minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

New argument save_playback_pos in method set_animation

This commit is contained in:
NaruTrey 2016-06-14 18:58:57 +04:00
parent bc1ea1684f
commit d8f0332ad9
10 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/lua_api.txt
View File

@ -2628,7 +2628,7 @@ This is basically a reference to a C++ `ServerActiveObject`
* `set_wielded_item(item)`: replaces the wielded item, returns `true` if successful
* `set_armor_groups({group1=rating, group2=rating, ...})`
* `get_armor_groups()`: returns a table with the armor group ratings
* `set_animation({x=1,y=1}, frame_speed=15, frame_blend=0, frame_loop=true)`
* `set_animation({x=1,y=1}, frame_speed=15, frame_blend=0, frame_loop=true, save_playback_pos=false)`
* `get_animation()`: returns range, frame_speed, frame_blend and frame_loop
* `set_attach(parent, bone, position, rotation)`
* `bone`: string

28
src/content_cao.cpp
View File

@ -566,6 +566,7 @@ GenericCAO::GenericCAO(IGameDef *gamedef, ClientEnvironment *env):
m_animation_speed(15),
m_animation_blend(0),
m_animation_loop(true),
m_animation_save_playback_pos(false),
m_bone_position(std::map<std::string, core::vector2d<v3f> >()),
m_attachment_bone(""),
m_attachment_position(v3f(0,0,0)),
@ -1490,14 +1491,25 @@ void GenericCAO::updateAnimation()
if(m_animated_meshnode == NULL)
return;
if (m_animated_meshnode->getStartFrame() != m_animation_range.X ||
m_animated_meshnode->getEndFrame() != m_animation_range.Y) {
f32 current_frame = m_animated_meshnode->getFrameNr();
m_animated_meshnode->setFrameLoop(m_animation_range.X, m_animation_range.Y);
// setFrameLoop method has a side effect, it resets the current frame of the animation
if (current_frame > m_animated_meshnode->getStartFrame() &&
current_frame < m_animated_meshnode->getEndFrame())
if (m_animated_meshnode->getStartFrame() == m_animation_range.X &&
m_animated_meshnode->getEndFrame() == m_animation_range.Y) {
if (m_animation_save_playback_pos) {
f32 current_frame = m_animated_meshnode->getFrameNr();
m_animated_meshnode->setFrameLoop(m_animation_range.X, m_animation_range.Y);
m_animated_meshnode->setCurrentFrame(current_frame);
} else {
m_animated_meshnode->setCurrentFrame(m_animation_range.X);
}
} else {
if (m_animation_save_playback_pos) {
f32 new_animation_pos = m_animated_meshnode->getFrameNr() - m_animated_meshnode->getStartFrame();
f32 new_animation_length = m_animation_range.Y - m_animation_range.X;
m_animated_meshnode->setFrameLoop(m_animation_range.X, m_animation_range.Y);
m_animated_meshnode->setCurrentFrame(m_animation_range.X + fmod(new_animation_pos, new_animation_length));
} else {
m_animated_meshnode->setFrameLoop(m_animation_range.X, m_animation_range.Y);
m_animated_meshnode->setCurrentFrame(m_animation_range.X);
}
}
if (m_animated_meshnode->getAnimationSpeed() != m_animation_speed)
m_animated_meshnode->setAnimationSpeed(m_animation_speed);
@ -1677,6 +1689,7 @@ void GenericCAO::processMessage(const std::string &data)
m_animation_blend = readF1000(is);
// these are sent inverted so we get true when the server sends nothing
m_animation_loop = !readU8(is);
m_animation_save_playback_pos = !readU8(is);
updateAnimation();
} else {
LocalPlayer *player = m_env->getLocalPlayer();
@ -1687,6 +1700,7 @@ void GenericCAO::processMessage(const std::string &data)
m_animation_blend = readF1000(is);
// these are sent inverted so we get true when the server sends nothing
m_animation_loop = !readU8(is);
m_animation_save_playback_pos = !readU8(is);
}
// update animation only if local animations present
// and received animation is unknown (except idle animation)

1
src/content_cao.h
View File

@ -90,6 +90,7 @@ private:
int m_animation_speed;
int m_animation_blend;
bool m_animation_loop;
bool m_animation_save_playback_pos;
std::map<std::string, core::vector2d<v3f> > m_bone_position; // stores position and rotation for each bone name
std::string m_attachment_bone;
v3f m_attachment_position;

17
src/content_sao.cpp
View File

@ -136,6 +136,7 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
m_animation_speed(0),
m_animation_blend(0),
m_animation_loop(true),
m_animation_save_playback_pos(false),
m_animation_sent(false),
m_bone_position_sent(false),
m_attachment_parent_id(0),
@ -337,7 +338,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
if(m_animation_sent == false){
m_animation_sent = true;
std::string str = gob_cmd_update_animation(
m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop);
m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop, m_animation_save_playback_pos);
// create message and add to list
ActiveObjectMessage aom(getId(), true, str);
m_messages_out.push(aom);
@ -380,7 +381,7 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
os<<serializeLongString(getPropertyPacket()); // message 1
os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
os<<serializeLongString(gob_cmd_update_animation(
m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop)); // 3
m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop, m_animation_save_playback_pos)); // 3
for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
os<<serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
}
@ -547,12 +548,14 @@ ItemGroupList LuaEntitySAO::getArmorGroups()
return m_armor_groups;
}
void LuaEntitySAO::setAnimation(v2f frame_range, float frame_speed, float frame_blend, bool frame_loop)
void LuaEntitySAO::setAnimation(v2f frame_range, float frame_speed, float frame_blend,
bool frame_loop, bool save_playback_pos)
{
m_animation_range = frame_range;
m_animation_speed = frame_speed;
m_animation_blend = frame_blend;
m_animation_loop = frame_loop;
m_animation_save_playback_pos = save_playback_pos;
m_animation_sent = false;
}
@ -859,7 +862,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
os<<serializeLongString(getPropertyPacket()); // message 1
os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
os<<serializeLongString(gob_cmd_update_animation(
m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop)); // 3
m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop, m_animation_save_playback_pos)); // 3
for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
os<<serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
}
@ -999,7 +1002,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
if(m_animation_sent == false){
m_animation_sent = true;
std::string str = gob_cmd_update_animation(
m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop);
m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop, m_animation_save_playback_pos);
// create message and add to list
ActiveObjectMessage aom(getId(), true, str);
m_messages_out.push(aom);
@ -1190,13 +1193,15 @@ ItemGroupList PlayerSAO::getArmorGroups()
return m_armor_groups;
}
void PlayerSAO::setAnimation(v2f frame_range, float frame_speed, float frame_blend, bool frame_loop)
void PlayerSAO::setAnimation(v2f frame_range, float frame_speed, float frame_blend,
bool frame_loop, bool save_playback_pos)
{
// store these so they can be updated to clients
m_animation_range = frame_range;
m_animation_speed = frame_speed;
m_animation_blend = frame_blend;
m_animation_loop = frame_loop;
m_animation_save_playback_pos = save_playback_pos;
m_animation_sent = false;
}

6
src/content_sao.h
View File

@ -59,7 +59,7 @@ public:
s16 getHP() const;
void setArmorGroups(const ItemGroupList &armor_groups);
ItemGroupList getArmorGroups();
void setAnimation(v2f frame_range, float frame_speed, float frame_blend, bool frame_loop);
void setAnimation(v2f frame_range, float frame_speed, float frame_blend, bool frame_loop, bool save_playback_pos);
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);
@ -110,6 +110,7 @@ private:
float m_animation_speed;
float m_animation_blend;
bool m_animation_loop;
bool m_animation_save_playback_pos;
bool m_animation_sent;
std::map<std::string, core::vector2d<v3f> > m_bone_position;
@ -202,7 +203,7 @@ public:
void setBreath(u16 breath);
void setArmorGroups(const ItemGroupList &armor_groups);
ItemGroupList getArmorGroups();
void setAnimation(v2f frame_range, float frame_speed, float frame_blend, bool frame_loop);
void setAnimation(v2f frame_range, float frame_speed, float frame_blend, bool frame_loop, bool save_playback_pos);
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);
@ -319,6 +320,7 @@ private:
float m_animation_speed;
float m_animation_blend;
bool m_animation_loop;
bool m_animation_save_playback_pos;
bool m_animation_sent;
std::map<std::string, core::vector2d<v3f> > m_bone_position; // Stores position and rotation for each bone name

4
src/genericobject.cpp
View File

@ -133,7 +133,8 @@ std::string gob_cmd_update_physics_override(float physics_override_speed, float
return os.str();
}
std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend, bool frame_loop)
std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend,
bool frame_loop, bool save_playback_pos)
{
std::ostringstream os(std::ios::binary);
// command
@ -144,6 +145,7 @@ std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_
writeF1000(os, frame_blend);
// these are sent inverted so we get true when the server sends nothing
writeU8(os, !frame_loop);
writeU8(os, !save_playback_pos);
return os.str();
}

3
src/genericobject.h
View File

@ -69,7 +69,8 @@ std::string gob_cmd_update_armor_groups(const ItemGroupList &armor_groups);
std::string gob_cmd_update_physics_override(float physics_override_speed,
float physics_override_jump, float physics_override_gravity, bool sneak, bool sneak_glitch);
std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend, bool frame_loop);
std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend,
bool frame_loop, bool save_playback_pos);
std::string gob_cmd_update_bone_position(std::string bone, v3f position, v3f rotation);

7
src/script/lua_api/l_object.cpp
View File

@ -457,7 +457,7 @@ int ObjectRef::l_get_physics_override(lua_State *L)
return 1;
}
// set_animation(self, frame_range, frame_speed, frame_blend, frame_loop)
// set_animation(self, frame_range, frame_speed, frame_blend, frame_loop, save_playback_pos)
int ObjectRef::l_set_animation(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
@ -477,7 +477,10 @@ int ObjectRef::l_set_animation(lua_State *L)
bool frame_loop = true;
if (lua_isboolean(L, 5))
frame_loop = lua_toboolean(L, 5);
co->setAnimation(frames, frame_speed, frame_blend, frame_loop);
bool save_playback_pos = false;
if (lua_isboolean(L, 6))
save_playback_pos = lua_toboolean(L, 6);
co->setAnimation(frames, frame_speed, frame_blend, frame_loop, save_playback_pos);
return 0;
}

2
src/script/lua_api/l_object.h
View File

@ -111,7 +111,7 @@ private:
// get_physics_override(self)
static int l_get_physics_override(lua_State *L);
// set_animation(self, frame_range, frame_speed, frame_blend, frame_loop)
// set_animation(self, frame_range, frame_speed, frame_blend, frame_loop, save_playback_pos)
static int l_set_animation(lua_State *L);
// get_animation(self)

2
src/serverobject.h
View File

@ -151,7 +151,7 @@ public:
{ return ItemGroupList(); }
virtual void setPhysicsOverride(float physics_override_speed, float physics_override_jump, float physics_override_gravity)
{}
virtual void setAnimation(v2f frames, float frame_speed, float frame_blend, bool frame_loop)
virtual void setAnimation(v2f frames, float frame_speed, float frame_blend, bool frame_loop, bool save_playback_pos)
{}
virtual void getAnimation(v2f *frames, float *frame_speed, float *frame_blend, bool *frame_loop)
{}