Merge branch 'feature/animation' into dev

Author: denis-beqiraj

Engine/Shaders/AnimationPipeline/vertex_deferred.glsl

@@ -0,0 +1,65 @@
+#version 460 core
+layout(location = 0) in vec3 aPos;
+layout(location = 1) in vec3 aNormal;
+layout(location = 2) in vec2 aTexCoords;
+layout(location = 3) in vec3 aTangent;
+layout(location = 4) in vec2 aBitangent;
+layout(location = 5) in ivec4 boneIds;
+layout(location = 6) in vec4 weights;
+
+const int MAX_BONES = 128;
+const int MAX_BONE_INFLUENCE = 4;
+
+out vec3 FragPos;
+out vec3 viewPos;
+
+out vec2 TexCoords;
+
+out vec3 Normal;
+flat out int drawId;
+
+layout(std140, binding = 1) uniform MeshData
+{
+    mat4 view;
+    mat4 projection;
+};
+
+layout(std430, binding = 6) buffer AnimationMatrices
+{
+    mat4 modelAnimationMatrices[];
+};
+
+struct SSBOAnimation {
+    mat4 animations[MAX_BONES];
+};
+
+layout(std430, binding = 8) buffer BoneMatrices
+{
+    SSBOAnimation boneMatrices[];
+};
+
+void main()
+{
+    vec4 totalPosition = vec4(0.0f);
+    for (int i = 0; i < MAX_BONE_INFLUENCE; i++)
+    {
+        if (boneIds[i] == -1)
+            continue;
+        if (boneIds[i] >= MAX_BONES)
+        {
+            totalPosition = vec4(aPos, 1.0f);
+            break;
+        }
+        vec4 localPosition = boneMatrices[gl_DrawID].animations[boneIds[i]] * vec4(aPos, 1.0f);
+        totalPosition += localPosition * weights[i];
+    }
+    drawId = gl_DrawID;
+    FragPos = vec3(modelAnimationMatrices[gl_DrawID] * vec4(aPos, 1.0));
+    TexCoords = aTexCoords;
+    mat3 normalMatrix = mat3(transpose(inverse(mat3(modelAnimationMatrices[gl_DrawID]))));
+    Normal = normalMatrix * aNormal;
+
+    viewPos = vec3(inverse(view)[3]);
+
+    gl_Position = projection * view * modelAnimationMatrices[gl_DrawID] * totalPosition;
+}

Engine/Shaders/AnimationPipeline/vertex_omni.glsl

@@ -0,0 +1,40 @@
+#version 460 core
+layout(location = 0) in vec3 aPos;
+layout(location = 5) in ivec4 boneIds;
+layout(location = 6) in vec4 weights;
+
+const int MAX_BONES = 128;
+const int MAX_BONE_INFLUENCE = 4;
+
+layout(std430, binding = 6) buffer AnimationMatrices
+{
+    mat4 modelAnimationMatrices[];
+};
+
+struct SSBOAnimation {
+    mat4 animations[MAX_BONES];
+};
+
+layout(std430, binding = 8) buffer BoneMatrices
+{
+    SSBOAnimation boneMatrices[];
+};
+
+void main()
+{
+    vec4 totalPosition = vec4(0.0f);
+    for (int i = 0; i < MAX_BONE_INFLUENCE; i++)
+    {
+        if (boneIds[i] == -1)
+            continue;
+        if (boneIds[i] >= MAX_BONES)
+        {
+            totalPosition = vec4(aPos, 1.0f);
+            break;
+        }
+        vec4 localPosition = boneMatrices[gl_DrawID].animations[boneIds[i]] * vec4(aPos, 1.0f);
+        totalPosition += localPosition * weights[i];
+    }
+
+    gl_Position = modelAnimationMatrices[gl_DrawID] * totalPosition;
+}

Engine/Shaders/DeferredPipeline/fragment.glsl

@@ -1,5 +1,4 @@
-#version 460 core
-#extension GL_ARB_bindless_texture : enable
+
 
 in vec3 FragPos;
 in vec2 TexCoords;
@@ -18,14 +17,23 @@ struct MaterialData {
     vec2 padding;
 };
 
+MaterialData currentMaterial;
+
+#if defined(ANIMATE)
+layout(std430, binding = 7) buffer MaterialAnimation
+{
+    MaterialData materialDataAnimation[];
+};
+#else
 layout(std430, binding = 0) buffer Material
 {
     MaterialData materialData[];
 };
+#endif
 
 vec3 getNormalFromMap()
 {
-    vec3 tangentNormal = texture(materialData[drawId].normal, TexCoords).xyz * 2.0 - 1.0;
+    vec3 tangentNormal = texture(currentMaterial.normal, TexCoords).xyz * 2.0 - 1.0;
 
     vec3 Q1 = dFdx(FragPos);
     vec3 Q2 = dFdy(FragPos);
@@ -42,14 +50,19 @@ vec3 getNormalFromMap()
 
 void main()
 {
+#if defined(ANIMATE)
+    currentMaterial = materialDataAnimation[drawId];
+#else
+    currentMaterial = materialData[drawId];
+#endif
     // store the fragment position vector in the first gbuffer texture
     gPosition.rgb = FragPos;
     // also store the per-fragment normals into the gbuffer
     gNormal.rgb = getNormalFromMap();
     // and the diffuse per-fragment color
-    gAlbedoSpec.rgb = texture(materialData[drawId].diffuse, TexCoords).rgb;
+    gAlbedoSpec.rgb = texture(currentMaterial.diffuse, TexCoords).rgb;
 
-    vec4 roughnessMetalnessTexture = texture(materialData[drawId].roughness_metalness, TexCoords);
+    vec4 roughnessMetalnessTexture = texture(currentMaterial.roughness_metalness, TexCoords);
 
     gAlbedoSpec.a= roughnessMetalnessTexture.b;
     gNormal.a = roughnessMetalnessTexture.g;

Engine/Shaders/DeferredPipeline/fragment_d.glsl

@@ -30,8 +30,6 @@ layout(std430, binding = 5) restrict buffer clusterSSBO
     Cluster clusters[];
 };
 
-uniform vec3 viewPos;
-
 struct ShadowData {
     mat4 shadow;
 };
@@ -79,9 +77,14 @@ layout(std430, binding = 3) buffer Omni
     OmniData omniData[];
 };
 
-layout(bindless_sampler) uniform samplerCube irradianceMap;
-layout(bindless_sampler) uniform samplerCube prefilterMap;
-layout(bindless_sampler) uniform sampler2D brdfLUT;
+layout(std140, binding = 3) uniform FragmentData
+{
+    vec4 viewPos;
+    samplerCube irradianceMap;
+    samplerCube prefilterMap;
+    sampler2D brdfLUT;
+    vec2 paddingFragment;
+};
 
 const float PI = 3.14159265359;
 
@@ -149,7 +152,7 @@ float ShadowCalculation(vec3 fragPos,vec3 lightPos,int depthMapId)
     float shadow = 0.0;
     float bias = 0.15;
     int samples = 20;
-    float viewDistance = length(viewPos - fragPos);
+    float viewDistance = length(viewPos.xyz - fragPos);
     float diskRadius = (1.0 + (viewDistance / omniData[depthMapId].far_plane.r)) / 25.0;
     for(int i = 0; i < samples; ++i)
     {
@@ -213,7 +216,7 @@ void main()
     float roughness = texture(gNormal, TexCoords).a;
     float metallic = texture(gAlbedo, TexCoords).a;
 
-    vec3 V = normalize(viewPos - FragPos);
+    vec3 V = normalize(viewPos.xyz - FragPos);
 
     vec3 F0 = vec3(0.04);
     F0 = mix(F0, albedo, metallic);

Engine/Shaders/ForwardPipeline/fragment.glsl

@@ -1,10 +1,8 @@
-#version 460 core
-#extension GL_ARB_bindless_texture : enable
+
 out vec4 FragColor;
 
 in vec3 FragPos;
 in vec2 TexCoords;
-uniform vec3 viewPos;
 in vec3 Normal;
 flat in int drawId;
 in vec4 shadowDirData[16];
@@ -47,6 +45,15 @@ layout(std140, binding = 1) uniform MeshData
     mat4 projection;
 };
 
+layout(std140, binding = 3) uniform FragmentData
+{
+    vec4 viewPos;
+    samplerCube irradianceMap;
+    samplerCube prefilterMap;
+    sampler2D brdfLUT;
+    vec2 paddingFragment;
+};
+
 struct OmniData {
     vec4 position;
     vec4 diffuse;
@@ -64,14 +71,19 @@ struct MaterialData {
     vec2 padding;
 };
 
-layout(bindless_sampler) uniform samplerCube irradianceMap;
-layout(bindless_sampler) uniform samplerCube prefilterMap;
-layout(bindless_sampler) uniform sampler2D brdfLUT;
+MaterialData currentMaterial;
 
+#if defined(ANIMATE)
+layout(std430, binding = 7) buffer MaterialAnimation
+{
+    MaterialData materialDataAnimation[];
+};
+#else
 layout(std430, binding = 0) buffer Material
 {
     MaterialData materialData[];
 };
+#endif
 
 layout(std430, binding = 2) buffer Directional
 {
@@ -99,7 +111,7 @@ const float PI = 3.14159265359;
 
 vec3 getNormalFromMap()
 {
-    vec3 tangentNormal = texture(materialData[drawId].normal, TexCoords).xyz * 2.0 - 1.0;
+    vec3 tangentNormal = texture(currentMaterial.normal, TexCoords).xyz * 2.0 - 1.0;
 
     vec3 Q1 = dFdx(FragPos);
     vec3 Q2 = dFdy(FragPos);
@@ -178,7 +190,7 @@ float ShadowCalculation(vec3 fragPos,vec3 lightPos,int depthMapId)
     float shadow = 0.0;
     float bias = 0.15;
     int samples = 20;
-    float viewDistance = length(viewPos - fragPos);
+    float viewDistance = length(viewPos.xyz - fragPos);
     float diskRadius = (1.0 + (viewDistance / omniData[depthMapId].far_plane.r)) / 25.0;
     for(int i = 0; i < samples; ++i)
     {
@@ -233,14 +245,19 @@ float ShadowCalculationDirectional(vec3 fragPosWorldSpace,vec3 lightPos,vec3 N,u
 
 void main()
 {
-    vec3 albedo = texture(materialData[drawId].diffuse, TexCoords).rgb;
-    vec4 roughnessMetalnessTexture = texture(materialData[drawId].roughness_metalness, TexCoords);
+    #if defined(ANIMATE)
+    currentMaterial = materialDataAnimation[drawId];
+    #else
+    currentMaterial = materialData[drawId];
+    #endif
+    vec3 albedo = texture(currentMaterial.diffuse, TexCoords).rgb;
+    vec4 roughnessMetalnessTexture = texture(currentMaterial.roughness_metalness, TexCoords);
     float metallic = roughnessMetalnessTexture.b;
     float roughness = roughnessMetalnessTexture.g;
 
     vec3 N = getNormalFromMap();
 
-    vec3 V = normalize(viewPos - FragPos);
+    vec3 V = normalize(viewPos.xyz - FragPos);
 
     vec3 F0 = vec3(0.04);
     F0 = mix(F0, albedo, metallic);

Engine/include/Handlers/AnimationHandler.h

@@ -8,21 +8,25 @@
 namespace Prisma {
 	class AnimationHandler {
 	public:
+		struct SSBOAnimation {
+			glm::mat4 animations[MAX_BONES];
+		};
 		AnimationHandler(const AnimationHandler&) = delete;
 		AnimationHandler& operator=(const AnimationHandler&) = delete;
 
 		static AnimationHandler& getInstance();
 
 		void updateAnimations();
 
+		std::vector<SSBOAnimation>& animations();
+
 		AnimationHandler();
 
 	private:
 		std::shared_ptr<SSBO> m_ssboAnimation;
-		struct SSBOAnimation {
-			glm::mat4 animations[MAX_BONES];
-		};
 		void copyMatrices(SSBOAnimation& animation, std::vector<glm::mat4>& animationsData);
+		std::vector<SSBOAnimation> m_animations;
+
 		static std::shared_ptr<AnimationHandler> instance;
 	};
 }

Engine/include/Handlers/MeshHandler.h

@@ -21,6 +21,14 @@ namespace Prisma {
 			float padding[2];
 		};
 
+		struct alignas(16) UBOFragment {
+			glm::vec4 viewPos;
+			uint64_t irradiancePos;
+			uint64_t prefilterPos;
+			uint64_t lutPos;
+			glm::vec2 padding;
+		};
+
 		static const unsigned int VIEW_OFFSET = 0;
 		static const unsigned int PROJECTION_OFFSET = sizeof(glm::mat4);
 
@@ -30,6 +38,7 @@ namespace Prisma {
 		MeshHandler& operator=(const MeshHandler&) = delete;
 		void updateCamera();
 		void updateCluster();
+		void updateFragment();
 
 		static MeshHandler& getInstance();
 
@@ -39,7 +48,9 @@ namespace Prisma {
         std::shared_ptr<UBOData> m_uboData;
 		std::shared_ptr<Ubo> m_ubo;
 		std::shared_ptr<Ubo> m_uboCluster;
+		std::shared_ptr<Ubo> m_uboFragment;
 		UBOCluster m_uboClusterData;
+		UBOFragment m_fragment;
 		Prisma::Settings m_settings;
 		static std::shared_ptr<MeshHandler> instance;
 	};