refactor(render): unify model and player rendering with single shader pipeline

assets/shaders/model_frag.glsl

@@ -3,13 +3,45 @@
 in vec2 tc;
 in vec3 normal;
 in vec3 vert_pos;
-
+in vec4 FragPosLightSpace;
 out vec4 color;
 
-layout (binding = 0) uniform sampler2D samp;
+layout (binding = 0) uniform sampler2D shadowMap;
+layout (binding = 1) uniform sampler2D samp;
 
+uniform float ambientStrength;
+uniform vec3 sunlightColor;
+uniform vec3 ambientColor;
+uniform vec3 sunlightDir;
+uniform bool shader_on;
+uniform int shadowMode;
+uniform float lightSizeUV; 
+uniform float minRadius;
+uniform float maxRadius;
+
+#include "shadow.glsl"
 
 void main() {
-    color = texture(samp, tc);
+    vec4 objectColor = texture(samp, tc);
 
+    if (!shader_on) {
+        color = objectColor;
+        return;
+    }
+   
+    vec3 lightDir = normalize(-sunlightDir);
+    
+    vec3 norm = normalize(normal);
+
+    vec3 ambient = ambientStrength * ambientColor;
+    
+    float diff = max(dot(norm, lightDir), 0.0);
+    
+    vec3 diffuse = diff * sunlightColor;
+ 
+    float shadow = ShadowCalculation(FragPosLightSpace, norm, lightDir);  
+    //float shadow = 0.0;
+    //color = vec4(vec3(shadow),1);
+    //color = vec4(vec3(diff),1);
+    color = vec4((ambient + (1.0 - shadow) * (diffuse)) * objectColor.rgb, objectColor.a);
 }

assets/shaders/model_vert.glsl

@@ -6,17 +6,21 @@ layout (location = 2) in vec3 aNormal;
 
 uniform mat4 mv_matrix;
 uniform mat4 proj_matrix;
-
+uniform mat4 norm_matrix;
+uniform mat4 lightSpaceMatrix;
+uniform mat4 modelMatrix;
+out vec4 FragPosLightSpace;
 out vec3 normal;
 out vec2 tc;
 out vec3 vert_pos;
 
 
 void main() {
-    //vec4 worldPos = modelMatrix * vec4(pos, 1.0);
+    vec4 worldPos = modelMatrix * vec4(pos, 1.0);
+    FragPosLightSpace = lightSpaceMatrix * worldPos;
     vec4 viewPos = mv_matrix * vec4(pos, 1.0);
     tc = texCoord;
     vert_pos = pos;
-    //normal = normalize(mat3(norm_matrix) * aNormal);
+    normal = normalize(mat3(norm_matrix) * aNormal);
     gl_Position = proj_matrix * viewPos;
 }

assets/shaders/player_f_shader.glsl

@@ -1,47 +0,0 @@
-#version 460
-
-in vec2 tc;
-in vec3 normal;
-in vec3 vert_pos;
-in vec4 FragPosLightSpace;
-out vec4 color;
-
-layout (binding = 0) uniform sampler2D shadowMap;
-layout (binding = 1) uniform sampler2D samp;
-
-uniform float ambientStrength;
-uniform vec3 sunlightColor;
-uniform vec3 ambientColor;
-uniform vec3 sunlightDir;
-uniform bool shader_on;
-uniform int shadowMode;
-uniform float lightSizeUV; 
-uniform float minRadius;
-uniform float maxRadius;
-
-#include "shadow.glsl"
-
-void main() {
-    vec4 objectColor = texture(samp, tc);
-
-    if (!shader_on) {
-        color = objectColor;
-        return;
-    }
-   
-    vec3 lightDir = normalize(-sunlightDir);
-    
-    vec3 norm = normalize(normal);
-
-    vec3 ambient = ambientStrength * ambientColor;
-    
-    float diff = max(dot(norm, lightDir), 0.0);
-    
-    vec3 diffuse = diff * sunlightColor;
- 
-    float shadow = ShadowCalculation(FragPosLightSpace, norm, lightDir);  
-    //float shadow = 0.0;
-    //color = vec4(vec3(shadow),1);
-    //color = vec4(vec3(diff),1);
-    color = vec4((ambient + (1.0 - shadow) * (diffuse)) * objectColor.rgb, objectColor.a);
-}

assets/shaders/player_v_shader.glsl

@@ -1,27 +0,0 @@
-#version 460
-
-layout (location = 0) in vec3 pos;
-layout (location = 1) in vec2 texCoord;
-layout (location = 2) in vec3 aNormal;
-layout (location = 3) in vec3 aTangent;
-
-uniform mat4 mv_matrix;
-uniform mat4 proj_matrix;
-uniform mat4 norm_matrix;
-uniform mat4 lightSpaceMatrix;
-uniform mat4 modelMatrix;
-out vec4 FragPosLightSpace;
-out vec3 normal;
-out vec2 tc;
-out vec3 vert_pos;
-
-
-void main() {
-    vec4 worldPos = modelMatrix * vec4(pos, 1.0);
-    FragPosLightSpace = lightSpaceMatrix * worldPos;
-    vec4 viewPos = mv_matrix * vec4(pos, 1.0);
-    tc = texCoord;
-    vert_pos = pos;
-    normal = normalize(mat3(norm_matrix) * aNormal);
-    gl_Position = proj_matrix * viewPos;
-}