|
@@ -379,28 +379,27 @@ SharedPtr<Animation> Animation::Clone(const String& cloneName) const
|
|
|
ret->triggers_ = triggers_;
|
|
ret->triggers_ = triggers_;
|
|
|
ret->CopyMetadata(*this);
|
|
ret->CopyMetadata(*this);
|
|
|
ret->SetMemoryUse(GetMemoryUse());
|
|
ret->SetMemoryUse(GetMemoryUse());
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
return ret;
|
|
return ret;
|
|
|
-}
|
|
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
-AnimationTrack* Animation::GetTrack(unsigned index)
|
|
|
|
|
-{
|
|
|
|
|
- if (index >= GetNumTracks())
|
|
|
|
|
|
|
+AnimationTrack* Animation::GetTrack(unsigned index)
|
|
|
|
|
+{
|
|
|
|
|
+ if (index >= GetNumTracks())
|
|
|
return (AnimationTrack*) 0;
|
|
return (AnimationTrack*) 0;
|
|
|
|
|
|
|
|
- int j = 0;
|
|
|
|
|
- for(HashMap<StringHash, AnimationTrack>::Iterator i = tracks_.Begin(); i != tracks_.End(); ++i)
|
|
|
|
|
|
|
+ int j = 0;
|
|
|
|
|
+ for(HashMap<StringHash, AnimationTrack>::Iterator i = tracks_.Begin(); i != tracks_.End(); ++i)
|
|
|
{
|
|
{
|
|
|
- if (j == index)
|
|
|
|
|
- return &i->second_;
|
|
|
|
|
-
|
|
|
|
|
|
|
+ if (j == index)
|
|
|
|
|
+ return &i->second_;
|
|
|
|
|
+
|
|
|
++j;
|
|
++j;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
return (AnimationTrack*) 0;
|
|
return (AnimationTrack*) 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
AnimationTrack* Animation::GetTrack(const String& name)
|
|
AnimationTrack* Animation::GetTrack(const String& name)
|
|
|
{
|
|
{
|
|
|
HashMap<StringHash, AnimationTrack>::Iterator i = tracks_.Find(StringHash(name));
|
|
HashMap<StringHash, AnimationTrack>::Iterator i = tracks_.Find(StringHash(name));
|