dmuratshin 9 years ago
parent
commit
57baebcf35
4 changed files with 14 additions and 13 deletions
  1. 4 4
      src/flow/Scene.cpp
  2. 6 5
      src/flow/Transition.cpp
  3. 2 2
      src/flow/Transition.h
  4. 2 2
      src/flow/flow.cpp

+ 4 - 4
src/flow/Scene.cpp

@@ -183,10 +183,10 @@ namespace oxygine
         void Scene::postHiding()
         {
             LOGD("%-20s '%s'", "Scene.postHiding", getName().c_str());
-            _transitionIn->_current = 0;
-            _transitionIn->_next = 0;
-            _transitionOut->_current = 0;
-            _transitionOut->_next = 0;
+            //_transitionIn->_current = 0;
+            //_transitionIn->_next = 0;
+            //_transitionOut->_current = 0;
+            //_transitionOut->_next = 0;
 
             Event ev(EVENT_POST_HIDING);
             dispatchEvent(&ev);

+ 6 - 5
src/flow/Transition.cpp

@@ -30,8 +30,8 @@ namespace oxygine
         void Transition::run(Flow* f, spScene current, spScene next, bool back)
         {
             _flow = f;
-            _current = current;
-            _next = next;
+            //_current = current;
+            //_next = next;
             //_done = false;
 
             _attach(current, next, back);
@@ -44,8 +44,8 @@ namespace oxygine
             {
                 //_done = true;
                 _clear();
-                _current = 0;
-                _next = 0;
+                //_current = 0;
+                //_next = 0;
                 _flow->phaseEnd();
             });
         }
@@ -388,7 +388,8 @@ namespace oxygine
 
         void TransitionQuads::_clear()
         {
-            _next->getHolder()->attachTo(getStage());
+            OX_ASSERT(!"not implemented");
+            //_next->getHolder()->attachTo(getStage());
 
             _holder->detach();
             _bg->detach();

+ 2 - 2
src/flow/Transition.h

@@ -31,8 +31,8 @@ namespace oxygine
             void waitTween(spTween);
 
             Flow* _flow;
-            spScene _current;
-            spScene _next;
+            //spScene _current;
+            //spScene _next;
             //bool _done;
             bool _singleDirection;
         };

+ 2 - 2
src/flow/flow.cpp

@@ -42,8 +42,8 @@ namespace oxygine
         {
             _touchBlocker->detach();
             _touchBlocker = 0;
-            _defaultTransition->_current = 0;
-            _defaultTransition->_next = 0;
+            //_defaultTransition->_current = 0;
+            //_defaultTransition->_next = 0;
             _defaultTransition = 0;
             Flow::instance.free();
         }