Merge pull request #19 from ProtectedVariable/animation-system

Animation system

Author: ProtectedVariable

Assets/Shaders/frag_uniforms.glsl

@@ -0,0 +1,15 @@
+#define MAX_LIGHTS 16
+
+struct Light {
+    vec3 position;         
+    vec3 rotation;         
+    vec3 color;            
+    float distance_dropoff;
+    int type;
+};
+
+layout(std140, binding = 1) uniform SceneLightsUBO {
+    Light lights[MAX_LIGHTS];
+    vec4 ambient_light;
+    int light_count;
+};

Assets/Shaders/lastpass.fs

@@ -1,4 +1,4 @@
-#version 330 core
+#version 420 core
 
 out vec4 fragColor;
 

Assets/Shaders/lastpass.vs

@@ -1,4 +1,4 @@
-#version 330 core
+#version 420 core
 layout (location = 0) in vec3 aPos;
 layout (location = 1) in vec2 aUV;
 

Assets/Shaders/normal.fs

@@ -1,4 +1,4 @@
-#version 330 core
+#version 420 core
 
 out vec4 frag_color;
 

Assets/Shaders/normal.vs

@@ -1,15 +1,15 @@
-#version 330 core
+#version 420 core
+
+#include "vert_uniforms.glsl"
 
 layout (location = 0) in vec3 vertex;
 layout (location = 1) in vec3 normal;
 
-uniform mat4 projection;
-uniform mat4 view;
 uniform mat4 model;
 
 out vec3 f_normal;
 
 void main() {
     f_normal = abs(normal);
-    gl_Position = projection * view * model * vec4(vertex, 1.0);
+    gl_Position = uProjection * uView * model * vec4(vertex, 1.0);
 }

Assets/Shaders/phong.fs

@@ -1,15 +1,8 @@
-#version 330 core
-#define ICE_MAX_LIGHTS (16)
+#version 420 core
 
-out vec4 frag_color;
+#include "frag_uniforms.glsl"
 
-struct Light {
-    vec3 position;
-    vec3 rotation;
-    vec3 color;
-    int type; //0 = Point, 1 = Directional, 2 = Spot
-    float distance_dropoff;
-};
+out vec4 frag_color;
 
 struct Material {
     vec4 albedo;
@@ -26,9 +19,6 @@ struct Material {
     sampler2D normal_map;
 };
 
-uniform vec3 ambient_light;
-uniform Light lights[ICE_MAX_LIGHTS];
-uniform int light_count;
 uniform Material material;
 
 in vec3 fnormal;
@@ -88,7 +78,7 @@ void main() {
         normal = fnormal;
     }
     //ambient
-    vec4 color_accumulator = material.ambient * vec4(ambient_light, 1.0);
+    vec4 color_accumulator = material.ambient * ambient_light;
     if(material.use_ambient_map) {
         color_accumulator *= texture(material.ambient_map, ftex_coords);
     }

Assets/Shaders/phong.vs

@@ -1,22 +1,67 @@
-#version 330 core
+#version 420 core
+
+#include "vert_uniforms.glsl"
+#define MAX_BONES 100
+#define MAX_BONE_INFLUENCE 4
 
 layout (location = 0) in vec3 vertex;
 layout (location = 1) in vec3 normal;
 layout (location = 2) in vec2 tex_coords;
+layout (location = 3) in vec3 tangent;
+layout (location = 4) in vec3 bitangent;
+layout (location = 5) in ivec4 bone_ids;
+layout (location = 6) in vec4 bone_weights;
 
-uniform mat4 projection;
-uniform mat4 view;
 uniform mat4 model;
+uniform mat4 bonesTransformMatrices[MAX_BONES];
+uniform mat4 bonesOffsetMatrices[MAX_BONES];
 
 out vec3 fnormal;
+out vec3 ftangent;
+out vec3 fbitangent;
 out vec3 fposition;
 out vec3 fview;
 out vec2 ftex_coords;
 
 void main() {
-    fview = (inverse(view) * vec4(0, 0, 0, 1)).xyz;
-    fnormal = normalize(mat3(transpose(inverse(model))) * normal);
-    fposition = (model * vec4(vertex, 1.0)).xyz;
+    vec4 totalPosition = vec4(0.0f);
+    vec3 totalNormal = vec3(0.0f);
+    vec3 totalTangent = vec3(0.0f);
+    vec3 totalBitangent = vec3(0.0f);
+	
+	if(bone_ids == ivec4(-1)) {
+		totalPosition = vec4(vertex, 1.0f);
+        totalNormal = normal;
+	} else {
+		for(int i = 0 ; i < MAX_BONE_INFLUENCE ; i++) {
+			if(bone_ids[i] == -1) continue;
+		   
+			if(bone_ids[i] >= MAX_BONES) {
+				totalPosition = vec4(vertex, 1.0f);
+				totalNormal = normal;
+				break; 
+			}
+			
+			mat4 finalBonesMatrix = bonesTransformMatrices[bone_ids[i]] * bonesOffsetMatrices[bone_ids[i]];
+			
+			totalPosition += finalBonesMatrix * vec4(vertex, 1.0f) * bone_weights[i];
+			
+			mat3 normalMatrix = mat3(transpose(inverse(finalBonesMatrix)));
+			totalNormal += normalMatrix * normal * bone_weights[i];
+			totalTangent += normalMatrix * tangent * bone_weights[i];
+			totalBitangent += normalMatrix * bitangent * bone_weights[i];
+		}
+	}
+
+
+    fposition = (model * totalPosition).xyz; 
+	mat3 normalModelMatrix = mat3(transpose(inverse(model)));
+    fnormal = normalize(normalModelMatrix * totalNormal); 
+    ftangent = normalize(normalModelMatrix * totalTangent); 
+    fbitangent = normalize(normalModelMatrix * totalBitangent); 
+
+    gl_Position = uProjection * uView * model * totalPosition;
+
+    fview = (inverse(uView) * vec4(0, 0, 0, 1)).xyz;
     ftex_coords = tex_coords;
-    gl_Position = projection * view * model * vec4(vertex, 1.0);
 }

Assets/Shaders/picking.fs

@@ -1,4 +1,4 @@
-#version 330 core
+#version 420 core
 
 uniform int objectID;
 

Assets/Shaders/picking.vs

@@ -1,12 +1,12 @@
-#version 330 core
+#version 420 core
+
+#include "vert_uniforms.glsl"
 
 layout (location = 0) in vec3 vertex;
 layout (location = 1) in vec3 normal;
 
-uniform mat4 projection;
-uniform mat4 view;
 uniform mat4 model;
 
 void main() {
-    gl_Position = projection * view * model * vec4(vertex, 1.0);
+    gl_Position = uProjection * uView * model * vec4(vertex, 1.0);
 }

Assets/Shaders/skybox.fs

@@ -1,4 +1,4 @@
-#version 330 core
+#version 420 core
 out vec4 FragColor;
 
 in vec3 TexCoords;