Fix Lint broken by b662a4577d692329b9ca83525e6039f2ddcd1ac1

[oweals/minetest.git] / src / camera.cpp

diff --git a/src/camera.cpp b/src/camera.cpp
index 4768e8778207bfd92c8de10b570395212312528b..b119bbfbbeda6a70247a0e8fa5a0d7996a55a30e 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -31,7 +31,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "event.h"
 #include "profiler.h"
 #include "util/numeric.h"
-#include "util/mathconstants.h"
 #include "constants.h"
 #include "fontengine.h"
 
@@ -103,7 +102,6 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
        m_cache_view_bobbing_amount = g_settings->getFloat("view_bobbing_amount");
        m_cache_fov                 = g_settings->getFloat("fov");
        m_cache_zoom_fov            = g_settings->getFloat("zoom_fov");
-       m_cache_view_bobbing        = g_settings->getBool("view_bobbing");
        m_nametags.clear();
 }
 
@@ -281,8 +279,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
        v3f rel_cam_target = v3f(0,0,1);
        v3f rel_cam_up = v3f(0,1,0);
 
-       if (m_view_bobbing_anim != 0 && m_camera_mode < CAMERA_MODE_THIRD)
-       {
+       if (m_cache_view_bobbing_amount != 0.0f && m_view_bobbing_anim != 0.0f &&
+               m_camera_mode < CAMERA_MODE_THIRD) {
                f32 bobfrac = my_modf(m_view_bobbing_anim * 2);
                f32 bobdir = (m_view_bobbing_anim < 0.5) ? 1.0 : -1.0;
 
@@ -394,8 +392,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
        } else {
                fov_degrees = m_cache_fov;
        }
-       fov_degrees = MYMAX(fov_degrees, 10.0);
-       fov_degrees = MYMIN(fov_degrees, 170.0);
+       fov_degrees = rangelim(fov_degrees, 7.0, 160.0);
 
        // FOV and aspect ratio
        m_aspect = (f32) porting::getWindowSize().X / (f32) porting::getWindowSize().Y;
@@ -406,9 +403,12 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
        m_cameranode->setAspectRatio(m_aspect);
        m_cameranode->setFOV(m_fov_y);
 
+       float wieldmesh_offset_Y = -35 + player->getPitch() * 0.05;
+       wieldmesh_offset_Y = rangelim(wieldmesh_offset_Y, -52, -32);
+
        // Position the wielded item
        //v3f wield_position = v3f(45, -35, 65);
-       v3f wield_position = v3f(55, -35, 65);
+       v3f wield_position = v3f(55, wieldmesh_offset_Y, 65);
        //v3f wield_rotation = v3f(-100, 120, -100);
        v3f wield_rotation = v3f(-100, 120, -100);
        wield_position.Y += fabs(m_wield_change_timer)*320 - 40;
@@ -466,9 +466,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
        const bool swimming = (movement_XZ || player->swimming_vertical) && player->in_liquid;
        const bool climbing = movement_Y && player->is_climbing;
        if ((walking || swimming || climbing) &&
-                       m_cache_view_bobbing &&
-                       (!g_settings->getBool("free_move") || !m_client->checkLocalPrivilege("fly")))
-       {
+                       (!g_settings->getBool("free_move") || !m_client->checkLocalPrivilege("fly"))) {
                // Start animation
                m_view_bobbing_state = 1;
                m_view_bobbing_speed = MYMIN(speed.getLength(), 70);
@@ -500,7 +498,8 @@ void Camera::setDigging(s32 button)
 
 void Camera::wield(const ItemStack &item)
 {
-       if (item.name != m_wield_item_next.name) {
+       if (item.name != m_wield_item_next.name ||
+                       item.metadata != m_wield_item_next.metadata) {
                m_wield_item_next = item;
                if (m_wield_change_timer > 0)
                        m_wield_change_timer = -m_wield_change_timer;