Merge pull request #554 from blackberry-gaming/next-kcunney

Refactors AnimationClip::Listener::DEFAULT to AnimationClip::Listener::TIME

gameplay/src/AnimationClip.cpp

@@ -425,7 +425,7 @@ bool AnimationClip::update(float elapsedTime)
                 GP_ASSERT(**_listenerItr);
                 GP_ASSERT((**_listenerItr)->_listener);
 
-                (**_listenerItr)->_listener->animationEvent(this, Listener::DEFAULT);
+                (**_listenerItr)->_listener->animationEvent(this, Listener::TIME);
                 ++*_listenerItr;
             }
         }
@@ -437,7 +437,7 @@ bool AnimationClip::update(float elapsedTime)
                 GP_ASSERT(**_listenerItr);
                 GP_ASSERT((**_listenerItr)->_listener);
 
-                (**_listenerItr)->_listener->animationEvent(this, Listener::DEFAULT);
+                (**_listenerItr)->_listener->animationEvent(this, Listener::TIME);
                 --*_listenerItr;
             }
         }

gameplay/src/AnimationClip.h

@@ -49,11 +49,6 @@ public:
          */
         enum EventType 
         {
-            /**
-             * A timed event type.
-             */
-            DEFAULT,
-
             /**
              * Event fired when the clip begins.
              */
@@ -62,7 +57,12 @@ public:
             /**
              * Event fired when the clip ends.
              */
-            END
+            END,
+
+            /**
+             * Event fired at a specified time during a clip update.
+             */
+            TIME
         };
         
         /*

gameplay/src/lua/lua_AnimationClipListenerEventType.cpp

@@ -6,30 +6,30 @@ namespace gameplay
 
 static const char* enumStringEmpty = "";
 
-static const char* luaEnumString_AnimationClipListenerEventType_DEFAULT = "DEFAULT";
 static const char* luaEnumString_AnimationClipListenerEventType_BEGIN = "BEGIN";
 static const char* luaEnumString_AnimationClipListenerEventType_END = "END";
+static const char* luaEnumString_AnimationClipListenerEventType_TIME = "TIME";
 
 AnimationClip::Listener::EventType lua_enumFromString_AnimationClipListenerEventType(const char* s)
 {
-    if (strcmp(s, luaEnumString_AnimationClipListenerEventType_DEFAULT) == 0)
-        return AnimationClip::Listener::DEFAULT;
     if (strcmp(s, luaEnumString_AnimationClipListenerEventType_BEGIN) == 0)
         return AnimationClip::Listener::BEGIN;
     if (strcmp(s, luaEnumString_AnimationClipListenerEventType_END) == 0)
         return AnimationClip::Listener::END;
+    if (strcmp(s, luaEnumString_AnimationClipListenerEventType_TIME) == 0)
+        return AnimationClip::Listener::TIME;
     GP_ERROR("Invalid enumeration value '%s' for enumeration AnimationClip::Listener::EventType.", s);
-    return AnimationClip::Listener::DEFAULT;
+    return AnimationClip::Listener::BEGIN;
 }
 
 const char* lua_stringFromEnum_AnimationClipListenerEventType(AnimationClip::Listener::EventType e)
 {
-    if (e == AnimationClip::Listener::DEFAULT)
-        return luaEnumString_AnimationClipListenerEventType_DEFAULT;
     if (e == AnimationClip::Listener::BEGIN)
         return luaEnumString_AnimationClipListenerEventType_BEGIN;
     if (e == AnimationClip::Listener::END)
         return luaEnumString_AnimationClipListenerEventType_END;
+    if (e == AnimationClip::Listener::TIME)
+        return luaEnumString_AnimationClipListenerEventType_TIME;
     GP_ERROR("Invalid enumeration value '%d' for enumeration AnimationClip::Listener::EventType.", e);
     return enumStringEmpty;
 }

gameplay/src/lua/lua_Global.cpp

@@ -143,9 +143,9 @@ void luaRegister_lua_Global()
         std::vector<std::string> scopePath;
         scopePath.push_back("AnimationClip");
         scopePath.push_back("Listener");
-        ScriptUtil::registerConstantString("DEFAULT", "DEFAULT", scopePath);
         ScriptUtil::registerConstantString("BEGIN", "BEGIN", scopePath);
         ScriptUtil::registerConstantString("END", "END", scopePath);
+        ScriptUtil::registerConstantString("TIME", "TIME", scopePath);
     }
 
     // Register enumeration AudioSource::State.