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

Added movement to water texture. Movement speed currently hard coded.

Browse Source
This commit is contained in:
Faerbit 2015-03-07 14:56:16 +01:00
parent 86619fd2dd
commit d24e70dbdd
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/shader/phong.fsh
View File

@ -40,6 +40,9 @@ uniform float lightIntensities[32];
uniform float farPlane; uniform float farPlane;
uniform vec4 fogColor; uniform vec4 fogColor;
uniform vec3 cameraCenter; uniform vec3 cameraCenter;
uniform bool movingTexture;
uniform vec2 movement;
uniform float time;
vec2 poissonDisk[16] = vec2[]( vec2 poissonDisk[16] = vec2[](
vec2( -0.94201624, -0.39906216 ), vec2( -0.94201624, -0.39906216 ),
@ -191,7 +194,13 @@ void main()
float fogFactor = clamp((1.0 - ((farPlane - 35.0) -distanceCameraCenter)/30.0), 0.0, 1.0); float fogFactor = clamp((1.0 - ((farPlane - 35.0) -distanceCameraCenter)/30.0), 0.0, 1.0);
fogFactor *= clamp((1.0-((fragPosition.y-40.0)/30.0)), 0.0, 1.0); fogFactor *= clamp((1.0-((fragPosition.y-40.0)/30.0)), 0.0, 1.0);
vec4 texture = texture(uTexture, vTexCoord).rgba; vec4 textureColor = vec4(0.0, 0.0, 0.0, 1.0);
oColor = vec4(finalColor, 1.0f)*texture; if (movingTexture == true) {
textureColor = texture(uTexture, vec2(vTexCoord.x + movement.x * time, vTexCoord.y + movement.y * time)).rgba;
}
else {
textureColor = texture(uTexture, vTexCoord).rgba;
}
oColor = vec4(finalColor, 1.0f)*textureColor;
oColor = mix(oColor, fogColor, fogFactor); oColor = mix(oColor, fogColor, fogFactor);
} }

2
graphics.cc
View File

@ -314,6 +314,8 @@ void Graphics::render(double time)
// set Material Parameters // set Material Parameters
lightingShader->setUniform("ambientColor", level->getAmbientLight()); lightingShader->setUniform("ambientColor", level->getAmbientLight());
lightingShader->setUniform("camera", level->getPhysics()->getCameraPosition()); lightingShader->setUniform("camera", level->getPhysics()->getCameraPosition());
lightingShader->setUniform("movement", glm::vec2(-0.3f, -0.4f));
lightingShader->setUniform("time", (float) time);
// render the level // render the level
level->render(lightingShader, true, &lightingViewProjectionMatrix, &depthBiasVPs); level->render(lightingShader, true, &lightingViewProjectionMatrix, &depthBiasVPs);