diff --git a/include/Cubed/gameplay/player.hpp b/include/Cubed/gameplay/player.hpp index 8f6b81b..87050d8 100644 --- a/include/Cubed/gameplay/player.hpp +++ b/include/Cubed/gameplay/player.hpp @@ -12,8 +12,8 @@ class World; class Player { private: - constexpr static float ACCELERATION = 30.0f; - constexpr static float DECELERATION = 50.0f; + constexpr static float ACCELERATION = 25.0f; + constexpr static float DECELERATION = 40.0f; float m_yaw = 0.0f; float m_pitch = 0.0f; diff --git a/src/gameplay/player.cpp b/src/gameplay/player.cpp index d71a2fd..0e70a09 100644 --- a/src/gameplay/player.cpp +++ b/src/gameplay/player.cpp @@ -197,26 +197,20 @@ void Player::update(float delta_time) { } - static bool should_ceil = true; static float down_speed = 0.0f; if (!m_world.is_block(glm::floor(m_player_pos)) && !m_move_state.up) { - should_ceil = true; down_speed += 25 * delta_time; if (down_speed > 20.0f) { down_speed = 20.0f; } m_player_pos -= glm::vec3(0.0f, 1.0f, 0.0f) * down_speed * delta_time; } else { - if (should_ceil && m_world.is_block(glm::floor(glm::vec3(m_player_pos.x, m_player_pos.y, m_player_pos.z)))) { - should_ceil = false; - m_player_pos.y = std::floor(m_player_pos.y + 1.0f); - } down_speed = 0.0f; } if (m_player_pos.y < -50.0f) { - m_player_pos = glm::vec3(0.0f, 15.0f, 0.0f); + m_player_pos = glm::vec3(0.0f, 16.0f, 0.0f); }