Fix some "Conditional jump or move depends on uninitialised value(s)" valgrind detections

[minetest.git] / src / camera.cpp

diff --git a/src/camera.cpp b/src/camera.cpp
index a615321438ed0019a9d05212df2e6c48e895b2d3..634a7cc9f7f63eb5ab3023e454a11a9ca1e071ba 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -25,6 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "player.h"
 #include "tile.h"
 #include <cmath>
+#include <SAnimatedMesh.h>
+#include "settings.h"
 
 Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control):
        m_smgr(smgr),
@@ -126,9 +128,11 @@ void Camera::step(f32 dtime)
 {
        if (m_view_bobbing_state != 0)
        {
-               f32 offset = dtime * m_view_bobbing_speed * 0.035;
+               //f32 offset = dtime * m_view_bobbing_speed * 0.035;
+               f32 offset = dtime * m_view_bobbing_speed * 0.030;
                if (m_view_bobbing_state == 2)
                {
+#if 0
                        // Animation is getting turned off
                        if (m_view_bobbing_anim < 0.5)
                                m_view_bobbing_anim -= offset;
@@ -139,6 +143,29 @@ void Camera::step(f32 dtime)
                                m_view_bobbing_anim = 0;
                                m_view_bobbing_state = 0;
                        }
+#endif
+#if 1
+                       // Animation is getting turned off
+                       if(m_view_bobbing_anim < 0.25){
+                               m_view_bobbing_anim -= offset;
+                       } else if(m_view_bobbing_anim > 0.75){
+                               m_view_bobbing_anim += offset;
+                       } if(m_view_bobbing_anim < 0.5){
+                               m_view_bobbing_anim += offset;
+                               if(m_view_bobbing_anim > 0.5)
+                                       m_view_bobbing_anim = 0.5;
+                       } else {
+                               m_view_bobbing_anim -= offset;
+                               if(m_view_bobbing_anim < 0.5)
+                                       m_view_bobbing_anim = 0.5;
+                       }
+                       if(m_view_bobbing_anim <= 0 || m_view_bobbing_anim >= 1 ||
+                                       fabs(m_view_bobbing_anim - 0.5) < 0.01)
+                       {
+                               m_view_bobbing_anim = 0;
+                               m_view_bobbing_state = 0;
+                       }
+#endif
                }
                else
                {
@@ -183,15 +210,25 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
                #if 1
                f32 bobknob = 1.2;
                f32 bobtmp = sin(pow(bobfrac, bobknob) * PI);
+               //f32 bobtmp2 = cos(pow(bobfrac, bobknob) * PI);
 
                v3f bobvec = v3f(
-                       bobdir * sin(bobfrac * PI),
-                       0.8 * bobtmp * bobtmp,
+                       0.3 * bobdir * sin(bobfrac * PI),
+                       -0.28 * bobtmp * bobtmp,
                        0.);
 
-               rel_cam_pos += 0.02 * bobvec;
-               rel_cam_target += 0.03 * bobvec;
-               rel_cam_up.rotateXYBy(0.02 * bobdir * bobtmp * PI);
+               //rel_cam_pos += 0.2 * bobvec;
+               //rel_cam_target += 0.03 * bobvec;
+               //rel_cam_up.rotateXYBy(0.02 * bobdir * bobtmp * PI);
+               float f = 1.0;
+               f *= g_settings->getFloat("view_bobbing_amount");
+               rel_cam_pos += bobvec * f;
+               //rel_cam_target += 0.995 * bobvec * f;
+               rel_cam_target += bobvec * f;
+               rel_cam_target.Z -= 0.005 * bobvec.Z * f;
+               //rel_cam_target.X -= 0.005 * bobvec.X * f;
+               //rel_cam_target.Y -= 0.005 * bobvec.Y * f;
+               rel_cam_up.rotateXYBy(-0.03 * bobdir * bobtmp * PI * f);
                #else
                f32 angle_deg = 1 * bobdir * sin(bobfrac * PI);
                f32 angle_rad = angle_deg * PI / 180;
@@ -231,7 +268,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
 
        // Position the wielded item
        v3f wield_position = v3f(45, -35, 65);
-       v3f wield_rotation = v3f(90, -90, -90);
+       v3f wield_rotation = v3f(-100, 110, -100);
        if (m_digging_button != -1)
        {
                f32 digfrac = m_digging_anim;
@@ -241,12 +278,17 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
 
                // Euler angles are PURE EVIL, so why not use quaternions?
                core::quaternion quat_begin(wield_rotation * core::DEGTORAD);
-               core::quaternion quat_end(v3f(90, 20, -130) * core::DEGTORAD);
+               core::quaternion quat_end(v3f(90, -10, -130) * core::DEGTORAD);
                core::quaternion quat_slerp;
                quat_slerp.slerp(quat_begin, quat_end, sin(digfrac * PI));
                quat_slerp.toEuler(wield_rotation);
                wield_rotation *= core::RADTODEG;
        }
+       else {
+               f32 bobfrac = my_modf(m_view_bobbing_anim);
+               wield_position.X -= sin(bobfrac*PI*2.0) * 3.0;
+               wield_position.Y += sin(my_modf(bobfrac*2.0)*PI) * 3.0;
+       }
        m_wieldnode->setPosition(wield_position);
        m_wieldnode->setRotation(wield_rotation);
        m_wieldnode->updateLight(player->light);
@@ -260,8 +302,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
        v3f speed = player->getSpeed();
        if ((hypot(speed.X, speed.Z) > BS) &&
                (player->touching_ground) &&
-               (g_settings.getBool("view_bobbing") == true) &&
-               (g_settings.getBool("free_move") == false))
+               (g_settings->getBool("view_bobbing") == true) &&
+               (g_settings->getBool("free_move") == false))
        {
                // Start animation
                m_view_bobbing_state = 1;
@@ -388,18 +430,18 @@ void Camera::updateViewingRange(f32 frametime_in)
 
 void Camera::updateSettings()
 {
-       m_viewing_range_min = g_settings.getS16("viewing_range_nodes_min");
+       m_viewing_range_min = g_settings->getS16("viewing_range_nodes_min");
        m_viewing_range_min = MYMAX(5.0, m_viewing_range_min);
 
-       m_viewing_range_max = g_settings.getS16("viewing_range_nodes_max");
+       m_viewing_range_max = g_settings->getS16("viewing_range_nodes_max");
        m_viewing_range_max = MYMAX(m_viewing_range_min, m_viewing_range_max);
 
-       f32 fov_degrees = g_settings.getFloat("fov");
+       f32 fov_degrees = g_settings->getFloat("fov");
        fov_degrees = MYMAX(fov_degrees, 10.0);
        fov_degrees = MYMIN(fov_degrees, 170.0);
        m_fov_y = fov_degrees * PI / 180.0;
 
-       f32 wanted_fps = g_settings.getFloat("wanted_fps");
+       f32 wanted_fps = g_settings->getFloat("wanted_fps");
        wanted_fps = MYMAX(wanted_fps, 1.0);
        m_wanted_frametime = 1.0 / wanted_fps;
 }
@@ -557,6 +599,8 @@ void ExtrudedSpriteSceneNode::updateLight(u8 light)
        m_light = light;
 
        u8 li = decode_light(light);
+       // Set brightness one lower than incoming light
+       diminish_light(li);
        video::SColor color(255,li,li,li);
        setMeshVerticesColor(m_meshnode->getMesh(), color);
 }