dmuratshin 9 years ago
parent
commit
efa87158ce
4 changed files with 15 additions and 3 deletions
  1. 2 0
      .gitignore
  2. 2 2
      src/flow/Scene.cpp
  3. 1 1
      src/flow/Scene.h
  4. 10 0
      src/flow/flow.cpp

+ 2 - 0
.gitignore

@@ -26,3 +26,5 @@ examples/HelloFlow/proj.cmake/build/
 examples/HelloFlow/proj.win32/.vs/HelloFlow/v14/.suo
 examples/HelloFlow/proj.android/build/
 examples/HelloFlow/proj.android/.gradle/
+
+*.db

+ 2 - 2
src/flow/Scene.cpp

@@ -136,7 +136,7 @@ namespace oxygine
         }
 
         void Scene::_flowPostLeaving()
-        {            
+        {
             postHiding();
             postLeaving();
         }
@@ -200,7 +200,7 @@ namespace oxygine
             LOGD("%-20s '%s'", "Scene.postShowing", getName().c_str());
             _inloop = true;
             Event ev(EVENT_POST_SHOWING);
-            dispatchEvent(&ev);            
+            dispatchEvent(&ev);
         }
 
         void Scene::preHiding()

+ 1 - 1
src/flow/Scene.h

@@ -144,7 +144,7 @@ namespace oxygine
 
             bool _remove;
             bool _done;
-            
+
 
             void preShowing();
             void postShowing();

+ 10 - 0
src/flow/flow.cpp

@@ -213,6 +213,16 @@ namespace oxygine
                 std::vector<spScene>::iterator i = std::find(scenes.begin(), scenes.end(), current);
                 OX_ASSERT(i != scenes.end());
                 scenes.erase(i);
+
+                /*
+                for (auto it = scenes.begin(); it != scenes.end(); )
+                {
+                    if ((*it)->_remove)
+                        scenes.erase(it);
+                    else
+                        it++;
+                }
+                */
             }