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

Changed fog functions a little bit more. Looks nice enough.

Browse Source
This commit is contained in:
Faerbit 2014-11-25 13:54:00 +01:00
parent 7736e7850f
commit 7431d0d63e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shader/phong.fsh
View File

@ -20,7 +20,7 @@ uniform float directionalIntensity;
uniform vec3 lightSources[128];
uniform vec3 lightColors[128];
uniform float lightIntensities[128];
uniform float fogStart;
uniform float fogEnd;
uniform vec4 fogColor;
uniform vec3 cameraCenter;
@ -54,8 +54,8 @@ void main()
vec3 finalColor = specularColor + diffuseColor + ambientColor;
float distanceCameraCenter = distance(cameraCenter, vec3(fragPosition));
float fogFactor = clamp((1.0 - exp(-distanceCameraCenter+fogStart)), 0.0, 1.0);
fogFactor = mix(fogFactor, 0.0, clamp((fragPosition.y/50.0), 0.0, 1.0));
float fogFactor = clamp((1.0 - (fogEnd-distanceCameraCenter)/30.0), 0.0, 1.0);
fogFactor *= clamp((1.0-((fragPosition.y-8.0)/30.0)), 0.0, 1.0);
vec4 texture = texture(uTexture, vTexCoord).rgba;
oColor = vec4(finalColor, 1.0f)*texture;

2
graphics.cc
View File

@ -140,7 +140,7 @@ void Graphics::render(Level* level, ACGL::OpenGL::SharedShaderProgram shader)
}
// set fog Parameters
shader->setUniform("fogStart", (float)((farPlane/2.0f)-20.0f));
shader->setUniform("fogEnd", (farPlane/2.0f)-10.0f);
shader->setUniform("fogColor", level->getFogColor());
shader->setUniform("cameraCenter", level->getCameraCenter()->getPosition());