Added support for rendering multiple lights, standardized shaders to use snake case for variables and camel case for functions, stubbed PBR material shader include.

assets/shaders/vertex/g_buffer.glsl

@@ -1,28 +1,28 @@
 # version 330 core
 
-layout(location = 0) in vec3 inPosition;
-layout(location = 1) in vec3 inColor;
-layout(location = 2) in vec3 inNormal;
-layout(location = 3) in vec3 inUV;
+layout(location = 0) in vec3 in_position;
+layout(location = 1) in vec3 in_color;
+layout(location = 2) in vec3 in_normal;
+layout(location = 3) in vec3 in_uv;
 
 uniform mat4 projection, view, model;
-uniform int hasTexture;
-uniform vec3 cameraPos;
+uniform int has_texture;
+uniform vec3 camera_pos;
 
-out vec3 outPosition, outColor, outNormal, outUV;
-out vec3 outFragPos, outViewPos, outCameraPos;
-flat out int outHasTexture;
+out vec3 out_position, out_color, out_normal, out_uv;
+out vec3 out_frag_pos, out_view_pos, out_camera_pos;
+flat out int out_has_texture;
 
 void main() {
   // projection * view * model * position
-  outPosition = inPosition;
-  outColor = inColor;
-  outNormal= normalize(transpose(inverse(mat3(model))) * inNormal);
-  outUV    = inUV;
-  outHasTexture = hasTexture;
-  outCameraPos = cameraPos;
+  out_position = in_position;
+  out_color = in_color;
+  out_normal= normalize(transpose(inverse(mat3(model))) * in_normal);
+  out_uv    = in_uv;
+  out_has_texture = has_texture;
+  out_camera_pos = camera_pos;
 
-  outFragPos = vec3(model * vec4(inPosition, 1.0));
+  out_frag_pos = vec3(model * vec4(in_position, 1.0));
 
-  gl_Position = projection * view * model * vec4(inPosition, 1.0);
+  gl_Position = projection * view * model * vec4(in_position, 1.0);
 }

assets/shaders/vertex/lighting.glsl

@@ -1,17 +1,24 @@
 #version 330 core
 @include "light_struct"
 
-layout (location = 0) in vec3 inPosition;
-layout (location = 1) in vec2 inTexCoords;
+layout (location = 0) in vec3 in_position;
+layout (location = 1) in vec2 in_tex_coords;
 
 uniform sampler2D diffuse, position, texcoord, normal, depth;
-uniform Light light[1];
+uniform int light_count;
+uniform Light lights[7];
 
-out vec2 outTexCoords;
-flat out Light outLight[1];
+out vec2 out_tex_coords;
+flat out int out_light_count;
+flat out Light out_lights[7];
 
 void main() {
-  gl_Position = vec4(inPosition.x, inPosition.y, inPosition.z, 1.0);
-  outTexCoords = inTexCoords;
-  outLight = light;
-}
+  gl_Position = vec4(in_position.x, in_position.y, in_position.z, 1.0);
+  out_tex_coords = in_tex_coords;
+  out_light_count = light_count;
+
+  for(int i = 0; i < light_count; i++)
+  {
+    out_lights[i] = lights[i];
+  }
+}