diff options
| author | sapier <sapier@users.noreply.github.com> | 2017-09-01 11:15:12 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-09-01 11:15:12 +0200 |
| commit | bf403b923ab4a1e11447b3f81d54d5d0c1124f65 (patch) | |
| tree | 8c8f73e07051d8de8d5eb5c488bfdbc4377de3b3 /src/script/lua_api/l_object.cpp | |
| parent | b8f06ad37e142004335e8c2ffaec5fe73b620196 (diff) | |
| download | minetest-bf403b923ab4a1e11447b3f81d54d5d0c1124f65.tar.gz minetest-bf403b923ab4a1e11447b3f81d54d5d0c1124f65.tar.bz2 minetest-bf403b923ab4a1e11447b3f81d54d5d0c1124f65.zip | |
Fix animation frame_speed and blend loosing precision due to incorrec… (#6357)
* Fix animation frame_speed and blend loosing precision due to incorrect data type
Add lua function set_animation_frame_speed to update the frame speed without resetting the animation to start
Diffstat (limited to 'src/script/lua_api/l_object.cpp')
| -rw-r--r-- | src/script/lua_api/l_object.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp index 24fdeca4b..9b312b3ee 100644 --- a/src/script/lua_api/l_object.cpp +++ b/src/script/lua_api/l_object.cpp @@ -604,6 +604,26 @@ int ObjectRef::l_get_eye_offset(lua_State *L) return 2; } +// set_animation_frame_speed(self, frame_speed) +int ObjectRef::l_set_animation_frame_speed(lua_State *L) +{ + NO_MAP_LOCK_REQUIRED; + ObjectRef *ref = checkobject(L, 1); + ServerActiveObject *co = getobject(ref); + if (co == NULL) + return 0; + + // Do it + if (!lua_isnil(L, 2)) { + float frame_speed = lua_tonumber(L, 2); + co->setAnimationSpeed(frame_speed); + lua_pushboolean(L, true); + } else { + lua_pushboolean(L, false); + } + return 1; +} + // set_bone_position(self, std::string bone, v3f position, v3f rotation) int ObjectRef::l_set_bone_position(lua_State *L) { @@ -1937,6 +1957,7 @@ const luaL_Reg ObjectRef::methods[] = { luamethod(ObjectRef, get_armor_groups), luamethod(ObjectRef, set_animation), luamethod(ObjectRef, get_animation), + luamethod(ObjectRef, set_animation_frame_speed), luamethod(ObjectRef, set_bone_position), luamethod(ObjectRef, get_bone_position), luamethod(ObjectRef, set_attach), |