Merge branch 'merge_with_textures' of https://git.wmi.amu.edu.pl/s473559/Grafika2023 into merge_with_textures

# Conflicts:
#	PlanetCreator/cw 6/shaders/shader_5_1_tex.frag

PlanetCreator/cw 6/shaders/shader_5_1_tex.frag

@@ -2,9 +2,17 @@
 
 float AMBIENT = 0.2; 
 
-uniform vec3 color;
 uniform vec3 lightPos;
-uniform sampler2D colorTexture;
+uniform vec3 viewPos;
+
+in vec3 FragPos; // Pozycja fragmentu
+in vec3 Normal; // Normalna fragmentu
+out vec4 FragColor;
+
+// Obliczenie faktora odbicia ?wietlnego dla modelu PBR
+float DistributionGGX(vec3 N, vec3 H, float roughness);
+float GeometrySchlickGGX(float NdotV, float roughness);
+float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness);
 
 const float PI = 3.14159265359;