ServerRemotePlayer implements ServerActiveObject

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

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 6cc0106b6d13580184d775c59f8c55943502e5e2..0abeb0ef047e30675d235f44c72ea96d16681d51 100644 (file)
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -1509,7 +1509,9 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
        m_prop(new LuaEntityProperties),
        m_yaw(0),
        m_last_sent_yaw(0),
-       m_last_sent_position(0,0,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){
@@ -1561,6 +1563,8 @@ 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);
@@ -1568,9 +1572,17 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 
        if(send_recommended == false)
                return;
-       if(m_base_position.getDistanceFrom(m_last_sent_position) > 0.05*BS
-                       || fabs(m_yaw - m_last_sent_yaw) > 1.0){
-               sendPosition(true);
+       
+       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);
        }
 }
 
@@ -1634,28 +1646,46 @@ void LuaEntitySAO::rightClick(Player *player)
 void LuaEntitySAO::setPos(v3f pos)
 {
        m_base_position = pos;
-       sendPosition(false);
+       sendPosition(false, true);
 }
 
-void LuaEntitySAO::moveTo(v3f pos)
+void LuaEntitySAO::moveTo(v3f pos, bool continuous)
 {
        m_base_position = pos;
+       if(!continuous)
+               sendPosition(true, true);
 }
 
-void LuaEntitySAO::sendPosition(bool do_interpolate)
+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);