ServerRemotePlayer implements ServerActiveObject

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

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index d51e92a8c50738bafb9e6a83a8325df8f39c50e1..0abeb0ef047e30675d235f44c72ea96d16681d51 100644 (file)
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -1495,6 +1495,7 @@ void MobV2SAO::doDamage(u16 d)
 */
 
 #include "scriptapi.h"
+#include "luaentity_common.h"
 
 // Prototype
 LuaEntitySAO proto_LuaEntitySAO(NULL, v3f(0,0,0), "_prototype", "");
@@ -1504,8 +1505,15 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
        ServerActiveObject(env, pos),
        m_init_name(name),
        m_init_state(state),
-       m_registered(false)
+       m_registered(false),
+       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){
                ServerActiveObject::registerType(getType(), create);
                return;
@@ -1516,18 +1524,22 @@ LuaEntitySAO::~LuaEntitySAO()
 {
        if(m_registered){
                lua_State *L = m_env->getLua();
-               scriptapi_luaentity_deregister(L, m_id);
+               scriptapi_luaentity_rm(L, m_id);
        }
+       delete m_prop;
 }
 
 void LuaEntitySAO::addedToEnvironment(u16 id)
 {
        ServerActiveObject::addedToEnvironment(id);
        
-       // Create entity by name and state
+       // Create entity from name and state
        m_registered = true;
        lua_State *L = m_env->getLua();
-       scriptapi_luaentity_register(L, id, m_init_name.c_str(), m_init_state.c_str());
+       scriptapi_luaentity_add(L, id, m_init_name.c_str(), m_init_state.c_str());
+       
+       // Get properties
+       scriptapi_luaentity_get_properties(L, m_id, m_prop);
 }
 
 ServerActiveObject* LuaEntitySAO::create(ServerEnvironment *env, v3f pos,
@@ -1551,9 +1563,26 @@ 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, send_recommended);
+               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);
        }
 }
 
@@ -1564,6 +1593,13 @@ 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);
+       os<<serializeLongString(prop_os.str());
+       // return result
        return os.str();
 }
 
@@ -1576,9 +1612,83 @@ std::string LuaEntitySAO::getStaticData()
        // name
        os<<serializeString(m_init_name);
        // state
-       std::string state = scriptapi_luaentity_get_state(L, m_id);
-       os<<serializeString(state);
+       if(m_registered){
+               lua_State *L = m_env->getLua();
+               std::string state = scriptapi_luaentity_get_state(L, m_id);
+               os<<serializeLongString(state);
+       } else {
+               os<<serializeLongString(m_init_state);
+       }
        return os.str();
 }
 
+InventoryItem* LuaEntitySAO::createPickedUpItem()
+{
+       std::istringstream is("CraftItem testobject1 1", std::ios_base::binary);
+       InventoryItem *item = InventoryItem::deSerialize(is);
+       return item;
+}
+
+u16 LuaEntitySAO::punch(const std::string &toolname, v3f dir,
+               const std::string &playername)
+{
+       return 0;
+}
+
+void LuaEntitySAO::rightClick(Player *player)
+{
+       if(!m_registered)
+               return;
+       lua_State *L = m_env->getLua();
+       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);
+}
+