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/genericobject.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'src/genericobject.cpp') diff --git a/src/genericobject.cpp b/src/genericobject.cpp index 0914a13c5..d915d78a5 100644 --- a/src/genericobject.cpp +++ b/src/genericobject.cpp @@ -92,19 +92,30 @@ std::string gob_cmd_set_sprite( return os.str(); } -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::ostringstream os(std::ios::binary); // command writeU8(os, GENERIC_CMD_SET_ANIMATIONS); // parameters - writeU16(os, frame_start); - writeU16(os, frame_end); + writeV2F1000(os, frames); writeF1000(os, frame_speed); writeF1000(os, frame_blend); return os.str(); } +std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation) +{ + std::ostringstream os(std::ios::binary); + // command + writeU8(os, GENERIC_CMD_SET_BONE_POSROT); + // parameters + os<