Merge pull request #476 from seanpaultaylor/next

Changes to use size_t instead of unsigned int for 64-bit

gameplay/src/Animation.cpp

@@ -296,8 +296,8 @@ AnimationClip* Animation::findClip(const char* id) const
     if (_clips)
     {
         AnimationClip* clip = NULL;
-        unsigned int clipCount = _clips->size();
-        for (unsigned int i = 0; i < clipCount; i++)
+        size_t clipCount = _clips->size();
+        for (size_t i = 0; i < clipCount; i++)
         {
             clip = _clips->at(i);
             GP_ASSERT(clip);

gameplay/src/AnimationClip.cpp

@@ -43,7 +43,7 @@ AnimationClip::~AnimationClip()
 
     if (_scriptListeners)
     {
-        for (unsigned int i = 0; i < _scriptListeners->size(); i++)
+        for (size_t i = 0; i < _scriptListeners->size(); i++)
         {
             SAFE_DELETE((*_scriptListeners)[i]);
         }
@@ -498,8 +498,8 @@ bool AnimationClip::update(float elapsedTime)
     Animation::Channel* channel = NULL;
     AnimationValue* value = NULL;
     AnimationTarget* target = NULL;
-    unsigned int channelCount = _animation->_channels.size();
-    for (unsigned int i = 0; i < channelCount; i++)
+    size_t channelCount = _animation->_channels.size();
+    for (size_t i = 0; i < channelCount; i++)
     {
         channel = _animation->_channels[i];
         GP_ASSERT(channel);
@@ -627,4 +627,4 @@ void AnimationClip::ScriptListener::animationEvent(AnimationClip* clip, EventTyp
 }
 
 
-}
+}

gameplay/src/AnimationController.cpp

@@ -97,7 +97,7 @@ void AnimationController::update(float elapsedTime)
 {
     if (_state != RUNNING)
         return;
-
+    
     Transform::suspendTransformChanged();
 
     // Loop through running clips and call update() on them.

gameplay/src/AnimationTarget.cpp

@@ -164,11 +164,11 @@ Animation* AnimationTarget::createAnimation(const char* id, Properties* animatio
     }
     
     char delimeter = ' ';
-    unsigned int startOffset = 0;
-    unsigned int endOffset = (unsigned int)std::string::npos;
+    size_t startOffset = 0;
+    size_t endOffset = std::string::npos;
     
     unsigned long* keyTimes = new unsigned long[keyCount];
-    for (unsigned int i = 0; i < keyCount; i++)
+    for (size_t i = 0; i < keyCount; i++)
     {
         endOffset = static_cast<std::string>(keyTimesStr).find_first_of(delimeter, startOffset);
         if (endOffset != std::string::npos)
@@ -183,7 +183,7 @@ Animation* AnimationTarget::createAnimation(const char* id, Properties* animatio
     }
 
     startOffset = 0;
-    endOffset = (unsigned int)std::string::npos;
+    endOffset = std::string::npos;
     
     int componentCount = getAnimationPropertyComponentCount(propertyId);
     GP_ASSERT(componentCount > 0);
@@ -211,7 +211,7 @@ Animation* AnimationTarget::createAnimation(const char* id, Properties* animatio
     {
         keyIn = new float[components];
         startOffset = 0;
-        endOffset = (unsigned int)std::string::npos;
+        endOffset = std::string::npos;
         for (unsigned int i = 0; i < components; i++)
         {
             endOffset = static_cast<std::string>(keyInStr).find_first_of(delimeter, startOffset);
@@ -233,7 +233,7 @@ Animation* AnimationTarget::createAnimation(const char* id, Properties* animatio
     {   
         keyOut = new float[components];
         startOffset = 0;
-        endOffset = (unsigned int)std::string::npos;
+        endOffset = std::string::npos;
         for (unsigned int i = 0; i < components; i++)
         {
             endOffset = static_cast<std::string>(keyOutStr).find_first_of(delimeter, startOffset);