Forráskód Böngészése

Convert tabs to spaces

Rcmaniac25 11 éve
szülő
commit
76a4ef4a88
2 módosított fájl, 122 hozzáadás és 122 törlés
  1. 84 84
      gameplay/src/AnimationClip.cpp
  2. 38 38
      gameplay/src/AnimationClip.h

+ 84 - 84
gameplay/src/AnimationClip.cpp

@@ -56,7 +56,7 @@ AnimationClip::~AnimationClip()
         {
         {
             ListenerEvent* lEvt = **_listenerItr;
             ListenerEvent* lEvt = **_listenerItr;
             SAFE_DELETE(lEvt);
             SAFE_DELETE(lEvt);
-			++(*_listenerItr);
+            ++(*_listenerItr);
         }
         }
         SAFE_DELETE(_listeners);
         SAFE_DELETE(_listeners);
     }
     }
@@ -309,11 +309,11 @@ void AnimationClip::addListener(AnimationClip::Listener* listener, unsigned long
                 {
                 {
                     float currentTime = fmodf(_elapsedTime, (float)_duration);
                     float currentTime = fmodf(_elapsedTime, (float)_duration);
                     GP_ASSERT(**_listenerItr || *_listenerItr == _listeners->end());
                     GP_ASSERT(**_listenerItr || *_listenerItr == _listeners->end());
-					if ((_speed >= 0.0f && currentTime < eventTime && (*_listenerItr == _listeners->end() || eventTime < (**_listenerItr)->_eventTime)) ||
-						(_speed <= 0 && currentTime > eventTime && (*_listenerItr == _listeners->begin() || eventTime > (**_listenerItr)->_eventTime)))
-					{
-						*_listenerItr = itr;
-					}
+                    if ((_speed >= 0.0f && currentTime < eventTime && (*_listenerItr == _listeners->end() || eventTime < (**_listenerItr)->_eventTime)) ||
+                        (_speed <= 0 && currentTime > eventTime && (*_listenerItr == _listeners->begin() || eventTime > (**_listenerItr)->_eventTime)))
+                    {
+                        *_listenerItr = itr;
+                    }
                 }
                 }
                 return;
                 return;
             }
             }
@@ -324,28 +324,28 @@ void AnimationClip::addListener(AnimationClip::Listener* listener, unsigned long
 
 
 void AnimationClip::removeListener(AnimationClip::Listener* listener, unsigned long eventTime)
 void AnimationClip::removeListener(AnimationClip::Listener* listener, unsigned long eventTime)
 {
 {
-	if (_listeners)
-	{
-		GP_ASSERT(listener);
-		std::list<ListenerEvent*>::iterator iter = std::find_if(_listeners->begin(), _listeners->end(), [&](ListenerEvent* lst){ return lst->_eventTime == eventTime && lst->_listener == listener; });
-		if (iter != _listeners->end())
-		{
-			if (isClipStateBitSet(CLIP_IS_PLAYING_BIT))
-			{
-				float currentTime = fmodf(_elapsedTime, (float)_duration);
-				GP_ASSERT(**_listenerItr || *_listenerItr == _listeners->end());
-
-				// We the listener has not been triggered yet, then check if it is next to be triggered, remove it, and update the iterator
-				if (((_speed >= 0.0f && currentTime < eventTime) || (_speed <= 0 && currentTime > eventTime)) &&
-					*iter == **_listenerItr)
-				{
-					*_listenerItr = _listeners->erase(iter);
-					return;
-				}
-			}
-			_listeners->erase(iter);
-		}
-	}
+    if (_listeners)
+    {
+        GP_ASSERT(listener);
+        std::list<ListenerEvent*>::iterator iter = std::find_if(_listeners->begin(), _listeners->end(), [&](ListenerEvent* lst){ return lst->_eventTime == eventTime && lst->_listener == listener; });
+        if (iter != _listeners->end())
+        {
+            if (isClipStateBitSet(CLIP_IS_PLAYING_BIT))
+            {
+                float currentTime = fmodf(_elapsedTime, (float)_duration);
+                GP_ASSERT(**_listenerItr || *_listenerItr == _listeners->end());
+
+                // We the listener has not been triggered yet, then check if it is next to be triggered, remove it, and update the iterator
+                if (((_speed >= 0.0f && currentTime < eventTime) || (_speed <= 0 && currentTime > eventTime)) &&
+                    *iter == **_listenerItr)
+                {
+                    *_listenerItr = _listeners->erase(iter);
+                    return;
+                }
+            }
+            _listeners->erase(iter);
+        }
+    }
 }
 }
 
 
 void AnimationClip::addBeginListener(AnimationClip::Listener* listener)
 void AnimationClip::addBeginListener(AnimationClip::Listener* listener)
@@ -359,15 +359,15 @@ void AnimationClip::addBeginListener(AnimationClip::Listener* listener)
 
 
 void AnimationClip::removeBeginListener(AnimationClip::Listener* listener)
 void AnimationClip::removeBeginListener(AnimationClip::Listener* listener)
 {
 {
-	if (_beginListeners)
-	{
-		GP_ASSERT(listener);
-		std::vector<Listener*>::iterator iter = std::find(_beginListeners->begin(), _beginListeners->end(), listener);
-		if (iter != _beginListeners->end())
-		{
-			_beginListeners->erase(iter);
-		}
-	}
+    if (_beginListeners)
+    {
+        GP_ASSERT(listener);
+        std::vector<Listener*>::iterator iter = std::find(_beginListeners->begin(), _beginListeners->end(), listener);
+        if (iter != _beginListeners->end())
+        {
+            _beginListeners->erase(iter);
+        }
+    }
 }
 }
 
 
 void AnimationClip::addEndListener(AnimationClip::Listener* listener)
 void AnimationClip::addEndListener(AnimationClip::Listener* listener)
@@ -381,15 +381,15 @@ void AnimationClip::addEndListener(AnimationClip::Listener* listener)
 
 
 void AnimationClip::removeEndListener(AnimationClip::Listener* listener)
 void AnimationClip::removeEndListener(AnimationClip::Listener* listener)
 {
 {
-	if (_endListeners)
-	{
-		GP_ASSERT(listener);
-		std::vector<Listener*>::iterator iter = std::find(_endListeners->begin(), _endListeners->end(), listener);
-		if (iter != _endListeners->end())
-		{
-			_endListeners->erase(iter);
-		}
-	}
+    if (_endListeners)
+    {
+        GP_ASSERT(listener);
+        std::vector<Listener*>::iterator iter = std::find(_endListeners->begin(), _endListeners->end(), listener);
+        if (iter != _endListeners->end())
+        {
+            _endListeners->erase(iter);
+        }
+    }
 }
 }
 
 
 void AnimationClip::addBeginListener(const char* function)
 void AnimationClip::addBeginListener(const char* function)
@@ -404,19 +404,19 @@ void AnimationClip::addBeginListener(const char* function)
 
 
 void AnimationClip::removeBeginListener(const char* function)
 void AnimationClip::removeBeginListener(const char* function)
 {
 {
-	if (_scriptListeners)
-	{
-		std::string functionRef = Game::getInstance()->getScriptController()->loadUrl(function);
-		std::vector<ScriptListener*>::iterator iter = std::find_if(_scriptListeners->begin(), _scriptListeners->end(), [&](ScriptListener* listener){ return listener->function == functionRef; });
-		if (iter != _scriptListeners->end())
-		{
-			ScriptListener* listener = *iter;
+    if (_scriptListeners)
+    {
+        std::string functionRef = Game::getInstance()->getScriptController()->loadUrl(function);
+        std::vector<ScriptListener*>::iterator iter = std::find_if(_scriptListeners->begin(), _scriptListeners->end(), [&](ScriptListener* listener){ return listener->function == functionRef; });
+        if (iter != _scriptListeners->end())
+        {
+            ScriptListener* listener = *iter;
 
 
-			removeBeginListener(listener);
-			_scriptListeners->erase(iter);
-			SAFE_DELETE(listener);
-		}
-	}
+            removeBeginListener(listener);
+            _scriptListeners->erase(iter);
+            SAFE_DELETE(listener);
+        }
+    }
 }
 }
 
 
 void AnimationClip::addEndListener(const char* function)
 void AnimationClip::addEndListener(const char* function)
@@ -431,19 +431,19 @@ void AnimationClip::addEndListener(const char* function)
 
 
 void AnimationClip::removeEndListener(const char* function)
 void AnimationClip::removeEndListener(const char* function)
 {
 {
-	if (_scriptListeners)
-	{
-		std::string functionRef = Game::getInstance()->getScriptController()->loadUrl(function);
-		std::vector<ScriptListener*>::iterator iter = std::find_if(_scriptListeners->begin(), _scriptListeners->end(), [&](ScriptListener* listener){ return listener->function == functionRef; });
-		if (iter != _scriptListeners->end())
-		{
-			ScriptListener* listener = *iter;
+    if (_scriptListeners)
+    {
+        std::string functionRef = Game::getInstance()->getScriptController()->loadUrl(function);
+        std::vector<ScriptListener*>::iterator iter = std::find_if(_scriptListeners->begin(), _scriptListeners->end(), [&](ScriptListener* listener){ return listener->function == functionRef; });
+        if (iter != _scriptListeners->end())
+        {
+            ScriptListener* listener = *iter;
 
 
-			removeEndListener(listener);
-			_scriptListeners->erase(iter);
-			SAFE_DELETE(listener);
-		}
-	}
+            removeEndListener(listener);
+            _scriptListeners->erase(iter);
+            SAFE_DELETE(listener);
+        }
+    }
 }
 }
 
 
 void AnimationClip::addListener(const char* function, unsigned long eventTime)
 void AnimationClip::addListener(const char* function, unsigned long eventTime)
@@ -458,20 +458,20 @@ void AnimationClip::addListener(const char* function, unsigned long eventTime)
 
 
 void AnimationClip::removeListener(const char* function, unsigned long eventTime)
 void AnimationClip::removeListener(const char* function, unsigned long eventTime)
 {
 {
-	if (_scriptListeners)
-	{
-		GP_ASSERT(eventTime < _activeDuration); // Do this check here, before we modify any state
-		std::string functionRef = Game::getInstance()->getScriptController()->loadUrl(function);
-		std::vector<ScriptListener*>::iterator iter = std::find_if(_scriptListeners->begin(), _scriptListeners->end(), [&](ScriptListener* listener){ return listener->function == functionRef; });
-		if (iter != _scriptListeners->end())
-		{
-			ScriptListener* listener = *iter;
-
-			removeListener(listener, eventTime);
-			_scriptListeners->erase(iter);
-			SAFE_DELETE(listener);
-		}
-	}
+    if (_scriptListeners)
+    {
+        GP_ASSERT(eventTime < _activeDuration); // Do this check here, before we modify any state
+        std::string functionRef = Game::getInstance()->getScriptController()->loadUrl(function);
+        std::vector<ScriptListener*>::iterator iter = std::find_if(_scriptListeners->begin(), _scriptListeners->end(), [&](ScriptListener* listener){ return listener->function == functionRef; });
+        if (iter != _scriptListeners->end())
+        {
+            ScriptListener* listener = *iter;
+
+            removeListener(listener, eventTime);
+            _scriptListeners->erase(iter);
+            SAFE_DELETE(listener);
+        }
+    }
 }
 }
 
 
 bool AnimationClip::update(float elapsedTime)
 bool AnimationClip::update(float elapsedTime)

+ 38 - 38
gameplay/src/AnimationClip.h

@@ -231,12 +231,12 @@ public:
      */
      */
     void addBeginListener(AnimationClip::Listener* listener);
     void addBeginListener(AnimationClip::Listener* listener);
 
 
-	/**
-	 * Removes an animation begin listener.
-	 *
-	 * @param listener The listener to be removed.
-	 */
-	void removeBeginListener(AnimationClip::Listener* listener);
+    /**
+     * Removes an animation begin listener.
+     *
+     * @param listener The listener to be removed.
+     */
+    void removeBeginListener(AnimationClip::Listener* listener);
 
 
     /**
     /**
      * Adds an animation end listener.
      * Adds an animation end listener.
@@ -245,12 +245,12 @@ public:
      */
      */
     void addEndListener(AnimationClip::Listener* listener);
     void addEndListener(AnimationClip::Listener* listener);
 
 
-	/**
-	 * Removes an animation end listener.
-	 *
-	 * @param listener The listener to be removed.
-	 */
-	void removeEndListener(AnimationClip::Listener* listener);
+    /**
+     * Removes an animation end listener.
+     *
+     * @param listener The listener to be removed.
+     */
+    void removeEndListener(AnimationClip::Listener* listener);
 
 
     /**
     /**
      * Adds an animation listener to be called back at the specified eventTime during the playback 
      * Adds an animation listener to be called back at the specified eventTime during the playback 
@@ -263,13 +263,13 @@ public:
      */
      */
     void addListener(AnimationClip::Listener* listener, unsigned long eventTime);
     void addListener(AnimationClip::Listener* listener, unsigned long eventTime);
 
 
-	/**
-	 * Removes an animation listener assigned to the specified eventTime.
-	 *
-	 * @param listener The listener to be removed with the specified time.
-	 * @param eventTime The time of the listener to be removed.
-	 */
-	void removeListener(AnimationClip::Listener* listener, unsigned long eventTime);
+    /**
+     * Removes an animation listener assigned to the specified eventTime.
+     *
+     * @param listener The listener to be removed with the specified time.
+     * @param eventTime The time of the listener to be removed.
+     */
+    void removeListener(AnimationClip::Listener* listener, unsigned long eventTime);
 
 
     /**
     /**
      * Adds an animation begin listener.
      * Adds an animation begin listener.
@@ -280,12 +280,12 @@ public:
      */
      */
     void addBeginListener(const char* function);
     void addBeginListener(const char* function);
 
 
-	/**
-	 * Removes an animation begin listener.
-	 *
-	 * @param function The Lua script function to remove.
-	 */
-	void removeBeginListener(const char* function);
+    /**
+     * Removes an animation begin listener.
+     *
+     * @param function The Lua script function to remove.
+     */
+    void removeBeginListener(const char* function);
 
 
     /**
     /**
      * Adds an animation end listener.
      * Adds an animation end listener.
@@ -296,12 +296,12 @@ public:
      */
      */
     void addEndListener(const char* function);
     void addEndListener(const char* function);
 
 
-	/**
-	 * Removes an animation end listener.
-	 *
-	 * @param function The Lua script function to remove.
-	 */
-	void removeEndListener(const char* function);
+    /**
+     * Removes an animation end listener.
+     *
+     * @param function The Lua script function to remove.
+     */
+    void removeEndListener(const char* function);
 
 
     /**
     /**
      * Adds an animation listener to be called back at the specified eventTime during the playback 
      * Adds an animation listener to be called back at the specified eventTime during the playback 
@@ -316,13 +316,13 @@ public:
      */
      */
     void addListener(const char* function, unsigned long eventTime);
     void addListener(const char* function, unsigned long eventTime);
 
 
-	/**
-	 * Removes an animation listener assigned to the specified eventTime.
-	 *
-	 * @param function The Lua script function to remove with the specified time.
-	 * @param eventTime The time of the listener to be removed.
-	 */
-	void removeListener(const char* function, unsigned long eventTime);
+    /**
+     * Removes an animation listener assigned to the specified eventTime.
+     *
+     * @param function The Lua script function to remove with the specified time.
+     * @param eventTime The time of the listener to be removed.
+     */
+    void removeListener(const char* function, unsigned long eventTime);
 
 
 private:
 private: