ProgressTo supports ui::Widgets with setPercent now

Author: tankorsmash

cocos/2d/CCActionProgressTimer.cpp

@@ -25,13 +25,11 @@ THE SOFTWARE.
 ****************************************************************************/
 #include "2d/CCActionProgressTimer.h"
 #include "2d/CCProgressTimer.h"
+#include "ui/UILoadingBar.h"
 
 NS_CC_BEGIN
 
-#define kProgressTimerCast ProgressTimer*
-
 // implementation of ProgressTo
-
 ProgressTo* ProgressTo::create(float duration, float percent)
 {
     ProgressTo *progressTo = new (std::nothrow) ProgressTo();
@@ -71,12 +69,23 @@ ProgressTo* ProgressTo::reverse() const
 void ProgressTo::startWithTarget(Node *target)
 {
     ActionInterval::startWithTarget(target);
-    _from = ((kProgressTimerCast)(target))->getPercentage();
+
+    ui::LoadingBar* loading_bar = dynamic_cast<ui::LoadingBar*>(target);
+    if (loading_bar){
+        _from = loading_bar->getPercent();
+    } else {
+        _from = static_cast<ProgressTimer*>(target)->getPercentage();
+    };
 }
 
 void ProgressTo::update(float time)
 {
-    ((kProgressTimerCast)(_target))->setPercentage(_from + (_to - _from) * time);
+    ui::LoadingBar* loading_bar = dynamic_cast<ui::LoadingBar*>(_target);
+    if (loading_bar){
+        loading_bar->setPercent(_from + (_to - _from) * time);
+    } else {
+        static_cast<ProgressTimer*>(_target)->setPercentage(_from + (_to - _from) * time);
+    };
 }
 
 // implementation of ProgressFromTo
@@ -125,7 +134,12 @@ void ProgressFromTo::startWithTarget(Node *target)
 
 void ProgressFromTo::update(float time)
 {
-    ((kProgressTimerCast)(_target))->setPercentage(_from + (_to - _from) * time);
+    ui::LoadingBar* loading_bar = dynamic_cast<ui::LoadingBar*>(_target);
+    if (loading_bar){
+        loading_bar->setPercent(_from + (_to - _from) * time);
+    } else {
+        static_cast<ProgressTimer*>(_target)->setPercentage(_from + (_to - _from) * time);
+    };
 }
 
 NS_CC_END