diff options
| author | MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com> | 2015-02-21 23:38:53 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-06-22 01:53:38 +0200 |
| commit | 660fa516bfe774c77947c47a97154d6f069f414d (patch) | |
| tree | 60cbb826cfda9f08bd747aab3f087a75aec1df4c /src/content_sao.h | |
| parent | 622918d8a86ab2bb8a6ef1211b9a2ed1ad4c9b96 (diff) | |
| download | minetest-660fa516bfe774c77947c47a97154d6f069f414d.tar.gz minetest-660fa516bfe774c77947c47a97154d6f069f414d.tar.bz2 minetest-660fa516bfe774c77947c47a97154d6f069f414d.zip | |
Fix some issues with animations, and allow non-looped animations to be defined
Diffstat (limited to 'src/content_sao.h')
| -rw-r--r-- | src/content_sao.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/content_sao.h b/src/content_sao.h index 241788066..f61566665 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -59,8 +59,8 @@ public: s16 getHP() const; void setArmorGroups(const ItemGroupList &armor_groups); ItemGroupList getArmorGroups(); - void setAnimation(v2f frame_range, float frame_speed, float frame_blend); - void getAnimation(v2f *frame_range, float *frame_speed, float *frame_blend); + 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 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); @@ -106,6 +106,7 @@ private: v2f m_animation_range; float m_animation_speed; float m_animation_blend; + bool m_animation_loop; bool m_animation_sent; std::map<std::string, core::vector2d<v3f> > m_bone_position; @@ -197,8 +198,8 @@ public: void setBreath(u16 breath); void setArmorGroups(const ItemGroupList &armor_groups); ItemGroupList getArmorGroups(); - void setAnimation(v2f frame_range, float frame_speed, float frame_blend); - void getAnimation(v2f *frame_range, float *frame_speed, float *frame_blend); + 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 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); @@ -312,6 +313,7 @@ private: v2f m_animation_range; float m_animation_speed; float m_animation_blend; + bool m_animation_loop; bool m_animation_sent; std::map<std::string, core::vector2d<v3f> > m_bone_position; // Stores position and rotation for each bone name |