]> git.lizzy.rs Git - minetest.git/blobdiff - src/sky.cpp
Make ClientInterface::statenames consistent with the state enum again
[minetest.git] / src / sky.cpp
index 04bb3ab42e033d4444409c59ad9d9e79f1a392f2..01fb8ef860ed140e5d434d59139727c8ddbd71d8 100644 (file)
@@ -3,16 +3,17 @@
 #include "ISceneManager.h"
 #include "ICameraSceneNode.h"
 #include "S3DVertex.h"
-#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" // MYMIN
+#include "util/numeric.h"
 #include <cmath>
 #include "settings.h"
+#include "camera.h"           // CameraModes
 
 //! constructor
-Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id, LocalPlayer* player):
+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),
@@ -21,8 +22,7 @@ Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id, LocalPlay
                m_cloud_brightness(0.5),
                m_bgcolor_bright_f(1,1,1,1),
                m_skycolor_bright_f(1,1,1,1),
-               m_cloudcolor_bright_f(1,1,1,1),
-               m_player(player)
+               m_cloudcolor_bright_f(1,1,1,1)
 {
        setAutomaticCulling(scene::EAC_OFF);
        Box.MaxEdge.set(0,0,0);
@@ -46,33 +46,32 @@ Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id, LocalPlay
        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 = mgr->getVideoDriver()->getTexture(
-                       getTexturePath("sun.png").c_str());
-       m_moon_texture = mgr->getVideoDriver()->getTexture(
-                       getTexturePath("moon.png").c_str());
-       m_sun_tonemap = mgr->getVideoDriver()->getTexture(
-                       getTexturePath("sun_tonemap.png").c_str());
-       m_moon_tonemap = mgr->getVideoDriver()->getTexture(
-                       getTexturePath("moon_tonemap.png").c_str());
+       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;         
+                       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;         
+                       m_materials[4].Lighting = true;
        }
 
        for(u32 i=0; i<SKY_STAR_COUNT; i++){
@@ -160,20 +159,20 @@ void Sky::render()
                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;       
+               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_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_moon_tonemap->unlock();
                        m_materials[4].EmissiveColor = texel_color;
                }
 
@@ -262,7 +261,7 @@ void Sky::render()
                }
 
                // Draw sun
-               if(wicked_time_of_day > 0.15 && wicked_time_of_day < 0.85){     
+               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;
@@ -410,7 +409,7 @@ void Sky::render()
                                        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);
                        }
                }
 
@@ -484,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){
@@ -495,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;
        }
@@ -572,55 +572,71 @@ void Sky::update(float time_of_day, float time_brightness,
                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);
+
+       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);
+
        // 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
-                       f32 pointcolor_blend = wrapDegrees_0_360(m_player->getYaw() + 90);
+                       // 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(m_player->getPitch())) / 90 * 1.5, 1));
+                       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);
-                       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);
+                       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);
                }
-       }
-
-       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);
-       if (m_directional_colored_fog) {
                m_bgcolor = m_mix_scolor(m_bgcolor, pointcolor, m_horizon_blend() * 0.5);
-       }
-
-       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);
-       if (m_directional_colored_fog) {
                m_skycolor = m_mix_scolor(m_skycolor, pointcolor, m_horizon_blend() * 0.25);
        }