From abb8c981bc2f49140724f6ee15eb0573b8fde5d2 Mon Sep 17 00:00:00 2001
From: Fabian Klemp <fabian.klemp1@rwth-aachen.de>
Date: Mon, 9 Mar 2015 15:43:12 +0100
Subject: [PATCH] Changed a few parameters corresponding with the sunrise.

---
 data/levels/Level1.xml  | 18 +++++++++---------
 data/shader/phong.fsh   |  6 +++---
 data/shader/skydome.fsh |  4 ++--
 graphics.cc             |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/data/levels/Level1.xml b/data/levels/Level1.xml
index 01de205..09f77db 100644
--- a/data/levels/Level1.xml
+++ b/data/levels/Level1.xml
@@ -13057,23 +13057,23 @@
 </ambientLight>
 
 <fogColourDay>
-    <rColour>0.10</rColour>
-    <gColour>0.14</gColour>
-    <bColour>0.14</bColour>
+    <rColour>0.57</rColour>
+    <gColour>0.80</gColour>
+    <bColour>0.98</bColour>
     <alpha>1.0</alpha>
 </fogColourDay>
 
 <fogColourRise>
-    <rColour>0.60</rColour>
-    <gColour>0.14</gColour>
-    <bColour>0.14</bColour>
+    <rColour>0.88</rColour>
+    <gColour>0.38</gColour>
+    <bColour>0.38</bColour>
     <alpha>1.0</alpha>
 </fogColourRise>
 
 <fogColourNight>
-    <rColour>0.05</rColour>
-    <gColour>0.07</gColour>
-    <bColour>0.34</bColour>
+    <rColour>0.09</rColour>
+    <gColour>0.1</gColour>
+    <bColour>0.24</bColour>
     <alpha>1.0</alpha>
 </fogColourNight>
 
diff --git a/data/shader/phong.fsh b/data/shader/phong.fsh
index 507e19a..7562e38 100644
--- a/data/shader/phong.fsh
+++ b/data/shader/phong.fsh
@@ -92,11 +92,11 @@ vec4 fogColor(float dot) {
     if(dot<0.0) {
         dayFactor = 0.0;
     }
-    else if(dot>0.51) {
+    else if(dot>1.0) {
         dayFactor = 1.0;
     }
     else {
-        dayFactor = sin(3*dot);
+        dayFactor = sin(1.5*dot);
     }
     if (dot <0.0) {
         return mix(fogColorNight, fogColorRise, riseFactor);
@@ -155,7 +155,7 @@ void main()
     if(length(directionalLightVector)>0.0f) {
         vec3 directionalVector = normalize(directionalLightVector);
         sunAngle = dot(vec3(0.0, 1.0, 0.0), directionalVector);
-        if ( sunAngle > -0.5) {
+        if ( sunAngle > -0.7) {
             float directionalVisibility = 1.0f;
             if (distanceToBorder(shadowCoord1.xy) <= 0.5 && distanceToBorder(shadowCoord1.xy) > 0.2) {
                 if (distanceToBorder(shadowCoord0.xy) <= 0.5 && distanceToBorder(shadowCoord0.xy) > 0.2) {
diff --git a/data/shader/skydome.fsh b/data/shader/skydome.fsh
index ce5174e..45f2e81 100644
--- a/data/shader/skydome.fsh
+++ b/data/shader/skydome.fsh
@@ -35,11 +35,11 @@ vec4 fogColor(float dot) {
     if(dot<0.0) {
         dayFactor = 0.0;
     }
-    else if(dot>0.77) {
+    else if(dot>1.0) {
         dayFactor = 1.0;
     }
     else {
-        dayFactor = sin(2*dot);
+        dayFactor = sin(1.5*dot);
     }
     if (dot <0.0) {
         return mix(fogColorNight, fogColorRise, riseFactor);
diff --git a/graphics.cc b/graphics.cc
index acf473f..f860c90 100644
--- a/graphics.cc
+++ b/graphics.cc
@@ -348,7 +348,7 @@ void Graphics::render(double time)
         for (unsigned int i = 0; i<framebuffer_directional.size(); i++) {
             framebuffer_directional.at(i)->bind(); 
             glClear(GL_DEPTH_BUFFER_BIT);
-            if (sunAngle > -0.5f) {
+            if (sunAngle > -0.7f) {
                 float projection_size = 0.0f;
                 switch(i) {
                     case 0: