Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix undefined behaviour in arm movement when dividing by zero

master
Loic Blot 2017-06-26 23:19:47 +02:00
parent b3a36f7378
commit 53a6b5439e
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/camera.cpp
View File

@ -197,8 +197,15 @@ void Camera::step(f32 dtime)
void Camera::addArmInertia(f32 player_yaw, f32 frametime) void Camera::addArmInertia(f32 player_yaw, f32 frametime)
{ {
m_cam_vel.X = std::fabs((m_last_cam_pos.X - player_yaw) / m_timer.X) * 0.01f; if (m_timer.X == 0.0f)
m_cam_vel.Y = std::fabs((m_last_cam_pos.Y - m_camera_direction.Y) / m_timer.Y); m_cam_vel.X = std::fabs((m_last_cam_pos.X - player_yaw)) * 0.01f;
else
m_cam_vel.X = std::fabs((m_last_cam_pos.X - player_yaw) / m_timer.X) * 0.01f;
if (m_timer.Y == 0.0f)
m_cam_vel.Y = std::fabs(m_last_cam_pos.Y - m_camera_direction.Y);
else
m_cam_vel.Y = std::fabs((m_last_cam_pos.Y - m_camera_direction.Y) / m_timer.Y);
if (m_cam_vel.X > 1.0f || m_cam_vel.Y > 1.0f) { if (m_cam_vel.X > 1.0f || m_cam_vel.Y > 1.0f) {
/* /*
@ -206,8 +213,7 @@ void Camera::addArmInertia(f32 player_yaw, f32 frametime)
*/ */
if (m_cam_vel.X > 1.0f) { if (m_cam_vel.X > 1.0f) {
m_timer.X = 0.0f; m_timer.X = frametime;
m_timer.X += frametime;
if (m_cam_vel.X > m_cam_vel_old.X) if (m_cam_vel.X > m_cam_vel_old.X)
m_cam_vel_old.X = m_cam_vel.X; m_cam_vel_old.X = m_cam_vel.X;
@ -226,8 +232,7 @@ void Camera::addArmInertia(f32 player_yaw, f32 frametime)
} }
if (m_cam_vel.Y > 1.0f) { if (m_cam_vel.Y > 1.0f) {
m_timer.Y = 0.0f; m_timer.Y = frametime;
m_timer.Y += frametime;
if (m_cam_vel.Y > m_cam_vel_old.Y) if (m_cam_vel.Y > m_cam_vel_old.Y)
m_cam_vel_old.Y = m_cam_vel.Y; m_cam_vel_old.Y = m_cam_vel.Y;