2
0
Эх сурвалжийг харах

Fix order of exposing AnimatedModel functions to Lua so that all overloads of SetMorphWeight() & GetMorphWeight() work. Closes #182.

Lasse Öörni 12 жил өмнө
parent
commit
ffd5b7de5e

+ 3 - 3
Source/Engine/LuaScript/pkgs/Graphics/AnimatedModel.pkg

@@ -12,9 +12,9 @@ class AnimatedModel : public StaticModel
     void RemoveAllAnimationStates();
     void RemoveAllAnimationStates();
     void SetAnimationLodBias(float bias);
     void SetAnimationLodBias(float bias);
     void SetUpdateInvisible(bool enable);
     void SetUpdateInvisible(bool enable);
-    void SetMorphWeight(unsigned index, float weight);
     void SetMorphWeight(const String name, float weight);
     void SetMorphWeight(const String name, float weight);
     void SetMorphWeight(StringHash nameHash, float weight);
     void SetMorphWeight(StringHash nameHash, float weight);
+    void SetMorphWeight(unsigned index, float weight);
     void ResetMorphWeights();
     void ResetMorphWeights();
 
 
     Skeleton& GetSkeleton();
     Skeleton& GetSkeleton();
@@ -26,12 +26,12 @@ class AnimatedModel : public StaticModel
     float GetAnimationLodBias() const;
     float GetAnimationLodBias() const;
     bool GetUpdateInvisible() const;
     bool GetUpdateInvisible() const;
     unsigned GetNumMorphs() const;
     unsigned GetNumMorphs() const;
-    float GetMorphWeight(unsigned index) const;
     float GetMorphWeight(const String name) const;
     float GetMorphWeight(const String name) const;
     float GetMorphWeight(StringHash nameHash) const;
     float GetMorphWeight(StringHash nameHash) const;
+    float GetMorphWeight(unsigned index) const;
     bool IsMaster() const;
     bool IsMaster() const;
     
     
-    tolua_property__get_set Model* model;    
+    tolua_property__get_set Model* model;
     tolua_readonly tolua_property__get_set Skeleton& skeleton;
     tolua_readonly tolua_property__get_set Skeleton& skeleton;
     tolua_readonly tolua_property__get_set unsigned numAnimationStates;
     tolua_readonly tolua_property__get_set unsigned numAnimationStates;
     tolua_property__get_set float animationLodBias;
     tolua_property__get_set float animationLodBias;