From 1575448b1a71dd029a8d135d2aff9096483a9953 Mon Sep 17 00:00:00 2001 From: Kahrl Date: Mon, 19 Mar 2012 04:25:09 +0100 Subject: Custom boxy nodes (stairs, slabs) and collision changes --- src/content_cao.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/content_cao.cpp') diff --git a/src/content_cao.cpp b/src/content_cao.cpp index c993f3f83..5702a73b6 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -881,22 +881,24 @@ public: box.MinEdge *= BS; box.MaxEdge *= BS; collisionMoveResult moveresult; - f32 pos_max_d = BS*0.25; // Distance per iteration + f32 pos_max_d = BS*0.125; // Distance per iteration + f32 stepheight = 0; v3f p_pos = m_position; v3f p_velocity = m_velocity; + v3f p_acceleration = m_acceleration; IGameDef *gamedef = env->getGameDef(); - moveresult = collisionMovePrecise(&env->getMap(), gamedef, - pos_max_d, box, dtime, p_pos, p_velocity); + moveresult = collisionMoveSimple(&env->getMap(), gamedef, + pos_max_d, box, stepheight, dtime, + p_pos, p_velocity, p_acceleration); // Apply results m_position = p_pos; m_velocity = p_velocity; + m_acceleration = p_acceleration; bool is_end_position = moveresult.collides; pos_translator.update(m_position, is_end_position, dtime); pos_translator.translate(dtime); updateNodePos(); - - m_velocity += dtime * m_acceleration; } else { m_position += dtime * m_velocity + 0.5 * dtime * dtime * m_acceleration; m_velocity += dtime * m_acceleration; -- cgit v1.2.3