diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-21 14:36:21 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:50 +0200 |
| commit | 290e9219208fd904807bded7ccdb7109a4f92bc6 (patch) | |
| tree | 1bad6c56620e007c4177284e42386e4b0cea8b8f /src/content_sao.cpp | |
| parent | 94feb62b087d61d0c211645970a36e6752d1c732 (diff) | |
| download | minetest-290e9219208fd904807bded7ccdb7109a4f92bc6.tar.gz minetest-290e9219208fd904807bded7ccdb7109a4f92bc6.tar.bz2 minetest-290e9219208fd904807bded7ccdb7109a4f92bc6.zip | |
Relatively snappy object-ground collision detection
Diffstat (limited to 'src/content_sao.cpp')
| -rw-r--r-- | src/content_sao.cpp | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 986e3f15f..5d63b295e 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -1555,6 +1555,7 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos, 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) { @@ -1612,8 +1613,27 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) { m_last_sent_position_timer += dtime; - m_base_position += dtime * m_velocity + 0.5 * dtime * dtime * m_acceleration; - m_velocity += dtime * m_acceleration; + 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(); @@ -1623,7 +1643,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) if(send_recommended == false) return; - // TODO: force send when velocity/acceleration changes enough + // TODO: force send when acceleration changes enough? float minchange = 0.2*BS; if(m_last_sent_position_timer > 1.0){ minchange = 0.01*BS; @@ -1632,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); } } @@ -1675,6 +1697,7 @@ std::string LuaEntitySAO::getStaticData() InventoryItem* LuaEntitySAO::createPickedUpItem() { + // TODO: Ask item from scriptapi std::istringstream is("CraftItem testobject1 1", std::ios_base::binary); IGameDef *gamedef = m_env->getGameDef(); InventoryItem *item = InventoryItem::deSerialize(is, gamedef); @@ -1732,7 +1755,7 @@ 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_velocity = m_velocity; //m_last_sent_acceleration = m_acceleration; float update_interval = m_env->getSendRecommendedInterval(); |