Просмотр исходного кода

Fixed coding style; added AngelScript binding.

Florastamine 8 лет назад
Родитель
Сommit
eb9e5c8b6e
2 измененных файлов с 5 добавлено и 3 удалено
  1. 1 0
      Source/Urho3D/AngelScript/GraphicsAPI.cpp
  2. 4 3
      Source/Urho3D/Graphics/Animation.cpp

+ 1 - 0
Source/Urho3D/AngelScript/GraphicsAPI.cpp

@@ -1128,6 +1128,7 @@ static void RegisterAnimation(asIScriptEngine* engine)
     engine->RegisterObjectMethod("Animation", "void set_length(float)", asMETHOD(Animation, SetLength), asCALL_THISCALL);
     engine->RegisterObjectMethod("Animation", "float get_length() const", asMETHOD(Animation, GetLength), asCALL_THISCALL);
     engine->RegisterObjectMethod("Animation", "AnimationTrack@+ get_tracks(const String&in)", asMETHODPR(Animation, GetTrack, (const String&), AnimationTrack*), asCALL_THISCALL);
+    engine->RegisterObjectMethod("Animation", "AnimationTrack@+ GetTrack(uint)", asMETHODPR(Animation, GetTrack, (unsigned), AnimationTrack*), asCALL_THISCALL);
     engine->RegisterObjectMethod("Animation", "uint get_numTracks() const", asMETHOD(Animation, GetNumTracks), asCALL_THISCALL);
     engine->RegisterObjectMethod("Animation", "void set_numTriggers(uint)", asMETHOD(Animation, SetNumTriggers), asCALL_THISCALL);
     engine->RegisterObjectMethod("Animation", "uint get_numTriggers() const", asMETHOD(Animation, GetNumTriggers), asCALL_THISCALL);

+ 4 - 3
Source/Urho3D/Graphics/Animation.cpp

@@ -379,8 +379,9 @@ SharedPtr<Animation> Animation::Clone(const String& cloneName) const
 } 
 
 AnimationTrack* Animation::GetTrack(unsigned index) 
-{
-    index = (index < 0) || (index > tracks_.Size() - 1) ? 0 : index; 
+{ 
+    if (index >= GetNumTracks()) 
+        return (AnimationTrack*) 0;
 
     int j = 0; 
     for(HashMap<StringHash, AnimationTrack>::Iterator i = tracks_.Begin(); i != tracks_.End(); ++i) 
@@ -391,7 +392,7 @@ AnimationTrack* Animation::GetTrack(unsigned index)
         ++j;
     }
     
-    return (AnimationTrack*)0;
+    return (AnimationTrack*) 0;
 }