summaryrefslogtreecommitdiff
path: root/src/content_sao.h
diff options
context:
space:
mode:
authorsapier <sapier@users.noreply.github.com>2017-09-01 11:15:12 +0200
committerLoïc Blot <nerzhul@users.noreply.github.com>2017-09-01 11:15:12 +0200
commitbf403b923ab4a1e11447b3f81d54d5d0c1124f65 (patch)
tree8c8f73e07051d8de8d5eb5c488bfdbc4377de3b3 /src/content_sao.h
parentb8f06ad37e142004335e8c2ffaec5fe73b620196 (diff)
downloadminetest-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/content_sao.h')
-rw-r--r--src/content_sao.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/content_sao.h b/src/content_sao.h
index 160ac7f43..019397d83 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -46,6 +46,7 @@ public:
const ItemGroupList &getArmorGroups();
void setAnimation(v2f frame_range, float frame_speed, float frame_blend, bool frame_loop);
void getAnimation(v2f *frame_range, float *frame_speed, float *frame_blend, bool *frame_loop);
+ void setAnimationSpeed(float frame_speed);
void setBonePosition(const std::string &bone, v3f position, v3f rotation);
void getBonePosition(const std::string &bone, v3f *position, v3f *rotation);
void setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation);
@@ -70,6 +71,7 @@ protected:
float m_animation_blend = 0.0f;
bool m_animation_loop = true;
bool m_animation_sent = false;
+ bool m_animation_speed_sent = false;
// Stores position and rotation for each bone name
std::unordered_map<std::string, core::vector2d<v3f>> m_bone_position;