Fix water-glass and water-lava surfaces

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

diff --git a/src/camera.cpp b/src/camera.cpp
index 6fc7c16cd81a09513082dbd63db0ce56ca801a2a..a32336714fdadcd4a53db4b55d7a5ae79b4bbf5b 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -221,6 +221,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
                //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;
@@ -341,7 +342,7 @@ void Camera::updateViewingRange(f32 frametime_in)
                        <<std::endl;*/
 
        m_draw_control.wanted_min_range = m_viewing_range_min;
-       m_draw_control.wanted_max_blocks = (1.5*m_draw_control.blocks_would_have_drawn)+1;
+       m_draw_control.wanted_max_blocks = (2.0*m_draw_control.blocks_would_have_drawn)+1;
        if (m_draw_control.wanted_max_blocks < 10)
                m_draw_control.wanted_max_blocks = 10;
 
@@ -363,7 +364,9 @@ void Camera::updateViewingRange(f32 frametime_in)
        //dstream<<"wanted_frametime_change="<<wanted_frametime_change<<std::endl;
 
        // If needed frametime change is small, just return
-       if (fabs(wanted_frametime_change) < m_wanted_frametime*0.4)
+       // This value was 0.4 for many months until 2011-10-18 by c55;
+       // Let's see how this works out.
+       if (fabs(wanted_frametime_change) < m_wanted_frametime*0.33)
        {
                //dstream<<"ignoring small wanted_frametime_change"<<std::endl;
                return;