s473593
/
grk_5sem_labs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reformatted

This commit is contained in:
Eikthyrnir 2023-11-18 02:56:00 +01:00
parent 0e406f71c8
commit ce33570341
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cw 1/src/main.cpp
View File

@ -4,7 +4,7 @@
#include "Shader_Loader.h" #include "Shader_Loader.h"
#include "Render_Utils.h" #include "Render_Utils.h"
#include "ex_1_1.hpp" #include "ex_1_7.hpp"

5
cw 5/shaders/shader_5_1.frag
View File

@ -8,7 +8,7 @@ uniform vec3 cameraPos;
uniform float time; uniform float time;
in vec3 vertexNormalOut; in vec3 vertexNormalOut;
out vec3 vertexPosOut; in vec3 vertexPosOut;
out vec4 outColor; out vec4 outColor;
void main() void main()
@ -24,6 +24,5 @@ void main()
float specular = pow(max(dot(viewDir, reflectDir), 0.0), glossPow); float specular = pow(max(dot(viewDir, reflectDir), 0.0), glossPow);
float diffuse = intensity; float diffuse = intensity;
//outColor = vec4(lightColor * (color * diffuse + specular ), 1.0); outColor = vec4(lightColor * (color * diffuse + specular ), 1.0);
outColor = vec4(1.0);
} }