diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index cede3f83a6..7ce975cf05 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,10 @@ ________________________________________________________________________________ StepMania 5.0 $next | 2011???? -------------------------------------------------------------------------------- +2011/09/07 +---------- +* [Model] Added GetDefaultAnimation() Lua binding. [AJ] + 2011/09/02 ---------- * [MenuTimer] Added start(), disable() Lua bindings. Also renamed setseconds to diff --git a/src/Model.cpp b/src/Model.cpp index 070783de83..af1da0d951 100644 --- a/src/Model.cpp +++ b/src/Model.cpp @@ -778,6 +778,7 @@ public: static int position( T* p, lua_State *L ) { p->SetPosition( FArg(1) ); return 0; } static int playanimation( T* p, lua_State *L ) { p->PlayAnimation(SArg(1),FArg(2)); return 0; } static int SetDefaultAnimation( T* p, lua_State *L ) { p->SetDefaultAnimation(SArg(1),FArg(2)); return 0; } + static int GetDefaultAnimation( T* p, lua_State *L ) { lua_pushstring( L, p->GetDefaultAnimation() ); return 1; } static int loop( T* p, lua_State *L ) { p->SetLoop(BArg(1)); return 0; } static int rate( T* p, lua_State *L ) { p->SetRate(FArg(1)); return 0; } static int GetNumStates( T* p, lua_State *L ) { lua_pushnumber( L, p->GetNumStates() ); return 1; } @@ -788,11 +789,13 @@ public: ADD_METHOD( position ); ADD_METHOD( playanimation ); ADD_METHOD( SetDefaultAnimation ); + ADD_METHOD( GetDefaultAnimation ); ADD_METHOD( loop ); ADD_METHOD( rate ); // sm-ssc adds: ADD_METHOD( GetNumStates ); //ADD_METHOD( CelShading ); + // LoadMilkshapeAsciiBones? } }; diff --git a/src/Model.h b/src/Model.h index d9ce8e343b..afb70cc738 100644 --- a/src/Model.h +++ b/src/Model.h @@ -83,7 +83,7 @@ private: float m_fCurAnimationRate; bool m_bLoop; bool m_bDrawCelShaded; // for Lua models - + Model& operator=(const Model& rhs); };