faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Changed a few parameters corresponding with the sunrise.

Browse Source
This commit is contained in:
Fabian Klemp 2015-03-09 15:43:12 +01:00
parent 0a75dd030a
commit abb8c981bc
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/levels/Level1.xml
View File

@ -13057,23 +13057,23 @@
</ambientLight> </ambientLight>
<fogColourDay> <fogColourDay>
<rColour>0.10</rColour> <rColour>0.57</rColour>
<gColour>0.14</gColour> <gColour>0.80</gColour>
<bColour>0.14</bColour> <bColour>0.98</bColour>
<alpha>1.0</alpha> <alpha>1.0</alpha>
</fogColourDay> </fogColourDay>
<fogColourRise> <fogColourRise>
<rColour>0.60</rColour> <rColour>0.88</rColour>
<gColour>0.14</gColour> <gColour>0.38</gColour>
<bColour>0.14</bColour> <bColour>0.38</bColour>
<alpha>1.0</alpha> <alpha>1.0</alpha>
</fogColourRise> </fogColourRise>
<fogColourNight> <fogColourNight>
<rColour>0.05</rColour> <rColour>0.09</rColour>
<gColour>0.07</gColour> <gColour>0.1</gColour>
<bColour>0.34</bColour> <bColour>0.24</bColour>
<alpha>1.0</alpha> <alpha>1.0</alpha>
</fogColourNight> </fogColourNight>

6
data/shader/phong.fsh
View File

@ -92,11 +92,11 @@ vec4 fogColor(float dot) {
if(dot<0.0) { if(dot<0.0) {
dayFactor = 0.0; dayFactor = 0.0;
} }
else if(dot>0.51) { else if(dot>1.0) {
dayFactor = 1.0; dayFactor = 1.0;
} }
else { else {
dayFactor = sin(3*dot); dayFactor = sin(1.5*dot);
} }
if (dot <0.0) { if (dot <0.0) {
return mix(fogColorNight, fogColorRise, riseFactor); return mix(fogColorNight, fogColorRise, riseFactor);
@ -155,7 +155,7 @@ void main()
if(length(directionalLightVector)>0.0f) { if(length(directionalLightVector)>0.0f) {
vec3 directionalVector = normalize(directionalLightVector); vec3 directionalVector = normalize(directionalLightVector);
sunAngle = dot(vec3(0.0, 1.0, 0.0), directionalVector); sunAngle = dot(vec3(0.0, 1.0, 0.0), directionalVector);
if ( sunAngle > -0.5) { if ( sunAngle > -0.7) {
float directionalVisibility = 1.0f; float directionalVisibility = 1.0f;
if (distanceToBorder(shadowCoord1.xy) <= 0.5 && distanceToBorder(shadowCoord1.xy) > 0.2) { if (distanceToBorder(shadowCoord1.xy) <= 0.5 && distanceToBorder(shadowCoord1.xy) > 0.2) {
if (distanceToBorder(shadowCoord0.xy) <= 0.5 && distanceToBorder(shadowCoord0.xy) > 0.2) { if (distanceToBorder(shadowCoord0.xy) <= 0.5 && distanceToBorder(shadowCoord0.xy) > 0.2) {

4
data/shader/skydome.fsh
View File

@ -35,11 +35,11 @@ vec4 fogColor(float dot) {
if(dot<0.0) { if(dot<0.0) {
dayFactor = 0.0; dayFactor = 0.0;
} }
else if(dot>0.77) { else if(dot>1.0) {
dayFactor = 1.0; dayFactor = 1.0;
} }
else { else {
dayFactor = sin(2*dot); dayFactor = sin(1.5*dot);
} }
if (dot <0.0) { if (dot <0.0) {
return mix(fogColorNight, fogColorRise, riseFactor); return mix(fogColorNight, fogColorRise, riseFactor);

2
graphics.cc
View File

@ -348,7 +348,7 @@ void Graphics::render(double time)
for (unsigned int i = 0; i<framebuffer_directional.size(); i++) { for (unsigned int i = 0; i<framebuffer_directional.size(); i++) {
framebuffer_directional.at(i)->bind(); framebuffer_directional.at(i)->bind();
glClear(GL_DEPTH_BUFFER_BIT); glClear(GL_DEPTH_BUFFER_BIT);
if (sunAngle > -0.5f) { if (sunAngle > -0.7f) {
float projection_size = 0.0f; float projection_size = 0.0f;
switch(i) { switch(i) {
case 0: case 0: