summaryrefslogtreecommitdiff
path: root/src/content_sao.h
diff options
context:
space:
mode:
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>2012-10-26 18:03:24 +0300
committerPerttu Ahola <celeron55@gmail.com>2012-11-25 18:14:15 +0200
commit118285e6babd511c285780b07c275d527d7da9b1 (patch)
tree7a0419626d8ac7fe26d50f851a041a581bd00dcb /src/content_sao.h
parentba4d93027f7b1590f303eff2138cae413faf5c34 (diff)
downloadminetest-118285e6babd511c285780b07c275d527d7da9b1.tar.gz
minetest-118285e6babd511c285780b07c275d527d7da9b1.tar.bz2
minetest-118285e6babd511c285780b07c275d527d7da9b1.zip
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
Diffstat (limited to 'src/content_sao.h')
-rw-r--r--src/content_sao.h5
1 files changed, 4 insertions, 1 deletions
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();