Applied atmosphere humidity to opengl renderer

src/interface/modeler/quickapp/qml/AtmosphereSection.qml

@@ -16,7 +16,7 @@ BaseSection {
 
         ToolbarButton {
             id: tool_humidity
-            picture: "images/icon_atmosphere_humidity.png"
+            picture: "images/icon_atmosphere.png"
             hovertext: qsTr("Humidity factor in the air")
         }
     }

src/render/opengl/OpenGLSkybox.cpp

@@ -53,6 +53,7 @@ void OpenGLSkybox::initialize()
 
     // Watch for definition changes
     renderer->getScenery()->getAtmosphere()->propDayTime()->addWatcher(this, true);
+    renderer->getScenery()->getAtmosphere()->propHumidity()->addWatcher(this, true);
 }
 
 void OpenGLSkybox::update()
@@ -66,7 +67,7 @@ void OpenGLSkybox::render()
 {
     program->drawTriangleStrip(vertices, 14);
 }
-
+#include "Logs.h"
 void OpenGLSkybox::nodeChanged(const DefinitionNode *node, const DefinitionDiff *)
 {
     if (node->getPath() == "/atmosphere/daytime")
@@ -76,6 +77,12 @@ void OpenGLSkybox::nodeChanged(const DefinitionNode *node, const DefinitionDiff
 
         Color sun_color = renderer->getScenery()->getAtmosphere()->sun_color;
         renderer->getSharedState()->set("sunColor", sun_color);
+
+        renderer->getSharedState()->set("dayTime", renderer->getScenery()->getAtmosphere()->propDayTime()->getValue());
+    }
+    else if (node->getPath() == "/atmosphere/humidity")
+    {
+        renderer->getSharedState()->set("atmosphereHumidity", renderer->getScenery()->getAtmosphere()->propHumidity()->getValue());
     }
 }
 

src/render/opengl/opengl.pro

@@ -28,7 +28,7 @@ SOURCES += \
     OpenGLTerrain.cpp
 
 HEADERS +=\
-        opengl_global.h \
+    opengl_global.h \
     OpenGLRenderer.h \
     ExplorerChunkTerrain.h \
     WidgetExplorer.h \
@@ -78,14 +78,5 @@ RESOURCES += \
     shaders/resources.qrc
 
 OTHER_FILES += \
-    shaders/skybox.frag \
+    shaders/*.frag \
-    shaders/skybox.vert \
+    shaders/*.vert
-    shaders/water.vert \
-    shaders/water.frag \
-    shaders/bruneton.frag \
-    shaders/bruneton.frag \
-    shaders/tonemapping.frag \
-    shaders/terrain.frag \
-    shaders/terrain.vert \
-    shaders/fadeout.frag \
-    shaders/noise.frag

src/render/opengl/shaders/atmosphere.frag

@@ -24,9 +24,11 @@ const int RES_R = 32;
 const int RES_NU = 8;
 
 uniform float waterHeight;
+uniform float atmosphereHumidity;
 uniform vec3 cameraLocation;
 uniform vec3 sunDirection;
 uniform vec4 sunColor;
+uniform float dayTime;
 const float sunRadius = 1.0; // TODO -> uniform
 
 varying vec3 unprojected;
@@ -186,6 +188,64 @@ vec3 _getInscatterColor(inout vec3 x, inout float t, vec3 v, vec3 s, out float r
     return result * ISun;
 }
 
+float getDayFactor(float _daytime)
+{
+    float daytime = 1.0 - abs(0.5 - _daytime) / 0.5;
+    return daytime < 0.45 ? 0.0 : sqrt((daytime - 0.45) / 0.55);
+}
+
+void limitPower(inout vec3 color, float max_power)
+{
+    float power = color.r + color.g + color.b;
+
+    if (power > max_power)
+    {
+        float factor = max_power / power;
+
+        color.r *= factor;
+        color.g *= factor;
+        color.b *= factor;
+    }
+}
+
+vec3 applyWeatherEffects(float distance, vec3 base, vec3 _attenuation, vec3 _inscattering)
+{
+    vec3 attenuation = _attenuation;
+    vec3 inscattering = _inscattering;
+    float max_distance = 100.0 - 90.0 * atmosphereHumidity;
+
+    if (distance > max_distance)
+    {
+        distance = max_distance;
+    }
+    float distancefactor = (distance > max_distance ? max_distance : distance) / max_distance;
+    float dayfactor = getDayFactor(dayTime);
+
+    if (atmosphereHumidity < 0.15)
+    {
+        float force = (0.15 - atmosphereHumidity) / 0.15;
+        limitPower(inscattering, 100.0 - 90.0 * pow(force, 0.1));
+    }
+    else
+    {
+        float force = 1.2 * (atmosphereHumidity < 0.5 ? sqrt((atmosphereHumidity - 0.15) / 0.35) : 1.0 - (atmosphereHumidity - 0.5) / 0.5);
+        inscattering.r *= 1.0 + force * distancefactor * (atmosphereHumidity - 0.15) / 0.85;
+        inscattering.g *= 1.0 + force * distancefactor * (atmosphereHumidity - 0.15) / 0.85;
+        inscattering.b *= 1.0 + force * distancefactor * (atmosphereHumidity - 0.15) / 0.85;
+    }
+
+    attenuation.r *= 1.0 - 0.4 * distancefactor * atmosphereHumidity;
+    attenuation.g *= 1.0 - 0.4 * distancefactor * atmosphereHumidity;
+    attenuation.b *= 1.0 - 0.4 * distancefactor * atmosphereHumidity;
+
+    vec3 result = base * attenuation + inscattering;
+    if (atmosphereHumidity > 0.3)
+    {
+        result = mix(result, vec3((10.0 - 8.0 * atmosphereHumidity) * dayfactor), distancefactor * (atmosphereHumidity - 0.3) / 0.7);
+    }
+    return result;
+}
+
 vec4 applyAerialPerspective(vec4 base)
 {
     vec3 x = vec3(0.0, Rg + WORKAROUND_OFFSET + cameraLocation.y * WORLD_SCALING, 0.0);
@@ -204,7 +264,7 @@ vec4 applyAerialPerspective(vec4 base)
     vec3 attenuation;
     vec3 inscattering = _getInscatterColor(x, t, v, s, r, mu, attenuation);
 
-    return base * vec4(attenuation, 0.0) + vec4(inscattering, 0.0);
+    return vec4(applyWeatherEffects(length(unprojected - cameraLocation), base.rgb, attenuation, inscattering), base.a);
 }
 
 vec4 getSkyColor(vec3 location, vec3 direction)
@@ -221,9 +281,8 @@ vec4 getSkyColor(vec3 location, vec3 direction)
     vec3 attenuation;
     vec3 inscattering = _getInscatterColor(x, t, v, s, r, mu, attenuation);
 
-    vec4 result = vec4(0.01, 0.012, 0.03, 1.0); // night sky
+    vec3 nightsky = vec3(0.01, 0.012, 0.03);
-    result += sunTransmittance + vec4(inscattering, 0.0);
+    return vec4(applyWeatherEffects(SPHERE_SIZE, nightsky + sunTransmittance.rgb, vec3(0), inscattering), 1.0);
-    return result;
 }
 
 vec4 applyLighting(vec3 location, vec3 normal, vec4 color, float shininess)

src/render/software/AtmosphereRenderer.cpp

@@ -32,8 +32,9 @@ static inline void _applyWeatherEffects(AtmosphereDefinition* definition, Atmosp
         return;
     }
 
+    double humidity = definition->propHumidity()->getValue();
     double distance = result->distance;
-    double max_distance = 100.0 - 90.0 * definition->propHumidity()->getValue();
+    double max_distance = 100.0 - 90.0 * humidity;
     double distancefactor, dayfactor;
 
     if (distance > max_distance)
@@ -44,8 +45,6 @@ static inline void _applyWeatherEffects(AtmosphereDefinition* definition, Atmosp
     /* TODO Get day lighting from model */
     dayfactor = _getDayFactor(definition->propDayTime()->getValue());
 
-    double humidity = definition->propHumidity()->getValue();
-
     /* Fog masking */
     if (humidity > 0.3)
     {