diff options
| -rw-r--r-- | doc/lua_api.txt | 2 | ||||
| -rw-r--r-- | src/client/content_cao.cpp | 13 | ||||
| -rw-r--r-- | src/content_sao.cpp | 12 |
3 files changed, 13 insertions, 14 deletions
diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 870daba02..c7035bb72 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -5680,7 +5680,7 @@ Used by `ObjectRef` methods. Part of an Entity definition. automatic_face_movement_max_rotation_per_sec = -1, -- Limit automatic rotation to this value in degrees per second. - -- No limit if value < 0. + -- No limit if value <= 0. backface_culling = true, -- Set to false to disable backface_culling for model diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp index 22f62e6c3..b169ba75f 100644 --- a/src/client/content_cao.cpp +++ b/src/client/content_cao.cpp @@ -997,21 +997,20 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) if (!getParent() && m_prop.automatic_face_movement_dir && (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)) { - float target_yaw = atan2(m_velocity.Z, m_velocity.X) * 180 / M_PI + m_prop.automatic_face_movement_dir_offset; float max_rotation_per_sec = m_prop.automatic_face_movement_max_rotation_per_sec; - if (max_rotation_per_sec > 0) { - float max_rotation_delta = dtime * max_rotation_per_sec; - wrappedApproachShortest(m_rotation.Y, target_yaw, max_rotation_delta, 360.f); - } else - // Negative values of ...max_rotation_per_sec mean disabled. + if (max_rotation_per_sec > 0) { + wrappedApproachShortest(m_rotation.Y, target_yaw, + dtime * max_rotation_per_sec, 360.f); + } else { + // Negative values of max_rotation_per_sec mean disabled. m_rotation.Y = target_yaw; + } rot_translator.val_current = m_rotation; - updateNodePos(); } } diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 1fd890044..f0d7fbf5d 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -454,19 +454,19 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) if (m_prop.automatic_face_movement_dir && (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)) { - float target_yaw = atan2(m_velocity.Z, m_velocity.X) * 180 / M_PI + m_prop.automatic_face_movement_dir_offset; - float max_rotation_per_sec = m_prop.automatic_face_movement_max_rotation_per_sec; + if (max_rotation_per_sec > 0) { - float max_rotation_delta = dtime * max_rotation_per_sec; m_rotation.Y = wrapDegrees_0_360(m_rotation.Y); - wrappedApproachShortest(m_rotation.Y, target_yaw, max_rotation_delta, 360.f); - } else - // Negative values of ...max_rotation_per_sec mean disabled. + wrappedApproachShortest(m_rotation.Y, target_yaw, + dtime * max_rotation_per_sec, 360.f); + } else { + // Negative values of max_rotation_per_sec mean disabled. m_rotation.Y = target_yaw; + } } } |