Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer

CMakeLists.txt

@@ -14,6 +14,8 @@ endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+elseif(MSVC)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 endif()
 
 #set(BUILD_SHARED_LIBS FALSE)
@@ -34,6 +36,12 @@ foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
 endforeach(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES)
 
+# DEBUG definition
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
+	$<$<CONFIG:Debug>:DEBUG>
+	$<$<CONFIG:RelWithDebInfo>:DEBUG>
+)
+
 include(cotire)
 add_subdirectory(src/Engine)
 add_subdirectory(src/Game)

include/Engine/Collision/CollidableOctreeSystem.h

@@ -4,11 +4,12 @@
 #include "../Core/System.h"
 #include "../Core/Octree.h"
 #include "Collision.h"
+#include "EntityAABB.h"
 
 class CollidableOctreeSystem : public ImpureSystem, public PureSystem
 {
 public:
-    CollidableOctreeSystem(World* world, EventBroker* eventBroker, Octree<AABB>* octree)
+    CollidableOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree)
         : System(world, eventBroker)
         , PureSystem("Collidable")
         , m_Octree(octree)
@@ -18,7 +19,7 @@ public:
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
 
 private:
-    Octree<AABB>* m_Octree;
+    Octree<EntityAABB>* m_Octree;
 };
 
 #endif

include/Engine/Collision/Collision.h

@@ -15,6 +15,7 @@
 #include "../Core/Transform.h"
 #include "../Core/Entity.h"
 #include "../Core/EntityWrapper.h"
+#include "EntityAABB.h"
 
 class World;
 struct ComponentWrapper;
@@ -58,10 +59,9 @@ bool AABBVsAABB(const AABB& a, const AABB& b);
 //Return true if the boxes are intersecting.
 //Also outputs the minimum translation that box [a] would need in order to resolve collision.
 bool AABBVsAABB(const AABB& a, const AABB& b, glm::vec3& minimumTranslation);
-bool IsSameBoxProbably(const AABB& first, const AABB& second, const float epsilon = 0.0001f);
 
 // Calculates an absolute AABB from an entity AABB component
-boost::optional<AABB> EntityAbsoluteAABB(EntityWrapper& entity);
+boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity);
 
 }
 

include/Engine/Collision/CollisionSystem.h

@@ -7,30 +7,23 @@
 #include "../Common.h"
 #include "../Core/System.h"
 #include "../Core/EventBroker.h"
-#include "../Core/EKeyUp.h"
 #include "../Core/Octree.h"
+#include "EntityAABB.h"
 
 class CollisionSystem : public PureSystem
 {
 public:
-    CollisionSystem(World* world, EventBroker* eventBroker, Octree<AABB>* octree)
+    CollisionSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree)
         : System(world, eventBroker)
         , PureSystem("Collidable")
         , m_Octree(octree)
-        , zPress(false)
-    {
-        //TODO: Debug stuff, remove later.
-        EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &CollisionSystem::OnKeyUp);
-    }
+    { }
 
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
 
 private:
-    Octree<AABB>* m_Octree;
-    bool zPress;
-
-    EventRelay<CollisionSystem, Events::KeyUp> m_EKeyUp;
-    bool OnKeyUp(const Events::KeyUp &event);
+    Octree<EntityAABB>* m_Octree;
+    std::vector<EntityAABB> m_OctreeResult;
 };
 
 #endif

include/Engine/Collision/ETrigger.h

@@ -2,7 +2,7 @@
 #define Events_TriggerEnter_h__
 
 #include "../Core/EventBroker.h"
-#include "../Core/Entity.h"
+#include "../Core/EntityWrapper.h"
 
 namespace Events
 {
@@ -11,27 +11,27 @@ namespace Events
 struct TriggerTouch : Event
 {
     /** The id of the entity that touches the trigger. */
-    EntityID Entity;
+    EntityWrapper Entity;
     /** The id of the trigger entity. */
-    EntityID Trigger;
+    EntityWrapper Trigger;
 };
 
 /** Thrown once, when an entity has completely left a trigger. */
 struct TriggerLeave : Event
 {
     /** The id of the entity that left the trigger. */
-    EntityID Entity;
+    EntityWrapper Entity;
     /** The id of the trigger entity. */
-    EntityID Trigger;
+    EntityWrapper Trigger;
 };
 
 /** Thrown once, when an entity is completely contained inside a trigger. */
 struct TriggerEnter : Event
 {
     /** The id of the entity that entered the trigger. */
-    EntityID Entity;
+    EntityWrapper Entity;
     /** The id of the trigger entity. */
-    EntityID Trigger;
+    EntityWrapper Trigger;
 };
 
 }

include/Engine/Collision/EntityAABB.h

@@ -0,0 +1,22 @@
+#ifndef EntityAABB_h__
+#define EntityAABB_h__
+
+#include "../Core/AABB.h"
+#include "../Core/EntityWrapper.h"
+
+struct EntityAABB : AABB
+{
+    EntityAABB() = default;
+
+    EntityAABB(const glm::vec3& minPos, const glm::vec3& maxPos)
+        : AABB(minPos, maxPos)
+    { }
+
+    EntityAABB(const AABB& aabb)
+        : AABB(aabb)
+    { }
+
+    EntityWrapper Entity;
+};
+
+#endif

include/Engine/Collision/TriggerSystem.h

@@ -8,13 +8,14 @@
 #include "../Core/EventBroker.h"
 #include "../Core/Octree.h"
 #include "ETrigger.h"
+#include "EntityAABB.h"
 
 class AABB;
 
 class TriggerSystem : public PureSystem
 {
 public:
-    TriggerSystem(World* world, EventBroker* eventBroker, Octree<AABB>* octree)
+    TriggerSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree)
         : System(world, eventBroker)
         , PureSystem("Trigger")
         , m_Octree(octree)
@@ -27,9 +28,10 @@ public:
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
 
 private:
-    Octree<AABB>* m_Octree;
-    std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesTouchingTrigger;
-    std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesCompletelyInTrigger;
+    Octree<EntityAABB>* m_Octree;
+    std::vector<EntityAABB> m_OctreeOut;
+    std::unordered_map<EntityWrapper, std::unordered_set<EntityWrapper>> m_EntitiesTouchingTrigger;
+    std::unordered_map<EntityWrapper, std::unordered_set<EntityWrapper>> m_EntitiesCompletelyInTrigger;
 
     //TODO: Only exists for debug purposes, remove later.
     EventRelay<TriggerSystem, Events::TriggerEnter> m_EEnter;
@@ -40,13 +42,13 @@ private:
     bool OnLeave(const Events::TriggerLeave &event);
 
     //True if leave event was thrown.
-    bool throwLeaveIfWasInTrigger(std::unordered_set<EntityID>& triggerSet, EntityID pId, EntityID tId);
+    bool throwLeaveIfWasInTrigger(std::unordered_set<EntityWrapper>& triggerSet, EntityWrapper colliderENtity, EntityWrapper triggerEntity);
     template<typename Event>
-    void publish(EntityID pId, EntityID tId)
+    void publish(EntityWrapper collider, EntityWrapper trigger)
     {
         Event e;
-        e.Trigger = tId;
-        e.Entity = pId;
+        e.Trigger = trigger;
+        e.Entity = collider;
         m_EventBroker->Publish(e);
     }
 };

include/Engine/Common.h

@@ -5,6 +5,7 @@
 #include <map>
 #include <unordered_map>
 #include <algorithm>
+#include <array>
 
 #include "Core/Util/Logging.h"
 #include "Core/Util/IfDebug.h"

include/Engine/Core/AABB.h

@@ -9,7 +9,6 @@ public:
     AABB() = default;
     //No checks are made. Values in minPos must be less than values in maxPos, i.e. min.x < max.x, etc.
     AABB(const glm::vec3& minPos, const glm::vec3& maxPos);
-    AABB(const glm::vec4& minPos, const glm::vec4& maxPos);
     //No checks are made. Size must consist of non-negative numbers.
     static AABB FromOriginSize(const glm::vec3& origin, const glm::vec3& size);
     virtual ~AABB();

include/Engine/Core/EntityWrapper.h

@@ -35,7 +35,6 @@ struct EntityWrapper
     bool operator==(const EntityWrapper& e) const;
     bool operator!=(const EntityWrapper& e) const;
     explicit operator EntityID() const;
-    operator bool();
 
 private:
     EntityWrapper firstChildByNameRecursive(const std::string& name, EntityID parent);

include/Engine/Core/Octree.h

@@ -149,7 +149,7 @@ template<typename T>
 template<typename Box>
 void Octree<T>::ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects)
 {
-    static_assert(std::is_base_of<AABB, Box>::value, "template argument type Box in Octree<T>::ObjectsInSameRegion must be a subclass of AABB.");
+    //static_assert(std::is_base_of<AABB, Box>::value, "template argument type Box in Octree<T>::ObjectsInSameRegion must be a subclass of AABB.");
     falsifyObjectChecks();
     m_Root->ObjectsInSameRegion(box, outObjects);
 }

include/Engine/Core/Util/Logging.h

@@ -29,41 +29,9 @@ enum _LOG_LEVEL
 
 extern _LOG_LEVEL LOG_LEVEL;
 
-const static char* _LOG_LEVEL_PREFIX[] =
-{
-	"EE: ",
-	"",
-	"WW: ",
-	"DD: "
-};
+extern const char* _LOG_LEVEL_PREFIX[];
 
-static void _LOG(_LOG_LEVEL logLevel, const char* file, const char* func, unsigned int line, const char* format, ...)
-{
-	if (logLevel > LOG_LEVEL) {
-		return;
-	}
-
-	char* message = nullptr;
-	va_list args;
-
-	va_start(args, format);
-	size_t size = vsnprintf(message, 0, format, args) + 1;
-	va_end(args);
-
-	va_start(args, format);
-	message = new char[size];
-	vsnprintf(message, size, format, args);
-	va_end(args);
-
-	if (logLevel == LOG_LEVEL_ERROR) {
-		std::cerr << file << ":" << line << " " << func << std::endl;
-		std::cerr << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
-	} else {
-		std::cout << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
-	}
-
-	delete[] message;
-}
+extern void _LOG(_LOG_LEVEL logLevel, const char* file, const char* func, unsigned int line, const char* format, ...);
 
 #define LOG(logLevel, format, ...) \
 	_LOG(logLevel, __BASE_FILE__, __func__, __LINE__, format, ##__VA_ARGS__)
@@ -77,7 +45,11 @@ static void _LOG(_LOG_LEVEL logLevel, const char* file, const char* func, unsign
 #define LOG_INFO(format, ...) \
 	LOG(LOG_LEVEL_INFO, format, ##__VA_ARGS__)
 
+#ifdef DEBUG
 #define LOG_DEBUG(format, ...) \
 	LOG(LOG_LEVEL_DEBUG, format, ##__VA_ARGS__)
+#else
+#define LOG_DEBUG(format, ...) 
+#endif
 
 #endif // Logging_h__

include/Engine/Rendering/DrawFinalPass.h

@@ -30,9 +30,18 @@ public:
 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 BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job, RenderScene& scene);
+    void BindModelUniforms(GLuint shaderHandle, std::shared_ptr<ModelJob>& job, RenderScene& scene);
+
+    void BindExplosionTextures(std::shared_ptr<ExplosionEffectJob>& job);
+    void BindModelTextures(std::shared_ptr<ModelJob>& job);
 
     Texture* m_WhiteTexture;
     Texture* m_BlackTexture;
+    Texture* m_NeutralNormalTexture;
+    Texture* m_GreyTexture;
 
     FrameBuffer m_FinalPassFrameBuffer;
     GLuint m_BloomTexture;
@@ -43,6 +52,7 @@ private:
     const LightCullingPass* m_LightCullingPass;
 
     ShaderProgram* m_ForwardPlusProgram;
+    ShaderProgram* m_ExplosionEffectProgram;
 };
 
 #endif 

include/Engine/Rendering/ExplosionEffectJob.h

@@ -0,0 +1,106 @@
+#ifndef ExplosionEffectJob_h__
+#define ExplosionEffectJob_h__
+
+#include <cstdint>
+
+#include "../Common.h"
+#include "../GLM.h"
+#include "../Core/ComponentWrapper.h"
+#include "Texture.h"
+#include "Model.h"
+#include "RenderJob.h"
+#include "../Core/ResourceManager.h"
+#include "Camera.h"
+#include "../Core/World.h"
+
+struct ExplosionEffectJob : ModelJob
+{
+    ExplosionEffectJob(ComponentWrapper explosionEffectComponent, ::Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialGroup matGroup, ComponentWrapper modelComponent, ::World* world, glm::vec4 fillColor, float fillPercentage)
+        : ModelJob(model, camera, matrix, matGroup, modelComponent, world, fillColor, fillPercentage)
+    {
+        ExplosionOrigin = (glm::vec3)explosionEffectComponent["ExplosionOrigin"];
+        TimeSinceDeath = (double)explosionEffectComponent["TimeSinceDeath"];
+        ExplosionDuration = (double)explosionEffectComponent["ExplosionDuration"];
+        EndColor = (glm::vec4)explosionEffectComponent["EndColor"];
+        Randomness = (bool)explosionEffectComponent["Randomness"];
+        RandomnessScalar = (double)explosionEffectComponent["RandomnessScalar"];
+        Velocity = (glm::vec2)explosionEffectComponent["Velocity"];
+        ColorByDistance = (bool)explosionEffectComponent["ColorByDistance"];
+        ExponentialAccelaration = (bool)explosionEffectComponent["ExponentialAccelaration"];
+    };
+
+    glm::vec3 ExplosionOrigin;
+    double TimeSinceDeath = 0.f; //Seconds
+    double ExplosionDuration = 2.f;
+    //bool Gravity = true;
+    //double GravityForce = 1.f; // Speed
+    //double ObjectRadius = 2.f; // TODO: Change this for object radius when it's available
+    glm::vec4 EndColor;
+    bool Randomness = false;
+    
+    float RandomnessScalar = 1.f;
+    glm::vec2 Velocity;
+    bool ColorByDistance = false;
+    //bool ReverseAnimation = false;
+    //bool Wireframe = false;
+    bool ExponentialAccelaration = false;
+
+    std::array<float, 50> RandomNumbers = {
+        0.3257552917701f,
+        0.07601508315467f,
+        0.57408909014151f,
+        0.0f,
+        0.8618231368539f,
+        0.074957156588769f,
+        0.39413607511396f,
+        0.54579346698979f,
+        0.83222648353885f,
+        0.83635707285086f,
+        0.34473986148124f,
+        0.98092448710507f,
+        0.46346380070944f,
+        0.7308761201477f,
+        0.70832470371776f,
+        0.28268750909841f,
+        0.26291620883295f,
+        0.07685032816457f,
+        0.30760929515008f,
+        0.2781575388639f   ,
+        0.016950582161988f  ,
+        0.25787915254844f   ,
+        0.76293767279151f   ,
+        0.67730279903733f   ,
+        0.49042877018937f   ,
+        0.13002237823327f   ,
+        0.62803373841012f   ,
+        0.94525353747665f   ,
+        0.32893980076953f   ,
+        0.95952951719962f   ,
+        0.056386206790985f  ,
+        0.012030893476694f  ,
+        0.93090049220757f,
+        0.83579883064879f,
+        0.79733513938139f,
+        0.8796381046435f    ,
+        0.94160434600972f   ,
+        0.76901855588379f   ,
+        0.50253688101775f   ,
+        0.82457069578793f   ,
+        0.80157403359263f   ,
+        0.87291810189975f   ,
+        0.64679548919517f   ,
+        0.42664138899494f   ,
+        0.77171308303797f   ,
+        0.75567959237643f   ,
+        0.45190826265696f   ,
+        0.59844922628181f   ,
+        0.56534937655802f   ,
+        0.195656257307f};
+
+    void CalculateHash() override
+    {
+        Hash = 0;
+    }
+};
+
+#endif

include/Engine/Rendering/IRenderer.h

@@ -25,21 +25,27 @@ class IRenderer
 {
 public:
 	GLFWwindow* Window() const { return m_Window; }
+    //Returns screensize including window border and header
 	Rectangle Resolution() const { return m_Resolution; }
 	void SetResolution(const Rectangle& resolution) { m_Resolution = resolution; }
 	bool Fullscreen() { return m_Fullscreen; }
 	void SetFullscreen(bool fullscreen) { m_Fullscreen = fullscreen; }
 	bool VSYNC() const { return m_VSYNC; }
 	void SetVSYNC(bool vsync) { m_VSYNC = vsync; }
+    //Returns screensize excluding window border and header
+    Rectangle GetViewPortSize() const { return m_ViewPortWidth; }
+    void SetViewPortSize(const Rectangle& viewportWidth) { m_ViewPortWidth = viewportWidth; }
 	virtual void Initialize() = 0;
 	virtual void Update(double dt) = 0;
 	virtual void Draw(RenderFrame& rq) = 0;
     virtual PickData Pick(glm::vec2 screenCord) = 0;
 
+
     World* m_World; //Temp world, untill viktor merge.
 
 protected:
 	Rectangle m_Resolution = Rectangle::Rectangle(1280, 720);
+    Rectangle m_ViewPortWidth = Rectangle::Rectangle(1280, 720);
 	bool m_Fullscreen = false;
 	bool m_VSYNC = false;
 	int m_GLVersion[2];

include/Engine/Rendering/ModelJob.h

@@ -22,10 +22,26 @@ struct ModelJob : RenderJob
     {
         Model = model;
         TextureID = (matGroup.Texture) ? matGroup.Texture->ResourceID : 0;
+        if (modelComponent["DiffuseTexture"]) {
             DiffuseTexture = matGroup.Texture.get();
+        } else {
+            DiffuseTexture = nullptr;
+        }
+        if (modelComponent["NormalMap"]) {
             NormalTexture = matGroup.NormalMap.get();
+        } else {
+            NormalTexture = nullptr;
+        }
+        if (modelComponent["SpecularMap"]) {
             SpecularTexture = matGroup.SpecularMap.get();
+        } else {
+            SpecularTexture = nullptr;
+        }
+        if (modelComponent["GlowMap"]) {
             IncandescenceTexture = matGroup.IncandescenceMap.get();
+        } else {
+            IncandescenceTexture = nullptr;
+        }
         DiffuseColor = matGroup.DiffuseColor;
         SpecularColor = matGroup.SpecularColor;
         IncandescenceColor = matGroup.IncandescenceColor;
@@ -39,7 +55,6 @@ struct ModelJob : RenderJob
         Depth = worldpos.z;
         World = world;
 
-
         FillColor = fillColor;
         FillPercentage = fillPercentage;
         Skeleton = Model->m_RawModel->m_Skeleton;

include/Engine/Rendering/RawModelCustom.h

@@ -110,7 +110,7 @@ private:
     void ReadAnimationJoint(unsigned int &offset, char* fileData, unsigned int& fileByteSize);
     void ReadAnimationClips(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int numberOfClips);
     void ReadAnimationClipSingle(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int clipIndex);
-    void ReadAnimationKeyFrame(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int numberOfJoints, Skeleton::Animation& animation);
+    void ReadAnimationKeyFrame(unsigned int &offset, char* fileData, unsigned int& fileByteSize, Skeleton::Animation& animation);
     
     //void CreateSkeleton(std::vector<std::tuple<std::string, glm::mat4>> &boneInfo, std::map<std::string, int> &boneNameMapping, aiNode* node, int parentID);
 };

include/Engine/Rendering/RenderQueue.h

@@ -14,11 +14,13 @@
 #include "TextJob.h"
 #include "PointLightJob.h"
 #include "DirectionalLightJob.h"
+#include "ExplosionEffectJob.h"
 
 struct RenderScene
 {
     ::Camera* Camera = nullptr;
-    std::list<std::shared_ptr<RenderJob>> ForwardJobs;
+    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;
@@ -27,7 +29,8 @@ struct RenderScene
 
 	void Clear()
 	{
-        ForwardJobs.clear();
+        OpaqueObjects.clear();
+        TransparentObjects.clear();
         PointLightJobs.clear();
         TextJobs.clear();
         DirectionalLightJobs.clear();

include/Engine/Rendering/RenderSystem.h

@@ -35,17 +35,19 @@ private:
 
     EventRelay<RenderSystem, Events::SetCamera> m_ESetCamera;
     bool OnSetCamera(Events::SetCamera &event);
+    EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
+    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 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);
-    EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;
-    bool OnInputCommand(const Events::InputCommand& e);
-
-    void fillModels(std::list<std::shared_ptr<RenderJob>>& jobs);
     void fillLight(std::list<std::shared_ptr<RenderJob>>& jobs);
+    bool isChildOfACamera(EntityWrapper entity);
+    bool isChildOfCurrentCamera(EntityWrapper entity);
 
-    EventRelay<RenderSystem, Events::PlayerSpawned> m_EPlayerSpawned;
-    bool OnPlayerSpawned(Events::PlayerSpawned& e);
 };
 
 #endif

include/Engine/Rendering/Renderer.h

@@ -73,6 +73,8 @@ private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
 	//--------------------ShaderPrograms-------------------//
     ShaderProgram* m_BasicForwardProgram;
+    ShaderProgram* m_ExplosionEffectProgram;
+
 };
 
 #endif

include/Game/ExplosionEffectSystem.h

@@ -0,0 +1,24 @@
+#include "Common.h"
+#include "Core/System.h"
+
+class ExplosionEffectSystem : public PureSystem
+{
+public:
+    ExplosionEffectSystem(World* world, EventBroker* eventBroker)
+        : System(world, eventBroker)
+        , PureSystem("ExplosionEffect")
+    { }
+
+    virtual void  UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override
+    {
+
+        if ((double)component["TimeSinceDeath"] > (double)component["ExplosionDuration"]) {
+            (double)component["TimeSinceDeath"] = 0.f;
+        }
+        (double&)component["TimeSinceDeath"] += dt;
+
+        //if ((bool)Component["Gravity"] == true) {
+        //    (bool)Component["ExponentialAccelaration"] = false;
+        //}
+    }
+};

include/Game/Game.h

@@ -14,6 +14,7 @@
 #include "Core/EKeyDown.h"
 #include "Core/EntityFilePreprocessor.h"
 #include "Core/SystemPipeline.h"
+#include "ExplosionEffectSystem.h"
 #include "Editor/EditorSystem.h"
 #include "Core/EntityFile.h"
 #include "Rendering/RenderSystem.h"
@@ -21,6 +22,7 @@
 #include "Core/Octree.h"
 #include "Rendering/Font.h"
 #include "Systems/InterpolationSystem.h"
+#include "Collision/EntityAABB.h"
 // Network
 #include <boost/thread.hpp>
 #include "Network/Network.h"
@@ -48,8 +50,8 @@ private:
     InputProxy* m_InputProxy;
 	GUI::Frame* m_FrameStack;
     World* m_World;
-    Octree<AABB>* m_OctreeCollision;
-    Octree<AABB>* m_OctreeFrustrumCulling;
+    Octree<EntityAABB>* m_OctreeCollision;
+    Octree<EntityAABB>* m_OctreeFrustrumCulling;
     SystemPipeline* m_SystemPipeline;
     RenderFrame* m_RenderFrame;
     // Network variables

include/Game/Systems/CapturePointSystem.h

@@ -40,7 +40,7 @@ private:
     int m_BlueTeamHomeCapturePoint = m_NotACapturePoint;
 
     int m_NumberOfCapturePoints = 0;
-    std::map<int, EntityID> m_CapturePointNumberToEntityIDMap;
+    std::map<int, EntityWrapper> m_CapturePointNumberToEntityMap;
 
     //std::vector<ComponentWrapper>
 
@@ -48,8 +48,8 @@ private:
     bool m_ResetTimers = false;
 
     //vectors which will keep track of enter/leave changes
-    std::vector<std::tuple<EntityID, EntityID>> m_ETriggerTouchVector;
-    std::vector<std::tuple<EntityID, EntityID>> m_ETriggerLeaveVector;
+    std::vector<std::tuple<EntityWrapper, EntityWrapper>> m_ETriggerTouchVector;
+    std::vector<std::tuple<EntityWrapper, EntityWrapper>> m_ETriggerLeaveVector;
 };
 
 #endif

resources/Schema/Components.xsd

@@ -12,6 +12,7 @@
 	<xs:include schemaLocation="Components/PointLight.xsd"/>
 	<xs:include schemaLocation="Components/DirectionalLight.xsd"/>
 	<xs:include schemaLocation="Components/Trigger.xsd"/>
+	<xs:include schemaLocation="Components/ExplosionEffect.xsd"/>
 	<xs:include schemaLocation="Components/Health.xsd"/>
 	<xs:include schemaLocation="Components/CapturePoint.xsd"/>
 	<xs:include schemaLocation="Components/Listener.xsd"/>
@@ -27,4 +28,5 @@
 	<xs:include schemaLocation="Components/Animation.xsd"/>
 	<xs:include schemaLocation="Components/Fill.xsd"/>
 	<xs:include schemaLocation="Components/Lifetime.xsd"/>
+	<xs:include schemaLocation="Components/HiddenForLocalPlayer.xsd"/>
 </xs:schema>

resources/Schema/Components/Animation.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Animation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Animation.xsd">
+	<Name></Name>
 	<Time>0</Time>
 	<Speed>0</Speed>
 	<Loop>true</Loop>

resources/Schema/Components/CapturePoint.xsd

@@ -2,18 +2,7 @@
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:complexType name="TeamEnum" mixed="true">
-		<xs:complexContent>
-			<xs:extension base="t:enum">
-				<xs:choice>
-					<xs:element name="Spectator" type="xs:integer" fixed="1" minOccurs="0"/>
-					<xs:element name="Red" type="xs:integer" fixed="2" minOccurs="0"/>
-					<xs:element name="Blue" type="xs:integer" fixed="3" minOccurs="0"/>
-				</xs:choice>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
+	<xs:include schemaLocation="../Types/TeamEnum.xsd"/>
 
 	<xs:element name="CapturePoint">
 		<xs:annotation>

resources/Schema/Components/ExplosionEffect.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ExplosionEffect xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ExplosionEffect.xsd">
+	<ExplosionOrigin X="0" Y="0" Z="0"/>
+	<TimeSinceDeath>0</TimeSinceDeath>
+	<ExplosionDuration>2</ExplosionDuration>
+	<!--<Gravity>1</Gravity>-->
+	<!--<GravityForce>1</GravityForce>-->
+	<!--<ObjectRadius>2</ObjectRadius>-->
+	<EndColor R="0" G="0" B="0" A="0"/>
+	<Randomness>0</Randomness>
+	<RandomnessScalar>1</RandomnessScalar>
+	<Velocity X="2" Y="2"/>
+	<ColorByDistance>0</ColorByDistance>
+	<!--<ReverseAnimation>0</ReverseAnimation>-->
+	<!--<Wireframe>0</Wireframe>-->
+	<ExponentialAccelaration>0</ExponentialAccelaration>
+</ExplosionEffect>

resources/Schema/Components/ExplosionEffect.xsd

@@ -0,0 +1,57 @@
+<?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="ExplosionEffect">
+		<xs:annotation>
+			<xs:documentation>A component that trigger the death effect</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="ExplosionOrigin" type="t:Vector" minOccurs="0">
+					<xs:annotation><xs:documentation>The position in which to spawn the component</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="TimeSinceDeath" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Seconds since death</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ExplosionDuration" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>How many seconds the death animation should be</xs:documentation></xs:annotation>
+				</xs:element>
+				<!--<xs:element name="Gravity" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Enable/disable gravity</xs:documentation></xs:annotation>
+				</xs:element>-->
+				<!--<xs:element name="GravityForce" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>The force of the gravity</xs:documentation></xs:annotation>
+				</xs:element>-->
+				<!--<xs:element name="ObjectRadius" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Object radius (TO BE REMOVED AND AUTOMATED)</xs:documentation></xs:annotation>
+				</xs:element>-->
+				<xs:element name="EndColor" type="t:Color" minOccurs="0">
+					<xs:annotation><xs:documentation>The tint the polys end with</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Randomness" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Add some randomness to the explosion</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="RandomnessScalar" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Alter the power of the randomness</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Velocity" type="t:Vector" minOccurs="0">
+					<xs:annotation><xs:documentation>The velocity factors (start/end)</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ColorByDistance" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Change the color by its moved distance instead of by its time</xs:documentation></xs:annotation>
+				</xs:element>
+				<!--<xs:element name="ReverseAnimation" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Implosions are cooler</xs:documentation></xs:annotation>
+				</xs:element>-->
+				<!--<xs:element name="Wireframe" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Enable/disable wireframe</xs:documentation></xs:annotation>
+				</xs:element>-->
+				<xs:element name="ExponentialAccelaration" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Linear/Exponential accelaration</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/HealthHUD.xml

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

resources/Schema/Components/HiddenForLocalPlayer.xml

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

resources/Schema/Components/HiddenForLocalPlayer.xsd

@@ -0,0 +1,11 @@
+<?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="HiddenForLocalPlayer">
+		<xs:annotation>
+			<xs:documentation>Used to make the entity invisible if it's parented to the current local player entity (for first person player model and such)</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Lifetime.xml

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

resources/Schema/Components/Model.xml

@@ -2,5 +2,10 @@
 <Model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Model.xsd">
 	<Resource></Resource>
 	<Color R="1" G="1" B="1" A="1"/>
+	<Transparent>false</Transparent>
 	<Visible>true</Visible>
+	<DiffuseTexture>true</DiffuseTexture>
+	<NormalMap>true</NormalMap>
+	<SpecularMap>true</SpecularMap>
+	<GlowMap>true</GlowMap>
 </Model>

resources/Schema/Components/Model.xsd

@@ -15,8 +15,23 @@
 				<xs:element name="Color" type="t:Color" minOccurs="0">
 					<xs:annotation><xs:documentation>Color tint</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="Transparent" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Wether the model is transparent or not</xs:documentation></xs:annotation>
+				</xs:element>
 				<xs:element name="Visible" type="t:bool" minOccurs="0">
-					<xs:annotation><xs:documentation>Wether the model is visible or not</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>Whether the model is visible or not</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="DiffuseTexture" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Whether the model should use the Diffuse texture or not</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="NormalMap" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Whether the model should use the Normalmap or not</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="SpecularMap" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Whether the model should use the Specularmap or not</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="GlowMap" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Whether the model should use the Glowmap or not</xs:documentation></xs:annotation>
 				</xs:element>
 			</xs:all>
 		</xs:complexType>

resources/Schema/Components/Team.xsd

@@ -2,18 +2,7 @@
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:complexType name="TeamEnum" mixed="true">
-		<xs:complexContent>
-			<xs:extension base="t:enum">
-				<xs:choice>
-					<xs:element name="Spectator" type="xs:integer" fixed="1" minOccurs="0"/>
-					<xs:element name="Red" type="xs:integer" fixed="2" minOccurs="0"/>
-					<xs:element name="Blue" type="xs:integer" fixed="3" minOccurs="0"/>
-				</xs:choice>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
+	<xs:include schemaLocation="../Types/TeamEnum.xsd"/>
 	
 	<xs:element name="Team">
 		<xs:annotation>

resources/Schema/Entities/EditorTestWorld.xml

@@ -6,7 +6,7 @@
   </Components>
 
   <Children>
-    <Entity>
+    <Entity name="Ground">
       <Components>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
@@ -18,69 +18,51 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity>
-      <Components>
-        <c:Model>
-          <Resource>An error</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="1" Y="1" Z="0"/>
-          <Orientation X="0" Y="0.785390019" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:Model>
-              <Resource>An error</Resource>
-            </c:Model>
-            <c:Transform>
-              <Position X="2" Y="0" Z="0"/>
-              <Orientation X="0" Y="0.785390019" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
     <Entity>
       <Components>
         <c:Camera/>
         <c:Listener/>
         <c:Transform>
-          <Position X="1.36896265" Y="4.4259491" Z="10.6640663"/>
+          <Position X="1.36896265" Y="4.10503054" Z="10.6640663"/>
           <Orientation X="-0.0349078141" Y="0.157154545" Z="-2.60252193e-07"/>
         </c:Transform>
       </Components>
       <Children/>
     </Entity>
-    <Entity>
+    <Entity name="DirectionalLight">
       <Components>
-        <c:DirectionalLight/>
+        <c:DirectionalLight>
+          <Intensity>0.80000001192092896</Intensity>
+        </c:DirectionalLight>
         <c:Model>
           <Resource>Models/DirectionalLightWidget.mesh</Resource>
         </c:Model>
+        <c:RaptorCopter>
+          <Speed>1.0499999523162842</Speed>
+          <Axis X="0" Y="1" Z="0"/>
+        </c:RaptorCopter>
         <c:Transform>
           <Position X="2.1529963" Y="6.59221172" Z="0.169116676"/>
-          <Orientation X="4.32000017" Y="4.6340003" Z="0"/>
+          <Orientation X="4.16300011" Y="1422.89319" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
     </Entity>
-    <Entity>
+    <Entity name="AssaultTPose">
       <Components>
         <c:Model>
           <Resource>Models/Assault.mesh</Resource>
         </c:Model>
         <c:Transform>
-          <Position X="-2.00568962" Y="0.527161121" Z="0"/>
+          <Position X="-1.68900967" Y="0.527161121" Z="-1.59648728"/>
+          <Orientation X="0" Y="1.64900005" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
-        <Entity>
+        <Entity name="SecondaryWeapon">
           <Components>
             <c:Model>
-              <Resource>Models/SecondaryWeapon.fbx</Resource>
+              <Resource>Models/SecondaryWeapon.mesh</Resource>
             </c:Model>
             <c:Transform>
               <Position X="-0.546139359" Y="0.853016734" Z="0.177482292"/>
@@ -91,17 +73,219 @@
         </Entity>
       </Children>
     </Entity>
-    <Entity>
+    <Entity name="AnimationGroupOrigin">
+      <Components>
+        <c:Transform>
+          <Position X="1.11190474" Y="0.490183681" Z="0"/>
+          <Orientation X="0" Y="1.02100003" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="RunAnim">
+          <Components>
+            <c:Animation>
+              <Name>Run</Name>
+              <Time>0.62051775215976157</Time>
+              <Speed>1</Speed>
+            </c:Animation>
+            <c:Model>
+              <Resource>models/AssaultAnimated.mesh</Resource>
+            </c:Model>
+            <c:Transform>
+              <Position X="0.786919653" Y="0" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Walkanim">
+          <Components>
+            <c:Animation>
+              <Name>Walk</Name>
+              <Time>0.28779680073140668</Time>
+              <Speed>1</Speed>
+            </c:Animation>
+            <c:Model>
+              <Resource>models/AssaultAnimated.mesh</Resource>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="UnitSphere">
               <Components>
                 <c:Model>
                   <Resource>Models/Core/UnitSphere.mesh</Resource>
+                  <Color A="0.294117659" B="19.6078434" G="1.17647064" R="0.0392156877"/>
+                  <Transparent>true</Transparent>
                 </c:Model>
                 <c:Transform>
-          <Position X="0" Y="3.70000029" Z="0"/>
+                  <Position X="0" Y="0.754540265" Z="0"/>
+                  <Scale X="0.800000012" Y="1.9000001" Z="1"/>
                 </c:Transform>
               </Components>
               <Children/>
             </Entity>
           </Children>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Log">
+      <Components>
+        <c:Model>
+          <Resource>Models/Log.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-4" Y="0.698000014" Z="-1"/>
+          <Orientation X="0" Y="2.74900007" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="SpheresOrigin">
+      <Components>
+        <c:Transform>
+          <Position X="6.80000019" Y="4.9000001" Z="-5.9000001"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="NormalSphere">
+          <Components>
+            <c:Model>
+              <Resource>Models/NormalMapSphere.mesh</Resource>
+            </c:Model>
+            <c:Transform>
+              <Position X="1.82700014" Y="0" Z="-0.166000009"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="SpecularSphere">
+          <Components>
+            <c:Model>
+              <Resource>Models/SpecularMapSphere.mesh</Resource>
+            </c:Model>
+            <c:Transform>
+              <Position X="-1.06487739" Y="0" Z="1.52336037"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Rotationpoint">
+              <Components>
+                <c:RaptorCopter>
+                  <Speed>1</Speed>
+                  <Axis X="0.699999988" Y="1" Z="0.300000012"/>
+                </c:RaptorCopter>
+                <c:Transform>
+                  <Orientation X="404.200684" Y="577.428955" Z="173.228897"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="PointLight">
+                  <Components>
+                    <c:Model>
+                      <Resource>Models/Core/UnitSphere.mesh</Resource>
+                      <Color A="1" B="0" G="3.92156863" R="3.92156863"/>
+                    </c:Model>
+                    <c:PointLight>
+                      <Radius>3</Radius>
+                      <Intensity>1.1399998664855957</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.600000024" Y="0.5" Z="0"/>
+                      <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="GlowMap">
+          <Components>
+            <c:Model>
+              <Resource>Models/IncandescenceMapSphere.mesh</Resource>
+            </c:Model>
+            <c:Transform>
+              <Position X="-1.10000002" Y="0" Z="-1.80000007"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="CombinedSpheres">
+          <Components>
+            <c:Model>
+              <Resource>models/NormSpecIncdMapSphere.mesh</Resource>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="RotationPoint">
+          <Components>
+            <c:RaptorCopter>
+              <Speed>1</Speed>
+              <Axis X="1" Y="1" Z="1"/>
+            </c:RaptorCopter>
+            <c:Transform>
+              <Orientation X="53.9495354" Y="53.9495354" Z="53.9495354"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="PointLight">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Core/UnitSphere.mesh</Resource>
+                  <Color A="1" B="0" G="3.92156863" R="3.92156863"/>
+                </c:Model>
+                <c:PointLight>
+                  <Radius>3</Radius>
+                  <Intensity>1.1399998664855957</Intensity>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="-1.70000005" Y="0" Z="0"/>
+                  <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="PointLight">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Core/UnitSphere.mesh</Resource>
+                  <Color A="1" B="0" G="3.92156863" R="3.92156863"/>
+                </c:Model>
+                <c:PointLight>
+                  <Radius>5.0100002288818359</Radius>
+                  <Intensity>0.69999998807907104</Intensity>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="0.900000036" Y="1.10000002" Z="0"/>
+                  <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="PointLight">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Core/UnitSphere.mesh</Resource>
+                  <Color A="1" B="0" G="3.92156863" R="3.92156863"/>
+                </c:Model>
+                <c:PointLight>
+                  <Radius>4</Radius>
+                  <Intensity>0.80000001192092896</Intensity>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="0.400000006" Y="-1" Z="-1.50000012"/>
+                  <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
 
 </Entity>

resources/Schema/Entities/FastWorld.xml

@@ -25,10 +25,16 @@
         <Entity>
           <Components>
             <c:Animation>
-              <Name>Crouch Walk</Name>
-              <Time>701.10570384634161</Time>
-              <Speed>32</Speed>
+              <Name>Run</Name>
+              <Time>0.56277947897317659</Time>
+              <Speed>1</Speed>
             </c:Animation>
+            <c:ExplosionEffect>
+              <Velocity X="0" Y="1.10000002" Z="3.30000019"/>
+              <ExplosionOrigin X="-0.600000024" Y="1" Z="0"/>
+              <TimeSinceDeath>0.95625903442123672</TimeSinceDeath>
+              <EndColor A="0" B="0.815686285" G="1" R="0"/>
+            </c:ExplosionEffect>
             <c:Model>
               <Resource>Models/AssaultAnimated.mesh</Resource>
               <Color A="1" B="392156.875" G="1" R="1"/>

resources/Schema/Entities/Player.xml

@@ -20,7 +20,7 @@
       </Team>
     </c:Team>
     <c:Transform>
-      <Orientation X="0" Y="2.24449515" Z="0"/>
+      <Position X="8.60201447e-23" Y="0" Z="3.9201616e-23"/>
     </c:Transform>
   </Components>
 
@@ -141,9 +141,10 @@
       <Components>
         <c:Animation>
           <Name>Hold Pos</Name>
-          <Time>0.9779997896222552</Time>
+          <Time>0.73515426169631848</Time>
           <Speed>1</Speed>
         </c:Animation>
+        <c:HiddenForLocalPlayer/>
         <c:Model>
           <Resource>Models/AssaultAnimated.mesh</Resource>
           <Color A="1" B="0" G="0" R="1"/>

resources/Schema/Entities/PointLightWithModel.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="PointLight" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Model>
+      <Resource>Models/Core/UnitSphere.mesh</Resource>
+      <Color A="1" B="0" G="3.92156863" R="3.92156863"/>
+    </c:Model>
+    <c:PointLight>
+      <Radius>3</Radius>
+      <Intensity>1.1399998664855957</Intensity>
+    </c:PointLight>
+    <c:Transform>
+      <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
+    </c:Transform>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/Test.xml

@@ -18,6 +18,23 @@
 				</c:Transform>
 				<c:Camera>
 				</c:Camera>
+							<Orientation X="0.0" Y="0.0" Z="0"/>
+						<c:ExplosionEffect>
+							<ExplosionOrigin X="0" Y="0" Z="0"/>
+							<TimeSinceDeath>0</TimeSinceDeath>
+							<ExplosionDuration>2</ExplosionDuration>
+							<!--<Gravity>1</Gravity>-->
+							<!--<GravityForce>1</GravityForce>-->
+							<!--<ObjectRadius>2</ObjectRadius>-->
+							<EndColor R="0" G="0" B="0" A="0"/>
+							<Randomness>0</Randomness>
+							<RandomnessScalar>1</RandomnessScalar>
+							<Velocity X="2" Y="2"/>
+							<ColorByDistance>0</ColorByDistance>
+							<!--<ReverseAnimation>0</ReverseAnimation>-->
+							<!--<Wireframe>0</Wireframe>-->
+							<ExponentialAccelaration>0</ExponentialAccelaration>
+						</c:ExplosionEffect>
 				<c:Model>
 					<Resource>Models/Camera.mesh</Resource>
 				</c:Model>

resources/Schema/Types/Entity.xsd

@@ -15,6 +15,7 @@
 							<xs:element ref="c:Model" minOccurs="0"/>
 							<xs:element ref="c:RaptorCopter" minOccurs="0"/>
 							<xs:element ref="c:Player" minOccurs="0"/>
+							<xs:element ref="c:ExplosionEffect" minOccurs="0"/>
 							<xs:element ref="c:Camera" minOccurs="0"/>
 							<xs:element ref="c:Text" minOccurs="0"/>
 							<xs:element ref="c:AABB" minOccurs="0"/>
@@ -33,6 +34,9 @@
 							<xs:element ref="c:UniformScale" minOccurs="0"/>
 							<xs:element ref="c:EditorWidget" minOccurs="0"/>
 							<xs:element ref="c:Lifetime" minOccurs="0"/>
+							<xs:element ref="c:HiddenForLocalPlayer" minOccurs="0"/>
+							<xs:element ref="c:Fill" minOccurs="0"/>
+							<xs:element ref="c:Animation" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>
@@ -43,7 +47,7 @@
 							<xs:element ref="Entity" minOccurs="0" maxOccurs="unbounded"/>
 							<xs:element name="EntityRef" minOccurs="0" maxOccurs="unbounded">
 								<xs:complexType>
-										<xs:attribute name="file" type="xs:string" minOccurs="0"/> 
+										<xs:attribute name="file" type="xs:string"/> 
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>
@@ -51,7 +55,7 @@
 				</xs:element>
 			</xs:all>
 			<xs:attribute ref="xml:base"/>
-			<xs:attribute name="name" type="xs:string" minOccurs="0" default=""/> 
+			<xs:attribute name="name" type="xs:string" default=""/> 
 		</xs:complexType>
 	</xs:element>
 </xs:schema>

resources/Schema/Types/TeamEnum.xsd

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:complexType name="TeamEnum" mixed="true">
+		<xs:complexContent>
+			<xs:extension base="t:enum">
+				<xs:choice>
+					<xs:element name="Spectator" type="t:int" fixed="1" minOccurs="0"/>
+					<xs:element name="Red" type="t:int" fixed="2" minOccurs="0"/>
+					<xs:element name="Blue" type="t:int" fixed="3" minOccurs="0"/>
+				</xs:choice>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+</xs:schema>

resources/Shaders/ExplosionEffect.frag.glsl

@@ -0,0 +1,25 @@
+#version 430
+
+uniform mat4 M;
+uniform mat4 V;
+uniform mat4 P;
+uniform vec4 Color;
+
+uniform sampler2D texture0;
+
+in VertexData{
+	vec3 Position;
+	vec3 Normal;
+	vec2 TextureCoordinate;
+	vec4 DiffuseColor;
+	vec4 ExplosionColor;
+}Input;
+
+out vec4 fragmentColor;
+
+
+void main()
+{
+	vec4 texel = texture2D(texture0, Input.TextureCoordinate);
+	fragmentColor = texel * Input.DiffuseColor * Color + Input.ExplosionColor;
+}

resources/Shaders/ExplosionEffect.geom.glsl

@@ -0,0 +1,179 @@
+#version 430
+
+uniform mat4 M;
+uniform mat4 V;
+uniform mat4 P;
+uniform vec3 ExplosionOrigin;
+uniform float TimeSinceDeath; 
+uniform float ExplosionDuration; 
+uniform vec4 EndColor;
+uniform bool Randomness;
+uniform float RandomNumbers[50];
+uniform float RandomnessScalar;
+uniform vec2 Velocity;
+uniform bool ColorByDistance;
+uniform bool ExponentialAccelaration;
+
+in VertexData{
+	vec3 Position;
+	vec3 Normal;
+	vec2 TextureCoordinate;
+	vec4 ExplosionColor;
+}Input[];
+
+out VertexData{
+	vec3 Position;
+	vec3 Normal;
+	vec2 TextureCoordinate;
+	vec4 ExplosionColor;
+}Output;
+
+layout(triangles) in;
+layout(triangle_strip, max_vertices = 3) out;
+
+// returns a "random" number based on input parameter
+float GetRandomNumber(int polygon_index)
+{
+	int randomIndex = int(mod(polygon_index, 50));
+	
+	return RandomNumbers[randomIndex];
+}
+
+float randomNumber = 0.0;
+float randomDistance = 0.0;
+
+void main()
+{
+	// calculate middle of vectors
+	vec3 v1 = Input[1].Position - Input[0].Position;
+	vec3 v2 = Input[2].Position - Input[0].Position;
+	vec3 v3 = Input[2].Position - (v1 / 2);
+	vec3 v4 = Input[1].Position - (v2 / 2);
+	
+	// calculate intersection
+	
+	// normalize direction
+	vec3 dir1 = normalize(v1);
+	vec3 dir2 = normalize(v2);
+	
+	vec3 vecA = Input[2].Position - Input[1].Position; //o2 - o1
+	vec3 vecB = cross(dir1, dir2);
+	
+	mat3 matrisA = mat3(vecA, dir2, vecB);
+	
+	float lengthA = length(vecB);
+	lengthA = lengthA * lengthA;
+
+	float s = determinant(matrisA) / lengthA;
+	
+	// center position of triangle
+	vec3 centerOfTriangle = Input[1].Position + (s * dir1);
+	
+	// center position of triangle to origin vector
+	vec3 origin2TriangleCenterVector = centerOfTriangle - ExplosionOrigin;
+	vec3 normalizedOrigin2TriangleCenterVector = normalize(origin2TriangleCenterVector);
+	
+	// time percentage until end of explosion (0.0-1.0)
+	float timePercetage = TimeSinceDeath / ExplosionDuration;
+	
+		// get a random number if randomness is enabled, otherwise the random number will be zero and won't affect the other algorithms
+	if (Randomness == true)
+	{
+		randomDistance = GetRandomNumber(gl_PrimitiveIDIn) * RandomnessScalar;
+	}
+	
+	vec2 randomVelocity = Velocity * (randomDistance + 1.0);
+	
+	// accelaration to use on current frame. is a interpolation between start and end value
+	float currentVelocity = mix(randomVelocity.x, randomVelocity.y, timePercetage);
+	
+	if (ExponentialAccelaration == true)
+	{
+		currentVelocity = pow(currentVelocity, 2) / 2.0;
+	}
+	
+	// distance between origin and the center of the current triangle
+	float origin2TriangleCenterDistance = length(origin2TriangleCenterVector);
+	
+	// the distance from origin to the triangle center with eventual randomness added
+	float fullDistanceWithRandomness = origin2TriangleCenterDistance + randomDistance;
+
+	// vector from the triangle center to the explosion's shockwave
+	vec3 triangleCenter2ExplosionRadius = (normalizedOrigin2TriangleCenterVector * (TimeSinceDeath * currentVelocity)) - (normalizedOrigin2TriangleCenterVector * fullDistanceWithRandomness);
+	
+	// if the triangle is inside the blast radius...
+	if (fullDistanceWithRandomness <= (TimeSinceDeath * currentVelocity))
+	{
+		float maxRadius = max(TimeSinceDeath * currentVelocity, (ExplosionDuration * currentVelocity));
+		
+		float a = (randomVelocity.y - randomVelocity.x) / ExplosionDuration;
+		//float t = sqrt((2 * origin2TriangleCenterDistance) / a);
+		
+		// if explosion color should be affected by distance instead of time...
+		if (ColorByDistance == true)
+		{
+			// calculate the max distance (s) the triangle will move
+			float s = (randomVelocity.x * ExplosionDuration) + (0.5 * a * pow(ExplosionDuration, 2));
+			
+			Output.ExplosionColor = EndColor * (length(triangleCenter2ExplosionRadius) / s);
+		}
+		else
+		{
+			Output.ExplosionColor = EndColor * timePercetage;
+		}
+		
+		// for every vertex on the triangle...
+		for (int i = 0; i < gl_in.length(); i++)
+		{
+			// move the triangle to the blast radius
+			vec3 ExplodedPosition = Input[i].Position + triangleCenter2ExplosionRadius;
+			
+			// pass through vertex data
+			Output.Normal = Input[i].Normal;
+			Output.Position = Input[i].Position;
+			Output.TextureCoordinate = Input[i].TextureCoordinate;
+			
+			// convert to model space for the gravity to always be in -y
+			vec4 ExplodedPositionInModelSpace = M * vec4(ExplodedPosition, 1.0);
+			
+			// if there is gravity, apply it
+			//if (Gravity == true)
+			//{				
+			//	// ---DO THIS----> //ExplodedPositionInModelSpace.y = ExplodedPositionInModelSpace.y - TimeSinceHit;
+			//	
+			//	ExplodedPositionInModelSpace.y = ExplodedPositionInModelSpace.y - pow(TimeSinceDeath, 2);
+			//}
+			
+			// convert to screen space 
+			gl_Position = P*V * ExplodedPositionInModelSpace;
+			EmitVertex();
+		}
+	}
+	else
+	{
+		// if explosion color should be affected by distance instead of time...
+		if (ColorByDistance == true)
+		{
+			Output.ExplosionColor = vec4(0.0);
+		}
+		else
+		{
+			Output.ExplosionColor = EndColor * timePercetage;
+		}
+		
+		// for every vertex on the triangle...
+		for(int i = 0; i < gl_in.length(); i++)
+		{
+			// pass through vertex data
+			Output.Normal = Input[i].Normal;
+			Output.Position = Input[i].Position;
+			Output.TextureCoordinate = Input[i].TextureCoordinate;
+			
+			// no change in position, pass through vertex
+			gl_Position = gl_in[i].gl_Position;
+			EmitVertex();
+		}
+	}
+	
+	//EndPrimitive();
+}

resources/Shaders/ExplosionEffect.vert.glsl

@@ -0,0 +1,36 @@
+#version 430
+
+uniform mat4 M;
+uniform mat4 V;
+uniform mat4 P;
+
+layout(location = 0) in vec3 Position;
+layout(location = 1) in vec3 Normal;
+layout(location = 2) in vec3 Tangent;
+layout(location = 3) in vec3 BiTangent;
+layout(location = 4) in vec2 TextureCoords;
+layout(location = 5) in vec4 DiffuseVertexColor;
+layout(location = 6) in vec4 SpecularVertexColor;
+layout(location = 7) in vec4 BoneIndices1;
+layout(location = 8) in vec4 BoneIndices2;
+layout(location = 9) in vec4 BoneWeights1;
+layout(location = 10) in vec4 BoneWeights2;
+
+out VertexData{
+	vec3 Position;
+	vec3 Normal;
+	vec2 TextureCoordinate;
+	vec4 DiffuseColor;
+	vec4 ExplosionColor;
+}Output;
+
+void main()
+{
+	gl_Position = P*V*M * vec4(Position, 1.0);
+
+	Output.Position = Position;
+	Output.TextureCoordinate = TextureCoords;
+	Output.Normal = Normal;
+	Output.DiffuseColor = DiffuseVertexColor;
+	Output.ExplosionColor = vec4(0.0);
+}

resources/Shaders/ForwardPlus.frag.glsl

@@ -9,7 +9,9 @@ uniform vec2 ScreenDimensions;
 uniform vec4 FillColor;
 uniform float FillPercentage;
 layout (binding = 0) uniform sampler2D DiffuseTexture;
-layout (binding = 1) uniform sampler2D GlowMap;
+layout (binding = 1) uniform sampler2D NormalMapTexture;
+layout (binding = 2) uniform sampler2D SpecularMapTexture;
+layout (binding = 3) uniform sampler2D GlowMapTexture;
 
 
 #define TILE_SIZE 16
@@ -49,7 +51,10 @@ layout (std430, binding = 4) buffer LightIndexBuffer
 in VertexData{
 	vec3 Position;
 	vec3 Normal;
+	vec3 Tangent;
+	vec3 BiTangent;
 	vec2 TextureCoordinate;
+	vec4 ExplosionColor;
 }Input;
 
 out vec4 sceneColor;
@@ -101,13 +106,21 @@ LightResult CalcDirectionalLightSource(vec4 direction, vec4 color, float intensi
 	return result;
 }
 
+vec4 CalcNormalMappedValue(vec3 normal, vec3 tangent, vec3 bitangent, vec2 textureCoordinate, sampler2D normalMap)
+{
+	mat3 TBN = mat3(tangent, bitangent, normal);
+	vec3 NormalMap = texture(normalMap, textureCoordinate).xyz * 2.0 - vec3(1.0);
+	return vec4(TBN * normalize(NormalMap), 0.0);
+}
 
 void main()
 {
 	vec4 diffuseTexel = texture2D(DiffuseTexture, Input.TextureCoordinate);
-	vec4 glowTexel = texture2D(GlowMap, Input.TextureCoordinate);
+	vec4 glowTexel = texture2D(GlowMapTexture, Input.TextureCoordinate);
+	vec4 specularTexel = texture2D(SpecularMapTexture, Input.TextureCoordinate);
 	vec4 position = V * M * vec4(Input.Position, 1.0); 
-	vec4 normal = normalize(V  * vec4(Input.Normal, 0.0));
+	vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate, NormalMapTexture);
+	//vec4 normal = normalize(V  * vec4(Input.Normal, 0.0));
 	vec4 viewVec = normalize(-position); 
 
 	vec2 tilePos;
@@ -137,8 +150,8 @@ void main()
 		totalLighting.Specular += light_result.Specular;
 	}
 
-	//sceneColor += Input.DiffuseColor;
-	vec4 color_result = DiffuseColor * (totalLighting.Diffuse + totalLighting.Specular) * diffuseTexel * Color;
+	
+	vec4 color_result = (DiffuseColor + Input.ExplosionColor) * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel)) * diffuseTexel * Color;
 	
 
 	float pos = ((P * vec4(Input.Position, 1)).y + 1.0)/2.0;
@@ -146,27 +159,10 @@ void main()
 	if(pos <= FillPercentage) {
 		color_result += FillColor;
 	}
-	//bloomColor = vec4(0.3, 0.8, 0.6, 1.0);
 	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
-	//These if statements should be removed if they are slow.
 	color_result += glowTexel;
 
-
-	
-
 	bloomColor = vec4(clamp(color_result.xyz - 1.0, 0, 100), 1.0);
-	/*
-	if(color_result.x > 1 || color_result.y > 1 || color_result.z > 1) {
-		bloomColor = vec4(color_result.xyz, 1.0);
-	} else {
-		bloomColor = vec4(0.0, 0.0, 0.0, 1.0);
-	} */
-	
-	//sceneColor += Input.DiffuseColor * (totalLighting.Diffuse) * diffuseTexel * Color;
-	//sceneColor += Input.DiffuseColor + vec4(0.0, LightGrids.Data[currentTile].Amount/3, 0, 1);
-
-	
-
 
 	//Tiled Debug Code
 	/*

resources/Shaders/ForwardPlus.vert.glsl

@@ -16,7 +16,10 @@ layout(location = 6) in vec4 BoneWeights;
 out VertexData{
 	vec3 Position;
 	vec3 Normal;
+	vec3 Tangent;
+	vec3 BiTangent;
 	vec2 TextureCoordinate;
+	vec4 ExplosionColor;
 }Output;
 
 void main()
@@ -36,4 +39,7 @@ void main()
 	Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
 	Output.TextureCoordinate = TextureCoords;
 	Output.Normal = vec3(M * vec4(Normal, 0.0));
+	Output.Tangent = vec3(M * vec4(Tangent, 0.0));
+ 	Output.BiTangent = vec3(M * vec4(BiTangent, 0.0));
+	Output.ExplosionColor = vec4(0.0);
 }

resources/Shaders/Gaussian_horiz.frag.glsl

@@ -1,4 +1,5 @@
 #version 430
+#extension GL_EXT_gpu_shader4 : enable
 
 layout (binding = 0) uniform sampler2D Texture;
 
@@ -12,7 +13,7 @@ uniform float weight[5] = float[](0.227027, 0.1945946, 0.1216216, 0.054054, 0.01
 
 void main()
 {
-	vec2 tex_offset = 1.0 / textureSize(Texture, 0);
+	vec2 tex_offset = 1.0 / textureSize2D(Texture, 0);
 	vec3 result = texture(Texture, Input.TextureCoordinate).rgb * weight[0];
 
 	for(int i = 1; i < 5; ++i) {

resources/Shaders/Gaussian_vert.frag.glsl

@@ -1,4 +1,5 @@
 #version 430
+#extension GL_EXT_gpu_shader4 : enable
 
 layout (binding = 0) uniform sampler2D Texture;
 
@@ -12,7 +13,7 @@ uniform float weight[5] = float[](0.227027, 0.1945946, 0.1216216, 0.054054, 0.01
 
 void main()
 {
-	vec2 tex_offset = 1.0 / textureSize(Texture, 0);
+	vec2 tex_offset = 1.0 / textureSize2D(Texture, 0);
 	vec3 result = texture(Texture, Input.TextureCoordinate).rgb * weight[0];
 
     for(int i = 1; i < 5; ++i) {

src/Engine/Collision/CollidableOctreeSystem.cpp

@@ -8,7 +8,7 @@ void CollidableOctreeSystem::Update(double dt)
 void CollidableOctreeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
 {
     if (entity.HasComponent("AABB")) {
-        boost::optional<AABB> absoluteAABB = Collision::EntityAbsoluteAABB(entity);
+        boost::optional<EntityAABB> absoluteAABB = Collision::EntityAbsoluteAABB(entity);
         if (absoluteAABB) {
             m_Octree->AddDynamicObject(*absoluteAABB);
         }

src/Engine/Collision/Collision.cpp

@@ -239,20 +239,6 @@ bool AABBvsTriangles(const AABB& box, const std::vector<RawModel::Vertex>& model
     return hit;
 }
 
-bool IsSameBoxProbably(const AABB& first, const AABB& second, const float epsilon)
-{
-    const glm::vec3& ma1 = first.MaxCorner();
-    const glm::vec3& ma2 = second.MaxCorner();
-    const glm::vec3& mi1 = first.MinCorner();
-    const glm::vec3& mi2 = second.MinCorner();
-    return (std::abs(ma1.x - ma2.x) < epsilon) &&
-        (std::abs(mi1.x - mi2.x) < epsilon) &&
-        (std::abs(ma1.z - ma2.z) < epsilon) &&
-        (std::abs(mi1.z - mi2.z) < epsilon) &&
-        (std::abs(ma1.y - ma2.y) < epsilon) &&
-        (std::abs(mi1.y - mi2.y) < epsilon);
-}
-
 bool attachAABBComponentFromModel(World* world, EntityID id)
 {
     if (!world->HasComponent(id, "Model")) {
@@ -284,7 +270,7 @@ bool attachAABBComponentFromModel(World* world, EntityID id)
     return true;
 }
 
-boost::optional<AABB> EntityAbsoluteAABB(EntityWrapper& entity)
+boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity)
 {
     if (!entity.HasComponent("AABB")) {
         return boost::none;
@@ -295,7 +281,11 @@ boost::optional<AABB> EntityAbsoluteAABB(EntityWrapper& entity)
     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;
-    return AABB::FromOriginSize(origin, size);
+
+    EntityAABB aabb = EntityAABB::FromOriginSize(origin, size);
+    aabb.Entity = entity;
+
+    return aabb;
 }
 
 }

src/Engine/Collision/CollisionSystem.cpp

@@ -9,31 +9,29 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
     }
     ComponentWrapper& cPhysics = entity["Physics"];
 
-    boost::optional<AABB> boundingBox = Collision::EntityAbsoluteAABB(entity);
+    boost::optional<EntityAABB> boundingBox = Collision::EntityAbsoluteAABB(entity);
     if (!boundingBox) {
         return;
     }
     ComponentWrapper& cTransform = entity["Transform"];
-    AABB& boxA = *boundingBox;
+    EntityAABB& boxA = *boundingBox;
 
-    //Press 'Z' to enable/disable collision.
-    if (zPress) {
-        return;
-    }
-
-    // Collide against octree
-    std::vector<AABB> octreeResult;
-    m_Octree->ObjectsInSameRegion(*boundingBox, octreeResult);
-    for (auto& boxB : octreeResult) {
+    // Collide against octree items
+    m_OctreeResult.clear();
+    m_Octree->ObjectsInSameRegion(*boundingBox, m_OctreeResult);
+    for (auto& boxB : m_OctreeResult) {
         glm::vec3 resolutionVector;
-        if (Collision::IsSameBoxProbably(boxA, boxB)) {
+        if (boxA.Entity == boxB.Entity) {
             continue;
         }
+
         if (Collision::AABBVsAABB(boxA, boxB, resolutionVector)) {
             (glm::vec3&)cTransform["Position"] += resolutionVector;
+            if (resolutionVector.y > 0) {
                 ((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");
@@ -57,11 +55,3 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
     //    }
     //}
 }
-
-bool CollisionSystem::OnKeyUp(const Events::KeyUp & event)
-{
-    if (event.KeyCode == GLFW_KEY_Z) {
-        zPress = !zPress;
-    }
-    return false;
-}

src/Engine/Collision/TriggerSystem.cpp

@@ -3,79 +3,72 @@
 #include "Core/AABB.h"
 #include "Rendering/Model.h"
 
-void TriggerSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
+void TriggerSystem::UpdateComponent(EntityWrapper& triggerEntity, ComponentWrapper& cTrigger, double dt)
 {
-    //Currently only players can trigger things.
-    auto players = m_World->GetComponents("Player");
-    if (players == nullptr) {
-        return;
-    }
-    EntityID tId = component.EntityID;
-    boost::optional<AABB> triggerBox = Collision::EntityAbsoluteAABB(entity);
     // 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;
     }
-    for (auto& pc : *players) {
-        EntityID pId = pc.EntityID;
-        boost::optional<AABB> playerBox = Collision::EntityAbsoluteAABB(EntityWrapper(m_World, pId));
-        //The player can't trigger anything without an AABB.
-        if (!playerBox) {
-            continue;
+
+    m_OctreeOut.clear();
+    m_Octree->ObjectsInSameRegion(*triggerBox, m_OctreeOut);
+
+    for (EntityAABB& colliderBox : m_OctreeOut) {
+        EntityWrapper colliderEntity = colliderBox.Entity;
+
+        if (Collision::AABBVsAABB(*triggerBox, colliderBox)) {
+            AABB completelyInsideBox;
+            bool colliderFitsInTrigger = glm::all(glm::greaterThan((*triggerBox).Size(), colliderBox.Size()));
+            if (colliderFitsInTrigger) {
+                completelyInsideBox = AABB::FromOriginSize((*triggerBox).Origin(), (*triggerBox).Size() - 2.0f * colliderBox.Size());
             }
-        if (!Collision::AABBVsAABB(*triggerBox, *playerBox)) {
+            if (colliderFitsInTrigger && Collision::AABBVsAABB(completelyInsideBox, colliderBox)) {
+                // Entity is completely inside the trigger.
+                // If it was only touching before, it is erased.
+                m_EntitiesTouchingTrigger[triggerEntity].erase(colliderEntity);
+                auto& completeSet = m_EntitiesCompletelyInTrigger[triggerEntity];
+                if (completeSet.count(colliderEntity) == 0) {
+                    // If it wasn't completely in the trigger, throw Enter and add to the set.
+                    completeSet.insert(colliderEntity);
+                    publish<Events::TriggerEnter>(colliderEntity, triggerEntity);
+                }
+            } else {
+                // Entity is only touching the trigger.
+                auto& touchSet = m_EntitiesTouchingTrigger[triggerEntity];
+                auto& completeSet = m_EntitiesCompletelyInTrigger[triggerEntity];
+                const auto& it = completeSet.find(colliderEntity);
+                //If it was completely inside before.
+                if (it != completeSet.end()) {
+                    completeSet.erase(it);
+                    touchSet.insert(colliderEntity);
+                    //If it was completely outside before.
+                } else if (touchSet.count(colliderEntity) == 0) {
+                    publish<Events::TriggerTouch>(colliderEntity, triggerEntity);
+                    touchSet.insert(colliderEntity);
+                }
+                // Else, it was touching the trigger last frame too and nothing is done.
+            }
+        } else {
             // Entity is not touching the trigger,
             // Throw event if it was previously.
-            if (throwLeaveIfWasInTrigger(m_EntitiesTouchingTrigger[tId], pId, tId)) {
+            if (throwLeaveIfWasInTrigger(m_EntitiesTouchingTrigger[triggerEntity], colliderEntity, triggerEntity)) {
                 continue;
             }
             // This only occurs if the entity was completely inside the trigger one frame, 
             // then completely outside the trigger, e.g. when dying and respawning.
-            throwLeaveIfWasInTrigger(m_EntitiesCompletelyInTrigger[tId], pId, tId);
-        } else {
-            //Entity is at least touching the trigger.
-            AABB completelyInsideBox;
-            bool playerFitsInTrigger = glm::all(glm::greaterThan((*triggerBox).Size(), (*playerBox).Size()));
-            if (playerFitsInTrigger) {
-                completelyInsideBox = AABB::FromOriginSize((*triggerBox).Origin(), (*triggerBox).Size() - 2.0f * (*playerBox).Size());
-            }
-            if (playerFitsInTrigger && Collision::AABBVsAABB(completelyInsideBox, *playerBox)) {
-                //Entity is completely inside the trigger.
-                //If it was only touching before, it is erased.
-                m_EntitiesTouchingTrigger[tId].erase(pId);
-                std::unordered_set<EntityID>& completeSet = m_EntitiesCompletelyInTrigger[tId];
-                if (completeSet.count(pId) == 0) {
-                    //If it wasn't completely in the trigger, throw Enter and add to the set.
-                    completeSet.insert(pId);
-                    publish<Events::TriggerEnter>(pId, tId);
-                }
-            } else {
-                //Entity is only touching the trigger.
-                std::unordered_set<EntityID>& touchSet = m_EntitiesTouchingTrigger[tId];
-                std::unordered_set<EntityID>& completeSet = m_EntitiesCompletelyInTrigger[tId];
-                const auto& it = completeSet.find(pId);
-                //If it was completely inside before.
-                if (it != completeSet.end()) {
-                    completeSet.erase(it);
-                    touchSet.insert(pId);
-                    //If it was completely outside before.
-                } else if (touchSet.count(pId) == 0) {
-                    publish<Events::TriggerTouch>(pId, tId);
-                    touchSet.insert(pId);
-                }
-                //Else, it was touching the trigger last frame too and nothing is done.
-            }
+            throwLeaveIfWasInTrigger(m_EntitiesCompletelyInTrigger[triggerEntity], colliderEntity, triggerEntity);
         }
     }
 }
 
-bool TriggerSystem::throwLeaveIfWasInTrigger(std::unordered_set<EntityID>& triggerSet, EntityID pId, EntityID tId)
+bool TriggerSystem::throwLeaveIfWasInTrigger(std::unordered_set<EntityWrapper>& triggerSet, EntityWrapper colliderEntity, EntityWrapper triggerEntity)
 {
-    const auto& it = triggerSet.find(pId);
+    const auto& it = triggerSet.find(colliderEntity);
     if (it != triggerSet.end()) {
         //If it was in the trigger, but not anymore, throw leaveEvent and erase from the set.
         triggerSet.erase(it);
-        publish<Events::TriggerLeave>(pId, tId);
+        publish<Events::TriggerLeave>(colliderEntity, triggerEntity);
         return true;
     }
     return false;

src/Engine/Core/AABB.cpp

@@ -20,10 +20,6 @@ AABB::AABB(const glm::vec3& minPos, const glm::vec3& maxPos)
     }
 }
 
-AABB::AABB(const glm::vec4& minPos, const glm::vec4& maxPos)
-    : AABB(glm::vec3(minPos), glm::vec3(maxPos))
-{ }
-
 AABB AABB::FromOriginSize(const glm::vec3& origin, const glm::vec3& size)
 {
     return AABB(origin - (size/2.f), origin + (size/2.f));

src/Engine/Core/EntityFile.cpp

@@ -20,7 +20,7 @@ void EntityFile::Parse(const EntityFileHandler* handler) const
 {
     using namespace xercesc;
 
-    EntityFileSAXHandler saxHandler(handler, nullptr);
+    EntityFileSAXHandler saxHandler(handler, m_SAX2XMLReader);
     setReaderFeatures(m_SAX2XMLReader);
     m_SAX2XMLReader->setContentHandler(&saxHandler);
     m_SAX2XMLReader->setErrorHandler(&saxHandler);
@@ -37,6 +37,7 @@ void EntityFile::setReaderFeatures(xercesc::SAX2XMLReader* reader)
     reader->setFeature(XMLUni::fgSAX2CoreNameSpaces, true);
     reader->setFeature(XMLUni::fgXercesSchema, true);
     reader->setFeature(XMLUni::fgXercesSchemaFullChecking, true);
+    reader->setFeature(XMLUni::fgXercesCalculateSrcOfs, true);
 }
 
 std::size_t EntityFile::GetTypeStride(std::string typeName)
@@ -111,7 +112,8 @@ void EntityFile::WriteValueData(char* outData, const ComponentInfo::Field_t& fie
     } catch (const boost::bad_lexical_cast&) { }
 }
 
-EntityFileSAXHandler::EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader) : m_Handler(handler)
+EntityFileSAXHandler::EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader) 
+    : m_Handler(handler)
     , m_Reader(reader)
 {
     // 0 is imaginary base parent
@@ -188,21 +190,29 @@ void EntityFileSAXHandler::characters(const XMLCh* const chars, const XMLSize_t
 
 void EntityFileSAXHandler::fatalError(const xercesc::SAXParseException& e)
 {
-    XS::ToString s(e.getMessage());
-    LOG_ERROR("SAXParseException: %s", ((std::string)s).c_str());
-    //throw e;
+    std::string message = XS::ToString(e.getMessage());
+    std::string systemId = XS::ToString(e.getSystemId());
+    XMLFileLoc line = e.getLineNumber();
+    XMLFileLoc column = e.getColumnNumber();
+    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tFatal Error: %s", systemId.c_str(), line, column, message.c_str());
 }
 
 void EntityFileSAXHandler::error(const xercesc::SAXParseException& e)
 {
-    XS::ToString s(e.getMessage());
-    LOG_ERROR("SAXParseException: %s", ((std::string)s).c_str());
+    std::string message = XS::ToString(e.getMessage());
+    std::string systemId = XS::ToString(e.getSystemId());
+    XMLFileLoc line = e.getLineNumber();
+    XMLFileLoc column = e.getColumnNumber();
+    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tError: %s", systemId.c_str(), line, column, message.c_str());
 }
 
 void EntityFileSAXHandler::warning(const xercesc::SAXParseException& e)
 {
-    XS::ToString s(e.getMessage());
-    LOG_ERROR("SAXParseException: %s", ((std::string)s).c_str());
+    std::string message = XS::ToString(e.getMessage());
+    std::string systemId = XS::ToString(e.getSystemId());
+    XMLFileLoc line = e.getLineNumber();
+    XMLFileLoc column = e.getColumnNumber();
+    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tWarning: %s", systemId.c_str(), line, column, message.c_str());
 }
 
 void EntityFileSAXHandler::onStartEntity(const xercesc::Attributes& attrs)

src/Engine/Core/EntityFilePreprocessor.cpp

@@ -65,6 +65,7 @@ void EntityFilePreprocessor::parseComponentInfo()
 
         // Name
         compInfo.Name = XS::ToString(element->getName());
+        bool brk = compInfo.Name == "HiddenForLocalPlayer";
         // Known allocation
         compInfo.Meta->Allocation = m_ComponentCounts[compInfo.Name];
         // Annotation
@@ -90,7 +91,7 @@ void EntityFilePreprocessor::parseComponentInfo()
         // <xs:all>
         auto modelGroupParticle = complexTypeDefinition->getParticle();
         if (modelGroupParticle == nullptr || modelGroupParticle->getTermType() != XSParticle::TERM_MODELGROUP) {
-            //LOG_ERROR("Failed to parse component definition for \"%s\": Model group particle was null or wasn't TERM_MODELGROUP!", compInfo.Name.c_str());
+            LOG_ERROR("Failed to parse component definition for \"%s\": Model group particle was null or wasn't TERM_MODELGROUP!", compInfo.Name.c_str());
             continue;
         }
         auto modelGroup = modelGroupParticle->getModelGroupTerm();

src/Engine/Core/EntityWrapper.cpp

@@ -97,11 +97,6 @@ EntityWrapper::operator EntityID() const
     return this->ID;
 }
 
-EntityWrapper::operator bool()
-{
-    return this->Valid();
-}
-
 EntityWrapper EntityWrapper::firstChildByNameRecursive(const std::string& name, EntityID parent)
 {
     if (!this->World->ValidEntity(parent)) {

src/Engine/Core/Octree.cpp

@@ -105,8 +105,7 @@ bool Child::BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected) const
         for (int i : m_DynamicObjIndices) {
             if (!m_DynamicObjectsRef[i].Checked) {
                 const AABB& objBox = *m_DynamicObjectsRef[i].Box;
-                if (!Collision::IsSameBoxProbably(boxToTest, objBox) &&
-                    Collision::AABBVsAABB(boxToTest, objBox)) {
+                if (Collision::AABBVsAABB(boxToTest, objBox)) {
                     outBoxIntersected = objBox;
                     return true;
                 }

src/Engine/Core/Util/Logging.cpp

@@ -5,3 +5,39 @@ _LOG_LEVEL LOG_LEVEL = LOG_LEVEL_DEBUG;
 #else
 _LOG_LEVEL LOG_LEVEL = LOG_LEVEL_INFO;
 #endif
+
+const char* _LOG_LEVEL_PREFIX[] =
+{
+    "EE: ",
+	"",
+	"WW: ",
+	"DD: "
+};
+
+void _LOG(_LOG_LEVEL logLevel, const char* file, const char* func, unsigned int line, const char* format, ...)
+{
+	if (logLevel > LOG_LEVEL) {
+		return;
+	}
+
+	char* message = nullptr;
+	va_list args;
+
+	va_start(args, format);
+	size_t size = vsnprintf(message, 0, format, args) + 1;
+	va_end(args);
+
+	va_start(args, format);
+	message = new char[size];
+	vsnprintf(message, size, format, args);
+	va_end(args);
+
+	if (logLevel == LOG_LEVEL_ERROR) {
+		std::cerr << file << ":" << line << " " << func << std::endl;
+		std::cerr << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
+	} else {
+		std::cout << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
+	}
+
+	delete[] message;
+}

src/Engine/Core/World.cpp

@@ -54,8 +54,12 @@ ComponentWrapper World::AttachComponent(EntityID entity, const std::string& comp
 
 bool World::HasComponent(EntityID entity, const std::string& componentType) const
 {
-    ComponentPool* pool = m_ComponentPools.at(componentType);
-    return pool->KnowsEntity(entity);
+    auto it = m_ComponentPools.find(componentType);
+    if (it == m_ComponentPools.end()) {
+        return false;
+    } else {
+        return it->second->KnowsEntity(entity);
+    }
 }
 
 ComponentWrapper World::GetComponent(EntityID entity, const std::string& componentType)

src/Engine/Editor/EditorRenderSystem.cpp

@@ -12,7 +12,7 @@ EditorRenderSystem::EditorRenderSystem(World* m_World, EventBroker* eventBroker,
 
 void EditorRenderSystem::Update(double dt)
 {
-    if (m_CurrentCamera) {
+    if (m_CurrentCamera.Valid()) {
         ComponentWrapper cameraTransform = m_CurrentCamera["Transform"];
         m_EditorCamera->SetPosition(cameraTransform["Position"]);
         m_EditorCamera->SetOrientation(glm::quat((const glm::vec3&)cameraTransform["Orientation"]));
@@ -49,7 +49,11 @@ void EditorRenderSystem::Update(double dt)
             glm::mat4 modelMatrix = Transform::ModelMatrix(entity.ID, entity.World);
             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);
-                scene.ForwardJobs.push_back(modelJob);
+                if(cModel["Transparent"]) {
+                    scene.TransparentObjects.push_back(modelJob);
+                } else {
+                    scene.OpaqueObjects.push_back(modelJob);
+                }
             }
         }
     }

src/Engine/Editor/EditorWidgetSystem.cpp

@@ -30,7 +30,7 @@ void EditorWidgetSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper
 
     auto camera = m_PickData.Camera;
     glm::vec3 axis = cEditorWidget["Axis"];
-    glm::vec2 axisScreen = camera->WorldToScreen(axis, m_Renderer->Resolution()) - camera->WorldToScreen(glm::vec3(0, 0, 0), m_Renderer->Resolution());
+    glm::vec2 axisScreen = camera->WorldToScreen(axis, m_Renderer->GetViewPortSize()) - camera->WorldToScreen(glm::vec3(0, 0, 0), m_Renderer->GetViewPortSize());
     float dot = glm::dot(m_MouseDelta, glm::normalize(axisScreen)) / glm::length(axisScreen);
     glm::vec3 worldMovement = dot * axis;
 

src/Engine/Rendering/DrawBloomPass.cpp

@@ -13,7 +13,7 @@ DrawBloomPass::DrawBloomPass(IRenderer* renderer)
 
 void DrawBloomPass::InitializeTextures()
 {
-    m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/Blank.png");
+    m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/White.png");
 }
 
 void DrawBloomPass::InitializeShaderPrograms()
@@ -34,12 +34,12 @@ void DrawBloomPass::InitializeShaderPrograms()
 
 void DrawBloomPass::InitializeBuffers()
 {
-    GenerateTexture(&m_GaussianTexture_horiz, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->Resolution().Width, m_Renderer->Resolution().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
+    GenerateTexture(&m_GaussianTexture_horiz, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewPortSize().Width, m_Renderer->GetViewPortSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
 
     m_GaussianFrameBuffer_horiz.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_GaussianTexture_horiz, GL_COLOR_ATTACHMENT0)));
     m_GaussianFrameBuffer_horiz.Generate();
 
-    GenerateTexture(&m_GaussianTexture_vert, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->Resolution().Width, m_Renderer->Resolution().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
+    GenerateTexture(&m_GaussianTexture_vert, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewPortSize().Width, m_Renderer->GetViewPortSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
 
     m_GaussianFrameBuffer_vert.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_GaussianTexture_vert, GL_COLOR_ATTACHMENT0)));
     m_GaussianFrameBuffer_vert.Generate();

src/Engine/Rendering/DrawFinalPass.cpp

@@ -11,20 +11,22 @@ DrawFinalPass::DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCulling
 
 void DrawFinalPass::InitializeTextures()
 {
-    m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/Blank.png");
+    m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/White.png");
     m_BlackTexture = ResourceManager::Load<Texture>("Textures/Core/Black.png");
+    m_NeutralNormalTexture = ResourceManager::Load<Texture>("Textures/Core/NeutralNormalMap.png");
+    m_GreyTexture = ResourceManager::Load<Texture>("Textures/Core/Grey.png");
 }
 
 void DrawFinalPass::InitializeFrameBuffers()
 {
     glGenRenderbuffers(1, &m_DepthBuffer);
     glBindRenderbuffer(GL_RENDERBUFFER, m_DepthBuffer);
-    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, m_Renderer->Resolution().Width, m_Renderer->Resolution().Height);
+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, m_Renderer->GetViewPortSize().Width, m_Renderer->GetViewPortSize().Height);
 
-    GenerateTexture(&m_SceneTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->Resolution().Width, m_Renderer->Resolution().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
-    //GenerateTexture(&m_BloomTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->Resolution().Width, m_Renderer->Resolution().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
-    GenerateTexture(&m_BloomTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->Resolution().Width, m_Renderer->Resolution().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
-    //GenerateMipMapTexture(&m_BloomTexture, GL_CLAMP_TO_EDGE, glm::vec2(m_Renderer->Resolution().Width, m_Renderer->Resolution().Height), GL_RGB16F, GL_FLOAT, 4);
+    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);
 
     m_FinalPassFrameBuffer.AddResource(std::shared_ptr<BufferResource>(new RenderBuffer(&m_DepthBuffer, GL_DEPTH_ATTACHMENT)));
     m_FinalPassFrameBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_SceneTexture, GL_COLOR_ATTACHMENT0)));
@@ -42,6 +44,15 @@ void DrawFinalPass::InitializeShaderPrograms()
     m_ForwardPlusProgram->BindFragDataLocation(0, "sceneColor");
     m_ForwardPlusProgram->BindFragDataLocation(1, "bloomColor");
     m_ForwardPlusProgram->Link();
+
+    m_ExplosionEffectProgram = ResourceManager::Load<ShaderProgram>("#ExplosionEffectProgram");
+    m_ExplosionEffectProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/ForwardPlus.vert.glsl")));
+    m_ExplosionEffectProgram->AddShader(std::shared_ptr<Shader>(new GeometryShader("Shaders/ExplosionEffect.geom.glsl")));
+    m_ExplosionEffectProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/ForwardPlus.frag.glsl")));
+    m_ExplosionEffectProgram->Compile();
+    m_ExplosionEffectProgram->BindFragDataLocation(0, "sceneColor");
+    m_ExplosionEffectProgram->BindFragDataLocation(1, "bloomColor");
+    m_ExplosionEffectProgram->Link();
 }
 
 void DrawFinalPass::Draw(RenderScene& scene)
@@ -49,69 +60,15 @@ void DrawFinalPass::Draw(RenderScene& scene)
     GLERROR("DrawFinalPass::Draw: Pre");
 
     DrawFinalPassState* state = new DrawFinalPassState(m_FinalPassFrameBuffer.GetHandle());
-
-    m_ForwardPlusProgram->Bind();
-    GLuint shaderHandle = m_ForwardPlusProgram->GetHandle();
-
     if (scene.ClearDepth) {
         glClear(GL_DEPTH_BUFFER_BIT);
     }
 
-    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());
+    DrawModelRenderQueues(scene.OpaqueObjects, scene);
+    GLERROR("DrawFinalPass::Draw: OpaqueObjects");
+    DrawModelRenderQueues(scene.TransparentObjects, scene);
+    GLERROR("DrawFinalPass::Draw: TransparentObjects");
 
-    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()));
-    glUniform2f(glGetUniformLocation(shaderHandle, "ScreenDimensions"), m_Renderer->Resolution().Width, m_Renderer->Resolution().Height);
-
-
-    //TODO: Render: Add code for more jobs than modeljobs.
-    for (auto &job : scene.ForwardJobs) {
-        auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
-        if(modelJob) {
-            //TODO: Kolla upp "header/include/common" shader saken så man slipper skicka in asmycket uniforms
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
-            glUniform4fv(glGetUniformLocation(shaderHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
-            glUniform4fv(glGetUniformLocation(shaderHandle, "DiffuseColor"), 1, glm::value_ptr(modelJob->DiffuseColor));
-
-            glUniform4fv(glGetUniformLocation(shaderHandle, "FillColor"), 1, glm::value_ptr(modelJob->FillColor));
-            glUniform1f(glGetUniformLocation(shaderHandle, "FillPercentage"), modelJob->FillPercentage);
-
-
-            glActiveTexture(GL_TEXTURE0);
-            if(modelJob->DiffuseTexture != nullptr) {
-                glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture->m_Texture);
-            } else {
-                glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
-            }
-            glActiveTexture(GL_TEXTURE1);
-            if (modelJob->IncandescenceTexture != nullptr) {
-                glBindTexture(GL_TEXTURE_2D, modelJob->IncandescenceTexture->m_Texture);
-            } else {
-                glBindTexture(GL_TEXTURE_2D, m_BlackTexture->m_Texture);
-            }
-
-            /*if(modelJob->GlowMap != nullptr) {
-            glBindTexture(GL_TEXTURE_2D, modelJob->GlowMap->m_Texture);
-            } else {
-            glBindTexture(GL_TEXTURE_2D, m_BlackTexture->m_Texture);
-            }*/
-
-            //TODO: Fixa så att modelsJobs kan spela upp olika animationer och så att den kan få in en tid istället för 1.0f - Hälsningar Johan och Andreas :)
-            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)));
-        }
-    }
     GLERROR("DrawFinalPass::Draw: END");
     delete state;
 }
@@ -150,3 +107,151 @@ void DrawFinalPass::GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm:
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
     GLERROR("MipMap Texture initialization failed");
 }
+
+void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& job, RenderScene& scene)
+{
+    GLuint forwardHandle = m_ForwardPlusProgram->GetHandle();
+    GLuint explosionHandle = m_ExplosionEffectProgram->GetHandle();
+
+    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 : job)
+    {
+        auto explosionEffectJob = std::dynamic_pointer_cast<ExplosionEffectJob>(job);
+        if(explosionEffectJob) {
+            //Bind program
+            m_ExplosionEffectProgram->Bind();
+
+            //Bind uniforms
+            BindExplosionUniforms(explosionHandle, explosionEffectJob, scene);
+
+            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]));
+                }
+            }
+
+            //bind textures
+            BindExplosionTextures(explosionEffectJob);
+            //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)));
+
+        } else {
+            auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
+            if (modelJob) {
+                //bind forward program
+                m_ForwardPlusProgram->Bind();
+
+                //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)));
+                GLERROR("DrawFinalPass::Model: END");
+            }
+        }
+    }
+
+}
+
+void DrawFinalPass::BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job, RenderScene& scene)
+{
+    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()));
+    glUniform2f(glGetUniformLocation(shaderHandle, "ScreenDimensions"), m_Renderer->Resolution().Width, m_Renderer->Resolution().Height);
+
+    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(job->Matrix));
+    glUniform4fv(glGetUniformLocation(shaderHandle, "Color"), 1, glm::value_ptr(job->Color));
+    glUniform3fv(glGetUniformLocation(shaderHandle, "ExplosionOrigin"), 1, glm::value_ptr(job->ExplosionOrigin));
+    glUniform1f(glGetUniformLocation(shaderHandle, "TimeSinceDeath"), job->TimeSinceDeath);
+    glUniform1f(glGetUniformLocation(shaderHandle, "ExplosionDuration"), job->ExplosionDuration);
+    glUniform4fv(glGetUniformLocation(shaderHandle, "EndColor"), 1, glm::value_ptr(job->EndColor));
+    glUniform1i(glGetUniformLocation(shaderHandle, "Randomness"), job->Randomness);
+    glUniform1f(glGetUniformLocation(shaderHandle, "RandomnessScalar"), job->RandomnessScalar);
+    glUniform2fv(glGetUniformLocation(shaderHandle, "Velocity"), 1, glm::value_ptr(job->Velocity));
+    glUniform1i(glGetUniformLocation(shaderHandle, "ColorByDistance"), job->ColorByDistance);
+    glUniform1i(glGetUniformLocation(shaderHandle, "ExponentialAccelaration"), job->ExponentialAccelaration);
+    glUniform4fv(glGetUniformLocation(shaderHandle, "DiffuseColor"), 1, glm::value_ptr(job->DiffuseColor));
+    glUniform1fv(glGetUniformLocation(shaderHandle, "RandomNumbers"), 50, job->RandomNumbers.data());
+}
+
+void DrawFinalPass::BindModelUniforms(GLuint shaderHandle, std::shared_ptr<ModelJob>& job, RenderScene& scene)
+{
+    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()));
+    glUniform2f(glGetUniformLocation(shaderHandle, "ScreenDimensions"), m_Renderer->Resolution().Width, m_Renderer->Resolution().Height);
+
+    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(job->Matrix));
+    glUniform4fv(glGetUniformLocation(shaderHandle, "Color"), 1, glm::value_ptr(job->Color));
+    glUniform4fv(glGetUniformLocation(shaderHandle, "DiffuseColor"), 1, glm::value_ptr(job->DiffuseColor));
+    glUniform4fv(glGetUniformLocation(shaderHandle, "FillColor"), 1, glm::value_ptr(job->FillColor));
+    glUniform1f(glGetUniformLocation(shaderHandle, "FillPercentage"), job->FillPercentage);
+}
+
+
+void DrawFinalPass::BindExplosionTextures(std::shared_ptr<ExplosionEffectJob>& job)
+{
+    glActiveTexture(GL_TEXTURE0);
+    if (job->DiffuseTexture != nullptr) {
+        glBindTexture(GL_TEXTURE_2D, job->DiffuseTexture->m_Texture);
+    } else {
+        glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
+    }
+    glActiveTexture(GL_TEXTURE1);
+    if (job->IncandescenceTexture != nullptr) {
+        glBindTexture(GL_TEXTURE_2D, job->IncandescenceTexture->m_Texture);
+    } else {
+        glBindTexture(GL_TEXTURE_2D, m_BlackTexture->m_Texture);
+    }
+}
+
+void DrawFinalPass::BindModelTextures(std::shared_ptr<ModelJob>& job)
+{
+    glActiveTexture(GL_TEXTURE0);
+    if (job->DiffuseTexture != nullptr) {
+        glBindTexture(GL_TEXTURE_2D, job->DiffuseTexture->m_Texture);
+    } else {
+        glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
+    }
+
+    glActiveTexture(GL_TEXTURE1);
+    if (job->NormalTexture != nullptr) {
+        glBindTexture(GL_TEXTURE_2D, job->NormalTexture->m_Texture); 
+    } else {
+        glBindTexture(GL_TEXTURE_2D, m_NeutralNormalTexture->m_Texture);
+    }
+
+    glActiveTexture(GL_TEXTURE2);
+    if (job->SpecularTexture != nullptr) {
+        glBindTexture(GL_TEXTURE_2D, job->SpecularTexture->m_Texture);
+    } else {
+        glBindTexture(GL_TEXTURE_2D, m_GreyTexture->m_Texture);
+    }
+
+    glActiveTexture(GL_TEXTURE3);
+    if (job->IncandescenceTexture != nullptr) {
+        glBindTexture(GL_TEXTURE_2D, job->IncandescenceTexture->m_Texture);
+    } else {
+        glBindTexture(GL_TEXTURE_2D, m_BlackTexture->m_Texture);
+    }
+}
+

src/Engine/Rendering/LightCullingPass.cpp

@@ -25,8 +25,8 @@ void LightCullingPass::GenerateNewFrustum(RenderScene& scene)
 
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, m_FrustumSSBO);
     glUniformMatrix4fv(glGetUniformLocation(m_CalculateFrustumProgram->GetHandle(), "P"), 1, false, glm::value_ptr(scene.Camera->ProjectionMatrix()));
-    glUniform2f(glGetUniformLocation(m_CalculateFrustumProgram->GetHandle(), "ScreenDimensions"), m_Renderer->Resolution().Width, m_Renderer->Resolution().Height);
-    glDispatchCompute((int)(m_Renderer->Resolution().Width/(TILE_SIZE*TILE_SIZE) + 1), (int)(m_Renderer->Resolution().Height/(TILE_SIZE*TILE_SIZE) + 1), 1);
+    glUniform2f(glGetUniformLocation(m_CalculateFrustumProgram->GetHandle(), "ScreenDimensions"), m_Renderer->GetViewPortSize().Width, m_Renderer->GetViewPortSize().Height);
+    glDispatchCompute((int)(m_Renderer->GetViewPortSize().Width/(TILE_SIZE*TILE_SIZE) + 1), (int)(m_Renderer->GetViewPortSize().Height/(TILE_SIZE*TILE_SIZE) + 1), 1);
 
     GLERROR("CalculateFrustum Error: End");
 }
@@ -40,7 +40,7 @@ void LightCullingPass::OnResolutionChange()
 
 void LightCullingPass::SetSSBOSizes()
 {
-    m_NumberOfTiles = (int)(m_Renderer->Resolution().Width/TILE_SIZE) * (int)(m_Renderer->Resolution().Height/TILE_SIZE);
+    m_NumberOfTiles = (int)(m_Renderer->GetViewPortSize().Width/TILE_SIZE) * (int)(m_Renderer->GetViewPortSize().Height/TILE_SIZE);
 
     m_Frustums = new Frustum[m_NumberOfTiles];
     m_LightGrid = new LightGrid[m_NumberOfTiles];
@@ -67,14 +67,14 @@ void LightCullingPass::CullLights(RenderScene& scene)
     glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
 
     m_LightCullProgram->Bind();
-    glUniform2f(glGetUniformLocation(m_LightCullProgram->GetHandle(), "ScreenDimensions"), m_Renderer->Resolution().Width, m_Renderer->Resolution().Height);
+    glUniform2f(glGetUniformLocation(m_LightCullProgram->GetHandle(), "ScreenDimensions"), m_Renderer->GetViewPortSize().Width, m_Renderer->GetViewPortSize().Height);
     glUniformMatrix4fv(glGetUniformLocation(m_LightCullProgram->GetHandle(), "V"), 1, false, glm::value_ptr(scene.Camera->ViewMatrix()));
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, m_FrustumSSBO);
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, m_LightSSBO);
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightGridSSBO);
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, m_LightOffsetSSBO);
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, m_LightIndexSSBO);
-    glDispatchCompute(glm::ceil(m_Renderer->Resolution().Width / TILE_SIZE), glm::ceil(m_Renderer->Resolution().Height / TILE_SIZE), 1);
+    glDispatchCompute(glm::ceil(m_Renderer->GetViewPortSize().Width/ TILE_SIZE), glm::ceil(m_Renderer->GetViewPortSize().Height / TILE_SIZE), 1);
 
     GLERROR("CullLights Error: End");
 }

src/Engine/Rendering/PickingPass.cpp

@@ -18,14 +18,14 @@ PickingPass::~PickingPass()
 void PickingPass::InitializeTextures()
 {
     GenerateTexture(&m_PickingTexture, GL_CLAMP_TO_BORDER, GL_LINEAR,
-        glm::vec2(m_Renderer->Resolution().Width, m_Renderer->Resolution().Height), GL_RG8, GL_RG, GL_UNSIGNED_BYTE);
+        glm::vec2(m_Renderer->GetViewPortSize().Width, m_Renderer->GetViewPortSize().Height), GL_RG8, GL_RG, GL_UNSIGNED_BYTE);
 }
 
 void PickingPass::InitializeFrameBuffers()
 {
     glGenRenderbuffers(1, &m_DepthBuffer);
     glBindRenderbuffer(GL_RENDERBUFFER, m_DepthBuffer);
-    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, m_Renderer->Resolution().Width, m_Renderer->Resolution().Height);
+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, m_Renderer->GetViewPortSize().Width, m_Renderer->GetViewPortSize().Height);
 
     m_PickingBuffer.AddResource(std::shared_ptr<BufferResource>(new RenderBuffer(&m_DepthBuffer, GL_DEPTH_ATTACHMENT)));
     m_PickingBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_PickingTexture, GL_COLOR_ATTACHMENT0)));
@@ -56,7 +56,53 @@ void PickingPass::Draw(RenderScene& scene)
     }
     m_Camera = scene.Camera;
 
-    for (auto &job : scene.ForwardJobs) {
+    for (auto &job : scene.OpaqueObjects) {
+        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] += 5;
+                } else {
+                        m_ColorCounter[0] += 50;
+                }
+            }
+
+            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.TransparentObjects) {
         auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
 
         if (modelJob) {

src/Engine/Rendering/RawModelCustom.cpp

@@ -341,22 +341,16 @@ void RawModelCustom::ReadAnimationClipSingle(unsigned int &offset, char* fileDat
     unsigned int nrOfKeyframes = *(unsigned int*)(fileData + offset);
     offset += sizeof(unsigned int);
 
-    if (offset + sizeof(unsigned int) > fileByteSize) {
-        throw Resource::FailedLoadingException("Reading AnimationClip NrOfJoints failed");
-    }
-    unsigned int nrOfJoints = *(unsigned int*)(fileData + offset);
-    offset += sizeof(unsigned int);
-
     newAnimation.Keyframes.reserve(nrOfKeyframes);
     for (unsigned int i = 0; i < nrOfKeyframes; i++) { 
-        ReadAnimationKeyFrame(offset, fileData, fileByteSize, nrOfJoints, newAnimation);
+        ReadAnimationKeyFrame(offset, fileData, fileByteSize, newAnimation);
     }
     m_Skeleton->Animations[newAnimation.Name] = newAnimation;
 #else
 #endif
 }
 
-void RawModelCustom::ReadAnimationKeyFrame(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int nrOfJoints, Skeleton::Animation& animation)
+void RawModelCustom::ReadAnimationKeyFrame(unsigned int &offset, char* fileData, unsigned int& fileByteSize, Skeleton::Animation& animation)
 {
     Skeleton::Animation::Keyframe newKeyFrame;
 
@@ -372,6 +366,12 @@ void RawModelCustom::ReadAnimationKeyFrame(unsigned int &offset, char* fileData,
     newKeyFrame.Time = *(float*)(fileData + offset);
     offset += sizeof(float);
 
+    if (offset + sizeof(unsigned int) > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading AnimationKeyFrame NrOfJoints failed");
+    }
+    unsigned int nrOfJoints = *(unsigned int*)(fileData + offset);
+    offset += sizeof(unsigned int);
+
     if (offset + sizeof(Skeleton::Animation::Keyframe::BoneProperty) * nrOfJoints> fileByteSize) {
         throw Resource::FailedLoadingException("Reading AnimationKeyFrame joints failed");
     }

src/Engine/Rendering/RenderSystem.cpp

@@ -31,33 +31,41 @@ bool RenderSystem::OnSetCamera(Events::SetCamera& e)
     return true;
 }
 
-void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& jobs)
+bool RenderSystem::isChildOfACamera(EntityWrapper entity)
+{
+    return entity.FirstParentWithComponent("Camera").Valid();
+}
+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)
 {
     auto models = m_World->GetComponents("Model");
     if (models == nullptr) {
         return;
     }
 
-    for (auto& modelComponent : *models) {
-        bool visible = modelComponent["Visible"];
+    for (auto& cModel : *models) {
+        bool visible = cModel["Visible"];
         if (!visible) {
             continue;
         }
-        std::string resource = modelComponent["Resource"];
+        std::string resource = cModel["Resource"];
         if (resource.empty()) {
             continue;
         }
 
-        EntityWrapper entity(m_World, modelComponent.EntityID);
+        EntityWrapper entity(m_World, cModel.EntityID);
 
-        // Don't render the local player
-        if (entity == m_LocalPlayer || entity.IsChildOf(m_LocalPlayer)) {
-            if (!entity.HasComponent("HealthHUD") && entity.Name() != "Crosshair" && entity.Name() != "Weapon") { //Should work but needs to be fixed. Should only render the things "childed" to the local player camera
+        // Only render children of a camera if that camera is currently active
+        if (isChildOfACamera(entity) && !isChildOfCurrentCamera(entity)) {
             continue;
         }
-        }
 
-        if ((entity.Name() == "Weapon" || entity.HasComponent("HealthHUD")) && !entity.IsChildOf(m_LocalPlayer)) {
+        // Hide things parented to local player if they have the HiddenFromLocalPlayer component
+        if (entity.HasComponent("HiddenForLocalPlayer") && (entity == m_LocalPlayer || entity.IsChildOf(m_LocalPlayer))) {
             continue;
         }
 
@@ -75,22 +83,58 @@ void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& jobs)
             }
         }
 
-
         float fillPercentage = 0.f;
         glm::vec4 fillColor = glm::vec4(0);
-
-        if(m_World->HasComponent(modelComponent.EntityID, "Fill")) {
-            auto fillComponent = m_World->GetComponent(modelComponent.EntityID, "Fill");
+        if(m_World->HasComponent(cModel.EntityID, "Fill")) {
+            auto fillComponent = m_World->GetComponent(cModel.EntityID, "Fill");
             fillPercentage = (float)(double)fillComponent["Percentage"];
             fillColor = (glm::vec4)fillComponent["Color"];
         }
 
-        
-
-        glm::mat4 modelMatrix = Transform::ModelMatrix(modelComponent.EntityID, m_World);
+        glm::mat4 modelMatrix = Transform::ModelMatrix(cModel.EntityID, m_World);
         for (auto matGroup : model->MaterialGroups()) {
-            std::shared_ptr<ModelJob> modelJob = std::shared_ptr<ModelJob>(new ModelJob(model, m_Camera, modelMatrix, matGroup, modelComponent, m_World, fillColor, fillPercentage));
-            jobs.push_back(modelJob);
+            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(
+                    explosionEffectComponent, 
+                    model, 
+                    m_Camera, 
+                    modelMatrix, 
+                    matGroup, 
+                    cModel, 
+                    m_World, 
+                    fillColor, 
+                    fillPercentage
+                ));
+                if(explosionEffectJob->Color.a != 1.f || explosionEffectJob->EndColor.a != 1.f || explosionEffectJob->DiffuseColor.a != 1.f) {
+                    cModel["Transparent"] = true;
+                }
+
+                if (cModel["Transparent"]) {
+                    transparentJobs.push_back(explosionEffectJob);
+                } else {
+                    opaqueJobs.push_back(explosionEffectJob);
+                }
+            } else {
+                std::shared_ptr<ModelJob> modelJob = std::shared_ptr<ModelJob>(new ModelJob(
+                    model, 
+                    m_Camera, 
+                    modelMatrix, 
+                    matGroup, 
+                    cModel, 
+                    m_World, 
+                    fillColor, 
+                    fillPercentage
+                ));
+                if (modelJob->Color.a != 1.f || modelJob->DiffuseColor.a != 1.f) {
+                    cModel["Transparent"] = true;
+                }
+                if (cModel["Transparent"]) {
+                    transparentJobs.push_back(modelJob);
+                } else {
+                    opaqueJobs.push_back(modelJob);
+                }
+            }
         }
     }
 }
@@ -200,7 +244,7 @@ void RenderSystem::Update(double dt)
     RenderScene scene;
     scene.Camera = m_Camera;
     scene.Viewport = Rectangle(1280, 720);
-    fillModels(scene.ForwardJobs);
+    fillModels(scene.OpaqueObjects, scene.TransparentObjects);
     fillPointLights(scene.PointLightJobs, m_World);
     fillDirectionalLights(scene.DirectionalLightJobs, m_World);
     fillText(scene.TextJobs, m_World);

src/Engine/Rendering/Renderer.cpp

@@ -58,11 +58,25 @@ void Renderer::InitializeWindow()
 		LOG_ERROR("GLEW: Initialization failed");
 		exit(EXIT_FAILURE);
 	}
+
+    int res[2];
+    glfwGetWindowSize(m_Window, &res[0], &res[1]);
+    SetViewPortSize(Rectangle::Rectangle(res[0], res[1]));
+
 }
 
 void Renderer::InitializeShaders()
 {
     m_BasicForwardProgram = ResourceManager::Load<ShaderProgram>("#m_BasicForwardProgram");
+    m_ExplosionEffectProgram = ResourceManager::Load<ShaderProgram>("#ExplosionEffectProgram");
+    //m_ExplosionEffectProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/ExplosionEffect.vert.glsl")));
+    //m_ExplosionEffectProgram->AddShader(std::shared_ptr<Shader>(new GeometryShader("Shaders/ExplosionEffect.geom.glsl")));
+    //m_ExplosionEffectProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/ExplosionEffect.frag.glsl")));
+    //m_ExplosionEffectProgram->Compile();
+    //m_ExplosionEffectProgram->Link();
+
+
+
 }
 
 void Renderer::InputUpdate(double dt)
@@ -98,6 +112,7 @@ void Renderer::Draw(RenderFrame& frame)
         m_LightCullingPass->FillLightList(*scene);
         m_LightCullingPass->CullLights(*scene);
         m_DrawFinalPass->Draw(*scene);
+        //m_DrawScenePass->Draw(*scene);
 
         GLERROR("Renderer::Draw m_DrawScenePass->Draw");
 
@@ -133,14 +148,14 @@ PickData Renderer::Pick(glm::vec2 screenCoord)
 void Renderer::InitializeTextures()
 {
     m_ErrorTexture = ResourceManager::Load<Texture>("Textures/Core/ErrorTexture.png");
-    m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/Blank.png");
+    m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/White.png");
 }
 
 
 void Renderer::SortRenderJobsByDepth(RenderScene &scene)
 {
     //Sort all forward jobs so transparency is good.
-    scene.ForwardJobs.sort(Renderer::DepthSort);
+    scene.TransparentObjects.sort(Renderer::DepthSort);
 }
 
 void Renderer::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type)

src/Game/Game.cpp

@@ -1,5 +1,6 @@
 #include "Game.h"
 #include "Collision/CollidableOctreeSystem.h"
+#include "Collision/EntityAABB.h"
 #include "Collision/TriggerSystem.h"
 #include "Collision/CollisionSystem.h"
 #include "Systems/RaptorCopterSystem.h"
@@ -72,14 +73,15 @@ Game::Game(int argc, char* argv[])
 
 
     // Create Octrees
-    m_OctreeCollision = new Octree<AABB>(AABB(glm::vec3(-100), glm::vec3(100)), 4);
-    m_OctreeFrustrumCulling = new Octree<AABB>(AABB(glm::vec3(-100), glm::vec3(100)), 4);
+    m_OctreeCollision = new Octree<EntityAABB>(AABB(glm::vec3(-100), glm::vec3(100)), 4);
+    m_OctreeFrustrumCulling = new Octree<EntityAABB>(AABB(glm::vec3(-100), glm::vec3(100)), 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<RaptorCopterSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<ExplosionEffectSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<HealthSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PlayerMovementSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<InterpolationSystem>(updateOrderLevel);
@@ -87,6 +89,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<PlayerSpawnSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<WeaponSystem>(updateOrderLevel, m_Renderer);
     m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeCollision);
@@ -98,7 +101,6 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<CollisionSystem>(updateOrderLevel, m_OctreeCollision);
     m_SystemPipeline->AddSystem<TriggerSystem>(updateOrderLevel, m_OctreeCollision);
     ++updateOrderLevel;
-    m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<RenderSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<EditorSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);

src/Game/Systems/CapturePointSystem.cpp

@@ -13,27 +13,27 @@ CapturePointSystem::CapturePointSystem(World* world, EventBroker* eventBroker)
 
 //here all capturepoints will update their component
 //NOTE: needs to run each frame, since we're possibly modifying the captureTimer for the capturePoints by dt
-void CapturePointSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt)
+void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, ComponentWrapper& cCapturePoint, double dt)
 {
     if (m_WinnerWasFound) {
         return;
     }
-    const int capturePointNumber = capturePoint["CapturePointNumber"];
-    const bool hasTeamComponent = m_World->HasComponent(capturePoint.EntityID, "Team");
+    const int capturePointNumber = cCapturePoint["CapturePointNumber"];
+    const bool hasTeamComponent = capturePointEntity.HasComponent("Team");
 
     //if point doesnt have a teamComponent yet, add one. since:
     //what if capture point has no team -> we cant get/use the team enum from it...
     if (!hasTeamComponent) {
-        m_World->AttachComponent(capturePoint.EntityID, "Team");
-        ComponentWrapper& teamComponent = m_World->GetComponent(capturePoint.EntityID, "Team");
+        m_World->AttachComponent(cCapturePoint.EntityID, "Team");
+        ComponentWrapper& teamComponent = capturePointEntity["Team"];
         teamComponent["Team"] = (int)teamComponent["Team"].Enum("Spectator");
     }
-    ComponentWrapper& teamComponent = m_World->GetComponent(capturePoint.EntityID, "Team");
+    ComponentWrapper& teamComponent = capturePointEntity["Team"];
     const int redTeam = (int)teamComponent["Team"].Enum("Red");
     const int blueTeam = (int)teamComponent["Team"].Enum("Blue");
     const int spectatorTeam = (int)teamComponent["Team"].Enum("Spectator");
 
-    int homePointForTeam = (int)capturePoint["HomePointForTeam"];
+    int homePointForTeam = (int)cCapturePoint["HomePointForTeam"];
     if (m_NumberOfCapturePoints == 0 && capturePointNumber != 0 && (homePointForTeam == redTeam || homePointForTeam == blueTeam)) {
         m_NumberOfCapturePoints = capturePointNumber + 1;//ex 2 -> 0,1,2 = 3
         if (homePointForTeam == redTeam) {
@@ -46,8 +46,8 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper
     }
 
     //if we havent received all capturepoints yet, just return
-    if (m_NumberOfCapturePoints == 0 || m_NumberOfCapturePoints != m_CapturePointNumberToEntityIDMap.size()) {
-        m_CapturePointNumberToEntityIDMap.insert(std::make_pair(capturePointNumber, capturePoint.EntityID));
+    if (m_NumberOfCapturePoints == 0 || m_NumberOfCapturePoints != m_CapturePointNumberToEntityMap.size()) {
+        m_CapturePointNumberToEntityMap.insert(std::make_pair(capturePointNumber, capturePointEntity));
         return;
     }
 
@@ -55,9 +55,9 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper
     int ownedBy = teamComponent["Team"];
     int redTeamPlayersStandingInside = 0;
     int blueTeamPlayersStandingInside = 0;
-    if (entity.HasComponent("Model")) {
+    if (capturePointEntity.HasComponent("Model")) {
         //Now sets team color to the capturepoint, or white if it is uncaptured.
-        entity["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, 1) : ownedBy == redTeam ? glm::vec4(1, 0.2f, 0, 1) : glm::vec4(1, 1, 1, 1);
     }
 
     //calculate next possible capturePoint for both teams
@@ -66,10 +66,10 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper
     nextPossibleCapturePoint["Blue"] = -1;
     for (size_t i = 0; i < m_NumberOfCapturePoints; i++)
     {
-        if (!m_World->HasComponent(m_CapturePointNumberToEntityIDMap[i], "Team")) {
+        if (m_CapturePointNumberToEntityMap[i].HasComponent("Team")) {
             continue;
         }
-        ComponentWrapper& capturePointOwnedBy = m_World->GetComponent(m_CapturePointNumberToEntityIDMap[i], "Team");
+        ComponentWrapper& capturePointOwnedBy = m_CapturePointNumberToEntityMap[i]["Team"];
         if ((int)capturePointOwnedBy["Team"] == redTeam && m_RedTeamHomeCapturePoint == 0) {
             nextPossibleCapturePoint["Red"] = i + 1;
         }
@@ -79,10 +79,10 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper
     }
     for (int i = m_NumberOfCapturePoints - 1; i >= 0; i--)
     {
-        if (!m_World->HasComponent(m_CapturePointNumberToEntityIDMap[i], "Team")) {
+        if (!m_CapturePointNumberToEntityMap[i].HasComponent("Team")) {
             continue;
         }
-        ComponentWrapper& capturePointOwnedBy = m_World->GetComponent(m_CapturePointNumberToEntityIDMap[i], "Team");
+        ComponentWrapper& capturePointOwnedBy = m_CapturePointNumberToEntityMap[i]["Team"];
         if ((int)capturePointOwnedBy["Team"] == redTeam && m_RedTeamHomeCapturePoint != 0) {
             nextPossibleCapturePoint["Red"] = i - 1;
         }
@@ -95,7 +95,7 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper
     if (m_ResetTimers) {
         for (size_t i = 0; i < m_NumberOfCapturePoints; i++)
         {
-            ComponentWrapper& capturePoint = m_World->GetComponent(m_CapturePointNumberToEntityIDMap[i], "CapturePoint");
+            ComponentWrapper& capturePoint = m_CapturePointNumberToEntityMap[i]["CapturePoint"];
             if ((int)capturePoint["CapturePointNumber"] != nextPossibleCapturePoint["Red"] &&
                 (int)capturePoint["CapturePointNumber"] != nextPossibleCapturePoint["Blue"]) {
                 capturePoint["CaptureTimer"] = 0.0;
@@ -106,34 +106,34 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper
 
     //colorize next possible capturepoint
     if (nextPossibleCapturePoint["Red"] == capturePointNumber) {
-        entity["Model"]["Color"] = glm::vec4(1, 1, 0, 1);
+        capturePointEntity["Model"]["Color"] = glm::vec4(1, 1, 0, 1);
     }
     if (nextPossibleCapturePoint["Blue"] == capturePointNumber) {
-        entity["Model"]["Color"] = glm::vec4(0, 1, 1, 1);
+        capturePointEntity["Model"]["Color"] = glm::vec4(0, 1, 1, 1);
     }
 
     //check how many players are standing inside and are healthy
     for (size_t i = m_ETriggerTouchVector.size(); i > 0; i--)
     {
         auto triggerTouched = m_ETriggerTouchVector[i - 1];
-        if (std::get<1>(triggerTouched) == capturePoint.EntityID) {
+        if (std::get<1>(triggerTouched) == capturePointEntity) {
             //some player has touched this - lets figure out: what team, health
-            EntityID playerID = std::get<0>(triggerTouched);
-            if (!m_World->HasComponent(playerID, "Player")) {
+            EntityWrapper player = std::get<0>(triggerTouched);
+            if (!player.HasComponent("Player")) {
                 //if a non-player has entered the capturePoint, just erase that event and continue
                 m_ETriggerTouchVector.erase(m_ETriggerTouchVector.begin() + i - 1);
                 continue;
             }
-            bool hasHealthComponent = m_World->HasComponent(playerID, "Health");
+            bool hasHealthComponent = player.HasComponent("Health");
             if (hasHealthComponent) {
-                double currentHealth = m_World->GetComponent(playerID, "Health")["Health"];
+                double currentHealth = player["Health"]["Health"];
                 //check if player is dead
                 if ((int)currentHealth == 0) {
                     continue;
                 }
             }
             //check team - spectatorNumber = "no team"
-            int teamNumber = m_World->GetComponent(playerID, "Team")["Team"];
+            int teamNumber = player["Team"]["Team"];
             if (teamNumber == redTeam) {
                 redTeamPlayersStandingInside++;
             } else if (teamNumber == blueTeam) {
@@ -169,24 +169,24 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper
         //B. at most one of the teams have players inside
         //if capturePoint is not owned by the take-over team, just modify the CaptureTimer accordingly
         if (ownedBy != currentTeam && canCapture) {
-            if (abs((double)capturePoint["CaptureTimer"]) < 0.001f) {
+            if (abs((double)cCapturePoint["CaptureTimer"]) < 0.001f) {
                 LOG_DEBUG("Point is being captured by team %i", currentTeam);   //Remove when we tested sufficiently.
             }
-            capturePoint["CaptureTimer"] = (double)capturePoint["CaptureTimer"] + timerDeltaChange;
+            cCapturePoint["CaptureTimer"] = (double)cCapturePoint["CaptureTimer"] + timerDeltaChange;
         }
         //if capturePoint is owned by the team, and the other team has been trying to take it, then increase/decrease the timer towards 0.0
-        if ((ownedBy == currentTeam && currentTeam == redTeam && (double)capturePoint["CaptureTimer"] < 0.0) ||
-            (ownedBy == currentTeam && currentTeam == blueTeam && (double)capturePoint["CaptureTimer"] > 0.0)) {
-            capturePoint["CaptureTimer"] = (double)capturePoint["CaptureTimer"] + timerDeltaChange;
+        if ((ownedBy == currentTeam && currentTeam == redTeam && (double)cCapturePoint["CaptureTimer"] < 0.0) ||
+            (ownedBy == currentTeam && currentTeam == blueTeam && (double)cCapturePoint["CaptureTimer"] > 0.0)) {
+            cCapturePoint["CaptureTimer"] = (double)cCapturePoint["CaptureTimer"] + timerDeltaChange;
         }
         //check if captureTimer > m_CaptureTimeToTakeOver and if so change owner and publish the eCaptured event
-        if (abs((double)capturePoint["CaptureTimer"]) > abs(m_CaptureTimeToTakeOver) && canCapture) {
+        if (abs((double)cCapturePoint["CaptureTimer"]) > abs(m_CaptureTimeToTakeOver) && canCapture) {
             teamComponent["Team"] = currentTeam;
-            capturePoint["CaptureTimer"] = 0.0;
+            cCapturePoint["CaptureTimer"] = 0.0;
             //publish Captured event
             LOG_DEBUG("Point is captured by team %i!", currentTeam);    //Remove when we tested sufficiently.
             Events::Captured e;
-            e.CapturePointID = capturePoint.EntityID;
+            e.CapturePointID = cCapturePoint.EntityID;
             e.TeamNumberThatCapturedCapturePoint = currentTeam;
             m_EventBroker->Publish(e);
             //NextPossibleCapturePoint will be calculated in the next update...

src/Game/Systems/PlayerMovementSystem.cpp

@@ -80,14 +80,14 @@ void PlayerMovementSystem::Update(double dt)
                 velocity.y += 4.f;
             }
 
-            //if (player.HasComponent("AABB")) {
-            //    glm::vec3& size = player["AABB"]["Size"];
-            //    if (controller->Crouching()) {
-            //        size = glm::vec3(1.f, 1.f, 1.f);
-            //    } else {
-            //        size = glm::vec3(1.f, 1.6f, 1.f);
-            //    }
-            //}
+            if (player.HasComponent("AABB")) {
+                glm::vec3& size = player["AABB"]["Size"];
+                if (controller->Crouching()) {
+                    size = glm::vec3(1.f, 1.f, 1.f);
+                } else {
+                    size = glm::vec3(1.f, 1.6f, 1.f);
+                }
+            }
 
             // Animations
             EntityWrapper playerModel = player.FirstChildByName("PlayerModel");

src/Game/Systems/WeaponSystem.cpp

@@ -25,6 +25,16 @@ bool WeaponSystem::OnPlayerSpawned(const Events::PlayerSpawned& e)
 
 bool WeaponSystem::OnInputCommand(const Events::InputCommand& e)
 {
+    // Only shoot client-side!
+    if (e.PlayerID != -1) {
+        return false;
+    }
+
+    // Only shoot if the player is alive
+    if (!m_LocalPlayer.Valid()) {
+        return false;
+    }
+
     if (e.Command == "PrimaryFire" && e.Value > 0) {
         Events::Shoot eShoot;
         if (e.PlayerID == -1) {
@@ -94,7 +104,7 @@ bool WeaponSystem::OnShoot(Events::Shoot& eShoot)
 
     // Screen center, based on current resolution!
     // TODO: check if player has enough ammo and if weapon has a cooldown or not
-    Rectangle screenResolution = m_Renderer->Resolution();
+    Rectangle screenResolution = m_Renderer->GetViewPortSize();
     glm::vec2 centerScreen = glm::vec2(screenResolution.Width / 2, screenResolution.Height / 2);
 
     // TODO: check if player has enough ammo and if weapon has a cooldown or not

tools/MayaExporter/MayaExporter/Skeleton.cpp

@@ -77,69 +77,69 @@ Animation Skeleton::GetAnimData(std::string animationName, int startFrame, int e
     std::map<std::string, std::array<std::array<double, 4>, 4>> joinCheckMap;
     std::map<std::string, bool> exportJoint;
 
-	MItDag jointIt(MItDag::TraversalType::kDepthFirst, MFn::kJoint);
-	for (unsigned int i = startFrame; i <= endFrame; i++)
-	{
-		MAnimControl::setCurrentTime(MTime(i, MTime::kNTSCField));
-		while (!jointIt.isDone())
-		{
-			m_Hierarchy.push_back(jointIt.item());
+    //MItDag jointIt(MItDag::TraversalType::kDepthFirst, MFn::kJoint);
+    //for (unsigned int i = startFrame; i <= endFrame; i++)
+    //{
+    //	MAnimControl::setCurrentTime(MTime(i, MTime::kNTSCField));
+    //	while (!jointIt.isDone())
+    //	{
+    //		m_Hierarchy.push_back(jointIt.item());
 
-			MFnTransform MayaJoint(jointIt.item());
-			MMatrix transformationMatrix = MayaJoint.transformationMatrix();
+    //		MFnTransform MayaJoint(jointIt.item());
+    //		MMatrix transformationMatrix = MayaJoint.transformationMatrix();
 
-			if (i == startFrame)
-			{
-				double doubleMat[4][4];
-				transformationMatrix.get(doubleMat);
+    //		if (i == startFrame)
+    //		{
+    //			double doubleMat[4][4];
+    //			transformationMatrix.get(doubleMat);
 
-				joinCheckMap[MayaJoint.name().asChar()][0][0] = doubleMat[0][0];
-				joinCheckMap[MayaJoint.name().asChar()][0][1] = doubleMat[0][1];
-				joinCheckMap[MayaJoint.name().asChar()][0][2] = doubleMat[0][2];
-				joinCheckMap[MayaJoint.name().asChar()][0][3] = doubleMat[0][3];
-				joinCheckMap[MayaJoint.name().asChar()][1][0] = doubleMat[1][0];
-				joinCheckMap[MayaJoint.name().asChar()][1][1] = doubleMat[1][1];
-				joinCheckMap[MayaJoint.name().asChar()][1][2] = doubleMat[1][2];
-				joinCheckMap[MayaJoint.name().asChar()][1][3] = doubleMat[1][3];
-				joinCheckMap[MayaJoint.name().asChar()][2][0] = doubleMat[2][0];
-				joinCheckMap[MayaJoint.name().asChar()][2][1] = doubleMat[2][1];
-				joinCheckMap[MayaJoint.name().asChar()][2][2] = doubleMat[2][2];
-				joinCheckMap[MayaJoint.name().asChar()][2][3] = doubleMat[2][3];
-				joinCheckMap[MayaJoint.name().asChar()][3][0] = doubleMat[3][0];
-				joinCheckMap[MayaJoint.name().asChar()][3][1] = doubleMat[3][1];
-				joinCheckMap[MayaJoint.name().asChar()][3][2] = doubleMat[3][2];
-				joinCheckMap[MayaJoint.name().asChar()][3][3] = doubleMat[3][3];
+    //			joinCheckMap[MayaJoint.name().asChar()][0][0] = doubleMat[0][0];
+    //			joinCheckMap[MayaJoint.name().asChar()][0][1] = doubleMat[0][1];
+    //			joinCheckMap[MayaJoint.name().asChar()][0][2] = doubleMat[0][2];
+    //			joinCheckMap[MayaJoint.name().asChar()][0][3] = doubleMat[0][3];
+    //			joinCheckMap[MayaJoint.name().asChar()][1][0] = doubleMat[1][0];
+    //			joinCheckMap[MayaJoint.name().asChar()][1][1] = doubleMat[1][1];
+    //			joinCheckMap[MayaJoint.name().asChar()][1][2] = doubleMat[1][2];
+    //			joinCheckMap[MayaJoint.name().asChar()][1][3] = doubleMat[1][3];
+    //			joinCheckMap[MayaJoint.name().asChar()][2][0] = doubleMat[2][0];
+    //			joinCheckMap[MayaJoint.name().asChar()][2][1] = doubleMat[2][1];
+    //			joinCheckMap[MayaJoint.name().asChar()][2][2] = doubleMat[2][2];
+    //			joinCheckMap[MayaJoint.name().asChar()][2][3] = doubleMat[2][3];
+    //			joinCheckMap[MayaJoint.name().asChar()][3][0] = doubleMat[3][0];
+    //			joinCheckMap[MayaJoint.name().asChar()][3][1] = doubleMat[3][1];
+    //			joinCheckMap[MayaJoint.name().asChar()][3][2] = doubleMat[3][2];
+    //			joinCheckMap[MayaJoint.name().asChar()][3][3] = doubleMat[3][3];
 
-				exportJoint[MayaJoint.name().asChar()] = false;
-			}
-			else if(!exportJoint[MayaJoint.name().asChar()])//!exportJoint[MayaJoint.name().asChar()])
-			{
-				double doubleMat[4][4];
+    //			exportJoint[MayaJoint.name().asChar()] = false;
+    //		}
+    //		else if(!exportJoint[MayaJoint.name().asChar()])//!exportJoint[MayaJoint.name().asChar()])
+    //		{
+    //			double doubleMat[4][4];
 
-				doubleMat[0][0] = joinCheckMap[MayaJoint.name().asChar()][0][0];
-				doubleMat[0][1] = joinCheckMap[MayaJoint.name().asChar()][0][1];
-				doubleMat[0][2] = joinCheckMap[MayaJoint.name().asChar()][0][2];
-				doubleMat[0][3] = joinCheckMap[MayaJoint.name().asChar()][0][3];
-				doubleMat[1][0] = joinCheckMap[MayaJoint.name().asChar()][1][0];
-				doubleMat[1][1] = joinCheckMap[MayaJoint.name().asChar()][1][1];
-				doubleMat[1][2] = joinCheckMap[MayaJoint.name().asChar()][1][2];
-				doubleMat[1][3] = joinCheckMap[MayaJoint.name().asChar()][1][3];
-				doubleMat[2][0] = joinCheckMap[MayaJoint.name().asChar()][2][0];
-				doubleMat[2][1] = joinCheckMap[MayaJoint.name().asChar()][2][1];
-				doubleMat[2][2] = joinCheckMap[MayaJoint.name().asChar()][2][2];
-				doubleMat[2][3] = joinCheckMap[MayaJoint.name().asChar()][2][3];
-				doubleMat[3][0] = joinCheckMap[MayaJoint.name().asChar()][3][0];
-				doubleMat[3][1] = joinCheckMap[MayaJoint.name().asChar()][3][1];
-				doubleMat[3][2] = joinCheckMap[MayaJoint.name().asChar()][3][2];
-				doubleMat[3][3] = joinCheckMap[MayaJoint.name().asChar()][3][3];
+    //			doubleMat[0][0] = joinCheckMap[MayaJoint.name().asChar()][0][0];
+    //			doubleMat[0][1] = joinCheckMap[MayaJoint.name().asChar()][0][1];
+    //			doubleMat[0][2] = joinCheckMap[MayaJoint.name().asChar()][0][2];
+    //			doubleMat[0][3] = joinCheckMap[MayaJoint.name().asChar()][0][3];
+    //			doubleMat[1][0] = joinCheckMap[MayaJoint.name().asChar()][1][0];
+    //			doubleMat[1][1] = joinCheckMap[MayaJoint.name().asChar()][1][1];
+    //			doubleMat[1][2] = joinCheckMap[MayaJoint.name().asChar()][1][2];
+    //			doubleMat[1][3] = joinCheckMap[MayaJoint.name().asChar()][1][3];
+    //			doubleMat[2][0] = joinCheckMap[MayaJoint.name().asChar()][2][0];
+    //			doubleMat[2][1] = joinCheckMap[MayaJoint.name().asChar()][2][1];
+    //			doubleMat[2][2] = joinCheckMap[MayaJoint.name().asChar()][2][2];
+    //			doubleMat[2][3] = joinCheckMap[MayaJoint.name().asChar()][2][3];
+    //			doubleMat[3][0] = joinCheckMap[MayaJoint.name().asChar()][3][0];
+    //			doubleMat[3][1] = joinCheckMap[MayaJoint.name().asChar()][3][1];
+    //			doubleMat[3][2] = joinCheckMap[MayaJoint.name().asChar()][3][2];
+    //			doubleMat[3][3] = joinCheckMap[MayaJoint.name().asChar()][3][3];
 
-				MMatrix tmp(doubleMat);
-				if (!tmp.isEquivalent(transformationMatrix)) {
-					MGlobal::displayInfo(MString() + MayaJoint.name() + " is exported");
-					exportJoint[MayaJoint.name().asChar()] = true;
-					animatedJoints.push_back(MayaJoint.object());
-				}
-			}
+    //			MMatrix tmp(doubleMat);
+    //			if (!tmp.isEquivalent(transformationMatrix)) {
+    //				MGlobal::displayInfo(MString() + MayaJoint.name() + " is exported");
+    //				exportJoint[MayaJoint.name().asChar()] = true;
+    //				animatedJoints.push_back(MayaJoint.object());
+    //			}
+    //		}
 
                 /*for (int i = 0; i < 9; i++)
                 {
@@ -186,33 +186,33 @@ Animation Skeleton::GetAnimData(std::string animationName, int startFrame, int e
 
                     /*MGlobal::displayInfo(MString() + "start keyfram index: " + startKeyFrameIndex + ". End keyfram index: " + endKeyFrameIndex + ".");*/
 
-				//			if (startFrame  <= jointAnim.time(endKeyFrameIndex).value() && jointAnim.time(endKeyFrameIndex).value() <= endFrame || endKeyFrameIndex - startKeyFrameIndex > 0) {
-				//						animatedJoints.push_back(jointIt.item());
-				//						i = 9;
-				//						break;
-				//					}
+                    /*if (startFrame  <= jointAnim.time(endKeyFrameIndex).value() && jointAnim.time(endKeyFrameIndex).value() <= endFrame || endKeyFrameIndex - startKeyFrameIndex > 0) {
+                                animatedJoints.push_back(jointIt.item());
+                                i = 9;
+                                break;
+                            }
 
-				//					MFnTransform MayaJoint(jointIt.item());
+                            MFnTransform MayaJoint(jointIt.item());
 
-				//					MPlug BindPose = MayaJoint.findPlug("bindPose");
-				//					MDataHandle DataHandle;
-				//					BindPose.getValue(DataHandle);
-				//					MFnMatrixData MartixFn(DataHandle.data());
-				//					MMatrix BindPoseMatrix = MartixFn.matrix();
+                            MPlug BindPose = MayaJoint.findPlug("bindPose");
+                            MDataHandle DataHandle;
+                            BindPose.getValue(DataHandle);
+                            MFnMatrixData MartixFn(DataHandle.data());
+                            MMatrix BindPoseMatrix = MartixFn.matrix();
 
-				//					if (!BindPoseMatrix.isEquivalent(MayaJoint.transformationMatrix()))
-				//					{
-				//						MGlobal::displayError(MString() + animationName.c_str() + " is using " + MayaJoint.name() + " that is not in bind pose nor is it key framed in the animation, the exported animation will NOT correspond to the animation in Maya");
-				//					}
-				//				}
-				//			}
-				//		}
+                            if (!BindPoseMatrix.isEquivalent(MayaJoint.transformationMatrix()))
+                            {
+                                MGlobal::displayError(MString() + animationName.c_str() + " is using " + MayaJoint.name() + " that is not in bind pose nor is it key framed in the animation, the exported animation will NOT correspond to the animation in Maya");
+                            }
+                        }
+                    }
+                }
 
-				//} // end of int i loop
-				jointIt.next();
+        } // end of int i loop*/
+        /*		jointIt.next();
         }
         jointIt.reset();
-	}
+    }*/
 
 
     int currentFrame = startFrame;
@@ -224,18 +224,62 @@ Animation Skeleton::GetAnimData(std::string animationName, int startFrame, int e
         MAnimControl::setCurrentTime(MTime(currentFrame, MTime::kNTSCField));
         MTime time = MAnimControl::currentTime();
 
-		for (auto aJoint : animatedJoints){		
-			MFnTransform thisJoint(aJoint);
+        MItDag jointIt(MItDag::TraversalType::kDepthFirst, MFn::kJoint);
+        unsigned int jointID = 0;
+        while (!jointIt.isDone()) {
+            MFnTransform thisJoint(jointIt.currentItem());
+            MMatrix transformationMatrix = thisJoint.transformationMatrix();
+           
+            double doubleMat[4][4];
+
+            if (currentFrame != startFrame){
                 Animation::Keyframe::JointProperty joint;
 
-			auto it = std::find(m_Hierarchy.begin(), m_Hierarchy.end(), thisJoint.object());
-			if (it != m_Hierarchy.end()) {
-				joint.ID = it - m_Hierarchy.begin();
+                doubleMat[0][0] = joinCheckMap[thisJoint.name().asChar()][0][0];
+                doubleMat[0][1] = joinCheckMap[thisJoint.name().asChar()][0][1];
+                doubleMat[0][2] = joinCheckMap[thisJoint.name().asChar()][0][2];
+                doubleMat[0][3] = joinCheckMap[thisJoint.name().asChar()][0][3];
+                doubleMat[1][0] = joinCheckMap[thisJoint.name().asChar()][1][0];
+                doubleMat[1][1] = joinCheckMap[thisJoint.name().asChar()][1][1];
+                doubleMat[1][2] = joinCheckMap[thisJoint.name().asChar()][1][2];
+                doubleMat[1][3] = joinCheckMap[thisJoint.name().asChar()][1][3];
+                doubleMat[2][0] = joinCheckMap[thisJoint.name().asChar()][2][0];
+                doubleMat[2][1] = joinCheckMap[thisJoint.name().asChar()][2][1];
+                doubleMat[2][2] = joinCheckMap[thisJoint.name().asChar()][2][2];
+                doubleMat[2][3] = joinCheckMap[thisJoint.name().asChar()][2][3];
+                doubleMat[3][0] = joinCheckMap[thisJoint.name().asChar()][3][0];
+                doubleMat[3][1] = joinCheckMap[thisJoint.name().asChar()][3][1];
+                doubleMat[3][2] = joinCheckMap[thisJoint.name().asChar()][3][2];
+                doubleMat[3][3] = joinCheckMap[thisJoint.name().asChar()][3][3];
+
+                MMatrix LastJointMatrix(doubleMat);
+                //Is same as last KeyFrame
+                if (LastJointMatrix.isEquivalent(transformationMatrix)) {
+                    jointID++;
+                    jointIt.next();
+                    continue;
                 }
-			else {
-				MGlobal::displayError(MString() + "Could not find joint ID for: " + thisJoint.name());
             }
 
+            transformationMatrix.get(doubleMat);
+
+            joinCheckMap[thisJoint.name().asChar()][0][0] = doubleMat[0][0];
+            joinCheckMap[thisJoint.name().asChar()][0][1] = doubleMat[0][1];
+            joinCheckMap[thisJoint.name().asChar()][0][2] = doubleMat[0][2];
+            joinCheckMap[thisJoint.name().asChar()][0][3] = doubleMat[0][3];
+            joinCheckMap[thisJoint.name().asChar()][1][0] = doubleMat[1][0];
+            joinCheckMap[thisJoint.name().asChar()][1][1] = doubleMat[1][1];
+            joinCheckMap[thisJoint.name().asChar()][1][2] = doubleMat[1][2];
+            joinCheckMap[thisJoint.name().asChar()][1][3] = doubleMat[1][3];
+            joinCheckMap[thisJoint.name().asChar()][2][0] = doubleMat[2][0];
+            joinCheckMap[thisJoint.name().asChar()][2][1] = doubleMat[2][1];
+            joinCheckMap[thisJoint.name().asChar()][2][2] = doubleMat[2][2];
+            joinCheckMap[thisJoint.name().asChar()][2][3] = doubleMat[2][3];
+            joinCheckMap[thisJoint.name().asChar()][3][0] = doubleMat[3][0];
+            joinCheckMap[thisJoint.name().asChar()][3][1] = doubleMat[3][1];
+            joinCheckMap[thisJoint.name().asChar()][3][2] = doubleMat[3][2];
+            joinCheckMap[thisJoint.name().asChar()][3][3] = doubleMat[3][3];
+
             MTransformationMatrix Matrix = thisJoint.transformation();
             MPlug BindPose = thisJoint.findPlug("bindPose");
             MDataHandle DataHandle;
@@ -264,6 +308,9 @@ Animation Skeleton::GetAnimData(std::string animationName, int startFrame, int e
             rotation = rotation * jo;
             rotation.get(tmp);
 
+            Animation::Keyframe::JointProperty joint;
+            joint.ID = jointID;
+
             joint.Rotation[0] = tmp[0];
             joint.Rotation[1] = tmp[1];
             joint.Rotation[2] = tmp[2];
@@ -278,13 +325,16 @@ Animation Skeleton::GetAnimData(std::string animationName, int startFrame, int e
             joint.Scale[2] = tmp[2];
 
             thisKeyFrame.JointProperties.push_back(joint);
+           
+            jointID++;
+            jointIt.next();
         }
+        thisKeyFrame.NumberOfJoints = thisKeyFrame.JointProperties.size();
         returnData.Keyframes.push_back(thisKeyFrame);
         currentFrame++;
     }
 
     returnData.NumKeyFrames = returnData.Keyframes.size();
-    returnData.NumberOfJoints = animatedJoints.size();
 
     return returnData;
 }
@@ -310,13 +360,11 @@ std::vector<BindPoseSkeletonNode> Skeleton::GetBindPoses()
             }
             SkeletonStorage.Name = std::string(MayaJoint.name().asChar());
             NewJoint.ParentID = -1; // This joint is root
-		}
-		else {
+        } else {
             auto it = std::find(m_Hierarchy.begin(), m_Hierarchy.end(), MayaJoint.parent(0));
             if (it != m_Hierarchy.end()) {
                 NewJoint.ParentID = it - m_Hierarchy.begin();
-			}
-			else {
+            } else {
                 MGlobal::displayError(MString() + "Could not find joint parent for: " + MayaJoint.name());
             }
         }

tools/MayaExporter/MayaExporter/Skeleton.h

@@ -22,6 +22,7 @@ public:
 
 		int Index = 0;
 		float Time = 0;
+        int NumberOfJoints;
 		std::vector<JointProperty> JointProperties;
 	};
 
@@ -29,7 +30,6 @@ public:
     int nameLength = 0;
 	float Duration = 0;
     int NumKeyFrames = 0;
-    int NumberOfJoints = 0;
 	std::vector<Keyframe> Keyframes;
 
 	virtual void WriteBinary(std::ostream& out)
@@ -38,11 +38,11 @@ public:
 		out.write(Name.c_str(), Name.size() + 1);
 		out.write((char*)&Duration, sizeof(float));
         out.write((char*)&NumKeyFrames, sizeof(int));
-        out.write((char*)&NumberOfJoints, sizeof(int));
         //Här under loopas alla key frames igenom
 		for (auto aKeyframe : Keyframes) {
 			out.write((char*)&aKeyframe.Index, sizeof(int));
 			out.write((char*)&aKeyframe.Time, sizeof(float));
+            out.write((char*)&aKeyframe.NumberOfJoints, sizeof(int));
 			for (auto aJoint : aKeyframe.JointProperties) {
 				out.write((char*)&aJoint.ID, sizeof(int));
 				out.write((char*)aJoint.Position, sizeof(float) * 3);
@@ -57,10 +57,10 @@ public:
 		out << "Animation Name: " << Name << endl;
 		out << "Duration: " << Duration << endl;
         out << "Number of KeyFrames: " << NumKeyFrames << endl;   
-        out << "Number of Joints: " << NumberOfJoints << endl;
 		for (auto aKeyframe : Keyframes) {
 			out << "Frame: " << aKeyframe.Index << endl;
 			out << "Time: " << aKeyframe.Time << endl;
+            out << "Number of Joints: " << aKeyframe.NumberOfJoints << endl;
 			for (auto aJoint : aKeyframe.JointProperties) {
 				out << "Joint ID: " << aJoint.ID << endl;
 				out << aJoint.Position[0] << " " << aJoint.Position[1] << " " << aJoint.Position[2] << endl;