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

include/Engine/Input/InputProxy.h

@@ -18,7 +18,7 @@ public:
     
     void LoadBindings(std::string file);
 	void Update(double dt);
-    void Process();
+    void Process(bool suppressNewEvents = false);
     template <typename T>
     void AddHandler();
     void Publish(const Events::InputCommand& e);

include/Engine/Network/Client.h

@@ -17,6 +17,7 @@
 #include "Network/TCPClient.h"
 #include "Network/SnapshotDefinitions.h"
 #include "Core/World.h"
+#include "Core/EntityFile.h"
 #include "Core/EventBroker.h"
 #include "Core/ConfigFile.h"
 #include "Core/EPlayerDeath.h"
@@ -30,7 +31,7 @@
 #include "Network/ESearchForServers.h"
 #include "../Game/Events/EDashAbility.h"
 #include "Network/EDisplayServerlist.h"
-
+#include "Network/EConnectRequest.h"
 class Client : public Network
 {
 public:
@@ -108,6 +109,8 @@ private:
     void sendLocalPlayerTransform();
     void becomePlayer();
     void displayServerlist();
+    void removeWorld();
+    void createMainMenu();
     // Mapping Logic
     // Returns if local EntityID exist in map
     bool clientServerMapsHasEntity(EntityID clientEntityID);
@@ -128,6 +131,8 @@ private:
     bool OnDoubleJump(Events::DoubleJump & e);
     EventRelay<Client, Events::DashAbility> m_EDashAbility;
     bool OnDashAbility(const Events::DashAbility& e);
+    EventRelay<Client, Events::ConnectRequest> m_EConnectRequest;
+    bool OnConnectRequest(const Events::ConnectRequest& e);
 
     bool OnSearchForServers(const Events::SearchForServers& e);
     UDPClient m_ServerlistRequest;

include/Engine/Network/NetworkClient.h

@@ -11,7 +11,7 @@ class NetworkClient
 public:
     NetworkClient();
     virtual ~NetworkClient();
-    virtual void Connect(std::string playerName, std::string address, int port) = 0;
+    virtual bool Connect(std::string playerName, std::string address, int port) = 0;
     virtual void Disconnect() = 0;
     virtual void Receive(Packet& packet) = 0;
     virtual void Send(Packet & packet) = 0;

include/Engine/Network/Server.h

@@ -60,6 +60,7 @@ private:
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
     std::clock_t m_StartPingTime;
+    std::string m_ServerName = "";
 
     // Packet loss logic
     PacketID m_PacketID = 0;

include/Engine/Network/TCPClient.h

@@ -10,7 +10,7 @@ public:
     TCPClient();
     ~TCPClient();
 
-    void Connect(std::string playerName, std::string address, int port);
+    bool Connect(std::string playerName, std::string address, int port);
     void Disconnect();
     void Receive(Packet& packet);
     void Send(Packet & packet);

include/Engine/Network/UDPClient.h

@@ -10,7 +10,7 @@ public:
     UDPClient();
     ~UDPClient();
 
-    void Connect(std::string playerName, std::string address, int port);
+    bool Connect(std::string playerName, std::string address, int port);
     void Disconnect();
     void Receive(Packet& packet);
     void Send(Packet & packet);

include/Engine/Rendering/BlurHUD.h

@@ -48,7 +48,7 @@ private:
     //const LightCullingPass* m_LightCullingPass 
     int m_Iterations = 3;
 	int m_Quality = 0;
-    float m_BlurQuality = 2.f;
+    float m_BlurQuality = 4.f;
 
     GLuint m_GaussianTexture_horiz = 0;
     GLuint m_GaussianTexture_vert = 0;

include/Engine/Rendering/CubeMapPass.h

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

include/Engine/Rendering/DrawBloomPass.h

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

include/Engine/Rendering/DrawFinalPass.h

@@ -17,7 +17,7 @@ class DrawFinalPass
 {
 public:
     DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass);
-    ~DrawFinalPass() { }
+	~DrawFinalPass();
     void InitializeTextures();
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
@@ -57,11 +57,11 @@ private:
 
     FrameBuffer m_FinalPassFrameBuffer;
 	FrameBuffer m_ShieldDepthFrameBuffer;
-    GLuint m_BloomTexture;
-    GLuint m_SceneTexture;
-    GLuint m_DepthBuffer;
-	GLuint m_ShieldBuffer;
-    GLuint m_CubeMapTexture;
+    GLuint m_BloomTexture = 0;
+    GLuint m_SceneTexture = 0;
+    GLuint m_DepthBuffer = 0;
+	GLuint m_ShieldBuffer = 0;
+    GLuint m_CubeMapTexture = 0;
     GLuint m_FullBlurredTexture;
     GLuint m_CombinedTexture; //This can be removed for less memory usage, just set m_sceneTexture to the return from m_BlurHUDPass.CombineTextures 
 

include/Engine/Rendering/ModelJob.h

@@ -111,7 +111,7 @@ struct ModelJob : RenderJob
         Color = modelComponent["Color"];
         GlowIntensity = ((double)modelComponent["GlowIntensity"]);
         Entity = modelComponent.EntityID;
-        glm::vec3 abspos = Transform::AbsolutePosition(world, modelComponent.EntityID);
+        glm::vec3 abspos = glm::vec3(matrix[3][0], matrix[3][1], matrix[3][2]);
         glm::vec3 worldpos = glm::vec3(camera->ViewMatrix() * glm::vec4(abspos, 1));
         Depth = worldpos.z;
         World = world;
@@ -164,7 +164,9 @@ struct ModelJob : RenderJob
 	bool IsShielded;
     void CalculateHash() override
     {
-        Hash = ShaderID << 20 + ModelID << 10 + TextureID;
+		Hash = TextureID;
+		Hash += ModelID << 10;
+		Hash += ShaderID << 20;
     }
 };
 

include/Engine/Rendering/PickingPass.h

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

include/Engine/Rendering/RenderJob.h

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

include/Engine/Rendering/Renderer.h

@@ -37,6 +37,7 @@ public:
 		: m_EventBroker(eventBroker)
 		, m_Config(config)
     { }
+	~Renderer();
 
     virtual void Initialize() override;
     virtual void Update(double dt) override;

include/Engine/Rendering/SSAOPass.h

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

include/Engine/Rendering/ShaderProgram.h

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

include/Engine/Rendering/SpriteJob.h

@@ -7,6 +7,7 @@
 #include "../GLM.h"
 #include "../Core/ComponentWrapper.h"
 #include "Texture.h"
+#include "TextureSprite.h"
 #include "Model.h"
 #include "RenderJob.h"
 #include "../Core/ResourceManager.h"
@@ -24,9 +25,9 @@ struct SpriteJob : RenderJob
         ::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
         TextureID = 0;
 
-        DiffuseTexture = CommonFunctions::LoadTexture(cSprite["DiffuseTexture"], true);
+        DiffuseTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["DiffuseTexture"]);
 
-        IncandescenceTexture = CommonFunctions::LoadTexture(cSprite["GlowMap"], true);
+        IncandescenceTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["GlowMap"]);
 
         StartIndex = matProp.material->StartIndex;
         EndIndex = matProp.material->EndIndex;

include/Engine/Rendering/Texture.h

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

include/Engine/Rendering/TextureSprite.h

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

include/Engine/Rendering/Util/CommonFunctions.h

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

include/Game/Systems/StartSystem.h

@@ -0,0 +1,23 @@
+#ifndef StartSystem_h__
+#define StartSystem_h__
+
+#include "Core/System.h"
+#include "Core/ResourceManager.h"
+#include "Core/Event.h"
+#include "Core/EventBroker.h"
+#include "Rendering/ESetCamera.h"
+
+class StartSystem : public ImpureSystem
+{
+public:
+    StartSystem(SystemParams params);
+    virtual void Update(double dt) override;
+
+private:
+    EntityWrapper m_ActiveCamera = EntityWrapper::Invalid;
+    
+    EventRelay<StartSystem, Events::SetCamera> m_ECameraActivated;
+    bool OnCameraActivated(const Events::SetCamera& e);
+};
+
+#endif

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -32,20 +32,19 @@ public:
 
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override
     {
-        EntityWrapper firstPersonWeapon = entity.FirstChildByName("Hands").FirstChildByName("AssaultWeapon");
-        EntityWrapper thirdPersonWeapon = entity.FirstChildByName("PlayerModel").FirstChildByName("AssaultWeapon");
-        if (IsClient && (firstPersonWeapon.Valid() || thirdPersonWeapon.Valid())) {
-            if (m_ActiveWeapons.count(entity) == 0) {
+        /* EntityWrapper firstPersonWeapon = entity.FirstChildByName("Hands").FirstChildByName("AssaultWeapon");
+         EntityWrapper thirdPersonWeapon = entity.FirstChildByName("PlayerModel").FirstChildByName("AssaultWeapon");
+         if (IsClient && (firstPersonWeapon.Valid() || thirdPersonWeapon.Valid())) {
+             if (m_ActiveWeapons.count(entity) == 0) {
+                 WeaponInfo& wi = m_ActiveWeapons[entity];
+                 wi.Player = entity;
+                 wi.WeaponEntity = entity;
+                 wi.FirstPersonEntity = firstPersonWeapon;
+                 wi.ThirdPersonEntity = thirdPersonWeapon;
 
-                WeaponInfo& wi = m_ActiveWeapons[entity];
-                wi.Player = entity;
-                wi.WeaponEntity = entity;
-                wi.FirstPersonEntity = firstPersonWeapon;
-                wi.ThirdPersonEntity = thirdPersonWeapon;
-
-                OnEquip(cWeapon, wi);
-            }
-        }
+                 OnEquip(cWeapon, wi);
+             }
+         }*/
 
         auto weapon = getActiveWeapon(entity);
         if (!weapon) {
@@ -61,7 +60,9 @@ protected:
         EntityWrapper Player;
         EntityWrapper WeaponEntity;
         EntityWrapper FirstPersonEntity;
+        EntityWrapper FirstPersonPlayerModel;
         EntityWrapper ThirdPersonEntity;
+        EntityWrapper ThirdPersonPlayerModel;
     };
 
     IRenderer* m_Renderer;
@@ -89,7 +90,7 @@ protected:
 
     // Returns wi.FirstPersonEntity or wi.ThirdPersonEntity depending on
     // if the player is in first person mode or not.
-    EntityWrapper getRelevantWeaponModelEntity(WeaponInfo& wi)
+    EntityWrapper getRelevantWeaponEntity(WeaponInfo& wi)
     {
         if (isPlayerInFirstPerson(wi.Player)) {
             return wi.FirstPersonEntity;
@@ -137,7 +138,7 @@ protected:
 
     void playAnimationAndReturn(EntityWrapper weaponModelEntity, const std::string& subTreeName, const std::string& animationNodeName)
     {
-        EntityWrapper root = weaponModelEntity.FirstParentWithComponent("Model");
+        EntityWrapper root = weaponModelEntity;
         if (!root.Valid()) {
             return;
         }
@@ -254,9 +255,9 @@ private:
 
     void selectWeapon(ComponentWrapper cWeapon, EntityWrapper player)
     {
-        if (!IsServer) {
-            return;
-        }
+        //if (!IsServer) {
+        //    return;
+        //}
 
         // Don't reselect weapon if it's already active
         if (getActiveWeapon(player)) {
@@ -287,20 +288,24 @@ private:
         // Spawn the weapon(s)
         EntityWrapper firstPersonWeapon;
         EntityWrapper thirdPersonWeapon;
-        //if (IsClient) {
+        if (IsClient) {
             if (firstPersonAttachment.Valid()) {
                 firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
             }
-        //}
-        if (thirdPersonAttachment.Valid()) {
-            thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
+        }
+        if (IsServer) {
+            if (thirdPersonAttachment.Valid()) {
+                thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
+            }
         }
 
         WeaponInfo& wi = m_ActiveWeapons[player];
         wi.Player = player;
         wi.WeaponEntity = player;
         wi.FirstPersonEntity = firstPersonWeapon;
+        wi.FirstPersonPlayerModel = firstPersonWeapon;
         wi.ThirdPersonEntity = thirdPersonWeapon;
+        wi.ThirdPersonPlayerModel = thirdPersonWeapon.FirstParentWithComponent("Model");
         
         OnEquip(cWeapon, wi);
     }

resources/Schema/Components/Animation.xml

@@ -4,7 +4,7 @@
 	<Time>0</Time>
 	<Play>false</Play>
 	<Reverse>false</Reverse>
-	<Speed>0</Speed>
+	<Speed>1</Speed>
 	<Loop>true</Loop>
 	<Additive>false</Additive>
 </Animation>

resources/Schema/Components/ExplosionEffect.xml

@@ -3,6 +3,8 @@
 	<ExplosionOrigin X="0" Y="0" Z="0"/>
 	<TimeSinceDeath>0</TimeSinceDeath>
 	<ExplosionDuration>2</ExplosionDuration>
+	<Speed>1</Speed>
+	<Delay>0</Delay>
 	<!--<Gravity>1</Gravity>-->
 	<!--<GravityForce>1</GravityForce>-->
 	<!--<ObjectRadius>2</ObjectRadius>-->

resources/Schema/Components/ExplosionEffect.xsd

@@ -18,6 +18,8 @@
 				<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="Speed" type="t:double" minOccurs="0"/>
+				<xs:element name="Delay" type="t:double" minOccurs="0"/>
 				<!--<xs:element name="Gravity" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Enable/disable gravity</xs:documentation></xs:annotation>
 				</xs:element>-->

resources/Schema/Entities/AmmoHUD

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="AmmunitionHUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:AmmunitionHUD/>
-    <c:Transform>
-      <Position X="-0.0430000015" Y="0.131501317" Z="-0.0670000017"/>
-      <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="AmmunitionHUDBackground">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-          <Color A="0.588235319" B="0" G="0" R="0"/>
-        </c:Sprite>
-        <c:Transform>
-          <Position X="0" Y="0" Z="-0.00200000009"/>
-          <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="MagazineAmmo">
-          <Components>
-            <c:Text>
-              <Content>0</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-              <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-            </c:Text>
-            <c:Transform>
-              <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Ammo">
-          <Components>
-            <c:Text>
-              <Content>360</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-              <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-            </c:Text>
-            <c:Transform>
-              <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
-              <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Transform>
-          <Position X="-0.00200000009" Y="0.00400000019" Z="-0.00100000005"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="MagazineAmmo">
-          <Components>
-            <c:Text>
-              <Content>0</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-              <Color A="1" B="0" G="0" R="0"/>
-            </c:Text>
-            <c:Transform>
-              <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Ammo">
-          <Components>
-            <c:Text>
-              <Content>360</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-              <Color A="1" B="0" G="0" R="0"/>
-            </c:Text>
-            <c:Transform>
-              <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
-              <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/BlendTreeAssaultWeapon.xml

@@ -1,46 +1,102 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="PrimaryBlendTree" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="Hands" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:Blend>
-      <Pose1>Idle</Pose1>
-      <Pose2>WeaponAction</Pose2>
-      <Weight>0</Weight>
-      <SubTreeRoot>true</SubTreeRoot>
-    </c:Blend>
+    <c:BlendAdditive>
+      <Adder>MovementBlend</Adder>
+      <Receiver>FinalBlend</Receiver>
+    </c:BlendAdditive>
+    <c:Model>
+      <Resource>Models/Characters/Assault/FirstPersonAssaultBlue.mesh</Resource>
+    </c:Model>
     <c:Transform/>
   </Components>
 
   <Children>
-    <Entity name="WeaponAction">
+    <Entity name="FinalBlend">
       <Components>
         <c:Blend>
-          <Pose1>Fire</Pose1>
-          <Pose2>Reload</Pose2>
-          <Weight>1</Weight>
+          <Pose1>BlendTreeAssaultWeapon</Pose1>
+          <Pose2>BlendTreeSecondaryWeapon</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
         </c:Blend>
         <c:Transform/>
       </Components>
       <Children>
-        <Entity name="Fire">
+        <Entity name="BlendTreeAssaultWeapon">
+          <Components>
+            <c:Blend>
+              <Pose1>Fire</Pose1>
+              <Pose2>Reload</Pose2>
+              <Weight>0</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Reload">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ReloadSwitchF</AnimationName>
+                  <Speed>0.5</Speed>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Fire">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ShootRifleF</AnimationName>
+                  <Speed>1</Speed>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BlendTreeSecondaryWeapon">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="MovementBlend">
+      <Components>
+        <c:Blend>
+          <Pose1>Idle</Pose1>
+          <Pose2>Run</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Run">
           <Components>
             <c:Animation>
-              <AnimationName>ShootShotgunF</AnimationName>
+              <AnimationName>RunF</AnimationName>
               <Speed>1</Speed>
               <Play>true</Play>
-              <Loop>false</Loop>
+              <Additive>true</Additive>
             </c:Animation>
             <c:Transform/>
           </Components>
           <Children/>
         </Entity>
-        <Entity name="Reload">
+        <Entity name="Idle">
           <Components>
             <c:Animation>
-              <AnimationName>ReloadSwitchF</AnimationName>
-              <Time>0.58991607886241582</Time>
+              <AnimationName>IdleF</AnimationName>
               <Speed>1</Speed>
               <Play>true</Play>
+              <Additive>true</Additive>
             </c:Animation>
             <c:Transform/>
           </Components>
@@ -48,17 +104,116 @@
         </Entity>
       </Children>
     </Entity>
-    <Entity name="Idle">
+    <Entity name="ViewModel">
       <Components>
-        <c:Animation>
-          <AnimationName>IdleF</AnimationName>
-          <Time>0.14837891922093149</Time>
-          <Speed>1</Speed>
-          <Play>true</Play>
-        </c:Animation>
-        <c:Transform/>
+        <c:BoneAttachment>
+          <BoneName>R_Arm_Weapon_Joint</BoneName>
+        </c:BoneAttachment>
+        <c:Model>
+          <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0.120748274" Y="-0.228437141" Z="-0.181454718"/>
+          <Orientation X="0.0104048206" Y="-0.00268219248" Z="0.0428443849"/>
+        </c:Transform>
       </Components>
-      <Children/>
+      <Children>
+        <Entity name="WeaponMuzzle">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.00800000038" Y="0.0920000076" Z="-0.416000009"/>
+              <Orientation X="6.2760005" Y="0.00500000035" Z="0.00600000005"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ReloadSpawner">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/WeaponAssaultReloadEffectView.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="AmmoHUD">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Ammo_Joint</BoneName>
+          <ScaleOffset X="0.5" Y="0.5" Z="1"/>
+          <InheritScale>true</InheritScale>
+        </c:BoneAttachment>
+        <c:Transform>
+          <Position X="0.0540266186" Y="-0.0954354703" Z="-0.255526125"/>
+          <Orientation X="0.000684258412" Y="0.077423811" Z="0.00118651299"/>
+          <Scale X="0.50000006" Y="0.500000477" Z="1.00000083"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Background">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.588235319" B="0" G="0" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.00200000009"/>
+              <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Text">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="MagazineAmmo">
+              <Components>
+                <c:Text>
+                  <Content>32</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:TextFieldReader>
+                  <ParentEntityName>PlayerAssault</ParentEntityName>
+                  <ComponentType>AssaultWeapon</ComponentType>
+                  <Field>MagazineAmmo</Field>
+                </c:TextFieldReader>
+                <c:Transform>
+                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Ammo">
+              <Components>
+                <c:Text>
+                  <Content>320</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:TextFieldReader>
+                  <ParentEntityName>PlayerAssault</ParentEntityName>
+                  <ComponentType>AssaultWeapon</ComponentType>
+                  <Field>Ammo</Field>
+                </c:TextFieldReader>
+                <c:Transform>
+                  <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
+                  <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
     </Entity>
   </Children>
 

resources/Schema/Entities/BlendTreeDefenderWeapon.xml

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="Hands" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BlendAdditive>
+      <Adder>MovementBlend</Adder>
+      <Receiver>FinalBlend</Receiver>
+    </c:BlendAdditive>
+    <c:Model>
+      <Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
+    </c:Model>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="FinalBlend">
+      <Components>
+        <c:Blend>
+          <Pose1>BlendTreeDefenderWeapon</Pose1>
+          <Pose2>BlendTreeSecondaryWeapon</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="BlendTreeDefenderWeapon">
+          <Components>
+            <c:Blend>
+              <Pose1>ActionBlend</Pose1>
+              <Pose2>Shield</Pose2>
+              <Weight>0</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Shield">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ActivateDeactiveShieldF</AnimationName>
+                  <Time>1</Time>
+                  <Speed>1</Speed>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="ActionBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>Idle</Pose1>
+                  <Pose2>ActionBlend2</Pose2>
+                  <Weight>0</Weight>
+                  <SubTreeRoot>true</SubTreeRoot>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="Idle">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>IdleF</AnimationName>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="ActionBlend2">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>Fire</Pose1>
+                      <Pose2>Reload</Pose2>
+                      <Weight>0</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="Fire">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShootShotgunF</AnimationName>
+                          <Time>0.5</Time>
+                          <Speed>1</Speed>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="Reload">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShotgunReloadTwoF</AnimationName>
+                          <Time>0.23333333432674408</Time>
+                          <Speed>1</Speed>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BlendTreeSecondaryWeapon">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="MovementBlend">
+      <Components>
+        <c:Blend>
+          <Pose1>Idle</Pose1>
+          <Pose2>Run</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Run">
+          <Components>
+            <c:Animation>
+              <AnimationName>RunF</AnimationName>
+              <Time>0.93061516164344571</Time>
+              <Speed>1</Speed>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Idle">
+          <Components>
+            <c:Animation>
+              <AnimationName>IdleF</AnimationName>
+              <Time>0.11396167157691739</Time>
+              <Speed>1</Speed>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/BlueRifle

@@ -1,19 +0,0 @@
-<?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:BoneAttachment>
-      <BoneName>R_Arm_Weapon_Joint</BoneName>
-    </c:BoneAttachment>
-    <c:Model>
-      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-    </c:Model>
-    <c:Transform>
-      <Position X="0.136586398" Y="0.92942369" Z="-0.139760047"/>
-      <Orientation X="-0.601206124" Y="0.132410824" Z="-0.129014626"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/BoneMarker

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="R_Leg_Top" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:BoneAttachment>
-      <BoneName>R_Leg_Top</BoneName>
-      <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-    </c:BoneAttachment>
-    <c:Model>
-      <Resource>Models/Core/UnitCube.mesh</Resource>
-      <Color A="1" B="1" G="19.6078434" R="1"/>
-    </c:Model>
-    <c:Transform>
-      <Position X="0.0664939061" Y="0.714353919" Z="0.0475388765"/>
-      <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-      <Orientation X="-0.783109188" Y="-0.0050998251" Z="3.14151597"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/DeadGirl.xlm

@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:AABB>
-      <Origin X="0" Y="0.772000015" Z="0"/>
-      <Size X="1" Y="1.60000002" Z="1"/>
-    </c:AABB>
-    <c:AssaultWeapon>
-      <RPM>600</RPM>
-    </c:AssaultWeapon>
-    <c:Collidable/>
-    <c:DashAbility/>
-    <c:Health/>
-    <c:Physics>
-      <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
-    </c:Physics>
-    <c:Player>
-      <MovementSpeed>5</MovementSpeed>
-    </c:Player>
-    <c:Team>
-      <Team>
-        <Red/>
-      </Team>
-    </c:Team>
-    <c:Transform>
-      <Position X="0" Y="0.0288832653" Z="2.64837074"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="Camera">
-      <Components>
-        <c:Camera/>
-        <c:Transform>
-          <Position X="0" Y="1.27700007" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="PlayerName">
-          <Components>
-            <c:Text>
-              <Resource>Fonts/DroidSans.ttf,100</Resource>
-              <Color A="1" B="0" G="1" R="0"/>
-            </c:Text>
-            <c:Transform>
-              <Position X="0.100000001" Y="0.248000011" Z="-0.248000011"/>
-              <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
-              <Orientation X="0" Y="3.14199996" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="CameraModel">
-          <Components>
-            <c:Model>
-              <Resource>Models/Widgets/Camera.mesh</Resource>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
-              <Scale X="1.30000007" Y="1.50000012" Z="1"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="HUD">
-          <Components>
-            <c:Transform>
-              <Position X="0" Y="0" Z="-0.5"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="HealthBar">
-              <Components>
-                <c:Fill>
-                  <Percentage>1</Percentage>
-                  <Color A="0" B="1" G="0" R="0"/>
-                </c:Fill>
-                <c:HealthHUD/>
-                <c:Model>
-                  <Resource>Models/Core/UnitHexagon.mesh</Resource>
-                  <Color A="1" B="0.70588237" G="0.70588237" R="0.70588237"/>
-                </c:Model>
-                <c:Transform>
-                  <Position X="-0.383000016" Y="-0.185000002" Z="0"/>
-                  <Scale X="0.150000006" Y="0.150000006" Z="0.150000006"/>
-                  <Orientation X="0" Y="0.594000041" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="Crosshair">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
-                  <DepthSort>false</DepthSort>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.200000003"/>
-                  <Scale X="0.0250000004" Y="0.0250000004" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Hands">
-          <Components>
-            <c:Animation>
-              <AnimationName1>Idle</AnimationName1>
-              <Time1>0.28963486380924053</Time1>
-              <Speed1>1</Speed1>
-            </c:Animation>
-            <c:Model>
-              <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
-              <Transparent>true</Transparent>
-            </c:Model>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="WeaponModel">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:Model>
-                  <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-                  <Transparent>true</Transparent>
-                </c:Model>
-                <c:Transform>
-                  <Position X="0.120430455" Y="-0.231800437" Z="-0.181454748"/>
-                  <Orientation X="0.0104047749" Y="-0.00268166233" Z="0.042844031"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="WeaponMuzzle">
-                  <Components>
-                    <c:Spawner>
-                      <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
-                    </c:Spawner>
-                    <c:Transform>
-                      <Position X="0.00325386273" Y="0.0970000029" Z="-0.843000054"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="FirstPersonReloadSpawner">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/WeaponReloadEffect.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="ThirdPersonCamera">
-      <Components>
-        <c:Camera/>
-        <c:Model>
-          <Resource>Models/Widgets/Camera.mesh</Resource>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.284000009" Y="1.83800006" Z="1.18900001"/>
-          <Orientation X="5.95600033" Y="0" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="PlayerModel">
-      <Components>
-        <c:Animation>
-          <AnimationName1>Idle</AnimationName1>
-          <Time1>0.42156525436696768</Time1>
-          <Speed1>1</Speed1>
-        </c:Animation>
-        <c:AnimationOffset>
-          <AnimationName>AimRifle</AnimationName>
-          <Time>0.5</Time>
-        </c:AnimationOffset>
-        <c:HiddenForLocalPlayer/>
-        <c:Model>
-          <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
-          <Color A="1" B="0" G="0" R="1"/>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="ThirdPersonWeaponModel">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.160716802" Y="1.02800739" Z="-0.215931982"/>
-              <Orientation X="-0.0627654716" Y="-0.0450839326" Z="0.119217664"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="ThirdPersonWeaponMuzzle">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.00644115033" Y="0.096679531" Z="-0.436609417"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="AABBStanding">
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="0.427450985" B="1" G="1" R="1"/>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0.772000015" Z="0"/>
-          <Scale X="1" Y="1.60000002" Z="1"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="AABBCrouching">
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="0.745098054" B="1" G="0" R="1"/>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0.772000015" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/FirstPersonArms

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Wave" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Animation>
-      <AnimationName1>Run</AnimationName1>
-      <Weight1>0.5</Weight1>
-      <Time1>0.97312056690160276</Time1>
-      <Speed1>1</Speed1>
-      <Speed2>1</Speed2>
-      <AnimationName2>ReloadSwitch</AnimationName2>
-      <Time2>0.91310356788604263</Time2>
-      <AnimationName3>LeftRight</AnimationName3>
-      <Weight3>0</Weight3>
-      <Time3>0.040207288496060478</Time3>
-      <Speed3>1</Speed3>
-    </c:Animation>
-    <c:AnimationOffset>
-      <AnimationName>DownUp</AnimationName>
-      <Time>0.77999961376190186</Time>
-    </c:AnimationOffset>
-    <c:Model>
-      <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
-      <Color A="0.627451003" B="19.6078434" G="1" R="3.92156863"/>
-      <Transparent>true</Transparent>
-    </c:Model>
-    <c:Transform>
-      <Position X="-0.690088332" Y="1.00491476" Z="0"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Arm_Weapon_Joint</BoneName>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Weapons/Blue/AssaultWeapon.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.120778561" Y="-0.223796993" Z="-0.15143311"/>
-          <Orientation X="0.0957378224" Y="0.0132024018" Z="0.0284451656"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Camera/>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/MainMenu.xml

@@ -12,52 +12,11 @@
     <Entity name="Side_Origin">
       <Components>
         <c:Transform>
-          <Position X="-0.377000004" Y="0.0400000028" Z="0"/>
-          <Orientation X="0" Y="0.797000051" Z="0"/>
+          <Position X="-0.443000019" Y="0.0400000028" Z="0"/>
+          <Orientation X="0" Y="0.867000043" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
-        <Entity name="ButtonPos_3">
-          <Components>
-            <c:Transform>
-              <Position X="0" Y="-0.140000001" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="Button_3">
-              <Components>
-                <c:Button/>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                  <BlurBackground>true</BlurBackground>
-                  <GlowMap></GlowMap>
-                  <Color A="0.588235319" B="1" G="1" R="1"/>
-                </c:Sprite>
-                <c:Transform>
-                  <Scale X="0.200000003" Y="0.0500000007" Z="1"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="Text">
-              <Components>
-                <c:Text>
-                  <Content>Credits</Content>
-                  <Resource>Fonts/DroidSans.ttf,64</Resource>
-                  <Color A="1" B="0" G="0" R="0"/>
-                  <Alignment>
-                    <Left/>
-                  </Alignment>
-                </c:Text>
-                <c:Transform>
-                  <Position X="-0.075000003" Y="-0.0150000006" Z="0.00100000005"/>
-                  <Scale X="0.0199999996" Y="0.0199999996" Z="1"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
         <Entity name="ButtonPos_1">
           <Components>
             <c:Transform/>
@@ -70,7 +29,8 @@
                   <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
                   <BlurBackground>true</BlurBackground>
                   <GlowMap></GlowMap>
-                  <Color A="0.588235319" B="1" G="1" R="1"/>
+                  <DepthSort>false</DepthSort>
+                  <Color A="0.392156869" B="0" G="0" R="0"/>
                 </c:Sprite>
                 <c:InputCmdButton>
                   <Command>Play</Command>
@@ -87,18 +47,126 @@
                 <c:Text>
                   <Content>Play</Content>
                   <Resource>Fonts/DroidSans.ttf,64</Resource>
-                  <Color A="1" B="0" G="0" R="0"/>
                   <Alignment>
-                    <Left/>
+                    <Right/>
                   </Alignment>
                 </c:Text>
                 <c:Transform>
-                  <Position X="-0.075000003" Y="-0.0150000006" Z="0.00100000005"/>
+                  <Position X="0.0920000002" Y="-0.0150000006" Z="0.00499999989"/>
                   <Scale X="0.0199999996" Y="0.0199999996" Z="1"/>
                 </c:Transform>
               </Components>
               <Children/>
             </Entity>
+            <Entity name="ButtonCorner_Origin">
+              <Components>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="TopRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="BottomRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
+                      <Orientation X="0" Y="0" Z="4.71199989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="ButtonPos_3">
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="-0.140000001" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Button_3">
+              <Components>
+                <c:Button/>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                  <BlurBackground>true</BlurBackground>
+                  <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
+                  <Color A="0.392156869" B="0" G="0" R="0"/>
+                </c:Sprite>
+                <c:Transform>
+                  <Scale X="0.200000003" Y="0.0500000007" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Text">
+              <Components>
+                <c:Text>
+                  <Content>Credits</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Alignment>
+                    <Right/>
+                  </Alignment>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0.0920000002" Y="-0.0150000006" Z="0.00499999989"/>
+                  <Scale X="0.0199999996" Y="0.0199999996" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="ButtonCorner_Origin">
+              <Components>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="TopRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="BottomRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
+                      <Orientation X="0" Y="0" Z="4.71199989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
           </Children>
         </Entity>
         <Entity name="ButtonPos_2">
@@ -115,7 +183,8 @@
                   <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
                   <BlurBackground>true</BlurBackground>
                   <GlowMap></GlowMap>
-                  <Color A="0.588235319" B="1" G="1" R="1"/>
+                  <DepthSort>false</DepthSort>
+                  <Color A="0.392156869" B="0" G="0" R="0"/>
                 </c:Sprite>
                 <c:Transform>
                   <Scale X="0.200000003" Y="0.0500000007" Z="1"/>
@@ -128,18 +197,51 @@
                 <c:Text>
                   <Content>Option</Content>
                   <Resource>Fonts/DroidSans.ttf,64</Resource>
-                  <Color A="1" B="0" G="0" R="0"/>
                   <Alignment>
-                    <Left/>
+                    <Right/>
                   </Alignment>
                 </c:Text>
                 <c:Transform>
-                  <Position X="-0.075000003" Y="-0.0150000006" Z="0.00100000005"/>
+                  <Position X="0.0920000076" Y="-0.0150000006" Z="0.00499999989"/>
                   <Scale X="0.0199999996" Y="0.0199999996" Z="1"/>
                 </c:Transform>
               </Components>
               <Children/>
             </Entity>
+            <Entity name="ButtonCorner_Origin">
+              <Components>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="TopRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="BottomRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
+                      <Orientation X="0" Y="0" Z="4.71199989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
           </Children>
         </Entity>
         <Entity name="ButtonPos_4">
@@ -156,7 +258,8 @@
                   <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
                   <BlurBackground>true</BlurBackground>
                   <GlowMap></GlowMap>
-                  <Color A="0.588235319" B="1" G="1" R="1"/>
+                  <DepthSort>false</DepthSort>
+                  <Color A="0.392156869" B="0" G="0" R="0"/>
                 </c:Sprite>
                 <c:Transform>
                   <Scale X="0.200000003" Y="0.0500000007" Z="1"/>
@@ -169,18 +272,51 @@
                 <c:Text>
                   <Content>Quit</Content>
                   <Resource>Fonts/DroidSans.ttf,64</Resource>
-                  <Color A="1" B="0" G="0" R="0"/>
                   <Alignment>
-                    <Left/>
+                    <Right/>
                   </Alignment>
                 </c:Text>
                 <c:Transform>
-                  <Position X="-0.075000003" Y="-0.0150000006" Z="0.00100000005"/>
+                  <Position X="0.0920000002" Y="-0.0150000006" Z="0.00499999989"/>
                   <Scale X="0.0199999996" Y="0.0199999996" Z="1"/>
                 </c:Transform>
               </Components>
               <Children/>
             </Entity>
+            <Entity name="ButtonCorner_Origin">
+              <Components>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="TopRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="BottomRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
+                      <Orientation X="0" Y="0" Z="4.71199989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
           </Children>
         </Entity>
       </Children>

resources/Schema/Entities/MovementTest.xml

@@ -2,7 +2,9 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:Transform/>
+    <c:Transform>
+      <Position X="0" Y="-0.872543275" Z="-2.49763942"/>
+    </c:Transform>
   </Components>
 
   <Children>

resources/Schema/Entities/PlayerAssaultFallbackBlue.xml

@@ -1,699 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:NetworkComponent/>
-    <c:AABB>
-      <Origin X="0" Y="0.772000015" Z="0"/>
-      <Size X="1" Y="1.60000002" Z="1"/>
-    </c:AABB>
-    <c:AssaultWeapon/>
-    <c:Collidable/>
-    <c:DashAbility/>
-    <c:DoubleJump/>
-    <c:Health/>
-    <c:Physics>
-      <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
-    </c:Physics>
-    <c:Player>
-      <MovementSpeed>5</MovementSpeed>
-      <CurrentWeapon></CurrentWeapon>
-    </c:Player>
-    <c:Team>
-      <Team>
-        <Blue/>
-      </Team>
-    </c:Team>
-    <c:Transform>
-      <Position X="0" Y="0.0288832188" Z="2.64144421"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="Camera">
-      <Components>
-        <c:Camera>
-          <NearClip>0.10000000149011612</NearClip>
-          <FarClip>300</FarClip>
-        </c:Camera>
-        <c:Transform>
-          <Position X="0" Y="1.27700007" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="CameraModel">
-          <Components>
-            <c:Model>
-              <Resource>Models/Widgets/Camera.mesh</Resource>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
-              <Scale X="1.30000007" Y="1.50000012" Z="1"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="HUD">
-          <Components>
-            <c:Transform>
-              <Position X="0" Y="0" Z="-0.5"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="Crosshair">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <DepthSort>false</DepthSort>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.200000003"/>
-                  <Scale X="0.0250000004" Y="0.0250000004" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="HitMarkerSpawner">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/HitMarker.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="HealthHUD">
-              <Components>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="HealthBar">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="0.301960796" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:HealthHUD/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.588235319" B="0" G="0" R="0"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
-                      <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
-                      <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="BoostIcons">
-                      <Components>
-                        <c:BoostIconsHUD/>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="Assault">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.225000009" Y="0.168000013" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Defender">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.224999994" Y="0.27700001" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Sniper">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="0.345098048" G="0" R="1"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.225000009" Y="0.38500002" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="ShiftAbility">
-                      <Components>
-                        <c:AbilityCooldownHUD/>
-                        <c:Fill>
-                          <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                          <DepthSort>false</DepthSort>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0.224999994" Y="0.00400000019" Z="0"/>
-                          <Scale X="0.27700001" Y="0.190000013" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Cooldown">
-                          <Components>
-                            <c:Text>
-                              <Content>0.0</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="0" G="0" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="0.146000013" Y="0.00900000054" Z="0.0560000017"/>
-                              <Orientation X="0" Y="0" Z="1.57099998"/>
-                              <Scale X="0.515000045" Y="0.704000056" Z="0.431000024"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="HealthText">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="1" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:Text>
-                      <Content>100/100</Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
-                    </c:Text>
-                    <c:HealthHUD/>
-                    <c:Transform>
-                      <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
-                      <Orientation X="0" Y="0.410000026" Z="0"/>
-                      <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="CapturePointHUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0.190541431" Z="0"/>
-                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <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>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <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>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <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>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <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>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="0" G="0" 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" R="1"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="4.71238899"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="KillFeed">
-              <Components>
-                <c:KillFeed/>
-                <c:Transform>
-                  <Position X="0.486000031" Y="0.26000002" Z="0"/>
-                  <Scale X="0.0149999997" Y="0.0149999997" Z="0.0149999997"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="KillFeed1">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed2">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-1" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed3">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-2" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="CapturePointArrow">
-              <Components>
-                <c:CapturePointArrowHUD/>
-                <c:Model>
-                  <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
-                </c:Model>
-                <c:Team>
-                  <Team>
-                    <Blue/>
-                  </Team>
-                </c:Team>
-                <c:Transform>
-                  <Position X="0" Y="0.714000046" Z="-1.30000007"/>
-                  <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
-                  <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Hands">
-          <Components>
-            <c:Animation>
-              <AnimationName1>Idle</AnimationName1>
-              <Time1>1.8348644854054612</Time1>
-              <Speed1>1</Speed1>
-              <AnimationName2></AnimationName2>
-              <AnimationName3></AnimationName3>
-            </c:Animation>
-            <c:Model>
-              <Resource>Models/Characters/Assault/Test/FirstPerson.mesh</Resource>
-              <Color A="1" B="1" G="0.294117659" R="0"/>
-            </c:Model>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="PrimaryAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>AssaultWeapon</Weapon>
-                </c:WeaponAttachment>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/WeaponAssaultBlueView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
-                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="SecondaryAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>SidearmWeapon</Weapon>
-                </c:WeaponAttachment>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/SidearmWeaponView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
-                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="ThirdPersonCamera">
-      <Components>
-        <c:Camera>
-          <NearClip>0.10000000149011612</NearClip>
-          <FarClip>300</FarClip>
-        </c:Camera>
-        <c:Model>
-          <Resource>Models/Widgets/Camera.mesh</Resource>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.284000009" Y="1.83800006" Z="1.18900001"/>
-          <Orientation X="5.95600033" Y="0" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="PlayerModel">
-      <Components>
-        <c:Animation>
-          <AnimationName1>IdleF</AnimationName1>
-          <Speed1>1</Speed1>
-          <AnimationName2></AnimationName2>
-          <AnimationName3></AnimationName3>
-        </c:Animation>
-        <c:AnimationOffset>
-          <AnimationName>AimRifle</AnimationName>
-          <Time>0.5</Time>
-        </c:AnimationOffset>
-        <c:Shielded/>
-        <c:HiddenForLocalPlayer/>
-        <c:Model>
-          <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
-          <Color A="1" B="1" G="0.952941179" R="1"/>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="PrimaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:WeaponAttachment>
-              <Weapon>AssaultWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.15691258" Y="1.04389966" Z="-0.213815808"/>
-              <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="SecondaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:WeaponAttachment>
-              <Weapon>SidearmWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.15691258" Y="1.04389966" Z="-0.213815808"/>
-              <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="AABBStanding">
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="0.427450985" B="1" G="1" R="1"/>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0.772000015" Z="0"/>
-          <Scale X="1" Y="1.60000002" Z="1"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="AABBCrouching">
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="0.745098054" B="1" G="0" R="1"/>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0.772000015" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="PlayerName">
-      <Components>
-        <c:Text>
-          <Content>Insert name here</Content>
-          <Resource>Fonts/DroidSans.ttf,100</Resource>
-          <Color A="1" B="0" G="1" R="0"/>
-        </c:Text>
-        <c:Transform>
-          <Position X="0.100000001" Y="1.50176644" Z="-0.248000011"/>
-          <Orientation X="0" Y="3.14199996" Z="0"/>
-          <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Indicator">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
-          <GlowMap></GlowMap>
-          <DepthSort>false</DepthSort>
-          <Color A="1" B="1" G="0.309803933" R="0"/>
-        </c:Sprite>
-        <c:HiddenForLocalPlayer/>
-        <c:SpriteIndicator>
-          <MinScale>50</MinScale>
-          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
-        </c:SpriteIndicator>
-        <c:Transform>
-          <Position X="0" Y="1.84019077" Z="0"/>
-          <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="ShieldAttachment">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/DefenderShield.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0" Y="0.859000027" Z="-0.976999998"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/PlayerAssaultFallbackRed.xml

@@ -1,699 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:NetworkComponent/>
-    <c:AABB>
-      <Origin X="0" Y="0.772000015" Z="0"/>
-      <Size X="1" Y="1.60000002" Z="1"/>
-    </c:AABB>
-    <c:AssaultWeapon/>
-    <c:Collidable/>
-    <c:DashAbility/>
-    <c:DoubleJump/>
-    <c:Health/>
-    <c:Physics>
-      <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
-    </c:Physics>
-    <c:Player>
-      <MovementSpeed>5</MovementSpeed>
-      <CurrentWeapon></CurrentWeapon>
-    </c:Player>
-    <c:Team>
-      <Team>
-        <Red/>
-      </Team>
-    </c:Team>
-    <c:Transform>
-      <Position X="0" Y="0.0288832188" Z="2.64144421"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="Camera">
-      <Components>
-        <c:Camera>
-          <NearClip>0.10000000149011612</NearClip>
-          <FarClip>300</FarClip>
-        </c:Camera>
-        <c:Transform>
-          <Position X="0" Y="1.27700007" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="CameraModel">
-          <Components>
-            <c:Model>
-              <Resource>Models/Widgets/Camera.mesh</Resource>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
-              <Scale X="1.30000007" Y="1.50000012" Z="1"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="HUD">
-          <Components>
-            <c:Transform>
-              <Position X="0" Y="0" Z="-0.5"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="Crosshair">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <DepthSort>false</DepthSort>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.200000003"/>
-                  <Scale X="0.0250000004" Y="0.0250000004" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="HitMarkerSpawner">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/HitMarker.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="HealthHUD">
-              <Components>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="HealthBar">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="0.301960796" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:HealthHUD/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.588235319" B="0" G="0" R="0"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
-                      <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
-                      <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="BoostIcons">
-                      <Components>
-                        <c:BoostIconsHUD/>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="Assault">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.225000009" Y="0.168000013" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Defender">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.224999994" Y="0.27700001" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Sniper">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="0.345098048" G="0" R="1"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.225000009" Y="0.38500002" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="ShiftAbility">
-                      <Components>
-                        <c:AbilityCooldownHUD/>
-                        <c:Fill>
-                          <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                          <DepthSort>false</DepthSort>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0.224999994" Y="0.00400000019" Z="0"/>
-                          <Scale X="0.27700001" Y="0.190000013" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Cooldown">
-                          <Components>
-                            <c:Text>
-                              <Content>0.0</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="0" G="0" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="0.146000013" Y="0.00900000054" Z="0.0560000017"/>
-                              <Orientation X="0" Y="0" Z="1.57099998"/>
-                              <Scale X="0.515000045" Y="0.704000056" Z="0.431000024"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="HealthText">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="1" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:Text>
-                      <Content>100/100</Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
-                    </c:Text>
-                    <c:HealthHUD/>
-                    <c:Transform>
-                      <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
-                      <Orientation X="0" Y="0.410000026" Z="0"/>
-                      <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="CapturePointHUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0.190541431" Z="0"/>
-                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <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>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <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>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <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>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <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>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="0" G="0" 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" R="1"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="4.71238899"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="KillFeed">
-              <Components>
-                <c:KillFeed/>
-                <c:Transform>
-                  <Position X="0.486000031" Y="0.26000002" Z="0"/>
-                  <Scale X="0.0149999997" Y="0.0149999997" Z="0.0149999997"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="KillFeed1">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed2">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-1" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed3">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-2" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="CapturePointArrow">
-              <Components>
-                <c:CapturePointArrowHUD/>
-                <c:Model>
-                  <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
-                </c:Model>
-                <c:Team>
-                  <Team>
-                    <Red/>
-                  </Team>
-                </c:Team>
-                <c:Transform>
-                  <Position X="0" Y="0.714000046" Z="-1.30000007"/>
-                  <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
-                  <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Hands">
-          <Components>
-            <c:Animation>
-              <AnimationName1>Idle</AnimationName1>
-              <Time1>1.8348644854054612</Time1>
-              <Speed1>1</Speed1>
-              <AnimationName2></AnimationName2>
-              <AnimationName3></AnimationName3>
-            </c:Animation>
-            <c:Model>
-              <Resource>Models/Characters/Assault/Test/FirstPerson.mesh</Resource>
-              <Color A="1" B="0.0431372561" G="0.0509803928" R="0.87843138"/>
-            </c:Model>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="PrimaryAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>AssaultWeapon</Weapon>
-                </c:WeaponAttachment>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/WeaponAssaultRedView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
-                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="SecondaryAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>SidearmWeapon</Weapon>
-                </c:WeaponAttachment>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/SidearmWeaponView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
-                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="ThirdPersonCamera">
-      <Components>
-        <c:Camera>
-          <NearClip>0.10000000149011612</NearClip>
-          <FarClip>300</FarClip>
-        </c:Camera>
-        <c:Model>
-          <Resource>Models/Widgets/Camera.mesh</Resource>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.284000009" Y="1.83800006" Z="1.18900001"/>
-          <Orientation X="5.95600033" Y="0" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="PlayerModel">
-      <Components>
-        <c:Animation>
-          <AnimationName1>IdleF</AnimationName1>
-          <Speed1>1</Speed1>
-          <AnimationName2></AnimationName2>
-          <AnimationName3></AnimationName3>
-        </c:Animation>
-        <c:AnimationOffset>
-          <AnimationName>AimRifle</AnimationName>
-          <Time>0.5</Time>
-        </c:AnimationOffset>
-        <c:Shielded/>
-        <c:HiddenForLocalPlayer/>
-        <c:Model>
-          <Resource>Models/Characters/Assault/AssaultRed.mesh</Resource>
-          <Color A="1" B="1" G="0.952941179" R="1"/>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="PrimaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:WeaponAttachment>
-              <Weapon>AssaultWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/WeaponAssaultRedWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.15691258" Y="1.04389966" Z="-0.213815808"/>
-              <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="SecondaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:WeaponAttachment>
-              <Weapon>SidearmWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.15691258" Y="1.04389966" Z="-0.213815808"/>
-              <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="AABBStanding">
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="0.427450985" B="1" G="1" R="1"/>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0.772000015" Z="0"/>
-          <Scale X="1" Y="1.60000002" Z="1"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="AABBCrouching">
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="0.745098054" B="1" G="0" R="1"/>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0.772000015" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="PlayerName">
-      <Components>
-        <c:Text>
-          <Content>Insert name here</Content>
-          <Resource>Fonts/DroidSans.ttf,100</Resource>
-          <Color A="1" B="0" G="1" R="0"/>
-        </c:Text>
-        <c:Transform>
-          <Position X="0.100000001" Y="1.50176644" Z="-0.248000011"/>
-          <Orientation X="0" Y="3.14199996" Z="0"/>
-          <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Indicator">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
-          <GlowMap></GlowMap>
-          <DepthSort>false</DepthSort>
-          <Color A="1" B="1" G="0.309803933" R="0"/>
-        </c:Sprite>
-        <c:HiddenForLocalPlayer/>
-        <c:SpriteIndicator>
-          <MinScale>50</MinScale>
-          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
-        </c:SpriteIndicator>
-        <c:Transform>
-          <Position X="0" Y="1.84019077" Z="0"/>
-          <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="ShieldAttachment">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/DefenderShield.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0" Y="0.859000027" Z="-0.976999998"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/ReloadEffectView.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="WeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="ReloadEffect" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
     <c:Lifetime>
-      <Lifetime>2</Lifetime>
+      <Lifetime>1</Lifetime>
     </c:Lifetime>
     <c:ExplosionEffect>
-      <ColorByDistance>true</ColorByDistance>
-      <Velocity X="3.33300018" Y="0.0320000015" Z="0"/>
-      <ExplosionOrigin X="0" Y="0.0790000036" Z="-0.329000026"/>
-      <ExponentialAccelaration>true</ExponentialAccelaration>
-      <EndColor A="0" B="19.6078434" G="19.6078434" R="1"/>
+      <Velocity X="0" Y="1" Z="0"/>
+      <ExplosionOrigin X="-0.0450000018" Y="0.148000002" Z="-0.646000028"/>
+      <ExplosionDuration>1</ExplosionDuration>
+      <EndColor A="0" B="3.92156863" G="0.545098066" R="1"/>
       <Randomness>true</Randomness>
     </c:ExplosionEffect>
     <c:Model>
       <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+      <Transparent>true</Transparent>
     </c:Model>
     <c:Transform/>
   </Components>

resources/Schema/Entities/ServerList.xml

@@ -36,7 +36,7 @@
           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
           <BlurBackground>true</BlurBackground>
           <GlowMap></GlowMap>
-          <Color A="0.588235319" B="0" G="0" R="0"/>
+          <Color A="0.196078435" B="0" G="0" R="0"/>
         </c:Sprite>
         <c:Transform>
           <Scale X="0.300000012" Y="0.5" Z="1"/>

resources/Schema/Entities/WeaponAssaultBlueView.xml

@@ -1,44 +1,139 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="AssaultWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="Hands" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:BlendAdditive>
+      <Adder>MovementBlend</Adder>
+      <Receiver>ActionBlend</Receiver>
+    </c:BlendAdditive>
     <c:Model>
-      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+      <Resource>Models/Characters/Assault/FirstPersonAssaultBlue.mesh</Resource>
     </c:Model>
     <c:Transform/>
   </Components>
 
   <Children>
-    <Entity name="WeaponMuzzle">
+    <Entity name="ActionBlend">
       <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0.00800000038" Y="0.0920000076" Z="-0.416000009"/>
-          <Orientation X="6.2760005" Y="0.00500000035" Z="0.00600000005"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="FirstPersonReloadSpawner">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
-        </c:Spawner>
+        <c:Blend>
+          <Pose1>Fire</Pose1>
+          <Pose2>Reload</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
         <c:Transform/>
       </Components>
-      <Children/>
+      <Children>
+        <Entity name="Reload">
+          <Components>
+            <c:Animation>
+              <AnimationName>ReloadSwitchF</AnimationName>
+              <Speed>0.5</Speed>
+              <Loop>false</Loop>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Fire">
+          <Components>
+            <c:Animation>
+              <AnimationName>ShootRifleF</AnimationName>
+              <Loop>false</Loop>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
     </Entity>
-    <Entity name="AmmunitionHUD">
+    <Entity name="MovementBlend">
       <Components>
+        <c:Blend>
+          <Pose1>Idle</Pose1>
+          <Pose2>Run</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Run">
+          <Components>
+            <c:Animation>
+              <AnimationName>RunF</AnimationName>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Idle">
+          <Components>
+            <c:Animation>
+              <AnimationName>IdleF</AnimationName>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="ViewModel">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Arm_Weapon_Joint</BoneName>
+        </c:BoneAttachment>
+        <c:Model>
+          <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+        </c:Model>
         <c:Transform>
-          <Position X="-0.0440000035" Y="0.136000007" Z="-0.119000003"/>
-          <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
+          <Position X="0.118469834" Y="-0.231588811" Z="-0.181454763"/>
+          <Orientation X="0.0104042515" Y="-0.00268274755" Z="0.0428440832"/>
         </c:Transform>
       </Components>
       <Children>
-        <Entity name="AmmunitionHUDBackground">
+        <Entity name="WeaponMuzzle">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.00800000038" Y="0.0920000076" Z="-0.416000009"/>
+              <Orientation X="6.2760005" Y="0.00500000035" Z="0.00600000005"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ReloadSpawner">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/WeaponAssaultReloadEffectView.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="AmmoHUD">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Ammo_Joint</BoneName>
+          <ScaleOffset X="0.5" Y="0.5" Z="1"/>
+          <InheritScale>true</InheritScale>
+        </c:BoneAttachment>
+        <c:Transform>
+          <Position X="0.0517482236" Y="-0.0985872298" Z="-0.255526245"/>
+          <Orientation X="0.000683688093" Y="0.0774232447" Z="0.0011862258"/>
+          <Scale X="0.25" Y="0.250000119" Z="0.500000238"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Background">
           <Components>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
@@ -52,7 +147,7 @@
           </Components>
           <Children/>
         </Entity>
-        <Entity name="AmmunitionText">
+        <Entity name="Text">
           <Components>
             <c:Transform/>
           </Components>
@@ -65,7 +160,7 @@
                   <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
                 </c:Text>
                 <c:TextFieldReader>
-                  <ParentEntityName>Player</ParentEntityName>
+                  <ParentEntityName></ParentEntityName>
                   <ComponentType>AssaultWeapon</ComponentType>
                   <Field>MagazineAmmo</Field>
                 </c:TextFieldReader>
@@ -83,7 +178,7 @@
                   <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
                 </c:Text>
                 <c:TextFieldReader>
-                  <ParentEntityName>Player</ParentEntityName>
+                  <ParentEntityName></ParentEntityName>
                   <ComponentType>AssaultWeapon</ComponentType>
                   <Field>Ammo</Field>
                 </c:TextFieldReader>
@@ -98,12 +193,6 @@
         </Entity>
       </Children>
     </Entity>
-    <Entity name="ReloadEffect">
-      <Components>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/WeaponAssaultBlueWorld.xml

@@ -20,7 +20,7 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity name="ThirdPersonReloadSpawner">
+    <Entity name="ReloadSpawner">
       <Components>
         <c:Spawner>
           <EntityFile>Schema/Entities/ReloadEffectWorld.xml</EntityFile>

resources/Schema/Entities/WeaponAssaultRedView.xml

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="AssaultWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Model>
-      <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
-    </c:Model>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity name="WeaponMuzzle">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/RayRed.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0.00800000038" Y="0.0920000076" Z="-0.416000009"/>
-          <Orientation X="6.2760005" Y="0.00500000035" Z="0.00600000005"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="FirstPersonReloadSpawner">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="AmmunitionHUD">
-      <Components>
-        <c:Transform>
-          <Position X="-0.0440000035" Y="0.136000007" Z="-0.119000003"/>
-          <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="AmmunitionHUDBackground">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <GlowMap></GlowMap>
-              <Color A="0.588235319" B="0" G="0" R="0"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0" Y="0" Z="-0.00200000009"/>
-              <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="AmmunitionText">
-          <Components>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="MagazineAmmo">
-              <Components>
-                <c:Text>
-                  <Content>32</Content>
-                  <Resource>Fonts/DroidSans.ttf,64</Resource>
-                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-                </c:Text>
-                <c:TextFieldReader>
-                  <ParentEntityName>Player</ParentEntityName>
-                  <ComponentType>AssaultWeapon</ComponentType>
-                  <Field>MagazineAmmo</Field>
-                </c:TextFieldReader>
-                <c:Transform>
-                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="Ammo">
-              <Components>
-                <c:Text>
-                  <Content>320</Content>
-                  <Resource>Fonts/DroidSans.ttf,64</Resource>
-                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-                </c:Text>
-                <c:TextFieldReader>
-                  <ParentEntityName>Player</ParentEntityName>
-                  <ComponentType>AssaultWeapon</ComponentType>
-                  <Field>Ammo</Field>
-                </c:TextFieldReader>
-                <c:Transform>
-                  <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
-                  <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="ReloadEffect">
-      <Components>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/WeaponAssaultRedWorld.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="AssaultWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Model>
-      <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
-    </c:Model>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity name="WeaponMuzzle">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/RayRed.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0.00644115033" Y="0.096679531" Z="-0.436609417"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="ThirdPersonReloadSpawner">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/ReloadEffectWorld.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/WeaponAssaultReloadEffectView.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ReloadEffect" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>2</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Out">
+      <Components>
+        <c:ExplosionEffect>
+          <Velocity X="0" Y="1" Z="0"/>
+          <ExplosionOrigin X="-0.0450000018" Y="0.148000002" Z="-0.646000028"/>
+          <TimeSinceDeath>1</TimeSinceDeath>
+          <Delay>1</Delay>
+          <Speed>-1</Speed>
+          <ExplosionDuration>1</ExplosionDuration>
+          <EndColor A="0" B="3.92156863" G="0.545098066" R="1"/>
+          <Randomness>true</Randomness>
+        </c:ExplosionEffect>
+        <c:Model>
+          <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+          <Transparent>true</Transparent>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="In">
+      <Components>
+        <c:Lifetime>
+          <Lifetime>1</Lifetime>
+        </c:Lifetime>
+        <c:ExplosionEffect>
+          <Velocity X="0" Y="1" Z="0"/>
+          <ExplosionOrigin X="-0.0450000018" Y="0.148000002" Z="-0.646000028"/>
+          <ExplosionDuration>1</ExplosionDuration>
+          <EndColor A="0" B="3.92156863" G="0.545098066" R="1"/>
+          <Randomness>true</Randomness>
+        </c:ExplosionEffect>
+        <c:Model>
+          <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+          <Transparent>true</Transparent>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/WeaponDefenderBlueView.xml

@@ -1,43 +1,201 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="DefenderWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="Hands" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:BlendAdditive>
+      <Adder>MovementBlend</Adder>
+      <Receiver>FinalBlend</Receiver>
+    </c:BlendAdditive>
     <c:Model>
-      <Resource>Models/Weapons/Blue/DefenderWeaponBlue.mesh</Resource>
+      <Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
     </c:Model>
     <c:Transform/>
   </Components>
 
   <Children>
-    <Entity name="WeaponMuzzle">
+    <Entity name="FinalBlend">
       <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0.00191565475" Y="0.0324025005" Z="-0.2021029"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="FirstPersonReloadSpawner">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
-        </c:Spawner>
+        <c:Blend>
+          <Pose1>ActionBlend</Pose1>
+          <Pose2>Shield</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
         <c:Transform/>
       </Components>
-      <Children/>
+      <Children>
+        <Entity name="Shield">
+          <Components>
+            <c:Animation>
+              <AnimationName>ActivateDeactivateShieldF</AnimationName>
+              <Loop>false</Loop>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ActionBlend">
+          <Components>
+            <c:Blend>
+              <Pose1>Fire</Pose1>
+              <Pose2>ReloadBlend</Pose2>
+              <Weight>0</Weight>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Fire">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ShootShotgunF</AnimationName>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="ReloadBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>ReloadLoop</Pose1>
+                  <Pose2>ReloadTransitionBlend</Pose2>
+                  <Weight>1</Weight>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="ReloadLoop">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>ShotgunReloadTwoF</AnimationName>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="ReloadTransitionBlend">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>ReloadStart</Pose1>
+                      <Pose2>ReloadEnd</Pose2>
+                      <Weight>0</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="ReloadStart">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShotgunReloadOneF</AnimationName>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="ReloadEnd">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShotgunReloadThreeF</AnimationName>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
     </Entity>
-    <Entity name="AmmunitionHUD">
+    <Entity name="MovementBlend">
       <Components>
+        <c:Blend>
+          <Pose1>Idle</Pose1>
+          <Pose2>Run</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Idle">
+          <Components>
+            <c:Animation>
+              <AnimationName>IdleF</AnimationName>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Run">
+          <Components>
+            <c:Animation>
+              <AnimationName>RunF</AnimationName>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="ViewModel">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Arm_Weapon_Joint</BoneName>
+        </c:BoneAttachment>
+        <c:Model>
+          <Resource>Models/Weapons/Blue/DefenderWeaponBlue.mesh</Resource>
+        </c:Model>
         <c:Transform>
-          <Position X="-0.0460000038" Y="0.119000003" Z="-0.162"/>
-          <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
+          <Position X="0.120748043" Y="-0.228436321" Z="-0.151475549"/>
+          <Orientation X="0.0104044285" Y="-0.00268185162" Z="0.0428444184"/>
         </c:Transform>
       </Components>
       <Children>
-        <Entity name="AmmunitionHUDBackground">
+        <Entity name="WeaponMuzzle">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.00191565475" Y="0.0324025005" Z="-0.2021029"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ReloadSpawner">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="AmmoHUD">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Ammo_Joint</BoneName>
+          <InheritScale>true</InheritScale>
+        </c:BoneAttachment>
+        <c:Transform>
+          <Position X="0.0540262833" Y="-0.0954347998" Z="-0.225546911"/>
+          <Orientation X="0.000683821447" Y="0.0774240941" Z="-1.56960988"/>
+          <Scale X="0.500000179" Y="0.500000179" Z="0.499999911"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Background">
           <Components>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
@@ -51,38 +209,20 @@
           </Components>
           <Children/>
         </Entity>
-        <Entity name="AmmunitionText">
+        <Entity name="Text">
           <Components>
             <c:Transform/>
           </Components>
           <Children>
-            <Entity name="MagazineAmmo">
-              <Components>
-                <c:Text>
-                  <Content>8</Content>
-                  <Resource>Fonts/DroidSans.ttf,64</Resource>
-                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-                </c:Text>
-                <c:TextFieldReader>
-                  <ParentEntityName>Player</ParentEntityName>
-                  <ComponentType>DefenderWeapon</ComponentType>
-                  <Field>MagazineAmmo</Field>
-                </c:TextFieldReader>
-                <c:Transform>
-                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
             <Entity name="Ammo">
               <Components>
                 <c:Text>
-                  <Content>64</Content>
+                  <Content>38</Content>
                   <Resource>Fonts/DroidSans.ttf,64</Resource>
                   <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
                 </c:Text>
                 <c:TextFieldReader>
-                  <ParentEntityName>Player</ParentEntityName>
+                  <ParentEntityName></ParentEntityName>
                   <ComponentType>DefenderWeapon</ComponentType>
                   <Field>Ammo</Field>
                 </c:TextFieldReader>
@@ -93,6 +233,24 @@
               </Components>
               <Children/>
             </Entity>
+            <Entity name="MagazineAmmo">
+              <Components>
+                <c:Text>
+                  <Content>5</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:TextFieldReader>
+                  <ParentEntityName></ParentEntityName>
+                  <ComponentType>DefenderWeapon</ComponentType>
+                  <Field>MagazineAmmo</Field>
+                </c:TextFieldReader>
+                <c:Transform>
+                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
           </Children>
         </Entity>
       </Children>

resources/Schema/Entities/aim_rays.xml

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

resources/Schema/Entities/awdawd

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Test" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:BoneAttachment>
-      <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-      <Name>L_Foot</Name>
-      <InheritScale>true</InheritScale>
-    </c:BoneAttachment>
-    <c:Model>
-      <Resource>Models/Core/UnitCube.mesh</Resource>
-      <Color A="1" B="1" G="19.6078434" R="1"/>
-    </c:Model>
-    <c:Transform>
-      <Position X="-0.0863945931" Y="0.221357167" Z="-0.0781617165"/>
-      <Scale X="0.199999973" Y="0.199999973" Z="0.199999973"/>
-      <Orientation X="-2.80262542" Y="0.0150706368" Z="-3.13294244"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/ble

@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="AnimationTests" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:SceneLight>
-      <Gamma>0.30000001192092896</Gamma>
-      <Exposure>3</Exposure>
-    </c:SceneLight>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:Transform>
-          <Position X="0.100000001" Y="-1.5150001" Z="-3.70500016"/>
-          <Orientation X="0" Y="2.41300011" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:DirectionalLight>
-              <Intensity>0</Intensity>
-            </c:DirectionalLight>
-            <c:Model>
-              <Resource>Models/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="2.42800021" Z="-2.80000019"/>
-              <Orientation X="5.60000038" Y="3.14159203" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Light">
-          <Components>
-            <c:PointLight>
-              <Color A="1" B="0.70588237" G="0.70588237" R="1"/>
-              <Radius>8</Radius>
-              <Intensity>0.60000002384185791</Intensity>
-            </c:PointLight>
-            <c:Transform>
-              <Position X="1.32209361" Y="1.37392569" Z="-0.0505663045"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Assault">
-          <Components>
-            <c:BlendAdditive>
-              <Adder></Adder>
-              <Receiver></Receiver>
-            </c:BlendAdditive>
-            <c:Model>
-              <GlowIntensity>5</GlowIntensity>
-              <Resource>Models/Characters/Defender/DefenderBlue.mesh</Resource>
-            </c:Model>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="WeaponAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:Model>
-                  <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-                </c:Model>
-                <c:Transform>
-                  <Scale X="1.00000012" Y="1" Z="1.00000012"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="AimBlend">
-              <Components>
-                <c:Blend>
-                  <Pose1>AimPrimary</Pose1>
-                  <Pose2>AimSecondary</Pose2>
-                  <Weight>0</Weight>
-                </c:Blend>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="AimPrimary">
-                  <Components>
-                    <c:Animation>
-                      <AnimationName></AnimationName>
-                    </c:Animation>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="AimSecondary">
-                  <Components>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Plane">
-          <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitPlane.mesh</Resource>
-            </c:Model>
-            <c:Transform>
-              <Scale X="5" Y="1" Z="5"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Light">
-          <Components>
-            <c:PointLight>
-              <Color A="1" B="0.956862748" G="0.960784316" R="0.819607854"/>
-              <Radius>8</Radius>
-              <Intensity>0.60000002384185791</Intensity>
-            </c:PointLight>
-            <c:Transform>
-              <Position X="-1.36898434" Y="1.37392569" Z="0.620898128"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Light">
-          <Components>
-            <c:PointLight>
-              <Radius>8</Radius>
-              <Intensity>0.80000001192092896</Intensity>
-            </c:PointLight>
-            <c:Transform>
-              <Position X="-0.127636135" Y="1.37392569" Z="-1.52101767"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Shaders/FillDepthBuffer.vert.glsl

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

resources/Shaders/FillDepthBufferSkinned.vert.glsl

@@ -1,8 +1,6 @@
 #version 430
 
-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
+uniform mat4 PVM;
 uniform mat4 Bones[100];
 
 
@@ -27,7 +25,7 @@ void main()
 				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
 	}
 
-	gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
+	gl_Position = PVM*boneTransform * vec4(Position, 1.0);
 
 	Output.Position = vec3(0.0);
 }

resources/Shaders/ForwardPlus.frag.glsl

@@ -2,6 +2,7 @@
 
 #define MIN_AMBIENT_LIGHT 0.3
 
+uniform mat4 VM;
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -11,7 +12,7 @@ uniform vec2 ScreenDimensions;
 uniform vec4 FillColor;
 uniform vec4 AmbientColor;
 uniform float FillPercentage;
-uniform float GlowIntensity = 10;
+uniform float GlowIntensity;
 uniform vec3 CameraPosition;
 uniform int SSAOQuality;
 
@@ -131,7 +132,7 @@ void main()
 	vec4 diffuseTexel = texture2D(DiffuseTexture, Input.TextureCoordinate * DiffuseUVRepeat);
 	vec4 glowTexel = texture2D(GlowMapTexture, Input.TextureCoordinate * GlowUVRepeat);
 	vec4 specularTexel = texture2D(SpecularMapTexture, Input.TextureCoordinate * SpecularUVRepeat);
-	vec4 position = V * M * vec4(Input.Position, 1.0); 
+	vec4 position = VM * vec4(Input.Position, 1.0); 
 	vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate * NormalUVRepeat, NormalMapTexture);
 	normal = normalize(normal);
 	//vec4 normal = normalize(V  * vec4(Input.Normal, 0.0));
@@ -182,6 +183,7 @@ void main()
 		color_result += FillColor;
 	}
 	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
+	//sceneColor = CommonUniforms.testColour;
 	//sceneColor = vec4(reflectionColor.xyz, 1);
 	color_result.xyz += glowTexel.xyz*GlowIntensity;
 

resources/Shaders/ForwardPlus.vert.glsl

@@ -1,5 +1,6 @@
 #version 430
-
+uniform mat4 PVM;
+uniform mat4 TIM;
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -22,8 +23,8 @@ out VertexData{
 
 void main()
 {
-	gl_Position = P*V*M * vec4(Position, 1.0);
-	mat4 TIM = transpose(inverse(M));
+	gl_Position = PVM * vec4(Position, 1.0);
+	//mat4 TIM = transpose(inverse(M));
 	Output.Position = Position;
 	Output.TextureCoordinate = TextureCoords;
 	Output.Normal = vec3(TIM * vec4(Normal, 0.0));

resources/Shaders/ForwardPlusShieldCheck.frag.glsl

@@ -2,6 +2,7 @@
 
 #define MIN_AMBIENT_LIGHT 0.3
 
+uniform mat4 VM;
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -11,7 +12,7 @@ uniform vec2 ScreenDimensions;
 uniform vec4 FillColor;
 uniform vec4 AmbientColor;
 uniform float FillPercentage;
-uniform float GlowIntensity = 10;
+uniform float GlowIntensity;
 uniform vec3 CameraPosition;
 uniform int SSAOQuality;
 
@@ -138,7 +139,7 @@ void main()
 	vec4 diffuseTexel = texture2D(DiffuseTexture, Input.TextureCoordinate * DiffuseUVRepeat);
 	vec4 glowTexel = texture2D(GlowMapTexture, Input.TextureCoordinate * GlowUVRepeat);
 	vec4 specularTexel = texture2D(SpecularMapTexture, Input.TextureCoordinate * SpecularUVRepeat);
-	vec4 position = V * M * vec4(Input.Position, 1.0); 
+	vec4 position = VM * vec4(Input.Position, 1.0); 
 	vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate * NormalUVRepeat, NormalMapTexture);
 	normal = normalize(normal);
 	//vec4 normal = normalize(V  * vec4(Input.Normal, 0.0));

resources/Shaders/ForwardPlusSkinned.vert.glsl

@@ -1,5 +1,7 @@
 #version 430
 
+uniform mat4 PVM;
+uniform mat4 TIM;
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -34,7 +36,7 @@ void main()
 				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
 	}
 
-	gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
+	gl_Position = PVM*boneTransform * vec4(Position, 1.0);
 	
 	Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
 	Output.TextureCoordinate = TextureCoords;

resources/Shaders/ForwardPlusSplatMapRGB.frag.glsl

@@ -2,6 +2,7 @@
 
 #define MIN_AMBIENT_LIGHT 0.3
 
+uniform mat4 VM;
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -189,7 +190,7 @@ void main()
 	 									 GlowUVRepeat1, GlowUVRepeat2, GlowUVRepeat3);
 	vec4 specularTexel = CalcBlendedTexel(splatTexel, SpecularMapTexture1, SpecularMapTexture2, SpecularMapTexture3,
 										 SpecularUVRepeat1, SpecularUVRepeat2, SpecularUVRepeat3);
-	vec4 position = V * M * vec4(Input.Position, 1.0); 
+	vec4 position = VM * vec4(Input.Position, 1.0); 
 	//vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate, SplatMapTexture);
 	vec4 normal = V * CalcBlendedNormal(splatTexel, NormalMapTexture1, NormalMapTexture2, NormalMapTexture3,
 		   								NormalUVRepeat1, NormalUVRepeat2, NormalUVRepeat3);

resources/Shaders/ForwardPlusSplatMapRGBShieldCheck.frag.glsl

@@ -2,6 +2,7 @@
 
 #define MIN_AMBIENT_LIGHT 0.3
 
+uniform mat4 VM;
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -190,7 +191,7 @@ void main()
 	 									 GlowUVRepeat1, GlowUVRepeat2, GlowUVRepeat3);
 	vec4 specularTexel = CalcBlendedTexel(splatTexel, SpecularMapTexture1, SpecularMapTexture2, SpecularMapTexture3,
 										 SpecularUVRepeat1, SpecularUVRepeat2, SpecularUVRepeat3);
-	vec4 position = V * M * vec4(Input.Position, 1.0); 
+	vec4 position = VM * vec4(Input.Position, 1.0); 
 	//vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate, SplatMapTexture);
 	vec4 normal = V * CalcBlendedNormal(splatTexel, NormalMapTexture1, NormalMapTexture2, NormalMapTexture3,
 		   								NormalUVRepeat1, NormalUVRepeat2, NormalUVRepeat3);

resources/Shaders/Picking.vert.glsl

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

resources/Shaders/PickingSkinned.vert.glsl

@@ -1,8 +1,5 @@
 #version 430
-
-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
+uniform mat4 PVM;
 uniform mat4 Bones[100];
 
 layout(location = 0) in vec3 Position;
@@ -27,6 +24,6 @@ void main()
 				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
 	}
 
-	gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
+	gl_Position = PVM*boneTransform * vec4(Position, 1.0);
 	Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
 }

resources/Shaders/Sprite.frag.glsl

@@ -3,8 +3,6 @@
 uniform vec4 Color;
 uniform vec4 FillColor;
 uniform float FillPercentage;
-uniform mat4 M;
-uniform mat4 V;
 uniform mat4 P;
 
 layout (binding = 1) uniform sampler2D DiffuseTexture;

resources/Shaders/Sprite.vert.glsl

@@ -1,8 +1,6 @@
 #version 430
 
-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
+uniform mat4 PVM;
 
 layout(location = 0) in vec3 Position;
 layout(location = 1) in vec3 Normal;
@@ -17,7 +15,7 @@ out VertexData{
 void main()
 {
 
-	gl_Position = P * V * M * vec4(Position, 1.0);
+	gl_Position = PVM* vec4(Position, 1.0);
 
 	Output.Position = Position;
 	Output.TextureCoordinate = TextureCoords;

resources/Shaders/Util/CommonUniforms.glsl

@@ -0,0 +1,6 @@
+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);
+}

src/Engine/Input/InputProxy.cpp

@@ -45,7 +45,7 @@ void InputProxy::Update(double dt)
     }
 }
 
-void InputProxy::Process()
+void InputProxy::Process(bool suppressNewEvents /*= false*/)
 {
     for (auto& pair : m_CommandHandlers) {
         const std::string& command = pair.first;
@@ -62,8 +62,10 @@ void InputProxy::Process()
             e.PlayerID = -1;
             e.Command = command;
             e.Value = currentValue;
-            m_EventBroker->Publish(e);
-            //LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+            if (!suppressNewEvents || e.Value == 0) {
+                m_EventBroker->Publish(e);
+                //LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+            }
             m_LastCommandValues[command] = currentValue;
         }
     }
@@ -78,8 +80,10 @@ void InputProxy::Process()
             e.Value += value;
         }
         //e.Value = std::max(-1.f, std::min(e.Value, 1.f));
-        m_EventBroker->Publish(e);
-        //LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+        if (!suppressNewEvents || e.Value == 0) {
+            m_EventBroker->Publish(e);
+            //LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+        }
     }
     m_CommandQueue.clear();
 }

src/Engine/Network/Client.cpp

@@ -35,6 +35,7 @@ void Client::Connect(std::string address, int port)
     EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &Client::OnDoubleJump);
     EVENT_SUBSCRIBE_MEMBER(m_EDashAbility, &Client::OnDashAbility);
     EVENT_SUBSCRIBE_MEMBER(m_ESearchForServers, &Client::OnSearchForServers);
+    EVENT_SUBSCRIBE_MEMBER(m_EConnectRequest, &Client::OnConnectRequest);
     auto config = ResourceManager::Load<ConfigFile>("Config.ini");
     m_Address = address;
     if (address.empty()) {
@@ -180,8 +181,8 @@ void Client::parseTCPConnect(Packet& packet)
     Packet UnreliablePacket(MessageType::Connect, m_SendPacketID);
     // Add player id and other stuff
     packet.WritePrimitive(m_PlayerID);
- //   m_Unreliable.Send(packet);
-  //  LOG_INFO("Sent UDP Connect Server");
+    //   m_Unreliable.Send(packet);
+     //  LOG_INFO("Sent UDP Connect Server");
 }
 
 void Client::parsePlayerConnected(Packet & packet)
@@ -456,12 +457,14 @@ void Client::parseSnapshot(Packet& packet)
 
 void Client::disconnect()
 {
+    removeWorld();
     m_IsConnected = false;
     m_PreviousPacketID = 0;
     m_PacketID = 0;
     Packet packet(MessageType::Disconnect, m_SendPacketID);
     m_Reliable.Send(packet);
     m_Reliable.Disconnect();
+    createMainMenu();
 }
 
 bool Client::OnInputCommand(const Events::InputCommand & e)
@@ -472,7 +475,7 @@ bool Client::OnInputCommand(const Events::InputCommand & e)
 
     if (e.Command == "ConnectToServer") { // Connect for now
         if (e.Value > 0) {
-            m_Reliable.Connect(m_PlayerName, m_Address, m_Port);
+            //m_Reliable.Connect(m_PlayerName, m_Address, m_Port);
         //    m_Unreliable.Connect(m_PlayerName, m_Address, m_Port);
         }
         //LOG_DEBUG("Client::OnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
@@ -545,6 +548,23 @@ bool Client::OnDashAbility(const Events::DashAbility& e)
     return true;
 }
 
+
+bool Client::OnConnectRequest(const Events::ConnectRequest& e)
+{
+    removeWorld();
+    if (m_Reliable.Connect(m_PlayerName, e.IP, e.Port)) {
+        // The client sent a successful connect message
+        return true;
+
+    } else {
+        // The client could not send a successful connect message
+        createMainMenu();
+        // Load the main menu again ?
+        return false;
+    }
+    return false;
+}
+
 bool Client::OnSearchForServers(const Events::SearchForServers& e)
 {
     m_SearchingForServers = true;
@@ -671,6 +691,26 @@ void Client::displayServerlist()
     }
 }
 
+
+void Client::removeWorld()
+{
+    std::vector<EntityID> childrenToBeDeleted;
+    auto rootEntites = m_World->GetDirectChildren(EntityID_Invalid);
+    for (auto it = rootEntites.first; it != rootEntites.second; it++) {
+        childrenToBeDeleted.push_back(it->second);
+    }
+    for (int i = 0; i < childrenToBeDeleted.size(); ++i) {
+        m_World->DeleteEntity(childrenToBeDeleted[i]);
+    }
+}
+
+
+void Client::createMainMenu()
+{
+    auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/StartMenu.xml");
+    entityFile->MergeInto(m_World);
+}
+
 bool Client::clientServerMapsHasEntity(EntityID clientEntityID)
 {
     if (m_ClientIDToServerID.find(clientEntityID) != m_ClientIDToServerID.end()) {

src/Engine/Network/Server.cpp

@@ -7,6 +7,8 @@ Server::Server(World* world, EventBroker* eventBroker, int port)
     ConfigFile* config = ResourceManager::Load<ConfigFile>("Config.ini");
     snapshotInterval = 1000 * config->Get<float>("Networking.SnapshotInterval", 0.05f);
     pingIntervalMs = config->Get<float>("Networking.PingIntervalMs", 1000);
+    m_ServerName = config->Get<std::string>("Networking.Name", "Unnamed");
+
     // Subscribe to events
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Server::OnInputCommand);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &Server::OnPlayerSpawned);
@@ -410,7 +412,7 @@ void Server::parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint)
     Packet packet(MessageType::ServerlistRequest);
     packet.WriteString(m_Reliable.Address());
     packet.WritePrimitive<int>(m_Reliable.Port());
-    packet.WriteString("SERVERNAME");
+    packet.WriteString(m_ServerName);
     packet.WritePrimitive<int>(m_ConnectedPlayers.size());
     m_ServerlistRequest.Send(packet);
 }

src/Engine/Network/TCPClient.cpp

@@ -10,7 +10,7 @@ TCPClient::~TCPClient()
 {
 }
 
-void TCPClient::Connect(std::string playerName, std::string address, int port)
+bool TCPClient::Connect(std::string playerName, std::string address, int port)
 {
     if (m_Socket) {
         if (m_IsConnected) {
@@ -19,6 +19,7 @@ void TCPClient::Connect(std::string playerName, std::string address, int port)
             Send(packet);
             LOG_INFO("Connect message sent again!");
         }
+        return true;
     }
     else if (!m_IsConnected) {
         boost::system::error_code error = boost::asio::error::host_not_found;
@@ -34,11 +35,13 @@ void TCPClient::Connect(std::string playerName, std::string address, int port)
             packet.WriteString(playerName);
             Send(packet);
             LOG_INFO("Connect message sent!");
+            return true;
         }
         // If error
         else {
             m_Socket->close();
             m_Socket = nullptr;
+            return false;
         }
     }
 }

src/Engine/Network/UDPClient.cpp

@@ -10,14 +10,15 @@ UDPClient::~UDPClient()
 { 
 }
 
-void UDPClient::Connect(std::string playerName, std::string address, int port)
+bool UDPClient::Connect(std::string playerName, std::string address, int port)
 {
     if (m_Socket) {
-        return;
+        return false;
     }
     m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address().from_string(address), port);
     m_Socket = boost::shared_ptr<boost::asio::ip::udp::socket>(new boost::asio::ip::udp::socket(m_IOService));
     m_Socket->open(boost::asio::ip::udp::v4());
+    return true;
 }
 
 void UDPClient::Disconnect()

src/Engine/Rendering/BlurHUD.cpp

@@ -10,7 +10,7 @@ BlurHUD::BlurHUD(IRenderer* renderer)
 
 void BlurHUD::InitializeTextures()
 {
-    m_BlackTexture = CommonFunctions::LoadTexture("Textures/Core/Black.png", false);
+    m_BlackTexture = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/Black.png");
     m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.mesh");
 }
 

src/Engine/Rendering/BoneAttachmentSystem.cpp

@@ -50,13 +50,15 @@ void BoneAttachmentSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapp
         glm::vec4 perspective;
         glm::decompose(boneTransform, scale, rotation, translation, skew, perspective);
 
-        glm::vec3 angles = glm::vec3(-glm::pitch(rotation), -glm::yaw(rotation), -glm::roll(rotation));
+        rotation = glm::quat((glm::vec3)entity["BoneAttachment"]["OrientationOffset"]) * rotation;
+        rotation = glm::inverse(rotation);
+        glm::vec3 angles = glm::eulerAngles(rotation);
         
         if ((bool)entity["BoneAttachment"]["InheritPosition"]) {
             (glm::vec3&)entity["Transform"]["Position"] = translation + (glm::vec3)entity["BoneAttachment"]["PositionOffset"];
         }
         if ((bool)entity["BoneAttachment"]["InheritOrientation"]) {
-            (glm::vec3&)entity["Transform"]["Orientation"] = angles  + (glm::vec3)entity["BoneAttachment"]["OrientationOffset"];
+            (glm::vec3&)entity["Transform"]["Orientation"] = angles;
         }
         if ((bool)entity["BoneAttachment"]["InheritScale"]) {
             (glm::vec3&)entity["Transform"]["Scale"] = scale  * (glm::vec3)entity["BoneAttachment"]["ScaleOffset"];

src/Engine/Rendering/DrawBloomPass.cpp

@@ -9,9 +9,14 @@ DrawBloomPass::DrawBloomPass(IRenderer* renderer, ConfigFile* config)
 	ChangeQuality(m_Config->Get<int>("GLOW.Quality", 2));
 }
 
+DrawBloomPass::~DrawBloomPass() {
+	CommonFunctions::DeleteTexture(&m_GaussianTexture_horiz);
+	CommonFunctions::DeleteTexture(&m_GaussianTexture_vert);
+}
+
 void DrawBloomPass::InitializeTextures()
 {
-    m_BlackTexture = CommonFunctions::LoadTexture("Textures/Core/Black.png", false);
+    m_BlackTexture = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/Black.png");
 }
 
 void DrawBloomPass::ChangeQuality(int quality)

src/Engine/Rendering/DrawFinalPass.cpp

@@ -12,13 +12,21 @@ DrawFinalPass::DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCulling
     InitializeFrameBuffers();
 }
 
+DrawFinalPass::~DrawFinalPass(){
+	CommonFunctions::DeleteTexture(&m_BloomTexture);
+	CommonFunctions::DeleteTexture(&m_SceneTexture);
+	CommonFunctions::DeleteTexture(&m_DepthBuffer);
+	CommonFunctions::DeleteTexture(&m_ShieldBuffer);
+	CommonFunctions::DeleteTexture(&m_CubeMapTexture);
+}
+
 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 = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/White.png");
+    m_BlackTexture = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/Black.png");
+    m_NeutralNormalTexture = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/NeutralNormalMap.png");
+    m_GreyTexture = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/Grey.png");
+    m_ErrorTexture = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/ErrorTexture.png");
 }
 
 void DrawFinalPass::InitializeFrameBuffers()
@@ -351,6 +359,8 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 	GLuint explosionSkinnedHandle = m_ExplosionEffectSkinnedProgram->GetHandle();
 	GLuint explosionSplatMapSkinnedHandle = m_ExplosionEffectSplatMapSkinnedProgram->GetHandle();
 	GLuint forwardSplatMapSkinnedHandle = m_ForwardPlusSplatMapSkinnedProgram->GetHandle();
+	GLuint lastShader = 0;
+	unsigned int lastModel = 0;
 
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, m_LightCullingPass->LightSSBO());
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightCullingPass->LightGridSSBO());
@@ -367,9 +377,17 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 			case RawModel::MaterialType::SingleTextures:
 				{
                     if (explosionEffectJob->Model->IsSkinned()) {
-
-                        m_ExplosionEffectSkinnedProgram->Bind();
-                        GLERROR("Bind ExplosionEffectSkinned program");
+						if (lastShader != m_ExplosionEffectSkinnedProgram->GetHandle()) {
+							m_ExplosionEffectSkinnedProgram->Bind();
+							lastShader = m_ExplosionEffectSkinnedProgram->GetHandle();
+							GLERROR("Bind ExplosionEffectSkinned program");
+							glUniform1i(glGetUniformLocation(explosionSkinnedHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+							glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+							glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+							glUniform2f(glGetUniformLocation(explosionSkinnedHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+							glUniform4fv(glGetUniformLocation(explosionSkinnedHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+							GLERROR("Bind ExplosionEffectSkinned Uniforms");
+						}
                         //bind uniforms
                         BindExplosionUniforms(explosionSkinnedHandle, explosionEffectJob, scene);
                         //bind textures
@@ -389,8 +407,17 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 
                     }
 					else {
-						m_ExplosionEffectProgram->Bind();
-						GLERROR("Bind ExplosionEffect program");
+						if (lastShader != m_ExplosionEffectProgram->GetHandle()) {
+							m_ExplosionEffectProgram->Bind();
+							lastShader = m_ExplosionEffectProgram->GetHandle();
+							GLERROR("Bind ExplosionEffect program");
+							glUniform1i(glGetUniformLocation(explosionHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+							glUniformMatrix4fv(glGetUniformLocation(explosionHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+							glUniformMatrix4fv(glGetUniformLocation(explosionHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+							glUniform2f(glGetUniformLocation(explosionHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+							glUniform4fv(glGetUniformLocation(explosionHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+							GLERROR("Bind ExplosionEffect Uniforms");
+						}
 						//bind uniforms
 						BindExplosionUniforms(explosionHandle, explosionEffectJob, scene);
 						//bind textures
@@ -404,8 +431,17 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 			case RawModel::MaterialType::SplatMapping:
 				{
                     if (explosionEffectJob->Model->IsSkinned()) {
-                        m_ExplosionEffectSplatMapSkinnedProgram->Bind();
-                        GLERROR("Bind ExplosionEffectSplatMapSkinned program");
+						if (lastShader != m_ExplosionEffectSplatMapSkinnedProgram->GetHandle()) {
+							m_ExplosionEffectSplatMapSkinnedProgram->Bind();
+							lastShader = m_ExplosionEffectSplatMapSkinnedProgram->GetHandle();
+							GLERROR("Bind ExplosionEffectSplatMapSkinned program");
+							glUniform1i(glGetUniformLocation(explosionSplatMapSkinnedHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+							glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+							glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+							glUniform2f(glGetUniformLocation(explosionSplatMapSkinnedHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+							glUniform4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+							GLERROR("Bind ExplosionEffectSplatMapSkinned Uniforms");
+						}
                         //bind uniforms
                         BindExplosionUniforms(explosionSplatMapSkinnedHandle, explosionEffectJob, scene);
                         //bind textures
@@ -421,9 +457,17 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 
                     }
 					else {
-						m_ExplosionEffectSplatMapProgram->Bind();
-						GLERROR("Bind ExplosionEffectSplatMap program");
-						//bind uniforms
+						if (lastShader != m_ExplosionEffectSplatMapProgram->GetHandle()) {
+							m_ExplosionEffectSplatMapProgram->Bind();
+							lastShader = m_ExplosionEffectSplatMapProgram->GetHandle();
+							GLERROR("Bind ExplosionEffectSplatMap program");
+							glUniform1i(glGetUniformLocation(explosionSplatMapHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+							glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+							glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+							glUniform2f(glGetUniformLocation(explosionSplatMapHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+							glUniform4fv(glGetUniformLocation(explosionSplatMapHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+							GLERROR("Bind ExplosionEffectSplatMap Uniforms");
+						}
 						//bind uniforms
 						BindExplosionUniforms(explosionSplatMapHandle, explosionEffectJob, scene);
 						//bind textures
@@ -436,8 +480,11 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
             glDisable(GL_CULL_FACE);
 
             //draw
-            glBindVertexArray(explosionEffectJob->Model->VAO);
-            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, explosionEffectJob->Model->ElementBuffer);
+			if (lastModel != explosionEffectJob->ModelID) {
+				glBindVertexArray(explosionEffectJob->Model->VAO);
+				glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, explosionEffectJob->Model->ElementBuffer);
+				lastModel = explosionEffectJob->ModelID;
+			}
             glDrawElements(GL_TRIANGLES, explosionEffectJob->EndIndex - explosionEffectJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(explosionEffectJob->StartIndex*sizeof(unsigned int)));
             glEnable(GL_CULL_FACE);
             GLERROR("explosion effect end");
@@ -451,8 +498,17 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 				case RawModel::MaterialType::SingleTextures:
 				{
 					if (modelJob->Model->IsSkinned()) {
-						m_ForwardPlusSkinnedProgram->Bind();
-						GLERROR("Bind ForwardPlusSkinnedProgram");
+						if (lastShader != m_ForwardPlusSkinnedProgram->GetHandle()) {
+							m_ForwardPlusSkinnedProgram->Bind();
+							lastShader = m_ForwardPlusSkinnedProgram->GetHandle();
+							GLERROR("Bind ForwardPlusSkinnedProgram program");
+							glUniform1i(glGetUniformLocation(forwardSkinnedHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+							glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+							glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+							glUniform2f(glGetUniformLocation(forwardSkinnedHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+							glUniform4fv(glGetUniformLocation(forwardSkinnedHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+							GLERROR("Bind ForwardPlusSkinnedProgram Uniforms");
+						}
 						//bind uniforms
 						BindModelUniforms(forwardSkinnedHandle, modelJob, scene);
 						//bind textures
@@ -470,8 +526,17 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
                         glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
                     }
 					else {
-						m_ForwardPlusProgram->Bind();
-						GLERROR("Bind ForwardPlusProgram");
+						if (lastShader != m_ForwardPlusProgram->GetHandle()) {
+							m_ForwardPlusProgram->Bind();
+							lastShader = m_ForwardPlusProgram->GetHandle();
+							GLERROR("Bind ForwardPlusProgram program");
+							glUniform1i(glGetUniformLocation(forwardHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+							glUniformMatrix4fv(glGetUniformLocation(forwardHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+							glUniformMatrix4fv(glGetUniformLocation(forwardHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+							glUniform2f(glGetUniformLocation(forwardHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+							glUniform4fv(glGetUniformLocation(forwardHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+							GLERROR("Bind ForwardPlusProgram Uniforms");
+						}
 						//bind uniforms
 						BindModelUniforms(forwardHandle, modelJob, scene);
 						//bind textures
@@ -485,8 +550,17 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 				case RawModel::MaterialType::SplatMapping:
 				{
 					if (modelJob->Model->IsSkinned()) {
-						m_ForwardPlusSplatMapSkinnedProgram->Bind();
-						GLERROR("Bind SplatMap program");
+						if (lastShader != m_ForwardPlusSplatMapSkinnedProgram->GetHandle()) {
+							m_ForwardPlusSplatMapSkinnedProgram->Bind();
+							lastShader = m_ForwardPlusSplatMapSkinnedProgram->GetHandle();
+							GLERROR("Bind SkinnedSplatMapProgram program");
+							glUniform1i(glGetUniformLocation(forwardSplatMapSkinnedHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+							glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+							glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+							glUniform2f(glGetUniformLocation(forwardSplatMapSkinnedHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+							glUniform4fv(glGetUniformLocation(forwardSplatMapSkinnedHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+							GLERROR("Bind SkinnedSplatMapProgram Uniforms");
+						}
 						//bind uniforms
 						BindModelUniforms(forwardSplatMapSkinnedHandle, modelJob, scene);
 						//bind textures
@@ -502,8 +576,17 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 
 					}
 					else {
-						m_ForwardPlusSplatMapProgram->Bind();
-						GLERROR("Bind SplatMap program");
+						if (lastShader != m_ForwardPlusSplatMapProgram->GetHandle()) {
+							m_ForwardPlusSplatMapProgram->Bind();
+							lastShader = m_ForwardPlusSplatMapProgram->GetHandle();
+							GLERROR("Bind SplatMap program");
+							glUniform1i(glGetUniformLocation(forwardSplatMapHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+							glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+							glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+							glUniform2f(glGetUniformLocation(forwardSplatMapHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+							glUniform4fv(glGetUniformLocation(forwardSplatMapHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+							GLERROR("Bind SplatMap Uniforms");
+						}
 						//bind uniforms
 						BindModelUniforms(forwardSplatMapHandle, modelJob, scene);
 						//bind textures
@@ -514,8 +597,11 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 				}
                 }
                 //draw
-                glBindVertexArray(modelJob->Model->VAO);
-                glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+				if (lastModel != modelJob->ModelID) {
+					glBindVertexArray(modelJob->Model->VAO);
+					glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+					lastModel = modelJob->ModelID;
+				}
                 glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex*sizeof(unsigned int)));
                 if (GLERROR("models end")) {
                     continue;
@@ -544,6 +630,8 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 	GLuint explosionSkinnedShieldCheckHandle = m_ExplosionEffectSkinnedShieldCheckProgram->GetHandle();
 	GLuint explosionSplatMapSkinnedShieldCheckHandle = m_ExplosionEffectSplatMapSkinnedShieldCheckProgram->GetHandle();
 	GLuint forwardSplatMapSkinnedShieldCheckHandle = m_ForwardPlusSplatMapSkinnedShieldCheckProgram->GetHandle();
+	GLuint lastShader = 0;
+	unsigned int lastModel = 0;
 
 	glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, m_LightCullingPass->LightSSBO());
 	glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightCullingPass->LightGridSSBO());
@@ -564,9 +652,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 				case RawModel::MaterialType::SingleTextures:
 					{
 						if (explosionEffectJob->Model->IsSkinned()) {
-
-							m_ExplosionEffectSkinnedShieldCheckProgram->Bind();
-							GLERROR("Bind ExplosionEffectSkinned program");
+							if (lastShader != m_ExplosionEffectSkinnedShieldCheckProgram->GetHandle()) {
+								m_ExplosionEffectSkinnedShieldCheckProgram->Bind();
+								lastShader = m_ExplosionEffectSkinnedShieldCheckProgram->GetHandle();
+								GLERROR("Bind ExplosionEffectSkinned program");
+								glUniform1i(glGetUniformLocation(explosionSkinnedShieldCheckHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+								glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedShieldCheckHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+								glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedShieldCheckHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+								glUniform2f(glGetUniformLocation(explosionSkinnedShieldCheckHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+								glUniform4fv(glGetUniformLocation(explosionSkinnedShieldCheckHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+								GLERROR("Bind ExplosionEffectSkinned Uniforms");
+							}
 							//bind uniforms
 							BindExplosionUniforms(explosionSkinnedShieldCheckHandle, explosionEffectJob, scene);
 							//bind textures
@@ -585,8 +681,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 
 						}
 						else {
-							m_ExplosionEffectShieldCheckProgram->Bind();
-							GLERROR("Bind ExplosionEffect program");
+							if (lastShader != m_ExplosionEffectShieldCheckProgram->GetHandle()) {
+								m_ExplosionEffectShieldCheckProgram->Bind();
+								lastShader = m_ExplosionEffectShieldCheckProgram->GetHandle();
+								GLERROR("Bind ExplosionEffect program");
+								glUniform1i(glGetUniformLocation(explosionShieldCheckHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+								glUniformMatrix4fv(glGetUniformLocation(explosionShieldCheckHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+								glUniformMatrix4fv(glGetUniformLocation(explosionShieldCheckHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+								glUniform2f(glGetUniformLocation(explosionShieldCheckHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+								glUniform4fv(glGetUniformLocation(explosionShieldCheckHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+								GLERROR("Bind ExplosionEffect Uniforms");
+							}
 							//bind uniforms
 							BindExplosionUniforms(explosionShieldCheckHandle, explosionEffectJob, scene);
 							//bind textures
@@ -601,8 +706,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 				case RawModel::MaterialType::SplatMapping:
 					{
 						if (explosionEffectJob->Model->IsSkinned()) {
-							m_ExplosionEffectSplatMapSkinnedShieldCheckProgram->Bind();
-							GLERROR("Bind ExplosionEffectSplatMapSkinned program");
+							if (lastShader != m_ExplosionEffectSplatMapSkinnedShieldCheckProgram->GetHandle()) {
+								m_ExplosionEffectSplatMapSkinnedShieldCheckProgram->Bind();
+								lastShader = m_ExplosionEffectSplatMapSkinnedShieldCheckProgram->GetHandle();
+								GLERROR("Bind ExplosionEffectSplatMapSkinned program");
+								glUniform1i(glGetUniformLocation(explosionSplatMapSkinnedShieldCheckHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+								glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedShieldCheckHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+								glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedShieldCheckHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+								glUniform2f(glGetUniformLocation(explosionSplatMapSkinnedShieldCheckHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+								glUniform4fv(glGetUniformLocation(explosionSplatMapSkinnedShieldCheckHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+								GLERROR("Bind ExplosionEffectSplatMapSkinned Uniforms");
+							}
 							//bind uniforms
 							BindExplosionUniforms(explosionSplatMapSkinnedShieldCheckHandle, explosionEffectJob, scene);
 							//bind textures
@@ -619,9 +733,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 
 						}
 						else {
-							m_ExplosionEffectSplatMapShieldCheckProgram->Bind();
-							GLERROR("Bind ExplosionEffectSplatMap program");
-							//bind uniforms
+							if (lastShader != m_ExplosionEffectSplatMapShieldCheckProgram->GetHandle()) {
+								m_ExplosionEffectSplatMapShieldCheckProgram->Bind();
+								lastShader = m_ExplosionEffectSplatMapShieldCheckProgram->GetHandle();
+								GLERROR("Bind ExplosionEffectSplatMap program");
+								glUniform1i(glGetUniformLocation(explosionSplatMapShieldCheckHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+								glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapShieldCheckHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+								glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapShieldCheckHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+								glUniform2f(glGetUniformLocation(explosionSplatMapShieldCheckHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+								glUniform4fv(glGetUniformLocation(explosionSplatMapShieldCheckHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+								GLERROR("Bind ExplosionEffectSplatMap Uniforms");
+							}
 							//bind uniforms
 							BindExplosionUniforms(explosionSplatMapShieldCheckHandle, explosionEffectJob, scene);
 							//bind textures
@@ -637,9 +759,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 				case RawModel::MaterialType::SingleTextures:
 					{
 						if (explosionEffectJob->Model->IsSkinned()) {
-
-							m_ExplosionEffectSkinnedProgram->Bind();
-							GLERROR("Bind ExplosionEffectSkinned program");
+							if (lastShader != m_ExplosionEffectSkinnedProgram->GetHandle()) {
+								m_ExplosionEffectSkinnedProgram->Bind();
+								lastShader = m_ExplosionEffectSkinnedProgram->GetHandle();
+								GLERROR("Bind ExplosionEffectSkinned program");
+								glUniform1i(glGetUniformLocation(explosionSkinnedHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+								glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+								glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+								glUniform2f(glGetUniformLocation(explosionSkinnedHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+								glUniform4fv(glGetUniformLocation(explosionSkinnedHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+								GLERROR("Bind ExplosionEffectSkinned Uniforms");
+							}
 							//bind uniforms
 							BindExplosionUniforms(explosionSkinnedHandle, explosionEffectJob, scene);
 							//bind textures
@@ -657,8 +787,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
                             glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
                         }
 						else {
-							m_ExplosionEffectProgram->Bind();
-							GLERROR("Bind ExplosionEffect program");
+							if (lastShader != m_ExplosionEffectProgram->GetHandle()) {
+								m_ExplosionEffectProgram->Bind();
+								lastShader = m_ExplosionEffectProgram->GetHandle();
+								GLERROR("Bind ExplosionEffect program");
+								glUniform1i(glGetUniformLocation(explosionHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+								glUniformMatrix4fv(glGetUniformLocation(explosionHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+								glUniformMatrix4fv(glGetUniformLocation(explosionHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+								glUniform2f(glGetUniformLocation(explosionHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+								glUniform4fv(glGetUniformLocation(explosionHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+								GLERROR("Bind ExplosionEffect Uniforms");
+							}
 							//bind uniforms
 							BindExplosionUniforms(explosionHandle, explosionEffectJob, scene);
 							//bind textures
@@ -672,8 +811,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 				case RawModel::MaterialType::SplatMapping:
 					{
 						if (explosionEffectJob->Model->IsSkinned()) {
-							m_ExplosionEffectSplatMapSkinnedProgram->Bind();
-							GLERROR("Bind ExplosionEffectSplatMapSkinned program");
+							if (lastShader != m_ExplosionEffectSplatMapSkinnedProgram->GetHandle()) {
+								m_ExplosionEffectSplatMapSkinnedProgram->Bind();
+								lastShader = m_ExplosionEffectSplatMapSkinnedProgram->GetHandle();
+								GLERROR("Bind ExplosionEffectSkinnedSplatMap program");
+								glUniform1i(glGetUniformLocation(explosionSplatMapSkinnedHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+								glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+								glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+								glUniform2f(glGetUniformLocation(explosionSplatMapSkinnedHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+								glUniform4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+								GLERROR("Bind ExplosionEffectSkinnedSplatMap Uniforms");
+							}
 							//bind uniforms
 							BindExplosionUniforms(explosionSplatMapSkinnedHandle, explosionEffectJob, scene);
 							//bind textures
@@ -689,9 +837,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 
 						}
 						else {
-							m_ExplosionEffectSplatMapProgram->Bind();
-							GLERROR("Bind ExplosionEffectSplatMap program");
-							//bind uniforms
+							if (lastShader != m_ExplosionEffectSplatMapProgram->GetHandle()) {
+								m_ExplosionEffectSplatMapProgram->Bind();
+								lastShader = m_ExplosionEffectSplatMapProgram->GetHandle();
+								GLERROR("Bind ExplosionEffectSplatMap program");
+								glUniform1i(glGetUniformLocation(explosionSplatMapHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+								glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+								glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+								glUniform2f(glGetUniformLocation(explosionSplatMapHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+								glUniform4fv(glGetUniformLocation(explosionSplatMapHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+								GLERROR("Bind ExplosionEffectSplatMap Uniforms");
+							}
 							//bind uniforms
 							BindExplosionUniforms(explosionSplatMapHandle, explosionEffectJob, scene);
 							//bind textures
@@ -705,8 +861,11 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 			glDisable(GL_CULL_FACE);
 
 			//draw
-			glBindVertexArray(explosionEffectJob->Model->VAO);
-			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, explosionEffectJob->Model->ElementBuffer);
+			if (lastModel != explosionEffectJob->ModelID) {
+				glBindVertexArray(explosionEffectJob->Model->VAO);
+				glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, explosionEffectJob->Model->ElementBuffer);
+				lastModel = explosionEffectJob->ModelID;
+			}
 			glDrawElements(GL_TRIANGLES, explosionEffectJob->EndIndex - explosionEffectJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(explosionEffectJob->StartIndex*sizeof(unsigned int)));
 			glEnable(GL_CULL_FACE);
 			GLERROR("explosion effect end");
@@ -721,8 +880,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 					case RawModel::MaterialType::SingleTextures:
 						{
 							if (modelJob->Model->IsSkinned()) {
-								m_ForwardPlusSkinnedShieldCheckProgram->Bind();
-								GLERROR("Bind ForwardPlusSkinnedProgram");
+								if (lastShader != m_ForwardPlusSkinnedShieldCheckProgram->GetHandle()) {
+									m_ForwardPlusSkinnedShieldCheckProgram->Bind();
+									lastShader = m_ForwardPlusSkinnedShieldCheckProgram->GetHandle();
+									GLERROR("Bind ForwardPlusSkinnedProgram program");
+									glUniform1i(glGetUniformLocation(forwardSkinnedShieldCheckHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+									glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedShieldCheckHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+									glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedShieldCheckHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+									glUniform2f(glGetUniformLocation(forwardSkinnedShieldCheckHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+									glUniform4fv(glGetUniformLocation(forwardSkinnedShieldCheckHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+									GLERROR("Bind ForwardPlusSkinnedProgram Uniforms");
+								}
 								//bind uniforms
 								BindModelUniforms(forwardSkinnedShieldCheckHandle, modelJob, scene);
 								//bind textures
@@ -741,8 +909,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 
 							}
 							else {
-								m_ForwardPlusShieldCheckProgram->Bind();
-								GLERROR("Bind ForwardPlusProgram");
+								if (lastShader != m_ForwardPlusShieldCheckProgram->GetHandle()) {
+									m_ForwardPlusShieldCheckProgram->Bind();
+									lastShader = m_ForwardPlusShieldCheckProgram->GetHandle();
+									GLERROR("Bind ForwardPlusProgram program");
+									glUniform1i(glGetUniformLocation(forwardShieldCheckHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+									glUniformMatrix4fv(glGetUniformLocation(forwardShieldCheckHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+									glUniformMatrix4fv(glGetUniformLocation(forwardShieldCheckHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+									glUniform2f(glGetUniformLocation(forwardShieldCheckHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+									glUniform4fv(glGetUniformLocation(forwardShieldCheckHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+									GLERROR("Bind ForwardPlusProgram Uniforms");
+								}
 								//bind uniforms
 								BindModelUniforms(forwardShieldCheckHandle, modelJob, scene);
 								//bind textures
@@ -756,8 +933,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 					case RawModel::MaterialType::SplatMapping:
 						{
 							if (modelJob->Model->IsSkinned()) {
-								m_ForwardPlusSplatMapSkinnedShieldCheckProgram->Bind();
-								GLERROR("Bind SplatMap program");
+								if (lastShader != m_ForwardPlusSplatMapSkinnedShieldCheckProgram->GetHandle()) {
+									m_ForwardPlusSplatMapSkinnedShieldCheckProgram->Bind();
+									lastShader = m_ForwardPlusSplatMapSkinnedShieldCheckProgram->GetHandle();
+									GLERROR("Bind ForwardPlusProgramSplatMapSkinned program");
+									glUniform1i(glGetUniformLocation(forwardSplatMapSkinnedShieldCheckHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+									glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapSkinnedShieldCheckHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+									glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapSkinnedShieldCheckHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+									glUniform2f(glGetUniformLocation(forwardSplatMapSkinnedShieldCheckHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+									glUniform4fv(glGetUniformLocation(forwardSplatMapSkinnedShieldCheckHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+									GLERROR("Bind ForwardPlusProgramSplatMapSkinned Uniforms");
+								}
 								//bind uniforms
 								BindModelUniforms(forwardSplatMapSkinnedShieldCheckHandle, modelJob, scene);
 								//bind textures
@@ -773,8 +959,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
                                 glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 							}
 							else {
-								m_ForwardPlusSplatMapShieldCheckProgram->Bind();
-								GLERROR("Bind SplatMap program");
+								if (lastShader != m_ForwardPlusSplatMapShieldCheckProgram->GetHandle()) {
+									m_ForwardPlusSplatMapShieldCheckProgram->Bind();
+									lastShader = m_ForwardPlusSplatMapShieldCheckProgram->GetHandle();
+									GLERROR("Bind SplatMap program");
+									glUniform1i(glGetUniformLocation(forwardSplatShieldCheckHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+									glUniformMatrix4fv(glGetUniformLocation(forwardSplatShieldCheckHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+									glUniformMatrix4fv(glGetUniformLocation(forwardSplatShieldCheckHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+									glUniform2f(glGetUniformLocation(forwardSplatShieldCheckHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+									glUniform4fv(glGetUniformLocation(forwardSplatShieldCheckHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+									GLERROR("Bind SplatMap Uniforms");
+								}
 								//bind uniforms
 								BindModelUniforms(forwardSplatShieldCheckHandle, modelJob, scene);
 								//bind textures
@@ -790,8 +985,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 					case RawModel::MaterialType::SingleTextures:
 						{
 							if (modelJob->Model->IsSkinned()) {
-								m_ForwardPlusSkinnedProgram->Bind();
-								GLERROR("Bind ForwardPlusSkinnedProgram");
+								if (lastShader != m_ForwardPlusSkinnedProgram->GetHandle()) {
+									m_ForwardPlusSkinnedProgram->Bind();
+									lastShader = m_ForwardPlusSkinnedProgram->GetHandle();
+									GLERROR("Bind ForwardPlusSkinnedProgram program");
+									glUniform1i(glGetUniformLocation(forwardSkinnedHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+									glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+									glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+									glUniform2f(glGetUniformLocation(forwardSkinnedHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+									glUniform4fv(glGetUniformLocation(forwardSkinnedHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+									GLERROR("Bind ForwardPlusSkinnedProgram Uniforms");
+								}
 								//bind uniforms
 								BindModelUniforms(forwardSkinnedHandle, modelJob, scene);
 								//bind textures
@@ -810,8 +1014,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 
 							}
 							else {
-								m_ForwardPlusProgram->Bind();
-								GLERROR("Bind ForwardPlusProgram");
+								if (lastShader != m_ForwardPlusProgram->GetHandle()) {
+									m_ForwardPlusProgram->Bind();
+									lastShader = m_ForwardPlusProgram->GetHandle();
+									GLERROR("Bind ForwardPlusProgram program");
+									glUniform1i(glGetUniformLocation(forwardHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+									glUniformMatrix4fv(glGetUniformLocation(forwardHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+									glUniformMatrix4fv(glGetUniformLocation(forwardHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+									glUniform2f(glGetUniformLocation(forwardHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+									glUniform4fv(glGetUniformLocation(forwardHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+									GLERROR("Bind ForwardPlusProgram Uniforms");
+								}
 								//bind uniforms
 								BindModelUniforms(forwardHandle, modelJob, scene);
 								//bind textures
@@ -825,8 +1038,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 					case RawModel::MaterialType::SplatMapping:
 						{
 							if (modelJob->Model->IsSkinned()) {
-								m_ForwardPlusSplatMapSkinnedProgram->Bind();
-								GLERROR("Bind SplatMap program");
+								if (lastShader != m_ForwardPlusSplatMapSkinnedProgram->GetHandle()) {
+									m_ForwardPlusSplatMapSkinnedProgram->Bind();
+									lastShader = m_ForwardPlusSplatMapSkinnedProgram->GetHandle();
+									GLERROR("Bind SplatMap program");
+									glUniform1i(glGetUniformLocation(forwardSplatMapSkinnedHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+									glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapSkinnedHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+									glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+									glUniform2f(glGetUniformLocation(forwardSplatMapSkinnedHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+									glUniform4fv(glGetUniformLocation(forwardSplatMapSkinnedHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+									GLERROR("Bind SplatMap Uniforms");
+								}
 								//bind uniforms
 								BindModelUniforms(forwardSplatMapSkinnedHandle, modelJob, scene);
 								//bind textures
@@ -842,8 +1064,17 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
                                 glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 							}
 							else {
-								m_ForwardPlusSplatMapProgram->Bind();
-								GLERROR("Bind SplatMap program");
+								if (lastShader != m_ForwardPlusSplatMapProgram->GetHandle()) {
+									m_ForwardPlusSplatMapProgram->Bind();
+									lastShader = m_ForwardPlusSplatMapProgram->GetHandle();
+									GLERROR("Bind SplatMap program");
+									glUniform1i(glGetUniformLocation(forwardSplatMapHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+									glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+									glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+									glUniform2f(glGetUniformLocation(forwardSplatMapHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+									glUniform4fv(glGetUniformLocation(forwardSplatMapHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+									GLERROR("Bind SplatMap Uniforms");
+								}
 								//bind uniforms
 								BindModelUniforms(forwardSplatMapHandle, modelJob, scene);
 								//bind textures
@@ -855,8 +1086,11 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 					}
 				}
 				//draw
-				glBindVertexArray(modelJob->Model->VAO);
-				glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+				if (lastModel != modelJob->ModelID) {
+					glBindVertexArray(modelJob->Model->VAO);
+					glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+					lastModel = modelJob->ModelID;
+				}
 				glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex*sizeof(unsigned int)));
 				if (GLERROR("models end")) {
 					continue;
@@ -961,17 +1195,26 @@ void DrawFinalPass::DrawShieldedModelRenderQueue(std::list<std::shared_ptr<Rende
 
 void DrawFinalPass::DrawToDepthStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene)
 {
-    
-   
+	GLuint shaderSkinnedHandle = m_FillDepthStencilBufferSkinnedProgram->GetHandle();
+    GLuint shaderHandle = m_FillDepthStencilBufferProgram->GetHandle();
+	GLuint lastShader = 0;
     for (auto &job : jobs) {
         auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
       
         if(modelJob->Model->IsSkinned()) {
-            m_FillDepthStencilBufferSkinnedProgram->Bind();
-            GLuint shaderHandle = m_FillDepthStencilBufferSkinnedProgram->GetHandle();
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
+			if (lastShader != m_FillDepthStencilBufferSkinnedProgram->GetHandle()) {
+				m_FillDepthStencilBufferSkinnedProgram->Bind();
+				lastShader = m_FillDepthStencilBufferSkinnedProgram->GetHandle();
+				glUniform1i(glGetUniformLocation(shaderSkinnedHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+				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()));
+				glUniform2f(glGetUniformLocation(shaderSkinnedHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+				glUniform4fv(glGetUniformLocation(shaderSkinnedHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+				GLERROR("Bind Uniforms 1");
+			}
+
+			glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
+			GLERROR("Bind PVM uniform");
 
             std::vector<glm::mat4> frameBones;
             if (modelJob->BlendTree != nullptr) {
@@ -982,11 +1225,19 @@ void DrawFinalPass::DrawToDepthStencilBuffer(std::list<std::shared_ptr<RenderJob
             glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
         } else {
-            m_FillDepthStencilBufferProgram->Bind();
-            GLuint shaderHandle = m_FillDepthStencilBufferProgram->GetHandle();
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
+			if (lastShader != m_FillDepthStencilBufferProgram->GetHandle()) {
+				m_FillDepthStencilBufferProgram->Bind();
+				lastShader = m_FillDepthStencilBufferProgram->GetHandle();
+				glUniform1i(glGetUniformLocation(shaderHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
+				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->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+				glUniform4fv(glGetUniformLocation(shaderHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
+				GLERROR("Bind Uniforms 2");
+			}
+
+			glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
+			GLERROR("Bind PVM uniform");
         }
 
 
@@ -1008,6 +1259,9 @@ void DrawFinalPass::DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, Rend
 
     GLuint shaderHandle = m_SpriteProgram->GetHandle();
 
+	glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+	glUniform3fv(glGetUniformLocation(shaderHandle, "CameraPos"), 1, glm::value_ptr(scene.Camera->Position()));
+
     for(auto& job : jobs) {
         auto spriteJob = std::dynamic_pointer_cast<SpriteJob>(job);
         RenderState jobState;
@@ -1016,10 +1270,7 @@ void DrawFinalPass::DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, Rend
             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()));
+            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * spriteJob->Matrix));
             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);
@@ -1049,17 +1300,14 @@ void DrawFinalPass::DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, Rend
 
 void DrawFinalPass::BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job, RenderScene& scene)
 {
-	glUniform1i(glGetUniformLocation(shaderHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
-	GLERROR("Bind 1 uniform");
     glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(job->Matrix));
 	GLERROR("Bind 2 uniform");
-    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
-	GLERROR("Bind 3 uniform");
-    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
-	GLERROR("Bind 4 uniform");
-
-    glUniform2f(glGetUniformLocation(shaderHandle, "ScreenDimensions"), m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
-	GLERROR("Bind 5 uniform");
+	glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * job->Matrix));
+	GLERROR("Bind PVM uniform");
+	glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "VM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix() * job->Matrix));
+	GLERROR("Bind VM uniform");
+	glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "TIM"), 1, GL_FALSE, glm::value_ptr(glm::transpose(glm::inverse(job->Matrix))));
+	GLERROR("Bind TIM uniform");
 
     glUniform3fv(glGetUniformLocation(shaderHandle, "ExplosionOrigin"), 1, glm::value_ptr(job->ExplosionOrigin));
 	GLERROR("Bind 6 uniform");
@@ -1090,29 +1338,21 @@ void DrawFinalPass::BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<E
 	GLERROR("Bind 18 uniform");
     glUniform1f(glGetUniformLocation(shaderHandle, "FillPercentage"), job->FillPercentage);
 	GLERROR("Bind 19 uniform");
-    glUniform4fv(glGetUniformLocation(shaderHandle, "AmbientColor"), 1, glm::value_ptr(scene.AmbientColor));
-    GLERROR("Bind 20 uniform");
     glUniform1f(glGetUniformLocation(shaderHandle, "GlowIntensity"), job->GlowIntensity);
     GLERROR("END");
 }
 
 void DrawFinalPass::BindModelUniforms(GLuint shaderHandle, std::shared_ptr<ModelJob>& job, RenderScene& scene)
 {
-	glUniform1i(glGetUniformLocation(shaderHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
-	GLERROR("Bind 1 uniform");
 	GLint Location_M = glGetUniformLocation(shaderHandle, "M");
 	glUniformMatrix4fv(Location_M, 1, GL_FALSE, glm::value_ptr(job->Matrix));
 	GLERROR("Bind 2 uniform");
-	GLint Location_V = glGetUniformLocation(shaderHandle, "V");
-	glUniformMatrix4fv(Location_V, 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
-	GLERROR("Bind 3 uniform");
-	GLint Location_P = glGetUniformLocation(shaderHandle, "P");
-	glUniformMatrix4fv(Location_P, 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
-	GLERROR("Bind 4 uniform");
-
-	GLint Location_ScreenDimensions = glGetUniformLocation(shaderHandle, "ScreenDimensions");
-	glUniform2f(Location_ScreenDimensions, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
-	GLERROR("Bind 5 uniform");
+	glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * job->Matrix));
+	GLERROR("Bind PVM uniform");
+	glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "VM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix() * job->Matrix));
+	GLERROR("Bind VM uniform");
+	glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "TIM"), 1, GL_FALSE, glm::value_ptr(glm::transpose(glm::inverse(job->Matrix))));
+	GLERROR("Bind TIM uniform");
 
 	GLint Location_FillPercentage = glGetUniformLocation(shaderHandle, "FillPercentage");
 	glUniform1f(Location_FillPercentage, job->FillPercentage);
@@ -1125,11 +1365,6 @@ void DrawFinalPass::BindModelUniforms(GLuint shaderHandle, std::shared_ptr<Model
 	GLERROR("Bind 8 uniform");
 	GLint Location_Color = glGetUniformLocation(shaderHandle, "Color");
 	glUniform4fv(Location_Color, 1, glm::value_ptr(job->Color));
-	GLERROR("Bind 9 uniform");
-	GLint Location_AmbientColor = glGetUniformLocation(shaderHandle, "AmbientColor");
-	glUniform4fv(Location_AmbientColor, 1, glm::value_ptr(scene.AmbientColor));
-
-    GLERROR("Bind 10 uniform");
     GLint Location_GlowIntensity = glGetUniformLocation(shaderHandle, "GlowIntensity");
 
     glUniform1f(Location_GlowIntensity, job->GlowIntensity);

src/Engine/Rendering/Model.cpp

@@ -10,31 +10,31 @@ 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);
+            materialSingleTexture->ColorMap.Texture = CommonFunctions::TryLoadResource<Texture, false>(materialSingleTexture->ColorMap.TexturePath);
+            materialSingleTexture->NormalMap.Texture = CommonFunctions::TryLoadResource<Texture, false>(materialSingleTexture->NormalMap.TexturePath);
+            materialSingleTexture->SpecularMap.Texture = CommonFunctions::TryLoadResource<Texture, false>(materialSingleTexture->SpecularMap.TexturePath);
+            materialSingleTexture->IncandescenceMap.Texture = CommonFunctions::TryLoadResource<Texture, false>(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);
+			materialSplatMapping->SplatMap.Texture = CommonFunctions::TryLoadResource<Texture, false>(materialSplatMapping->SplatMap.TexturePath);
 			for (auto& texture : materialSplatMapping->ColorMaps)
 			{
-				texture.Texture = CommonFunctions::LoadTexture(texture.TexturePath, false);
+				texture.Texture = CommonFunctions::TryLoadResource<Texture, false>(texture.TexturePath);
 			}
 			for (auto& texture : materialSplatMapping->NormalMaps)
 			{
-				texture.Texture = CommonFunctions::LoadTexture(texture.TexturePath, false);
+				texture.Texture = CommonFunctions::TryLoadResource<Texture, false>(texture.TexturePath);
 			}
 			for (auto& texture : materialSplatMapping->SpecularMaps)
 			{
-				texture.Texture = CommonFunctions::LoadTexture(texture.TexturePath, false);
+				texture.Texture = CommonFunctions::TryLoadResource<Texture, false>(texture.TexturePath);
 			}
 			for (auto& texture : materialSplatMapping->IncandescenceMaps)
 			{
-				texture.Texture = CommonFunctions::LoadTexture(texture.TexturePath, false);
+				texture.Texture = CommonFunctions::TryLoadResource<Texture, false>(texture.TexturePath);
 			}
 		}
 			break;

src/Engine/Rendering/PickingPass.cpp

@@ -12,7 +12,8 @@ PickingPass::PickingPass(IRenderer* renderer, EventBroker* eb)
 
 PickingPass::~PickingPass()
 {
-
+	CommonFunctions::DeleteTexture(&m_PickingTexture);
+	CommonFunctions::DeleteTexture(&m_DepthBuffer);
 }
 
 
@@ -61,8 +62,9 @@ void PickingPass::Draw(RenderScene& scene)
     //TODO: Render: Add code for more jobs than modeljobs.
     GLuint shaderHandle = m_PickingProgram->GetHandle();
     GLuint shaderSkinnedHandle = m_PickingSkinnedProgram->GetHandle();
+	GLuint lastShader = 0;
+	unsigned int lastModel = 0;
     m_PickingProgram->Bind();
-
     if (scene.ClearDepth) {
         //glClear(GL_DEPTH_BUFFER_BIT);
 		state->Disable(GL_DEPTH_TEST);
@@ -98,10 +100,11 @@ void PickingPass::Draw(RenderScene& scene)
             m_PickingColorsToEntity[glm::ivec2(pickColor[0], pickColor[1])] = pickInfo;
 
             if (modelJob->Model->IsSkinned()) {
-                m_PickingSkinnedProgram->Bind();
-                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()));
+				if (lastShader != m_PickingSkinnedProgram->GetHandle()) {
+					m_PickingSkinnedProgram->Bind();
+					lastShader = m_PickingSkinnedProgram->GetHandle();
+				}
+                glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
                 std::vector<glm::mat4> frameBones;
@@ -114,15 +117,19 @@ void PickingPass::Draw(RenderScene& scene)
 
 
             } else {
-                m_PickingProgram->Bind();
-                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()));
+				if (lastShader != m_PickingProgram->GetHandle()) {
+					m_PickingProgram->Bind();
+					lastShader = m_PickingProgram->GetHandle();
+				}
+				glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
                 glUniform2fv(glGetUniformLocation(shaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
             }
 
-            glBindVertexArray(modelJob->Model->VAO);
-            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+			if (lastModel != modelJob->ModelID) {
+				glBindVertexArray(modelJob->Model->VAO);
+				glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+				lastModel = modelJob->ModelID;
+			}
             glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
         }
     }
@@ -208,10 +215,11 @@ void PickingPass::Draw(RenderScene& scene)
             m_PickingColorsToEntity[glm::ivec2(pickColor[0], pickColor[1])] = pickInfo;
 
             if (modelJob->Model->IsSkinned()) {
-                m_PickingSkinnedProgram->Bind();
-                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()));
+				if (lastShader != m_PickingSkinnedProgram->GetHandle()) {
+					m_PickingSkinnedProgram->Bind();
+					lastShader = m_PickingSkinnedProgram->GetHandle();
+				}
+				glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
                 std::vector<glm::mat4> frameBones;
@@ -224,19 +232,24 @@ void PickingPass::Draw(RenderScene& scene)
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
             } else {
-                m_PickingProgram->Bind();
-                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()));
+				if (lastShader != m_PickingProgram->GetHandle()) {
+					m_PickingProgram->Bind();
+					lastShader = m_PickingProgram->GetHandle();
+				}
+				glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
                 glUniform2fv(glGetUniformLocation(shaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
             }
 
-            glBindVertexArray(modelJob->Model->VAO);
-            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+			if (lastModel != modelJob->ModelID) {
+				glBindVertexArray(modelJob->Model->VAO);
+				glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+				lastModel = modelJob->ModelID;
+			}
             glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
         }
     }
 
+	m_PickingProgram->Bind();
     for (auto& job : scene.Jobs.SpriteJob) {
         auto spriteJob = std::dynamic_pointer_cast<SpriteJob>(job);
         if (!spriteJob->Pickable) {
@@ -271,14 +284,11 @@ void PickingPass::Draw(RenderScene& scene)
 
             m_PickingColorsToEntity[glm::ivec2(pickColor[0], pickColor[1])] = pickInfo;
 
-            m_PickingProgram->Bind();
-            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()));
+			glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * spriteJob->Matrix));
             glUniform2fv(glGetUniformLocation(shaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
-            glBindVertexArray(spriteJob->Model->VAO);
-            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, spriteJob->Model->ElementBuffer);
+			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)));
         }
     }

src/Engine/Rendering/RenderSystem.cpp

@@ -449,7 +449,7 @@ void RenderSystem::Update(double dt)
     fillModels(scene.Jobs);
     fillPointLights(scene.Jobs.PointLight, m_World);
     //TODO: Make sure all objects needed are also sorted.
-	scene.Jobs.OpaqueObjects.sort();
+	scene.Jobs.OpaqueObjects.sort([](auto& a, auto& b) {return *a < *b; });
     fillSprites(scene.Jobs.SpriteJob, m_World);
     fillDirectionalLights(scene.Jobs.DirectionalLight, m_World);
     fillText(scene.Jobs.Text, m_World);

src/Engine/Rendering/Renderer.cpp

@@ -2,6 +2,19 @@
 
 std::unordered_map<GLFWwindow*, Renderer*> Renderer::m_WindowToRenderer;
 
+Renderer::~Renderer() {
+	delete m_PickingPass;
+	delete m_LightCullingPass;
+	delete m_ImGuiRenderPass;
+	delete m_DrawFinalPass;
+	delete m_DrawScreenQuadPass;
+	delete m_DrawBloomPass;
+	delete m_DrawColorCorrectionPass;
+	delete m_SSAOPass;
+	delete m_CubeMapPass;
+	delete m_TextPass;
+}
+
 void Renderer::Initialize()
 {
 	m_SSAO_Quality = m_Config->Get<int>("SSAO.Quality", 0);
@@ -220,8 +233,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 = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/ErrorTexture.png");
+    m_WhiteTexture = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/White.png");
 }
 
 

src/Engine/Rendering/SSAOPass.cpp

@@ -4,12 +4,19 @@ SSAOPass::SSAOPass(IRenderer* renderer, ConfigFile* config)
 	: m_Renderer(renderer)
 	, m_Config(config)
 {
-	m_WhiteTexture = CommonFunctions::LoadTexture("Textures/Core/White.png", false);
+	m_WhiteTexture = CommonFunctions::TryLoadResource<Texture, false>("Textures/Core/White.png");
 
 	ChangeQuality(m_Config->Get<int>("SSAO.Quality", 0));
 
 }
 
+SSAOPass::~SSAOPass() {
+	CommonFunctions::DeleteTexture(&m_SSAOTexture);
+	CommonFunctions::DeleteTexture(&m_SSAOViewSpaceZTexture);
+	CommonFunctions::DeleteTexture(&m_Gaussian_horiz);
+	CommonFunctions::DeleteTexture(&m_Gaussian_vert);
+}
+
 void SSAOPass::ChangeQuality(int quality)
 {
 	if (m_Quality == quality) {

src/Engine/Rendering/ShaderProgram.cpp

@@ -4,22 +4,32 @@ GLuint Shader::CompileShader(GLenum shaderType, std::string fileName)
 {
 	LOG_INFO("Compiling shader \"%s\"", fileName.c_str());
 
-	std::string shaderFile;
-	std::ifstream in(fileName, std::ios::in);
-	if (!in) {
-		LOG_ERROR("Error: Failed to open shader file \"%s\"", fileName.c_str());
-		return 0;
-	}
-	in.seekg(0, std::ios::end);
-	shaderFile.resize((int)in.tellg());
-	in.seekg(0, std::ios::beg);
-	in.read(&shaderFile[0], shaderFile.size());
-	in.close();
+    std::string shaderFile = ReadFile(fileName);
 
 	GLuint shader = glCreateShader(shaderType);
 	if (GLERROR("glCreateShader"))
 		return 0;
 
+    std::size_t startPos = 0;
+    std::size_t SEofNewFile[2];
+    std::string key = "#include";
+    while((startPos = shaderFile.find(key, startPos)) != std::string::npos)
+    {
+        SEofNewFile[0] = shaderFile.find('"', startPos+key.length())+1;
+        SEofNewFile[1] = shaderFile.find('"', SEofNewFile[0]);
+        if (SEofNewFile[0] == std::string::npos || SEofNewFile[1] == std::string::npos)
+            return 0;
+
+        std::string replacementFileName = shaderFile.substr(SEofNewFile[0], SEofNewFile[1] - SEofNewFile[0]);
+        std::string replacementString = ReadFile(replacementFileName);
+        size_t firstof = replacementString.find_first_of((char)0);
+        replacementString.erase(firstof, replacementString.size() - firstof);
+        if (replacementString.length() <= 0)
+            return 0;
+        shaderFile.replace(startPos, SEofNewFile[1]+2 - startPos, replacementString + "\n");
+        startPos += replacementString.length(); //This might not be wanted.
+    }
+
 	const GLchar* shaderFiles = shaderFile.c_str();
 	const GLint length = static_cast<GLint>(shaderFile.length());
 	glShaderSource(shader, 1, &shaderFiles, &length);
@@ -46,6 +56,24 @@ GLuint Shader::CompileShader(GLenum shaderType, std::string fileName)
 	return shader;
 }
 
+std::string Shader::ReadFile(std::string fileName)
+{
+    std::string shaderFile;
+    std::ifstream in(fileName, std::ios::in);
+    if (!in) {
+        LOG_ERROR("Error: Failed to open shader file \"%s\"", fileName.c_str());
+        return "";
+    }
+
+    in.seekg(0, std::ios::end);
+    shaderFile.resize((int)in.tellg());
+    in.seekg(0, std::ios::beg);
+    in.read(&shaderFile[0], shaderFile.size());
+    in.close();
+    return shaderFile;
+}
+
+
 Shader::Shader(GLenum shaderType, std::string fileName) : m_ShaderType(shaderType), m_FileName(fileName)
 {
 	m_ShaderHandle = 0;

src/Engine/Rendering/Texture.cpp

@@ -4,18 +4,6 @@ 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);
-
-    //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->Data = img->Data;
@@ -29,9 +17,9 @@ Texture::Texture(std::string path)
         format = GL_RGBA;
         break;
     }
-    
-
+   
     // Construct the OpenGL texture
+
     glGenTextures(1, &m_Texture);
     glBindTexture(GL_TEXTURE_2D, m_Texture);
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);

src/Engine/Rendering/TextureSprite.cpp

@@ -0,0 +1,11 @@
+#include "Rendering/TextureSprite.h"
+
+TextureSprite::TextureSprite(std::string path)
+    :Texture(path)
+{
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST_MIPMAP_NEAREST);
+    GLERROR("Texture load");
+}

src/Engine/Rendering/Util/CommonFunctions.cpp

@@ -1,23 +1,5 @@
 #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;
-}
-
 void CommonFunctions::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type)
 {
 	glDeleteTextures(1, texture);

src/Engine/Rendering/Util/ScreenCoords.cpp

@@ -37,7 +37,7 @@ ScreenCoords::PixelData ScreenCoords::ToPixelData(float x, float y, FrameBuffer*
     glReadPixels(x, y, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pdata);
 	GLERROR("glReadPixels(pdata) Error");
     PickDataBuffer->Unbind();
-
+	GLERROR("Unbind Error");
     glBindFramebuffer(GL_FRAMEBUFFER, DepthBuffer); 
 	GLERROR("glBindFramebuffer(DepthBuffer) Error");
     float depthData;

src/Game/Game.cpp

@@ -39,6 +39,8 @@
 #include "GUI/ButtonSystem.h"
 #include "Game/Systems/MainMenuSystem.h"
 #include "Game/Systems/ServerListSystem.h"
+#include "Game/Systems/StartSystem.h"
+#include "Rendering/TextureSprite.h"
 
 
 Game::Game(int argc, char* argv[])
@@ -50,6 +52,7 @@ Game::Game(int argc, char* argv[])
     ResourceManager::RegisterType<Model>("Model");
     ResourceManager::RegisterType<RawModel>("RawModel");
     ResourceManager::RegisterType<Texture>("Texture");
+    ResourceManager::RegisterType<TextureSprite>("TextureSprite");
     ResourceManager::RegisterType<PNG>("Png");
     ResourceManager::RegisterType<ShaderProgram>("ShaderProgram");
     ResourceManager::RegisterType<EntityFile>("EntityFile");
@@ -153,6 +156,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<ScoreScreenSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<SpectatorCameraSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<ServerListSystem>(updateOrderLevel, m_Renderer);
+    m_SystemPipeline->AddSystem<StartSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
@@ -215,7 +219,7 @@ void Game::Tick()
     PerformanceTimer::StartTimerAndStopPrevious("InputProxy");
     m_InputProxy->Update(dt);
     m_EventBroker->Swap();
-    m_InputProxy->Process();
+    m_InputProxy->Process(ImGui::GetIO().WantCaptureKeyboard || ImGui::GetIO().WantCaptureMouse);
     m_EventBroker->Swap();
 
     PerformanceTimer::StartTimerAndStopPrevious("SoundManager");

src/Game/Network/MultiplayerSnapshotFilter.cpp

@@ -15,7 +15,9 @@ bool MultiplayerSnapshotFilter::FilterComponent(EntityWrapper entity, SharedComp
             || component.Info.Name == "AssaultWeapon"
             || component.Info.Name == "DefenderWeapon"
             || component.Info.Name == "Animation"
-            || component.Info.Name == "AnimationOffset"
+            || component.Info.Name == "Blend"
+            || component.Info.Name == "BlendAdditive"
+            || component.Info.Name == "BlendOverride"
             || entity.Name() == "PlayerName"
         ) {
             return false;

src/Game/Systems/DamageIndicatorSystem.cpp

@@ -8,7 +8,7 @@ DamageIndicatorSystem::DamageIndicatorSystem(SystemParams params)
     EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &DamageIndicatorSystem::OnSetCamera);
 
     //load texture to cache
-    auto texture = CommonFunctions::LoadTexture("Textures/DamageIndicator.png", false);
+    auto texture = CommonFunctions::TryLoadResource<Texture, false>("Textures/DamageIndicator.png");
     auto entityFile = ResourceManager::Load<EntityXMLFile>("Schema/Entities/DamageIndicator.xml");
     m_NetworkEnabled = ResourceManager::Load<ConfigFile>("Config.ini")->Get("Networking.StartNetwork", false);
 }

src/Game/Systems/ExplosionEffectSystem.cpp

@@ -2,13 +2,17 @@
 
 void ExplosionEffectSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
 {
-    if ((double)component["TimeSinceDeath"] > (double)component["ExplosionDuration"]) {
-        (double)component["TimeSinceDeath"] = 0.f;
+    double& delay = (double)component["Delay"];
+    if (delay > 0) {
+        delay = std::max(0.0, delay - dt);
     }
-    (double&)component["TimeSinceDeath"] += dt;
 
-    //if ((bool)Component["Gravity"] == true) {
-    //    (bool)Component["ExponentialAccelaration"] = false;
-    //}
+    if (delay <= 0) {
+        double& timeSinceDeath = component["TimeSinceDeath"];
+        timeSinceDeath += (double)component["Speed"] * dt;
+        if (timeSinceDeath < 0 || timeSinceDeath > (double)component["ExplosionDuration"]) {
+            timeSinceDeath = 0.0;
+        }
+    }
 }
 

src/Game/Systems/MainMenuSystem.cpp

@@ -23,8 +23,8 @@ bool MainMenuSystem::OnButtonClick(const Events::ButtonClicked& e)
         EntityWrapper serverIdentityEntity = entity.FirstParentWithComponent("ServerIdentity");
         if(serverIdentityEntity.Valid()) {
             Events::ConnectRequest event;
-            event.IP = (std::string)entity["ServerIdentity"]["IP"];
-            event.Port = (int)entity["ServerIdentity"]["Port"];
+            event.IP = (std::string)serverIdentityEntity["ServerIdentity"]["IP"];
+            event.Port = (int)serverIdentityEntity["ServerIdentity"]["Port"];
             printf("\n ----Request Server Connect----\nIP: %s\nPort: %i\n ------------------------------", event.IP, event.Port);
             m_EventBroker->Publish(event);
         }
@@ -82,7 +82,6 @@ bool MainMenuSystem::OnInputCommand(const Events::InputCommand& e)
             }
         } else {
             //Serverlist submenu is open, close it.
-            printf("\n\nMenuShit\n\n");
             m_World->DeleteEntity(m_OpenSubMenu.ID);
             m_OpenSubMenu = EntityWrapper::Invalid;
         }

src/Game/Systems/ServerListSystem.cpp

@@ -37,17 +37,17 @@ bool ServerListSystem::OnServerListRecieved(const Events::DisplayServerlist& e)
         for (int i = 0; i < e.Serverlist.size(); i++) {
             //Create Identities for each server and place them on the right position.
             EntityWrapper newIdentity = SpawnerSystem::Spawn(identitySpawner, identitySpawner);
+            EntityWrapper serverIdentityEntity = newIdentity.FirstChildByName("ServerIdentity");
 
             glm::vec3 offset = (glm::vec3)serverListEntity["ServerList"]["Offset"];
-            (glm::vec3&)newIdentity["Transform"]["Position"] = offset * (float)i;
+            (glm::vec3&)serverIdentityEntity["Transform"]["Position"] = offset * (float)i;
 
-            auto& cIdentity = newIdentity["ServerIdentity"];
+            auto& cIdentity = serverIdentityEntity["ServerIdentity"];
             (std::string&)cIdentity["IP"] = e.Serverlist[i].Address;
             (std::string&)cIdentity["ServerName"] = e.Serverlist[i].Name;
             (int&)cIdentity["Port"] = e.Serverlist[i].Port;
             (int&)cIdentity["PlayersConnected"] = e.Serverlist[i].PlayersConnected;
         }
     }
-
     return 1;
 }

src/Game/Systems/StartSystem.cpp

@@ -0,0 +1,33 @@
+#include "../Game/Systems/StartSystem.h"
+
+StartSystem::StartSystem(SystemParams params)
+    : System(params)
+    , ImpureSystem()
+{
+    EVENT_SUBSCRIBE_MEMBER(m_ECameraActivated, &StartSystem::OnCameraActivated);
+}
+
+void StartSystem::Update(double dt)
+{
+    auto cameras = m_World->GetComponents("Camera");
+    if(cameras == nullptr) {
+        return;
+    }
+    for(auto& cCamera: *cameras) {
+        EntityWrapper cameraEntity = EntityWrapper(m_World, cCamera.EntityID);
+        if(cameraEntity == m_ActiveCamera){
+            return;
+        }
+        if(cameraEntity.Name() == "Overview_Camera_Start_Menu") {
+            Events::SetCamera event;
+            event.CameraEntity = cameraEntity;
+            m_EventBroker->Publish(event);
+        }
+    }
+}
+
+bool StartSystem::OnCameraActivated(const Events::SetCamera& e)
+{
+    m_ActiveCamera = e.CameraEntity;
+    return 1;
+}

src/Game/Systems/TextFieldReader.cpp

@@ -7,17 +7,21 @@ void TextFieldReader::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
     }
 
     // Find the entity to read from
-    const std::string& parentEntityName = cAmmunitionHUD["ParentEntityName"];
+    const std::string& entityName = cAmmunitionHUD["ParentEntityName"];
+    const std::string& componentType = cAmmunitionHUD["ComponentType"];
     EntityWrapper readEntity = entity;
-    if (!parentEntityName.empty()) {
-        readEntity = entity.FirstParentByName(parentEntityName);
-        if (!readEntity.Valid()) {
-            return;
+    if (entityName.empty()) {
+        if (!readEntity.HasComponent(componentType)) {
+            readEntity = readEntity.FirstParentWithComponent(componentType);
         }
+    } else {
+        readEntity = entity.FirstParentByName(entityName);
+    }
+    if (!readEntity.Valid()) {
+        return;
     }
 
     // Find the component to read from
-    const std::string& componentType = cAmmunitionHUD["ComponentType"];
     if (componentType.empty() || !readEntity.HasComponent(componentType)) {
         return;
     }

src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp

@@ -40,12 +40,16 @@ void AssaultWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
         magAmmo = glm::min(magSize, ammo);
         isReloading = false;
         if (wi.FirstPersonEntity.Valid()) {
-            wi.FirstPersonEntity["Model"]["Visible"] = true;
+            wi.FirstPersonEntity.FirstChildByName("ViewModel")["Model"]["Visible"] = true;
         }
         if (wi.ThirdPersonEntity.Valid()) {
             wi.ThirdPersonEntity["Model"]["Visible"] = true;
         }
     }    
+    double reloadTime = cWeapon["ReloadTime"];
+    if (isReloading && reloadTimer <= reloadTime / 2) {
+
+    }
     
     // Restore view angle
     if (IsClient) {
@@ -68,7 +72,7 @@ void AssaultWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
     const float& movementSpeed = cPlayer["MovementSpeed"];
     float speed = glm::length((const glm::vec3&)cPhysics["Velocity"]);
     float animationWeight = glm::min(speed, movementSpeed) / movementSpeed;
-    EntityWrapper rootNode = wi.FirstPersonEntity.FirstParentWithComponent("Model");
+    EntityWrapper rootNode = wi.FirstPersonEntity;
     if (rootNode.Valid()) {
         EntityWrapper blend = rootNode.FirstChildByName("MovementBlend");
         if (blend.Valid()) {
@@ -121,19 +125,40 @@ void AssaultWeaponBehaviour::OnReload(ComponentWrapper cWeapon, WeaponInfo& wi)
     reloadTimer = reloadTime;
 
     // Play animation
-    playAnimationAndReturn(wi.FirstPersonEntity, "BlendTreeAssaultWeapon", "Reload");
-    if (IsClient) {
-        // Spawn explosion effect
-        EntityWrapper reloadEffectSpawner = wi.FirstPersonEntity.FirstChildByName("FirstPersonReloadSpawner");
-        if (reloadEffectSpawner.Valid()) {
-            SpawnerSystem::Spawn(reloadEffectSpawner, reloadEffectSpawner);
+    playAnimationAndReturn(wi.FirstPersonEntity, "ActionBlend", "Reload");
+    // Third person anim
+    Events::AutoAnimationBlend b1;
+    b1.RootNode = wi.ThirdPersonPlayerModel;
+    b1.NodeName = "Reload";
+    b1.Restart = true;
+    b1.Start = true;
+    m_EventBroker->Publish(b1);
+    Events::AutoAnimationBlend b2;
+    b2.RootNode = wi.ThirdPersonPlayerModel;
+    b2.NodeName = "MovementBlend";
+    b2.AnimationEntity = wi.ThirdPersonPlayerModel.FirstChildByName("AssaultWeaponBlend").FirstChildByName("Reload");
+    m_EventBroker->Publish(b2);
+
+    // Spawn explosion effect
+    if (wi.FirstPersonEntity.Valid()) {
+        if (IsClient) {
+            EntityWrapper reloadEffectSpawner = wi.FirstPersonEntity.FirstChildByName("ReloadSpawner");
+            if (reloadEffectSpawner.Valid()) {
+                reloadEffectSpawner.DeleteChildren();
+                SpawnerSystem::Spawn(reloadEffectSpawner, reloadEffectSpawner);
+            }
         }
-        if (wi.FirstPersonEntity.Valid()) { 
-            wi.FirstPersonEntity["Model"]["Visible"] = false;
-        }
-        if (wi.ThirdPersonEntity.Valid()) {
-            wi.ThirdPersonEntity["Model"]["Visible"] = false;
+        wi.FirstPersonEntity.FirstChildByName("ViewModel")["Model"]["Visible"] = false;
+    }
+    if (wi.ThirdPersonEntity.Valid()) {
+        if (IsServer) {
+            EntityWrapper reloadEffectSpawner = wi.ThirdPersonEntity.FirstChildByName("ReloadSpawner");
+            if (reloadEffectSpawner.Valid()) {
+                reloadEffectSpawner.DeleteChildren();
+                SpawnerSystem::Spawn(reloadEffectSpawner, reloadEffectSpawner);
+            }
         }
+        wi.ThirdPersonEntity["Model"]["Visible"] = false;
     }
 
     // Sound
@@ -190,7 +215,7 @@ void AssaultWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
     }
 
     // Get weapon model based on current person
-    EntityWrapper weaponModelEntity = getRelevantWeaponModelEntity(wi);
+    EntityWrapper weaponModelEntity = getRelevantWeaponEntity(wi);
     if (!weaponModelEntity.Valid()) {
         return;
     }
@@ -221,7 +246,19 @@ void AssaultWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
     }
     
     // Play animation
-    playAnimationAndReturn(wi.FirstPersonEntity, "BlendTreeAssaultWeapon", "Fire");
+    playAnimationAndReturn(wi.FirstPersonEntity, "ActionBlend", "Fire");
+    // Third person anim
+    Events::AutoAnimationBlend b1;
+    b1.RootNode = wi.ThirdPersonPlayerModel;
+    b1.NodeName = "Fire";
+    b1.Restart = true;
+    b1.Start = true;
+    m_EventBroker->Publish(b1);
+    Events::AutoAnimationBlend b2;
+    b2.RootNode = wi.ThirdPersonPlayerModel;
+    b2.NodeName = "MovementBlend";
+    b2.AnimationEntity = wi.ThirdPersonPlayerModel.FirstChildByName("AssaultWeaponBlend").FirstChildByName("Fire");
+    m_EventBroker->Publish(b2);
 
     // Sound
     Events::PlaySoundOnEntity e;

src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp

@@ -36,7 +36,7 @@ void DefenderWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
             m_EventBroker->Publish(e);
         } else {
             isReloading = false;
-            playAnimationAndReturn(wi.FirstPersonEntity, "FinalBlend", "Idle");
+            playAnimationAndReturn(wi.FirstPersonEntity, "FinalBlend", "ReloadEnd");
         }
     }
 
@@ -99,7 +99,21 @@ void DefenderWeaponBehaviour::OnReload(ComponentWrapper cWeapon, WeaponInfo& wi)
     reloadTimer = reloadTime;
 
     // Play animation
-    playAnimationAndReturn(wi.FirstPersonEntity, "FinalBlend", "Reload");
+    if (wi.FirstPersonEntity.Valid()) {
+        Events::AutoAnimationBlend eBlendStart;
+        eBlendStart.RootNode = wi.FirstPersonEntity;
+        eBlendStart.NodeName = "ReloadStart";
+        eBlendStart.Restart = true;
+        eBlendStart.Start = true;
+        m_EventBroker->Publish(eBlendStart);
+        Events::AutoAnimationBlend eBlendLoop;
+        eBlendLoop.RootNode = wi.FirstPersonEntity;
+        eBlendLoop.NodeName = "ReloadLoop";
+        eBlendLoop.Restart = true;
+        eBlendLoop.Start = true;
+        eBlendLoop.AnimationEntity = wi.FirstPersonEntity.FirstChildByName("ReloadStart");
+        m_EventBroker->Publish(eBlendLoop);
+    }
 }
 
 void DefenderWeaponBehaviour::OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi)
@@ -114,17 +128,18 @@ void DefenderWeaponBehaviour::OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi
 
 bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInfo& wi, const Events::InputCommand& e)
 {
-    if (e.Command == "SpecialAbility" && IsServer) {
+    if (e.Command == "SpecialAbility") {
         EntityWrapper attachment = wi.Player.FirstChildByName("ShieldAttachment");
         if (attachment.Valid()) {
             if (e.Value > 0) {
-                SpawnerSystem::Spawn(attachment, attachment);
+                if (IsServer) {
+                    SpawnerSystem::Spawn(attachment, attachment);
+                }
 
-                EntityWrapper root = wi.FirstPersonEntity.FirstParentWithComponent("Model");
-                if (root.Valid()) {
-                    EntityWrapper subTree = root.FirstChildByName("FinalBlend");
-                    if (subTree.Valid()) {
-                        EntityWrapper animationNode = subTree.FirstChildByName("Shield");
+                if (IsClient) {
+                    EntityWrapper root = wi.FirstPersonEntity;
+                    if (root.Valid()) {
+                        EntityWrapper animationNode = root.FirstChildByName("Shield");
                         if (animationNode.Valid()) {
                             Events::AutoAnimationBlend eFireBlend;
                             eFireBlend.RootNode = root;
@@ -138,11 +153,10 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
             } else {
                 attachment.DeleteChildren();
 
-                EntityWrapper root = wi.FirstPersonEntity.FirstParentWithComponent("Model");
-                if (root.Valid()) {
-                    EntityWrapper subTree = root.FirstChildByName("FinalBlend");
-                    if (subTree.Valid()) {
-                        EntityWrapper animationNode = subTree.FirstChildByName("ActionBlend");
+                if (IsClient) {
+                    EntityWrapper root = wi.FirstPersonEntity;
+                    if (root.Valid()) {
+                        EntityWrapper animationNode = root.FirstChildByName("ActionBlend");
                         if (animationNode.Valid()) {
                             Events::AutoAnimationBlend eFireBlend;
                             eFireBlend.RootNode = root;
@@ -232,7 +246,7 @@ void DefenderWeaponBehaviour::fireShell(ComponentWrapper cWeapon, WeaponInfo& wi
     }
 
     // Play animation
-    playAnimationAndReturn(wi.FirstPersonEntity, "BlendTreeDefenderWeapon", "Fire");
+    playAnimationAndReturn(wi.FirstPersonEntity, "FinalBlend", "Fire");
 
     // Sound
     Events::PlaySoundOnEntity e;

src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp

@@ -52,7 +52,7 @@ void SidearmWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
     cWeapon["FireCooldown"] = 60.0 / (double)cWeapon["RPM"];
 
     // Get weapon model based on current person
-    EntityWrapper weaponModelEntity = getRelevantWeaponModelEntity(wi);
+    EntityWrapper weaponModelEntity = getRelevantWeaponEntity(wi);
     if (!weaponModelEntity.Valid()) {
         return;
     }