misc changes do the DoubleJumpHexagon.xml

# Conflicts:
#	include/Game/Systems/PlayerMovementSystem.h

include/Engine/GUI/TextureFrame.h

@@ -3,7 +3,6 @@
 
 #include "Frame.h"
 #include "../Rendering/Texture.h"
-#include "../Rendering/Util/CommonFunctions.h"
 
 namespace GUI
 {
@@ -56,10 +55,10 @@ public:
 			return;
 		}
 
-		m_Texture = CommonFunctions::LoadTexture(resourceName, false);
+		m_Texture = ResourceManager::Load<Texture>(resourceName);
 		m_TextureName = resourceName;
 		if (m_Texture == nullptr) {
-			m_Texture = CommonFunctions::LoadTexture("Textures/Core/ErrorTexture.png", false);
+			m_Texture = ResourceManager::Load<Texture>("Textures/Core/ErrorTexture.png");
 		}
 
 		SizeToTexture();

include/Engine/Input/FirstPersonInputController.h

@@ -55,6 +55,7 @@ protected:
     //specialabilitys
     bool m_MovementKeyDown = false;
     bool m_SpecialAbilityKeyDown = false;
+    int m_NumberOfMovementKeysDown = 0;
 
     EventRelay<EventContext, Events::LockMouse> m_ELockMouse;
     bool OnLockMouse(const Events::LockMouse& e);
@@ -132,6 +133,7 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
         }
         //if value = 0 then you have just released this key
         if (e.Value != 0) {
+            m_NumberOfMovementKeysDown++;
             m_MovementKeyDown = true;
             //if you pressed the same key within m_AssaultDashDoubleTapSensitivityTimer then you have doubletapped it
             if (m_AssaultDashDoubleTapDeltaTime < m_AssaultDashDoubleTapSensitivityTimer && m_AssaultDashTapDirection == m_CurrentDirectionVector) {
@@ -139,10 +141,14 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
             }
         } else {
             //== 0
-            m_MovementKeyDown = false;
-            //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
-            m_AssaultDashTapDirection = m_CurrentDirectionVector;
-            m_AssaultDashDoubleTapDeltaTime = 0.f;
+            m_NumberOfMovementKeysDown--;
+            if (m_NumberOfMovementKeysDown == 0) {
+                m_MovementKeyDown = false;
+            }
+                //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
+                m_AssaultDashTapDirection = m_CurrentDirectionVector;
+                m_AssaultDashDoubleTapDeltaTime = 0.f;
+            
         }
     }
 
@@ -202,12 +208,6 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
         m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
         m_AssaultDashDoubleTapped = true;
         m_AssaultDashDoubleTapDeltaTime = 0.f;
-        //moving to the side has priority
-        return;
-    }
-
-    //dashing with doubletap - check if doubletap to dash enabled
-    if (ResourceManager::Load<ConfigFile>("Input.ini")->Get<bool>("Keyboard.DoubleTapToDash", false)) {
         return;
     }
 
@@ -216,6 +216,11 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
         m_AssaultDashDoubleTapped = false;
     }
 
+    //dashing with doubletap - check if doubletap to dash enabled
+    if (!ResourceManager::Load<ConfigFile>("Input.ini")->Get<bool>("Keyboard.DoubleTapToDash", false)) {
+        return;
+    }
+
     //check if we have received a valid doubletap
     if (!m_ValidDoubleTap) {
         return;

include/Engine/Rendering/Camera.h

@@ -33,8 +33,6 @@ public:
 	glm::mat4 ViewMatrix() const { return m_ViewMatrix; }
     void SetViewMatrix(glm::mat4 val);
 
-    glm::mat4 BillboardMatrix();
-
 	float AspectRatio() const { return m_AspectRatio; }
 	void SetAspectRatio(float val);
 

include/Engine/Rendering/DrawFinalPass.h

@@ -7,7 +7,6 @@
 #include "FrameBuffer.h"
 #include "ShaderProgram.h"
 #include "Util/UnorderedMapVec2.h"
-#include "Util/CommonFunctions.h"
 #include "Texture.h"
 
 class DrawFinalPass
@@ -36,7 +35,6 @@ 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 DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, RenderScene& scene);
     void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
     void DrawShieldToStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
     void DrawShieldedModelRenderQueue(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
@@ -52,7 +50,6 @@ private:
     Texture* m_BlackTexture;
     Texture* m_NeutralNormalTexture;
     Texture* m_GreyTexture;
-    Texture* m_ErrorTexture;
 
     FrameBuffer m_FinalPassFrameBuffer;
     FrameBuffer m_FinalPassFrameBufferLowRes;
@@ -72,7 +69,6 @@ private:
     ShaderProgram* m_ForwardPlusProgram;
     ShaderProgram* m_ExplosionEffectProgram;
 	ShaderProgram* m_ExplosionEffectSplatMapProgram;
-    ShaderProgram* m_SpriteProgram;
 	ShaderProgram* m_ForwardPlusSplatMapProgram;
     ShaderProgram* m_ShieldToStencilProgram;
     ShaderProgram* m_FillDepthBufferProgram;

include/Engine/Rendering/Model.h

@@ -2,7 +2,6 @@
 #define Model_h__
 
 #include "Rendering/RawModelCustom.h"
-#include "Util/CommonFunctions.h"
 //#include "Rendering/RawModelAssimp.h"
 #include "../OpenGL.h"
 #include "Core/AABB.h"

include/Engine/Rendering/PNG.h

@@ -6,10 +6,9 @@
 #include <png.h>
 
 #include "../Common.h"
-#include "../Core/ResourceManager.h"
 #include "Image.h"
 
-class PNG : public Image, public Resource
+class PNG : public Image
 {
 public:
 	PNG(std::string path);

include/Engine/Rendering/PickingPass.h

@@ -59,8 +59,6 @@ private:
 
     int m_ColorCounter[2];
     std::map<std::tuple<EntityID, const World*, Camera*>, glm::ivec2> m_EntityColors;
-
-    Texture* m_WhiteTexture;
 };
 
 #endif 

include/Engine/Rendering/RawModelCustom.h

@@ -50,7 +50,7 @@ public:
 	struct TextureProperties {
 		std::string TexturePath;
 		glm::vec2 UVRepeat;
-		Texture* Texture;	
+		std::shared_ptr<::Texture> Texture;	
 	};
 	
     struct MaterialBasic

include/Engine/Rendering/RenderQueue.h

@@ -15,7 +15,6 @@
 #include "PointLightJob.h"
 #include "DirectionalLightJob.h"
 #include "ExplosionEffectJob.h"
-#include "SpriteJob.h"
 
 struct RenderScene
 {
@@ -26,7 +25,6 @@ struct RenderScene
         std::list<std::shared_ptr<RenderJob>> OpaqueShieldedObjects;
         std::list<std::shared_ptr<RenderJob>> TransparentShieldedObjects;
         std::list<std::shared_ptr<RenderJob>> ShieldObjects;
-        std::list<std::shared_ptr<RenderJob>> SpriteJob;
         std::list<std::shared_ptr<RenderJob>> PointLight;
         std::list<std::shared_ptr<RenderJob>> Text;
         std::list<std::shared_ptr<RenderJob>> DirectionalLight;
@@ -43,7 +41,7 @@ struct RenderScene
         Jobs.OpaqueShieldedObjects.clear();
         Jobs.TransparentShieldedObjects.clear();
         Jobs.ShieldObjects.clear();
-        Jobs.SpriteJob.clear();
+        Jobs.Text.clear();
         Jobs.DirectionalLight.clear();
 	}
 };

include/Engine/Rendering/RenderSystem.h

@@ -47,7 +47,6 @@ private:
     void fillPointLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
     void fillDirectionalLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
     void fillLight(std::list<std::shared_ptr<RenderJob>>& jobs);
-    void fillSprites(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
     bool isChildOfACamera(EntityWrapper entity);
     bool isChildOfCurrentCamera(EntityWrapper entity);
 };

include/Engine/Rendering/Renderer.h

@@ -22,7 +22,6 @@
 #include "../Core/Transform.h"
 #include "imgui/imgui.h"
 #include "TextPass.h"
-#include "Util/CommonFunctions.h"
 
 class Renderer : public IRenderer
 {

include/Engine/Rendering/SpriteJob.h

@@ -1,73 +0,0 @@
-#ifndef SpriteJob_h__
-#define SpriteJob_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"
-#include "../Core/Transform.h"
-#include "Skeleton.h"
-
-struct SpriteJob : RenderJob
-{
-    SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted)
-        : RenderJob()
-    {
-        Model = ResourceManager::Load<::Model>("Models/Core/UnitQuad.mesh");
-        ::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
-        TextureID = 0;
-
-        DiffuseTexture = CommonFunctions::LoadTexture(cSprite["DiffuseTexture"], true);
-
-        IncandescenceTexture = CommonFunctions::LoadTexture(cSprite["GlowMap"], true);
-
-        StartIndex = matProp.material->StartIndex;
-        EndIndex = matProp.material->EndIndex;
-        Matrix = matrix;
-        Color = cSprite["Color"];
-        Entity = cSprite.EntityID;
-        Position = Transform::AbsolutePosition(world, cSprite.EntityID);
-        Depth = 0;
-        if (depthSorted) {
-            glm::vec3 viewpos = glm::vec3(camera->ViewMatrix() * glm::vec4(Position, 1));
-            Depth = viewpos.z;
-        }
-        World = world;
-
-        FillColor = fillColor;
-        FillPercentage = fillPercentage;
-    };
-
-    unsigned int TextureID;
-
-    EntityID Entity;
-    glm::mat4 Matrix;
-    const Texture* DiffuseTexture;
-    const Texture* NormalTexture;
-    const Texture* SpecularTexture;
-    const Texture* IncandescenceTexture;
-    float Shininess = 0.f;
-    glm::vec4 Color;
-    glm::vec3 Position;
-    const ::Model* Model = nullptr;
-    unsigned int StartIndex = 0;
-    unsigned int EndIndex = 0;
-    World* World;
-
-    glm::vec4 FillColor = glm::vec4(0);
-    float FillPercentage = 0.0;
-
-    void CalculateHash() override
-    {
-        Hash = TextureID;
-    }
-};
-
-#endif

include/Engine/Rendering/Util/CommonFunctions.h

@@ -4,11 +4,14 @@
 #include "../../Common.h"
 #include "../../OpenGL.h"
 #include "../../GLM.h"
-#include "../Texture.h"
 
-namespace CommonFunctions
-{ 
-Texture* LoadTexture(std::string path, bool threaded);
+class CommonFuntions
+{
+public:
+    CommonFuntions() = delete;
+
+private:
+
 };
 
 #endif

include/Game/Systems/CapturePointHUDSystem.h

@@ -1,22 +0,0 @@
-#ifndef CapturePointHUDSystem_h__
-#define CapturePointHUDSystem_h__
-
-#include <GLFW/glfw3.h>
-#include <glm/common.hpp>
-#include <glm/gtc/quaternion.hpp>
-
-#include "Common.h"
-#include "Core/System.h"
-#include "Engine/Collision/ETrigger.h"
-
-class CapturePointHUDSystem : public ImpureSystem
-{
-public:
-    CapturePointHUDSystem(SystemParams params);
-
-    virtual void Update(double dt) override;
-
-private:
-};
-
-#endif

include/Game/Systems/PlayerMovementSystem.h

@@ -7,6 +7,9 @@
 #include "Events/EDoubleJump.h"
 #include "../Engine/Sound/EPlaySoundOnEntity.h"
 
+#include "Core/EntityFile.h"
+#include "Core/EntityFileParser.h"
+
 class PlayerMovementSystem : public ImpureSystem
 {
 public:

resources/DefaultInput.ini

@@ -2,6 +2,9 @@
 Sensitivity=0.5
 InvertPitch=false
 
+[Keyboard]
+DoubleTapToDash=false
+
 [Bindings]
 MouseLeft=PrimaryFire
 MouseX=Yaw

resources/Schema/Components.xsd

@@ -36,7 +36,5 @@
 	<xs:include schemaLocation="Components/DashAbility.xsd"/>
 	<xs:include schemaLocation="Components/AssaultWeapon.xsd"/>
 	<xs:include schemaLocation="Components/Shield.xsd"/>
-	<xs:include schemaLocation="Components/Sprite.xsd"/>
 	<xs:include schemaLocation="Components/Shielded.xsd"/>
-	<xs:include schemaLocation="Components/CapturePointHUD.xsd"/>
 </xs:schema>

resources/Schema/Components/CapturePointHUD.xml

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

resources/Schema/Components/CapturePointHUD.xsd

@@ -1,24 +0,0 @@
-<?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:include schemaLocation="../Types/TeamEnum.xsd"/>
-	<xs:element name="CapturePointHUD">
-		<xs:annotation>
-			<xs:documentation>Hud element for tracking capture points.</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="CapturePointNumber" type="t:int" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Corresponds to the number on the capture point it should track.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="Owner" type="TeamEnum" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Specify the team that own this capturePoint.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Sprite.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Sprite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Sprite.xsd">
-	<DiffuseTexture></DiffuseTexture>
-	<GlowMap></GlowMap>
-	<Color R="1" G="1" B="1" A="1"/>
-	<Visible>true</Visible>
-	<DepthSort>true</DepthSort>
-</Sprite>

resources/Schema/Components/Sprite.xsd

@@ -1,30 +0,0 @@
-<?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="Sprite">
-		<xs:annotation>
-			<xs:documentation>A sprite that will be facing the camera</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="DiffuseTexture" type="t:string" minOccurs="0">
-					<xs:annotation><xs:documentation>Diffuse Texture file</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="GlowMap" type="t:string" minOccurs="0">
-					<xs:annotation><xs:documentation>GlowMap file</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="Color" type="t:Color" minOccurs="0">
-					<xs:annotation><xs:documentation>Color tint</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="Visible" type="t:bool" minOccurs="0">
-					<xs:annotation><xs:documentation>Whether the model is visible or not</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="DepthSort" type="t:bool" minOccurs="0">
-					<xs:annotation><xs:documentation>Whether the sprite should be sorted with depth or not. Only use false for textures that are on HUD</xs:documentation></xs:annotation>
-				</xs:element>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Entities/CapturePointHUDGroup

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="HudOrigin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform>
-      <Position X="-24.3529072" Y="0" Z="6.95243597"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="BackgroundHexagon">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-          <Color A="0.300000012" B="1" G="1" R="1"/>
-        </c:Sprite>
-        <c:Transform>
-          <Position X="0" Y="0.919596612" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="ProgressionHexagon">
-          <Components>
-            <c:CapturePointHUD>
-              <CapturePointNumber>2</CapturePointNumber>
-            </c:CapturePointHUD>
-            <c:Fill>
-              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-            </c:Fill>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-              <Orientation X="0" Y="0" Z="1.57079637"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="BackgroundHexagon">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-          <Color A="0.300000012" B="1" G="1" R="1"/>
-        </c:Sprite>
-        <c:Transform>
-          <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="ProgressionHexagon">
-          <Components>
-            <c:CapturePointHUD>
-              <CapturePointNumber>3</CapturePointNumber>
-            </c:CapturePointHUD>
-            <c:Fill>
-              <Percentage>0.80222018197612788</Percentage>
-              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-            </c:Fill>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-              <Orientation X="0" Y="0" Z="1.57079637"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="BackgroundHexagon">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-        </c:Sprite>
-        <c:Transform>
-          <Position X="1.62788737" Y="0.919596612" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="ProgressionHexagon">
-          <Components>
-            <c:CapturePointHUD>
-              <CapturePointNumber>4</CapturePointNumber>
-            </c:CapturePointHUD>
-            <c:Fill>
-              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-            </c:Fill>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-              <Orientation X="0" Y="0" Z="1.57079637"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="BackgroundHexagon">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-          <Color A="0.300000012" B="1" G="1" R="1"/>
-        </c:Sprite>
-        <c:Transform>
-          <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="ProgressionHexagon">
-          <Components>
-            <c:CapturePointHUD>
-              <CapturePointNumber>1</CapturePointNumber>
-            </c:CapturePointHUD>
-            <c:Fill>
-              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-            </c:Fill>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-              <Orientation X="0" Y="0" Z="1.57079637"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="BackgroundHexagon">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-          <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
-        </c:Sprite>
-        <c:Transform>
-          <Position X="-1.58304751" Y="0.919596612" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="ProgressionHexagon">
-          <Components>
-            <c:CapturePointHUD/>
-            <c:Fill>
-              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-            </c:Fill>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-              <Orientation X="0" Y="0" Z="1.57079637"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/CapturePointHUDHexagon.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="BackgroundHexagon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Sprite>
-      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-      <Color A="0.666666687" B="1" G="1" R="1"/>
-    </c:Sprite>
-    <c:Transform>
-      <Position X="0" Y="0.919596612" Z="0"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="ProgressionHexagon">
-      <Components>
-        <c:CapturePointHUD/>
-        <c:Fill>
-          <Percentage>0.5</Percentage>
-        </c:Fill>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-        </c:Sprite>
-        <c:Transform>
-          <Position X="0" Y="0" Z="0.00999999978"/>
-          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-          <Orientation X="0" Y="0" Z="1.5710001"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/DoubleJumpHexagon.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Model>
+      <Resource>Models/Effects/JumpEffectHexagon.mesh</Resource>
+      <Color A="0.576470613" B="500" G="255" R="0.854901969"/>
+      <Transparent>true</Transparent>
+    </c:Model>
+    <c:Transform>
+      <Position X="0.600000024" Y="0.800000012" Z="0"/>
+      <Scale X="0.50000012" Y="0.50000019" Z="0.50000014"/>
+    </c:Transform>
+    <c:Lifetime>
+      <Lifetime>0.5</Lifetime>
+    </c:Lifetime>
+    <c:ExplosionEffect>
+      <ColorByDistance>true</ColorByDistance>
+      <Velocity X="0" Y="-7.76300049" Z="0"/>
+      <ExplosionOrigin X="0" Y="2.67900002" Z="0"/>
+      <ExponentialAccelaration>true</ExponentialAccelaration>
+      <ExplosionDuration>0.5</ExplosionDuration>
+      <EndColor A="0" B="0" G="0" R="1"/>
+      <Randomness>true</Randomness>
+    </c:ExplosionEffect>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/QualityAssurance.xml

@@ -40,7 +40,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="7364.79053" Z="0"/>
+              <Orientation X="0" Y="9161.41992" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -120,7 +120,11 @@
       <Children>
         <Entity name="RunAnim">
           <Components>
-            <c:Animation/>
+            <c:Animation>
+              <Name>Run</Name>
+              <Time>0.79292191744688711</Time>
+              <Speed>1</Speed>
+            </c:Animation>
             <c:Model>
               <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
             </c:Model>
@@ -132,7 +136,11 @@
         </Entity>
         <Entity name="Walkanim">
           <Components>
-            <c:Animation/>
+            <c:Animation>
+              <Name>Walk</Name>
+              <Time>0.96020137154739604</Time>
+              <Speed>1</Speed>
+            </c:Animation>
             <c:Model>
               <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
             </c:Model>
@@ -180,13 +188,17 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="2019.28589" Z="0"/>
+                  <Orientation X="0" Y="2918.14136" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
                 <Entity name="Asset">
                   <Components>
-                    <c:Animation/>
+                    <c:Animation>
+                      <Name>Run</Name>
+                      <Time>0.53173203453812956</Time>
+                      <Speed>1</Speed>
+                    </c:Animation>
                     <c:Model>
                       <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
                     </c:Model>
@@ -671,7 +683,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.505432" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -718,7 +730,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.505432" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -778,7 +790,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.505432" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -825,7 +837,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.505432" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -871,7 +883,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.505432" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -918,7 +930,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.505432" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -965,7 +977,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.505432" Z="0"/>
+                  <Orientation X="0" Y="1217.61243" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1023,7 +1035,6 @@
                   <HomePointForTeam>
                     <Red/>
                   </HomePointForTeam>
-                  <CaptureTimer>15</CaptureTimer>
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
@@ -1163,6 +1174,7 @@
               <Components>
                 <c:AABB/>
                 <c:CapturePoint>
+                  <CaptureTimer>-12.033302729641917</CaptureTimer>
                   <CapturePointNumber>3</CapturePointNumber>
                 </c:CapturePoint>
                 <c:Model>
@@ -1212,7 +1224,6 @@
                   <HomePointForTeam>
                     <Blue/>
                   </HomePointForTeam>
-                  <CaptureTimer>-15</CaptureTimer>
                   <CapturePointNumber>4</CapturePointNumber>
                 </c:CapturePoint>
                 <c:Model>
@@ -1379,7 +1390,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="850.207886" Z="0"/>
+                  <Orientation X="0" Y="1750.85376" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1388,7 +1399,7 @@
                     <c:ExplosionEffect>
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                      <TimeSinceDeath>0.75205058136495551</TimeSinceDeath>
+                      <TimeSinceDeath>1.3671759474185377</TimeSinceDeath>
                       <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                       <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                       <Randomness>true</Randomness>
@@ -1435,7 +1446,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="850.207886" Z="0"/>
+                  <Orientation X="0" Y="1750.85376" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1444,7 +1455,7 @@
                     <c:ExplosionEffect>
                       <Velocity X="0.5" Y="1" Z="0"/>
                       <ExplosionOrigin X="0" Y="0.900000036" Z="0"/>
-                      <TimeSinceDeath>1.2019563319790627</TimeSinceDeath>
+                      <TimeSinceDeath>0.31711568080172703</TimeSinceDeath>
                     </c:ExplosionEffect>
                     <c:Model>
                       <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
@@ -1487,18 +1498,22 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="850.207886" Z="0"/>
+                  <Orientation X="0" Y="1750.85376" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
                 <Entity name="Asset">
                   <Components>
-                    <c:Animation/>
+                    <c:Animation>
+                      <Name>Walk</Name>
+                      <Time>0.74121802989810703</Time>
+                      <Speed>1</Speed>
+                    </c:Animation>
                     <c:ExplosionEffect>
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.300000012" Y="2" Z="0"/>
                       <ExplosionOrigin X="0" Y="1.30000007" Z="-0.200000003"/>
-                      <TimeSinceDeath>0.68540211563899389</TimeSinceDeath>
+                      <TimeSinceDeath>0.31711568080172703</TimeSinceDeath>
                       <EndColor A="0" B="0.333333343" G="0.933333337" R="3.92156863"/>
                       <Randomness>true</Randomness>
                     </c:ExplosionEffect>
@@ -1543,7 +1558,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="857.984314" Z="0"/>
+                  <Orientation X="0" Y="857.983765" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1553,7 +1568,7 @@
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0" Y="0.699999988" Z="0"/>
                       <ExplosionOrigin X="0" Y="-1.10000002" Z="0"/>
-                      <TimeSinceDeath>0.95150063648635763</TimeSinceDeath>
+                      <TimeSinceDeath>0.95047462600732735</TimeSinceDeath>
                       <ExplosionDuration>10</ExplosionDuration>
                       <EndColor A="1" B="0" G="0" R="1"/>
                       <RandomnessScalar>3</RandomnessScalar>
@@ -1601,7 +1616,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="456.136078" Z="0"/>
+                  <Orientation X="0" Y="456.13559" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1611,7 +1626,7 @@
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="6" Y="0.100000001" Z="0"/>
                       <ExplosionOrigin X="0" Y="-10" Z="0"/>
-                      <TimeSinceDeath>1.3515288978624223</TimeSinceDeath>
+                      <TimeSinceDeath>1.350502887383392</TimeSinceDeath>
                       <ExponentialAccelaration>true</ExponentialAccelaration>
                       <ExplosionDuration>5</ExplosionDuration>
                       <Randomness>true</Randomness>
@@ -1792,7 +1807,7 @@
                         <c:ExplosionEffect>
                           <ColorByDistance>true</ColorByDistance>
                           <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                          <TimeSinceDeath>1.3682019578975679</TimeSinceDeath>
+                          <TimeSinceDeath>1.3671759474185377</TimeSinceDeath>
                           <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                           <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                           <Randomness>true</Randomness>
@@ -1835,7 +1850,11 @@
             </Entity>
             <Entity name="PlayerModel">
               <Components>
-                <c:Animation/>
+                <c:Animation>
+                  <Name>Hold Pos</Name>
+                  <Time>0.39573681725672838</Time>
+                  <Speed>1</Speed>
+                </c:Animation>
                 <c:HiddenForLocalPlayer/>
                 <c:Model>
                   <Resource>Models/AssaultAnimated.mesh</Resource>
@@ -1897,8 +1916,7 @@
             <Entity name="Bush">
               <Components>
                 <c:Model>
-                  <Resource>Models/Props/Flora/AliveBush.mesh</Resource>
-                  <Transparent>true</Transparent>
+                  <Resource>Models/BushAlive.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="-4.95900011" Y="0" Z="1.29897511"/>
@@ -1925,226 +1943,6 @@
         </Entity>
       </Children>
     </Entity>
-    <Entity name="SpriteOrigin">
-      <Components>
-        <c:Transform>
-          <Position X="-24.0121765" Y="1" Z="0"/>
-          <Orientation X="0" Y="1.45400012" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="Sprite1">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Props/FoliageDiff.png</DiffuseTexture>
-            </c:Sprite>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Sprite2">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Props/FoliageDiff.png</DiffuseTexture>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="-0.177861199" Y="0" Z="-1.04673338"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="HudOrigin">
-      <Components>
-        <c:Transform>
-          <Position X="-24.3529072" Y="0" Z="6.95243597"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="BackgroundHexagon">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <Color A="0.300000012" B="1" G="1" R="1"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0" Y="0.919596612" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="ProgressionHexagon">
-              <Components>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>2</CapturePointNumber>
-                </c:CapturePointHUD>
-                <c:Fill>
-                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                </c:Fill>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                  <Orientation X="0" Y="0" Z="1.57079637"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="BackgroundHexagon">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <Color A="0.300000012" B="1" G="1" R="1"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="ProgressionHexagon">
-              <Components>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>3</CapturePointNumber>
-                </c:CapturePointHUD>
-                <c:Fill>
-                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                </c:Fill>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                  <Orientation X="0" Y="0" Z="1.57079637"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="BackgroundHexagon">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="1.62788737" Y="0.919596612" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="ProgressionHexagon">
-              <Components>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>4</CapturePointNumber>
-                </c:CapturePointHUD>
-                <c:Fill>
-                  <Percentage>1</Percentage>
-                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                </c:Fill>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                  <Orientation X="0" Y="0" Z="1.57079637"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="BackgroundHexagon">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <Color A="0.300000012" B="1" G="1" R="1"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="ProgressionHexagon">
-              <Components>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>1</CapturePointNumber>
-                </c:CapturePointHUD>
-                <c:Fill>
-                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                </c:Fill>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                  <Orientation X="0" Y="0" Z="1.57079637"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="BackgroundHexagon">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="-1.58304751" Y="0.919596612" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="ProgressionHexagon">
-              <Components>
-                <c:CapturePointHUD/>
-                <c:Fill>
-                  <Percentage>1</Percentage>
-                  <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
-                </c:Fill>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                  <Orientation X="0" Y="0" Z="4.71238899"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="CameraHUDOrigin">
-      <Components>
-        <c:Transform>
-          <Position X="-24.1716995" Y="1.20387542" Z="-6.66293383"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="Camera">
-          <Components>
-            <c:Camera/>
-            <c:Model>
-              <Resource>Models/Widgets/Camera.mesh</Resource>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="1.32321239" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/RenderingWorld.xml

@@ -162,7 +162,7 @@
           <Axis X="0.200000003" Y="3.4000001" Z="0.5"/>
         </c:RaptorCopter>
         <c:Transform>
-          <Orientation X="758.059998" Y="20632.8887" Z="1320.68311"/>
+          <Orientation X="948.868286" Y="23876.6914" Z="1797.71118"/>
         </c:Transform>
       </Components>
       <Children>
@@ -347,18 +347,6 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity name="Sprite">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/HexmapDiff.png</DiffuseTexture>
-          <GlowMap>Textures/GlowFrame.png</GlowMap>
-        </c:Sprite>
-        <c:Transform>
-          <Position X="0" Y="0" Z="-3.41100025"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
     <Entity>
       <Components>
         <c:Animation>

resources/Schema/Types/Entity.xsd

@@ -42,7 +42,6 @@
 							<xs:element ref="c:AssaultWeapon" minOccurs="0"/>
 							<xs:element ref="c:Shield" minOccurs="0"/>
 							<xs:element ref="c:Shielded" minOccurs="0"/>
-							<xs:element ref="c:CapturePointHUD" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/Picking.frag.glsl

@@ -1,27 +1,16 @@
 #version 430
 
 uniform vec2 PickingColor;
-layout (binding = 0) uniform sampler2D Texture;
-uniform vec4 Color;
-uniform vec4 DiffuseColor;
-uniform vec2 DiffuseUVRepeat;
-
 
 in VertexData{
 	vec3 Position;
-	vec2 TextureCoord;
 }Input;
 
 out vec4 TextureFragment;
 
 void main()
 {
-	vec4 diffuseTexel = texture2D(Texture, Input.TextureCoord * DiffuseUVRepeat);
-
-	if(Color.a * diffuseTexel.a >= 0.9) {
-		TextureFragment = vec4(PickingColor/255, 0, 1);
-	}
-
+	TextureFragment = vec4(PickingColor/255, 0, 1);
 }
 
 

resources/Shaders/Picking.vert.glsl

@@ -12,12 +12,10 @@ layout(location = 4) in vec2 TextureCoords;
 
 out VertexData{
 	vec3 Position;
-	vec2 TextureCoord;
 }Output;
 
 void main()
 {
 	gl_Position = P*V*M * vec4(Position, 1.0);
 	Output.Position = Position, 1.0;
-	Output.TextureCoord = TextureCoords;
 }

resources/Shaders/PickingSkinned.vert.glsl

@@ -15,7 +15,6 @@ layout(location = 6) in vec4 BoneWeights;
 
 out VertexData{
 	vec3 Position;
-	vec2 TextureCoord;
 }Output;
 
 void main()
@@ -30,5 +29,4 @@ void main()
 
 	gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
 	Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
-	Output.TextureCoord = TextureCoords;
 }

resources/Shaders/Sprite.frag.glsl

@@ -30,11 +30,12 @@ void main()
 
 	float pos = ((P * vec4(Input.Position, 1)).y + 1.0)/2.0;
 	if(pos <= FillPercentage) {
-		color_result = FillColor*diffuseTexel.a;
+		color_result += FillColor;
 	}
 	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
+	color_result += glowTexel*3;
 
-	//bloomColor = vec4(clamp((glowTexel.xyz*3) - 1.0, 0, 100), 1.0);
+	bloomColor = vec4(clamp(color_result.xyz - 1.0, 0, 100), 1.0);
 }
 
 

resources/Shaders/Sprite.vert.glsl

@@ -16,8 +16,7 @@ out VertexData{
 
 void main()
 {
-
-	gl_Position = P * V * M * vec4(Position, 1.0);
+	gl_Position = P  * M * vec4(Position, 1.0);
 
 	Output.Position = Position;
 	Output.TextureCoordinate = TextureCoords;

src/Engine/Rendering/Camera.cpp

@@ -62,13 +62,6 @@ void Camera::SetViewMatrix(glm::mat4 val)
     m_ViewMatrix = val;
 }
 
-
-glm::mat4 Camera::BillboardMatrix()
-{
-    glm::mat4 matrix = glm::toMat4(m_Orientation);
-    return matrix; 
-}
-
 //void Camera::Pitch(float val)
 //{
 //	m_Pitch = val;

src/Engine/Rendering/DrawBloomPass.cpp

@@ -13,7 +13,7 @@ DrawBloomPass::DrawBloomPass(IRenderer* renderer)
 
 void DrawBloomPass::InitializeTextures()
 {
-    m_WhiteTexture = CommonFunctions::LoadTexture("Textures/Core/White.png", false);
+    m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/White.png");
 }
 
 void DrawBloomPass::InitializeShaderPrograms()

src/Engine/Rendering/DrawFinalPass.cpp

@@ -13,11 +13,10 @@ DrawFinalPass::DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCulling
 
 void DrawFinalPass::InitializeTextures()
 {
-    m_WhiteTexture = CommonFunctions::LoadTexture("Textures/Core/White.png", false);
-    m_BlackTexture = CommonFunctions::LoadTexture("Textures/Core/Black.png", false);
-    m_NeutralNormalTexture = CommonFunctions::LoadTexture("Textures/Core/NeutralNormalMap.png", false);
-    m_GreyTexture = CommonFunctions::LoadTexture("Textures/Core/Grey.png", false);
-    m_ErrorTexture = CommonFunctions::LoadTexture("Textures/Core/ErrorTexture.png", false);
+    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()
@@ -80,14 +79,6 @@ void DrawFinalPass::InitializeShaderPrograms()
     m_ExplosionEffectProgram->Link();
     GLERROR("Creating explosion program");
 
-    m_SpriteProgram = ResourceManager::Load<ShaderProgram>("#SpriteProgram");
-    m_SpriteProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Sprite.vert.glsl")));
-    m_SpriteProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Sprite.frag.glsl")));
-    m_SpriteProgram->Compile();
-    m_SpriteProgram->BindFragDataLocation(0, "sceneColor");
-    m_SpriteProgram->BindFragDataLocation(1, "bloomColor");
-    m_SpriteProgram->Link();
-    GLERROR("Creating sprite program");
 	m_ForwardPlusSplatMapProgram = ResourceManager::Load<ShaderProgram>("#ForwardPlusSplatMapProgram");
 	m_ForwardPlusSplatMapProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/ForwardPlus.vert.glsl")));
 	m_ForwardPlusSplatMapProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/ForwardPlusSplatMap.frag.glsl")));
@@ -193,8 +184,6 @@ void DrawFinalPass::Draw(RenderScene& scene)
     GLERROR("OpaqueObjects");
     DrawModelRenderQueues(scene.Jobs.TransparentObjects, scene);
     GLERROR("TransparentObjects");
-    DrawSprites(scene.Jobs.SpriteJob, scene);
-    GLERROR("SpriteJobs");
 
     //DrawStencilState* stencilState = new DrawStencilState(m_FinalPassFrameBuffer.GetHandle());
     //Draw shields to stencil pass
@@ -323,6 +312,7 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightCullingPass->LightGridSSBO());
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, m_LightCullingPass->LightIndexSSBO());
 
+
     for (auto &job : jobs) {
         auto explosionEffectJob = std::dynamic_pointer_cast<ExplosionEffectJob>(job);
         if (explosionEffectJob) {
@@ -614,55 +604,6 @@ void DrawFinalPass::DrawToDepthBuffer(std::list<std::shared_ptr<RenderJob>>& job
 
 }
 
-
-void DrawFinalPass::DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, RenderScene& scene)
-{
-    m_SpriteProgram->Bind();
-
-    GLuint shaderHandle = m_SpriteProgram->GetHandle();
-
-    for(auto& job : jobs) {
-        auto spriteJob = std::dynamic_pointer_cast<SpriteJob>(job);
-        RenderState jobState;
-
-        if (spriteJob) {
-            if(spriteJob->Depth == 0) {
-                jobState.Disable(GL_DEPTH_TEST);
-            }
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(spriteJob->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()));
-            glUniform3fv(glGetUniformLocation(shaderHandle, "CameraPos"), 1, glm::value_ptr(scene.Camera->Position()));
-            glUniform4fv(glGetUniformLocation(shaderHandle, "Color"), 1, glm::value_ptr(spriteJob->Color));
-            glUniform4fv(glGetUniformLocation(shaderHandle, "FillColor"), 1, glm::value_ptr(spriteJob->FillColor));
-            glUniform1f(glGetUniformLocation(shaderHandle, "FillPercentage"), spriteJob->FillPercentage);
-
-            glActiveTexture(GL_TEXTURE0);
-            if (spriteJob->DiffuseTexture != nullptr) {
-                glBindTexture(GL_TEXTURE_2D, spriteJob->DiffuseTexture->m_Texture);
-            } else {
-                glBindTexture(GL_TEXTURE_2D, m_ErrorTexture->m_Texture);
-            }
-
-            glActiveTexture(GL_TEXTURE1);
-            if (spriteJob->IncandescenceTexture != nullptr) {
-                glBindTexture(GL_TEXTURE_2D, spriteJob->IncandescenceTexture->m_Texture);
-            } else {
-                glBindTexture(GL_TEXTURE_2D, m_BlackTexture->m_Texture);
-            }
-
-
-            glBindVertexArray(spriteJob->Model->VAO);
-            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, spriteJob->Model->ElementBuffer);
-            glDrawElements(GL_TRIANGLES, spriteJob->EndIndex - spriteJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(spriteJob->StartIndex*sizeof(unsigned int)));
-        }
-    }
-
-    
-
-   // m_SpriteProgram->Unbind();
-}
-
 void DrawFinalPass::BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job, RenderScene& scene)
 {
 	GLERROR("Bind 1 uniform");

src/Engine/Rendering/Model.cpp

@@ -10,31 +10,60 @@ Model::Model(std::string fileName)
 		case RawModel::MaterialType::SingleTextures:
 		{
 			RawModel::MaterialSingleTextures* materialSingleTexture = static_cast<RawModel::MaterialSingleTextures*>(materialProperty.material);
-            materialSingleTexture->ColorMap.Texture = CommonFunctions::LoadTexture(materialSingleTexture->ColorMap.TexturePath, false);
-            materialSingleTexture->NormalMap.Texture = CommonFunctions::LoadTexture(materialSingleTexture->NormalMap.TexturePath, false);
-            materialSingleTexture->SpecularMap.Texture = CommonFunctions::LoadTexture(materialSingleTexture->SpecularMap.TexturePath, false);
-            materialSingleTexture->IncandescenceMap.Texture = CommonFunctions::LoadTexture(materialSingleTexture->IncandescenceMap.TexturePath, false);
+			if (!materialSingleTexture->ColorMap.TexturePath.empty()) {
+				materialSingleTexture->ColorMap.Texture = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(materialSingleTexture->ColorMap.TexturePath));
+			}
+			if (!materialSingleTexture->NormalMap.TexturePath.empty()) {
+				materialSingleTexture->NormalMap.Texture = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(materialSingleTexture->NormalMap.TexturePath));
+			}
+			if (!materialSingleTexture->SpecularMap.TexturePath.empty()) {
+				materialSingleTexture->SpecularMap.Texture = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(materialSingleTexture->SpecularMap.TexturePath));
+			}
+			if (!materialSingleTexture->IncandescenceMap.TexturePath.empty()) {
+				materialSingleTexture->IncandescenceMap.Texture = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(materialSingleTexture->IncandescenceMap.TexturePath));
+			}
 		}
 			break;
 		case RawModel::MaterialType::SplatMapping:
 		{
 			RawModel::MaterialSplatMapping* materialSplatMapping = static_cast<RawModel::MaterialSplatMapping*>(materialProperty.material);
-			materialSplatMapping->SplatMap.Texture = CommonFunctions::LoadTexture(materialSplatMapping->SplatMap.TexturePath, false);
+			if (!materialSplatMapping->SplatMap.TexturePath.empty()) {
+				materialSplatMapping->SplatMap.Texture = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(materialSplatMapping->SplatMap.TexturePath));
+			}
 			for (auto& texture : materialSplatMapping->ColorMaps)
 			{
-				texture.Texture = CommonFunctions::LoadTexture(texture.TexturePath, false);
+				if (!texture.TexturePath.empty()) {
+					texture.Texture = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(texture.TexturePath));
+				}
+				else {
+					texture.Texture = nullptr;
+				}
 			}
 			for (auto& texture : materialSplatMapping->NormalMaps)
 			{
-				texture.Texture = CommonFunctions::LoadTexture(texture.TexturePath, false);
+				if (!texture.TexturePath.empty()) {
+					texture.Texture = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(texture.TexturePath));
+				} else {
+					texture.Texture = nullptr;
+				}
 			}
 			for (auto& texture : materialSplatMapping->SpecularMaps)
 			{
-				texture.Texture = CommonFunctions::LoadTexture(texture.TexturePath, false);
+				if (!texture.TexturePath.empty()) {
+					texture.Texture = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(texture.TexturePath));
+				}
+				else {
+					texture.Texture = nullptr;
+				}
 			}
 			for (auto& texture : materialSplatMapping->IncandescenceMaps)
 			{
-				texture.Texture = CommonFunctions::LoadTexture(texture.TexturePath, false);
+				if (!texture.TexturePath.empty()) {
+					texture.Texture = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(texture.TexturePath));
+				}
+				else {
+					texture.Texture = nullptr;
+				}
 			}
 		}
 			break;

src/Engine/Rendering/PNG.cpp

@@ -4,35 +4,40 @@ PNG::PNG(std::string path)
 {
 	FILE* file = fopen(path.c_str(), "rb");
 	if (!file) {
-        throw Resource::FailedLoadingException("Failed to open texture file.");
+		LOG_ERROR("Failed to open texture file \"%s\": %s", path.c_str(), const_cast<const char*>(strerror(errno)));
+		return;
 	}
 
 	png_byte header[8];
 	fread(header, 1, 8, file);
 	bool isPNG = !png_sig_cmp(header, 0, 8);
 	if (!isPNG) {
+		LOG_ERROR("Failed to load texture file \"%s\": File isn't PNG", path.c_str());
 		fclose(file);
-        throw Resource::FailedLoadingException("File is not PNG.");
+		return;
 	}
 
 	// Initialize libpng
 	png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, (png_error_ptr)&PNG::pngErrorFunction, (png_error_ptr)&PNG::pngErrorFunction);
 	if (!png_ptr) {
+		LOG_ERROR("libpng: Failed to initialze png_struct");
 		png_destroy_read_struct(&png_ptr, nullptr, nullptr);
 		fclose(file);
-        throw Resource::FailedLoadingException("Failed to initialze png_struct.");
+		return;
 	}
 	png_infop info_ptr = png_create_info_struct(png_ptr);
 	if (!info_ptr) {
+		LOG_ERROR("libpng: Failed to initialze png_info");
 		png_destroy_read_struct(&png_ptr, nullptr, nullptr);
 		fclose(file);
-        throw Resource::FailedLoadingException("Failed to initialze png_info.");
+		return;
 	}
 	png_infop info_end_ptr = png_create_info_struct(png_ptr);
 	if (!info_end_ptr) {
+		LOG_ERROR("libpng: Failed to initialze second png_info");
 		png_destroy_read_struct(&png_ptr, &info_ptr, nullptr);
 		fclose(file);
-        throw Resource::FailedLoadingException("Failed to initialze second png_info.");
+		return;
 	}
 	png_init_io(png_ptr, file);
 
@@ -46,8 +51,8 @@ PNG::PNG(std::string path)
 	unsigned int width, height;
 	png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL);
 	if (bit_depth != 8) {
-        throw Resource::FailedLoadingException("Unsupported bit depth. Must be 8");
-
+		LOG_ERROR("libpng: Unsupported bit depth \"%i\" of image \"%s\", must be 8", bit_depth, path.c_str());
+		return;
 	}
 	switch (color_type) {
 		case PNG_COLOR_TYPE_RGB:
@@ -55,7 +60,8 @@ PNG::PNG(std::string path)
 			Format = Image::ImageFormat::RGBA;
 			break;
 		default:
-            throw Resource::FailedLoadingException("Unsupported color format.");
+			LOG_ERROR("libpng: Unsupported color format \"%i\" of image \"%s\"", color_type, path.c_str());
+			return;
 	}
 
 	// Convert RGB to RGBA, since DirectX rather treat them all the same way

src/Engine/Rendering/PickingPass.cpp

@@ -17,7 +17,6 @@ PickingPass::~PickingPass()
 
 void PickingPass::InitializeTextures()
 {
-    m_WhiteTexture = CommonFunctions::LoadTexture("Textures/Core/White.png", false);
     GenerateTexture(&m_PickingTexture, GL_CLAMP_TO_BORDER, GL_LINEAR,
         glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RG8, GL_RG, GL_UNSIGNED_BYTE);
 }
@@ -99,18 +98,8 @@ void PickingPass::Draw(RenderScene& scene)
 				glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
 				glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
 				glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
-                glUniform4fv(glGetUniformLocation(shaderSkinnedHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
 				glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
-                glActiveTexture(GL_TEXTURE0);
-                if (modelJob->DiffuseTexture.size() > 0 && modelJob->DiffuseTexture[0]->Texture != nullptr) {
-                    glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture[0]->Texture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(modelJob->DiffuseTexture[0]->UVRepeat));
-                } else {
-                    glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(glm::vec2(1.0f, 1.0f)));
-                }
-
 				if (modelJob->Model->m_RawModel->m_Skeleton != nullptr) {
 
                     std::vector<glm::mat4> frameBones;
@@ -123,17 +112,7 @@ void PickingPass::Draw(RenderScene& scene)
 				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()));
-                glUniform4fv(glGetUniformLocation(shaderHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
 				glUniform2fv(glGetUniformLocation(shaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
-
-                glActiveTexture(GL_TEXTURE0);
-                if (modelJob->DiffuseTexture.size() > 0 && modelJob->DiffuseTexture[0]->Texture != nullptr) {
-                    glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture[0]->Texture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(modelJob->DiffuseTexture[0]->UVRepeat));
-                } else {
-                    glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(glm::vec2(1.0f, 1.0f)));
-                }
 			}
 
             glBindVertexArray(modelJob->Model->VAO);
@@ -174,18 +153,8 @@ void PickingPass::Draw(RenderScene& scene)
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
-                glUniform4fv(glGetUniformLocation(shaderSkinnedHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
-                glActiveTexture(GL_TEXTURE0);
-                if (modelJob->DiffuseTexture.size() > 0 && modelJob->DiffuseTexture[0]->Texture != nullptr) {
-                    glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture[0]->Texture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(modelJob->DiffuseTexture[0]->UVRepeat));
-                } else {
-                    glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(glm::vec2(1.0f, 1.0f)));
-                }
-
                 std::vector<glm::mat4> frameBones;
                 frameBones = modelJob->Skeleton->GetBones();
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
@@ -194,18 +163,7 @@ void PickingPass::Draw(RenderScene& scene)
                 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()));
-                glUniform4fv(glGetUniformLocation(shaderHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
                 glUniform2fv(glGetUniformLocation(shaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
-
-                glActiveTexture(GL_TEXTURE0);
-                if (modelJob->DiffuseTexture.size() > 0 && modelJob->DiffuseTexture[0]->Texture != nullptr) {
-                    glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture[0]->Texture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(modelJob->DiffuseTexture[0]->UVRepeat));
-                } else {
-                    glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(glm::vec2(1.0f, 1.0f)));
-                }
-
             }
 
             glBindVertexArray(modelJob->Model->VAO);
@@ -217,7 +175,6 @@ void PickingPass::Draw(RenderScene& scene)
     for (auto &job : scene.Jobs.OpaqueShieldedObjects) {
         auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
 
-
         if (modelJob) {
             int pickColor[2] = { m_ColorCounter[0], m_ColorCounter[1] };
 
@@ -247,19 +204,8 @@ void PickingPass::Draw(RenderScene& scene)
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
-                glUniform4fv(glGetUniformLocation(shaderSkinnedHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
-                glActiveTexture(GL_TEXTURE0);
-                if (modelJob->DiffuseTexture.size() > 0 && modelJob->DiffuseTexture[0]->Texture != nullptr) {
-                    glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture[0]->Texture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(modelJob->DiffuseTexture[0]->UVRepeat));
-                } else {
-                    glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(glm::vec2(1.0f, 1.0f)));
-                }
-
-
                 std::vector<glm::mat4> frameBones;
                 frameBones = modelJob->Skeleton->GetBones();
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
@@ -269,18 +215,7 @@ void PickingPass::Draw(RenderScene& scene)
                 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()));
-                glUniform4fv(glGetUniformLocation(shaderHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
                 glUniform2fv(glGetUniformLocation(shaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
-
-                glActiveTexture(GL_TEXTURE0);
-                if (modelJob->DiffuseTexture.size() > 0 && modelJob->DiffuseTexture[0]->Texture != nullptr) {
-                    glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture[0]->Texture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(modelJob->DiffuseTexture[0]->UVRepeat));
-                } else {
-                    glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(glm::vec2(1.0f, 1.0f)));
-                }
-
             }
 
             glBindVertexArray(modelJob->Model->VAO);
@@ -324,18 +259,8 @@ void PickingPass::Draw(RenderScene& scene)
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
-                glUniform4fv(glGetUniformLocation(shaderSkinnedHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
-                glActiveTexture(GL_TEXTURE0);
-                if (modelJob->DiffuseTexture.size() > 0 && modelJob->DiffuseTexture[0]->Texture != nullptr) {
-                    glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture[0]->Texture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(modelJob->DiffuseTexture[0]->UVRepeat));
-                } else {
-                    glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(glm::vec2(1.0f, 1.0f)));
-                }
-
                 if (modelJob->Model->m_RawModel->m_Skeleton != nullptr) {
 
                     std::vector<glm::mat4> frameBones;
@@ -349,19 +274,12 @@ void PickingPass::Draw(RenderScene& scene)
                 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()));
-                glUniform4fv(glGetUniformLocation(shaderHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
                 glUniform2fv(glGetUniformLocation(shaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
-
-                glActiveTexture(GL_TEXTURE0);
-                if (modelJob->DiffuseTexture.size() > 0 && modelJob->DiffuseTexture[0]->Texture != nullptr) {
-                    glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture[0]->Texture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(modelJob->DiffuseTexture[0]->UVRepeat));
-                } else {
-                    glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
-                    glUniform2fv(glGetUniformLocation(shaderHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(glm::vec2(1.0f, 1.0f)));
-                }
             }
 
+            
+
+
             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)));

src/Engine/Rendering/RenderSystem.cpp

@@ -33,58 +33,6 @@ bool RenderSystem::OnSetCamera(Events::SetCamera& e)
     return true;
 }
 
-
-void RenderSystem::fillSprites(std::list<std::shared_ptr<RenderJob>>& jobs, World* world)
-{
-    auto sprites = world->GetComponents("Sprite");
-    if (sprites == nullptr) {
-        return;
-    }
-
-    for (auto& cSprite : *sprites) {
-        bool visible = cSprite["Visible"];
-        if (!visible) {
-            continue;
-        }
-       
-
-        EntityWrapper entity(world, cSprite.EntityID);
-
-        // Only render children of a camera if that camera is currently active
-        if (isChildOfACamera(entity) && !isChildOfCurrentCamera(entity)) {
-            continue;
-        }
-
-        // Hide things parented to local player if they have the HiddenFromLocalPlayer component
-        if (entity.HasComponent("HiddenForLocalPlayer") && (entity == m_LocalPlayer || entity.IsChildOf(m_LocalPlayer))) {
-            continue;
-        }
-
-        std::string diffuseResource = cSprite["DiffuseTexture"];
-        std::string glowResource = cSprite["GlowMap"];
-        bool depthSorted = cSprite["DepthSort"];
-        if (diffuseResource.empty() && glowResource.empty()) {
-            continue;
-        }
-
-        float fillPercentage = 0.f;
-        glm::vec4 fillColor = glm::vec4(0);
-        if (world->HasComponent(entity.ID, "Fill")) {
-            auto fillComponent = world->GetComponent(entity.ID, "Fill");
-            fillPercentage = (float)(double)fillComponent["Percentage"];
-            fillColor = (glm::vec4)fillComponent["Color"];
-        }
-
-        glm::mat4 modelMatrix = Transform::ModelMatrix(entity.ID, world);
-        //modelMatrix *= m_Camera->BillboardMatrix();
-
-
-        std::shared_ptr<SpriteJob> spriteJob = std::shared_ptr<SpriteJob>(new SpriteJob(cSprite, m_Camera, modelMatrix, world, fillColor, fillPercentage, depthSorted));
-        
-        jobs.push_back(spriteJob);
-    }
-}
-
 bool RenderSystem::isChildOfACamera(EntityWrapper entity)
 {
     return entity.FirstParentWithComponent("Camera").Valid();
@@ -261,6 +209,7 @@ void RenderSystem::fillPointLights(std::list<std::shared_ptr<RenderJob>>& jobs,
     }
 }
 
+
 void RenderSystem::fillDirectionalLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world)
 {
     auto directionalLights = world->GetComponents("DirectionalLight");
@@ -282,6 +231,7 @@ void RenderSystem::fillDirectionalLights(std::list<std::shared_ptr<RenderJob>>&
     }
 }
 
+
 void RenderSystem::fillText(std::list<std::shared_ptr<RenderJob>>& jobs, World* world)
 {
     auto texts = world->GetComponents("Text");
@@ -347,7 +297,6 @@ void RenderSystem::Update(double dt)
     fillPointLights(scene.Jobs.PointLight, m_World);
     //TODO: Make sure all objects needed are also sorted.
 	scene.Jobs.OpaqueObjects.sort();
-    fillSprites(scene.Jobs.SpriteJob, m_World);
     fillDirectionalLights(scene.Jobs.DirectionalLight, m_World);
     fillText(scene.Jobs.Text, m_World);
     m_RenderFrame->Add(scene);

src/Engine/Rendering/Renderer.cpp

@@ -106,21 +106,16 @@ void Renderer::Draw(RenderFrame& frame)
     for (auto scene : frame.RenderScenes){
         
         SortRenderJobsByDepth(*scene);
-        GLERROR("SortByDepth");
         m_PickingPass->Draw(*scene);
-        GLERROR("Drawing pickingpass");
         m_LightCullingPass->GenerateNewFrustum(*scene);
-        GLERROR("Generate frustums");
         m_LightCullingPass->FillLightList(*scene);
-        GLERROR("Filling light list");
         m_LightCullingPass->CullLights(*scene);
-        GLERROR("LightCulling");
         m_DrawFinalPass->Draw(*scene);
-        GLERROR("Draw Geometry+Light");
         //m_DrawScenePass->Draw(*scene);
 
+        GLERROR("Renderer::Draw m_DrawScenePass->Draw");
+
         m_TextPass->Draw(*scene, *m_DrawFinalPass->FinalPassFrameBuffer());
-        GLERROR("Draw Text");
 
     }
     m_DrawBloomPass->Draw(m_DrawFinalPass->BloomTexture());
@@ -147,8 +142,7 @@ void Renderer::Draw(RenderFrame& frame)
     }
 
     m_ImGuiRenderPass->Draw();
-    GLERROR("Imgui draw");
-    glfwSwapBuffers(m_Window);
+	glfwSwapBuffers(m_Window);
 }
 
 PickData Renderer::Pick(glm::vec2 screenCoord)
@@ -158,8 +152,8 @@ PickData Renderer::Pick(glm::vec2 screenCoord)
 
 void Renderer::InitializeTextures()
 {
-    m_ErrorTexture = CommonFunctions::LoadTexture("Textures/Core/ErrorTexture.png", false);
-    m_WhiteTexture = CommonFunctions::LoadTexture("Textures/Core/White.png", false);
+    m_ErrorTexture = ResourceManager::Load<Texture>("Textures/Core/ErrorTexture.png");
+    m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/White.png");
 }
 
 
@@ -167,7 +161,6 @@ void Renderer::SortRenderJobsByDepth(RenderScene &scene)
 {
     //Sort all forward jobs so transparency is good.
     scene.Jobs.TransparentObjects.sort(Renderer::DepthSort);
-    scene.Jobs.SpriteJob.sort(Renderer::DepthSort);
 }
 
 void Renderer::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type)

src/Engine/Rendering/Texture.cpp

@@ -2,25 +2,21 @@
 
 Texture::Texture(std::string path)
 {
-    PNG* img = ResourceManager::Load<PNG, true>(path); //TODO: Make this threaded. Catch exeptions in all other load places.
+    PNG image(path);
 
-    //PNG image(path);
+    if (image.Width == 0 && image.Height == 0 || image.Format == Image::ImageFormat::Unknown) {
+        image = PNG("Textures/Core/ErrorTexture.png");
+        if (image.Width == 0 && image.Height == 0 || image.Format == Image::ImageFormat::Unknown) {
+            LOG_ERROR("Couldn't even load the error texture. This is a dark day indeed.");
+            return;
+        }
+    }
 
-    //if (img->Width == 0 && img->Height == 0 || img->Format == Image::ImageFormat::Unknown) {
-    //    //image = PNG("Textures/Core/ErrorTexture.png");
-    //    //return; // Temporary fix to remove crash
-
-    //    if (img->Width == 0 && img->Height == 0 || img->Format == Image::ImageFormat::Unknown) {
-    //        LOG_ERROR("Couldn't even load the error texture. This is a dark day indeed.");
-    //        return;
-    //    }
-    //}
-
-    this->Width = img->Width;
-    this->Height = img->Height;
+    this->Width = image.Width;
+    this->Height = image.Height;
 
     GLint format;
-    switch (img->Format) {
+    switch (image.Format) {
     case Image::ImageFormat::RGB:
         format = GL_RGB;
         break;
@@ -33,7 +29,7 @@ Texture::Texture(std::string path)
     glGenTextures(1, &m_Texture);
     glBindTexture(GL_TEXTURE_2D, m_Texture);
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    glTexImage2D(GL_TEXTURE_2D, 0, format, img->Width, img->Height, 0, format, GL_UNSIGNED_BYTE, img->Data);
+    glTexImage2D(GL_TEXTURE_2D, 0, format, image.Width, image.Height, 0, format, GL_UNSIGNED_BYTE, image.Data);
 	glGenerateMipmap(GL_TEXTURE_2D);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);

src/Engine/Rendering/Util/CommonFunctions.cpp

@@ -1,19 +1,2 @@
 #include "Rendering/Util/CommonFunctions.h"
 
-Texture* CommonFunctions::LoadTexture(std::string path, bool threaded)
-{
-    Texture* img;
-    try {
-        if(threaded) {
-            img = ResourceManager::Load<Texture, true>(path);
-        } else {
-            img = ResourceManager::Load<Texture, false>(path);
-        }
-    } catch (const Resource::StillLoadingException&) {
-        img = ResourceManager::Load<Texture>("Textures/Core/ErrorTexture.png");
-    } catch (const std::exception&) {
-        img = nullptr;
-    }
-
-    return img;
-}

src/Game/Game.cpp

@@ -12,14 +12,12 @@
 #include "Systems/PlayerDeathSystem.h"
 #include "Core/EntityFileWriter.h"
 #include "Game/Systems/CapturePointSystem.h"
-#include "Game/Systems/CapturePointHUDSystem.h"
 #include "Game/Systems/PickupSpawnSystem.h"
 #include "Game/Systems/WeaponSystem.h"
 #include "Rendering/AnimationSystem.h"
 #include "Game/Systems/PlayerHUDSystem.h"
 #include "Rendering/BoneAttachmentSystem.h"
 #include "Game/Systems/LifetimeSystem.h"
-#include "../Engine/Core/UniformScaleSystem.h"
 #include "Rendering/AnimationSystem.h"
 #include "Network/MultiplayerSnapshotFilter.h"
 
@@ -32,7 +30,6 @@ Game::Game(int argc, char* argv[])
     ResourceManager::RegisterType<Model>("Model");
     ResourceManager::RegisterType<RawModel>("RawModel");
     ResourceManager::RegisterType<Texture>("Texture");
-    ResourceManager::RegisterType<PNG>("Png");
     ResourceManager::RegisterType<ShaderProgram>("ShaderProgram");
     ResourceManager::RegisterType<EntityFile>("EntityFile");
     ResourceManager::RegisterType<Font>("FontFile");
@@ -121,7 +118,6 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<WeaponSystem>(updateOrderLevel, m_Renderer, m_OctreeCollision);
     m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<CapturePointHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PickupSpawnSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
@@ -129,7 +125,6 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
     m_SystemPipeline->AddSystem<FillFrustumOctreeSystem>(updateOrderLevel, m_OctreeFrustrumCulling);
     m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<UniformScaleSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PlayerHUDSystem>(updateOrderLevel);
     // Collision and TriggerSystem should update after player.
     ++updateOrderLevel;

src/Game/Systems/CapturePointHUDSystem.cpp

@@ -1,52 +0,0 @@
-#include "Systems/CapturePointHUDSystem.h"
-
-CapturePointHUDSystem::CapturePointHUDSystem(SystemParams params)
-    : System(params)
-    , ImpureSystem()
-{
-}
-
-
-void CapturePointHUDSystem::Update(double dt)
-{
-    bool LoadCheck = true;
-    int redTeam;
-    int blueTeam;
-    int spectatorTeam;
-
-    auto CapturePointHUDElements = m_World->GetComponents("CapturePointHUD");
-    auto CapturePoints = m_World->GetComponents("CapturePoint");
-
-    for (auto& cCapturePointHUD : *CapturePointHUDElements) {
-        int HUD_ID = cCapturePointHUD["CapturePointNumber"];
-        EntityWrapper entityHUD = EntityWrapper(m_World, cCapturePointHUD.EntityID);
-        EntityWrapper entityHUDparent = entityHUD.Parent();
-
-        for (auto& cCapturePoint : *CapturePoints) {
-            EntityWrapper entityCP = EntityWrapper(m_World, cCapturePoint.EntityID);
-
-            //Check if the HUD corresponds to the Capture Point Number
-            if (HUD_ID == (int)entityCP["CapturePoint"]["CapturePointNumber"]) {
-                ComponentWrapper& teamComponent = entityCP["Team"];
-                if (LoadCheck) {
-                    redTeam = (int)teamComponent["Team"].Enum("Red");
-                    blueTeam = (int)teamComponent["Team"].Enum("Blue");
-                    spectatorTeam = (int)teamComponent["Team"].Enum("Spectator");
-                    LoadCheck = false;
-                }
-                //Color hud with team color
-                auto capturePointTeam = (int)teamComponent["Team"];
-                entityHUDparent["Sprite"]["Color"] = capturePointTeam == blueTeam ? glm::vec4(0, 0.2f, 1, 0.7) : capturePointTeam == redTeam ? glm::vec4(1, 0.2f, 0, 0.7) : glm::vec4(1, 1, 1, 0.3);
-
-                //Progress is scaled with time
-                double currentCaptureTime = (double)entityCP["CapturePoint"]["CaptureTimer"];
-                double progress = glm::abs(currentCaptureTime)/15.0;
-                int currentCapturingTeam = currentCaptureTime > 0 ? redTeam : currentCaptureTime < 0 ? blueTeam : spectatorTeam;
-                ((glm::vec3&)entityHUD["Transform"]["Orientation"]).z = currentCapturingTeam == redTeam ? glm::half_pi<float>()+glm::pi<float>() : glm::half_pi<float>();
-                glm::vec4 fillColor = currentCapturingTeam == redTeam ? glm::vec4(1, 0.2f, 0, 0.7) : glm::vec4(0, 0.2f, 1, 0.7);
-                entityHUD["Fill"]["Color"] = fillColor;
-                entityHUD["Fill"]["Percentage"] = progress;
-            }
-        }
-    }
-}

src/Game/Systems/PlayerMovementSystem.cpp

@@ -109,9 +109,15 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
             //you cant jump and dash at the same time - since there is no friction in the air and we would thus dash much further in the air
             if (!controller->PlayerIsDashing() && controller->Jumping() && !controller->Crouching() && (isOnGround || !controller->DoubleJumping())) {
                 (bool)cPhysics["IsOnGround"] = false;
-                if (velocity.y == 0.f) {
+                if (isOnGround) {
                     controller->SetDoubleJumping(false);
                 } else {
+                    //put a hexagon at the players feet
+                    auto hexagonEffect = ResourceManager::Load<EntityFile>("Schema/Entities/DoubleJumpHexagon.xml");
+                    EntityFileParser parser(hexagonEffect);
+                    EntityID hexagonEffectID = parser.MergeEntities(m_World);
+                    EntityWrapper hexagonEW = EntityWrapper(m_World, hexagonEffectID);
+                    hexagonEW["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
                     controller->SetDoubleJumping(true);
                     Events::DoubleJump e;
                     m_EventBroker->Publish(e);