s473561/Grafika_Komputerowa_Interstellar_Odyssey
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cameraView

Browse Source
This commit is contained in:
Nikodem145 2024-01-28 13:54:33 +01:00
parent 0c8f79ae0f
commit f8986d1920
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cw 7/shaders/shader_5_tex.frag
View File

@ -62,8 +62,8 @@ void main()
float diffuse=max(0.0001,dot(N,L)); float diffuse=max(0.0001,dot(N,L));
vec3 lambertian = max(0.00001, dot(N,L))*textureColor;
vec3 Final = (kD*textureColor/3.1458993) + specular;
outColor = vec4(Final*min(1.0,AMBIENT + diffuse), 1.0); outColor = vec4(BRDF*min(1.0,AMBIENT + diffuse), 1.0);
} }

2
cw 7/src/ex_7_1.hpp
View File

@ -114,7 +114,7 @@ glm::mat4 createPerspectiveMatrix()
glm::mat4 perspectiveMatrix; glm::mat4 perspectiveMatrix;
float n = 0.05; float n = 0.05;
float f = 20.; float f = 60.;
float a1 = glm::min(aspectRatio, 1.f); float a1 = glm::min(aspectRatio, 1.f);
float a2 = glm::min(1 / aspectRatio, 1.f); float a2 = glm::min(1 / aspectRatio, 1.f);
perspectiveMatrix = glm::mat4({ perspectiveMatrix = glm::mat4({