Explorar o código

TweenQueue implemented complete

dmuratshin %!s(int64=9) %!d(string=hai) anos
pai
achega
a9759390ab
Modificáronse 2 ficheiros con 8 adicións e 2 borrados
  1. 6 1
      oxygine/src/TweenQueue.cpp
  2. 2 1
      oxygine/src/TweenQueue.h

+ 6 - 1
oxygine/src/TweenQueue.cpp

@@ -66,7 +66,12 @@ namespace oxygine
 
 
     void TweenQueue::complete(timeMS deltaTime)
     void TweenQueue::complete(timeMS deltaTime)
     {
     {
-        OX_ASSERT("Tween::complete is not supported for TweenQueue");
+        UpdateState us;
+        us.dt = deltaTime;
+        while (_status != status_done)
+        {
+            update(*_client, us);
+        }
     }
     }
 
 
     void TweenQueue::_start(Actor& actor)
     void TweenQueue::_start(Actor& actor)

+ 2 - 1
oxygine/src/TweenQueue.h

@@ -40,8 +40,9 @@ namespace oxygine
         template<class GS>
         template<class GS>
         spTween add(const GS& gs, timeMS duration, int loops = 1, bool twoSides = false, timeMS delay = 0, Tween::EASE ease = Tween::ease_linear);
         spTween add(const GS& gs, timeMS duration, int loops = 1, bool twoSides = false, timeMS delay = 0, Tween::EASE ease = Tween::ease_linear);
 
 
-    private:
         void complete(timeMS deltaTime);
         void complete(timeMS deltaTime);
+
+    private:
         void _start(Actor& actor);
         void _start(Actor& actor);
         void _update(Actor& actor, const UpdateState& us);
         void _update(Actor& actor, const UpdateState& us);