Tooltips: Unify the tooltip[] and list[] description tooltip display functions (...

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

diff --git a/src/sky.cpp b/src/sky.cpp
index 64f8cb5e7ffee97ae45de7dd54702fbc7e2b2183..b739fe1ad0cdb955b7b16d0065aebd3af072f3af 100644 (file)
--- a/src/sky.cpp
+++ b/src/sky.cpp
@@ -85,6 +85,8 @@ Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
        }
 
        m_directional_colored_fog = g_settings->getBool("directional_colored_fog");
+
+       m_clouds_enabled = true;
 }
 
 
@@ -232,6 +234,14 @@ void Sky::render()
                        driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
                }
 
+               // Draw bottom far cloudy fog thing
+               video::SColor c = cloudyfogcolor;
+               vertices[0] = video::S3DVertex(-1, -1.0, -1, 0, 1, 0, c, t, t);
+               vertices[1] = video::S3DVertex( 1, -1.0, -1, 0, 1, 0, c, o, t);
+               vertices[2] = video::S3DVertex( 1, -1.0, 1, 0, 1, 0, c, o, o);
+               vertices[3] = video::S3DVertex(-1, -1.0, 1, 0, 1, 0, c, t, o);
+               driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
+
                driver->setMaterial(m_materials[2]);
 
                // Draw sunrise/sunset horizon glow texture (textures/base/pack/sunrisebg.png)
@@ -526,8 +536,10 @@ void Sky::update(float time_of_day, float time_brightness,
        video::SColorf skycolor_bright_dawn_f = video::SColor(255, 180, 186, 250);
        video::SColorf skycolor_bright_night_f = video::SColor(255, 0, 107, 255);
        
-       video::SColorf cloudcolor_bright_normal_f = video::SColor(255, 240, 240, 255);
-       video::SColorf cloudcolor_bright_dawn_f = video::SColor(255, 255, 223, 191);
+       // pure white: becomes "diffuse light component" for clouds
+       video::SColorf cloudcolor_bright_normal_f = video::SColor(255, 255, 255, 255);
+       // dawn-factoring version of pure white (note: R is above 1.0)
+       video::SColorf cloudcolor_bright_dawn_f(255.0f/240.0f, 223.0f/240.0f, 191.0f/255.0f);
 
        float cloud_color_change_fraction = 0.95;
        if (sunlight_seen) {
@@ -597,7 +609,7 @@ void Sky::update(float time_of_day, float time_brightness,
        );
 
        // Horizon coloring based on sun and moon direction during sunset and sunrise
-       video::SColor pointcolor = video::SColor(255, 255, 255, m_bgcolor.getAlpha());
+       video::SColor pointcolor = video::SColor(m_bgcolor.getAlpha(), 255, 255, 255);
        if (m_directional_colored_fog) {
                if (m_horizon_blend() != 0) {
                        // Calculate hemisphere value from yaw, (inverted in third person front view)