Merge branch 'master' into DDS

Conflicts:
	assets
	src/Engine/Rendering/Texture.cpp
	src/Engine/Rendering/Util/CommonFunctions.cpp
	src/Game/Game.cpp

include/Engine/Rendering/AnimationSystem.h

@@ -3,27 +3,41 @@
 
 #include "GLM.h"
 
-#include "Common.h"
-#include "Core/System.h"
-#include "Core/ResourceManager.h"
+#include "../Common.h"
+#include "../Core/System.h"
+#include "../Core/ResourceManager.h"
 #include "Rendering/Model.h"
-#include "Rendering/EAnimationComplete.h"
 #include "Rendering/Skeleton.h"
-#include <imgui/imgui.h>
+#include "Rendering/BlendTree.h"
+#include "Rendering/EAutoAnimationBlend.h"
+#include "../Core/EntityWrapper.h"
+#include "Rendering/AutoBlendQueue.h"
+#include "../Input/EInputCommand.h"
+#include "../Core/EEntityDeleted.h"
+#include "Rendering/ESetBlendWeight.h"
+#include "imgui/imgui.h"
 
-class AnimationSystem : public PureSystem
+class AnimationSystem : public ImpureSystem
 {
 public:
-    AnimationSystem(SystemParams params)
-        : System(params)
-        , PureSystem("Animation")
-    {
-
-    }
+    AnimationSystem(SystemParams params);
     ~AnimationSystem() { }
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& animationComponent, double dt) override;
+    virtual void Update(double dt) override;
 private:
+    void CreateBlendTrees();
+    void UpdateAnimations(double dt);
+    void UpdateWeights(double dt);
 
+    EventRelay<AnimationSystem, Events::AutoAnimationBlend> m_EAutoAnimationBlend;
+    bool OnAutoAnimationBlend(Events::AutoAnimationBlend& e);
+
+    EventRelay<AnimationSystem, Events::EntityDeleted> m_EEntityDeleted;
+    bool OnEntityDeleted(Events::EntityDeleted& e);
+
+    EventRelay<AnimationSystem, Events::SetBlendWeight> m_ESetBlendWeight;
+    bool OnSetBlendWeight(Events::SetBlendWeight& e);
+
+    std::unordered_map<EntityWrapper, AutoBlendQueue> m_AutoBlendQueues;
 };
 
 #endif

include/Engine/Rendering/AutoBlendQueue.h

@@ -0,0 +1,48 @@
+#ifndef AutoBlendQueue_h__
+#define AutoBlendQueue_h__
+
+#include "../Core/ResourceManager.h"
+#include "Skeleton.h"
+#include "Model.h"
+#include "BlendTree.h"
+#include "../Core/EntityWrapper.h"
+
+class AutoBlendQueue
+{
+public:
+    struct AutoBlendJob
+    {
+        EntityWrapper RootNode = EntityWrapper::Invalid;
+        double Duration;
+        double CurrentTime = 0.0;
+        double Delay = 0.0;
+        EntityWrapper AnimationEntity = EntityWrapper::Invalid;
+        BlendTree::AutoBlendInfo BlendInfo;
+    };
+
+    struct AutoblendNode
+    {
+        AutoBlendJob BlendJob;
+        double StartTime;
+        double EndTime;
+    };
+
+    AutoBlendQueue() { };
+
+    void Insert(AutoBlendJob autoBlendJob);
+    void UpdateTime(double dt);
+
+    void PrintQueue();
+    bool HasActiveBlendJob();
+    std::shared_ptr<BlendTree> GetBlendTree();
+
+    AutoBlendQueue::AutoBlendJob& GetActiveBlendJob();
+
+    bool Empty() { return m_BlendQueue.empty(); }
+private:
+     std::list<AutoblendNode> m_BlendQueue;
+    
+
+};
+
+#endif

include/Engine/Rendering/BlendTree.h

@@ -0,0 +1,104 @@
+#ifndef BlendTree_h__
+#define BlendTree_h__
+
+#include "Common.h"
+#include "../GLM.h"
+#include "Skeleton.h"
+#include "../Core/EntityWrapper.h"
+#include "../Core/World.h"
+#include <stack>
+
+class BlendTree
+{
+public:
+    enum class NodeType
+    {
+        Additive,
+        Blend,
+        Override,
+        Animation,
+    };
+
+    
+
+    struct Node
+    {
+        std::string Name;
+        EntityWrapper Entity;
+        Node* Parent = nullptr;
+        Node* Child[2] = { nullptr, nullptr };
+        NodeType Type;
+        std::map<int, Skeleton::PoseData> Pose;
+        bool SubTreeRoot = false;
+        double Weight = 0.0;
+
+        Node* Next() {
+            Node* next = this;
+
+            if (next->Child[1] == nullptr) {
+                // Node has no right child
+                next = this;
+                while (next->Parent != nullptr && next == next->Parent->Child[1]) {
+                    next = next->Parent;
+                }
+                next = next->Parent;
+            } else {
+                // Find the leftmost node in the right subtree
+                next = next->Child[1];
+                while (next->Child[0] != nullptr) {
+                    next = next->Child[0];
+                }
+            }
+
+            return next;
+
+        }
+    };
+
+  
+    struct AutoBlendInfo
+    {
+        std::string NodeName;
+        double progress;
+        bool Start;
+        bool SingleBlend;
+        double Weight;
+        std::unordered_map<EntityWrapper, double> StartWeights;
+    };
+
+    
+
+    BlendTree(EntityWrapper ModelEntity, Skeleton* skeleton);
+    ~BlendTree();
+
+
+    std::vector<glm::mat4> GetFinalPose() { return m_FinalPose; }
+    glm::mat4 GetBoneTransform(int boneID);
+    bool IsValid() { return  (m_Root == nullptr ? false : true); }
+    void PrintTree();
+    BlendTree::AutoBlendInfo AutoBlendStep(AutoBlendInfo blendInfo);
+
+    BlendTree::Node* GetCommonParent(std::string NodeName1, std::string NodeName2);
+    BlendTree::Node* FirstCommonParent(Node* node1, Node* node2);
+
+    EntityWrapper GetSubTreeRoot(std::string nodeName);
+
+    std::vector<EntityWrapper> GetSingleLevelRoots(std::string name);
+    std::vector<EntityWrapper> GetEntitesByName(std::string name);
+
+    void SetWeightByName(std::string name, double weight);
+
+private:
+    Skeleton* m_Skeleton = nullptr;
+    Node* m_Root = nullptr;
+
+    std::vector<glm::mat4> m_FinalPose;
+    std::map<int, glm::mat4> m_FinalBoneTransforms;
+    std::vector<BlendTree::Node*> FindNodesByName(std::string name);
+    std::vector<glm::mat4> AccumulateFinalPose();
+    BlendTree::Node* FillTreeByName(Node* parentNode, std::string name, EntityWrapper parentEntity);
+
+    void Blend(std::map<int, Skeleton::PoseData>& pose);
+};
+
+#endif

include/Engine/Rendering/BlurHUD.h

@@ -0,0 +1,70 @@
+#ifndef BlurHUD_h__
+#define BlurHUD_h__
+
+#include "IRenderer.h"
+#include "DrawBloomPassState.h"
+//#include "LightCullingPass.h" Finalpass om den skall skickas in
+#include "FrameBuffer.h"
+#include "ShaderProgram.h"
+//#include "Util/UnorderedMapVec2.h"
+#include "Texture.h"
+
+class BlurHUD
+{
+public:
+    BlurHUD(IRenderer* renderer);
+    ~BlurHUD() { }
+    void InitializeTextures();
+    void InitializeFrameBuffers();
+    void InitializeShaderPrograms();
+    void InitializeBuffers();
+    void ClearBuffer();
+
+    void FillGaussianBuffer(FrameBuffer* fb);
+
+    GLuint Draw(GLuint texture, RenderScene& scene);
+
+    void OnWindowResize();
+    void FillStencil(RenderScene& scene);
+    GLuint CombineTextures(GLuint texture1, GLuint texture2);
+
+    //Getters
+    //Return the blurred result of the texture that was sent into draw
+	GLuint GaussianTexture() const { 
+		if (m_Quality == 0) { 
+			return m_BlackTexture->m_Texture;
+		} else { 
+			return m_GaussianTexture_vert;
+		} 
+	}
+
+
+private:
+    Texture* m_BlackTexture;
+    Model* m_ScreenQuad;
+
+    const IRenderer* m_Renderer;
+	ConfigFile* m_Config;
+    //const LightCullingPass* m_LightCullingPass 
+    int m_Iterations = 3;
+	int m_Quality = 0;
+    float m_BlurQuality = 4.f;
+
+    GLuint m_GaussianTexture_horiz = 0;
+    GLuint m_GaussianTexture_vert = 0;
+    GLuint m_DepthStencil_horiz = 0;
+    GLuint m_DepthStencil_vert = 0;
+    GLuint m_CombinedTexture = 0;
+
+    FrameBuffer m_GaussianFrameBuffer_horiz;
+    FrameBuffer m_GaussianFrameBuffer_vert;
+    FrameBuffer m_CombinedTextureBuffer;
+
+    ShaderProgram* m_GaussianProgram_horiz;
+    ShaderProgram* m_GaussianProgram_vert;
+    ShaderProgram* m_FillDepthStencilProgram;
+    ShaderProgram* m_CombineTexturesProgram;
+
+};
+
+#endif 

include/Engine/Rendering/BoneAttachmentSystem.h

@@ -8,6 +8,7 @@
 #include "Core/ResourceManager.h"
 #include "Rendering/Model.h"
 #include "Rendering/Skeleton.h"
+#include "Rendering/BlendTree.h"
 
 //Needs to be a higher orderlevel than AnimationSystem
 class BoneAttachmentSystem : public PureSystem

include/Engine/Rendering/CubeMapPass.h

@@ -15,7 +15,7 @@ public:
     void GenerateCubeMapTexture();
 
     //GLuint CubeMapTexture() const { return m_CubeMapTexture; }
-    GLuint m_CubeMapTexture = -1;
+    GLuint m_CubeMapTexture = 0;
 
 private:
     IRenderer* m_Renderer;

include/Engine/Rendering/DrawBloomPass.h

@@ -13,7 +13,7 @@ class DrawBloomPass
 {
 public:
     DrawBloomPass(IRenderer* renderer, ConfigFile* config);
-    ~DrawBloomPass() { }
+	~DrawBloomPass();
     void InitializeTextures();
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();

include/Engine/Rendering/DrawColorCorrectionPass.h

@@ -17,7 +17,7 @@ public:
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
 
-    void Draw(GLuint sceneTexture, GLuint bloomTexture, GLuint sceneTextureLowRes, GLuint bloomTextureLowRes, GLfloat gamma, GLfloat exposure);
+    void Draw(GLuint sceneTexture, GLuint bloomTexture, GLfloat gamma, GLfloat exposure);
 private:
     const IRenderer* m_Renderer;
 

include/Engine/Rendering/DrawFinalPass.h

@@ -11,35 +11,38 @@
 #include "Util/UnorderedMapVec2.h"
 #include "Util/CommonFunctions.h"
 #include "Texture.h"
+#include "ShadowPass.h"
+#include "BlurHUD.h"
 
 class DrawFinalPass
 {
 public:
-    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass, GLuint* depthBuffer);
-    ~DrawFinalPass() { }
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass, ShadowPass* shadowPass);
+	~DrawFinalPass();
     void InitializeTextures();
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
-    void Draw(RenderScene& scene);
+    void Draw(RenderScene& scene, BlurHUD* blurHUDPass);
     void ClearBuffer();
     void OnWindowResize();
 
     //Return the texture that is used in later stages to apply the bloom effect
     GLuint BloomTexture() const { return m_BloomTexture; }
-    GLuint BloomTextureLowRes() const { return m_BloomTextureLowRes; }
     //Return the texture with diffuse and lighting of the scene.
     GLuint SceneTexture() const { return m_SceneTexture; }
-    GLuint SceneTextureLowRes() const { return m_SceneTextureLowRes; }
+    //Return the SceneTexture with the blurred HUD bits.
+    GLuint CombinedSceneTexture() const { return m_CombinedTexture; }
+    //Return the blurred scene texture.
+    GLuint FullBlurredTexture() const { return m_FullBlurredTexture; }
     //Return the framebuffer used in the scene rendering stage.
     FrameBuffer* FinalPassFrameBuffer() { return &m_FinalPassFrameBuffer; }
-    FrameBuffer* FinalPassFrameBufferLowRes() { return &m_FinalPassFrameBufferLowRes; }
 
 private:
     void DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, RenderScene& scene);
     void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
-    void DrawShieldToStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
+	void DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
     void DrawShieldedModelRenderQueue(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
-    void DrawToDepthBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
+    void DrawToDepthStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
 
     void BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job, RenderScene& scene);
     void BindModelUniforms(GLuint shaderHandle, std::shared_ptr<ModelJob>& job, RenderScene& scene);
@@ -54,14 +57,14 @@ private:
     Texture* m_ErrorTexture;
 
     FrameBuffer m_FinalPassFrameBuffer;
-    FrameBuffer m_FinalPassFrameBufferLowRes;
-    GLuint m_BloomTexture;
-    GLuint m_SceneTexture;
-    GLuint m_BloomTextureLowRes;
-    GLuint m_SceneTextureLowRes;
-    GLuint* m_DepthBuffer;
-    GLuint m_DepthBufferLowRes;
-    GLuint m_CubeMapTexture;
+	FrameBuffer m_ShieldDepthFrameBuffer;
+    GLuint m_BloomTexture = 0;
+    GLuint m_SceneTexture = 0;
+    GLuint m_DepthBuffer = 0;
+	GLuint m_ShieldBuffer = 0;
+    GLuint m_CubeMapTexture = 0;
+    GLuint m_FullBlurredTexture;
+    GLuint m_CombinedTexture; //This can be removed for less memory usage, just set m_sceneTexture to the return from m_BlurHUDPass.CombineTextures 
 
     //maqke this component based i guess?
     GLuint m_ShieldPixelRate = 16;
@@ -70,22 +73,34 @@ private:
     const LightCullingPass* m_LightCullingPass;
     const CubeMapPass* m_CubeMapPass;
 	const SSAOPass* m_SSAOPass;
+	const ShadowPass* m_ShadowPass;
 
     ShaderProgram* m_ForwardPlusProgram;
     ShaderProgram* m_ExplosionEffectProgram;
 	ShaderProgram* m_ExplosionEffectSplatMapProgram;
     ShaderProgram* m_SpriteProgram;
 	ShaderProgram* m_ForwardPlusSplatMapProgram;
-    ShaderProgram* m_ShieldToStencilProgram;
-    ShaderProgram* m_FillDepthBufferProgram;
+    ShaderProgram* m_FillDepthStencilBufferProgram;
+
+	ShaderProgram* m_ForwardPlusShieldCheckProgram;
+	ShaderProgram* m_ExplosionEffectShieldCheckProgram;
+	ShaderProgram* m_ExplosionEffectSplatMapShieldCheckProgram;
+	ShaderProgram* m_SpriteShieldCheckProgram;
+	ShaderProgram* m_ForwardPlusSplatMapShieldCheckProgram;
+
 
 
 	ShaderProgram* m_ForwardPlusSkinnedProgram;
 	ShaderProgram* m_ExplosionEffectSkinnedProgram;
 	ShaderProgram* m_ExplosionEffectSplatMapSkinnedProgram;
 	ShaderProgram* m_ForwardPlusSplatMapSkinnedProgram;
-    ShaderProgram* m_ShieldToStencilSkinnedProgram;
-    ShaderProgram* m_FillDepthBufferSkinnedProgram;
+    ShaderProgram* m_FillDepthStencilBufferSkinnedProgram;
+
+	ShaderProgram* m_ForwardPlusSkinnedShieldCheckProgram;
+	ShaderProgram* m_ExplosionEffectSkinnedShieldCheckProgram;
+	ShaderProgram* m_ExplosionEffectSplatMapSkinnedShieldCheckProgram;
+	ShaderProgram* m_ForwardPlusSplatMapSkinnedShieldCheckProgram;
+	ShaderProgram* m_FillDepthBufferSkinnedShieldCheckProgram;
 };
 
 #endif 

include/Engine/Rendering/EAutoAnimationBlend.h

@@ -0,0 +1,28 @@
+#ifndef Events_AutoAnimationBlend_h__
+#define Events_AutoAnimationBlend_h__
+
+#include "../Core/EventBroker.h"
+#include "../Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct AutoAnimationBlend : Event
+{
+    EntityWrapper RootNode = EntityWrapper::Invalid;
+    std::string NodeName;
+    double Duration = 0.0;
+    double Delay = 0.0;
+    
+    bool Start = false;
+    bool Reverse = false;
+    bool Restart = false;
+    bool SingleLevelBlend = false;
+    double Weight = -1.0;
+
+    EntityWrapper AnimationEntity = EntityWrapper::Invalid;
+};
+
+}
+
+#endif

include/Engine/Rendering/ESetBlendWeight.h

@@ -0,0 +1,20 @@
+#ifndef Events_SetBlendWeight_h__
+#define Events_SetBlendWeight_h__
+
+#include "../Core/EventBroker.h"
+#include "../Core/EntityWrapper.h"
+
+namespace Events
+{
+
+//Sets the blend weight for all nodes with "NodeName"
+struct SetBlendWeight : Event
+{
+    EntityWrapper RootNode = EntityWrapper::Invalid;
+    std::string NodeName;
+    double Weight;
+};
+
+}
+
+#endif

include/Engine/Rendering/ExplosionEffectJob.h

@@ -15,8 +15,8 @@
 
 struct ExplosionEffectJob : ModelJob
 {
-    ExplosionEffectJob(ComponentWrapper explosionEffectComponent, ::Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matGroup, ComponentWrapper modelComponent, ::World* world, glm::vec4 fillColor, float fillPercentage)
-        : ModelJob(model, camera, matrix, matGroup, modelComponent, world, fillColor, fillPercentage)
+    ExplosionEffectJob(ComponentWrapper explosionEffectComponent, ::Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matGroup, ComponentWrapper modelComponent, ::World* world, glm::vec4 fillColor, float fillPercentage, bool isShielded, bool shadow)
+        : ModelJob(model, camera, matrix, matGroup, modelComponent, world, fillColor, fillPercentage, isShielded, shadow)
     {
         ExplosionOrigin = (glm::vec3)explosionEffectComponent["ExplosionOrigin"];
         TimeSinceDeath = (double)explosionEffectComponent["TimeSinceDeath"];

include/Engine/Rendering/FrameBuffer.h

@@ -43,6 +43,16 @@ public:
     ~RenderBuffer();
 };
 
+class Texture2DArray : public ResourceType<GL_TEXTURE_2D_ARRAY>
+{
+public:
+	Texture2DArray(GLuint* resourceHandle, GLenum attachment)
+		: ResourceType(resourceHandle, attachment)
+	{ };
+
+	~Texture2DArray();
+};
+
 class FrameBuffer
 {
 public:

include/Engine/Rendering/ModelJob.h

@@ -15,10 +15,11 @@
 #include "../Core/Transform.h"
 #include "Skeleton.h"
 #include "ShaderProgram.h"
+#include "BlendTree.h"
 
 struct ModelJob : RenderJob
 {
-    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matProp, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage)
+    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matProp, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage, bool isShielded, bool shadow)
         : RenderJob()
     {
         Model = model;
@@ -110,45 +111,28 @@ struct ModelJob : RenderJob
         Color = modelComponent["Color"];
         GlowIntensity = ((double)modelComponent["GlowIntensity"]);
         Entity = modelComponent.EntityID;
-        glm::vec3 abspos = Transform::AbsolutePosition(world, modelComponent.EntityID);
+        glm::vec3 abspos = glm::vec3(matrix[3][0], matrix[3][1], matrix[3][2]);
         glm::vec3 worldpos = glm::vec3(camera->ViewMatrix() * glm::vec4(abspos, 1));
         Depth = worldpos.z;
         World = world;
+		Shadow = shadow;
 
         FillColor = fillColor;
         FillPercentage = fillPercentage;
-
+		IsShielded = isShielded;
 
         if (model->IsSkinned()) {
             Skeleton = Model->m_RawModel->m_Skeleton;
 
             if (Skeleton != nullptr) {
-                if (world->HasComponent(Entity, "Animation")) {
-                    auto animationComponent = world->GetComponent(Entity, "Animation");
+                
+                EntityWrapper entityWrapper = EntityWrapper(world, modelComponent.EntityID);
 
-                    for (int i = 1; i <= 3; i++) {
-                        ::Skeleton::AnimationData animationData;
-                        animationData.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationComponent["AnimationName" + std::to_string(i)]);
-                        if (animationData.animation == nullptr) {
-                            continue;
-                        }
-                        animationData.time = (double)animationComponent["Time" + std::to_string(i)];
-                        animationData.weight = (double)animationComponent["Weight" + std::to_string(i)];
-
-                        Animations.push_back(animationData);
-                    }
-                }
-
-                if (world->HasComponent(Entity, "AnimationOffset")) {
-                    auto animationOffsetComponent = world->GetComponent(Entity, "AnimationOffset");
-                    AnimationOffset.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationOffsetComponent["AnimationName"]);
-                    AnimationOffset.time = (double)animationOffsetComponent["Time"];
-                } else {
-                    AnimationOffset.animation = nullptr;
+                if(Skeleton->BlendTrees.find(entityWrapper) != Skeleton->BlendTrees.end()) {
+                    BlendTree = Skeleton->BlendTrees.at(entityWrapper);
                 }
             }
         }
-            
     };
 
     unsigned int TextureID;
@@ -167,10 +151,7 @@ struct ModelJob : RenderJob
     glm::vec4 Color;
     const ::Model* Model = nullptr;
     ::Skeleton* Skeleton = nullptr;
-    std::vector<::Skeleton::AnimationData> Animations;
-    ::Skeleton::AnimationOffset AnimationOffset;
-    
-
+    std::shared_ptr<::BlendTree> BlendTree = nullptr;
     float GlowIntensity = 8.0;
     glm::vec4 DiffuseColor;
     glm::vec4 SpecularColor;
@@ -181,10 +162,14 @@ struct ModelJob : RenderJob
 
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;
+	bool IsShielded;
+	bool Shadow;
 
     void CalculateHash() override
     {
-        Hash = ShaderID << 20 + ModelID << 10 + TextureID;
+		Hash = TextureID;
+		Hash += ModelID << 10;
+		Hash += ShaderID << 20;
     }
 };
 

include/Engine/Rendering/PickingPass.h

@@ -52,8 +52,8 @@ private:
 
     std::unordered_map<glm::ivec2, PickingInfo> m_PickingColorsToEntity;
 
-    GLuint m_PickingTexture;
-    GLuint m_DepthBuffer;
+    GLuint m_PickingTexture = 0;
+    GLuint m_DepthBuffer = 0;
 
     FrameBuffer m_PickingBuffer;
 

include/Engine/Rendering/RenderJob.h

@@ -16,16 +16,15 @@ struct RenderJob
 public:
     float Depth;
 
+	bool operator<(const RenderJob& rhs)
+	{
+		return this->Hash < rhs.Hash;
+	}
+
 protected:
     uint64_t Hash;
 
     virtual void CalculateHash() = 0;
-
-    bool operator<(const RenderJob& rhs)
-    {
-        return this->Hash < rhs.Hash;
-    }
-
 };
 
 #endif

include/Engine/Rendering/RenderQueue.h

@@ -24,7 +24,6 @@ struct RenderScene
         std::list<std::shared_ptr<RenderJob>> OpaqueObjects;
         std::list<std::shared_ptr<RenderJob>> TransparentObjects;
         std::list<std::shared_ptr<RenderJob>> OpaqueShieldedObjects;
-        std::list<std::shared_ptr<RenderJob>> TransparentShieldedObjects;
         std::list<std::shared_ptr<RenderJob>> ShieldObjects;
         std::list<std::shared_ptr<RenderJob>> SpriteJob;
         std::list<std::shared_ptr<RenderJob>> PointLight;
@@ -34,6 +33,7 @@ struct RenderScene
 
     Rectangle Viewport;
     bool ClearDepth = false;
+    bool ShouldBlur = false;
     glm::vec4 AmbientColor;
 
 	void Clear()
@@ -41,7 +41,6 @@ struct RenderScene
         Jobs.OpaqueObjects.clear();
         Jobs.TransparentObjects.clear();
         Jobs.OpaqueShieldedObjects.clear();
-        Jobs.TransparentShieldedObjects.clear();
         Jobs.ShieldObjects.clear();
         Jobs.SpriteJob.clear();
         Jobs.DirectionalLight.clear();

include/Engine/Rendering/Renderer.h

@@ -18,6 +18,7 @@
 #include "DrawColorCorrectionPass.h"
 #include "SSAOPass.h"
 #include "CubeMapPass.h"
+#include "BlurHUD.h"
 #include "../Core/EventBroker.h"
 #include "ImGuiRenderPass.h"
 #include "Camera.h"
@@ -26,6 +27,7 @@
 #include "TextPass.h"
 #include "Util/CommonFunctions.h"
 #include "Core/PerformanceTimer.h"
+#include "ShadowPass.h"
 
 class Renderer : public IRenderer
 {
@@ -36,6 +38,7 @@ public:
 		: m_EventBroker(eventBroker)
 		, m_Config(config)
     { }
+	~Renderer();
 
     virtual void Initialize() override;
     virtual void Update(double dt) override;
@@ -75,6 +78,8 @@ private:
     DrawColorCorrectionPass* m_DrawColorCorrectionPass;
 	SSAOPass* m_SSAOPass;
     CubeMapPass* m_CubeMapPass;
+	ShadowPass* m_ShadowPass;
+    BlurHUD* m_BlurHUDPass;
 
     //----------------------Functions----------------------//
     void InitializeWindow();

include/Engine/Rendering/SSAOPass.h

@@ -14,7 +14,7 @@ class SSAOPass
 {
 public:
 	SSAOPass(IRenderer* renderer, ConfigFile* config);
-	~SSAOPass() { };
+	~SSAOPass();
 
 	void ChangeQuality(int quality);
 

include/Engine/Rendering/ShaderProgram.h

@@ -21,6 +21,8 @@ public:
 	std::string GetFileName() const;
 	GLuint GetHandle() const;
 	bool IsCompiled() const;
+    static std::string ReadFile(std::string fileName);
+private:
 protected:
 	GLenum m_ShaderType;
 	std::string m_FileName;

include/Engine/Rendering/ShadowPass.h

@@ -0,0 +1,87 @@
+#ifndef ShadowPass_h__
+#define ShadowPass_h__
+
+#include "IRenderer.h"
+#include "FrameBuffer.h"
+#include "ShaderProgram.h"
+#include "../Core/EventBroker.h"
+#include "../Core/World.h"
+#include "ShadowPassState.h"
+#include "imgui/imgui.h"
+
+#define MAX_SPLITS 4
+
+enum NearFar { NEAR = 0, FAR = 1 };
+enum LRBT { LEFT = 0, RIGHT = 1, BOTTOM = 2, TOP = 3 };
+
+struct ShadowFrustum
+{
+	float NearClip;
+	float FarClip;
+	float FOV;
+	float AspectRatio;
+	glm::vec3 MiddlePoint;
+	float Radius;
+	std::array<float, 4> LRBT;
+	std::array<glm::vec3, 8> CornerPoint;
+};
+
+class ShadowPass
+{
+public:
+	ShadowPass(IRenderer* renderer);
+	ShadowPass(IRenderer * renderer, int ShadowResX, int ShadowResY);
+	~ShadowPass();
+
+	void InitializeFrameBuffers();
+	void InitializeShaderPrograms();
+	void ClearBuffer();
+	void Draw(RenderScene& scene);
+
+	void DebugGUI();
+
+	GLuint DepthMap() const { return m_DepthMap; }
+	std::array<glm::mat4, MAX_SPLITS> LightP() const { return m_LightProjection; }
+	std::array<glm::mat4, MAX_SPLITS> LightV() const { return m_LightView; }
+	std::array<float, MAX_SPLITS> FarDistance() const { std::array<float, MAX_SPLITS> f; for (int i = 0; i < MAX_SPLITS; i++) f[i] = m_shadowFrusta[i].FarClip; return f; }
+	int CurrentNrOfSplits() const { return m_CurrentNrOfSplits; }
+
+	void SetSplitWeight(float split_weight) { m_SplitWeight = split_weight; };
+private:
+	void InitializeCameras(RenderScene & scene);
+	void UpdateSplitDist(std::array<ShadowFrustum, MAX_SPLITS>& frusta, float near_distance, float far_distance);
+	void UpdateFrustumPoints(ShadowFrustum& frustum, glm::vec3 camera_position, glm::vec3 view_dir);
+	void UpdateFrustumPoints(ShadowFrustum& frustum, glm::mat4 p, glm::mat4 v);
+
+	void PointsToLightspace(ShadowFrustum& frustum, glm::mat4 v);
+
+	float FindRadius(ShadowFrustum& frustum);
+	void RadiusToLightspace(ShadowFrustum& frustum);
+
+	EventBroker* m_EventBroker;
+	const IRenderer* m_Renderer;
+
+	GLuint m_DepthMap;
+	FrameBuffer m_DepthBuffer;
+	ShaderProgram* m_ShadowProgram;
+
+	std::array<glm::mat4, MAX_SPLITS> m_LightProjection;
+	std::array<glm::mat4, MAX_SPLITS> m_LightView;
+
+	GLfloat m_NearFarPlane[2] = { -34.f, 27.f };
+	GLuint m_ResolutionSizeWidth = 1024 * 2;
+	GLuint m_ResolutionSizeHeight = 1024 * 2;
+
+	bool m_TransparentObjects = false;
+	bool m_TexturedShadows = false;
+	bool m_EnableShadows = true;
+
+	int m_CurrentNrOfSplits = 4;
+	float m_SplitWeight = 0.962f;
+
+	std::array<ShadowFrustum, MAX_SPLITS> m_shadowFrusta;
+
+	Texture* m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/White.png");
+};
+
+#endif

include/Engine/Rendering/ShadowPassState.h

@@ -0,0 +1,15 @@
+#ifndef ShadowPassState_h_
+#define ShadowPassState_h_
+
+#include "Rendering/RenderState.h"
+
+class ShadowPassState : public RenderState
+{
+public:
+	ShadowPassState(GLuint frameBuffer);
+	~ShadowPassState();
+
+private:
+};
+
+#endif

include/Engine/Rendering/Skeleton.h

@@ -6,27 +6,9 @@
 #include "../GLM.h"
 #include <glm/gtx/matrix_decompose.hpp>
 #include <imgui/imgui.h>
+#include "../Core/EntityWrapper.h"
 
-//struct Bone
-//{
-//	Bone(std::string name, glm::mat4 offsetMatrix)
-//		: Name(name)
-//		, OffsetMatrix(offsetMatrix)
-//	{ }
-//
-//	~Bone()
-//	{
-//		for (auto kv : Children) {
-//			delete kv.second;
-//		}
-//	}
-//
-//	std::string Name;
-//	glm::mat4 OffsetMatrix;
-//	glm::mat4 LocalMatrix;
-//
-//	std::map<std::string, Bone*> Children;
-//};
+class BlendTree;
 
 class Skeleton
 {
@@ -68,58 +50,43 @@ public:
         std::map<int, std::vector<Keyframe>> JointAnimations;
 	};
 
-    struct AnimationData
-    {
-        const Animation* animation;
-        float time;
-        float weight;
-    };
-
-    struct JointFrameTransform {
-        glm::vec3 PositionInterp = glm::vec3(0);
-        glm::quat RotationInterp = glm::quat();
-        glm::vec3 ScaleInterp = glm::vec3(0);
-        float Weight;
-    };
-
-    struct AnimationOffset {
-        const Animation* animation;
-        float time;
+    struct PoseData {
+        glm::vec3 Translation;
+        glm::quat Orientation;
+        glm::vec3 Scale;
     };
 
 	Skeleton() { }
 	~Skeleton();
 
 	Bone* RootBone;
-
 	std::map<int, Bone*> Bones;
 
+    std::unordered_map<EntityWrapper, std::shared_ptr<BlendTree>> BlendTrees;
+
 	// Attach a new bone to the skeleton
 	// Returns: New bone index
 	int CreateBone(int ID, int parentID, std::string name, glm::mat4 offsetMatrix);
-
 	int GetBoneID(std::string name);
-
-    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, AnimationOffset animationOffset, bool noRootMotion = false);
-    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, bool noRootMotion = false);
-
     const Animation* GetAnimation(std::string name);
 
-    void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
-    void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, AnimationOffset animationOffset, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
+    std::map<int, Skeleton::PoseData> GetFrameBones(const Animation* animation, double time, bool additive, bool noRootMotion = false);
+    
+    std::map<int, Skeleton::PoseData> BlendPoses(const std::map<int, PoseData>& pose1, const std::map<int, PoseData>& pose2, double weight);
+    std::map<int, Skeleton::PoseData> OverridePose(const std::map<int, PoseData>& overridePose, const std::map<int, PoseData>& targetPose);
+    std::map<int, Skeleton::PoseData> BlendPoseAdditive(const std::map<int, PoseData>& additivePose, const std::map<int, PoseData>& targetPose);
+    void GetFinalPose(std::map<int, Skeleton::PoseData>& boneMatrices, std::vector<glm::mat4>& finalPose, std::map<int, glm::mat4>& boneTransforms);
+    
+    std::vector<glm::mat4> GetTPose();
 
-    void PrintSkeleton();
-	void PrintSkeleton(const Bone* parent, int depthCount);
-	std::map<std::string, Animation> Animations;
-
-    glm::mat4 GetBoneTransform(const Bone* bone, const Animation* animation, float time, glm::mat4 childMatrix);
-    glm::mat4 GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, AnimationOffset animationOffset, glm::mat4 childMatrix);
-    glm::mat4 GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, glm::mat4 childMatrix);
-    int GetKeyframe(const Animation& animation, double time);
 
+    std::map<std::string, Animation> Animations;
 private:
-
-    glm::mat4 GetOffsetTransform(const Bone* bone, AnimationOffset animationOffset);
+    Skeleton::PoseData GetAdditiveBonePose(const Bone* bone, const Animation* animation, double time);
+    
+    void AccumulateFinalPose(std::map<int, glm::mat4>& boneMatrices, std::map<int, Skeleton::PoseData>& poseDatas, std::map<int, glm::mat4>& boneTransforms, const Bone* bone, glm::mat4 parentMatrix);
+    void AdditiveBoneTransforms(const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone);
+    void AccumulateBoneTransforms(bool noRootMotion, const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone);
 
 	std::map<std::string, Bone*> m_BonesByName;
     

include/Engine/Rendering/SpriteJob.h

@@ -7,6 +7,7 @@
 #include "../GLM.h"
 #include "../Core/ComponentWrapper.h"
 #include "Texture.h"
+#include "TextureSprite.h"
 #include "Model.h"
 #include "RenderJob.h"
 #include "../Core/ResourceManager.h"
@@ -24,14 +25,16 @@ struct SpriteJob : RenderJob
         ::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
         TextureID = 0;
 
-        DiffuseTexture = CommonFunctions::LoadTexture(cSprite["DiffuseTexture"], true);
+        DiffuseTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["DiffuseTexture"]);
 
-        IncandescenceTexture = CommonFunctions::LoadTexture(cSprite["GlowMap"], true);
+        IncandescenceTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["GlowMap"]);
 
         StartIndex = matProp.material->StartIndex;
         EndIndex = matProp.material->EndIndex;
 		Matrix = matrix;
         Color = cSprite["Color"];
+        BlurBackground = (bool)cSprite["BlurBackground"];
+
         Entity = cSprite.EntityID;
         Position = Transform::AbsolutePosition(world, cSprite.EntityID);
         Depth = 0;
@@ -65,6 +68,7 @@ struct SpriteJob : RenderJob
 
     bool Pickable;
 	bool IsIndicator = false;
+    bool BlurBackground = false;
 
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;

include/Engine/Rendering/Texture.h

@@ -11,7 +11,7 @@ class Texture : public BaseTexture
 {
 	friend class ResourceManager;
 
-private:
+protected:
 	Texture(std::string path);
 
 public:

include/Engine/Rendering/TextureSprite.h

@@ -0,0 +1,26 @@
+#ifndef TextureSprite_h__
+#define TextureSprite_h__
+
+#include "../OpenGL.h"
+#include "BaseTexture.h"
+#include "Texture.h"
+#include "PNG.h"
+
+class TextureSprite : public Texture
+{
+	friend class ResourceManager;
+
+protected:
+	TextureSprite(std::string path);
+
+public:
+	~TextureSprite();
+
+	void Bind(GLenum textureUnit = GL_TEXTURE0);
+
+	GLuint m_Texture = 0;
+    unsigned char* Data = nullptr;
+    
+};
+
+#endif

include/Engine/Rendering/Util/CommonFunctions.h

@@ -8,7 +8,23 @@
 
 namespace CommonFunctions
 { 
-Texture* LoadTexture(std::string path, bool threaded);
+
+//Loads Texture/SpriteTexture and return null if it fails
+template <typename T, bool threaded>
+Texture* TryLoadResource(std::string path)
+{
+    Texture* img;
+    try {
+        img = ResourceManager::Load<T, threaded>(path);
+    } catch (const Resource::StillLoadingException&) {
+        img = ResourceManager::Load<T>("Textures/Core/ErrorTexture.png");
+    } catch (const std::exception&) {
+        img = nullptr;
+    }
+
+    return img;
+}
+
 void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
 void GenerateMultiSampleTexture(GLuint* texture, int numSamples, glm::vec2 dimensions, GLint internalFormat);
 void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps);