]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/sky.cpp
Add core.request_insecure_environment()
[dragonfireclient.git] / src / sky.cpp
index ba9b174932d76c0fd0d2fa2873001e7968fad300..01fb8ef860ed140e5d434d59139727c8ddbd71d8 100644 (file)
@@ -3,15 +3,20 @@
 #include "ISceneManager.h"
 #include "ICameraSceneNode.h"
 #include "S3DVertex.h"
-#include "utility.h" // MYMIN
-#include "tile.h" // getTexturePath
-#include "noise.h" // easeCurve
-#include "main.h" // g_profiler
+#include "client/tile.h"
+#include "noise.h"            // easeCurve
 #include "profiler.h"
+#include "util/numeric.h"
+#include <cmath>
+#include "settings.h"
+#include "camera.h"           // CameraModes
 
 //! constructor
-Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id):
+Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
+               ITextureSource *tsrc):
                scene::ISceneNode(parent, mgr, id),
+               m_visible(true),
+               m_fallback_bg_color(255,255,255,255),
                m_first_update(true),
                m_brightness(0.5),
                m_cloud_brightness(0.5),
@@ -41,11 +46,34 @@ Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id):
        m_materials[1].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
 
        m_materials[2] = mat;
-       m_materials[2].setTexture(0, mgr->getVideoDriver()->getTexture(
-                       getTexturePath("sunrisebg.png").c_str()));
+       m_materials[2].setTexture(0, tsrc->getTextureForMesh("sunrisebg.png"));
        m_materials[2].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
        //m_materials[2].MaterialType = video::EMT_TRANSPARENT_ADD_COLOR;
 
+       m_sun_texture = tsrc->isKnownSourceImage("sun.png") ?
+               tsrc->getTextureForMesh("sun.png") : NULL;
+       m_moon_texture = tsrc->isKnownSourceImage("moon.png") ?
+               tsrc->getTextureForMesh("moon.png") : NULL;
+       m_sun_tonemap = tsrc->isKnownSourceImage("sun_tonemap.png") ?
+               tsrc->getTexture("sun_tonemap.png") : NULL;
+       m_moon_tonemap = tsrc->isKnownSourceImage("moon_tonemap.png") ?
+               tsrc->getTexture("moon_tonemap.png") : NULL;
+
+       if (m_sun_texture){
+               m_materials[3] = mat;
+               m_materials[3].setTexture(0, m_sun_texture);
+               m_materials[3].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+               if (m_sun_tonemap)
+                       m_materials[3].Lighting = true;
+       }
+       if (m_moon_texture){
+               m_materials[4] = mat;
+               m_materials[4].setTexture(0, m_moon_texture);
+               m_materials[4].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+               if (m_moon_tonemap)
+                       m_materials[4].Lighting = true;
+       }
+
        for(u32 i=0; i<SKY_STAR_COUNT; i++){
                m_stars[i] = v3f(
                        myrand_range(-10000,10000),
@@ -54,6 +82,8 @@ Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id):
                );
                m_stars[i].normalize();
        }
+
+       m_directional_colored_fog = g_settings->getBool("directional_colored_fog");
 }
 
 void Sky::OnRegisterSceneNode()
@@ -72,6 +102,9 @@ const core::aabbox3d<f32>& Sky::getBoundingBox() const
 //! renders the node.
 void Sky::render()
 {
+       if(!m_visible)
+               return;
+
        video::IVideoDriver* driver = SceneManager->getVideoDriver();
        scene::ICameraSceneNode* camera = SceneManager->getActiveCamera();
 
@@ -91,7 +124,7 @@ void Sky::render()
        scale.setScale(core::vector3df(viewDistance, viewDistance, viewDistance));
 
        driver->setTransform(video::ETS_WORLD, translate * scale);
-       
+
        if(m_sunlight_seen)
        {
                float sunsize = 0.07;
@@ -108,7 +141,7 @@ void Sky::render()
                video::SColorf mooncolor_f(0.50, 0.57, 0.65, 1);
                video::SColorf mooncolor2_f(0.85, 0.875, 0.9, 1);
                
-               float nightlength = 0.41;
+               float nightlength = 0.415;
                float wn = nightlength / 2;
                float wicked_time_of_day = 0;
                if(m_time_of_day > wn && m_time_of_day < 1.0 - wn)
@@ -125,12 +158,85 @@ void Sky::render()
                video::SColor mooncolor = mooncolor_f.toSColor();
                video::SColor mooncolor2 = mooncolor2_f.toSColor();
 
+               // Calculate offset normalized to the X dimension of a 512x1 px tonemap
+               float offset=(1.0-fabs(sin((m_time_of_day - 0.5)*irr::core::PI)))*511;
+
+               if (m_sun_tonemap){
+                       u8 * texels = (u8 *)m_sun_tonemap->lock();
+                       video::SColor* texel = (video::SColor *)(texels + (u32)offset * 4);
+                       video::SColor texel_color (255,texel->getRed(),texel->getGreen(), texel->getBlue());
+                       m_sun_tonemap->unlock();
+                       m_materials[3].EmissiveColor = texel_color;
+               }
+               if (m_moon_tonemap){
+                       u8 * texels = (u8 *)m_moon_tonemap->lock();
+                       video::SColor* texel = (video::SColor *)(texels + (u32)offset * 4);
+                       video::SColor texel_color (255,texel->getRed(),texel->getGreen(), texel->getBlue());
+                       m_moon_tonemap->unlock();
+                       m_materials[4].EmissiveColor = texel_color;
+               }
+
                const f32 t = 1.0f;
                const f32 o = 0.0f;
                static const u16 indices[4] = {0,1,2,3};
                video::S3DVertex vertices[4];
+               
+               driver->setMaterial(m_materials[1]);
+               
+               //video::SColor cloudyfogcolor(255,255,255,255);
+               video::SColor cloudyfogcolor = m_bgcolor;
+               //video::SColor cloudyfogcolor = m_bgcolor.getInterpolated(m_skycolor, 0.5);
+               
+               // Draw far cloudy fog thing
+               for(u32 j=0; j<4; j++)
+               {
+                       video::SColor c = cloudyfogcolor.getInterpolated(m_skycolor, 0.45);
+                       vertices[0] = video::S3DVertex(-1, 0.08,-1, 0,0,1, c, t, t);
+                       vertices[1] = video::S3DVertex( 1, 0.08,-1, 0,0,1, c, o, t);
+                       vertices[2] = video::S3DVertex( 1, 0.12,-1, 0,0,1, c, o, o);
+                       vertices[3] = video::S3DVertex(-1, 0.12,-1, 0,0,1, c, t, o);
+                       for(u32 i=0; i<4; i++){
+                               if(j==0)
+                                       // Don't switch
+                                       {}
+                               else if(j==1)
+                                       // Switch from -Z (south) to +X (east)
+                                       vertices[i].Pos.rotateXZBy(90);
+                               else if(j==2)
+                                       // Switch from -Z (south) to -X (west)
+                                       vertices[i].Pos.rotateXZBy(-90);
+                               else
+                                       // Switch from -Z (south) to -Z (north)
+                                       vertices[i].Pos.rotateXZBy(-180);
+                       }
+                       driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
+               }
+               for(u32 j=0; j<4; j++)
+               {
+                       video::SColor c = cloudyfogcolor;
+                       vertices[0] = video::S3DVertex(-1,-1.0,-1, 0,0,1, c, t, t);
+                       vertices[1] = video::S3DVertex( 1,-1.0,-1, 0,0,1, c, o, t);
+                       vertices[2] = video::S3DVertex( 1, 0.08,-1, 0,0,1, c, o, o);
+                       vertices[3] = video::S3DVertex(-1, 0.08,-1, 0,0,1, c, t, o);
+                       for(u32 i=0; i<4; i++){
+                               if(j==0)
+                                       // Don't switch
+                                       {}
+                               else if(j==1)
+                                       // Switch from -Z (south) to +X (east)
+                                       vertices[i].Pos.rotateXZBy(90);
+                               else if(j==2)
+                                       // Switch from -Z (south) to -X (west)
+                                       vertices[i].Pos.rotateXZBy(-90);
+                               else
+                                       // Switch from -Z (south) to -Z (north)
+                                       vertices[i].Pos.rotateXZBy(-180);
+                       }
+                       driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
+               }
 
                driver->setMaterial(m_materials[2]);
+
                {
                        float mid1 = 0.25;
                        float mid = (wicked_time_of_day < 0.5 ? mid1 : (1.0 - mid1));
@@ -154,125 +260,168 @@ void Sky::render()
                        driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
                }
 
-               driver->setMaterial(m_materials[1]);
-               
                // Draw sun
-               if(wicked_time_of_day > 0.15 && wicked_time_of_day < 0.85)
-               {
-                       float d = sunsize * 1.7;
-                       video::SColor c = suncolor;
-                       c.setAlpha(0.05*255);
-                       vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
-                       vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
-                       vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
-                       vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
-                       for(u32 i=0; i<4; i++){
-                               // Switch from -Z (south) to +X (east)
-                               vertices[i].Pos.rotateXZBy(90);
-                               vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
-                       }
-                       driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
-
-                       d = sunsize * 1.2;
-                       c = suncolor;
-                       c.setAlpha(0.15*255);
-                       vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
-                       vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
-                       vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
-                       vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
-                       for(u32 i=0; i<4; i++){
-                               // Switch from -Z (south) to +X (east)
-                               vertices[i].Pos.rotateXZBy(90);
-                               vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
-                       }
-                       driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
-
-                       d = sunsize;
-                       vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, suncolor, t, t);
-                       vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, suncolor, o, t);
-                       vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, suncolor, o, o);
-                       vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, suncolor, t, o);
-                       for(u32 i=0; i<4; i++){
-                               // Switch from -Z (south) to +X (east)
-                               vertices[i].Pos.rotateXZBy(90);
-                               vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
-                       }
-                       driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
-
-                       d = sunsize * 0.7;
-                       vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, suncolor2, t, t);
-                       vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, suncolor2, o, t);
-                       vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, suncolor2, o, o);
-                       vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, suncolor2, t, o);
-                       for(u32 i=0; i<4; i++){
-                               // Switch from -Z (south) to +X (east)
-                               vertices[i].Pos.rotateXZBy(90);
-                               vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
+               if(wicked_time_of_day > 0.15 && wicked_time_of_day < 0.85){
+                       if (!m_sun_texture){
+                               driver->setMaterial(m_materials[1]);
+                               float d = sunsize * 1.7;
+                               video::SColor c = suncolor;
+                               c.setAlpha(0.05*255);
+                               vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
+                               vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
+                               vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
+                               vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
+                               for(u32 i=0; i<4; i++){
+                                       // Switch from -Z (south) to +X (east)
+                                       vertices[i].Pos.rotateXZBy(90);
+                                       vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
+                               }
+                               driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
+
+                               d = sunsize * 1.2;
+                               c = suncolor;
+                               c.setAlpha(0.15*255);
+                               vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
+                               vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
+                               vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
+                               vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
+                               for(u32 i=0; i<4; i++){
+                                       // Switch from -Z (south) to +X (east)
+                                       vertices[i].Pos.rotateXZBy(90);
+                                       vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
+                               }
+                               driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
+
+                               d = sunsize;
+                               vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, suncolor, t, t);
+                               vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, suncolor, o, t);
+                               vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, suncolor, o, o);
+                               vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, suncolor, t, o);
+                               for(u32 i=0; i<4; i++){
+                                       // Switch from -Z (south) to +X (east)
+                                       vertices[i].Pos.rotateXZBy(90);
+                                       vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
+                               }
+                               driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
+
+                               d = sunsize * 0.7;
+                               vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, suncolor2, t, t);
+                               vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, suncolor2, o, t);
+                               vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, suncolor2, o, o);
+                               vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, suncolor2, t, o);
+                               for(u32 i=0; i<4; i++){
+                                       // Switch from -Z (south) to +X (east)
+                                       vertices[i].Pos.rotateXZBy(90);
+                                       vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
+                               }
+                               driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
+                       } else {
+                               driver->setMaterial(m_materials[3]);
+                               float d = sunsize * 1.7;
+                               video::SColor c;
+                               if (m_sun_tonemap)
+                                       c = video::SColor (0,0,0,0);
+                               else
+                                       c = video::SColor (255,255,255,255);
+                               vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
+                               vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
+                               vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
+                               vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
+                               for(u32 i=0; i<4; i++){
+                                       // Switch from -Z (south) to +X (east)
+                                       vertices[i].Pos.rotateXZBy(90);
+                                       vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
+                               }
+                               driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
                        }
-                       driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
                }
+
                // Draw moon
                if(wicked_time_of_day < 0.3 || wicked_time_of_day > 0.7)
                {
-                       float d = moonsize * 1.9;
-                       video::SColor c = mooncolor;
-                       c.setAlpha(0.05*255);
-                       vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
-                       vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
-                       vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
-                       vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
-                       for(u32 i=0; i<4; i++){
-                               // Switch from -Z (south) to -X (west)
-                               vertices[i].Pos.rotateXZBy(-90);
-                               vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
-                       }
-                       driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
-                       
-                       d = moonsize * 1.3;
-                       c = mooncolor;
-                       c.setAlpha(0.15*255);
-                       vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
-                       vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
-                       vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
-                       vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
-                       for(u32 i=0; i<4; i++){
-                               // Switch from -Z (south) to -X (west)
-                               vertices[i].Pos.rotateXZBy(-90);
-                               vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
-                       }
-                       driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
-                       
-                       d = moonsize;
-                       vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, mooncolor, t, t);
-                       vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, mooncolor, o, t);
-                       vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, mooncolor, o, o);
-                       vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, mooncolor, t, o);
-                       for(u32 i=0; i<4; i++){
-                               // Switch from -Z (south) to -X (west)
-                               vertices[i].Pos.rotateXZBy(-90);
-                               vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
-                       }
-                       driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
+                       if (!m_moon_texture){
+                               driver->setMaterial(m_materials[1]);
+                               float d = moonsize * 1.9;
+                               video::SColor c = mooncolor;
+                               c.setAlpha(0.05*255);
+                               vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
+                               vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
+                               vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
+                               vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
+                               for(u32 i=0; i<4; i++){
+                                       // Switch from -Z (south) to -X (west)
+                                       vertices[i].Pos.rotateXZBy(-90);
+                                       vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
+                               }
+                               driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
                        
-                       float d2 = moonsize * 0.6;
-                       vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, mooncolor2, t, t);
-                       vertices[1] = video::S3DVertex( d2,-d,-1, 0,0,1, mooncolor2, o, t);
-                       vertices[2] = video::S3DVertex( d2, d2,-1, 0,0,1, mooncolor2, o, o);
-                       vertices[3] = video::S3DVertex(-d, d2,-1, 0,0,1, mooncolor2, t, o);
-                       for(u32 i=0; i<4; i++){
-                               // Switch from -Z (south) to -X (west)
-                               vertices[i].Pos.rotateXZBy(-90);
-                               vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
+                               d = moonsize * 1.3;
+                               c = mooncolor;
+                               c.setAlpha(0.15*255);
+                               vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
+                               vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
+                               vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
+                               vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
+                               for(u32 i=0; i<4; i++){
+                                       // Switch from -Z (south) to -X (west)
+                                       vertices[i].Pos.rotateXZBy(-90);
+                                       vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
+                               }
+                               driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
+
+                               d = moonsize;
+                               vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, mooncolor, t, t);
+                               vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, mooncolor, o, t);
+                               vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, mooncolor, o, o);
+                               vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, mooncolor, t, o);
+                               for(u32 i=0; i<4; i++){
+                                       // Switch from -Z (south) to -X (west)
+                                       vertices[i].Pos.rotateXZBy(-90);
+                                       vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
+                               }
+                               driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
+
+                               float d2 = moonsize * 0.6;
+                               vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, mooncolor2, t, t);
+                               vertices[1] = video::S3DVertex( d2,-d,-1, 0,0,1, mooncolor2, o, t);
+                               vertices[2] = video::S3DVertex( d2, d2,-1, 0,0,1, mooncolor2, o, o);
+                               vertices[3] = video::S3DVertex(-d, d2,-1, 0,0,1, mooncolor2, t, o);
+                               for(u32 i=0; i<4; i++){
+                                       // Switch from -Z (south) to -X (west)
+                                       vertices[i].Pos.rotateXZBy(-90);
+                                       vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
+                               }
+                               driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
+                       } else {
+                               driver->setMaterial(m_materials[4]);
+                               float d = moonsize * 1.9;
+                               video::SColor c;
+                               if (m_moon_tonemap)
+                                       c = video::SColor (0,0,0,0);
+                               else
+                                       c = video::SColor (255,255,255,255);
+                               vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
+                               vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
+                               vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
+                               vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
+                               for(u32 i=0; i<4; i++){
+                                       // Switch from -Z (south) to -X (west)
+                                       vertices[i].Pos.rotateXZBy(-90);
+                                       vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
+                               }
+                               driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
                        }
-                       driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
                }
+
                // Stars
+               driver->setMaterial(m_materials[1]);
                do{
                        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));
                        float f = starbrightness;
-                       video::SColor starcolor(255, f*120,f*120,f*120);
+                       float d = 0.007;
+                       video::SColor starcolor(255, f*90,f*90,f*90);
                        if(starcolor.getBlue() < m_skycolor.getBlue())
                                break;
                        u16 indices[SKY_STAR_COUNT*4];
@@ -284,14 +433,13 @@ void Sky::render()
                                indices[i*4+3] = i*4+3;
                                v3f p = m_stars[i];
                                core::CMatrix4<f32> a;
-                               float d = 0.005;
-                               a.buildRotateFromTo(v3f(0,1,0), v3f(d,1,0));
+                               a.buildRotateFromTo(v3f(0,1,0), v3f(d,1+d/2,0));
                                v3f p1 = p;
                                a.rotateVect(p1);
-                               a.buildRotateFromTo(v3f(0,1,0), v3f(d,1+d/2,d));
+                               a.buildRotateFromTo(v3f(0,1,0), v3f(d,1,d));
                                v3f p2 = p;
                                a.rotateVect(p2);
-                               a.buildRotateFromTo(v3f(0,1,0), v3f(0,1,d));
+                               a.buildRotateFromTo(v3f(0,1,0), v3f(0,1-d/2,d));
                                v3f p3 = p;
                                a.rotateVect(p3);
                                p.rotateXYBy(wicked_time_of_day * 360 - 90);
@@ -314,10 +462,12 @@ void Sky::render()
                
                for(u32 j=0; j<2; j++)
                {
-                       vertices[0] = video::S3DVertex(-1,-1.0,-1, 0,0,1, m_skycolor, t, t);
-                       vertices[1] = video::S3DVertex( 1,-1.0,-1, 0,0,1, m_skycolor, o, t);
-                       vertices[2] = video::S3DVertex( 1,-0.02,-1, 0,0,1, m_skycolor, o, o);
-                       vertices[3] = video::S3DVertex(-1,-0.02,-1, 0,0,1, m_skycolor, t, o);
+                       //video::SColor c = m_skycolor;
+                       video::SColor c = cloudyfogcolor;
+                       vertices[0] = video::S3DVertex(-1,-1.0,-1, 0,0,1, c, t, t);
+                       vertices[1] = video::S3DVertex( 1,-1.0,-1, 0,0,1, c, o, t);
+                       vertices[2] = video::S3DVertex( 1,-0.02,-1, 0,0,1, c, o, o);
+                       vertices[3] = video::S3DVertex(-1,-0.02,-1, 0,0,1, c, t, o);
                        for(u32 i=0; i<4; i++){
                                //if(wicked_time_of_day < 0.5)
                                if(j==0)
@@ -333,7 +483,8 @@ void Sky::render()
 }
 
 void Sky::update(float time_of_day, float time_brightness,
-               float direct_brightness, bool sunlight_seen)
+               float direct_brightness, bool sunlight_seen,
+               CameraMode cam_mode, float yaw, float pitch)
 {
        // Stabilize initial brightness and color values by flooding updates
        if(m_first_update){
@@ -344,7 +495,7 @@ void Sky::update(float time_of_day, float time_brightness,
                m_first_update = false;
                for(u32 i=0; i<100; i++){
                        update(time_of_day, time_brightness, direct_brightness,
-                                       sunlight_seen);
+                                       sunlight_seen, cam_mode, yaw, pitch);
                }
                return;
        }
@@ -353,14 +504,17 @@ void Sky::update(float time_of_day, float time_brightness,
        m_time_brightness = time_brightness;
        m_sunlight_seen = sunlight_seen;
        
-       bool is_dawn = (time_brightness >= 0.20 && time_brightness < 0.50);
+       bool is_dawn = (time_brightness >= 0.20 && time_brightness < 0.35);
 
-       video::SColorf bgcolor_bright_normal_f(170./255,200./255,230./255, 1.0);
+       //video::SColorf bgcolor_bright_normal_f(170./255,200./255,230./255, 1.0);
+       video::SColorf bgcolor_bright_normal_f(155./255,193./255,240./255, 1.0);
        video::SColorf bgcolor_bright_indoor_f(100./255,100./255,100./255, 1.0);
        //video::SColorf bgcolor_bright_dawn_f(0.666,200./255*0.7,230./255*0.5,1.0);
        //video::SColorf bgcolor_bright_dawn_f(0.666,0.549,0.220,1.0);
        //video::SColorf bgcolor_bright_dawn_f(0.666*1.2,0.549*1.0,0.220*1.0, 1.0);
-       video::SColorf bgcolor_bright_dawn_f(0.666*1.2,0.549*1.0,0.220*1.2,1.0);
+       //video::SColorf bgcolor_bright_dawn_f(0.666*1.2,0.549*1.0,0.220*1.2,1.0);
+       video::SColorf bgcolor_bright_dawn_f
+                       (155./255*1.2,193./255,240./255, 1.0);
 
        video::SColorf skycolor_bright_normal_f =
                        video::SColor(255, 140, 186, 250);
@@ -371,11 +525,17 @@ void Sky::update(float time_of_day, float time_brightness,
                        video::SColor(255, 240,240,255);
        //video::SColorf cloudcolor_bright_dawn_f(1.0, 0.591, 0.4);
        //video::SColorf cloudcolor_bright_dawn_f(1.0, 0.65, 0.44);
-       video::SColorf cloudcolor_bright_dawn_f(1.0, 0.7, 0.5);
+       //video::SColorf cloudcolor_bright_dawn_f(1.0, 0.7, 0.5);
+       video::SColorf cloudcolor_bright_dawn_f(1.0, 0.875, 0.75);
 
+       float cloud_color_change_fraction = 0.95;
        if(sunlight_seen){
-               //m_brightness = m_brightness * 0.95 + direct_brightness * 0.05;
-               m_brightness = m_brightness * 0.95 + time_brightness * 0.05;
+               if(fabs(time_brightness - m_brightness) < 0.2){
+                       m_brightness = m_brightness * 0.95 + time_brightness * 0.05;
+               } else {
+                       m_brightness = m_brightness * 0.80 + time_brightness * 0.20;
+                       cloud_color_change_fraction = 0.0;
+               }
        }
        else{
                if(direct_brightness < m_brightness)
@@ -405,41 +565,104 @@ void Sky::update(float time_of_day, float time_brightness,
        } else {
                m_bgcolor_bright_f = m_bgcolor_bright_f.getInterpolated(
                                bgcolor_bright_indoor_f, color_change_fraction);
-               m_cloudcolor_bright_f = m_cloudcolor_bright_f.getInterpolated(
-                               cloudcolor_bright_normal_f, color_change_fraction);
                m_skycolor_bright_f = m_skycolor_bright_f.getInterpolated(
                                bgcolor_bright_indoor_f, color_change_fraction);
+               m_cloudcolor_bright_f = m_cloudcolor_bright_f.getInterpolated(
+                               cloudcolor_bright_normal_f, color_change_fraction);
                m_clouds_visible = false;
        }
+
        video::SColor bgcolor_bright = m_bgcolor_bright_f.toSColor();
        m_bgcolor = video::SColor(
-                       255,
-                       bgcolor_bright.getRed() * m_brightness,
-                       bgcolor_bright.getGreen() * m_brightness,
-                       bgcolor_bright.getBlue() * m_brightness);
-       
+               255,
+               bgcolor_bright.getRed() * m_brightness,
+               bgcolor_bright.getGreen() * m_brightness,
+               bgcolor_bright.getBlue() * m_brightness);
+
        video::SColor skycolor_bright = m_skycolor_bright_f.toSColor();
        m_skycolor = video::SColor(
-                       255,
-                       skycolor_bright.getRed() * m_brightness,
-                       skycolor_bright.getGreen() * m_brightness,
-                       skycolor_bright.getBlue() * m_brightness);
-       
+               255,
+               skycolor_bright.getRed() * m_brightness,
+               skycolor_bright.getGreen() * m_brightness,
+               skycolor_bright.getBlue() * m_brightness);
+
+       // Horizon coloring based on sun and moon direction during sunset and sunrise
+       video::SColor pointcolor = video::SColor(255, 255, 255, m_bgcolor.getAlpha());
+       if (m_directional_colored_fog) {
+               if (m_horizon_blend() != 0)
+               {
+                       // calculate hemisphere value from yaw, (inverted in third person front view)
+                       s8 dir_factor = 1;
+                       if (cam_mode > CAMERA_MODE_THIRD)
+                               dir_factor = -1;
+                       f32 pointcolor_blend = wrapDegrees_0_360( yaw*dir_factor + 90);
+                       if (pointcolor_blend > 180)
+                               pointcolor_blend = 360 - pointcolor_blend;
+                       pointcolor_blend /= 180;
+                       // bound view angle to determine where transition starts and ends
+                       pointcolor_blend = rangelim(1 - pointcolor_blend * 1.375, 0, 1 / 1.375) * 1.375;
+                       // combine the colors when looking up or down, otherwise turning looks weird
+                       pointcolor_blend += (0.5 - pointcolor_blend) * (1 - MYMIN((90 - std::abs(pitch)) / 90 * 1.5, 1));
+                       // invert direction to match where the sun and moon are rising
+                       if (m_time_of_day > 0.5)
+                               pointcolor_blend = 1 - pointcolor_blend;
+                       // horizon colors of sun and moon
+                       f32 pointcolor_light = rangelim(m_time_brightness * 3, 0.2, 1);
+
+                       video::SColorf pointcolor_sun_f(1, 1, 1, 1);
+                       if (m_sun_tonemap)
+                       {
+                               pointcolor_sun_f.r = pointcolor_light * (float)m_materials[3].EmissiveColor.getRed() / 255;
+                               pointcolor_sun_f.b = pointcolor_light * (float)m_materials[3].EmissiveColor.getBlue() / 255;
+                               pointcolor_sun_f.g = pointcolor_light * (float)m_materials[3].EmissiveColor.getGreen() / 255;
+                       }
+                       else
+                       {
+                               pointcolor_sun_f.r = pointcolor_light * 1;
+                               pointcolor_sun_f.b = pointcolor_light * (0.25 + (rangelim(m_time_brightness, 0.25, 0.75) - 0.25) * 2 * 0.75);
+                               pointcolor_sun_f.g = pointcolor_light * (pointcolor_sun_f.b * 0.375 + (rangelim(m_time_brightness, 0.05, 0.15) - 0.05) * 10 * 0.625);
+                       }
+
+                       video::SColorf pointcolor_moon_f(0.5 * pointcolor_light, 0.6 * pointcolor_light, 0.8 * pointcolor_light, 1);
+                       if (m_moon_tonemap)
+                       {
+                               pointcolor_moon_f.r = pointcolor_light * (float)m_materials[4].EmissiveColor.getRed() / 255;
+                               pointcolor_moon_f.b = pointcolor_light * (float)m_materials[4].EmissiveColor.getBlue() / 255;
+                               pointcolor_moon_f.g = pointcolor_light * (float)m_materials[4].EmissiveColor.getGreen() / 255;
+                       }
+
+                       video::SColor pointcolor_sun = pointcolor_sun_f.toSColor();
+                       video::SColor pointcolor_moon = pointcolor_moon_f.toSColor();
+                       // calculate the blend color
+                       pointcolor = m_mix_scolor(pointcolor_moon, pointcolor_sun, pointcolor_blend);
+               }
+               m_bgcolor = m_mix_scolor(m_bgcolor, pointcolor, m_horizon_blend() * 0.5);
+               m_skycolor = m_mix_scolor(m_skycolor, pointcolor, m_horizon_blend() * 0.25);
+       }
+
        float cloud_direct_brightness = 0;
-       if(sunlight_seen){
-               cloud_direct_brightness = time_brightness;
-               if(time_brightness >= 0.2 && time_brightness < 0.7)
+       if(sunlight_seen) {
+               if (!m_directional_colored_fog) {
+                       cloud_direct_brightness = time_brightness;
+                       if(time_brightness >= 0.2 && time_brightness < 0.7)
                                cloud_direct_brightness *= 1.3;
+               }
+               else {
+                       cloud_direct_brightness = MYMIN(m_horizon_blend() * 0.15 + m_time_brightness, 1);
+               }
        } else {
                cloud_direct_brightness = direct_brightness;
        }
-       m_cloud_brightness = m_cloud_brightness * 0.95 +
-                       cloud_direct_brightness * (1.0 - 0.95);
+       m_cloud_brightness = m_cloud_brightness * cloud_color_change_fraction +
+                       cloud_direct_brightness * (1.0 - cloud_color_change_fraction);
        m_cloudcolor_f = video::SColorf(
-                       m_cloudcolor_bright_f.getRed() * m_cloud_brightness,
-                       m_cloudcolor_bright_f.getGreen() * m_cloud_brightness,
-                       m_cloudcolor_bright_f.getBlue() * m_cloud_brightness,
+                       m_cloudcolor_bright_f.r * m_cloud_brightness,
+                       m_cloudcolor_bright_f.g * m_cloud_brightness,
+                       m_cloudcolor_bright_f.b * m_cloud_brightness,
                        1.0);
+       if (m_directional_colored_fog) {
+               m_cloudcolor_f = m_mix_scolorf(m_cloudcolor_f, video::SColorf(pointcolor), m_horizon_blend() * 0.25);
+       }
 
 }