Random Lua tweaks/fixes

[minetest.git] / src / content_sao.cpp

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 1096ac116ecbc410a5d3bf5e5c7f709f932ac0ac..5d63b295e8b82dbe729efa7449de63b6ef3324cf 100644 (file)
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -21,7 +21,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "collision.h"
 #include "environment.h"
 #include "settings.h"
+#include "main.h" // For g_profiler
 #include "profiler.h"
+#include "serialization.h" // For compressZlib
 
 core::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;
 
@@ -158,8 +160,9 @@ void ItemSAO::step(float dtime, bool send_recommended)
                m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);
        v3f pos_f = getBasePosition();
        v3f pos_f_old = pos_f;
-       moveresult = collisionMoveSimple(&m_env->getMap(), pos_max_d,
-                       box, dtime, pos_f, m_speed_f);
+       IGameDef *gamedef = m_env->getGameDef();
+       moveresult = collisionMoveSimple(&m_env->getMap(), gamedef,
+                       pos_max_d, box, dtime, pos_f, m_speed_f);
        
        if(send_recommended == false)
                return;
@@ -223,7 +226,8 @@ InventoryItem * ItemSAO::createInventoryItem()
 {
        try{
                std::istringstream is(m_inventorystring, std::ios_base::binary);
-               InventoryItem *item = InventoryItem::deSerialize(is);
+               IGameDef *gamedef = m_env->getGameDef();
+               InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
                infostream<<__FUNCTION_NAME<<": m_inventorystring=\""
                                <<m_inventorystring<<"\" -> item="<<item
                                <<std::endl;
@@ -400,8 +404,9 @@ void RatSAO::step(float dtime, bool send_recommended)
                m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);
        v3f pos_f = getBasePosition();
        v3f pos_f_old = pos_f;
-       moveresult = collisionMoveSimple(&m_env->getMap(), pos_max_d,
-                       box, dtime, pos_f, m_speed_f);
+       IGameDef *gamedef = m_env->getGameDef();
+       moveresult = collisionMoveSimple(&m_env->getMap(), gamedef,
+                       pos_max_d, box, dtime, pos_f, m_speed_f);
        m_touching_ground = moveresult.touching_ground;
        
        setBasePosition(pos_f);
@@ -448,7 +453,8 @@ std::string RatSAO::getStaticData()
 void RatSAO::punch(ServerActiveObject *puncher)
 {
        std::istringstream is("CraftItem rat 1", std::ios_base::binary);
-       InventoryItem *item = InventoryItem::deSerialize(is);
+       IGameDef *gamedef = m_env->getGameDef();
+       InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
        bool fits = puncher->addToInventory(item);
        if(fits)
                m_removed = true;
@@ -636,8 +642,9 @@ void Oerkki1SAO::step(float dtime, bool send_recommended)
                m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);*/
        v3f pos_f = getBasePosition();
        v3f pos_f_old = pos_f;
-       moveresult = collisionMovePrecise(&m_env->getMap(), pos_max_d,
-                       box, dtime, pos_f, m_speed_f);
+       IGameDef *gamedef = m_env->getGameDef();
+       moveresult = collisionMovePrecise(&m_env->getMap(), gamedef,
+                       pos_max_d, box, dtime, pos_f, m_speed_f);
        m_touching_ground = moveresult.touching_ground;
        
        // Do collision damage
@@ -884,8 +891,9 @@ void FireflySAO::step(float dtime, bool send_recommended)
                m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);
        v3f pos_f = getBasePosition();
        v3f pos_f_old = pos_f;
-       moveresult = collisionMoveSimple(&m_env->getMap(), pos_max_d,
-                       box, dtime, pos_f, m_speed_f);
+       IGameDef *gamedef = m_env->getGameDef();
+       moveresult = collisionMoveSimple(&m_env->getMap(), gamedef,
+                       pos_max_d, box, dtime, pos_f, m_speed_f);
        m_touching_ground = moveresult.touching_ground;
        
        setBasePosition(pos_f);
@@ -932,7 +940,8 @@ std::string FireflySAO::getStaticData()
 InventoryItem* FireflySAO::createPickedUpItem()
 {
        std::istringstream is("CraftItem firefly 1", std::ios_base::binary);
-       InventoryItem *item = InventoryItem::deSerialize(is);
+       IGameDef *gamedef = m_env->getGameDef();
+       InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
        return item;
 }
 
@@ -1541,9 +1550,12 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
        m_init_state(state),
        m_registered(false),
        m_prop(new LuaEntityProperties),
+       m_velocity(0,0,0),
+       m_acceleration(0,0,0),
        m_yaw(0),
        m_last_sent_yaw(0),
        m_last_sent_position(0,0,0),
+       m_last_sent_velocity(0,0,0),
        m_last_sent_position_timer(0),
        m_last_sent_move_precision(0)
 {
@@ -1563,13 +1575,14 @@ LuaEntitySAO::~LuaEntitySAO()
        delete m_prop;
 }
 
-void LuaEntitySAO::addedToEnvironment(u16 id)
+void LuaEntitySAO::addedToEnvironment()
 {
-       ServerActiveObject::addedToEnvironment(id);
+       ServerActiveObject::addedToEnvironment();
        
        // Create entity from name and state
        lua_State *L = m_env->getLua();
-       m_registered = scriptapi_luaentity_add(L, id, m_init_name.c_str(), m_init_state.c_str());
+       m_registered = scriptapi_luaentity_add(L, m_id, m_init_name.c_str(),
+                       m_init_state.c_str());
        
        if(m_registered){
                // Get properties
@@ -1600,6 +1613,28 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 {
        m_last_sent_position_timer += dtime;
        
+       if(m_prop->physical){
+               core::aabbox3d<f32> box = m_prop->collisionbox;
+               box.MinEdge *= BS;
+               box.MaxEdge *= BS;
+               collisionMoveResult moveresult;
+               f32 pos_max_d = BS*0.25; // Distance per iteration
+               v3f p_pos = getBasePosition();
+               v3f p_velocity = m_velocity;
+               IGameDef *gamedef = m_env->getGameDef();
+               moveresult = collisionMovePrecise(&m_env->getMap(), gamedef,
+                               pos_max_d, box, dtime, p_pos, p_velocity);
+               // Apply results
+               setBasePosition(p_pos);
+               m_velocity = p_velocity;
+
+               m_velocity += dtime * m_acceleration;
+       } else {
+               m_base_position += dtime * m_velocity + 0.5 * dtime
+                               * dtime * m_acceleration;
+               m_velocity += dtime * m_acceleration;
+       }
+
        if(m_registered){
                lua_State *L = m_env->getLua();
                scriptapi_luaentity_step(L, m_id, dtime);
@@ -1608,6 +1643,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
        if(send_recommended == false)
                return;
        
+       // TODO: force send when acceleration changes enough?
        float minchange = 0.2*BS;
        if(m_last_sent_position_timer > 1.0){
                minchange = 0.01*BS;
@@ -1616,7 +1652,9 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
        }
        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){
+       float vel_d = m_velocity.getDistanceFrom(m_last_sent_velocity);
+       if(move_d > minchange || vel_d > minchange ||
+                       fabs(m_yaw - m_last_sent_yaw) > 1.0){
                sendPosition(true, false);
        }
 }
@@ -1649,7 +1687,7 @@ std::string LuaEntitySAO::getStaticData()
        // state
        if(m_registered){
                lua_State *L = m_env->getLua();
-               std::string state = scriptapi_luaentity_get_state(L, m_id);
+               std::string state = scriptapi_luaentity_get_staticdata(L, m_id);
                os<<serializeLongString(state);
        } else {
                os<<serializeLongString(m_init_state);
@@ -1659,8 +1697,10 @@ std::string LuaEntitySAO::getStaticData()
 
 InventoryItem* LuaEntitySAO::createPickedUpItem()
 {
+       // TODO: Ask item from scriptapi
        std::istringstream is("CraftItem testobject1 1", std::ios_base::binary);
-       InventoryItem *item = InventoryItem::deSerialize(is);
+       IGameDef *gamedef = m_env->getGameDef();
+       InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
        return item;
 }
 
@@ -1698,6 +1738,16 @@ float LuaEntitySAO::getMinimumSavedMovement()
        return 0.1 * BS;
 }
 
+void LuaEntitySAO::setVelocity(v3f velocity)
+{
+       m_velocity = velocity;
+}
+
+void LuaEntitySAO::setAcceleration(v3f acceleration)
+{
+       m_acceleration = acceleration;
+}
+
 void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
 {
        m_last_sent_move_precision = m_base_position.getDistanceFrom(
@@ -1705,6 +1755,8 @@ void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
        m_last_sent_position_timer = 0;
        m_last_sent_yaw = m_yaw;
        m_last_sent_position = m_base_position;
+       m_last_sent_velocity = m_velocity;
+       //m_last_sent_acceleration = m_acceleration;
 
        float update_interval = m_env->getSendRecommendedInterval();
 
@@ -1716,6 +1768,10 @@ void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
        writeU8(os, do_interpolate);
        // pos
        writeV3F1000(os, m_base_position);
+       // velocity
+       writeV3F1000(os, m_velocity);
+       // acceleration
+       writeV3F1000(os, m_acceleration);
        // yaw
        writeF1000(os, m_yaw);
        // is_end_position (for interpolation)