ServerRemotePlayer implements ServerActiveObject

[oweals/minetest.git] / src / content_sao.cpp

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 3802129cbfdc75ee7156b0f83009a1c9b0c51152..0abeb0ef047e30675d235f44c72ea96d16681d51 100644 (file)
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -1506,7 +1506,12 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
        m_init_name(name),
        m_init_state(state),
        m_registered(false),
-       m_prop(new LuaEntityProperties)
+       m_prop(new LuaEntityProperties),
+       m_yaw(0),
+       m_last_sent_yaw(0),
+       m_last_sent_position(0,0,0),
+       m_last_sent_position_timer(0),
+       m_last_sent_move_precision(0)
 {
        // Only register type if no environment supplied
        if(env == NULL){
@@ -1558,10 +1563,27 @@ ServerActiveObject* LuaEntitySAO::create(ServerEnvironment *env, v3f pos,
 
 void LuaEntitySAO::step(float dtime, bool send_recommended)
 {
+       m_last_sent_position_timer += dtime;
+       
        if(m_registered){
                lua_State *L = m_env->getLua();
                scriptapi_luaentity_step(L, m_id, dtime);
        }
+
+       if(send_recommended == false)
+               return;
+       
+       float minchange = 0.2*BS;
+       if(m_last_sent_position_timer > 1.0){
+               minchange = 0.01*BS;
+       } else if(m_last_sent_position_timer > 0.2){
+               minchange = 0.05*BS;
+       }
+       float move_d = m_base_position.getDistanceFrom(m_last_sent_position);
+       move_d += m_last_sent_move_precision;
+       if(move_d > minchange || fabs(m_yaw - m_last_sent_yaw) > 1.0){
+               sendPosition(true, false);
+       }
 }
 
 std::string LuaEntitySAO::getClientInitializationData()
@@ -1571,6 +1593,8 @@ std::string LuaEntitySAO::getClientInitializationData()
        writeU8(os, 0);
        // pos
        writeV3F1000(os, m_base_position);
+       // yaw
+       writeF1000(os, m_yaw);
        // properties
        std::ostringstream prop_os(std::ios::binary);
        m_prop->serialize(prop_os);
@@ -1619,3 +1643,52 @@ void LuaEntitySAO::rightClick(Player *player)
        scriptapi_luaentity_rightclick_player(L, m_id, player->getName());
 }
 
+void LuaEntitySAO::setPos(v3f pos)
+{
+       m_base_position = pos;
+       sendPosition(false, true);
+}
+
+void LuaEntitySAO::moveTo(v3f pos, bool continuous)
+{
+       m_base_position = pos;
+       if(!continuous)
+               sendPosition(true, true);
+}
+
+float LuaEntitySAO::getMinimumSavedMovement()
+{
+       return 0.1 * BS;
+}
+
+void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
+{
+       m_last_sent_move_precision = m_base_position.getDistanceFrom(
+                       m_last_sent_position);
+       m_last_sent_position_timer = 0;
+       m_last_sent_yaw = m_yaw;
+       m_last_sent_position = m_base_position;
+
+       float update_interval = m_env->getSendRecommendedInterval();
+
+       std::ostringstream os(std::ios::binary);
+       // command (0 = update position)
+       writeU8(os, 0);
+
+       // do_interpolate
+       writeU8(os, do_interpolate);
+       // pos
+       writeV3F1000(os, m_base_position);
+       // yaw
+       writeF1000(os, m_yaw);
+       // is_end_position (for interpolation)
+       writeU8(os, is_movement_end);
+       // update_interval (for interpolation)
+       writeF1000(os, update_interval);
+
+       // create message and add to list
+       ActiveObjectMessage aom(getId(), false, os.str());
+       m_messages_out.push_back(aom);
+}
+
+