s452622/GRK-Projekt
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: add terrain generation using perlin noise #12

Merged
s452622 merged 11 commits from terrain-generation-second-approach into master 2022-01-25 12:18:30 +01:00
Conversation 0 Commits 11 Files Changed 21 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0058724ddd - Show all commits

4
grafika_projekt/shaders/terrainShader.frag
View File

@ -5,7 +5,7 @@ in vec3 surfaceNormal;
in vec3 toLightVector; in vec3 toLightVector;
in vec3 toCameraVector; in vec3 toCameraVector;
out vec4 out_Color; //out vec4 out_Color;
uniform sampler2D modelTexture; uniform sampler2D modelTexture;
@ -31,6 +31,6 @@ void main(void){
vec3 finalSpecular = dampedFactor * reflectivity * vec3(1.0, 1.0, 1.0); //Tu by³a zmiana vec3 finalSpecular = dampedFactor * reflectivity * vec3(1.0, 1.0, 1.0); //Tu by³a zmiana
out_Color = vec4(diffuse,1.0) * texture(modelTexture,pass_textureCoordinates) + vec4(finalSpecular,1.0); gl_FragColor = vec4(1.0,1.0,1.0,1.0);
} }