LocalPlayer::accelerateHorizontal: cleanups

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

diff --git a/src/sky.cpp b/src/sky.cpp
index 3176ea936f0d0dfedcf8cd12e58bd977d65d16c9..d92697f3041430fbbd0e30a47fd3d221f6e9ceb7 100644 (file)
--- a/src/sky.cpp
+++ b/src/sky.cpp
@@ -8,13 +8,14 @@
 #include "profiler.h"
 #include "util/numeric.h"
 #include <cmath>
+#include "client/renderingengine.h"
 #include "settings.h"
 #include "camera.h"  // CameraModes
 
 
-Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
-               ITextureSource *tsrc):
-               scene::ISceneNode(parent, mgr, id)
+Sky::Sky(s32 id, ITextureSource *tsrc):
+               scene::ISceneNode(RenderingEngine::get_scene_manager()->getRootSceneNode(),
+                       RenderingEngine::get_scene_manager(), id)
 {
        setAutomaticCulling(scene::EAC_OFF);
        m_box.MaxEdge.set(0, 0, 0);
@@ -232,6 +233,10 @@ void Sky::render()
                vertices[3] = video::S3DVertex(-1, -1.0, 1, 0, 1, 0, c, t, o);
                driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
 
+               // If sun, moon and stars are (temporarily) disabled, abort here
+               if (!m_bodies_visible)
+                       return;
+
                driver->setMaterial(m_materials[2]);
 
                // Draw sunrise/sunset horizon glow texture (textures/base/pack/sunrisebg.png)
@@ -411,8 +416,8 @@ void Sky::render()
                }
 
                // Draw stars
-               driver->setMaterial(m_materials[1]);
                do {
+                       driver->setMaterial(m_materials[1]);
                        float starbrightness = MYMAX(0, MYMIN(1,
                                (0.285 - fabs(wicked_time_of_day < 0.5 ?
                                wicked_time_of_day : (1.0 - wicked_time_of_day))) * 10));
@@ -500,6 +505,7 @@ void Sky::update(float time_of_day, float time_brightness,
        m_time_of_day = time_of_day;
        m_time_brightness = time_brightness;
        m_sunlight_seen = sunlight_seen;
+       m_bodies_visible = true;
 
        bool is_dawn = (time_brightness >= 0.20 && time_brightness < 0.35);