wip

src/flow/Scene.cpp

@@ -48,7 +48,7 @@ namespace oxygine
     {
         extern bool _wasTouchBlocked;
 
-        Scene::Scene(): _done(false), _remove(false), _dialog(false), _inloop(false), _transitionDone(false)//, _finishEvent(0)
+        Scene::Scene(): _done(false), _remove(false), _dialog(false), _inloop(false)
         {
             setName("Scene");
             _holder = new Actor;
@@ -103,8 +103,6 @@ namespace oxygine
 
         spTransition Scene::runTransition(Flow* f, spScene current, bool back)
         {
-            _transitionDone = false;
-            current->_transitionDone = false;
             return back ? _runTransitionOut(f, current) : _runTransitionIn(f, current);
         }
 

src/flow/Scene.h

@@ -125,7 +125,7 @@ namespace oxygine
             virtual spTransition _runTransitionOut(Flow*, spScene current);
 
             spActor _holder;
-            bool _transitionDone;
+            //bool _transitionDone;
 
         private:
 

src/flow/Transition.cpp

@@ -22,7 +22,7 @@ namespace oxygine
             scene->setTransitionOut(t);
         }
 
-        Transition::Transition() : _done(false), _singleDirection(false), _flow(0)
+        Transition::Transition() :  _singleDirection(false), _flow(0)
         {
 
         }
@@ -32,7 +32,7 @@ namespace oxygine
             _flow = f;
             _current = current;
             _next = next;
-            _done = false;
+            //_done = false;
 
             _attach(current, next, back);
             _run(current, next, back);
@@ -42,7 +42,7 @@ namespace oxygine
         {
             t->setDoneCallback([ = ](Event*)
             {
-                _done = true;
+                //_done = true;
                 _clear();
                 _current = 0;
                 _next = 0;
@@ -75,7 +75,7 @@ namespace oxygine
 
         void TransitionSimple::_run(spScene current, spScene next, bool back)
         {
-            _done = true;
+
         }
 
         void TransitionMove::assign(Scene* scene)

src/flow/Transition.h

@@ -33,7 +33,7 @@ namespace oxygine
             Flow* _flow;
             spScene _current;
             spScene _next;
-            bool _done;
+            //bool _done;
             bool _singleDirection;
         };
 

src/flow/flow.cpp

@@ -46,6 +46,7 @@ namespace oxygine
         Flow::Flow()
         {
             _transition = false;
+            _transitionDone = false;
             _back = false;
         }
 
@@ -267,7 +268,8 @@ namespace oxygine
             if (_transition)
             {
                 //we don't know who controls transition, next, current, or Transition
-                if (_trans && _trans->_done || _next->_transitionDone || _current->_transitionDone)
+                //if (_trans && _trans->_done || _next->_transitionDone || _current->_transitionDone)
+                if (_transitionDone)
                     phaseEnd();
 
                 return;

src/flow/flow.h

@@ -61,6 +61,7 @@ namespace oxygine
             bool _back;
 
             spTransition _trans;
+            bool _transitionDone;
             spScene _current;
             spScene _next;
         };