WIP

resources/Shaders/FillDepthBuffer.vert.glsl

@@ -1,8 +1,6 @@
 #version 430
 
-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
+uniform mat4 PVM;
 
 layout(location = 0) in vec3 Position;
 layout(location = 5) in vec4 BoneIndices;
@@ -15,7 +13,7 @@ out VertexData{
 
 void main()
 {
-	gl_Position = P * V * M * vec4(Position, 1.0);
+	gl_Position = PVM * vec4(Position, 1.0);
 
 	Output.Position = Position;
 }

resources/Shaders/FillDepthBufferSkinned.vert.glsl

@@ -1,8 +1,6 @@
 #version 430
 
-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
+uniform mat4 PVM;
 uniform mat4 Bones[100];
 
 
@@ -27,7 +25,7 @@ void main()
 				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
 	}
 
-	gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
+	gl_Position = PVM*boneTransform * vec4(Position, 1.0);
 
 	Output.Position = vec3(0.0);
 }

resources/Shaders/ForwardPlus.frag.glsl

@@ -2,6 +2,7 @@
 
 #define MIN_AMBIENT_LIGHT 0.3
 
+uniform mat4 VM;
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -11,7 +12,7 @@ uniform vec2 ScreenDimensions;
 uniform vec4 FillColor;
 uniform vec4 AmbientColor;
 uniform float FillPercentage;
-uniform float GlowIntensity = 10;
+uniform float GlowIntensity;
 uniform vec3 CameraPosition;
 uniform int SSAOQuality;
 
@@ -131,7 +132,7 @@ void main()
 	vec4 diffuseTexel = texture2D(DiffuseTexture, Input.TextureCoordinate * DiffuseUVRepeat);
 	vec4 glowTexel = texture2D(GlowMapTexture, Input.TextureCoordinate * GlowUVRepeat);
 	vec4 specularTexel = texture2D(SpecularMapTexture, Input.TextureCoordinate * SpecularUVRepeat);
-	vec4 position = V * M * vec4(Input.Position, 1.0); 
+	vec4 position = VM * vec4(Input.Position, 1.0); 
 	vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate * NormalUVRepeat, NormalMapTexture);
 	normal = normalize(normal);
 	//vec4 normal = normalize(V  * vec4(Input.Normal, 0.0));

resources/Shaders/ForwardPlus.vert.glsl

@@ -1,5 +1,6 @@
 #version 430
-
+uniform mat4 PVM;
+uniform mat4 TIM;
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -22,8 +23,8 @@ out VertexData{
 
 void main()
 {
-	gl_Position = P*V*M * vec4(Position, 1.0);
-	mat4 TIM = transpose(inverse(M));
+	gl_Position = PVM * vec4(Position, 1.0);
+	//mat4 TIM = transpose(inverse(M));
 	Output.Position = Position;
 	Output.TextureCoordinate = TextureCoords;
 	Output.Normal = vec3(TIM * vec4(Normal, 0.0));

resources/Shaders/ForwardPlusShieldCheck.frag.glsl

@@ -2,6 +2,7 @@
 
 #define MIN_AMBIENT_LIGHT 0.3
 
+uniform mat4 VM;
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -11,7 +12,7 @@ uniform vec2 ScreenDimensions;
 uniform vec4 FillColor;
 uniform vec4 AmbientColor;
 uniform float FillPercentage;
-uniform float GlowIntensity = 10;
+uniform float GlowIntensity;
 uniform vec3 CameraPosition;
 uniform int SSAOQuality;
 
@@ -138,7 +139,7 @@ void main()
 	vec4 diffuseTexel = texture2D(DiffuseTexture, Input.TextureCoordinate * DiffuseUVRepeat);
 	vec4 glowTexel = texture2D(GlowMapTexture, Input.TextureCoordinate * GlowUVRepeat);
 	vec4 specularTexel = texture2D(SpecularMapTexture, Input.TextureCoordinate * SpecularUVRepeat);
-	vec4 position = V * M * vec4(Input.Position, 1.0); 
+	vec4 position = VM * vec4(Input.Position, 1.0); 
 	vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate * NormalUVRepeat, NormalMapTexture);
 	normal = normalize(normal);
 	//vec4 normal = normalize(V  * vec4(Input.Normal, 0.0));

resources/Shaders/ForwardPlusSkinned.vert.glsl

@@ -1,5 +1,7 @@
 #version 430
 
+uniform mat4 PVM;
+uniform mat4 TIM;
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -34,7 +36,7 @@ void main()
 				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
 	}
 
-	gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
+	gl_Position = PVM*boneTransform * vec4(Position, 1.0);
 	
 	Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
 	Output.TextureCoordinate = TextureCoords;

resources/Shaders/ForwardPlusSplatMapRGB.frag.glsl

@@ -2,6 +2,7 @@
 
 #define MIN_AMBIENT_LIGHT 0.3
 
+uniform mat4 VM;
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -189,7 +190,7 @@ void main()
 	 									 GlowUVRepeat1, GlowUVRepeat2, GlowUVRepeat3);
 	vec4 specularTexel = CalcBlendedTexel(splatTexel, SpecularMapTexture1, SpecularMapTexture2, SpecularMapTexture3,
 										 SpecularUVRepeat1, SpecularUVRepeat2, SpecularUVRepeat3);
-	vec4 position = V * M * vec4(Input.Position, 1.0); 
+	vec4 position = VM * vec4(Input.Position, 1.0); 
 	//vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate, SplatMapTexture);
 	vec4 normal = V * CalcBlendedNormal(splatTexel, NormalMapTexture1, NormalMapTexture2, NormalMapTexture3,
 		   								NormalUVRepeat1, NormalUVRepeat2, NormalUVRepeat3);

resources/Shaders/ForwardPlusSplatMapRGBShieldCheck.frag.glsl

@@ -2,6 +2,7 @@
 
 #define MIN_AMBIENT_LIGHT 0.3
 
+uniform mat4 VM;
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -190,7 +191,7 @@ void main()
 	 									 GlowUVRepeat1, GlowUVRepeat2, GlowUVRepeat3);
 	vec4 specularTexel = CalcBlendedTexel(splatTexel, SpecularMapTexture1, SpecularMapTexture2, SpecularMapTexture3,
 										 SpecularUVRepeat1, SpecularUVRepeat2, SpecularUVRepeat3);
-	vec4 position = V * M * vec4(Input.Position, 1.0); 
+	vec4 position = VM * vec4(Input.Position, 1.0); 
 	//vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate, SplatMapTexture);
 	vec4 normal = V * CalcBlendedNormal(splatTexel, NormalMapTexture1, NormalMapTexture2, NormalMapTexture3,
 		   								NormalUVRepeat1, NormalUVRepeat2, NormalUVRepeat3);

resources/Shaders/Picking.vert.glsl

@@ -1,8 +1,6 @@
 #version 430
-
-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
+#include "StandarUniform.glsl"
+layout(location = PVM_UNIFORM_LOCATION) uniform mat4 PVM;
 
 layout(location = 0) in vec3 Position;
 layout(location = 1) in vec3 Normal;
@@ -16,6 +14,6 @@ out VertexData{
 
 void main()
 {
-	gl_Position = P*V*M * vec4(Position, 1.0);
+	gl_Position = PVM * vec4(Position, 1.0);
 	Output.Position = Position, 1.0;
 }

resources/Shaders/PickingSkinned.vert.glsl

@@ -1,8 +1,6 @@
 #version 430
-
-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
+#include "StandarUniform.glsl"
+layout(location = PVM_UNIFORM_LOCATION) uniform mat4 PVM;
 uniform mat4 Bones[100];
 
 layout(location = 0) in vec3 Position;
@@ -27,6 +25,6 @@ void main()
 				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
 	}
 
-	gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
+	gl_Position = PVM*boneTransform * vec4(Position, 1.0);
 	Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
 }

resources/Shaders/Sprite.frag.glsl

@@ -3,8 +3,6 @@
 uniform vec4 Color;
 uniform vec4 FillColor;
 uniform float FillPercentage;
-uniform mat4 M;
-uniform mat4 V;
 uniform mat4 P;
 
 layout (binding = 1) uniform sampler2D DiffuseTexture;

resources/Shaders/Sprite.vert.glsl

@@ -1,8 +1,6 @@
 #version 430
 
-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
+uniform mat4 PVM;
 
 layout(location = 0) in vec3 Position;
 layout(location = 1) in vec3 Normal;
@@ -17,7 +15,7 @@ out VertexData{
 void main()
 {
 
-	gl_Position = P * V * M * vec4(Position, 1.0);
+	gl_Position = PVM* vec4(Position, 1.0);
 
 	Output.Position = Position;
 	Output.TextureCoordinate = TextureCoords;

resources/Shaders/StandarUniform.glsl

@@ -0,0 +1,55 @@
+//----- SHADER DEFINES -----
+#define MAX_BONES 100
+#define MIN_AMBIENT_LIGHT 0.3
+
+//----- UNIFORM LOCATION -----
+#define PVM_UNIFORM_LOCATION 100
+#define VM_UNIFORM_LOCATION 101
+#define VP_UNIFORM_LOCATION 102
+#define TIM_UNIFORM_LOCATION 103
+#define M_UNIFORM_LOCATION 104
+#define V_UNIFORM_LOCATION 105
+#define P_UNIFORM_LOCATION 106
+
+#define BONES_LOCATION 200
+
+#define AMBIENT_COLOR_UNIFORM_LOCATION 300
+#define COLOR_UNIFORM_LOCATION 301
+#define DIFFUSE_COLOR_UNIFORM_LOCATION 302
+#define SCREEN_DIMENSIONS_UNIFORM_LOCATION 303
+#define FILL_COLOR_UNIFORM_LOCATION 304
+#define FILL_PERCENTAGE_UNIFORM_LOCATION 305
+#define GLOW_INTENSITY_UNIFORM_LOCATION 306
+#define CAMERA_POSITION_UNIFORM_LOCATION 306
+#define SSAO_QUALITY_UNIFORM_LOCATION 308
+
+#define LOCAL_UNIFORM_LOCATION1;
+
+//----- TEXTURE LOCATION -----
+#define SSAO_TEXTURE_LOCATION 0
+#define SHADOW_TEXTURE_LOCATION 1
+#define LOCAL_TEXTURE_LOCATION1 2
+#define LOCAL_TEXTURE_LOCATION2 3
+#define LOCAL_TEXTURE_LOCATION3 4
+#define LOCAL_TEXTURE_LOCATION4 5
+#define LOCAL_TEXTURE_LOCATION5 6
+#define LOCAL_TEXTURE_LOCATION6 7
+#define LOCAL_TEXTURE_LOCATION7 8
+#define LOCAL_TEXTURE_LOCATION8 9
+#define LOCAL_TEXTURE_LOCATION9 10
+#define LOCAL_TEXTURE_LOCATION10 11
+#define LOCAL_TEXTURE_LOCATION11 12
+#define LOCAL_TEXTURE_LOCATION12 13
+#define LOCAL_TEXTURE_LOCATION13 14
+#define LOCAL_TEXTURE_LOCATION14 15
+#define LOCAL_TEXTURE_LOCATION15 16
+#define LOCAL_TEXTURE_LOCATION16 17
+#define LOCAL_TEXTURE_LOCATION17 18
+#define LOCAL_TEXTURE_LOCATION18 19
+#define LOCAL_TEXTURE_LOCATION19 20
+#define LOCAL_TEXTURE_LOCATION20 21
+#define LOCAL_TEXTURE_LOCATION21 22
+#define LOCAL_TEXTURE_LOCATION22 23
+#define LOCAL_TEXTURE_LOCATION23 24
+#define LOCAL_TEXTURE_LOCATION24 25
+#define LOCAL_TEXTURE_LOCATION25 26