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

AMBIENT

Browse Source
This commit is contained in:
Nikodem145 2024-01-28 00:04:28 +01:00
parent c929abb6af
commit 178cf4402b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cw 7/shaders/shader_5_tex.frag
View File

@ -1,7 +1,7 @@
#version 430 core #version 430 core
float AMBIENT = 0.2; float AMBIENT = 0.6;
float roughness = 0.1; float roughness = 0.2;
float metalic = 0.8; float metalic = 0.8;
@ -9,6 +9,9 @@ uniform vec3 color;
uniform sampler2D colorTexture; uniform sampler2D colorTexture;
uniform sampler2D normalSampler; uniform sampler2D normalSampler;
uniform sampler2D metalnessTexture;
uniform sampler2D roughnessTexture;
in vec3 worldPos; in vec3 worldPos;
in vec2 vecTex; in vec2 vecTex;
@ -24,6 +27,8 @@ void main()
vec3 V = (viewDirTS); vec3 V = (viewDirTS);
vec3 textureColor = texture2D(colorTexture, vecTex).xyz; vec3 textureColor = texture2D(colorTexture, vecTex).xyz;
float metalnessValue = texture2D(metalnessTexture, vecTex).r;
float roughnessValue = texture2D(roughnessTexture, vecTex).r;
vec3 N = texture2D(normalSampler, vecTex).xyz; vec3 N = texture2D(normalSampler, vecTex).xyz;
N = 2.0 * N - 1.0; N = 2.0 * N - 1.0;

4
cw 7/src/ex_7_1.hpp
View File

@ -424,8 +424,8 @@ void processInput(GLFWwindow* window)
{ {
spaceshipSide = glm::normalize(glm::cross(spaceshipDir, glm::vec3(0.f, 1.f, 0.f))); spaceshipSide = glm::normalize(glm::cross(spaceshipDir, glm::vec3(0.f, 1.f, 0.f)));
spaceshipUp = glm::vec3(0.f, 1.f, 0.f); spaceshipUp = glm::vec3(0.f, 1.f, 0.f);
float angleSpeed = 0.005f; float angleSpeed = 0.05f;
float moveSpeed = 0.005f; float moveSpeed = 0.05f;
double x = 0.002; double x = 0.002;