diff options
| author | MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com> | 2012-10-26 18:03:24 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-11-25 18:14:15 +0200 |
| commit | 118285e6babd511c285780b07c275d527d7da9b1 (patch) | |
| tree | 7a0419626d8ac7fe26d50f851a041a581bd00dcb /src/genericobject.h | |
| parent | ba4d93027f7b1590f303eff2138cae413faf5c34 (diff) | |
| download | minetest-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/genericobject.h')
| -rw-r--r-- | src/genericobject.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/genericobject.h b/src/genericobject.h index c57cce8ba..7e3e9d96f 100644 --- a/src/genericobject.h +++ b/src/genericobject.h @@ -29,8 +29,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #define GENERIC_CMD_SET_TEXTURE_MOD 2 #define GENERIC_CMD_SET_SPRITE 3 #define GENERIC_CMD_SET_ANIMATIONS 4 -#define GENERIC_CMD_PUNCHED 5 -#define GENERIC_CMD_UPDATE_ARMOR_GROUPS 6 +#define GENERIC_CMD_SET_BONE_POSROT 5 +#define GENERIC_CMD_PUNCHED 6 +#define GENERIC_CMD_UPDATE_ARMOR_GROUPS 7 #include "object_properties.h" std::string gob_cmd_set_properties(const ObjectProperties &prop); @@ -55,7 +56,9 @@ std::string gob_cmd_set_sprite( bool select_horiz_by_yawpitch ); -std::string gob_cmd_set_animations(int frame_start, int frame_end, float frame_speed, float frame_blend); +std::string gob_cmd_set_animations(v2f frames, float frame_speed, float frame_blend); + +std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation); std::string gob_cmd_punched(s16 damage, s16 result_hp); |