dm %!s(int64=7) %!d(string=hai) anos
pai
achega
e63eb1e205
Modificáronse 5 ficheiros con 17 adicións e 15 borrados
  1. 7 5
      src/flow/Scene.cpp
  2. 1 1
      src/flow/Scene.h
  3. 2 2
      src/flow/Transition.cpp
  4. 1 1
      src/flow/Transition.h
  5. 6 6
      src/flow/flow.cpp

+ 7 - 5
src/flow/Scene.cpp

@@ -87,14 +87,16 @@ namespace oxygine
             setTransitionOut(tout);
         }
 
-        void Scene::listenForAllSceneEvents(const EventCallback &cb)
+        void Scene::listenForAllSceneEvents(const EventCallback& cb)
         {
-            size_t events[] = { 
-                EVENT_PRE_ENTERING, EVENT_POST_ENTERING, EVENT_PRE_LEAVING, EVENT_POST_LEAVING, 
+            size_t events[] =
+            {
+                EVENT_PRE_ENTERING, EVENT_POST_ENTERING, EVENT_PRE_LEAVING, EVENT_POST_LEAVING,
                 EVENT_PRE_SHOWING, EVENT_POST_SHOWING, EVENT_PRE_HIDING, EVENT_POST_HIDING,
-                EVENT_SCENE_SHOWN, EVENT_SCENE_HIDDEN, EVENT_BACK };
+                EVENT_SCENE_SHOWN, EVENT_SCENE_HIDDEN, EVENT_BACK
+            };
 
-            for (size_t i = 0; i < sizeof(events) / sizeof(events[0]); ++i)            
+            for (size_t i = 0; i < sizeof(events) / sizeof(events[0]); ++i)
                 addEventListener(events[i], cb);
         }
 

+ 1 - 1
src/flow/Scene.h

@@ -116,7 +116,7 @@ namespace oxygine
 
             void setPassBlockedTouch(bool v) { _passBlockedTouch = v; }
 
-            void listenForAllSceneEvents(const EventCallback &cb);
+            void listenForAllSceneEvents(const EventCallback& cb);
 
         protected:
 

+ 2 - 2
src/flow/Transition.cpp

@@ -13,7 +13,7 @@ namespace oxygine
     {
         Color _fadeColor = Color(0, 0, 0, 128);
 
-        void setDefaultFadeColor(const Color &c)
+        void setDefaultFadeColor(const Color& c)
         {
             _fadeColor = c;
         }
@@ -101,7 +101,7 @@ namespace oxygine
             scene->setTransitionOut(t);
         }
 
-        TransitionMove::TransitionMove():_moveIn(true)
+        TransitionMove::TransitionMove(): _moveIn(true)
         {
             _fade = new ColorRectSprite;
             _fade->setPosition(-10000, -10000);

+ 1 - 1
src/flow/Transition.h

@@ -11,7 +11,7 @@ namespace oxygine
 
     namespace flow
     {
-        void setDefaultFadeColor(const Color &c);
+        void setDefaultFadeColor(const Color& c);
 
         class Flow;
 

+ 6 - 6
src/flow/flow.cpp

@@ -215,13 +215,13 @@ namespace oxygine
 
             _touchBlocker->setPriority(next->getHolder()->getPriority());
 
-            
+
             if (scenes.empty())
                 _touchBlocker->detach();//nothing to block
             else
                 next->getHolder()->insertSiblingBefore(_touchBlocker);
-            
-            
+
+
 
             if (_back)
             {
@@ -303,7 +303,7 @@ namespace oxygine
                     {
                         spScene prev = new Scene;
                         prev->_holder->setPriority(1000);
-                        prev->_holder->attachTo(getStage());                        
+                        prev->_holder->attachTo(getStage());
                         phaseBegin(current, prev, true);
                         prev->_holder->detach();
                     }
@@ -431,14 +431,14 @@ namespace oxygine
                 }
             }
 
-            
+
             bool quit = checkQuit();
             if (quit)
             {
                 _wasBackBlocked = true;
                 _wasTouchBlocked = false;
             }
-     
+
 
             if (_transition)
             {