From 118285e6babd511c285780b07c275d527d7da9b1 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Fri, 26 Oct 2012 18:03:24 +0300 Subject: Get the new animation framework properly working Store start and end frames as v2f Also move bone animations to their own function instead of object properties --- src/content_sao.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/content_sao.h') diff --git a/src/content_sao.h b/src/content_sao.h index 1cbf492b1..cba2729ae 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -61,6 +61,8 @@ public: void setHP(s16 hp); s16 getHP() const; void setArmorGroups(const ItemGroupList &armor_groups); + void setAnimations(v2f frames, float frame_speed, float frame_blend); + void setBonePosRot(std::string bone, v3f position, v3f rotation); ObjectProperties* accessObjectProperties(); void notifyObjectPropertiesModified(); /* LuaEntitySAO-specific */ @@ -73,7 +75,6 @@ public: void setTextureMod(const std::string &mod); void setSprite(v2s16 p, int num_frames, float framelength, bool select_horiz_by_yawpitch); - void setAnimations(int frame_start, int frame_end, float frame_speed, float frame_blend); std::string getName(); private: std::string getPropertyPacket(); @@ -143,6 +144,8 @@ public: void setHP(s16 hp); void setArmorGroups(const ItemGroupList &armor_groups); + void setAnimations(v2f frames, float frame_speed, float frame_blend); + void setBonePosRot(std::string bone, v3f position, v3f rotation); ObjectProperties* accessObjectProperties(); void notifyObjectPropertiesModified(); -- cgit v1.2.3