Browse Source

Fixed StaticModel::SetModel() getting called instead of AnimatedModel::SetModel() in Lua script.

Lasse Öörni 12 years ago
parent
commit
b3777b652c

+ 1 - 1
Docs/LuaScriptAPI.dox

@@ -1028,7 +1028,7 @@ Properties:<br>
 AnimatedModel : StaticModel
 
 Methods:<br>
-- void SetModel(Model* model, bool createBones = true)
+- void SetModel(Model* model)
 - AnimationState* AddAnimationState(Animation* animation)
 - void RemoveAnimationState(Animation* animation)
 - void RemoveAnimationState(const String animationName)

+ 1 - 0
Docs/ScriptAPI.dox

@@ -141,6 +141,7 @@ namespace Urho3D
 - uint AM_NOEDIT
 - uint AM_NODEID
 - uint AM_COMPONENTID
+- uint AM_NODEIDVECTOR
 - uint FIRST_REPLICATED_ID
 - uint LAST_REPLICATED_ID
 - uint FIRST_LOCAL_ID

+ 2 - 1
Source/Extras/LuaScript/pkgs/Graphics/AnimatedModel.pkg

@@ -2,7 +2,7 @@ $#include "AnimatedModel.h"
 
 class AnimatedModel : public StaticModel
 {
-    void SetModel(Model* model, bool createBones = true);
+    void SetModel(Model* model);
     AnimationState* AddAnimationState(Animation* animation);
     void RemoveAnimationState(Animation* animation);
     void RemoveAnimationState(const String animationName);
@@ -31,6 +31,7 @@ class AnimatedModel : public StaticModel
     float GetMorphWeight(StringHash nameHash) const;
     bool IsMaster() const;
     
+    tolua_property__get_set Model* model;    
     tolua_readonly tolua_property__get_set Skeleton& skeleton;
     tolua_readonly tolua_property__get_set unsigned numAnimationStates;
     tolua_property__get_set float animationLodBias;