Merge remote-tracking branch 'origin/master' into AssaultBoost

# Conflicts:
#	resources/Schema/Components.xsd

include/Engine/Collision/Collision.h

@@ -28,6 +28,21 @@ bool RayVsAABB(const Ray& ray, const AABB& box);
 //Return true if the ray hits the box, also outputs distance from ray origin to intersection point in [outDistance].
 bool RayVsAABB(const Ray& ray, const AABB& box, float& outDistance);
 
+//Return true if the ray hits the triangle.
+bool RayVsTriangle(const Ray& ray,
+    const glm::vec3& v0,
+    const glm::vec3& v1,
+    const glm::vec3& v2,
+    bool trueOnNegativeDistance = false);
+//Return true if the ray hits the triangle, and the distance is less than outDistance.
+bool RayVsTriangle(const Ray& ray,
+    const glm::vec3& v0,
+    const glm::vec3& v1,
+    const glm::vec3& v2,
+    float& outDistance,
+    float& outUCoord,
+    float& outVCoord,
+    bool trueOnNegativeDistance = false);
 //Return true if the ray hits any of the triangles in the model. Stops checking when a hit is detected.
 bool RayVsModel(const Ray& ray, 
     const std::vector<RawModel::Vertex>& modelVertices,
@@ -52,6 +67,9 @@ bool AABBvsTriangles(const AABB& box,
     const std::vector<RawModel::Vertex>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix,
+    glm::vec3& boxVelocity,
+    float verticalStepHeight,
+    bool& isOnGround,
     glm::vec3& outResolutionVector);
 
 //Return true if the boxes are intersecting.

include/Engine/Collision/FillFrustumOctreeSystem.h

@@ -1,17 +1,17 @@
-#ifndef CollidableOctreeSystem_h__
-#define CollidableOctreeSystem_h__
+#ifndef FillFrustumOctreeSystem_h__
+#define FillFrustumOctreeSystem_h__
 
 #include "../Core/System.h"
 #include "../Core/Octree.h"
 #include "Collision.h"
 #include "EntityAABB.h"
 
-class CollidableOctreeSystem : public ImpureSystem, public PureSystem
+class FillFrustumOctreeSystem : public ImpureSystem, public PureSystem
 {
 public:
-    CollidableOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree, const std::string& componentType)
+    FillFrustumOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree)
         : System(world, eventBroker)
-        , PureSystem(componentType)
+        , PureSystem("Model")
         , m_Octree(octree)
     { }
 

include/Engine/Collision/FillOctreeSystem.h

@@ -0,0 +1,25 @@
+#ifndef FillOctreeSystem_h__
+#define FillOctreeSystem_h__
+
+#include "../Core/System.h"
+#include "../Core/Octree.h"
+#include "Collision.h"
+#include "EntityAABB.h"
+
+class FillOctreeSystem : public ImpureSystem, public PureSystem
+{
+public:
+    FillOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree, const std::string& fillComponentType)
+        : System(world, eventBroker)
+        , PureSystem(fillComponentType)
+        , m_Octree(octree)
+    { }
+
+    virtual void Update(double dt) override;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
+
+private:
+    Octree<EntityAABB>* m_Octree;
+};
+
+#endif

include/Engine/Core/ComponentWrapper.h

@@ -43,6 +43,11 @@ struct ComponentWrapper
     // Specialization for string literals
     template <std::size_t N>
     void SetField(std::string name, const char(&value)[N]) { Field<std::string>(name) = std::string(value); }
+
+    void Copy(ComponentWrapper& destination)
+    {
+        memcpy(destination.Data, this->Data, Info.Stride);
+    }
     
     struct SubscriptProxy
     {

include/Engine/Core/EPickupSpawned.h

@@ -0,0 +1,17 @@
+#ifndef EPickupSpawned_h__
+#define EPickupSpawned_h__
+
+#include "Core/Event.h"
+#include "Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct PickupSpawned : Event
+{
+    EntityWrapper Pickup;
+};
+
+}
+
+#endif

include/Engine/Core/EPlayerDamage.h

@@ -9,6 +9,7 @@ namespace Events
 
 struct PlayerDamage : Event
 {
+    //NOTE: this struct is missing information on what the damageSource is
     EntityWrapper Player;
     double Damage;
 };

include/Engine/Core/EPlayerDeath.h

@@ -2,7 +2,7 @@
 #define EPlayerDeath_h__
 
 #include "EventBroker.h"
-#include "../Core/Entity.h"
+#include "../Core/EntityWrapper.h"
 
 namespace Events
 {
@@ -10,8 +10,7 @@ namespace Events
 struct PlayerDeath : Event
 {
     //KilledBy,KilledByWhat is optional for now. It might be used later in the playerlog-system
-    EntityID KilledBy;
-    EntityID PlayerID;
+    EntityWrapper Player;
     std::string KilledByWhat;
 };
 

include/Engine/Core/EntityWrapper.h

@@ -25,6 +25,7 @@ struct EntityWrapper
 
     const std::string Name();
     bool HasComponent(const std::string& componentType);
+    void AttachComponent(const char* componentName);
     EntityWrapper Parent();
     EntityWrapper FirstChildByName(const std::string& name);
     EntityWrapper FirstParentWithComponent(const std::string& componentType);

include/Engine/Core/Frustum.h

@@ -0,0 +1,77 @@
+#ifndef Frustum_h__
+#define Frustum_h__
+
+#include "../GLM.h"
+#include "AABB.h"
+#include <bitset>
+
+//A frustum defined by 6 planes.
+struct Frustum
+{
+    //Contains points P in: dot(normal, P) + d = 0
+    struct Plane
+    {
+        glm::vec3 Normal;
+        float Distance;
+    };
+
+    enum class Output
+    {
+        Inside,
+        Outside,
+        Intersects
+    };
+    Plane Planes[6];
+
+    Frustum() = default;
+    Frustum(glm::mat4x4 viewProjMatrix)
+    {
+        //Order: Right, left, top, bottom, far, near.
+        int sign = 1;
+        for (int i = 0; i < 6; ++i) {
+            sign = -sign;
+            int index = i / 2;
+            Plane& plane = Planes[i];
+            plane.Normal.x = viewProjMatrix[0].w + sign * viewProjMatrix[0][index];
+            plane.Normal.y = viewProjMatrix[1].w + sign * viewProjMatrix[1][index];
+            plane.Normal.z = viewProjMatrix[2].w + sign * viewProjMatrix[2][index];
+            plane.Distance = viewProjMatrix[3].w + sign * viewProjMatrix[3][index];
+            float divByNormalLength = 1.0f / glm::length(plane.Normal);
+            plane.Normal *= divByNormalLength;
+            plane.Distance *= divByNormalLength;
+        }
+    }
+
+    Output VsAABB(const AABB& box) const
+    {
+        const glm::vec3& maxCorner = box.MaxCorner();
+        const glm::vec3& minCorner = box.MinCorner();
+        bool completelyInside = true;
+        for (const Plane& p : Planes) {
+            bool anyWasInside = false;
+            bool anyWasOutside = false;
+            //If points are on both sides of the plane, we can stop.
+            for (int i = 0; i < 8 && (!anyWasInside || !anyWasOutside); ++i) {
+                std::bitset<3> bits(i);
+                glm::vec3 corner;
+                corner.x = bits.test(0) ? maxCorner.x : minCorner.x;
+                corner.y = bits.test(1) ? maxCorner.y : minCorner.y;
+                corner.z = bits.test(2) ? maxCorner.z : minCorner.z;
+                if (glm::dot(p.Normal, corner) > -p.Distance) {
+                    anyWasInside = true;
+                } else {
+                    anyWasOutside = true;
+                }
+            }
+            if (!anyWasInside) {
+                return Output::Outside;
+            }
+            if (anyWasOutside) {
+                completelyInside = false;
+            }
+        }
+        return completelyInside ? Output::Inside : Output::Intersects;
+    }
+};
+
+#endif

include/Engine/Core/MemoryPool.h

@@ -102,7 +102,7 @@ public:
 			m_ExtraMemory.push_back((char*)malloc(m_Stride));
 			//We should preferably not enter here to avoid performance issues. Set more numMaxElements in constructor instead.
             if (!DisableMemoryPool::Value) {
-			    LOG_WARNING("Allocated slots exceed Pool size, extra memory allocated dynamically. Pool size: %u, dynamic size: %u.", m_NumSlots, m_ExtraMemory.size());
+			    LOG_DEBUG("Allocated slots exceed Pool size, extra memory allocated dynamically. Pool size: %u, dynamic size: %u.", m_NumSlots, m_ExtraMemory.size());
             }
 			return m_ExtraMemory.back();
 		}

include/Engine/Core/Octree.h

@@ -5,6 +5,7 @@
 
 #include "../Common.h"
 #include "AABB.h"
+#include "Frustum.h"
 
 //Fwd declarations.
 class Ray;
@@ -40,6 +41,8 @@ public:
     //The type Box must be AABB, or inherit from AABB.
     template<typename Box>
     void ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects);
+    //Get the objects that are inside the frustum, the objects are put in outObjects.
+    void ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects);
     //Empty the tree of all objects, static and dynamic.
     void ClearObjects();
     //Empty the tree of all dynamic objects. Static objects remain in the tree.
@@ -97,6 +100,8 @@ struct Child
     void AddStaticObject(const AABB& box);
     template<typename T, typename Box>
     void ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects) const;
+    template<typename T>
+    void ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects, bool takeAllDontTest) const;
     void ClearObjects();
     void ClearDynamicObjects();
     bool RayCollides(const Ray& ray, Output& data) const;
@@ -111,7 +116,7 @@ struct Child
     std::vector<ContainedObject>& m_StaticObjectsRef;
     std::vector<ContainedObject>& m_DynamicObjectsRef;
 
-    bool hasChildren() const;
+    inline bool hasChildren() const { return m_Children[0] != nullptr; }
     int childIndexContainingPoint(const glm::vec3& point) const;
     std::vector<int> childIndicesContainingBox(const AABB& box) const;
 };
@@ -154,6 +159,13 @@ void Octree<T>::ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects)
     m_Root->ObjectsInSameRegion(box, outObjects);
 }
 
+template<typename T>
+void Octree<T>::ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects)
+{
+    falsifyObjectChecks();
+    m_Root->ObjectsInFrustum(frustum, outObjects, false);
+}
+
 template<typename T>
 void Octree<T>::ClearObjects()
 {
@@ -230,4 +242,46 @@ void OctSpace::Child::ObjectsInSameRegion(const Box& box, std::vector<T>& outObj
     }
 }
 
+template<typename T>
+void OctSpace::Child::ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects, bool takeAllDontTest) const
+{
+    if (hasChildren()) {
+        for (const Child* c : m_Children) {
+            Frustum::Output out = Frustum::Output::Inside;
+            if (!takeAllDontTest) {
+                out = frustum.VsAABB(c->m_Box);
+                if (out == Frustum::Output::Outside) {
+                    continue;
+                }
+            }
+            c->ObjectsInFrustum(frustum, outObjects, out == Frustum::Output::Inside);
+        }
+    } else {
+        size_t startIndex = outObjects.size();
+        int numDuplicates = 0;
+        outObjects.resize(outObjects.size() + m_StaticObjIndices.size() + m_DynamicObjIndices.size());
+        for (size_t i = 0; i < m_StaticObjIndices.size(); ++i) {
+            ContainedObject& obj = m_StaticObjectsRef[m_StaticObjIndices[i]];
+            if (obj.Checked || frustum.VsAABB(*obj.Box) == Frustum::Output::Outside) {
+                ++numDuplicates;
+            } else {
+                obj.Checked = true;
+                outObjects[startIndex + i - numDuplicates] = *static_cast<T*>(obj.Box.get());
+            }
+        }
+        for (size_t i = 0; i < m_DynamicObjIndices.size(); ++i) {
+            ContainedObject& obj = m_DynamicObjectsRef[m_DynamicObjIndices[i]];
+            if (obj.Checked || frustum.VsAABB(*obj.Box) == Frustum::Output::Outside) {
+                ++numDuplicates;
+            } else {
+                obj.Checked = true;
+                outObjects[startIndex + i - numDuplicates] = *static_cast<T*>(obj.Box.get());
+            }
+        }
+        for (size_t i = 0; i < numDuplicates; ++i) {
+            outObjects.pop_back();
+        }
+    }
+}
+
 #endif

include/Engine/Core/Ray.h

@@ -7,6 +7,10 @@
 class Ray
 {
 public:
+    Ray()
+        : m_Origin(glm::vec3(0.f))
+        , m_Direction(glm::vec3(0, 0, 1))
+    {}
     Ray(const glm::vec3& origin, const glm::vec3& dir)
         : m_Origin(origin)
         , m_Direction(glm::normalize(dir))

include/Engine/Core/Transform.h

@@ -18,6 +18,7 @@ glm::vec3 AbsoluteScale(EntityWrapper entity);
 glm::vec3 AbsoluteScale(World* world, EntityID entity);
 glm::mat4 ModelMatrix(EntityWrapper entity);
 glm::mat4 ModelMatrix(EntityID entity, World* world);
+glm::vec3 TransformPoint(const glm::vec3& point, const glm::mat4& matrix);
 
 }
 

include/Engine/Input/FirstPersonInputController.h

@@ -4,6 +4,7 @@
 #include "../GLM.h"
 #include "../Core/InputController.h"
 #include "../Core/ELockMouse.h"
+#include "../Game/Events/EDashAbility.h"
 #include "InputHandler.h"
 
 template <typename EventContext>
@@ -230,6 +231,9 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     m_AssaultDashDoubleTapped = true;
     m_AssaultDashDoubleTapDeltaTime = 0.f;
     m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
+
+    Events::DashAbility e;
+    m_EventBroker->Publish(e);
 }
 
 #endif

include/Engine/Rendering/DrawColorCorrectionPass.h

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

include/Engine/Rendering/DrawFinalPass.h

@@ -22,15 +22,23 @@ public:
 
     //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 framebuffer used in the scene rendering stage.
     FrameBuffer* FinalPassFrameBuffer() { return &m_FinalPassFrameBuffer; }
+    FrameBuffer* FinalPassFrameBufferLowRes() { return &m_FinalPassFrameBufferLowRes; }
 
 
 private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
     void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps) const;
-    void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& job, 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 DrawShieldedModelRenderQueue(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
+    void DrawToDepthBuffer(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);
@@ -44,15 +52,24 @@ private:
     Texture* m_GreyTexture;
 
     FrameBuffer m_FinalPassFrameBuffer;
+    FrameBuffer m_FinalPassFrameBufferLowRes;
     GLuint m_BloomTexture;
     GLuint m_SceneTexture;
+    GLuint m_BloomTextureLowRes;
+    GLuint m_SceneTextureLowRes;
     GLuint m_DepthBuffer;
+    GLuint m_DepthBufferLowRes;
+
+    //maqke this component based i guess?
+    GLuint m_ShieldPixelRate = 16;
 
     const IRenderer* m_Renderer;
     const LightCullingPass* m_LightCullingPass;
 
     ShaderProgram* m_ForwardPlusProgram;
     ShaderProgram* m_ExplosionEffectProgram;
+    ShaderProgram* m_ShieldToStencilProgram;
+    ShaderProgram* m_FillDepthBufferProgram;
 };
 
 #endif 

include/Engine/Rendering/DrawFinalPassState.h

@@ -12,4 +12,11 @@ private:
 
 };
 
+class DrawStencilState : public RenderState
+{
+public:
+    DrawStencilState(GLuint frameBuffer);
+    ~DrawStencilState();
+};
+
 #endif

include/Engine/Rendering/Model.h

@@ -4,6 +4,7 @@
 #include "Rendering/RawModelCustom.h"
 //#include "Rendering/RawModelAssimp.h"
 #include "../OpenGL.h"
+#include "Core/AABB.h"
 
 class Model : public ThreadUnsafeResource
 {
@@ -17,13 +18,15 @@ public:
     const std::vector<RawModel::MaterialGroup>& MaterialGroups() const { return m_RawModel->MaterialGroups; }
     const glm::mat4& Matrix() const { return m_RawModel->m_Matrix; }
     const std::vector<RawModel::Vertex>& Vertices() const { return m_RawModel->m_Vertices; }
+    const AABB& Box() const { return m_Box; }
 
 	GLuint VAO;
 	GLuint ElementBuffer;
     RawModel* m_RawModel;
 
 private:
-    
+    AABB m_Box;
+
 	GLuint VertexBuffer;
 	GLuint NormalBuffer;
 	GLuint TangentNormalsBuffer;

include/Engine/Rendering/RenderQueue.h

@@ -19,22 +19,30 @@
 struct RenderScene
 {
     ::Camera* Camera = nullptr;
-    std::list<std::shared_ptr<RenderJob>> OpaqueObjects;
-    std::list<std::shared_ptr<RenderJob>> TransparentObjects;
-    std::list<std::shared_ptr<RenderJob>> PointLightJobs;
-    std::list<std::shared_ptr<RenderJob>> TextJobs;
-    std::list<std::shared_ptr<RenderJob>> DirectionalLightJobs;
+    struct Queues {
+        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>> PointLight;
+        std::list<std::shared_ptr<RenderJob>> Text;
+        std::list<std::shared_ptr<RenderJob>> DirectionalLight;
+    } Jobs;
+
     Rectangle Viewport;
     bool ClearDepth = false;
     glm::vec4 AmbientColor;
 
 	void Clear()
 	{
-        OpaqueObjects.clear();
-        TransparentObjects.clear();
-        PointLightJobs.clear();
-        TextJobs.clear();
-        DirectionalLightJobs.clear();
+        Jobs.OpaqueObjects.clear();
+        Jobs.TransparentObjects.clear();
+        Jobs.OpaqueShieldedObjects.clear();
+        Jobs.TransparentShieldedObjects.clear();
+        Jobs.ShieldObjects.clear();
+        Jobs.Text.clear();
+        Jobs.DirectionalLight.clear();
 	}
 };
 

include/Engine/Rendering/RenderState.h

@@ -2,6 +2,7 @@
 #define RenderState_h__
 
 #include <functional>
+#include <boost/range/adaptor/reversed.hpp>
 #include "../Common.h"
 #include "../OpenGL.h"
 #include "../GLM.h"
@@ -19,6 +20,9 @@ public:
     bool BindFramebuffer(GLint framebuffer);
     bool BlendEquation(GLenum mode);
     bool BlendFunc(GLenum sfactor, GLenum dfactor);
+    bool StencilOp(GLenum sfail, GLenum dpfail, GLenum dppass);
+    bool StencilFunc(GLenum func, GLint ref, GLuint mask);
+    bool StencilMask(GLuint mask);
     bool DepthMask(GLboolean flag);
 
 private:

include/Engine/Rendering/RenderSystem.h

@@ -16,11 +16,13 @@
 #include "PointLightJob.h"
 #include "../Core/Transform.h"
 #include "../Core/EPlayerSpawned.h"
+#include "../Core/Octree.h"
+#include "../Collision/EntityAABB.h"
 
 class RenderSystem : public ImpureSystem
 {
 public:
-    RenderSystem(World* world, EventBroker* eventBrokerer, const IRenderer* renderer, RenderFrame* renderFrame);
+    RenderSystem(World* world, EventBroker* eventBrokerer, const IRenderer* renderer, RenderFrame* renderFrame, Octree<EntityAABB>* frustumCullOctree);
     ~RenderSystem();
 
     virtual void Update(double dt) override;
@@ -32,6 +34,7 @@ private:
     World* m_World;
     EntityWrapper m_CurrentCamera = EntityWrapper::Invalid;
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
+    Octree<EntityAABB>* m_Octree;
 
     EventRelay<RenderSystem, Events::SetCamera> m_ESetCamera;
     bool OnSetCamera(Events::SetCamera &event);
@@ -40,7 +43,7 @@ private:
     EventRelay<RenderSystem, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
 
-    void fillModels(std::list<std::shared_ptr<RenderJob>>& opaqueJobs, std::list<std::shared_ptr<RenderJob>>& transparentJobs);
+    void fillModels(RenderScene::Queues &jobs);
     void fillText(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
     void fillPointLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
     void fillDirectionalLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);

include/Engine/Sound/EPlayQueueOnEntity.h

@@ -0,0 +1,18 @@
+#ifndef Events_PlayQueueOnEntity_h__
+#define Events_PlayQueueOnEntity_h__
+
+#include "../Core/Event.h"
+#include "../Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct PlayQueueOnEntity : public Event
+{
+    EntityWrapper Emitter;
+    std::vector<std::string> FilePaths;
+};
+
+}
+
+#endif

include/Engine/Sound/Sound.h

@@ -1,6 +1,9 @@
 #ifndef Sound_h__
 #define Sound_h__
 
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+
 #include "Core/ResourceManager.h"
 
 class Sound : public Resource

include/Engine/Sound/SoundManager.h

@@ -1,17 +1,23 @@
-#ifndef SoundSystem_h__
-#define SoundSystem_h__
+#ifndef SoundManager_h__
+#define SoundManager_h__
 
 #include <unordered_map>
+#include <random>
 
 #include "glm/common.hpp"
 #include "glm/gtx/rotate_vector.hpp" // Calculate Up vector
 #include "OpenAL/al.h"
 #include "OpenAL/alc.h"
 
+#include "imgui/imgui.h"
+
 #include "Core/World.h"
 #include "Core/EventBroker.h"
+#include "../Engine/Core/ResourceManager.h"
+#include "../Engine/Core/ConfigFile.h"
 #include "Core/Transform.h" // Absolute transform
 #include "Sound/Sound.h"
+#include "../Engine/Sound/EPlayQueueOnEntity.h"
 #include "Sound/EPlaySoundOnEntity.h"
 #include "Sound/EPlaySoundOnPosition.h"
 #include "Sound/EPlayBackgroundMusic.h"
@@ -20,6 +26,11 @@
 #include "Sound/EStopSound.h"
 #include "Sound/ESetBGMGain.h"
 #include "Sound/ESetSFXGain.h"
+#include "Core/EPause.h"
+#include "Core/EComponentAttached.h"
+#include "../Core/EPlayerSpawned.h"
+
+typedef std::pair<ALuint, std::vector<ALuint>> QueuedBuffers;
 
 enum class SoundType {
     SFX,
@@ -34,14 +45,15 @@ struct Source
     SoundType Type;
 };
 
-class SoundSystem
+class SoundManager
 {
 public:
-    SoundSystem() { }
-    SoundSystem(World* world, EventBroker* eventBroker, bool editorMode);
-    ~SoundSystem();
+    SoundManager() { }
+    SoundManager(World* world, EventBroker* eventBroker);
+    ~SoundManager();
     // Update emitters / listener
     void Update(double dt); 
+
 private:
     // Help functions for working with OpenaAL
     void setListenerPos(glm::vec3 pos) { alListener3f(AL_POSITION, pos.x, pos.y, pos.z); };
@@ -56,46 +68,62 @@ private:
     // Logic 
     void initOpenAL();
     void updateEmitters(double dt);
-    void updateListener(double dt);
     void deleteInactiveEmitters();
-    void addNewEmitters(double dt);
-    Source* createSource(std::string filePath);
-    void playSound(Source* source);
-    void stopSound(Source* source);
     void stopEmitters();
+    void updateListener(double dt);
     ALenum getSourceState(ALuint source);
     void setGain(Source* source, float gain);
-    void setSoundProperties(ALuint source, ComponentWrapper* soundComponent);
+    void setSoundProperties(Source* source, ComponentWrapper* soundComponent);
+
+    // Specific logic
+    void playSound(Source* source);
+    // Need to be the same format (sample rate etc)
+    void playQueue(QueuedBuffers qb);
+    void stopSound(Source* source);
+    Source* createSource(std::string filePath);
+    std::unordered_map<EntityID, Source*> m_Sources;
+
+    // Logic
+    World* m_World = nullptr;
+    EventBroker* m_EventBroker = nullptr;
 
     // OpenAL system variables
     ALCdevice* m_ALCdevice = nullptr;
     ALCcontext* m_ALCcontext = nullptr;
 
-    // Logic
-    World* m_World = nullptr;
-    EventBroker* m_EventBroker = nullptr;
-    std::unordered_map<EntityID, Source*> m_Sources;
     float m_BGMVolumeChannel = 1.0f;
-    float m_SFXVolumeChannel = 1.f;
-    bool m_EditorEnabled = false;
-
+    float m_SFXVolumeChannel = 1.0f;
+    EntityWrapper m_LocalPlayer = EntityWrapper();
+    
     // Events
-    EventRelay<SoundSystem, Events::PlaySoundOnEntity> m_EPlaySoundOnEntity;
+    EventRelay<SoundManager, Events::PlaySoundOnEntity> m_EPlaySoundOnEntity;
     bool OnPlaySoundOnEntity(const Events::PlaySoundOnEntity &e);
-    EventRelay<SoundSystem, Events::PlaySoundOnPosition> m_EPlaySoundOnPosition;
+    EventRelay<SoundManager, Events::PlaySoundOnPosition> m_EPlaySoundOnPosition;
     bool OnPlaySoundOnPosition(const Events::PlaySoundOnPosition &e);
-    EventRelay<SoundSystem, Events::PlayBackgroundMusic> m_EPlayBackgroundMusic;
+    EventRelay<SoundManager, Events::PlayBackgroundMusic> m_EPlayBackgroundMusic;
     bool OnPlayBackgroundMusic(const Events::PlayBackgroundMusic &e);
-    EventRelay<SoundSystem, Events::PauseSound> m_EPauseSound;
+    EventRelay<SoundManager, Events::PauseSound> m_EPauseSound;
     bool OnPauseSound(const Events::PauseSound &e);
-    EventRelay<SoundSystem, Events::StopSound> m_EStopSound;
+    EventRelay<SoundManager, Events::StopSound> m_EStopSound;
     bool OnStopSound(const Events::StopSound &e);
-    EventRelay<SoundSystem, Events::ContinueSound> m_EContinueSound;
+    EventRelay<SoundManager, Events::ContinueSound> m_EContinueSound;
     bool OnContinueSound(const Events::ContinueSound &e);
-    EventRelay<SoundSystem, Events::SetBGMGain> m_ESetBGMGain; 
-    bool OnSetBGMGain(const Events::SetBGMGain &e); // Not tested
-    EventRelay<SoundSystem, Events::SetSFXGain> m_ESetSFXGain; 
-    bool OnSetSFXGain(const Events::SetSFXGain &e); // Not tested
+    EventRelay<SoundManager, Events::SetBGMGain> m_ESetBGMGain; 
+    bool OnSetBGMGain(const Events::SetBGMGain &e);
+    EventRelay<SoundManager, Events::SetSFXGain> m_ESetSFXGain; 
+    bool OnSetSFXGain(const Events::SetSFXGain &e);
+    EventRelay<SoundManager, Events::ComponentAttached> m_EComponentAttached;
+    bool OnComponentAttached(const Events::ComponentAttached &e);
+    EventRelay<SoundManager, Events::Pause> m_EPause;
+    bool OnPause(const Events::Pause &e);
+    EventRelay<SoundManager, Events::Resume> m_EResume;
+    bool OnResume(const Events::Resume &e);
+    EventRelay<SoundManager, Events::PlayerSpawned> m_EPlayerSpawned;
+    bool OnPlayerSpawned(const Events::PlayerSpawned &e);
+    EventRelay<SoundManager, Events::PlayQueueOnEntity> m_EPlayQueueOnEntity;
+    bool OnPlayQueueOnEntity(const Events::PlayQueueOnEntity &e);
+
+
 };
 
 #endif

include/Game/Events/EDashAbility.h

@@ -0,0 +1,13 @@
+#ifndef Events_DashAbility_h__
+#define Events_DashAbility_h__
+
+#include "Core/Event.h"
+
+namespace Events
+{
+
+struct DashAbility : public Event { };
+
+}
+
+#endif

include/Game/Events/EDoubleJump.h

@@ -0,0 +1,16 @@
+#ifndef Events_DoubleJump_h__
+#define Events_DoubleJump_h__
+
+#include "Core/Event.h"
+
+namespace Events
+{
+
+struct DoubleJump : public Event
+{
+
+};
+
+}
+
+#endif

include/Game/Game.h

@@ -30,7 +30,8 @@
 #include "Network/Client.h"
 
 // Sound
-#include "Sound/SoundSystem.h"
+#include "Sound/SoundManager.h"
+#include "Systems/SoundSystem.h"
 
 class Game
 {
@@ -64,7 +65,7 @@ private:
     bool m_IsClientOrServer = false;
 
     // Sound
-    SoundSystem* m_SoundSystem;
+    SoundManager* m_SoundManager;
 
     //EventRelay<Game, Events::InputCommand> m_EInputCommand;
     //bool debugOnInputCommand(const Events::InputCommand& e);

include/Game/Systems/HealthSystem.h

@@ -12,6 +12,7 @@
 
 #include <tuple>
 #include <vector>
+#include <algorithm>
 
 class HealthSystem : public PureSystem
 {

include/Game/Systems/LifetimeSystem.h

@@ -9,7 +9,9 @@ public:
     LifetimeSystem(World* world, EventBroker* eventBroker)
         : System(world, eventBroker)
         , PureSystem("Lifetime")
-    { }
+    {
+        LOG_INFO("ASDASDASSA");
+    }
 
     virtual void Update(double dt) override;
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cLifetime, double dt) override;

include/Game/Systems/PickupSpawnSystem.h

@@ -0,0 +1,33 @@
+#ifndef PickupSpawnSystem_h__
+#define PickupSpawnSystem_h__
+
+#include "Core/System.h"
+#include "Core/Transform.h"
+#include "Core/ResourceManager.h"
+#include "Core/EntityFileParser.h"
+#include "Core/EPickupSpawned.h"
+#include "Core/EPlayerHealthPickup.h"
+#include "Engine/Collision/ETrigger.h"
+#include "Common.h"
+#include <tuple>
+
+class PickupSpawnSystem : public ImpureSystem
+{
+public:
+    PickupSpawnSystem(World* world, EventBroker* eventBroker);
+
+    virtual void Update(double dt) override;
+
+private:
+    EventRelay<PickupSpawnSystem, Events::TriggerTouch> m_ETriggerTouch;
+    bool OnTriggerTouch(Events::TriggerTouch& e);
+
+    struct NewHealthPickup {
+        glm::vec3 Pos;
+        double HealthGain;
+        double RespawnTimer;
+        double DecreaseThisRespawnTimer;
+    };
+    std::vector<NewHealthPickup> m_ETriggerTouchVector;
+};
+#endif

include/Game/Systems/PlayerDeathSystem.h

@@ -0,0 +1,29 @@
+#ifndef PlayerDeathSystem_h__
+#define PlayerDeathSystem_h__
+
+#include "Core/System.h"
+#include "Input/EInputCommand.h"
+#include "GLM.h"
+#include "Rendering/ESetCamera.h"
+#include "Core/ConfigFile.h"
+
+#include "Core/EntityFile.h"
+#include "Core/EntityFileParser.h"
+
+#include "Core/EPlayerDeath.h"
+
+class PlayerDeathSystem : public ImpureSystem
+{
+public:
+    PlayerDeathSystem(World* world, EventBroker* eventBroker);
+
+    virtual void Update(double dt) override;
+
+private:
+    EventRelay<PlayerDeathSystem, Events::PlayerDeath> m_OnPlayerDeath;
+    bool OnPlayerDeath(Events::PlayerDeath& e);
+
+    void createDeathEffect(EntityWrapper player);
+
+};
+#endif

include/Game/Systems/PlayerMovementSystem.h

@@ -4,6 +4,8 @@
 #include "Core/EPlayerSpawned.h"
 #include "Input/FirstPersonInputController.h"
 #include <imgui/imgui.h>
+#include "Events/EDoubleJump.h"
+#include "../Engine/Sound/EPlaySoundOnEntity.h"
 
 class PlayerMovementSystem : public ImpureSystem, PureSystem
 {
@@ -18,6 +20,19 @@ private:
     // State
     std::unordered_map<EntityWrapper, FirstPersonInputController<PlayerMovementSystem>*> m_PlayerInputControllers;
 
+    EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
+    // Walking logic
+    // Keeps track of how far the player has walked within this "key press session".
+    float m_DistanceMoved = 0.0f;
+    // How far a step is (How often the step sound will be played).
+    const float m_PlayerStepLength = 1.75f;
+    // Determine what sound file to play.
+    bool m_LeftFoot = false;
+    // To get a difference when calculating the walking state.
+    glm::vec3 m_LastPosition = glm::vec3();
+    // The logic for making the sound play when player is moving
+    void playerStep(double dt);
+
     EventRelay<PlayerMovementSystem, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
 

include/Game/Systems/PlayerSpawnSystem.h

@@ -3,6 +3,7 @@
 #include "Systems/SpawnerSystem.h"
 #include "Events/ESpawnerSpawn.h"
 #include "Core/EPlayerSpawned.h"
+#include "Core/EPlayerDeath.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
 

include/Game/Systems/SoundSystem.h

@@ -0,0 +1,71 @@
+#ifndef Systems_SoundSystem_h__
+#define Systems_SoundSystem_h__
+
+#include <random>
+
+#include "../Engine/Core/System.h"
+#include "../Engine/Core/ResourceManager.h"
+#include "../Engine/Core/ConfigFile.h"
+#include "../Engine/Sound/Sound.h"
+#include "../Engine/Sound/EPlayQueueOnEntity.h"
+#include "../Engine/Core/EPlayerSpawned.h"
+#include "../Engine/Input/EInputCommand.h"
+#include "../Engine/Core/EShoot.h"
+#include "../Engine/Core/EPlayerSpawned.h"
+#include "../Engine/Input/EInputCommand.h"
+#include "../Engine/Core/ECaptured.h"
+#include "../Engine/Core/EPlayerDamage.h"
+#include "../Engine/Core/EPlayerDeath.h"
+#include "../Engine/Core/EPlayerHealthPickup.h"
+#include "../Engine/Collision/ETrigger.h"
+#include "../Engine/Sound/EPlaySoundOnEntity.h"
+#include "../Engine/Sound/EPlayBackgroundMusic.h"
+#include "../Game/Events/EDoubleJump.h"
+#include "../Game/Events/EDashAbility.h"
+
+
+class SoundSystem : public PureSystem, ImpureSystem
+{
+public:
+    SoundSystem(World* world, EventBroker* eventbroker);
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cComponent, double dt) override;
+    virtual void Update(double dt) override;
+private:
+    EntityWrapper m_LocalPlayer = EntityWrapper();
+
+    World* m_World = nullptr;
+    EventBroker* m_EventBroker = nullptr;
+    std::string m_Announcer = "";
+    // Logic for playing a sound when a player jumps
+    void playerJumps();
+    
+    // Temporary solution for play test.
+    bool m_DrumsIsPlaying = false;
+    double m_DrumTimer = 0.0;
+    bool drumTimer(double dt);
+
+    std::default_random_engine generator;
+
+    EventRelay<SoundSystem, Events::PlayerSpawned> m_EPlayerSpawned;
+    bool OnPlayerSpawned(const Events::PlayerSpawned &e);
+    EventRelay<SoundSystem, Events::InputCommand> m_InputCommand;
+    bool OnInputCommand(const Events::InputCommand &e);
+    EventRelay<SoundSystem, Events::DoubleJump> m_EDoubleJump;
+    bool OnDoubleJump(const Events::DoubleJump &e);
+    EventRelay<SoundSystem, Events::DashAbility> m_EDashAbility;
+    bool OnDashAbility(const Events::DashAbility &e);
+    EventRelay<SoundSystem, Events::TriggerTouch> m_ETriggerTouch;
+    bool OnTriggerTouch(const Events::TriggerTouch &e);
+    EventRelay<SoundSystem, Events::Shoot> m_EShoot;
+    bool OnShoot(const Events::Shoot &e);
+    EventRelay<SoundSystem, Events::Captured> m_ECaptured;
+    bool OnCaptured(const Events::Captured &e);
+    EventRelay<SoundSystem, Events::PlayerDamage> m_EPlayerDamage;
+    bool OnPlayerDamage(const Events::PlayerDamage &e);
+    EventRelay<SoundSystem, Events::PlayerDeath> m_EPlayerDeath;
+    bool OnPlayerDeath(const Events::PlayerDeath &e);
+    EventRelay<SoundSystem, Events::PlayerHealthPickup> m_EPlayerHealthPickup;
+    bool OnPlayerHealthPickup(const Events::PlayerHealthPickup &e);
+};
+
+#endif

resources/DefaultConfig.ini

@@ -29,3 +29,8 @@ TimeoutMs=15000
 
 [Multithreading]
 ResourceLoading=true
+
+[Sound]
+BGMVolume=1.0
+SFXVolume=1.0
+Announcer=female

resources/Schema/Components.xsd

@@ -30,7 +30,10 @@
 	<xs:include schemaLocation="Components/Fill.xsd"/>
 	<xs:include schemaLocation="Components/Lifetime.xsd"/>
 	<xs:include schemaLocation="Components/HiddenForLocalPlayer.xsd"/>
+	<xs:include schemaLocation="Components/HealthPickup.xsd"/>
 	<xs:include schemaLocation="Components/DashAbility.xsd"/>
 	<xs:include schemaLocation="Components/BoostAssault.xsd"/>
 	<xs:include schemaLocation="Components/BoostDefender.xsd"/>
+	<xs:include schemaLocation="Components/Shield.xsd"/>
+	<xs:include schemaLocation="Components/Shielded.xsd"/>
 </xs:schema>

resources/Schema/Components/AABB.xsd

@@ -7,10 +7,10 @@
 		<xs:complexType>
 			<xs:all>
 				<xs:element name="Origin" type="t:Vector" minOccurs="0">
-					<xs:annotation><xs:documentation>Middle point of the bounding box</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>Middle point of the bounding box, in model space</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="Size" type="t:Vector" minOccurs="0">
-					<xs:annotation><xs:documentation>Size of the bounding box</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>Size of the bounding box, in model space</xs:documentation></xs:annotation>
 				</xs:element>
 			</xs:all>
 		</xs:complexType>

resources/Schema/Components/HealthPickup.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<HealthPickup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="HealthPickup.xsd">
+	<RespawnTimer>3</RespawnTimer>
+	<HealthGain>30</HealthGain>
+</HealthPickup>

resources/Schema/Components/HealthPickup.xsd

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="HealthPickup">
+		<xs:annotation>
+			<xs:documentation>A Health Pickup</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="RespawnTimer" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>The respawn timer for a health pickup</xs:documentation></xs:annotation>
+				</xs:element>			
+				<xs:element name="HealthGain" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>How much percent max-health the player will get when he picks the healthPickup up</xs:documentation></xs:annotation>
+				</xs:element>			
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Physics.xml

@@ -2,4 +2,6 @@
 <Physics xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Physics.xsd">
 	<Velocity X="0" Y="0" Z="0"/>
 	<Gravity>true</Gravity>
+	<IsOnGround>false</IsOnGround>
+	<VerticalStepHeight>0.33</VerticalStepHeight>
 </Physics>

resources/Schema/Components/Physics.xsd

@@ -13,6 +13,10 @@
 					<xs:annotation><xs:documentation>m/s^2</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="Gravity" type="t:bool" minOccurs="0"/>
+				<xs:element name="IsOnGround" type="t:bool" minOccurs="0"/>
+				<xs:element name="VerticalStepHeight" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>The largest height of a "stair-step" that can be walked over</xs:documentation></xs:annotation>
+				</xs:element>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/Shield.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Shield xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Shield.xsd">
+</Shield>

resources/Schema/Components/Shield.xsd

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="Shield">
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Shielded.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Shielded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Shielded.xsd">
+</Shielded>

resources/Schema/Components/Shielded.xsd

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="Shielded">
+	</xs:element>
+</xs:schema>

resources/Schema/Entities/CollisionSpawnTest.xml

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>../assets/Models/Test/ObstacleCourse.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="0" Z="0.00638055196"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:DirectionalLight>
+          <Intensity>0.46000027656555176</Intensity>
+        </c:DirectionalLight>
+        <c:Transform>
+          <Orientation X="0" Y="2.59000015" Z="0.799000025"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-1.52309108" Y="5.72108126" Z="0"/>
+          <Scale X="5" Y="5" Z="5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BluSpawn">
+      <Components>
+        <c:PlayerSpawn/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="1" Y="1.60000002" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-2.05988312" Y="0" Z="2.79573512"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="1.85022807" Y="0" Z="-2.08909845"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="2.98651481" Y="0" Z="-4.67667246"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="-5.16323137" Y="0" Z="3.62892342"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="RedSpawn">
+      <Components>
+        <c:PlayerSpawn/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="-1.20000005" Y="1.60000002" Z="-8.40000057"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="0" Z="2.24403"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="2.20245028" Y="0" Z="-1.97843659"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="4.79769945" Y="0" Z="-5.2088728"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/CollisionTestLevel.xml

@@ -1,122 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
-<Entity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd" xmlns:c="components">
-	<Components>
-		<c:Transform>
-			<Orientation X="0" Y="0" Z="0"/>
-		</c:Transform>
-		<c:Model>
-			<Resource>Models/DummyScene.mesh</Resource>
-		</c:Model>
-	</Components>
-	<Children>
-		<Entity>
-			<Components>
-				<c:Transform>
-					<Position X="-1.5"/>
-					<Scale X="1" Y="1" Z="1"/>
-				</c:Transform>
-				<c:Model>
-					<Resource>Models/Core/UnitSphere.mesh</Resource>
-				</c:Model>
-			</Components>
-		</Entity>
-		<Entity>
-			<Components>
-				<c:Transform>
-					<Position X="1.5"/>
-					<Scale X="2" Y="2" Z="2"/>
-				</c:Transform>
-				<c:Model>
-					<Resource>Models/RotationWidgetX.mesh</Resource>
-				</c:Model>
-				<c:Trigger>
-				</c:Trigger>
-			</Components>
-		</Entity>
-		<Entity>
-			<Components>
-				<c:Player>
-					<Velocity X="0" Y="0" Z="0"/>
-				</c:Player>
-				<c:Transform>
-					<Position X="2.5"/>
-				</c:Transform>
-				<c:Model>
-					<Resource>Models/Core/UnitCube.mesh</Resource>
-				</c:Model>
-				<c:AABB>
-				</c:AABB>
-			</Components>
-		</Entity>
-		<Entity>
-			<Components>
-				<c:Transform>
-					<Position X="0" Y="-0"/>
-					<Scale X="1" Y="1" Z="1"/>
-				</c:Transform>
-				<!--<c:Move>
-					<Speed>1</Speed>
-					<Direction X="-1"/>
-					<Rotation Y="3.14"/>
-				</c:Move>-->
-			</Components>
-			<Children>
-				<Entity>
-					<Components>
-						<c:Transform>
-							<Position X="0" Y="0"/>
-							<Orientation X="0.0" Y="0" Z="1.0"/>
-						</c:Transform>
-						<c:Model>
-							<Resource>Models/Core/UnitRaptor.mesh</Resource>
-							<Color R="1" G="0.4" B="0.8"/>
-						</c:Model>
-					</Components>
-					<Children>
-						<Entity>
-							<Components>
-								<c:Transform>
-									<Position X="-0.01" Y="0.55"/>
-									<Orientation X="0" Y="0" Z="-1"/>
-								</c:Transform>
-								<c:RaptorCopter>
-									<Speed>20</Speed>
-									<Axis Y="1"/>
-								</c:RaptorCopter>
-							</Components>
-							<Children>
-								<Entity>
-									<Components>
-										<c:Transform>
-											<Position X="0" Y="0"/>
-											<Scale X="1.7" Y="0.03" Z="0.1"/>
-											<Orientation X="0" Y="0" Z="0"/>
-										</c:Transform>
-										<c:Model>
-											<Resource>Models/Core/UnitCube.mesh</Resource>
-											<Color R="1" G="0.4" B="0.8"/>
-										</c:Model>
-									</Components>
-								</Entity>
-								<Entity>
-									<Components>
-										<c:Transform>
-											<Position X="0" Y="0"/>
-											<Scale X="1.7" Y="0.03" Z="0.1"/>
-											<Orientation X="0" Y="1.57" Z="0"/>
-										</c:Transform>
-										<c:Model>
-											<Resource>Models/Core/UnitCube.mesh</Resource>
-											<Color R="1" G="0.4" B="0.8"/>
-										</c:Model>
-									</Components>
-								</Entity>
-							</Children>
-						</Entity>
-					</Children>
-				</Entity>
-			</Children>
-		</Entity>
-	</Children>
-</Entity>
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>../assets/Models/Test/ObstacleCourse.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="0" Z="0.00638055196"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:DirectionalLight>
+          <Intensity>0.46000027656555176</Intensity>
+        </c:DirectionalLight>
+        <c:Transform>
+          <Orientation X="0" Y="2.59000015" Z="0.799000025"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Physics>
+          <Gravity>false</Gravity>
+        </c:Physics>
+        <c:Player/>
+        <c:Transform>
+          <Position X="-8.80904388" Y="1.82786822" Z="7.97052002"/>
+          <Scale X="0.100000001" Y="1" Z="0.100000001"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>../assets/Models/Core/colorbox.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-1.52309108" Y="5.72108126" Z="0"/>
+          <Scale X="5" Y="5" Z="5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/GameMap.xml

@@ -8,6 +8,11 @@
   <Children>
     <Entity name="Scenemesh">
       <Components>
+        <c:AABB>
+          <Origin X="0.195705414" Y="26.0382366" Z="-0.010017395"/>
+          <Size X="135.414337" Y="68.3848572" Z="180.020035"/>
+        </c:AABB>
+        <c:Collidable/>
         <c:Model>
           <Resource>Models\MapVersion1.mesh</Resource>
         </c:Model>
@@ -139,7 +144,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="57.7363472" Y="1.18853188" Z="79.5"/>
+          <Position X="57.7363472" Y="2.38900018" Z="79.5"/>
         </c:Transform>
       </Components>
       <Children>
@@ -201,7 +206,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="-60.2567062" Y="1.60000002" Z="-78.1000061"/>
+          <Position X="-60.2567062" Y="3.4000001" Z="-78.1000061"/>
         </c:Transform>
       </Components>
       <Children>

resources/Schema/Entities/HealthPickup.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:AABB/>
+    <c:HealthPickup/>
+    <c:Model>
+      <Resource>Models/Core/UnitSphere.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="0" Y="1" Z="0"/>
+    </c:Transform>
+    <c:Trigger/>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/HealthPickupTest.xml

@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Scenemesh">
+      <Components>
+        <c:Model>
+          <Resource>Models\MapVersion1.mesh</Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="DirectionalLight">
+      <Components>
+        <c:DirectionalLight>
+          <Intensity>2</Intensity>
+        </c:DirectionalLight>
+        <c:Model>
+          <Resource>Models/DirectionalLightWidget.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="61.9050903" Z="0"/>
+          <Scale X="50" Y="50" Z="50"/>
+          <Orientation X="4.42700005" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="PointLight">
+      <Components>
+        <c:PointLight>
+          <Radius>8</Radius>
+          <Intensity>2.7999999523162842</Intensity>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="0.370978802" Y="1.88588905" Z="-0.55370003"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="PointLight">
+      <Components>
+        <c:PointLight>
+          <Radius>8</Radius>
+          <Intensity>2.7999999523162842</Intensity>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="38.0347443" Y="1.88588905" Z="62.7340622"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-0.904668212" Y="0" Z="8.48177528"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-4.61666441" Y="0" Z="-8.51156044"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-7.56803513" Y="-0.0658408776" Z="0.59418112"/>
+          <Scale X="1.20000005" Y="0.900000036" Z="1.30000007"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="10.460474" Y="0" Z="-3.92580295"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="1.09146011" Y="-0.315138876" Z="-0.333906144"/>
+          <Scale X="150" Y="1" Z="180"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BluSpawn">
+      <Components>
+        <c:PlayerSpawn/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="57.7363472" Y="1.18853188" Z="79.5"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-2.05988312" Y="0" Z="2.79573512"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="1.85022807" Y="0" Z="-2.08909845"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="2.98651481" Y="0" Z="-4.67667246"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="-5.16323137" Y="0" Z="3.62892342"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="RedSpawn">
+      <Components>
+        <c:PlayerSpawn/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="-60.2567062" Y="1.60000002" Z="-78.1000061"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="0" Z="2.24403"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="2.20245028" Y="0" Z="-1.97843659"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="4.79769945" Y="0" Z="-5.2088728"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:HealthPickup>
+          <RespawnTimer>1</RespawnTimer>
+          <HealthGain>22</HealthGain>
+        </c:HealthPickup>
+        <c:Model>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="60" Y="1" Z="80"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:HealthPickup>
+          <RespawnTimer>1</RespawnTimer>
+          <HealthGain>22</HealthGain>
+        </c:HealthPickup>
+        <c:Model>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="60" Y="1" Z="80"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:HealthPickup>
+          <RespawnTimer>4</RespawnTimer>
+          <HealthGain>44</HealthGain>
+        </c:HealthPickup>
+        <c:Model>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="60" Y="1" Z="80"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/LevelCollisionTest.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Collidable/>
+    <c:Model>
+      <Resource>../assets/Models/MapVersion1.mesh</Resource>
+    </c:Model>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Physics>
+          <Gravity>false</Gravity>
+        </c:Physics>
+        <c:Player/>
+        <c:Transform>
+          <Position X="-1.48400009" Y="3.68200016" Z="24.7580013"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:DirectionalLight/>
+        <c:Transform>
+          <Orientation X="3.80300021" Y="1.37800002" Z="4.10000038"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ModelCollisionTest.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="0" Y="0" Z="-0.313012958"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:Camera/>
+        <c:Listener/>
+        <c:Transform>
+          <Position X="2.56531811" Y="0.637967348" Z="0.202344239"/>
+          <Orientation X="2.68780756" Y="1.36143553" Z="3.14159179"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>../assets/Models/Core/Tri.obj</Resource>
+          <Color A="1" B="1" G="0.392156869" R="0"/>
+        </c:Model>
+        <c:Transform>
+          <Scale X="2" Y="2" Z="0.200000003"/>
+          <Orientation X="2.70100021" Y="2.37000012" Z="0.266000003"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>../assets/Models/Core/Tri.obj</Resource>
+              <Color A="1" B="0" G="0" R="1"/>
+            </c:Model>
+            <c:Transform>
+              <Orientation X="0" Y="3.14159274" Z="4.71238899"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+        </c:Model>
+        <c:Physics/>
+        <c:Transform>
+          <Position X="-1.95333278" Y="0.296304941" Z="2.56487775"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MovementTest.xml

@@ -6,22 +6,6 @@
   </Components>
 
   <Children>
-    <Entity name="Ground">
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="0.513725519" G="0" R="1"/>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="7" Y="-0.727000058" Z="-1.22800004"/>
-          <Scale X="50" Y="1.45100009" Z="50"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
     <Entity name="RedSpawn">
       <Components>
         <c:PlayerSpawn/>
@@ -81,6 +65,10 @@
     </Entity>
     <Entity name="ObstacleCourse">
       <Components>
+        <c:AABB>
+          <Size X="50" Y="50" Z="50"/>
+        </c:AABB>
+        <c:Collidable/>
         <c:Model>
           <Resource>Models/Test/ObstacleCourse.mesh</Resource>
         </c:Model>
@@ -88,51 +76,6 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity name="ObstacleCoursePlayerBox">
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="6.32800007" Y="0.807000041" Z="-2.2750001"/>
-          <Scale X="1" Y="1.60000002" Z="1"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="ObstacleCourse1uHigh">
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="9.11900043" Y="0.5" Z="-2.10900021"/>
-          <Scale X="1" Y="1" Z="8.1960001"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="ObstacleCourseWhoTheFuckKnows">
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="13.2370005" Y="1.28600001" Z="-1.71700013"/>
-          <Scale X="2.58000016" Y="2.58300018" Z="21.1860008"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
     <Entity name="BlueSpawn">
       <Components>
         <c:PlayerSpawn/>
@@ -197,7 +140,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="-1.68112314" Y="0.0264999866" Z="3.06287026"/>
+          <Position X="-1.68112314" Y="0.0288829971" Z="3.06287026"/>
           <Orientation X="0" Y="2.14675093" Z="0"/>
         </c:Transform>
       </Components>

resources/Schema/Entities/PlayerDeathExplosionWithCamera.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="Explosion" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Animation>
+      <Name>Hold Pos</Name>
+    </c:Animation>
+    <c:Lifetime>
+      <Lifetime>2.5</Lifetime>
+    </c:Lifetime>
+    <c:ExplosionEffect>
+      <ColorByDistance>true</ColorByDistance>
+      <Velocity X="0" Y="7.76300049" Z="0"/>
+      <ExplosionOrigin X="0" Y="0.67900002" Z="0"/>
+      <ExponentialAccelaration>true</ExponentialAccelaration>
+      <ExplosionDuration>3</ExplosionDuration>
+      <EndColor A="0" B="0" G="0" R="1"/>
+      <Randomness>true</Randomness>
+    </c:ExplosionEffect>
+    <c:Model>
+      <Resource>Models/AssaultAnimated.mesh</Resource>
+      <Color A="1" B="0" G="0" R="1"/>
+      <Transparent>true</Transparent>
+    </c:Model>
+    <c:Transform>
+      <Position X="0" Y="0" Z="3.46966481"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="Camera">
+      <Components>
+        <c:Camera/>
+        <c:Transform>
+          <Position X="0" Y="2.49700022" Z="4.31700039"/>
+          <Orientation X="5.95600033" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/QualityAssurance.xml

@@ -40,7 +40,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="7364.7876" Z="0"/>
+              <Orientation X="0" Y="9161.41992" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -105,7 +105,7 @@
         </c:RaptorCopter>
         <c:Transform>
           <Position X="2.1529963" Y="6.59221172" Z="0.169116676"/>
-          <Orientation X="4.16300011" Y="15381.7266" Z="0"/>
+          <Orientation X="4.16300011" Y="17199.7988" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -122,7 +122,7 @@
           <Components>
             <c:Animation>
               <Name>Run</Name>
-              <Time>0.28223692849998105</Time>
+              <Time>0.79292191744688711</Time>
               <Speed>1</Speed>
             </c:Animation>
             <c:Model>
@@ -138,7 +138,7 @@
           <Components>
             <c:Animation>
               <Name>Walk</Name>
-              <Time>0.44951638260048998</Time>
+              <Time>0.96020137154739604</Time>
               <Speed>1</Speed>
             </c:Animation>
             <c:Model>
@@ -188,7 +188,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="2019.28503" Z="0"/>
+                  <Orientation X="0" Y="2918.14136" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -196,7 +196,7 @@
                   <Components>
                     <c:Animation>
                       <Name>Run</Name>
-                      <Time>0.021047045591223501</Time>
+                      <Time>0.53173203453812956</Time>
                       <Speed>1</Speed>
                     </c:Animation>
                     <c:Model>
@@ -237,7 +237,7 @@
               <Axis X="1" Y="1" Z="1"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="13996.3721" Y="13996.3721" Z="13996.3721"/>
+              <Orientation X="15792.2051" Y="15792.2051" Z="15792.2051"/>
             </c:Transform>
           </Components>
           <Children>
@@ -301,7 +301,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="13793.4053" Z="0"/>
+              <Orientation X="0" Y="15589.2383" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -333,7 +333,7 @@
                       <Axis X="0.699999988" Y="1" Z="0.300000012"/>
                     </c:RaptorCopter>
                     <c:Transform>
-                      <Orientation X="10188.9443" Y="14517.8643" Z="4350.31738"/>
+                      <Orientation X="11456.2695" Y="16313.6973" Z="4881.66504"/>
                     </c:Transform>
                   </Components>
                   <Children>
@@ -586,7 +586,7 @@
               <Transparent>true</Transparent>
             </c:Model>
             <c:Transform>
-              <Position X="-0.258742422" Y="0.5" Z="-1.8603574"/>
+              <Position X="-0.236842498" Y="0.5" Z="-1.83845747"/>
               <Orientation X="2.03600001" Y="0" Z="0"/>
             </c:Transform>
           </Components>
@@ -683,7 +683,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -730,7 +730,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -790,7 +790,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -837,7 +837,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -883,7 +883,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -930,7 +930,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -977,7 +977,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1038,7 +1038,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="1" B="0" G="0.200000003" R="1"/>
+                  <Color A="0.300000012" B="0" G="0.200000003" R="1"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team>
@@ -1088,7 +1088,8 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="1" B="0" G="1" R="1"/>
+                  <Color A="0.300000012" B="0" G="1" R="1"/>
+                  <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team/>
                 <c:Transform>
@@ -1131,6 +1132,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
+                  <Color A="0.300000012" B="1" G="1" R="1"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team/>
@@ -1177,7 +1179,8 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="1" B="1" G="1" R="0"/>
+                  <Color A="0.300000012" B="1" G="1" R="0"/>
+                  <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team/>
                 <c:Transform>
@@ -1225,7 +1228,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="1" B="1" G="0.200000003" R="0"/>
+                  <Color A="0.300000012" B="1" G="0.200000003" R="0"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team>
@@ -1347,6 +1350,19 @@
         </c:Transform>
       </Components>
       <Children>
+        <Entity name="Text">
+          <Components>
+            <c:Text>
+              <Content>ExplosionEffect Test</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+            </c:Text>
+            <c:Transform>
+              <Position X="0" Y="3.80000019" Z="0"/>
+              <Orientation X="0" Y="1.5710001" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
         <Entity name="AssetBase">
           <Components>
             <c:Model>
@@ -1374,7 +1390,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="850.206848" Z="0"/>
+                  <Orientation X="0" Y="1750.85376" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1383,7 +1399,7 @@
                     <c:ExplosionEffect>
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                      <TimeSinceDeath>0.75008034908941568</TimeSinceDeath>
+                      <TimeSinceDeath>1.3671759474185377</TimeSinceDeath>
                       <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                       <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                       <Randomness>true</Randomness>
@@ -1430,7 +1446,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="850.206848" Z="0"/>
+                  <Orientation X="0" Y="1750.85376" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1439,7 +1455,7 @@
                     <c:ExplosionEffect>
                       <Velocity X="0.5" Y="1" Z="0"/>
                       <ExplosionOrigin X="0" Y="0.900000036" Z="0"/>
-                      <TimeSinceDeath>1.1999860997035228</TimeSinceDeath>
+                      <TimeSinceDeath>0.31711568080172703</TimeSinceDeath>
                     </c:ExplosionEffect>
                     <c:Model>
                       <Resource>Models/Assault.mesh</Resource>
@@ -1482,7 +1498,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="850.206848" Z="0"/>
+                  <Orientation X="0" Y="1750.85376" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1490,14 +1506,14 @@
                   <Components>
                     <c:Animation>
                       <Name>Walk</Name>
-                      <Time>0.23053304095120097</Time>
+                      <Time>0.74121802989810703</Time>
                       <Speed>1</Speed>
                     </c:Animation>
                     <c:ExplosionEffect>
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.300000012" Y="2" Z="0"/>
                       <ExplosionOrigin X="0" Y="1.30000007" Z="-0.200000003"/>
-                      <TimeSinceDeath>0.68343188336345406</TimeSinceDeath>
+                      <TimeSinceDeath>0.31711568080172703</TimeSinceDeath>
                       <EndColor A="0" B="0.333333343" G="0.933333337" R="3.92156863"/>
                       <Randomness>true</Randomness>
                     </c:ExplosionEffect>
@@ -1515,18 +1531,120 @@
             </Entity>
           </Children>
         </Entity>
-        <Entity name="Text">
+        <Entity name="AssetBase">
           <Components>
-            <c:Text>
-              <Content>ExplosionEffect Test</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-            </c:Text>
+            <c:Model>
+              <Resource>Models/Core/UnitCylinder.mesh</Resource>
+              <Color A="1" B="1.56862748" G="1.56862748" R="1.56862748"/>
+            </c:Model>
             <c:Transform>
-              <Position X="0" Y="3.80000019" Z="0"/>
-              <Orientation X="0" Y="1.5710001" Z="0"/>
+              <Position X="0" Y="-0.231354833" Z="-2.92637157"/>
             </c:Transform>
           </Components>
-          <Children/>
+          <Children>
+            <Entity name="Light">
+              <Components>
+                <c:PointLight/>
+                <c:Transform>
+                  <Position X="0" Y="0.663784981" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="RotationOrigin">
+              <Components>
+                <c:RaptorCopter>
+                  <Speed>0.5</Speed>
+                  <Axis X="0" Y="1" Z="0"/>
+                </c:RaptorCopter>
+                <c:Transform>
+                  <Orientation X="0" Y="857.983765" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Asset">
+                  <Components>
+                    <c:ExplosionEffect>
+                      <ColorByDistance>true</ColorByDistance>
+                      <Velocity X="0" Y="0.699999988" Z="0"/>
+                      <ExplosionOrigin X="0" Y="-1.10000002" Z="0"/>
+                      <TimeSinceDeath>0.95047462600732735</TimeSinceDeath>
+                      <ExplosionDuration>10</ExplosionDuration>
+                      <EndColor A="1" B="0" G="0" R="1"/>
+                      <RandomnessScalar>3</RandomnessScalar>
+                      <Randomness>true</Randomness>
+                    </c:ExplosionEffect>
+                    <c:Model>
+                      <Resource>Models/Core/UnitSphere.mesh</Resource>
+                      <Color A="0" B="1" G="0" R="0"/>
+                      <Transparent>true</Transparent>
+                    </c:Model>
+                    <c:Transform>
+                      <Position X="0" Y="0.5" Z="0"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="AssetBase">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitCylinder.mesh</Resource>
+              <Color A="1" B="1.56862748" G="1.56862748" R="1.56862748"/>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="-0.231354833" Z="-4.48872519"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Light">
+              <Components>
+                <c:PointLight/>
+                <c:Transform>
+                  <Position X="0" Y="0.663784981" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="RotationOrigin">
+              <Components>
+                <c:RaptorCopter>
+                  <Speed>0.5</Speed>
+                  <Axis X="0" Y="1" Z="0"/>
+                </c:RaptorCopter>
+                <c:Transform>
+                  <Orientation X="0" Y="456.13559" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Asset">
+                  <Components>
+                    <c:ExplosionEffect>
+                      <ColorByDistance>true</ColorByDistance>
+                      <Velocity X="6" Y="0.100000001" Z="0"/>
+                      <ExplosionOrigin X="0" Y="-10" Z="0"/>
+                      <TimeSinceDeath>1.350502887383392</TimeSinceDeath>
+                      <ExponentialAccelaration>true</ExponentialAccelaration>
+                      <ExplosionDuration>5</ExplosionDuration>
+                      <Randomness>true</Randomness>
+                    </c:ExplosionEffect>
+                    <c:Model>
+                      <Resource>Models/Assault.mesh</Resource>
+                      <Color A="1" B="1" G="0.392156869" R="0"/>
+                      <Transparent>true</Transparent>
+                    </c:Model>
+                    <c:Transform>
+                      <Position X="0" Y="0.5" Z="0"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
         </Entity>
       </Children>
     </Entity>
@@ -1553,6 +1671,278 @@
         </Entity>
       </Children>
     </Entity>
+    <Entity name="DefenderShieldTestOrigin">
+      <Components>
+        <c:Transform>
+          <Position X="-11.0375881" Y="0" Z="20.9209175"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Shield">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitHexagon.mesh</Resource>
+            </c:Model>
+            <c:Shield/>
+            <c:Transform>
+              <Position X="0" Y="1.47765553" Z="0"/>
+              <Orientation X="0" Y="2.15300012" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ShieldedCube">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitCube.mesh</Resource>
+            </c:Model>
+            <c:Shielded/>
+            <c:Transform>
+              <Position X="-3.34650159" Y="1.19966424" Z="3.09996605"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ShieldedPlayer">
+          <Components>
+            <c:AABB>
+              <Origin X="0" Y="0.772000015" Z="0"/>
+              <Size X="1" Y="1.60000002" Z="1"/>
+            </c:AABB>
+            <c:Collidable/>
+            <c:Health/>
+            <c:Physics>
+              <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
+              <Gravity>false</Gravity>
+            </c:Physics>
+            <c:Player>
+              <MovementSpeed>5</MovementSpeed>
+            </c:Player>
+            <c:Team>
+              <Team>
+                <Red/>
+              </Team>
+            </c:Team>
+            <c:Transform>
+              <Position X="-1.56735241" Y="0.527999997" Z="0.929739475"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Camera">
+              <Components>
+                <c:Camera/>
+                <c:Transform>
+                  <Position X="0" Y="1.37700009" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="PlayerName">
+                  <Components>
+                    <c:Text>
+                      <Resource>Fonts/DroidSans.ttf,100</Resource>
+                      <Color A="1" B="0" G="1" R="0"/>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="0.100000001" Y="0.248000011" Z="-0.248000011"/>
+                      <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
+                      <Orientation X="0" Y="3.14199996" Z="0"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="CameraModel">
+                  <Components>
+                    <c:Model>
+                      <Resource>Models/Camera.mesh</Resource>
+                      <Visible>false</Visible>
+                    </c:Model>
+                    <c:Transform>
+                      <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
+                      <Scale X="1.30000007" Y="1.50000012" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="HUD">
+                  <Components>
+                    <c:Transform>
+                      <Position X="0" Y="0" Z="-0.5"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="HealthBar">
+                      <Components>
+                        <c:Fill>
+                          <Percentage>1</Percentage>
+                          <Color A="0" B="1" G="0" R="0"/>
+                        </c:Fill>
+                        <c:HealthHUD/>
+                        <c:Model>
+                          <Resource>Models/Core/UnitHexagon.mesh</Resource>
+                          <Color A="1" B="0.70588237" G="0.70588237" R="0.70588237"/>
+                        </c:Model>
+                        <c:Transform>
+                          <Position X="-0.383000016" Y="-0.185000002" Z="0"/>
+                          <Scale X="0.150000006" Y="0.150000006" Z="0.150000006"/>
+                          <Orientation X="0" Y="0.594000041" Z="0"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="Crosshair">
+                      <Components>
+                        <c:Model>
+                          <Resource>Models/CrosshairQuad.mesh</Resource>
+                        </c:Model>
+                        <c:Transform>
+                          <Position X="0" Y="0" Z="0.200000003"/>
+                          <Scale X="0.00600000005" Y="1" Z="0.00600000005"/>
+                          <Orientation X="1.57000005" Y="0" Z="0"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="Weapon">
+                      <Components>
+                        <c:ExplosionEffect>
+                          <ColorByDistance>true</ColorByDistance>
+                          <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
+                          <TimeSinceDeath>1.3671759474185377</TimeSinceDeath>
+                          <ExplosionDuration>3.7999999523162842</ExplosionDuration>
+                          <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
+                          <Randomness>true</Randomness>
+                        </c:ExplosionEffect>
+                        <c:Model>
+                          <Resource>Models/AssaultWeaponRed.mesh</Resource>
+                        </c:Model>
+                        <c:Transform>
+                          <Position X="0.180000007" Y="-0.183000013" Z="0"/>
+                          <Orientation X="0" Y="3.08300018" Z="0"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="WeaponMuzzle">
+                      <Components>
+                        <c:Transform>
+                          <Position X="0.215000004" Y="-0.153000012" Z="-0.266000003"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="ThirdPersonCamera">
+              <Components>
+                <c:Camera/>
+                <c:Model>
+                  <Resource>Models/Camera.mesh</Resource>
+                  <Visible>false</Visible>
+                </c:Model>
+                <c:Transform>
+                  <Position X="-0.284000009" Y="1.83800006" Z="1.18900001"/>
+                  <Orientation X="5.95600033" Y="0" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="PlayerModel">
+              <Components>
+                <c:Animation>
+                  <Name>Hold Pos</Name>
+                  <Time>0.39573681725672838</Time>
+                  <Speed>1</Speed>
+                </c:Animation>
+                <c:HiddenForLocalPlayer/>
+                <c:Model>
+                  <Resource>Models/AssaultAnimated.mesh</Resource>
+                  <Color A="1" B="0" G="0" R="1"/>
+                </c:Model>
+                <c:Shielded/>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="AABBStanding">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Core/UnitCube.mesh</Resource>
+                  <Color A="0.427450985" B="1" G="1" R="1"/>
+                  <Visible>false</Visible>
+                </c:Model>
+                <c:Transform>
+                  <Position X="0" Y="0.772000015" Z="0"/>
+                  <Scale X="1" Y="1.60000002" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="AABBCrouching">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Core/UnitCube.mesh</Resource>
+                  <Color A="0.745098054" B="1" G="0" R="1"/>
+                  <Visible>false</Visible>
+                </c:Model>
+                <c:Transform>
+                  <Position X="0" Y="0.772000015" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BackgroundItemsOrigin">
+          <Components>
+            <c:Transform>
+              <Position X="-7.17760038" Y="0" Z="5.57545042"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Log">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Log.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Position X="-0.09513513" Y="0.53153497" Z="-0.127776429"/>
+                  <Orientation X="5.9920001" Y="0.640000045" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Bush">
+              <Components>
+                <c:Model>
+                  <Resource>Models/BushAlive.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Position X="-4.95900011" Y="0" Z="1.29897511"/>
+                  <Scale X="5" Y="5" Z="5"/>
+                  <Orientation X="0.407000005" Y="1.68700004" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="Text">
+          <Components>
+            <c:Text>
+              <Content>Defender Shield Test</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+            </c:Text>
+            <c:Transform>
+              <Position X="0" Y="4.20000029" Z="0"/>
+              <Orientation X="0" Y="2.15300012" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/aaaatestremoveme.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/Unithexagon.mesh</Resource>
+        </c:Model>
+        <c:Shield/>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="dl">
+      <Components>
+        <c:DirectionalLight/>
+        <c:Transform>
+          <Orientation X="0" Y="2.61800003" Z="0.756000042"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="sl">
+      <Components>
+        <c:SceneLight>
+          <Gamma>2.2000000476837158</Gamma>
+        </c:SceneLight>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/aim_rays.xml

@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="0.980392158" G="1" R="1"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="-0.100000001" Y="0" Z="0"/>
+          <Scale X="50" Y="1" Z="51.1000023"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="0" G="0" R="1"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="-14.500001" Y="1.50000012" Z="16.9222012"/>
+          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:DirectionalLight/>
+        <c:Transform>
+          <Orientation X="4.38500023" Y="0" Z="0.458000034"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="1" G="0" R="0"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="-14.500001" Y="1.50000012" Z="-17.6888409"/>
+          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="0" G="0" R="1"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="12.1000004" Y="1.50000012" Z="16.9222012"/>
+          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="1" G="0" R="0"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="12.1228638" Y="1.50000012" Z="-17.9642811"/>
+          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:PlayerSpawn/>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-20.6000004" Y="1" Z="21.7150002"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PlayerSpawn/>
+            <c:Transform>
+              <Position X="-12.2000008" Y="1" Z="21.5000019"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="15.4000006" Y="1" Z="21.6000004"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="10.500001" Y="0" Z="21.9000015"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:PlayerSpawn/>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-9.70000076" Y="1" Z="-23.4000015"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-18.8000011" Y="1" Z="-22.3000011"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="8.10000038" Y="1" Z="-23.2000008"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="16.2000008" Y="1" Z="-23.2000008"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="39.2156868" G="0" R="3.13725495"/>
+        </c:Model>
+        <c:Transform>
+          <Scale X="-70" Y="-70" Z="-70"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:CapturePoint>
+          <HomePointForTeam>
+            <Blue/>
+          </HomePointForTeam>
+        </c:CapturePoint>
+        <c:Model>
+          <Resource>Models\Core\UnitCube.mesh</Resource>
+          <Color A="1" B="1" G="0.200000003" R="0"/>
+        </c:Model>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="0" Y="0.773066521" Z="-18.975975"/>
+          <Scale X="4.9000001" Y="0.600000024" Z="3.50000024"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:CapturePoint>
+          <HomePointForTeam>
+            <Red/>
+          </HomePointForTeam>
+          <CapturePointNumber>1</CapturePointNumber>
+        </c:CapturePoint>
+        <c:Model>
+          <Resource>Models\Core\UnitCube.mesh</Resource>
+          <Color A="1" B="1" G="1" R="0"/>
+        </c:Model>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="0" Y="0.452868998" Z="18.5607414"/>
+          <Scale X="4.60000038" Y="0.900000036" Z="4.10000038"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Types/Entity.xsd

@@ -38,6 +38,8 @@
 							<xs:element ref="c:HiddenForLocalPlayer" minOccurs="0"/>
 							<xs:element ref="c:Fill" minOccurs="0"/>
 							<xs:element ref="c:Animation" minOccurs="0"/>
+							<xs:element ref="c:Shield" minOccurs="0"/>
+							<xs:element ref="c:Shielded" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/DrawColorCorrection.frag.glsl

@@ -2,6 +2,8 @@
 
 layout (binding = 0) uniform sampler2D SceneTexture;
 layout (binding = 1) uniform sampler2D BloomTexture;
+layout (binding = 2) uniform sampler2D SceneTextureLowRes;
+layout (binding = 3) uniform sampler2D BloomTextureLowRes;
 uniform float Exposure;
 uniform float Gamma;
 
@@ -15,10 +17,19 @@ void main()
 {
 	vec4 hdrColor = texture(SceneTexture, Input.TextureCoordinate);
 	vec4 bloomColor = texture(BloomTexture, Input.TextureCoordinate);
+	vec4 hdrColorLowRes = texture(SceneTextureLowRes, Input.TextureCoordinate);
+	vec4 bloomColorLowRes = texture(BloomTextureLowRes, Input.TextureCoordinate);
 	hdrColor += bloomColor;
+	hdrColorLowRes;
 
+	float hdrColorsum = hdrColorLowRes.r + hdrColorLowRes.g + hdrColorLowRes.b;
 	//Toon mapping thingy
-	vec3 result = vec3(1.0) - exp(-hdrColor.rgb * Exposure);
+	vec3 result;
+	if(hdrColorsum > 0.0) {
+		result = vec3(1.0) - exp(-hdrColorLowRes.rgb * Exposure);
+	} else {
+		result = vec3(1.0) - exp(-hdrColor.rgb * Exposure);
+	}
 
 	//gamme correction
 	result = pow(result, vec3(1.0 / Gamma));

resources/Shaders/FillDepthBuffer.frag.glsl

@@ -0,0 +1,11 @@
+#version 430
+
+in VertexData{
+	vec3 Position;
+}Input;
+
+void main()
+{
+}
+
+

resources/Shaders/FillDepthBuffer.vert.glsl

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

resources/Shaders/ShieldStencil.frag.glsl

@@ -0,0 +1,15 @@
+#version 430
+
+in VertexData{
+	vec3 Position;
+}Input;
+
+
+out vec4 fragmentColor;
+
+void main()
+{
+	fragmentColor = vec4(0.5, 0.0, 0.0, 0.0);
+}
+
+

resources/Shaders/ShieldStencil.vert.glsl

@@ -0,0 +1,19 @@
+#version 430
+
+uniform mat4 M;
+uniform mat4 V;
+uniform mat4 P;
+
+layout(location = 0) in vec3 Position;
+
+
+out VertexData{
+	vec3 Position;
+}Output;
+
+void main()
+{
+	gl_Position = P * V * M * vec4(Position, 1.0);
+
+	Output.Position = Position;
+}

src/Engine/Collision/CollidableOctreeSystem.cpp

@@ -1,18 +0,0 @@
-#include "Collision/CollidableOctreeSystem.h"
-
-void CollidableOctreeSystem::Update(double dt)
-{
-    m_Octree->ClearDynamicObjects();
-}
-
-void CollidableOctreeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
-{
-    if (entity.HasComponent("AABB")) {
-        boost::optional<EntityAABB> absoluteAABB = Collision::EntityAbsoluteAABB(entity);
-        if (absoluteAABB) {
-            m_Octree->AddDynamicObject(*absoluteAABB);
-        }
-    } else if (entity.HasComponent("Model")) {
-        // TODO: Derive AABB from model
-    }
-}

src/Engine/Collision/Collision.cpp

@@ -1,9 +1,11 @@
 #include <algorithm>
+#include <bitset>
 
 #include "Collision/Collision.h"
 #include "Engine/GLM.h"
 #include "Core/World.h"
 #include "Rendering/Model.h"
+#include "imgui/imgui.h"
 
 namespace Collision
 {
@@ -116,36 +118,79 @@ bool AABBVsAABB(const AABB& a, const AABB& b, glm::vec3& minimumTranslation)
     return glm::all(axisesIntersecting);
 }
 
+bool RayVsTriangle(const Ray& ray,
+    const glm::vec3& v0,
+    const glm::vec3& v1,
+    const glm::vec3& v2,
+    bool trueOnNegativeDistance)
+{
+    glm::vec3 e1 = v1 - v0;		//v1 - v0
+    glm::vec3 e2 = v2 - v0;		//v2 - v0
+    glm::vec3 m = ray.Origin() - v0;
+    glm::vec3 MxE1 = glm::cross(m, e1);
+    glm::vec3 DxE2 = glm::cross(ray.Direction(), e2);
+    float DetInv = glm::dot(e1, DxE2);
+    if (std::abs(DetInv) < FLT_EPSILON) {
+        return false;
+    }
+    DetInv = 1.0f / DetInv;
+    float u = glm::dot(m, DxE2) * DetInv;
+    float v = glm::dot(ray.Direction(), MxE1) * DetInv;
+    //u,v can be very close to 0 but still negative sometimes. added a deltafactor to compensate for that problem
+    if ((u + 0.001f) < 0 || (v + 0.001f) < 0 || 1 < u + v) {
+        return false;
+    }
+    //Here, u and v are positive, u+v <= 1, and if distance is positive - triangle is hit.
+    return trueOnNegativeDistance || 0 <= glm::dot(e2, MxE1) * DetInv;
+}
+
 bool RayVsModel(const Ray& ray,
     const std::vector<RawModel::Vertex>& modelVertices,
     const std::vector<unsigned int>& modelIndices)
 {
     for (int i = 0; i < modelIndices.size(); ++i) {
         glm::vec3 v0 = modelVertices[modelIndices[i]].Position;
-        glm::vec3 e1 = modelVertices[modelIndices[++i]].Position - v0;		//v1 - v0
-        glm::vec3 e2 = modelVertices[modelIndices[++i]].Position - v0;		//v2 - v0
-        glm::vec3 m = ray.Origin() - v0;
-        glm::vec3 MxE1 = glm::cross(m, e1);
-        glm::vec3 DxE2 = glm::cross(ray.Direction(), e2);
-        float DetInv = glm::dot(e1, DxE2);
-        if (std::abs(DetInv) < FLT_EPSILON) {
-            continue;
-        }
-        DetInv = 1.0f / DetInv;
-        float u = glm::dot(m, DxE2) * DetInv;
-        float v = glm::dot(ray.Direction(), MxE1) * DetInv;
-        //u,v can be very close to 0 but still negative sometimes. added a deltafactor to compensate for that problem
-        if ((u + 0.001f) < 0 || (v + 0.001f) < 0 || 1 < u + v) {
-            continue;
-        }
-        //Here, u and v are positive, u+v <= 1, and if distance is positive - triangle is hit.
-        if (0 <= glm::dot(e2, MxE1) * DetInv) {
+        glm::vec3 v1 = modelVertices[modelIndices[++i]].Position;
+        glm::vec3 v2 = modelVertices[modelIndices[++i]].Position;
+        if (RayVsTriangle(ray, v0, v1, v2)) {
             return true;
         }
     }
     return false;
 }
 
+bool RayVsTriangle(const Ray& ray,
+    const glm::vec3& v0,
+    const glm::vec3& v1,
+    const glm::vec3& v2,
+    float& outDistance,
+    float& outUCoord,
+    float& outVCoord,
+    bool trueOnNegativeDistance)
+{
+    glm::vec3 e1 = v1 - v0;		//v1 - v0
+    glm::vec3 e2 = v2 - v0;		//v2 - v0
+    glm::vec3 m = ray.Origin() - v0;
+    glm::vec3 MxE1 = glm::cross(m, e1);
+    glm::vec3 DxE2 = glm::cross(ray.Direction(), e2);//pVec
+    float DetInv = glm::dot(e1, DxE2);
+    if (std::abs(DetInv) < FLT_EPSILON) {
+        return false;
+    }
+    DetInv = 1.0f / DetInv;
+    float dist = glm::dot(e2, MxE1) * DetInv;
+    if (dist >= outDistance) {
+        return false;
+    }
+    outDistance = dist;
+    outUCoord = glm::dot(m, DxE2) * DetInv;
+    outVCoord  = glm::dot(ray.Direction(), MxE1) * DetInv;
+
+    //u,v can be very close to 0 but still negative sometimes. added a deltafactor to compensate for that problem
+    //If u and v are positive, u+v <= 1, dist is positive, and less than closest.
+    return (0 <= (outUCoord + 0.001f) && 0 <= (outVCoord + 0.001f) && outUCoord + outVCoord <= 1 && (trueOnNegativeDistance || 0 <= dist));
+}
+
 bool RayVsModel(const Ray& ray,
     const std::vector<RawModel::Vertex>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
@@ -157,26 +202,12 @@ bool RayVsModel(const Ray& ray,
     bool hit = false;
     for (int i = 0; i < modelIndices.size(); ++i) {
         glm::vec3 v0 = modelVertices[modelIndices[i]].Position;
-        glm::vec3 e1 = modelVertices[modelIndices[++i]].Position - v0;		//v1 - v0
-        glm::vec3 e2 = modelVertices[modelIndices[++i]].Position - v0;		//v2 - v0
-        glm::vec3 m = ray.Origin() - v0;
-        glm::vec3 MxE1 = glm::cross(m, e1);
-        glm::vec3 DxE2 = glm::cross(ray.Direction(), e2);//pVec
-        float DetInv = glm::dot(e1, DxE2);
-        if (std::abs(DetInv) < FLT_EPSILON) {
-            continue;
-        }
-        DetInv = 1.0f / DetInv;
-        float dist = glm::dot(e2, MxE1) * DetInv;
-        if (dist >= outDistance) {
-            continue;
-        }
-        float u = glm::dot(m, DxE2) * DetInv;
-        float v = glm::dot(ray.Direction(), MxE1) * DetInv;
-
-        //u,v can be very close to 0 but still negative sometimes. added a deltafactor to compensate for that problem
-        //If u and v are positive, u+v <= 1, dist is positive, and less than closest.
-        if (0 <= (u + 0.001f) && 0 <= (v + 0.001f) && u + v <= 1 && 0 <= dist) {
+        glm::vec3 v1 = modelVertices[modelIndices[++i]].Position;
+        glm::vec3 v2 = modelVertices[modelIndices[++i]].Position;
+        float dist;
+        float u;
+        float v;
+        if (RayVsTriangle(ray, v0, v1, v2, dist, u, v)) {
             outDistance = dist;
             outUCoord = u;
             outVCoord = v;
@@ -199,91 +230,385 @@ bool RayVsModel(const Ray& ray,
     return hit;
 }
 
-bool AABBvsTriangles(const AABB& box, const std::vector<RawModel::Vertex>& modelVertices, const std::vector<unsigned int>& modelIndices, const glm::mat4& modelMatrix, glm::vec3& outResolutionVector)
+constexpr inline int signNonZero(float x)
 {
-    bool hit = false;
-    
+    return x < 0 ? -1 : 1;
+}
+
+inline glm::vec3 signNonZero(const glm::vec3& x)
+{
+    glm::vec3 r;
+    for (int i = 0; i < 3; ++i) {
+        r[i] = (float)signNonZero(x[i]);
+    }
+    return r;
+}
+
+template<typename T>
+bool vectorHasLength(const T& vec)
+{
+    return glm::any(glm::greaterThan(glm::abs(vec), T(0.0001f)));
+}
+
+bool rectangleVsTriangle(const glm::vec2& boxMin,
+    const glm::vec2& boxMax,
+    const std::array<glm::vec2, 3>& triPos,
+    glm::vec2& resolutionDirection,
+    float& resolutionDistanceSq,
+    bool& pushedFromTriNormal)
+{
+    pushedFromTriNormal = false;
+    resolutionDistanceSq = INFINITY;
+    //Project along box normals (coordinate axes, since it's axis-aligned).
+    for (int ax = 0; ax < 2; ++ax) {
+        float minTri = INFINITY;
+        float maxTri = -INFINITY;
+        for (const glm::vec2& t : triPos) {
+            minTri = std::min(t[ax], minTri);
+            maxTri = std::max(t[ax], maxTri);
+        }
+        if (boxMax[ax] <= minTri || maxTri <= boxMin[ax]) {
+            return false;
+        }
+
+        //Here: maxBox > minTri && minBox < maxTri
+        //Left is negative.
+        float leftRes = minTri - boxMax[ax];
+        float rightRes = maxTri - boxMin[ax];
+        float push = rightRes < -leftRes ? rightRes : leftRes;
+        float absPushSq = abs(push);
+        absPushSq *= absPushSq;
+
+        if (absPushSq < resolutionDistanceSq) {
+            resolutionDistanceSq = absPushSq;
+            resolutionDirection[1 - ax] = 0.f;
+            resolutionDirection[ax] = push;
+        }
+    }
+    //Project along triangle normals.
+    //Put edges into normal vector, make normals in the loop.
+    std::array<glm::vec2, 3> triNormals = {
+        triPos[1] - triPos[0],
+        triPos[2] - triPos[1],
+        triPos[0] - triPos[2]
+    };
+    std::array<glm::vec2, 4> boxPos = {
+        boxMax,
+        glm::vec2(boxMax.x, boxMin.y),
+        glm::vec2(boxMin.x, boxMax.y),
+        boxMin
+    };
+    for (auto& normal : triNormals) {
+        if (!vectorHasLength(normal)) {
+            continue;
+        }
+        //Rotate edge to a normal.
+        normal = glm::normalize(glm::vec2(-normal.y, normal.x));
+        //Project triangle onto the normal.
+        float minTri = INFINITY;
+        float maxTri = -INFINITY;
+        for (const glm::vec2& point : triPos) {
+            float dot = glm::dot(normal, point);
+            minTri = std::min(dot, minTri);
+            maxTri = std::max(dot, maxTri);
+        }
+        //Project box onto the normal.
+        float minBox = INFINITY;
+        float maxBox = -INFINITY;
+        for (const glm::vec2& point : boxPos) {
+            float dot = glm::dot(normal, point);
+            minBox = std::min(dot, minBox);
+            maxBox = std::max(dot, maxBox);
+        }
+        if (maxBox <= minTri || maxTri <= minBox) {
+            return false;
+        }
+
+        //Here: maxBox > minTri && minBox < maxTri
+        //Left is negative.
+        float leftRes = minTri - maxBox;
+        float rightRes = maxTri - minBox;
+        float push = rightRes < -leftRes ? rightRes : leftRes;
+        float absPushSq = abs(push);
+        absPushSq *= absPushSq;
+        
+        if (absPushSq < resolutionDistanceSq) {
+            resolutionDistanceSq = absPushSq;
+            resolutionDirection = push * normal;
+            pushedFromTriNormal = true;
+        }
+    }
+    return true;
+}
+
+constexpr float SlopeConstant(float degrees)
+{
+    return (1.0f - degrees / 90.f);
+}
+
+//Returns true if the angle between horizon and the collision surface is less than 45 degrees. 
+constexpr bool FaceIsGround(float faceNormalY)
+{
+    //TODO: Perhaps the 45 degrees could be saved in a component or in the config..
+    return faceNormalY > SlopeConstant(45.0f);
+}
+
+//An array containing 3 int pairs { 0, 2 }, { 0, 1 }, { 1, 2 }
+constexpr std::array<std::pair<int, int>, 3> dimensionPairs({ std::pair<int, int>(0, 2), std::pair<int, int>(0, 1), std::pair<int, int>(1, 2) });
+
+bool AABBvsTriangle(const AABB& box, 
+    const std::array<glm::vec3, 3>& triPos, 
+    const glm::vec3& originalBoxVelocity,
+    float verticalStepHeight,
+    bool& isOnGround,
+    glm::vec3& boxVelocity,
+    glm::vec3& outResolution)
+{
+    //Check so we don't have a zero area triangle when calculating the normal.
+    //Also, don't check a triangle facing away from the player.
+    //Less checks, and we should be able to walk out from models if we are trapped inside.
+    glm::vec3 triNormal = glm::cross(triPos[1] - triPos[0], triPos[2] - triPos[0]);
+    if (!vectorHasLength(triNormal) || (glm::dot(triNormal, originalBoxVelocity) > 0)) {
+        return false;
+    }
+    triNormal = glm::normalize(triNormal);
+
+    enum BoxTriResolveCase
+    {
+        ResolveDimX,
+        ResolveDimY,
+        ResolveDimZ,
+        Line,       //Box edge colliding with triangle line.
+        Corner      //Box corner colliding with the triangle face.
+    };
+    struct Resolution
+    {
+        Resolution()
+            : DistanceSq(INFINITY)
+            , Vector(0.f)
+        {}
+        BoxTriResolveCase Case;
+        float DistanceSq;
+        glm::vec3 Vector;
+    };
+    //The smallest resolution that solves the collision.
+    Resolution resolveShortest;
+    //The smallest resolution that solves the collision, that resolves upwards.
+    Resolution resolveUpwards;
+    //If player stands on the ground and collides with a ground triangle, 
+    //we might step up onto it if the step is small enough.
+    bool canStairStepUp = isOnGround && FaceIsGround(triNormal.y);
+
     const glm::vec3& origin = box.Origin();
+    const glm::vec3& half = box.HalfSize();
     const glm::vec3& min = box.MinCorner();
     const glm::vec3& max = box.MaxCorner();
 
-    outResolutionVector.x = INFINITY;
-
-    for (int i = 0; i < modelIndices.size(); ++i) {
-        glm::vec3 p = modelVertices[i].Position;
-        p = glm::vec3(modelMatrix * glm::vec4(p.x, p.y, p.z, 1));
-
-        float distFromOrigin = glm::abs(origin.x - p.x);
-        float penetration = box.HalfSize().x - distFromOrigin;
-        if (penetration > 0 && penetration < glm::abs(outResolutionVector.x)) {
-            if (p.x > origin.x) {
-                outResolutionVector.x = -penetration;
-            } else {
-                outResolutionVector.x = penetration;
+    //For each projection in xy-, xz-, and yx-planes.
+    for (std::pair<int, int> dim : dimensionPairs) {
+        //2D Triangle.
+        //Project triangle.
+        std::array<glm::vec2, 3> t2D = {
+            glm::vec2(triPos[0][dim.first], triPos[0][dim.second]),
+            glm::vec2(triPos[1][dim.first], triPos[1][dim.second]),
+            glm::vec2(triPos[2][dim.first], triPos[2][dim.second])
+        };
+        //Project box.
+        glm::vec2 boxMin(min[dim.first], min[dim.second]);
+        glm::vec2 boxMax(max[dim.first], max[dim.second]);
+        glm::vec2 resolutionVector;
+        float resolutionDist;
+        bool pushedFromTriangleLine;
+        //if projections don't overlap, return false.
+        if (!rectangleVsTriangle(boxMin, boxMax, t2D, resolutionVector, resolutionDist, pushedFromTriangleLine)) {
+            return false;
+        } else {
+            //Overwrite the smallest resolution if this is smaller.
+            if (resolutionDist < resolveShortest.DistanceSq) {
+                resolveShortest.Vector = glm::vec3(0.f);
+                resolveShortest.Vector[dim.first] = resolutionVector.x;
+                resolveShortest.Vector[dim.second] = resolutionVector.y;
+                resolveShortest.DistanceSq = resolutionDist;
+                //If we pushed away from triangle line (edge), or if we 
+                //move the player along one coordinate axis (pick the dimension that isn't zero).
+                resolveShortest.Case = pushedFromTriangleLine ? Line : static_cast<BoxTriResolveCase>((abs(resolveShortest.Vector[dim.first]) < 0.0001f) ? dim.second : dim.first);
+            }
+            //Overwrite the smallest upward resolution if this is smaller, and resolves upwards.
+            constexpr int yAxis = 1;
+            bool resIsUpwardsIn3D = dim.first == yAxis && resolutionVector.x > 0 || dim.second == yAxis && resolutionVector.y > 0;
+            if (canStairStepUp && resIsUpwardsIn3D && resolutionDist < resolveUpwards.DistanceSq) {
+                resolveUpwards.Vector = glm::vec3(0.f);
+                resolveUpwards.Vector[dim.first] = resolutionVector.x;
+                resolveUpwards.Vector[dim.second] = resolutionVector.y;
+                resolveUpwards.DistanceSq = resolutionDist;
+                //If we pushed away from triangle line (edge), or if we 
+                //move the player along one coordinate axis (pick the dimension that isn't zero).
+                resolveUpwards.Case = pushedFromTriangleLine ? Line : static_cast<BoxTriResolveCase>((abs(resolveUpwards.Vector[dim.first]) < 0.0001f) ? dim.second : dim.first);
             }
-            hit = true;
         }
-        //glm::vec3 pLocal = origin - p;
-        //for (int axis = 0; axis < 3; ++axis) {
-        //    if (p[axis] < min[axis] || p[axis] > max[axis]) {
-        //        continue;
-        //    }
-
-        //    if (glm::abs(pLocal[axis]) < box.HalfSize()[axis]) {
-        //        outResolutionVector[axis] = (glm::sign(pLocal[axis]) * box.HalfSize()[axis]) - pLocal[axis];
-        //        hit = true;
-        //    }
-        //}
     }
 
-    return hit;
+    //If the triangle does intersect any of the cube diagonals, it will 
+    //intersect the cube diagonal that comes
+    //closest to being perpendicular to the plane of the triangle.
+    glm::vec3 diagonal = signNonZero(triNormal) * half;
+    //The triangle plane contains all points P in dot(triNormal, P) == dot(triNormal, v0)
+    //The diagonal line contains all points P in P = origin + diagonal * t.
+    float t = glm::dot(triNormal, triPos[0] - origin) / glm::dot(triNormal, diagonal);
+    //If intersection point between plane and diagonal is within the box.
+    if (glm::abs(t) > 1) {
+        return false;
+    }
+    glm::vec3 cornerResolution = (1+t) * diagonal;
+    //Overwrite the smallest resolution if cornerResolution is smaller.
+    float lenSq = glm::length2(cornerResolution);
+    if (lenSq < resolveShortest.DistanceSq) {
+        resolveShortest.Vector = cornerResolution;
+        resolveShortest.Case = Corner;
+    }
+    if (canStairStepUp && cornerResolution.y > 0 && lenSq < resolveUpwards.DistanceSq) {
+        resolveUpwards.Vector = cornerResolution;
+        resolveUpwards.Case = Corner;
+        resolveUpwards.DistanceSq = lenSq;
+    }
+
+    //Force the resolution upwards if it is smaller than the threshold verticalStepHeight.
+    //Else take the shortest resolution.
+    bool takeUp = resolveUpwards.Vector.y > 0 && resolveUpwards.Vector.y < verticalStepHeight;
+    Resolution& bestResolve = takeUp ? resolveUpwards : resolveShortest;
+    outResolution = bestResolve.Vector;
+
+    glm::vec3 projNorm;
+    switch (bestResolve.Case) {
+    case ResolveDimY:
+        boxVelocity.y = 0.f;
+        if (outResolution.y > 0)
+            isOnGround = true;
+    case ResolveDimX:
+    case ResolveDimZ:
+        //If we get here, the resolution is along one coordinate axis.
+        //set velocity to 0 in y if it is along y-axis.
+        return true;
+    case Line:
+        projNorm = glm::normalize(outResolution);
+        break;
+    case Corner:
+        projNorm = triNormal;
+        break;
+    default:
+        break;
+    }
+
+    //If the collision was not on steep wall or similarly (e.g. walking on the ground), force resolution in y only.
+    if (FaceIsGround(projNorm.y)) {
+        //Ensure that the player always is moved upwards, instead of sliding down.
+        float len = glm::length(outResolution);
+        float ang = glm::half_pi<float>() - glm::acos(outResolution.y / len);
+        if (len > 0.0000001f && ang > 0.0000001f) {
+            outResolution.x = 0;
+            outResolution.y = len / glm::sin(ang);
+            outResolution.z = 0;
+        }
+        //Also zero the vertical velocity, if it is positive, else project it onto the normal.
+        //Project the velocity onto the normal of the hit line/face.
+        //w = v - <v,n>*n, |n|==1.
+        boxVelocity.y = std::min(boxVelocity.y - glm::dot(boxVelocity, projNorm) * projNorm.y, 0.f);
+        isOnGround = true;
+    } else {
+        //Enter here if the triangle is a steep slope, and it is not facing downwards.
+        //Project the velocity onto the normal of the hit line/face.
+        //w = v - <v,n>*n, |n|==1.
+        //"ice cream"-effect, air resistance + projected velocity.
+        if (!isOnGround) {
+            boxVelocity = boxVelocity - glm::dot(boxVelocity, projNorm) * projNorm;
+        }
+    }
+    return true;
 }
 
-bool attachAABBComponentFromModel(World* world, EntityID id)
+bool AABBvsTriangles(const AABB& box, 
+    const std::vector<RawModel::Vertex>& modelVertices, 
+    const std::vector<unsigned int>& modelIndices, 
+    const glm::mat4& modelMatrix,
+    glm::vec3& boxVelocity,
+    float verticalStepHeight,
+    bool& isOnGround,
+    glm::vec3& outResolutionVector)
 {
-    if (!world->HasComponent(id, "Model")) {
-        return false;
-    }
-    ComponentWrapper model = world->GetComponent(id, "Model");
-    ComponentWrapper collision = world->AttachComponent(id, "AABB");
-    Model* modelRes = ResourceManager::Load<Model>(model["Resource"]);
-    if (modelRes == nullptr) {
-        return false;
+    bool hit = false;
+
+    bool everHitTheGround = false;
+    AABB newBox = box;
+    outResolutionVector = glm::vec3(0.f);
+    glm::vec3 originalBoxVelocity(boxVelocity);
+    for (int i = 0; i < modelIndices.size(); ) {
+        std::array<glm::vec3, 3> triVertices = {
+            Transform::TransformPoint(modelVertices[modelIndices[i++]].Position, modelMatrix),
+            Transform::TransformPoint(modelVertices[modelIndices[i++]].Position, modelMatrix),
+            Transform::TransformPoint(modelVertices[modelIndices[i++]].Position, modelMatrix)
+        };
+        glm::vec3 outVec;
+        bool collideWithGround = isOnGround;
+        if (AABBvsTriangle(newBox, triVertices, originalBoxVelocity, verticalStepHeight, collideWithGround, boxVelocity, outVec)) {
+            hit = true;
+            outResolutionVector += outVec;
+            newBox = AABB::FromOriginSize(newBox.Origin() + outVec, newBox.Size());
+            if (collideWithGround) {
+                everHitTheGround = isOnGround = true;
+            }
+        }
     }
 
-    glm::mat4 modelMatrix = modelRes->Matrix();
-
-    glm::vec3 mini = glm::vec3(INFINITY, INFINITY, INFINITY);
-    glm::vec3 maxi = glm::vec3(-INFINITY, -INFINITY, -INFINITY);
-    for (const auto& v : modelRes->Vertices()) {
-        const auto& wPos = modelMatrix * glm::vec4(v.Position.x, v.Position.y, v.Position.z, 1);
-        maxi.x = std::max(wPos.x, maxi.x);
-        maxi.y = std::max(wPos.y, maxi.y);
-        maxi.z = std::max(wPos.z, maxi.z);
-        mini.x = std::min(wPos.x, mini.x);
-        mini.y = std::min(wPos.y, mini.y);
-        mini.z = std::min(wPos.z, mini.z);
+    if (!everHitTheGround) {
+        isOnGround = false;
     }
-    collision["Origin"] = 0.5f * (maxi + mini);
-    collision["Size"] = maxi - mini;
-    return true;
+    return hit;
 }
 
 boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity)
 {
-    if (!entity.HasComponent("AABB")) {
+    AABB modelSpaceBox;
+    if (entity.HasComponent("AABB")) {
+        ComponentWrapper& cAABB = entity["AABB"];
+        modelSpaceBox = EntityAABB::FromOriginSize((glm::vec3)cAABB["Origin"], (glm::vec3)cAABB["Size"]);
+    } else if (entity.HasComponent("Model")) {
+        Model* model;
+        std::string res = entity["Model"]["Resource"];
+        if (res.empty()) {
+            return boost::none;
+        }
+        try {
+            model = ResourceManager::Load<::Model, true>(res);
+        } catch (const Resource::StillLoadingException&) {
+            return boost::none;
+        } catch (const std::exception&) {
+            return boost::none;
+        }
+        modelSpaceBox = model->Box();
+    } else {
         return boost::none;
     }
 
-    ComponentWrapper& cAABB = entity["AABB"];
-    glm::vec3 absPosition = Transform::AbsolutePosition(entity.World, entity.ID);
-    glm::vec3 absScale = Transform::AbsoluteScale(entity.World, entity.ID);
-    glm::vec3 origin = absPosition + (glm::vec3)cAABB["Origin"];
-    glm::vec3 size = (glm::vec3)cAABB["Size"] * absScale;
+    glm::mat4 modelMat = Transform::AbsoluteTransformation(entity);
+    glm::vec3 mini(INFINITY);
+    glm::vec3 maxi(-INFINITY);
+    glm::vec3 maxCorner = modelSpaceBox.MaxCorner();
+    glm::vec3 minCorner = modelSpaceBox.MinCorner();
+    for (int i = 0; i < 8; ++i) {
+        std::bitset<3> bits(i);
+        glm::vec3 corner;
+        corner.x = bits.test(0) ? maxCorner.x : minCorner.x;
+        corner.y = bits.test(1) ? maxCorner.y : minCorner.y;
+        corner.z = bits.test(2) ? maxCorner.z : minCorner.z;
+        corner = Transform::TransformPoint(corner, modelMat);
+        mini = glm::min(mini, corner);
+        maxi = glm::max(maxi, corner);
+    }
+
+    EntityAABB aabb;
+    aabb = AABB(mini, maxi);
 
-    EntityAABB aabb = EntityAABB::FromOriginSize(origin, size);
     aabb.Entity = entity;
-
     return aabb;
 }
 

src/Engine/Collision/CollisionSystem.cpp

@@ -1,6 +1,7 @@
 #include "Collision/Collision.h"
 #include "Collision/CollisionSystem.h"
 #include "Core/AABB.h"
+#include "Rendering/Model.h"
 
 void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
 {
@@ -19,39 +20,48 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
     // Collide against octree items
     m_OctreeResult.clear();
     m_Octree->ObjectsInSameRegion(*boundingBox, m_OctreeResult);
+    bool everHitTheGround = false;
     for (auto& boxB : m_OctreeResult) {
         glm::vec3 resolutionVector;
         if (boxA.Entity == boxB.Entity) {
             continue;
         }
 
-        if (Collision::AABBVsAABB(boxA, boxB, resolutionVector)) {
+        if (boxB.Entity.HasComponent("Model") && Collision::AABBVsAABB(boxA, boxB)) {
+            //Here we know boxB is a entity with Collideable, AABB, and Model.
+            RawModel* model;
+            try {
+                model = ResourceManager::Load<RawModel, true>(boxB.Entity["Model"]["Resource"]);
+            } catch (const std::exception&) {
+                continue;
+            }
+
+            glm::mat4 modelMatrix = Transform::ModelMatrix(boxB.Entity);
+
+            glm::vec3 inOutVelocity = (glm::vec3)cPhysics["Velocity"];
+            bool isOnGround = (bool)cPhysics["IsOnGround"];
+            float verticalStepHeight = (float)(double)cPhysics["VerticalStepHeight"];
+            if (Collision::AABBvsTriangles(boxA, model->m_Vertices, model->m_Indices, modelMatrix, inOutVelocity, verticalStepHeight, isOnGround, resolutionVector)) {
+                (glm::vec3&)cTransform["Position"] += resolutionVector;
+                cPhysics["Velocity"] = inOutVelocity;
+                if (isOnGround) {
+                    everHitTheGround = true;
+                    (bool)cPhysics["IsOnGround"] = true;
+                }
+            }
+        } else if (Collision::AABBVsAABB(boxA, boxB, resolutionVector)) {
+            //Enter here if boxB has no Model.
             (glm::vec3&)cTransform["Position"] += resolutionVector;
             if (resolutionVector.y > 0) {
+                everHitTheGround = true;
+                (bool)cPhysics["IsOnGround"] = true;
                 ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
             }
         }
     }
 
-    // HACK: Temporarily collide against all collidable models since they're not in the octree yet
-    //auto otherCollidables = world->GetComponents("Model");
-    //for (auto& cModel : *otherCollidables) {
-    //    if (cModel.EntityID == entity) {
-    //        continue;
-    //    }
-    //    if (!world->HasComponent(cModel.EntityID, "Collidable")) {
-    //        continue;
-    //    }
-
-    //    auto absPosition = RenderQueueFactory::AbsolutePosition(world, cModel.EntityID);
-    //    auto absOrientation = RenderQueueFactory::AbsoluteOrientation(world, cModel.EntityID);
-    //    auto absScale = RenderQueueFactory::AbsoluteScale(world, cModel.EntityID);
-    //    glm::mat4 modelMatrix = glm::translate(absPosition); // *glm::toMat4(absOrientation) * glm::scale(absScale);
-
-    //    auto model = ResourceManager::Load<Model>(cModel["Resource"]);
-    //    glm::vec3 resolutionVector;
-    //    if (Collision::AABBvsTriangles(boxA, model->m_Vertices, model->m_Indices, modelMatrix, resolutionVector)) {
-    //        (glm::vec3&)cTransform["Position"] += resolutionVector;
-    //    }
-    //}
-}
+    //This should apply air friction and such, iff zero models were hit.
+    if (!everHitTheGround) {
+        (bool)cPhysics["IsOnGround"] = false;
+    }
+}

src/Engine/Collision/FillFrustumOctreeSystem.cpp

@@ -0,0 +1,21 @@
+#include "Collision/FillFrustumOctreeSystem.h"
+
+void FillFrustumOctreeSystem::Update(double dt)
+{
+    m_Octree->ClearDynamicObjects();
+}
+
+void FillFrustumOctreeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
+{
+    if (entity.HasComponent("ExplosionEffect")) {
+        //TODO: Fix hack, get real box by using shader equation.
+        EntityAABB aabb = AABB(glm::vec3(-300), glm::vec3(300));
+        aabb.Entity = entity;
+        m_Octree->AddDynamicObject(aabb);
+    } else {
+        boost::optional<EntityAABB> absoluteAABB = Collision::EntityAbsoluteAABB(entity);
+        if (absoluteAABB) {
+            m_Octree->AddDynamicObject(*absoluteAABB);
+        }
+    }
+}

src/Engine/Collision/FillOctreeSystem.cpp

@@ -0,0 +1,14 @@
+#include "Collision/FillOctreeSystem.h"
+
+void FillOctreeSystem::Update(double dt)
+{
+    m_Octree->ClearDynamicObjects();
+}
+
+void FillOctreeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
+{
+    boost::optional<EntityAABB> absoluteAABB = Collision::EntityAbsoluteAABB(entity);
+    if (absoluteAABB) {
+        m_Octree->AddDynamicObject(*absoluteAABB);
+    }
+}

src/Engine/Collision/TriggerSystem.cpp

@@ -5,7 +5,6 @@
 
 void TriggerSystem::UpdateComponent(EntityWrapper& triggerEntity, ComponentWrapper& cTrigger, double dt)
 {
-    // The trigger *should* have a bounding box, or something, to test against so it can be triggered.
     boost::optional<EntityAABB> triggerBox = Collision::EntityAbsoluteAABB(triggerEntity);
     if (!triggerBox) {
         return;

src/Engine/Core/EntityWrapper.cpp

@@ -16,6 +16,15 @@ bool EntityWrapper::HasComponent(const std::string& componentName)
     return World->HasComponent(ID, componentName);
 }
 
+void EntityWrapper::AttachComponent(const char* componentName)
+{
+    if (!Valid()) {
+        LOG_WARNING("Could not attach \"%s\" component to #%i, entity is not valid.", componentName, ID);
+        return;
+    }
+    World->AttachComponent(ID, componentName);
+}
+
 EntityWrapper EntityWrapper::Parent()
 {
     if (this->World == nullptr || this->ID == EntityID_Invalid) {

src/Engine/Core/Octree.cpp

@@ -275,9 +275,4 @@ std::vector<int> Child::childIndicesContainingBox(const AABB& box) const
     }
 }
 
-bool Child::hasChildren() const
-{
-    return m_Children[0] != nullptr;
-}
-
 }

src/Engine/Core/Transform.cpp

@@ -97,3 +97,7 @@ glm::mat4 Transform::ModelMatrix(EntityID entity, World* world)
     return modelMatrix;
 }
 
+glm::vec3 Transform::TransformPoint(const glm::vec3& point, const glm::mat4& matrix)
+{
+    return glm::vec3(matrix * glm::vec4(point.x, point.y, point.z, 1));
+}

src/Engine/Editor/EditorRenderSystem.cpp

@@ -56,9 +56,9 @@ void EditorRenderSystem::Update(double dt)
             for (auto matGroup : model->MaterialGroups()) {
                 std::shared_ptr<ModelJob> modelJob = std::make_shared<ModelJob>(model, scene.Camera, modelMatrix, matGroup, cModel, entity.World, glm::vec4(0), 0.f);
                 if (cModel["Transparent"]) {
-                    scene.TransparentObjects.push_back(modelJob);
+                    scene.Jobs.TransparentObjects.push_back(modelJob);
                 } else {
-                    scene.OpaqueObjects.push_back(modelJob);
+                    scene.Jobs.OpaqueObjects.push_back(modelJob);
                 }
             }
         }
@@ -75,7 +75,7 @@ void EditorRenderSystem::Update(double dt)
             EntityWrapper entity(m_World, cPointLight.EntityID);
             ComponentWrapper& cTransform = entity["Transform"];
             std::shared_ptr<PointLightJob> pointLightJob = std::make_shared<PointLightJob>(cTransform, cPointLight, entity.World);
-            scene.PointLightJobs.push_back(pointLightJob);
+            scene.Jobs.PointLight.push_back(pointLightJob);
         }
     }
 

src/Engine/Rendering/DrawColorCorrectionPass.cpp

@@ -6,8 +6,6 @@ DrawColorCorrectionPass::DrawColorCorrectionPass(IRenderer* renderer)
 
     m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.mesh");
 
-    //m_Exposure = 0.4; //TODO: Renderer: Fixa så att denna går att ändra på genom komponent eller setting.
-
     InitializeShaderPrograms();
 }
 
@@ -20,7 +18,7 @@ void DrawColorCorrectionPass::InitializeShaderPrograms()
     m_ColorCorrectionProgram->Link();
 }
 
-void DrawColorCorrectionPass::Draw(GLuint sceneTexture, GLuint bloomTexture, GLfloat gamma, GLfloat exposure)
+void DrawColorCorrectionPass::Draw(GLuint sceneTexture, GLuint bloomTexture, GLuint sceneTextureLowRes, GLuint bloomTextureLowRes, GLfloat gamma, GLfloat exposure)
 {
     //glBindFramebuffer(GL_FRAMEBUFFER, 0);
     GLERROR("DrawScreenQuadPass::Draw: Pre");
@@ -35,6 +33,10 @@ void DrawColorCorrectionPass::Draw(GLuint sceneTexture, GLuint bloomTexture, GLf
     glBindTexture(GL_TEXTURE_2D, sceneTexture);
     glActiveTexture(GL_TEXTURE1);
     glBindTexture(GL_TEXTURE_2D, bloomTexture);
+    glActiveTexture(GL_TEXTURE2);
+    glBindTexture(GL_TEXTURE_2D, sceneTextureLowRes);
+    glActiveTexture(GL_TEXTURE3);
+    glBindTexture(GL_TEXTURE_2D, bloomTextureLowRes);
 
     glBindVertexArray(m_ScreenQuad->VAO);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ScreenQuad->ElementBuffer);

src/Engine/Rendering/DrawFinalPass.cpp

@@ -2,8 +2,10 @@
 
 DrawFinalPass::DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass)
 {
+    //TODO: Make sure that uniforms are not sent into shader if not needed.
     m_Renderer = renderer;
     m_LightCullingPass = lightCullingPass;
+    m_ShieldPixelRate = 8;
     InitializeTextures();
     InitializeShaderPrograms();
     InitializeFrameBuffers();
@@ -21,18 +23,39 @@ void DrawFinalPass::InitializeFrameBuffers()
 {
     glGenRenderbuffers(1, &m_DepthBuffer);
     glBindRenderbuffer(GL_RENDERBUFFER, m_DepthBuffer);
-    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+    GLERROR("RenderBuffer generation");
 
     GenerateTexture(&m_SceneTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
     //GenerateTexture(&m_BloomTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewPortSize().Width, m_Renderer->GetViewPortSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
     GenerateTexture(&m_BloomTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
     //GenerateMipMapTexture(&m_BloomTexture, GL_CLAMP_TO_EDGE, glm::vec2(m_Renderer->GetViewPortSize().Width, m_Renderer->GetViewPortSize().Height), GL_RGB16F, GL_FLOAT, 4);
+    //GenerateTexture(&m_StencilTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_STENCIL, GL_STENCIL_INDEX8, GL_INT);
 
-    m_FinalPassFrameBuffer.AddResource(std::shared_ptr<BufferResource>(new RenderBuffer(&m_DepthBuffer, GL_DEPTH_ATTACHMENT)));
+    m_FinalPassFrameBuffer.AddResource(std::shared_ptr<BufferResource>(new RenderBuffer(&m_DepthBuffer, GL_DEPTH_STENCIL_ATTACHMENT)));
+    //m_FinalPassFrameBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_StencilTexture, GL_STENCIL_ATTACHMENT)));
     m_FinalPassFrameBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_SceneTexture, GL_COLOR_ATTACHMENT0)));
     m_FinalPassFrameBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_BloomTexture, GL_COLOR_ATTACHMENT1)));
     m_FinalPassFrameBuffer.Generate();
+    GLERROR("FBO generation");
 
+    glGenRenderbuffers(1, &m_DepthBufferLowRes);
+    glBindRenderbuffer(GL_RENDERBUFFER, m_DepthBufferLowRes);
+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, (int)(m_Renderer->GetViewportSize().Width/m_ShieldPixelRate), (int)(m_Renderer->GetViewportSize().Height/m_ShieldPixelRate));
+    GLERROR("RenderBufferLowRes generation");
+
+    GenerateTexture(&m_SceneTextureLowRes, GL_CLAMP_TO_EDGE, GL_NEAREST, glm::vec2((int)(m_Renderer->GetViewportSize().Width/m_ShieldPixelRate), (int)(m_Renderer->GetViewportSize().Height/m_ShieldPixelRate)), GL_RGB16F, GL_RGB, GL_FLOAT);
+    //GenerateTexture(&m_BloomTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewPortSize().Width, m_Renderer->GetViewPortSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
+    GenerateTexture(&m_BloomTextureLowRes, GL_CLAMP_TO_EDGE, GL_NEAREST, glm::vec2((int)(m_Renderer->GetViewportSize().Width/m_ShieldPixelRate), (int)(m_Renderer->GetViewportSize().Height/m_ShieldPixelRate)), GL_RGB16F, GL_RGB, GL_FLOAT);
+    //GenerateMipMapTexture(&m_BloomTexture, GL_CLAMP_TO_EDGE, glm::vec2(m_Renderer->GetViewPortSize().Width, m_Renderer->GetViewPortSize().Height), GL_RGB16F, GL_FLOAT, 4);
+    //GenerateTexture(&m_StencilTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_STENCIL, GL_STENCIL_INDEX8, GL_INT);
+
+    m_FinalPassFrameBufferLowRes.AddResource(std::shared_ptr<BufferResource>(new RenderBuffer(&m_DepthBufferLowRes, GL_DEPTH_STENCIL_ATTACHMENT)));
+    //m_FinalPassFrameBufferLowRes.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_StencilTexture, GL_STENCIL_ATTACHMENT)));
+    m_FinalPassFrameBufferLowRes.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_SceneTextureLowRes, GL_COLOR_ATTACHMENT0)));
+    m_FinalPassFrameBufferLowRes.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_BloomTextureLowRes, GL_COLOR_ATTACHMENT1)));
+    m_FinalPassFrameBufferLowRes.Generate();
+    GLERROR("FBO2 generation");
 }
 
 void DrawFinalPass::InitializeShaderPrograms()
@@ -55,6 +78,20 @@ void DrawFinalPass::InitializeShaderPrograms()
     m_ExplosionEffectProgram->BindFragDataLocation(1, "bloomColor");
     m_ExplosionEffectProgram->Link();
     GLERROR("Creating explosion program");
+
+    m_ShieldToStencilProgram = ResourceManager::Load<ShaderProgram>("#ShieldToStencilProgram");
+    m_ShieldToStencilProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/ShieldStencil.vert.glsl")));
+    m_ShieldToStencilProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/ShieldStencil.frag.glsl")));
+    m_ShieldToStencilProgram->Compile();
+    m_ShieldToStencilProgram->Link();
+    GLERROR("Creating Shield program");
+
+    m_FillDepthBufferProgram = ResourceManager::Load<ShaderProgram>("#FillDepthBufferProgram");
+    m_FillDepthBufferProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/FillDepthBuffer.vert.glsl")));
+    m_FillDepthBufferProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/FillDepthBuffer.frag.glsl")));
+    m_FillDepthBufferProgram->Compile();
+    m_FillDepthBufferProgram->Link();
+    GLERROR("Creating DepthFill program");
 }
 
 void DrawFinalPass::Draw(RenderScene& scene)
@@ -65,20 +102,92 @@ void DrawFinalPass::Draw(RenderScene& scene)
     if (scene.ClearDepth) {
         glClear(GL_DEPTH_BUFFER_BIT);
     }
+    //TODO: Do we need check for this or will it be per scene always?
+    glClearStencil(0x00);
+    glClear(GL_STENCIL_BUFFER_BIT);
 
-    DrawModelRenderQueues(scene.OpaqueObjects, scene);
+    //Fill depth buffer
+
+
+    state->StencilMask(0x00);
+    DrawModelRenderQueues(scene.Jobs.OpaqueObjects, scene);
     GLERROR("OpaqueObjects");
-    DrawModelRenderQueues(scene.TransparentObjects, scene);
+    DrawModelRenderQueues(scene.Jobs.TransparentObjects, scene);
     GLERROR("TransparentObjects");
 
-    delete state;
+    //DrawStencilState* stencilState = new DrawStencilState(m_FinalPassFrameBuffer.GetHandle());
+    //Draw shields to stencil pass
+    state->StencilFunc(GL_ALWAYS, 1, 0xFF);
+    state->StencilMask(0xFF);
+    DrawShieldToStencilBuffer(scene.Jobs.ShieldObjects, scene);
+    GLERROR("StencilPass");
+
+    //Draw Opaque shielded objects
+    state->StencilFunc(GL_NOTEQUAL, 1, 0xFF);
+    state->StencilMask(0x00);
+    DrawShieldedModelRenderQueue(scene.Jobs.OpaqueShieldedObjects, scene);
+    GLERROR("Shielded Opaque object");
+
+    //Draw Transparen Shielded objects
+    DrawShieldedModelRenderQueue(scene.Jobs.TransparentShieldedObjects, scene);
+    GLERROR("Shielded Transparent objects");
+
     GLERROR("END");
+    delete state;
+
+
+    DrawFinalPassState* stateLowRes = new DrawFinalPassState(m_FinalPassFrameBufferLowRes.GetHandle());
+    //Draw the lowres texture that will be shown behind the shield.
+    stateLowRes->Enable(GL_SCISSOR_TEST);
+    stateLowRes->Enable(GL_DEPTH_TEST);
+    //TODO: Viewports and scissor should be in state
+    glViewport(0, 0, m_Renderer->GetViewportSize().Width/m_ShieldPixelRate, m_Renderer->GetViewportSize().Height/m_ShieldPixelRate);
+    glScissor(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+
+    glClearStencil(0x00);
+    glClear(GL_STENCIL_BUFFER_BIT);
+
+    //TODO: This should not be here...
+    stateLowRes->StencilFunc(GL_ALWAYS, 1, 0xFF);
+    stateLowRes->StencilMask(0x00);
+    DrawToDepthBuffer(scene.Jobs.OpaqueObjects, scene);
+    DrawToDepthBuffer(scene.Jobs.TransparentObjects, scene);
+
+    //Draw shields to stencil pass
+    stateLowRes->StencilFunc(GL_ALWAYS, 1, 0xFF);
+    stateLowRes->StencilMask(0xFF);
+    stateLowRes->Enable(GL_DEPTH_TEST);
+    DrawShieldToStencilBuffer(scene.Jobs.ShieldObjects, scene);
+    GLERROR("StencilPass");
+
+    glClear(GL_DEPTH_BUFFER_BIT);
+
+    stateLowRes->Enable(GL_DEPTH_TEST);
+    stateLowRes->StencilFunc(GL_LEQUAL, 1, 0xFF);
+    stateLowRes->StencilMask(0x00);
+    DrawModelRenderQueues(scene.Jobs.OpaqueObjects, scene);
+    GLERROR("OpaqueObjects");
+    DrawModelRenderQueues(scene.Jobs.TransparentObjects, scene);
+    GLERROR("TransparentObjects");
+    glViewport(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+    glScissor(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+    delete stateLowRes;
 }
 
 
 void DrawFinalPass::ClearBuffer()
 {
+    m_FinalPassFrameBufferLowRes.Bind();
+    glViewport(0, 0, m_Renderer->GetViewportSize().Width/m_ShieldPixelRate, m_Renderer->GetViewportSize().Height/m_ShieldPixelRate);
+    glScissor(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+    glClearColor(0.f, 0.f, 0.f, 0.f);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glDisable(GL_SCISSOR_TEST);
+    m_FinalPassFrameBufferLowRes.Unbind();
+
     m_FinalPassFrameBuffer.Bind();
+    glViewport(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+    glScissor(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
     glClearColor(0.f, 0.f, 0.f, 0.f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     m_FinalPassFrameBuffer.Unbind();
@@ -110,7 +219,7 @@ void DrawFinalPass::GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm:
     GLERROR("MipMap Texture initialization failed");
 }
 
-void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& job, RenderScene& scene)
+void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene)
 {
     GLuint forwardHandle = m_ForwardPlusProgram->GetHandle();
     GLERROR("forwardHandle");
@@ -121,7 +230,7 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightCullingPass->LightGridSSBO());
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, m_LightCullingPass->LightIndexSSBO());
 
-    for(auto &job : job)
+    for(auto &job : jobs)
     {
         auto explosionEffectJob = std::dynamic_pointer_cast<ExplosionEffectJob>(job);
         if(explosionEffectJob) {
@@ -201,6 +310,153 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 
 }
 
+
+void DrawFinalPass::DrawShieldToStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene)
+{
+    m_ShieldToStencilProgram->Bind();
+    GLuint shaderHandle = m_ShieldToStencilProgram->GetHandle();
+
+    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+
+    for (auto &job : jobs) {
+        auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
+        if (modelJob) {
+            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
+
+
+            glBindVertexArray(modelJob->Model->VAO);
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+            glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex*sizeof(unsigned int)));
+            if (GLERROR("models end")) {
+                continue;
+            }
+        }
+    }
+}
+
+void DrawFinalPass::DrawShieldedModelRenderQueue(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene)
+{
+    GLuint forwardHandle = m_ForwardPlusProgram->GetHandle();
+    GLERROR("forwardHandle");
+    GLuint explosionHandle = m_ExplosionEffectProgram->GetHandle();
+    GLERROR("explosionHandle");
+
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, m_LightCullingPass->LightSSBO());
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightCullingPass->LightGridSSBO());
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, m_LightCullingPass->LightIndexSSBO());
+
+    for (auto &job : jobs) {
+        auto explosionEffectJob = std::dynamic_pointer_cast<ExplosionEffectJob>(job);
+        if (explosionEffectJob) {
+            //Bind program
+            if (GLERROR("Prebind")) {
+                continue;
+            }
+            m_ExplosionEffectProgram->Bind();
+            if (GLERROR("BindProgram")) {
+                continue;
+            }
+
+            glDisable(GL_CULL_FACE);
+
+            //Bind uniforms
+            BindExplosionUniforms(explosionHandle, explosionEffectJob, scene);
+            if (GLERROR("BindExplosionUniforms")) {
+                continue;
+            }
+
+            if (explosionEffectJob->Model->m_RawModel->m_Skeleton != nullptr) {
+
+                if (explosionEffectJob->Animation != nullptr) {
+                    std::vector<glm::mat4> frameBones = explosionEffectJob->Skeleton->GetFrameBones(*explosionEffectJob->Animation, explosionEffectJob->AnimationTime);
+                    glUniformMatrix4fv(glGetUniformLocation(explosionHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                }
+            }
+            if (GLERROR("Animation")) {
+                continue;
+            }
+
+            //bind textures
+            BindExplosionTextures(explosionEffectJob);
+            if (GLERROR("BindExplosionTextures")) {
+                continue;
+            }
+            //draw
+            glBindVertexArray(explosionEffectJob->Model->VAO);
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, explosionEffectJob->Model->ElementBuffer);
+            glDrawElements(GL_TRIANGLES, explosionEffectJob->EndIndex - explosionEffectJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(explosionEffectJob->StartIndex*sizeof(unsigned int)));
+            glEnable(GL_CULL_FACE);
+            if (GLERROR("explosion effect end")) {
+                continue;
+            }
+
+        } else {
+            auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
+            if (modelJob) {
+                //bind forward program
+                m_ForwardPlusProgram->Bind();
+                glUniform2f(glGetUniformLocation(forwardHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+
+                //bind uniforms
+                BindModelUniforms(forwardHandle, modelJob, scene);
+
+                //bind textures
+                BindModelTextures(modelJob);
+
+                if (modelJob->Model->m_RawModel->m_Skeleton != nullptr) {
+
+                    if (modelJob->Animation != nullptr) {
+                        std::vector<glm::mat4> frameBones = modelJob->Skeleton->GetFrameBones(*modelJob->Animation, modelJob->AnimationTime);
+                        glUniformMatrix4fv(glGetUniformLocation(forwardHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                    }
+                }
+
+                //draw
+                glBindVertexArray(modelJob->Model->VAO);
+                glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+                glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex*sizeof(unsigned int)));
+                if (GLERROR("models end")) {
+                    continue;
+                }
+            }
+        }
+    }
+}
+
+
+void DrawFinalPass::DrawToDepthBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene)
+{
+    m_FillDepthBufferProgram->Bind();
+    GLuint shaderHandle = m_FillDepthBufferProgram->GetHandle();
+    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+
+    for (auto &job : jobs) {
+        auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
+      
+        //bind uniforms
+        glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
+
+        if (modelJob->Model->m_RawModel->m_Skeleton != nullptr) {
+
+            if (modelJob->Animation != nullptr) {
+                std::vector<glm::mat4> frameBones = modelJob->Skeleton->GetFrameBones(*modelJob->Animation, modelJob->AnimationTime);
+                glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+            }
+        }
+
+        //draw
+        glBindVertexArray(modelJob->Model->VAO);
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+        glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex*sizeof(unsigned int)));
+        if (GLERROR("models end")) {
+            continue;
+        }
+    }
+
+}
+
 void DrawFinalPass::BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job, RenderScene& scene)
 {
     glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(job->Matrix));

src/Engine/Rendering/DrawFinalPassState.cpp

@@ -1,6 +1,7 @@
 #include "Rendering/DrawFinalPassState.h"
 
 
+
 DrawFinalPassState::DrawFinalPassState(GLuint frameBuffer)
 {
     BindFramebuffer(frameBuffer);
@@ -8,6 +9,10 @@ DrawFinalPassState::DrawFinalPassState(GLuint frameBuffer)
     BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     Enable(GL_DEPTH_TEST);
     Enable(GL_CULL_FACE);
+    Enable(GL_STENCIL_TEST);
+    StencilFunc(GL_NOTEQUAL, 1, 0xFF);
+    StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
+    StencilMask(0xFF);
     ClearColor(glm::vec4(0.f, 0.f, 0.f, 0.f));
 }
 
@@ -15,3 +20,20 @@ DrawFinalPassState::~DrawFinalPassState()
 {
 
 }
+
+DrawStencilState::DrawStencilState(GLuint frameBuffer)
+{
+    BindFramebuffer(frameBuffer);
+    Enable(GL_STENCIL_TEST);
+    StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
+    StencilFunc(GL_ALWAYS, 1, 0xFF);
+    StencilMask(0xFF);
+    Enable(GL_DEPTH_TEST);
+    ClearColor(glm::vec4(0.f));
+}
+
+DrawStencilState::~DrawStencilState()
+{
+
+}
+

src/Engine/Rendering/FrameBuffer.cpp

@@ -39,10 +39,13 @@ void FrameBuffer::AddResource(std::shared_ptr<BufferResource> resource)
 
 void FrameBuffer::Generate()
 {
+    GLERROR("PRE");
+
     std::vector<GLenum> attachments;
 
     glGenFramebuffers(1, &m_BufferHandle);
     glBindFramebuffer(GL_FRAMEBUFFER, m_BufferHandle);
+    GLERROR("1");
 
     for (auto it = m_Resources.begin(); it != m_Resources.end(); it++) {
         switch ((*it)->m_ResourceType) {
@@ -56,20 +59,30 @@ void FrameBuffer::Generate()
             GLERROR("FrameBuffer generate: glFramebufferRenderbuffer");
             break;
         }
-        
+        GLERROR("2");
 
-        if ((*it)->m_Attachment != GL_DEPTH_ATTACHMENT) {
+        if ((*it)->m_Attachment != GL_DEPTH_ATTACHMENT && (*it)->m_Attachment != GL_STENCIL_ATTACHMENT && (*it)->m_Attachment != GL_DEPTH_STENCIL_ATTACHMENT) {
             attachments.push_back((*it)->m_Attachment);
         }
+        GLERROR("Attachment");
+
     }
-        
+    GLERROR("3");
+
+
     GLenum* bufferTextures = &attachments[0];
     glDrawBuffers(attachments.size(), bufferTextures);
+    if(GLERROR("4")) {
+        printf("hello");
+    }
 
     if (GLenum frameBufferStatus = glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
-        LOG_ERROR("FrameBuffer incomplete: 0x%x\n", frameBufferStatus);
+        GLERROR("Framebuffer incomplete");
+        //LOG_ERROR("FrameBuffer incomplete: 0x%x\n", frameBufferStatus);
         exit(EXIT_FAILURE);
     }
+    GLERROR("END");
+
 }
 
 void FrameBuffer::Bind()

src/Engine/Rendering/LightCullingPass.cpp

@@ -16,7 +16,7 @@ LightCullingPass::~LightCullingPass()
 
 void LightCullingPass::GenerateNewFrustum(RenderScene& scene)
 {
-    if (scene.PointLightJobs.size() == 0)
+    if (scene.Jobs.PointLight.size() == 0)
         return;
 
     GLERROR("CalculateFrustum Error: Pre");
@@ -83,7 +83,7 @@ void LightCullingPass::FillLightList(RenderScene& scene)
 {
     m_LightSources.clear();
 
-    for(auto &job : scene.PointLightJobs) {
+    for(auto &job : scene.Jobs.PointLight) {
         auto pointLightjob = std::dynamic_pointer_cast<PointLightJob>(job);
         if (pointLightjob) {
             LightSource p;
@@ -97,7 +97,7 @@ void LightCullingPass::FillLightList(RenderScene& scene)
             m_LightSources.push_back(p);
         }
     }
-    for(auto &job : scene.DirectionalLightJobs) {
+    for(auto &job : scene.Jobs.DirectionalLight) {
         auto directionalLightJob = std::dynamic_pointer_cast<DirectionalLightJob>(job);
         if(directionalLightJob) {
             LightSource p;

src/Engine/Rendering/Model.cpp

@@ -64,6 +64,15 @@ Model::Model(std::string fileName)
     GLERROR("GLEW: BufferFail5");
 
     //CreateBuffers();
+
+    glm::vec3 mini(INFINITY);
+    glm::vec3 maxi(-INFINITY);
+    for (const auto& v : m_RawModel->m_Vertices) {
+        mini = glm::min(mini, v.Position);
+        maxi = glm::max(maxi, v.Position);
+    }
+
+    m_Box = AABB(maxi, mini);
 }
 
 Model::~Model()

src/Engine/Rendering/PickingPass.cpp

@@ -56,7 +56,7 @@ void PickingPass::Draw(RenderScene& scene)
     }
     m_Camera = scene.Camera;
 
-    for (auto &job : scene.OpaqueObjects) {
+    for (auto &job : scene.Jobs.OpaqueObjects) {
         auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
 
         if (modelJob) {
@@ -102,7 +102,99 @@ void PickingPass::Draw(RenderScene& scene)
         }
     }
 
-    for (auto &job : scene.TransparentObjects) {
+    for (auto &job : scene.Jobs.TransparentObjects) {
+        auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
+
+        if (modelJob) {
+            int pickColor[2] = { m_ColorCounter[0], m_ColorCounter[1] };
+
+            PickingInfo pickInfo;
+            pickInfo.Entity = modelJob->Entity;
+            pickInfo.World = modelJob->World;
+            pickInfo.Camera = scene.Camera;
+
+            auto color = m_EntityColors.find(std::make_tuple(pickInfo.Entity, pickInfo.World, pickInfo.Camera));
+            if (color != m_EntityColors.end()) {
+                pickColor[0] = color->second[0];
+                pickColor[1] = color->second[1];
+            } else {
+                m_EntityColors[std::make_tuple(pickInfo.Entity, pickInfo.World, pickInfo.Camera)] = glm::ivec2(pickColor[0], pickColor[1]);
+                if (m_ColorCounter[0] > 255) {
+                    m_ColorCounter[0] = 0;
+                    m_ColorCounter[1] += 1;
+                } else {
+                    m_ColorCounter[0] += 1;
+                }
+            }
+
+            m_PickingColorsToEntity[glm::ivec2(pickColor[0], pickColor[1])] = pickInfo;
+
+            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
+            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+            glUniform2fv(glGetUniformLocation(shaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
+
+            if (modelJob->Model->m_RawModel->m_Skeleton != nullptr) {
+
+                if (modelJob->Animation != nullptr) {
+                    std::vector<glm::mat4> frameBones = modelJob->Skeleton->GetFrameBones(*modelJob->Animation, modelJob->AnimationTime);
+                    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                }
+            }
+
+            glBindVertexArray(modelJob->Model->VAO);
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+            glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
+        }
+    }
+
+    for (auto &job : scene.Jobs.OpaqueShieldedObjects) {
+        auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
+
+        if (modelJob) {
+            int pickColor[2] = { m_ColorCounter[0], m_ColorCounter[1] };
+
+            PickingInfo pickInfo;
+            pickInfo.Entity = modelJob->Entity;
+            pickInfo.World = modelJob->World;
+            pickInfo.Camera = scene.Camera;
+
+            auto color = m_EntityColors.find(std::make_tuple(pickInfo.Entity, pickInfo.World, pickInfo.Camera));
+            if (color != m_EntityColors.end()) {
+                pickColor[0] = color->second[0];
+                pickColor[1] = color->second[1];
+            } else {
+                m_EntityColors[std::make_tuple(pickInfo.Entity, pickInfo.World, pickInfo.Camera)] = glm::ivec2(pickColor[0], pickColor[1]);
+                if (m_ColorCounter[0] > 255) {
+                    m_ColorCounter[0] = 0;
+                    m_ColorCounter[1] += 1;
+                } else {
+                    m_ColorCounter[0] += 1;
+                }
+            }
+
+            m_PickingColorsToEntity[glm::ivec2(pickColor[0], pickColor[1])] = pickInfo;
+
+            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
+            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+            glUniform2fv(glGetUniformLocation(shaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
+
+            if (modelJob->Model->m_RawModel->m_Skeleton != nullptr) {
+
+                if (modelJob->Animation != nullptr) {
+                    std::vector<glm::mat4> frameBones = modelJob->Skeleton->GetFrameBones(*modelJob->Animation, modelJob->AnimationTime);
+                    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                }
+            }
+
+            glBindVertexArray(modelJob->Model->VAO);
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+            glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
+        }
+    }
+
+    for (auto &job : scene.Jobs.TransparentShieldedObjects) {
         auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
 
         if (modelJob) {

src/Engine/Rendering/RenderState.cpp

@@ -6,9 +6,10 @@ bool RenderState::Enable(GLenum cap)
         //LOG_WARNING("Trying to enable somthing that is already enabled.");
         return false;
     }
+
     m_ResetFunctions.push_back(std::bind(glDisable, cap));
     glEnable(cap);
-    return !GLERROR("RenderState::Enable");
+    return !GLERROR("Enable");
 }
 
 bool RenderState::Disable(GLenum cap)
@@ -16,9 +17,10 @@ bool RenderState::Disable(GLenum cap)
     if (!glIsEnabled(cap)) {
         return false;
     }
+
     m_ResetFunctions.push_back(std::bind(glEnable, cap));
     glDisable(cap);
-    return !GLERROR("RenderState::Disable");
+    return !GLERROR("Disable");
 }
 
 bool RenderState::CullFace(GLenum mode)
@@ -32,7 +34,7 @@ bool RenderState::CullFace(GLenum mode)
     glGetIntegerv(GL_CULL_FACE_MODE, &original);
     m_ResetFunctions.push_back(std::bind(glCullFace, original));
     glCullFace(mode);
-    return !GLERROR("RenderState::CullFace");
+    return !GLERROR("CullFace");
 }
 
 bool RenderState::ClearColor(glm::vec4 color)
@@ -41,7 +43,7 @@ bool RenderState::ClearColor(glm::vec4 color)
     glGetFloatv(GL_COLOR_CLEAR_VALUE, &original[0]);
     m_ResetFunctions.push_back(std::bind(glClearColor, original[0], original[1], original[2], original[3]));
     glClearColor(color.r, color.g, color.b, color.a);
-    return !GLERROR("RenderState::ClearColor");
+    return !GLERROR("ClearColor");
 }
 
 bool RenderState::BindFramebuffer(GLint framebuffer)
@@ -55,7 +57,7 @@ bool RenderState::BindFramebuffer(GLint framebuffer)
         glBindFramebuffer(GL_DRAW_FRAMEBUFFER, originalDraw); 
     });
     glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
-    return !GLERROR("RenderState::BindBuffer");
+    return !GLERROR("BindBuffer");
 }
 
 
@@ -67,7 +69,7 @@ bool RenderState::BlendEquation(GLenum mode)
     glGetIntegerv(GL_BLEND_EQUATION_ALPHA, &originalAlpha);
     m_ResetFunctions.push_back(std::bind(glBlendEquationSeparate, originalRGB, originalAlpha));
     glBlendEquation(mode);
-    return !GLERROR("RenderState::BlendEquation");
+    return !GLERROR("BlendEquation");
 }
 
 bool RenderState::BlendFunc(GLenum sfactor, GLenum dfactor)
@@ -82,7 +84,46 @@ bool RenderState::BlendFunc(GLenum sfactor, GLenum dfactor)
     glGetIntegerv(GL_BLEND_DST_ALPHA, &originalDestAlpha);
     m_ResetFunctions.push_back(std::bind(glBlendFuncSeparate, originalSrcRGB, originalSrcAlpha, originalDestRGB, originalDestAlpha));
     glBlendFunc(sfactor, dfactor);
-    return !GLERROR("RenderState::BlendFunc");
+    return !GLERROR("BlendFunc");
+}
+
+
+bool RenderState::StencilOp(GLenum sfail, GLenum dpfail, GLenum dppass)
+{
+    GLint originalSFail;
+    glGetIntegerv(GL_STENCIL_FAIL, &originalSFail);
+    GLint originalDPFail;
+    glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &originalDPFail);
+    GLint originalDPPass;
+    glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &originalDPPass);
+    m_ResetFunctions.push_back(std::bind(glStencilOp, originalSFail, originalDPFail, originalDPPass));
+    glStencilOp(sfail, dpfail, dppass);
+    return !GLERROR("StencilOp");
+}
+
+
+bool RenderState::StencilFunc(GLenum func, GLint ref, GLuint mask)
+{
+    GLint originalFunc;
+    glGetIntegerv(GL_STENCIL_FUNC, &originalFunc);
+    GLint originalRef;
+    glGetIntegerv(GL_STENCIL_REF, &originalRef);
+    GLint originalMask;
+    glGetIntegerv(GL_STENCIL_VALUE_MASK, &originalMask);
+    m_ResetFunctions.push_back(std::bind(glStencilFunc, originalFunc, originalRef, originalMask));
+    glStencilFunc(func, ref, mask);
+    return !GLERROR("StencilFunc");
+}
+
+
+
+bool RenderState::StencilMask(GLuint mask)
+{
+    GLint originalMask;
+    glGetIntegerv(GL_STENCIL_WRITEMASK, &originalMask);
+    m_ResetFunctions.push_back(std::bind(glStencilMask, mask));
+    glStencilMask(mask);
+    return !GLERROR("StencilMask");
 }
 
 bool RenderState::DepthMask(GLboolean flag)
@@ -91,12 +132,12 @@ bool RenderState::DepthMask(GLboolean flag)
     glGetBooleanv(GL_DEPTH_WRITEMASK, &original);
     m_ResetFunctions.push_back(std::bind(glDepthMask, original));
     glDepthMask(flag);
-    return !GLERROR("RenderState::DepthMask");
+    return !GLERROR("DepthMask");
 }
 
 RenderState::~RenderState()
 {
-    for (auto& f : m_ResetFunctions) {
+    for (auto& f : boost::adaptors::reverse(m_ResetFunctions)) {
         f();
     }
 }

src/Engine/Rendering/RenderSystem.cpp

@@ -1,10 +1,13 @@
 #include "Rendering/RenderSystem.h"
+#include "Collision/Collision.h"
+#include "Core/Frustum.h"
 
-RenderSystem::RenderSystem(World* world, EventBroker* eventBroker, const IRenderer* renderer, RenderFrame* renderFrame) 
+RenderSystem::RenderSystem(World* world, EventBroker* eventBroker, const IRenderer* renderer, RenderFrame* renderFrame, Octree<EntityAABB>* frustumCullOctree)
     : System(world, eventBroker)
     , m_Renderer(renderer)
     , m_RenderFrame(renderFrame)
     , m_World(world)
+    , m_Octree(frustumCullOctree)
 {
     EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &RenderSystem::OnSetCamera);
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &RenderSystem::OnInputCommand);
@@ -40,14 +43,15 @@ bool RenderSystem::isChildOfCurrentCamera(EntityWrapper entity)
     return entity == m_CurrentCamera || entity.IsChildOf(m_CurrentCamera);
 }
 
-void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& opaqueJobs, std::list<std::shared_ptr<RenderJob>>& transparentJobs)
+void RenderSystem::fillModels(RenderScene::Queues &Jobs)
 {
-    auto models = m_World->GetComponents("Model");
-    if (models == nullptr) {
-        return;
-    }
+    Frustum frustum(m_Camera->ProjectionMatrix() * m_Camera->ViewMatrix());
+    std::vector<EntityAABB> seenEntities;
+    m_Octree->ObjectsInFrustum(frustum, seenEntities);
 
-    for (auto& cModel : *models) {
+    for (auto& seenEntity : seenEntities) {
+        EntityWrapper entity = seenEntity.Entity;
+        ComponentWrapper cModel = entity["Model"];
         bool visible = cModel["Visible"];
         if (!visible) {
             continue;
@@ -57,8 +61,6 @@ void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& opaqueJobs,
             continue;
         }
 
-        EntityWrapper entity(m_World, cModel.EntityID);
-
         // Only render children of a camera if that camera is currently active
         if (isChildOfACamera(entity) && !isChildOfCurrentCamera(entity)) {
             continue;
@@ -92,7 +94,9 @@ void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& opaqueJobs,
         }
 
         glm::mat4 modelMatrix = Transform::ModelMatrix(cModel.EntityID, m_World);
+        //Loop through all materialgroups of a model
         for (auto matGroup : model->MaterialGroups()) {
+            //If the model has an explosioneffect component, we will add an explosioneffectjob
             if (m_World->HasComponent(cModel.EntityID, "ExplosionEffect")) {
                 auto explosionEffectComponent = m_World->GetComponent(cModel.EntityID, "ExplosionEffect");
                 std::shared_ptr<ExplosionEffectJob> explosionEffectJob = std::shared_ptr<ExplosionEffectJob>(new ExplosionEffectJob(
@@ -106,14 +110,30 @@ void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& opaqueJobs,
                     fillColor, 
                     fillPercentage
                 ));
-                if(explosionEffectJob->Color.a != 1.f || explosionEffectJob->EndColor.a != 1.f || explosionEffectJob->DiffuseColor.a != 1.f) {
-                    cModel["Transparent"] = true;
-                }
+                if (m_World->HasComponent(cModel.EntityID, "Shield")){
+                    Jobs.ShieldObjects.push_back(explosionEffectJob);
+                } else if (m_World->HasComponent(cModel.EntityID, "Shielded")
+                    || m_World->HasComponent(cModel.EntityID, "Player")) {
 
-                if (cModel["Transparent"]) {
-                    transparentJobs.push_back(explosionEffectJob);
+                    if (explosionEffectJob->Color.a != 1.f || explosionEffectJob->EndColor.a != 1.f || explosionEffectJob->DiffuseColor.a != 1.f) {
+                        cModel["Transparent"] = true;
+                    }
+
+                    if (cModel["Transparent"]) {
+                        Jobs.TransparentShieldedObjects.push_back(explosionEffectJob);
+                    } else {
+                        Jobs.OpaqueShieldedObjects.push_back(explosionEffectJob);
+                    }
                 } else {
-                    opaqueJobs.push_back(explosionEffectJob);
+                    if (explosionEffectJob->Color.a != 1.f || explosionEffectJob->EndColor.a != 1.f || explosionEffectJob->DiffuseColor.a != 1.f) {
+                        cModel["Transparent"] = true;
+                    }
+
+                    if (cModel["Transparent"]) {
+                        Jobs.TransparentObjects.push_back(explosionEffectJob);
+                    } else {
+                        Jobs.OpaqueObjects.push_back(explosionEffectJob);
+                    }
                 }
             } else {
                 std::shared_ptr<ModelJob> modelJob = std::shared_ptr<ModelJob>(new ModelJob(
@@ -126,13 +146,30 @@ void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& opaqueJobs,
                     fillColor, 
                     fillPercentage
                 ));
-                if (modelJob->Color.a != 1.f || modelJob->DiffuseColor.a != 1.f) {
-                    cModel["Transparent"] = true;
-                }
-                if (cModel["Transparent"]) {
-                    transparentJobs.push_back(modelJob);
+                if (m_World->HasComponent(cModel.EntityID, "Shield")) {
+                    Jobs.ShieldObjects.push_back(modelJob);
+                } else if (m_World->HasComponent(cModel.EntityID, "Shielded")
+                    || m_World->HasComponent(cModel.EntityID, "Player")) {
+
+                    if (modelJob->Color.a != 1.f || modelJob->DiffuseColor.a != 1.f) {
+                        cModel["Transparent"] = true;
+                    }
+
+                    if (cModel["Transparent"]) {
+                        Jobs.TransparentShieldedObjects.push_back(modelJob);
+                    } else {
+                        Jobs.OpaqueShieldedObjects.push_back(modelJob);
+                    }
                 } else {
-                    opaqueJobs.push_back(modelJob);
+                    if (modelJob->Color.a != 1.f || modelJob->DiffuseColor.a != 1.f) {
+                        cModel["Transparent"] = true;
+                    }
+
+                    if (cModel["Transparent"]) {
+                        Jobs.TransparentObjects.push_back(modelJob);
+                    } else {
+                        Jobs.OpaqueObjects.push_back(modelJob);
+                    }
                 }
             }
         }
@@ -251,10 +288,10 @@ void RenderSystem::Update(double dt)
         scene.AmbientColor = (glm::vec4)(*cSceneLight->begin())["AmbientColor"];
     }
 
-    fillModels(scene.OpaqueObjects, scene.TransparentObjects);
-    fillPointLights(scene.PointLightJobs, m_World);
-    fillDirectionalLights(scene.DirectionalLightJobs, m_World);
-    fillText(scene.TextJobs, m_World);
+    fillModels(scene.Jobs);
+    fillPointLights(scene.Jobs.PointLight, m_World);
+    fillDirectionalLights(scene.Jobs.DirectionalLight, m_World);
+    fillText(scene.Jobs.Text, m_World);
     m_RenderFrame->Add(scene);
    
 }

src/Engine/Rendering/Renderer.cpp

@@ -93,7 +93,7 @@ void Renderer::Update(double dt)
 
 void Renderer::Draw(RenderFrame& frame)
 {
-    ImGui::Combo("Draw textures", &m_DebugTextureToDraw, "Final\0Scene\0Bloom\0Gaussian\0Picking");
+    ImGui::Combo("Draw textures", &m_DebugTextureToDraw, "Final\0Scene\0Bloom\0SceneLowRes\0BloomLowRes\0Gaussian\0Picking");
     //clear buffer 0
     glClearColor(0.f, 0.f, 0.f, 0.f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -120,7 +120,7 @@ void Renderer::Draw(RenderFrame& frame)
     }
     m_DrawBloomPass->Draw(m_DrawFinalPass->BloomTexture());
     if (m_DebugTextureToDraw == 0) {
-        m_DrawColorCorrectionPass->Draw(m_DrawFinalPass->SceneTexture(), m_DrawBloomPass->GaussianTexture(), frame.Gamma, frame.Exposure);
+        m_DrawColorCorrectionPass->Draw(m_DrawFinalPass->SceneTexture(), m_DrawBloomPass->GaussianTexture(), m_DrawFinalPass->SceneTextureLowRes(), m_DrawFinalPass->BloomTextureLowRes(), frame.Gamma, frame.Exposure);
     }
     if (m_DebugTextureToDraw == 1) {
         m_DrawScreenQuadPass->Draw(m_DrawFinalPass->SceneTexture());
@@ -129,9 +129,15 @@ void Renderer::Draw(RenderFrame& frame)
         m_DrawScreenQuadPass->Draw(m_DrawFinalPass->BloomTexture());
     }
     if (m_DebugTextureToDraw == 3) {
-        m_DrawScreenQuadPass->Draw(m_DrawBloomPass->GaussianTexture());
+        m_DrawScreenQuadPass->Draw(m_DrawFinalPass->SceneTextureLowRes());
     }
     if (m_DebugTextureToDraw == 4) {
+        m_DrawScreenQuadPass->Draw(m_DrawFinalPass->BloomTextureLowRes());
+    }
+    if (m_DebugTextureToDraw == 5) {
+        m_DrawScreenQuadPass->Draw(m_DrawBloomPass->GaussianTexture());
+    }
+    if (m_DebugTextureToDraw == 6) {
         m_DrawScreenQuadPass->Draw(m_PickingPass->PickingTexture());
     }
 
@@ -154,7 +160,7 @@ void Renderer::InitializeTextures()
 void Renderer::SortRenderJobsByDepth(RenderScene &scene)
 {
     //Sort all forward jobs so transparency is good.
-    scene.TransparentObjects.sort(Renderer::DepthSort);
+    scene.Jobs.TransparentObjects.sort(Renderer::DepthSort);
 }
 
 void Renderer::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type)

src/Engine/Rendering/TextPass.cpp

@@ -35,7 +35,7 @@ void TextPass::Draw(RenderScene& scene, FrameBuffer& frameBuffer)
 {
     GLERROR("Derp1");
     TextPassState* state = new TextPassState(frameBuffer.GetHandle());
-    for (auto &job : scene.TextJobs) {
+    for (auto &job : scene.Jobs.Text) {
         auto textJob = std::dynamic_pointer_cast<TextJob>(job);
         if (textJob) {
 

src/Engine/Sound/SoundManager.cpp

@@ -0,0 +1,374 @@
+#include "Sound/SoundManager.h"
+
+SoundManager::SoundManager(World* world, EventBroker* eventBroker)
+{
+    ConfigFile* config = ResourceManager::Load<ConfigFile>("Config.ini");
+    m_EventBroker = eventBroker;
+    m_World = world;
+    m_BGMVolumeChannel = config->Get<float>("Sound.BGMVolume", 1.f);
+    m_SFXVolumeChannel = config->Get<float>("Sound.SFXVolume", 1.f);
+
+    initOpenAL();
+    alSpeedOfSound(340.29f);
+    alDistanceModel(AL_LINEAR_DISTANCE);
+    alDopplerFactor(1);
+
+    EVENT_SUBSCRIBE_MEMBER(m_EPlaySoundOnEntity, &SoundManager::OnPlaySoundOnEntity);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlaySoundOnPosition, &SoundManager::OnPlaySoundOnPosition);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayBackgroundMusic, &SoundManager::OnPlayBackgroundMusic);
+    EVENT_SUBSCRIBE_MEMBER(m_EStopSound, &SoundManager::OnStopSound);
+    EVENT_SUBSCRIBE_MEMBER(m_EPauseSound, &SoundManager::OnPauseSound);
+    EVENT_SUBSCRIBE_MEMBER(m_EContinueSound, &SoundManager::OnContinueSound);
+    EVENT_SUBSCRIBE_MEMBER(m_ESetBGMGain, &SoundManager::OnSetBGMGain);
+    EVENT_SUBSCRIBE_MEMBER(m_ESetSFXGain, &SoundManager::OnSetSFXGain);
+    EVENT_SUBSCRIBE_MEMBER(m_EPause, &SoundManager::OnPause);
+    EVENT_SUBSCRIBE_MEMBER(m_EResume, &SoundManager::OnResume);
+    EVENT_SUBSCRIBE_MEMBER(m_EComponentAttached, &SoundManager::OnComponentAttached);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &SoundManager::OnPlayerSpawned);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayQueueOnEntity, &SoundManager::OnPlayQueueOnEntity);
+}
+
+SoundManager::~SoundManager()
+{
+    stopEmitters(); // Stopps emitters
+    deleteInactiveEmitters(); // Deletes stopped emitters
+    // Delete entities
+    std::unordered_map<EntityID, Source*>::iterator it;
+    for (it = m_Sources.begin(); it != m_Sources.end(); it++) {
+        m_World->DeleteEntity((*it).first);
+    }
+    m_Sources.clear();
+
+    alcDestroyContext(m_ALCcontext);
+    alcCloseDevice(m_ALCdevice);
+}
+
+void SoundManager::stopEmitters()
+{
+    std::unordered_map<EntityID, Source*>::iterator it;
+    for (it = m_Sources.begin(); it != m_Sources.end(); it++) {
+        if (getSourceState(it->second->ALsource) == AL_PLAYING) {
+            stopSound(it->second);
+        }
+    }
+}
+
+void SoundManager::Update(double dt)
+{
+    m_EventBroker->Process<SoundManager>();
+    deleteInactiveEmitters(); // can be optimized with "EEntityDeleted"
+    updateEmitters(dt);
+    updateListener(dt);
+
+    // Editor debug info
+    ImGui::SliderFloat("BGM", &m_BGMVolumeChannel, 0.0f, 1.0f, "%.3f", 1.0f);
+    ImGui::SliderFloat("SFX", &m_SFXVolumeChannel, 0.0f, 1.0f, "%.3f", 1.0f);
+}
+
+void SoundManager::deleteInactiveEmitters()
+{
+    std::unordered_map<EntityID, Source*>::iterator it;
+    for (it = m_Sources.begin(); it != m_Sources.end();) {
+        if (m_World->ValidEntity(it->first)
+            && m_World->HasComponent(it->first, "SoundEmitter")) {
+            if (getSourceState(it->second->ALsource) != AL_STOPPED) {
+                // Nothing to see here, move along
+                it++;
+                continue;
+            } else {
+                // Sound has been stopped / finished playing. 
+                alDeleteBuffers(1, &it->second->ALsource);
+                alDeleteSources(1, &it->second->ALsource);
+                m_World->DeleteEntity(it->first);
+                delete it->second;
+                it = m_Sources.erase(it);
+            }
+        } else {
+            // Entity / Component has been removed
+            stopSound(it->second);
+            alDeleteBuffers(1, &it->second->ALsource);
+            alDeleteSources(1, &it->second->ALsource);
+            delete it->second;
+            it = m_Sources.erase(it);
+        }
+    }
+}
+
+void SoundManager::updateEmitters(double dt)
+{
+    std::unordered_map<EntityID, Source*>::iterator it;
+    for (it = m_Sources.begin(); it != m_Sources.end(); it++) {
+        // Get previous pos
+        if (!m_World->ValidEntity(it->first)) {
+            return;
+        }
+        if (!m_World->HasComponent(it->first, "SoundEmitter"))
+            return;
+
+        glm::vec3 previousPos;
+        alGetSource3f(it->second->ALsource, AL_POSITION, &previousPos.x, &previousPos.y, &previousPos.z);
+        // Get next pos
+        if (!m_World->HasComponent(it->first, "Transform"))
+            return;
+        if (!m_World->ValidEntity(m_World->GetParent(it->first))) {
+            return;
+        }
+        glm::vec3 nextPos = Transform::AbsolutePosition(m_World, it->first);
+        // Calculate velocity
+        glm::vec3 velocity = glm::vec3(nextPos - previousPos) / (float)dt;
+        setSourcePos(it->second->ALsource, nextPos);
+        setSourceVel(it->second->ALsource, velocity);
+
+        auto emitter = m_World->GetComponent(it->first, "SoundEmitter");
+        setSoundProperties(it->second, &emitter);
+
+        // Path changed
+        if (it->second->SoundResource->Path() != (std::string)emitter["FilePath"]) {
+            it->second->SoundResource = ResourceManager::Load<Sound>((std::string)emitter["FilePath"]);
+            if (it->second->SoundResource->Buffer() != 0) {
+                playSound(it->second);
+            }
+        }
+    }
+}
+
+void SoundManager::updateListener(double dt)
+{
+    // Should only be one listener.
+    auto listenerComponents = m_World->GetComponents("Listener");
+    if (listenerComponents == nullptr || !m_LocalPlayer.Valid()) {
+        return;
+    }
+    for (auto it = listenerComponents->begin(); it != listenerComponents->end(); it++) {
+        EntityWrapper listener(m_World, (*it).EntityID);
+        if (!listener.Valid()) {
+            break;
+        }
+        if (listener.IsChildOf(m_LocalPlayer) || listener == m_LocalPlayer) {
+            glm::vec3 previousPos;
+            alGetListener3f(AL_POSITION, &previousPos.x, &previousPos.y, &previousPos.z); // Get previous pos
+            glm::vec3 nextPos = Transform::AbsolutePosition(listener); // Get next (current) pos
+            glm::vec3 velocity = glm::vec3(nextPos - previousPos) / (float)dt; // Calculate velocity
+            setListenerPos(nextPos);
+            setListenerVel(velocity);
+            setListenerOri(glm::eulerAngles(Transform::AbsoluteOrientation(listener)));
+            break;
+        }
+    }
+}
+
+Source* SoundManager::createSource(std::string filePath)
+{
+    ALuint alSource;
+    alGenSources((ALuint)1, &alSource);
+    alSourcef(alSource, AL_REFERENCE_DISTANCE, 1.0);
+    alSourcef(alSource, AL_MAX_DISTANCE, FLT_MAX);
+    Source* source = new Source();
+    source->ALsource = alSource;
+    source->SoundResource = ResourceManager::Load<Sound>(filePath);
+    return source;
+}
+
+void SoundManager::playSound(Source* source)
+{
+    alSourcei(source->ALsource, AL_BUFFER, source->SoundResource->Buffer());
+    alSourcePlay(source->ALsource);
+}
+
+void SoundManager::playQueue(QueuedBuffers qb)
+{
+    for (int i = 0; i < qb.second.size(); i++) {
+        alSourceQueueBuffers(qb.first, 1, &qb.second[i]);
+    }
+    alSourcePlay(qb.first);
+}
+
+void SoundManager::stopSound(Source* source)
+{
+    alSourceStop(source->ALsource);
+}
+
+bool SoundManager::OnPlaySoundOnEntity(const Events::PlaySoundOnEntity & e)
+{
+    Source* source = createSource(e.FilePath);
+    source->Type = SoundType::SFX;
+    EntityID child = m_World->CreateEntity(e.EmitterID);
+    m_World->AttachComponent(child, "Transform");
+    m_World->AttachComponent(child, "SoundEmitter");
+    m_Sources[child] = source;
+    playSound(source);
+    return false;
+}
+
+bool SoundManager::OnPlaySoundOnPosition(const Events::PlaySoundOnPosition & e)
+{
+    Source* source = createSource(e.FilePath);
+    auto emitterID = m_World->CreateEntity();
+    auto transform = m_World->AttachComponent(emitterID, "Transform");
+    (glm::vec3&)transform["Position"] = e.Position;
+    auto emitter = m_World->AttachComponent(emitterID, "SoundEmitter");
+    (float&)(double)emitter["Gain"] = e.Gain;
+    (float&)(double)emitter["Pitch"] = e.Pitch;
+    (bool&)emitter["Loop"] = e.Loop;
+    (float&)(double)emitter["MaxDistance"] = e.MaxDistance;
+    (float&)(double)emitter["RollOffFactor"] = e.RollOffFactor;
+    (float&)(double)emitter["ReferenceDistance"] = e.ReferenceDistance;
+    source->Type = SoundType::SFX;
+    m_Sources[emitterID] = source;
+    playSound(source);
+    return true;
+}
+
+bool SoundManager::OnPauseSound(const Events::PauseSound & e)
+{
+    alSourcePause(m_Sources[e.EmitterID]->ALsource);
+    return true;
+}
+
+bool SoundManager::OnStopSound(const Events::StopSound & e)
+{
+    alSourceStop(m_Sources[e.EmitterID]->ALsource);
+    return true;
+}
+
+bool SoundManager::OnContinueSound(const Events::ContinueSound & e)
+{
+    alSourcePlay(m_Sources[e.EmitterID]->ALsource);
+    return true;
+}
+
+bool SoundManager::OnPlayBackgroundMusic(const Events::PlayBackgroundMusic & e)
+{
+    auto listenerComponents = m_World->GetComponents("Listener");
+    for (auto it = listenerComponents->begin(); it != listenerComponents->end(); it++) {
+        if ((*it).EntityID != m_LocalPlayer.ID) {
+            break;
+        }
+        auto emitterChild = m_World->CreateEntity((*it).EntityID);
+        auto emitter = m_World->AttachComponent(emitterChild, "SoundEmitter");
+        (bool&)emitter["Loop"] = true;
+        (std::string&)emitter["FilePath"] = e.FilePath;
+        m_World->AttachComponent(emitterChild, "Transform");
+        Source* source = createSource(e.FilePath);
+        source->Type = SoundType::BGM;
+        setSoundProperties(source, &emitter);
+        m_Sources[emitterChild] = source;
+        playSound(source);
+    }
+    return true;
+}
+
+bool SoundManager::OnSetBGMGain(const Events::SetBGMGain & e)
+{
+    m_BGMVolumeChannel = e.Gain;
+    return true;
+}
+
+bool SoundManager::OnSetSFXGain(const Events::SetSFXGain & e)
+{
+    m_SFXVolumeChannel = e.Gain;
+    return true;
+}
+
+bool SoundManager::OnComponentAttached(const Events::ComponentAttached & e)
+{
+    if (e.Component.Info.Name == "SoundEmitter") {
+        auto component = m_World->GetComponent(e.Entity.ID, "SoundEmitter");
+        Source* source = createSource(component["FilePath"]);
+        m_Sources[e.Entity.ID] = source;
+    }
+    return false;
+}
+
+bool SoundManager::OnPause(const Events::Pause & e)
+{
+    for (auto it = m_Sources.begin(); it != m_Sources.end(); it++) {
+        alSourcePause(it->second->ALsource);
+    }
+    return false;
+}
+
+bool SoundManager::OnResume(const Events::Resume &e)
+{
+    for (auto it = m_Sources.begin(); it != m_Sources.end(); it++) {
+        alSourcePlay(it->second->ALsource);
+    }
+    return false;
+}
+
+
+bool SoundManager::OnPlayerSpawned(const Events::PlayerSpawned &e)
+{
+    if (e.PlayerID == -1) { // Local player
+        m_LocalPlayer = e.Player;
+        return true;
+    }
+    return false;
+}
+
+
+bool SoundManager::OnPlayQueueOnEntity(const Events::PlayQueueOnEntity &e)
+{
+    Source* source = createSource(*e.FilePaths.begin());
+    std::vector<ALuint> buffers;
+    buffers.push_back(source->SoundResource->Buffer());
+    source->Type = SoundType::BGM;
+    std::vector<std::string>::const_iterator it;
+    for (it = e.FilePaths.begin() + 1; it != e.FilePaths.end(); it++) {
+        buffers.push_back(ResourceManager::Load<Sound>(*it)->Buffer());
+    }
+    playQueue(QueuedBuffers(source->ALsource, buffers));
+    return true;
+}
+
+ALenum SoundManager::getSourceState(ALuint source)
+{
+    ALenum state;
+    alGetSourcei(source, AL_SOURCE_STATE, &state);
+    return state;
+}
+
+void SoundManager::setGain(Source * source, float gain)
+{
+    alSourcef(source->ALsource, AL_GAIN, gain);
+}
+
+void SoundManager::setSoundProperties(Source* source, ComponentWrapper* soundComponent)
+{
+    float gain = (source->Type == SoundType::SFX) ? m_SFXVolumeChannel : m_BGMVolumeChannel;
+    alSourcef(source->ALsource, AL_GAIN, (float)(double)(*soundComponent)["Gain"] * gain);
+    alSourcef(source->ALsource, AL_PITCH, (float)(double)(*soundComponent)["Pitch"]);
+    alSourcei(source->ALsource, AL_LOOPING, (int)(bool)(*soundComponent)["Loop"]); // YOLO
+    alSourcef(source->ALsource, AL_MAX_DISTANCE, (float)(double)(*soundComponent)["MaxDistance"]);
+    alSourcef(source->ALsource, AL_ROLLOFF_FACTOR, (float)(double)(*soundComponent)["RollOffFactor"]);
+    alSourcef(source->ALsource, AL_REFERENCE_DISTANCE, (float)(double)(*soundComponent)["ReferenceDistance"]);
+}
+
+void SoundManager::initOpenAL()
+{
+    // Initialize OpenAL
+    m_ALCdevice = alcOpenDevice(nullptr);
+    if (m_ALCdevice != nullptr) {
+        m_ALCcontext = alcCreateContext(m_ALCdevice, nullptr);
+        alcMakeContextCurrent(m_ALCcontext);
+    } else {
+        LOG_ERROR("OpenAL failed to initialize.");
+    }
+}
+
+void SoundManager::setListenerOri(glm::vec3 ori)
+{
+    // Calculate forward and up vector.
+    glm::vec3 forward = glm::vec3(0.0, 0.0, -1.0);
+    forward = glm::rotateX(forward, ori.x);
+    forward = glm::rotateY(forward, ori.y);
+    forward = glm::rotateZ(forward, ori.z);
+    glm::normalize(forward);
+    glm::vec3 up = glm::vec3(0.0, 1.0, 0.0);
+    up = glm::rotateX(up, ori.x);
+    up = glm::rotateY(up, ori.y);
+    up = glm::rotateZ(up, ori.z);
+    glm::normalize(up);
+    ALfloat lOri[6] = { forward.x, forward.y, forward.z, up.x, up.y, up.z };
+    alListenerfv(AL_ORIENTATION, lOri);
+}

src/Engine/Sound/SoundSystem.cpp

@@ -1,308 +0,0 @@
-#include "Sound/SoundSystem.h"
-
-SoundSystem::SoundSystem(World* world, EventBroker* eventBroker, bool editorMode)
-{
-    m_EventBroker = eventBroker;
-    m_World = world;
-    m_EditorEnabled = editorMode;
-
-    initOpenAL();
-
-    alSpeedOfSound(340.29f);
-    alDistanceModel(AL_LINEAR_DISTANCE);
-    alDopplerFactor(1);
-
-    EVENT_SUBSCRIBE_MEMBER(m_EPlaySoundOnEntity, &SoundSystem::OnPlaySoundOnEntity);
-    EVENT_SUBSCRIBE_MEMBER(m_EPlaySoundOnPosition, &SoundSystem::OnPlaySoundOnPosition);
-    EVENT_SUBSCRIBE_MEMBER(m_EPlayBackgroundMusic, &SoundSystem::OnPlayBackgroundMusic);
-    EVENT_SUBSCRIBE_MEMBER(m_EStopSound, &SoundSystem::OnStopSound);
-    EVENT_SUBSCRIBE_MEMBER(m_EPauseSound, &SoundSystem::OnPauseSound);
-    EVENT_SUBSCRIBE_MEMBER(m_EContinueSound, &SoundSystem::OnContinueSound);
-    EVENT_SUBSCRIBE_MEMBER(m_ESetBGMGain, &SoundSystem::OnSetBGMGain);
-    EVENT_SUBSCRIBE_MEMBER(m_ESetSFXGain, &SoundSystem::OnSetSFXGain);
-}
-
-SoundSystem::~SoundSystem()
-{
-    stopEmitters(); // Stopps emitters
-    deleteInactiveEmitters(); // Deletes stopped emitters
-    // Delete entities
-    std::unordered_map<EntityID, Source*>::iterator it;
-    for (it = m_Sources.begin(); it != m_Sources.end(); it++) {
-        m_World->DeleteEntity((*it).first);
-    }
-    m_Sources.clear();
-
-    alcDestroyContext(m_ALCcontext);
-    alcCloseDevice(m_ALCdevice);
-}
-
-void SoundSystem::stopEmitters()
-{
-    std::unordered_map<EntityID, Source*>::iterator it;
-    for (it = m_Sources.begin(); it != m_Sources.end(); it++) {
-        if (getSourceState(it->second->ALsource) == AL_PLAYING) {
-            stopSound(it->second);
-        }
-    }
-}
-
-void SoundSystem::Update(double dt)
-{ 
-    m_EventBroker->Process<SoundSystem>();
-    addNewEmitters(dt); // can be optimized with "EEntityCreated"
-    deleteInactiveEmitters(); // can be optimized with "EEntityDeleted"
-    updateEmitters( dt);
-    updateListener( dt);
-}
-
-void SoundSystem::deleteInactiveEmitters()
-{
-    std::unordered_map<EntityID, Source*>::iterator it;
-    for (it = m_Sources.begin(); it != m_Sources.end();) {
-        if (m_World->ValidEntity(it->first) 
-            && m_World->HasComponent(it->first, "SoundEmitter")) {
-            if (getSourceState(it->second->ALsource) != AL_STOPPED) {
-                // Nothing to see here, move along
-                it++;
-                continue;
-            } else {
-                // Sound has been stopped / finished playing. 
-                alDeleteBuffers(1, &it->second->ALsource);
-                alDeleteSources(1, &it->second->ALsource);
-                m_World->DeleteEntity(it->first);
-                delete it->second;
-                it = m_Sources.erase(it);
-            }
-        } else {
-            // Entity / Component has been removed
-            stopSound((*it).second);
-            alDeleteBuffers(1, &it->second->ALsource);
-            alDeleteSources(1, &it->second->ALsource);
-            delete it->second;
-            it = m_Sources.erase(it);
-        }
-    }
-}
-
-void SoundSystem::addNewEmitters(double dt)
-{
-    auto emitterComponents = m_World->GetComponents("SoundEmitter");
-    if (emitterComponents == nullptr) {
-        return;
-    }
-    for (auto it = emitterComponents->begin(); it != emitterComponents->end(); it++) {
-        EntityID emitter = (*it).EntityID;
-        std::unordered_map<EntityID, Source*>::iterator source;
-        source = m_Sources.find(emitter);
-        if (source == m_Sources.end()) { // Did not exist, add it
-            Source* source = createSource((std::string)(*it)["FilePath"]);
-            m_Sources[emitter] = source;
-        }
-    }
-}
-
-void SoundSystem::updateEmitters(double dt)
-{
-    std::unordered_map<EntityID, Source*>::iterator it;
-    for (it = m_Sources.begin(); it != m_Sources.end(); it++) {
-        // Get previous pos
-        glm::vec3 previousPos;
-        alGetSource3f(it->second->ALsource, AL_POSITION, &previousPos.x, &previousPos.y, &previousPos.z);
-        // Get next pos
-        glm::vec3 nextPos = Transform::AbsolutePosition(m_World, it->first);
-        // Calculate velocity
-        glm::vec3 velocity = glm::vec3(nextPos - previousPos) / (float)dt;
-        setSourcePos(it->second->ALsource, nextPos);
-        setSourceVel(it->second->ALsource, velocity);
-        float gain;
-        if (it->second->Type == SoundType::SFX) {
-            gain = m_SFXVolumeChannel;
-        } else if (it->second->Type == SoundType::BGM) {
-            gain = m_BGMVolumeChannel;
-        }
-        auto emitter = m_World->GetComponent(it->first, "SoundEmitter");
-        setSoundProperties(it->second->ALsource, &emitter);
-
-        // To make an emitter play when spawned in editor mode
-        if (m_EditorEnabled) {
-            // Path changed
-            if (it->second->SoundResource->Path() != (std::string)emitter["FilePath"]) {
-                it->second->SoundResource = ResourceManager::Load<Sound>((std::string)emitter["FilePath"]);
-                if (it->second->SoundResource->Buffer() != 0) {
-                    playSound(it->second);
-                }
-            }
-        }
-    }
-}
-
-void SoundSystem::updateListener(double dt)
-{
-    // Should only be one listener.
-    auto listenerComponents = m_World->GetComponents("Listener");
-    if (listenerComponents == nullptr) {
-        return;
-    }
-    for (auto it = listenerComponents->begin(); it != listenerComponents->end(); it++) {
-        EntityID listener = (*it).EntityID;
-        glm::vec3 previousPos;
-        alGetListener3f(AL_POSITION, &previousPos.x, &previousPos.y, &previousPos.z); // Get previous pos
-        glm::vec3 nextPos = Transform::AbsolutePosition(m_World, listener); // Get next (current) pos
-        glm::vec3 velocity = glm::vec3(nextPos - previousPos) / (float)dt; // Calculate velocity
-        setListenerPos(nextPos);
-        setListenerVel(velocity);
-        setListenerOri(glm::eulerAngles(Transform::AbsoluteOrientation(m_World, listener)));
-    }
-}
-
-Source* SoundSystem::createSource(std::string filePath)
-{
-    ALuint alSource;
-    alGenSources((ALuint)1, &alSource);
-    alSourcef(alSource, AL_REFERENCE_DISTANCE, 1.0);
-    alSourcef(alSource, AL_MAX_DISTANCE, FLT_MAX);
-    Source* source = new Source();
-    source->ALsource = alSource;
-    source->SoundResource = ResourceManager::Load<Sound>(filePath);
-    return source;
-}
-
-void SoundSystem::playSound(Source* source)
-{
-    alSourcei(source->ALsource, AL_BUFFER, source->SoundResource->Buffer());
-    alSourcePlay(source->ALsource);
-}
-
-void SoundSystem::stopSound(Source* source)
-{
-    alSourceStop(source->ALsource);
-}
-
-bool SoundSystem::OnPlaySoundOnEntity(const Events::PlaySoundOnEntity & e)
-{
-    Source* source = createSource(e.FilePath);
-    source->Type = SoundType::SFX;
-    m_Sources[e.EmitterID] = source;
-    playSound(source);
-    return false;
-}
-
-bool SoundSystem::OnPlaySoundOnPosition(const Events::PlaySoundOnPosition & e)
-{
-    Source* source = createSource(e.FilePath);
-    auto emitterID = m_World->CreateEntity();
-    auto transform = m_World->AttachComponent(emitterID, "Transform");
-    (glm::vec3&)transform["Position"] = e.Position;
-    auto emitter = m_World->AttachComponent(emitterID, "SoundEmitter");
-    (float&)(double)emitter["Gain"] = e.Gain;
-    (float&)(double)emitter["Pitch"] = e.Pitch;
-    (bool&)emitter["Loop"] = e.Loop;
-    (float&)(double)emitter["MaxDistance"] = e.MaxDistance;
-    (float&)(double)emitter["RollOffFactor"] = e.RollOffFactor;
-    (float&)(double)emitter["ReferenceDistance"] = e.ReferenceDistance;
-    auto model = m_World->AttachComponent(emitterID, "Model");
-    (std::string&)model["Resource"] = "Models/Core/UnitCube.mesh"; // 360NoScope UnitCube
-    source->Type = SoundType::SFX;
-    m_Sources[emitterID] = source;
-    playSound(source);
-    return true;
-}
-
-bool SoundSystem::OnPauseSound(const Events::PauseSound & e)
-{
-    alSourcePause(m_Sources[e.EmitterID]->ALsource);
-    return true;
-}
-
-bool SoundSystem::OnStopSound(const Events::StopSound & e)
-{
-    alSourceStop(m_Sources[e.EmitterID]->ALsource);
-    return true;
-}
-
-bool SoundSystem::OnContinueSound(const Events::ContinueSound & e)
-{
-    alSourcePlay(m_Sources[e.EmitterID]->ALsource);
-    return true;
-}
-
-bool SoundSystem::OnPlayBackgroundMusic(const Events::PlayBackgroundMusic & e)
-{
-    auto listenerComponents = m_World->GetComponents("Listener");
-    for (auto it = listenerComponents->begin(); it != listenerComponents->end(); it++) {
-        auto emitterChild = m_World->CreateEntity((*it).EntityID);
-        auto emitter = m_World->AttachComponent(emitterChild, "SoundEmitter");
-        (bool&)emitter["Loop"] = true;
-        (std::string&)emitter["FilePath"] = e.FilePath;
-        m_World->AttachComponent(emitterChild, "Transform");
-        Source* source = createSource(e.FilePath);
-        source->Type = SoundType::BGM;
-        m_Sources[emitterChild] = source;
-        playSound(source);
-    }
-    return true;
-}
-
-bool SoundSystem::OnSetBGMGain(const Events::SetBGMGain & e)
-{
-    m_BGMVolumeChannel = e.Gain;
-    return true;
-}
-
-bool SoundSystem::OnSetSFXGain(const Events::SetSFXGain & e)
-{
-    m_SFXVolumeChannel = e.Gain;
-    return true;
-}
-
-void SoundSystem::setListenerOri(glm::vec3 ori)
-{
-    // Calculate forward and up vector.
-    glm::vec3 forward = glm::vec3(0.0, 0.0, -1.0);
-    forward = glm::rotateX(forward, ori.x);
-    forward = glm::rotateY(forward, ori.y);
-    forward = glm::rotateZ(forward, ori.z);
-    glm::normalize(forward);
-    glm::vec3 up = glm::vec3(0.0, 1.0, 0.0);
-    up = glm::rotateX(up, ori.x);
-    up = glm::rotateY(up, ori.y);
-    up = glm::rotateZ(up, ori.z);
-    glm::normalize(up);
-    ALfloat lOri[6] = { forward.x, forward.y, forward.z, up.x, up.y, up.z };
-    alListenerfv(AL_ORIENTATION, lOri);
-}
-
-ALenum SoundSystem::getSourceState(ALuint source)
-{
-    ALenum state;
-    alGetSourcei(source, AL_SOURCE_STATE, &state);
-    return state;
-}
-
-void SoundSystem::setGain(Source * source, float gain)
-{
-    alSourcef(source->ALsource, AL_GAIN, gain);
-}
-
-void SoundSystem::setSoundProperties(ALuint source, ComponentWrapper* soundComponent)
-{
-    alSourcef(source, AL_GAIN, (float)(double)(*soundComponent)["Gain"]);
-    alSourcef(source, AL_PITCH, (float)(double)(*soundComponent)["Pitch"]);
-    alSourcei(source, AL_LOOPING, (int)(bool)(*soundComponent)["Loop"]); // YOLO
-    alSourcef(source, AL_MAX_DISTANCE, (float)(double)(*soundComponent)["MaxDistance"]);
-    alSourcef(source, AL_ROLLOFF_FACTOR, (float)(double)(*soundComponent)["RollOffFactor"]);
-    alSourcef(source, AL_REFERENCE_DISTANCE, (float)(double)(*soundComponent)["ReferenceDistance"]);
-}
-
-void SoundSystem::initOpenAL()
-{
-    // Initialize OpenAL
-    m_ALCdevice = alcOpenDevice(nullptr);
-    if (m_ALCdevice != nullptr) {
-        m_ALCcontext = alcCreateContext(m_ALCdevice, nullptr);
-        alcMakeContextCurrent(m_ALCcontext);
-    } else {
-        LOG_ERROR("OpenAL failed to initialize.");
-    }
-}

src/Game/Game.cpp

@@ -1,5 +1,6 @@
 #include "Game.h"
-#include "Collision/CollidableOctreeSystem.h"
+#include "Collision/FillOctreeSystem.h"
+#include "Collision/FillFrustumOctreeSystem.h"
 #include "Collision/EntityAABB.h"
 #include "Collision/TriggerSystem.h"
 #include "Collision/CollisionSystem.h"
@@ -8,8 +9,10 @@
 #include "Systems/PlayerMovementSystem.h"
 #include "Systems/SpawnerSystem.h"
 #include "Systems/PlayerSpawnSystem.h"
+#include "Systems/PlayerDeathSystem.h"
 #include "Core/EntityFileWriter.h"
 #include "Game/Systems/CapturePointSystem.h"
+#include "Game/Systems/PickupSpawnSystem.h"
 #include "Game/Systems/WeaponSystem.h"
 #include "Game/Systems/PlayerHUD.h"
 #include "Game/Systems/LifetimeSystem.h"
@@ -71,16 +74,21 @@ Game::Game(int argc, char* argv[])
         fp.MergeEntities(m_World);
     }
 
+    // Create the sound manager
+    m_SoundManager = new SoundManager(m_World, m_EventBroker);
 
     // Create Octrees
-    m_OctreeCollision = new Octree<EntityAABB>(AABB(glm::vec3(-100), glm::vec3(100)), 4);
-    m_OctreeTrigger = new Octree<EntityAABB>(AABB(glm::vec3(-100), glm::vec3(100)), 4);
-    m_OctreeFrustrumCulling = new Octree<EntityAABB>(AABB(glm::vec3(-100), glm::vec3(100)), 4);
+    // TODO: Perhaps the world bounds should be set in some non-arbitrary way instead of this.
+    AABB boxContainingTheWorld(glm::vec3(-300), glm::vec3(300));
+    m_OctreeCollision = new Octree<EntityAABB>(boxContainingTheWorld, 4);
+    m_OctreeTrigger = new Octree<EntityAABB>(boxContainingTheWorld, 4);
+    m_OctreeFrustrumCulling = new Octree<EntityAABB>(boxContainingTheWorld, 4);
     // Create system pipeline
     m_SystemPipeline = new SystemPipeline(m_World, m_EventBroker);
 
     // All systems with orderlevel 0 will be updated first.
     unsigned int updateOrderLevel = 0;
+    m_SystemPipeline->AddSystem<SoundSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<RaptorCopterSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<ExplosionEffectSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<HealthSystem>(updateOrderLevel);
@@ -88,13 +96,16 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<InterpolationSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<SpawnerSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PlayerSpawnSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<PlayerDeathSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<WeaponSystem>(updateOrderLevel, m_Renderer);
     m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<PickupSpawnSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
-    m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
-    m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
+    m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
+    m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
+    m_SystemPipeline->AddSystem<FillFrustumOctreeSystem>(updateOrderLevel, m_OctreeFrustrumCulling);
     m_SystemPipeline->AddSystem<PlayerHUD>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel);
 
@@ -103,7 +114,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<CollisionSystem>(updateOrderLevel, m_OctreeCollision);
     m_SystemPipeline->AddSystem<TriggerSystem>(updateOrderLevel, m_OctreeTrigger);
     ++updateOrderLevel;
-    m_SystemPipeline->AddSystem<RenderSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);
+    m_SystemPipeline->AddSystem<RenderSystem>(updateOrderLevel, m_Renderer, m_RenderFrame, m_OctreeFrustrumCulling);
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<EditorSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);
 
@@ -113,19 +124,16 @@ Game::Game(int argc, char* argv[])
         networkFunction();
     }
 
-    // Invoke sound system
-    m_SoundSystem = new SoundSystem(m_World, m_EventBroker, m_Config->Get<bool>("Debug.EditorEnabled", false));
-
     m_LastTime = glfwGetTime();
 }
 
 Game::~Game()
 {
     delete m_SystemPipeline;
-    delete m_SoundSystem;
     delete m_OctreeFrustrumCulling;
     delete m_OctreeCollision;
     delete m_OctreeTrigger;
+    delete m_SoundManager;
     delete m_World;
     delete m_FrameStack;
     delete m_InputProxy;
@@ -153,16 +161,19 @@ void Game::Tick()
     m_InputProxy->Process();
     m_EventBroker->Swap();
 
+    m_SoundManager->Update(dt);
+
     // Update network
     if (m_IsClientOrServer) {
         m_ClientOrServer->Update();
     }
+    //m_SoundManager->Update(dt);
+
     // Iterate through systems and update world!
     m_EventBroker->Process<SystemPipeline>();
     m_SystemPipeline->Update(dt);
     debugTick(dt);
     m_Renderer->Update(dt);
-    m_SoundSystem->Update(dt);
     GLERROR("Game::Tick m_RenderQueueFactory->Update");
     m_Renderer->Draw(*m_RenderFrame);
     m_RenderFrame->Clear();

src/Game/Systems/CapturePointSystem.cpp

@@ -57,7 +57,7 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
     int blueTeamPlayersStandingInside = 0;
     if (capturePointEntity.HasComponent("Model")) {
         //Now sets team color to the capturepoint, or white if it is uncaptured.
-        capturePointEntity["Model"]["Color"] = ownedBy == blueTeam ? glm::vec4(0, 0.2f, 1, 1) : ownedBy == redTeam ? glm::vec4(1, 0.2f, 0, 1) : glm::vec4(1, 1, 1, 1);
+        capturePointEntity["Model"]["Color"] = ownedBy == blueTeam ? glm::vec4(0, 0.2f, 1, 0.3) : ownedBy == redTeam ? glm::vec4(1, 0.2f, 0, 0.3) : glm::vec4(1, 1, 1, 0.3);
     }
 
     //calculate next possible capturePoint for both teams
@@ -106,10 +106,10 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
 
     //colorize next possible capturepoint
     if (nextPossibleCapturePoint["Red"] == capturePointNumber) {
-        capturePointEntity["Model"]["Color"] = glm::vec4(1, 1, 0, 1);
+        capturePointEntity["Model"]["Color"] = glm::vec4(1, 1, 0, 0.3);
     }
     if (nextPossibleCapturePoint["Blue"] == capturePointNumber) {
-        capturePointEntity["Model"]["Color"] = glm::vec4(0, 1, 1, 1);
+        capturePointEntity["Model"]["Color"] = glm::vec4(0, 1, 1, 0.3);
     }
 
     //check how many players are standing inside and are healthy

src/Game/Systems/HealthSystem.cpp

@@ -21,9 +21,12 @@ bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
         e.Damage -= (double)e.Player["BoostDefender"]["StrengthOfEffect"];
     }
     health -= e.Damage;
-    
+
     if (health <= 0.0) {
-        m_World->DeleteEntity(e.Player.ID);
+        Events::PlayerDeath ePlayerDeath;
+        ePlayerDeath.Player = e.Player;
+        m_EventBroker->Publish(ePlayerDeath);
+        //Note: we will delete the entity in PlayerDeathSystem
     }
 
     return true;
@@ -33,8 +36,8 @@ bool HealthSystem::OnPlayerHealthPickup(Events::PlayerHealthPickup& e)
 {
     ComponentWrapper cHealth = e.Player["Health"];
     double& health = cHealth["Health"];
-    //NOTE: its possible to get more than MaxHealth health
     health += e.HealthAmount;
+    health = std::min(health, (double)cHealth["MaxHealth"]);
 
     return true;
 }

src/Game/Systems/PickupSpawnSystem.cpp

@@ -0,0 +1,66 @@
+#include "Systems/PickupSpawnSystem.h"
+
+PickupSpawnSystem::PickupSpawnSystem(World* m_World, EventBroker* eventBroker)
+    : System(m_World, eventBroker)
+{
+    EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &PickupSpawnSystem::OnTriggerTouch);
+}
+
+void PickupSpawnSystem::Update(double dt)
+{
+    for (auto it = m_ETriggerTouchVector.begin(); it != m_ETriggerTouchVector.end(); ++it)
+    {
+        auto& healthPickupPosition = *it;
+        //set the double timer value (value 3)
+        healthPickupPosition.DecreaseThisRespawnTimer -= dt;
+        if (healthPickupPosition.DecreaseThisRespawnTimer < 0) {
+            //spawn and delete the vector item
+            auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/HealthPickup.xml");
+            EntityFileParser parser(entityFile);
+            EntityID healthPickupID = parser.MergeEntities(m_World);
+
+            //let the world know a pickup has spawned (graphics effects, etc)
+            Events::PickupSpawned ePickupSpawned;
+            ePickupSpawned.Pickup = EntityWrapper(m_World, healthPickupID);
+            m_EventBroker->Publish(ePickupSpawned);
+
+            //set values from the old entity to the new entity
+            auto& newHealthPickupEntity = EntityWrapper(m_World, healthPickupID);
+            newHealthPickupEntity["Transform"]["Position"] = healthPickupPosition.Pos;
+            newHealthPickupEntity["HealthPickup"]["HealthGain"] = healthPickupPosition.HealthGain;
+            newHealthPickupEntity["HealthPickup"]["RespawnTimer"] = healthPickupPosition.RespawnTimer;
+
+            //erase the current element (healthPickupPosition)
+            m_ETriggerTouchVector.erase(it);
+            break;
+        }
+    }
+}
+
+
+bool PickupSpawnSystem::OnTriggerTouch(Events::TriggerTouch& e)
+{
+    if (!e.Trigger.HasComponent("HealthPickup")) {
+        return false;
+    }
+    double healthGiven = 0.01*(double)e.Trigger["HealthPickup"]["HealthGain"] * (double)e.Entity["Health"]["MaxHealth"];
+    //cant pick up healthpacks if you are already at MaxHealth
+    if ((double)e.Entity["Health"]["Health"] >= (double)e.Entity["Health"]["MaxHealth"]) {
+        return false;
+    }
+
+    //personEntered = e.Entity, thingEntered = e.Trigger
+    Events::PlayerHealthPickup ePlayerHealthPickup;
+    ePlayerHealthPickup.HealthAmount = healthGiven;
+    ePlayerHealthPickup.Player = e.Entity;
+    m_EventBroker->Publish(ePlayerHealthPickup);
+
+    //copy position, healthgain, respawntimer (twice since one of the values will be counted down to 0, the other will be set in the new object)
+    //we need to copy all values since each value can be different for each healthPickup
+    m_ETriggerTouchVector.push_back({ (glm::vec3)e.Trigger["Transform"]["Position"] ,e.Trigger["HealthPickup"]["HealthGain"],
+        e.Trigger["HealthPickup"]["RespawnTimer"],e.Trigger["HealthPickup"]["RespawnTimer"] });
+
+    //delete the healthpickup
+    m_World->DeleteEntity(e.Trigger.ID);
+    return true;
+}

src/Game/Systems/PlayerDeathSystem.cpp

@@ -0,0 +1,57 @@
+#include "Systems/PlayerDeathSystem.h"
+
+PlayerDeathSystem::PlayerDeathSystem(World* m_World, EventBroker* eventBroker)
+    : System(m_World, eventBroker)
+{
+    EVENT_SUBSCRIBE_MEMBER(m_OnPlayerDeath, &PlayerDeathSystem::OnPlayerDeath);
+}
+
+void PlayerDeathSystem::Update(double dt)
+{
+}
+
+bool PlayerDeathSystem::OnPlayerDeath(Events::PlayerDeath& e)
+{
+    if (!e.Player.Valid()) {
+        return false;
+    }
+
+    createDeathEffect(e.Player);
+
+    // Delete player
+    m_World->DeleteEntity(e.Player.ID);
+
+    return true;
+}
+
+void PlayerDeathSystem::createDeathEffect(EntityWrapper player)
+{
+    //load the explosioneffect XML
+    auto deathEffect = ResourceManager::Load<EntityFile>("Schema/Entities/PlayerDeathExplosionWithCamera.xml");
+    EntityFileParser parser(deathEffect);
+    EntityID deathEffectID = parser.MergeEntities(m_World);
+    EntityWrapper deathEffectEW = EntityWrapper(m_World, deathEffectID);
+
+    //components that we need from player
+    auto playerCamera = player.FirstChildByName("Camera");
+    auto playerEntityModel = player.FirstChildByName("PlayerModel")["Model"];
+    auto playerEntityAnimation = player.FirstChildByName("PlayerModel")["Animation"];
+
+    //copy the data from player to explisioneffectmodel
+    playerEntityModel.Copy(deathEffectEW["Model"]);
+    playerEntityAnimation.Copy(deathEffectEW["Animation"]);
+    //freeze the animation
+    deathEffectEW["Animation"]["Speed"] = 0.0;
+
+    //copy the models position,orientation
+    deathEffectEW["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
+    deathEffectEW["Transform"]["Orientation"] = (glm::vec3)player["Transform"]["Orientation"];
+    //effect,camera is relative to playersPosition
+    //deathEffectEW["ExplosionEffect"]["ExplosionOrigin"] = glm::vec3(0, 0, 0);
+
+    //camera (with lifetime) behind the player
+    auto cam = deathEffectEW.FirstChildByName("Camera");
+    Events::SetCamera eSetCamera;
+    eSetCamera.CameraEntity = cam;
+    m_EventBroker->Publish(eSetCamera);
+}

src/Game/Systems/PlayerMovementSystem.cpp

@@ -56,12 +56,20 @@ void PlayerMovementSystem::Update(double dt)
             } else {
                 wishSpeed = playerMovementSpeed;
             }
+            if (player.ID == m_LocalPlayer.ID) {
+                if (glm::length(wishDirection) == 0) {
+                    // If no key is pressed, reset the distance moved since last step.
+                    m_DistanceMoved = 0;
+                }
+            }
             glm::vec3& velocity = cPhysics["Velocity"];
-            ImGui::Text("velocity: (%f, %f, %f)", velocity.x, velocity.y, velocity.z);
+            bool isOnGround = (bool)cPhysics["IsOnGround"];
+            ImGui::Text(isOnGround ? "On ground" : "In air");
+            ImGui::Text("velocity: (%f, %f, %f) |%f|", velocity.x, velocity.y, velocity.z, glm::length(velocity));
             glm::vec3 groundVelocity(0.f, 0.f, 0.f);
-            groundVelocity.x = glm::dot(velocity, glm::vec3(1.f, 0.f, 0.f));
-            groundVelocity.z = glm::dot(velocity, glm::vec3(0.f, 0.f, 1.f));
-            ImGui::Text("groundVelocity: (%f, %f, %f) |%f|", groundVelocity.x, groundVelocity.y, groundVelocity.z, glm::length(wishDirection));
+            groundVelocity.x = velocity.x;
+            groundVelocity.z = velocity.z;
+            ImGui::Text("groundVelocity: (%f, %f, %f) |%f|", groundVelocity.x, groundVelocity.y, groundVelocity.z, glm::length(groundVelocity));
             ImGui::Text("wishDirection: (%f, %f, %f) |%f|", wishDirection.x, wishDirection.y, wishDirection.z, glm::length(wishDirection));
             float currentSpeedProj = glm::dot(groundVelocity, wishDirection);
             float addSpeed = wishSpeed - currentSpeedProj;
@@ -74,7 +82,7 @@ void PlayerMovementSystem::Update(double dt)
                 ImGui::InputFloat("accel", &accel);
                 static float airAccel = 0.5f;
                 ImGui::InputFloat("airAccel", &airAccel);
-                float actualAccel = (velocity.y != 0) ? airAccel : accel;
+                float actualAccel = isOnGround ? accel : airAccel;
                 static float surfaceFriction = 5.f;
                 ImGui::InputFloat("surfaceFriction", &surfaceFriction);
                 float accelerationSpeed = actualAccel * (float)dt * wishSpeed * surfaceFriction;
@@ -90,13 +98,16 @@ void PlayerMovementSystem::Update(double dt)
             }
 
             //you cant jump and dash at the same time - since there is no friction in the air and we would thus dash much further in the air
-            if (!controller->PlayerIsDashing() && controller->Jumping() && !controller->Crouching() && (velocity.y == 0.f || !controller->DoubleJumping())) {
+            if (!controller->PlayerIsDashing() && controller->Jumping() && !controller->Crouching() && (isOnGround || !controller->DoubleJumping())) {
+                (bool)cPhysics["IsOnGround"] = false;
                 if (velocity.y == 0.f) {
                     controller->SetDoubleJumping(false);
                 } else {
                     controller->SetDoubleJumping(true);
+                    Events::DoubleJump e;
+                    m_EventBroker->Publish(e);
                 }
-                velocity.y += 4.f;
+                velocity.y = 4.f;
             }
 
             if (player.HasComponent("AABB")) {
@@ -137,6 +148,7 @@ void PlayerMovementSystem::Update(double dt)
 
         controller->Reset();
     }
+    playerStep(dt);
 }
 
 void PlayerMovementSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
@@ -148,6 +160,7 @@ void PlayerMovementSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapp
 
     ComponentWrapper& cPhysics = entity["Physics"];
     glm::vec3& velocity = cPhysics["Velocity"];
+    bool isOnGround = (bool)cPhysics["IsOnGround"];
 
     // Ground friction
     float speed = glm::length(velocity);
@@ -155,7 +168,7 @@ void PlayerMovementSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapp
     ImGui::InputFloat("groundFriction", &groundFriction);
     static float airFriction = 0.f;
     ImGui::InputFloat("airFriction", &airFriction);
-    float friction = (velocity.y != 0) ? airFriction : groundFriction;
+    float friction = isOnGround ? groundFriction : airFriction;
     if (speed > 0) {
         float drop = speed * friction * (float)dt;
         float multiplier = glm::max(speed - drop, 0.f) / speed;
@@ -171,10 +184,38 @@ void PlayerMovementSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapp
     position += velocity * (float)dt;
 }
 
+void PlayerMovementSystem::playerStep(double dt)
+{
+    if (!m_LocalPlayer.Valid()) {
+        return;
+    }
+    // Position of the local player, used see how far a player has moved.
+    glm::vec3 pos = (glm::vec3)m_World->GetComponent(m_LocalPlayer.ID, "Transform")["Position"];
+    // Velocity of the local player, used to see if a player is airborne.
+    glm::vec3 vel = (glm::vec3)m_World->GetComponent(m_LocalPlayer.ID, "Physics")["Velocity"];
+    m_DistanceMoved += glm::length(pos - m_LastPosition);
+    // Set the last position for next iteration
+    m_LastPosition = pos;
+    bool isAirborne = vel.y != 0;
+    if (m_DistanceMoved > m_PlayerStepLength && !isAirborne) {
+        // Player moved a step's distance
+        // Create footstep sound
+        Events::PlaySoundOnEntity e;
+        e.EmitterID = m_LocalPlayer.ID;
+        e.FilePath = m_LeftFoot ? "Audio/footstep/footstep2.wav" : "Audio/footstep/footstep3.wav";
+        m_LeftFoot = !m_LeftFoot;
+        m_EventBroker->Publish(e);
+        m_DistanceMoved = 0.f;
+    }
+}
+
 bool PlayerMovementSystem::OnPlayerSpawned(Events::PlayerSpawned& e)
 {
     // When a player spawns, create an input controller for them
     m_PlayerInputControllers[e.Player] = new FirstPersonInputController<PlayerMovementSystem>(m_EventBroker, e.PlayerID);
-
+    if (e.PlayerID == -1) {
+        // Keep track of the local player
+        m_LocalPlayer = e.Player;
+    }
     return true;
 }

src/Game/Systems/PlayerSpawnSystem.cpp

@@ -75,7 +75,9 @@ bool PlayerSpawnSystem::OnPlayerSpawned(Events::PlayerSpawned& e)
     // Check if a player already exists
     if (m_PlayerEntities.count(e.PlayerID) != 0) {
         // TODO: Disallow infinite respawning here
-        m_World->DeleteEntity(m_PlayerEntities[e.PlayerID].ID);
+        if (m_PlayerEntities[e.PlayerID].Valid()) {
+            m_World->DeleteEntity(m_PlayerEntities[e.PlayerID].ID);
+        }
     }
 
     // Store the player for future reference

src/Game/Systems/SoundSystem.cpp

@@ -0,0 +1,190 @@
+#include "Game/Systems/SoundSystem.h"
+
+SoundSystem::SoundSystem(World* world, EventBroker* eventbroker)
+    : System(world, eventbroker)
+    , PureSystem("SoundEmitter")
+    //, ImpureSystem()
+{
+    ConfigFile* config = ResourceManager::Load<ConfigFile>("Config.ini");
+    m_Announcer = ResourceManager::Load<ConfigFile>("Config.ini")->Get<std::string>("Sound.Announcer", "female");
+    m_World = world;
+    m_EventBroker = eventbroker;
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &SoundSystem::OnPlayerSpawned);
+    EVENT_SUBSCRIBE_MEMBER(m_InputCommand, &SoundSystem::OnInputCommand);
+    EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &SoundSystem::OnDoubleJump);
+    EVENT_SUBSCRIBE_MEMBER(m_EDashAbility, &SoundSystem::OnDashAbility);
+    EVENT_SUBSCRIBE_MEMBER(m_EShoot, &SoundSystem::OnShoot);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &SoundSystem::OnPlayerDamage);
+    EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &SoundSystem::OnCaptured);
+    EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &SoundSystem::OnTriggerTouch);
+}
+
+void SoundSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cComponent, double dt)
+{ }
+
+void SoundSystem::Update(double dt)
+{
+    // Temp for play test.
+    if(m_DrumsIsPlaying) {
+        m_DrumsIsPlaying = !drumTimer(dt);
+    }
+}
+
+bool SoundSystem::OnPlayerSpawned(const Events::PlayerSpawned &e)
+{
+    if (e.PlayerID == -1) { // Local player
+        m_World->AttachComponent(e.Player.ID, "Listener");
+        m_LocalPlayer = e.Player;
+        Events::PlaySoundOnEntity go;
+        go.EmitterID = m_LocalPlayer.ID;
+        go.FilePath = "Audio/announcer/" + m_Announcer + "/go.wav";
+        m_EventBroker->Publish(go);
+        // TEMP: starts bgm
+        {
+            Events::PlayBackgroundMusic ev;
+            ev.FilePath = "Audio/bgm/ambient.wav";
+            m_EventBroker->Publish(ev);
+        }
+    }
+    return true;
+}
+
+bool SoundSystem::OnInputCommand(const Events::InputCommand & e)
+{
+    if (e.Command == "Jump" && e.Value > 0) {
+        if (e.PlayerID == -1) { // local player
+            playerJumps();
+            return true;
+        }
+    }
+    if (e.Command == "TakeDamage" && e.Value > 0) {
+        Events::PlayerDamage ev;
+        ev.Player = m_LocalPlayer;
+        ev.Damage = 1.0;
+        m_EventBroker->Publish(ev);
+    }
+
+    return false;
+}
+
+void SoundSystem::playerJumps()
+{
+    glm::vec3 vel = (glm::vec3)m_World->GetComponent(m_LocalPlayer.ID, "Physics")["Velocity"];
+    if (vel.y == 0) {
+        Events::PlaySoundOnEntity e;
+        e.EmitterID = m_LocalPlayer.ID;
+        e.FilePath = "Audio/jump/jump1.wav";
+        m_EventBroker->Publish(e);
+    }
+}
+
+bool SoundSystem::drumTimer(double dt)
+{
+    m_DrumTimer += dt;
+    if (m_DrumTimer > 15) {
+        m_DrumTimer = 0.0;
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool SoundSystem::OnShoot(const Events::Shoot & e)
+{
+    Events::PlaySoundOnEntity ev;
+    ev.EmitterID = m_LocalPlayer.ID;
+    ev.FilePath = "Audio/laser/laser1.wav";
+    m_EventBroker->Publish(ev);
+    return true;
+}
+
+bool SoundSystem::OnCaptured(const Events::Captured & e)
+{
+    int homeTeam = (int)m_World->GetComponent(e.CapturePointID, "Team")["Team"];
+    int team = (int)m_World->GetComponent(m_LocalPlayer.ID, "Team")["Team"];
+    Events::PlaySoundOnEntity ev;
+    if (team == homeTeam) {
+        ev.FilePath = "Audio/announcer/" + m_Announcer + "/objective_achieved.wav";
+    } else {
+        ev.FilePath = "Audio/announcer/" + m_Announcer + "/objective_failed.wav"; // have not been tested
+    }
+    ev.EmitterID = m_LocalPlayer.ID;
+    m_EventBroker->Publish(ev);
+    // Temp for play test.
+    m_DrumsIsPlaying = false;
+    return false;
+}
+
+// Testing purposes atm...
+bool SoundSystem::OnPlayerDamage(const Events::PlayerDamage & e)
+{
+    // Should check for only local players here...
+    std::uniform_int_distribution<int> dist(1, 12);
+    int rand = dist(generator);
+    std::vector<std::string> paths;
+    paths.push_back("Audio/hurt/hurt" + std::to_string(rand) + ".wav");
+
+//     // Breathe
+//     int ammountOfbreaths = (static_cast<int>(e.Damage) / 10) + 2; // TEMP: Idk something stupid like this shit
+//     for (int i = 0; i < ammountOfbreaths; i++) {
+//         paths.push_back("Audio/exhausted/breath.wav");
+//     }
+    Events::PlayQueueOnEntity ev;
+    ev.Emitter = m_LocalPlayer;
+    ev.FilePaths = paths;
+    m_EventBroker->Publish(ev);
+    return false;
+}
+
+bool SoundSystem::OnPlayerDeath(const Events::PlayerDeath & e)
+{
+    Events::PlaySoundOnEntity ev;
+    ev.EmitterID = m_LocalPlayer.ID;
+    ev.FilePath = "Audio/die/die2.wav"; 
+    m_EventBroker->Publish(ev);
+    return false;
+}
+
+bool SoundSystem::OnPlayerHealthPickup(const Events::PlayerHealthPickup & e)
+{
+    Events::PlaySoundOnEntity ev;
+    ev.EmitterID = m_LocalPlayer.ID;
+    ev.FilePath = "Audio/pickup/pickup2.wav";
+    m_EventBroker->Publish(ev);
+    return false;
+}
+
+bool SoundSystem::OnTriggerTouch(const Events::TriggerTouch & e)
+{
+    // Temp for play test.
+    if (m_DrumsIsPlaying) {
+        return false;
+    }
+    if (m_World->HasComponent(e.Trigger.ID, "CapturePoint")) {
+        Events::PlaySoundOnEntity ev; // should be BGM
+        ev.EmitterID = m_LocalPlayer.ID;
+        ev.FilePath = "Audio/bgm/drumstest.wav";
+        m_EventBroker->Publish(ev);
+        // Temp for play test.
+        m_DrumsIsPlaying = true;
+    }
+    return false;
+}
+
+bool SoundSystem::OnDoubleJump(const Events::DoubleJump & e)
+{
+    Events::PlaySoundOnEntity ev;
+    ev.EmitterID = m_LocalPlayer.ID;
+    ev.FilePath = "Audio/jump/jump2.wav";
+    m_EventBroker->Publish(ev);
+    return false;
+}
+
+bool SoundSystem::OnDashAbility(const Events::DashAbility &e)
+{
+    Events::PlaySoundOnEntity ev;
+    ev.EmitterID = m_LocalPlayer.ID;
+    ev.FilePath = "Audio/jump/dash1.wav";
+    m_EventBroker->Publish(ev);
+    return false;
+}