Rebase fixes

include/Engine/Editor/EditorRenderSystem.h

@@ -1,6 +1,3 @@
-#ifndef EditorRenderSystem_h__
-#define EditorRenderSystem_h__
-
 #include "../Core/System.h"
 #include "../Rendering/IRenderer.h"
 #include "../Rendering/ModelJob.h"
@@ -17,11 +14,11 @@ public:
 private:
     IRenderer* m_Renderer;
     RenderFrame* m_RenderFrame;
-    Camera* m_EditorCamera;
+    Camera* m_Camera;
     EntityWrapper m_CurrentCamera = EntityWrapper::Invalid;
 
     EventRelay<EditorRenderSystem, Events::SetCamera> m_ESetCamera;
     bool OnSetCamera(Events::SetCamera& e);
-};
 
-#endif
+    void enqueueModel(RenderScene& scene, EntityWrapper entity, const glm::mat4& modelMatrix, const std::string& modelResource, ComponentWrapper cModel, bool wireframe);
+};

include/Engine/Editor/EditorWidgetRenderSystem.h

@@ -0,0 +1,27 @@
+#ifndef EditorWidgetRenderSystem_h__
+#define EditorWidgetRenderSystem_h__
+
+#include "../Core/System.h"
+#include "../Rendering/IRenderer.h"
+#include "../Rendering/ModelJob.h"
+#include "../Rendering/Camera.h"
+#include "../Rendering/ESetCamera.h"
+
+class EditorWidgetRenderSystem : public ImpureSystem
+{
+public:
+    EditorWidgetRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame);
+
+    virtual void Update(double dt) override;
+
+private:
+    IRenderer* m_Renderer;
+    RenderFrame* m_RenderFrame;
+    Camera* m_EditorCamera;
+    EntityWrapper m_CurrentCamera = EntityWrapper::Invalid;
+
+    EventRelay<EditorWidgetRenderSystem, Events::SetCamera> m_ESetCamera;
+    bool OnSetCamera(Events::SetCamera& e);
+};
+
+#endif

include/Engine/Input/FirstPersonInputController.h

@@ -30,7 +30,6 @@ public:
     void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer, EntityID playerID);
     virtual bool AssaultDashDoubleTapped() const { return m_AssaultDashDoubleTapped; }
     virtual bool PlayerIsDashing() const { return m_PlayerIsDashing; }
-    bool SpecialAbilityKeyDown() const { return m_SpecialAbilityKeyDown; }
 
 protected:
     const int m_PlayerID;
@@ -146,9 +145,9 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
             if (m_NumberOfMovementKeysDown == 0) {
                 m_MovementKeyDown = false;
             }
-            //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
+                //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
-            m_AssaultDashTapDirection = m_CurrentDirectionVector;
+                m_AssaultDashTapDirection = m_CurrentDirectionVector;
-            m_AssaultDashDoubleTapDeltaTime = 0.f;
+                m_AssaultDashDoubleTapDeltaTime = 0.f;
             
         }
     }
@@ -162,10 +161,17 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
     }
 
     if (e.Command == "SpecialAbility") {
-        m_SpecialAbilityKeyDown = e.Value > 0;
+        if (e.Value > 0) {
+            m_SpecialAbilityKeyDown = true;
+        } else {
+            m_SpecialAbilityKeyDown = false;
+        }
+    }
+    if (m_SpecialAbilityKeyDown && m_MovementKeyDown) {
+        m_ShiftDashing = true;
+    } else {
+        m_ShiftDashing = false;
     }
-
-    m_ShiftDashing = m_SpecialAbilityKeyDown && m_MovementKeyDown;
 
     return true;
 }

include/Engine/Network/Packet.h

@@ -24,9 +24,7 @@ public:
     {
         // Check if we are trying to add more than the package can fit.
         if (m_MaxPacketSize < m_Offset + sizeof(T)) {
-            if (m_MaxPacketSize >= 32000) {
+            LOG_WARNING("Packet AddPrimitive(): You are trying to add more than we have allocated for! New size is %i bytes\n", m_MaxPacketSize*2);
-                LOG_WARNING("Package::WritePrimitive(): New size is huge %i bytes\n", m_MaxPacketSize*2);
-            }
             resizeData();
         }
         memcpy(m_Data + m_Offset, &val, sizeof(T));

include/Engine/Rendering/ModelJob.h

@@ -164,7 +164,7 @@ struct ModelJob : RenderJob
 	std::vector<const ::RawModel::TextureProperties*> SpecularTexture;
 	std::vector<const ::RawModel::TextureProperties*> IncandescenceTexture;
     float Shininess = 0.f;
-    glm::vec4 Color;
+    glm::vec4 Color = glm::vec4(1.f, 1.f, 1.f, 1.f);
     const ::Model* Model = nullptr;
     ::Skeleton* Skeleton = nullptr;
     std::vector<::Skeleton::AnimationData> Animations;
@@ -182,6 +182,7 @@ struct ModelJob : RenderJob
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;
 	bool IsShielded;
+    bool Wireframe = false;
     void CalculateHash() override
     {
         Hash = ShaderID << 20 + ModelID << 10 + TextureID;

include/Engine/Rendering/RenderState.h

@@ -25,6 +25,7 @@ public:
     bool StencilMask(GLuint mask);
     bool DepthMask(GLboolean flag);
 	bool DepthFunc(GLenum func);
+    bool PolygonMode(GLenum face, GLenum mode);
 	bool AlphaFunc(GLenum func, GLclampf thresholder);
 
 private:

include/Game/Systems/AbilityCooldownHUDSystem.h

@@ -1,17 +0,0 @@
-#ifndef AbilityCooldownHUDSystem_h__
-#define AbilityCooldownHUDSystem_h__
-
-#include "../../Engine/Core/System.h"
-#include "../../Engine/GLM.h"
-
-class AbilityCooldownHUDSystem : public ImpureSystem
-{
-public:
-    AbilityCooldownHUDSystem(SystemParams params)
-        : System(params)
-    { }
-
-    virtual void Update(double dt) override;
-};
-
-#endif

include/Game/Systems/BoostIconsHUDSystem.h

@@ -1,19 +0,0 @@
-#ifndef BoostIconsHUDSystem_h__
-#define BoostIconsHUDSystem_h__
-
-#include "../../Engine/Core/System.h"
-#include "../../Engine/GLM.h"
-
-class BoostIconsHUDSystem : public PureSystem
-{
-public:
-    BoostIconsHUDSystem(SystemParams params)
-        : System(params)
-        , PureSystem("BoostIconsHUD")
-    { }
-
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt) override;
-
-};
-
-#endif

include/Game/Systems/PlayerMovementSystem.h

@@ -30,8 +30,6 @@ private:
     bool m_LeftFoot = false;
     // To get a difference when calculating the walking state.
     glm::vec3 m_LastPosition = glm::vec3();
-    // Used to track afterimages for sprint effect.
-    float m_SprintEffectTimer;
     // The logic for making the sound play when player is moving
     void playerStep(double dt);
     // Spawn a hexagon at origin of an Entity

resources/DefaultInput.ini

@@ -28,4 +28,3 @@ P=SwitchToPlayer
 K=TakeDamage,1500
 F2=PerformanceTimingResetAllTimers
 F3=PerformanceTimingCreateExcelData
-F4=SwapToClassPick

resources/Schema/Components.xsd

@@ -51,13 +51,10 @@
 	<xs:include schemaLocation="Components/Page.xsd"/>
 	<xs:include schemaLocation="Components/SpriteIndicator.xsd"/>
 	<xs:include schemaLocation="Components/Button.xsd"/>
-	<xs:include schemaLocation="Components/AbilityCooldownHUD.xsd"/>
 	<xs:include schemaLocation="Components/DoubleJump.xsd"/>
 	<xs:include schemaLocation="Components/WeaponAttachment.xsd"/>
 	<xs:include schemaLocation="Components/DefenderWeapon.xsd"/>
 	<xs:include schemaLocation="Components/CapturePointGameMode.xsd"/>
 	<xs:include schemaLocation="Components/CapturePointArrowHUD.xsd"/>
 	<xs:include schemaLocation="Components/FloatingEffect.xsd"/>
-	<xs:include schemaLocation="Components/BoostIconsHUD.xsd"/>
-	<xs:include schemaLocation="Components/InputCmdButton.xsd"/>
 </xs:schema>

resources/Schema/Components/AbilityCooldownHUD.xml

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

resources/Schema/Components/AbilityCooldownHUD.xsd

@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-	<xs:element name="AbilityCooldownHUD">
-		<xs:annotation>
-			<xs:documentation>HUD element for tracking ability cooldown. If it has a sprite and fill component it will fill the sprite with chosen color depending on the cooldown.\n A child with text component named "Cooldown"</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/BoostIconsHUD.xml

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

resources/Schema/Components/BoostIconsHUD.xsd

@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="BoostIconsHUD">
-		<xs:annotation>
-			<xs:documentation>Origin for the 3 boost states. Create 3 children with Sprite and Fill components, name them "Sprint", "Defender", "Assault"</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/InputCmdButton.xml

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

resources/Schema/Components/InputCmdButton.xsd

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="InputCmdButton">
-		<xs:annotation><xs:documentation>Used with a Button component, the button will send an inputCommand event instead of ButtonPressed/Released event.</xs:documentation></xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="Command" type="t:string" minOccurs="0">
-					<xs:annotation><xs:documentation>The command name for the inputCommand.</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="PressValue" type="t:float" minOccurs="0">
-					<xs:annotation><xs:documentation>The value in inputCommand.Value that will be sent on button press.</xs:documentation></xs:annotation>
-				</xs:element>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/SprintAbility.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <SprintAbility xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SprintAbility.xsd">
-	<StrengthOfEffect>1.3</StrengthOfEffect>
+	<CoolDownMaxTimer>2.0</CoolDownMaxTimer>
-	<Active>false</Active>
 </SprintAbility>

resources/Schema/Components/SprintAbility.xsd

@@ -9,11 +9,8 @@
 		</xs:annotation>
 		<xs:complexType>
 			<xs:all>
-				<xs:element name="StrengthOfEffect" type="t:double" minOccurs="0">
+				<xs:element name="CoolDownMaxTimer" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>This is the strength of the sprint effect</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>This is the cooldown on sprint</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="Active" type="t:bool" minOccurs="0">
-					<xs:annotation><xs:documentation>True if currently sprinting.</xs:documentation></xs:annotation>
 				</xs:element>
 			</xs:all>
 		</xs:complexType>

resources/Schema/Components/Text.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Text xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Text.xsd">
 	<Content></Content>
-	<Resource>Fonts/DroidSans.ttf,64</Resource>
+	<Resource></Resource>
 	<Color R="1" G="1" B="1" A="1"/>
 	<Visible>true</Visible>
 	<Alignment><Center/></Alignment>

resources/Schema/Entities/OverwatchCamera.xml

@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="OverwatchCamera" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:RaptorCopter>
-      <Speed>0.049999997019767761</Speed>
-      <Axis X="0" Y="1" Z="0"/>
-    </c:RaptorCopter>
-    <c:Transform>
-      <Position X="0" Y="-4" Z="0"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="CameraAnchor">
-      <Components>
-        <c:Transform>
-          <Position X="66" Y="59.2180023" Z="0"/>
-          <Orientation X="5.89000034" Y="1.57079637" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="SpectatorCamera">
-          <Components>
-            <c:Camera/>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="SpectatorHUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="-0.5"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <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>
-                              <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>
-                              <Percentage>0.10332605343919568</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>
-                    <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>
-                              <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>
-                  </Children>
-                </Entity>
-                <Entity name="RespawnTimer">
-                  <Components>
-                    <c:Text>
-                      <Content>16</Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Color A="1" B="0" G="1" R="0.784313738"/>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="0.178199276" Z="0"/>
-                      <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="PickClassCamera">
-          <Components>
-            <c:Camera/>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="PickClassHUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="-0.5"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="DefenderClassPick">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                    </c:Sprite>
-                    <c:InputCmdButton>
-                      <Command>PickClass</Command>
-                      <PressValue>2</PressValue>
-                    </c:InputCmdButton>
-                    <c:Transform>
-                      <Position X="0.349999994" Y="0.0500000007" Z="0"/>
-                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="AssaultClassPick">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitRaptor.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                    </c:Sprite>
-                    <c:InputCmdButton>
-                      <Command>PickClass</Command>
-                      <PressValue>1</PressValue>
-                    </c:InputCmdButton>
-                    <c:Transform>
-                      <Position X="0.349999994" Y="0.149504215" Z="0"/>
-                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="SniperClassPick">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Test/aM4ME4GR.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                    </c:Sprite>
-                    <c:InputCmdButton>
-                      <Command>PickClass</Command>
-                      <PressValue>3</PressValue>
-                    </c:InputCmdButton>
-                    <c:Transform>
-                      <Position X="0.349999994" Y="-0.0500000007" Z="0"/>
-                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/Player.xml

@@ -100,12 +100,12 @@
                       <Percentage>1</Percentage>
                       <Color A="1" B="1" G="0" R="0"/>
                     </c:Fill>
+                    <c:HealthHUD/>
                     <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"/>
                       <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
@@ -132,70 +132,7 @@
                       <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
                     </c:Transform>
                   </Components>
-                  <Children>
+                  <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>
-                              <DepthSort>false</DepthSort>
-                              <GlowMap></GlowMap>
-                              <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>
-                              <DepthSort>false</DepthSort>
-                              <GlowMap></GlowMap>
-                              <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>
-                              <DepthSort>false</DepthSort>
-                              <GlowMap></GlowMap>
-                              <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>
-                  </Children>
                 </Entity>
               </Children>
             </Entity>
@@ -259,6 +196,7 @@
                           <CapturePointNumber>3</CapturePointNumber>
                         </c:CapturePointHUD>
                         <c:Fill>
+                          <Percentage>0.80222018197612788</Percentage>
                           <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                         </c:Fill>
                         <c:Sprite>
@@ -293,7 +231,6 @@
                           <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>
@@ -349,7 +286,7 @@
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                       <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="0" G="0" R="1"/>
+                      <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
                     </c:Sprite>
                     <c:Transform>
                       <Position X="-1.58304751" Y="0.919596612" Z="0"/>
@@ -360,8 +297,7 @@
                       <Components>
                         <c:CapturePointHUD/>
                         <c:Fill>
-                          <Percentage>1</Percentage>
+                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                          <Color A="0.699999988" B="0" G="0" R="1"/>
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
@@ -370,7 +306,7 @@
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
                           <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                          <Orientation X="0" Y="0" Z="4.71238899"/>
+                          <Orientation X="0" Y="0" Z="1.57079637"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -433,25 +369,6 @@
                 </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"/>
-                  <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-                  <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
           </Children>
         </Entity>
         <Entity name="Hands">

resources/Schema/Entities/SpectatorCamera.xml

@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="SpectatorCamera" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Camera/>
+    <c:Transform>
+      <Position X="0" Y="0" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="SpectatorHUD">
+      <Components>
+        <c:Transform>
+          <Position X="0" Y="0" Z="-0.5"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="RespawnTimer">
+          <Components>
+            <c:Text>
+              <Content>Time to respawn: 0</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="1" R="0.784313738"/>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="-0.115000000" Y="0.15304254" Z="0"/>
+              <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
+            </c:Transform>
+          </Components>
+          <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"/>
+                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                      <Orientation X="0" Y="0" Z="1.57079637"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="BackgroundHexagon">
+              <Components>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                  <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"/>
+                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                      <Orientation X="0" Y="0" Z="1.57079637"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="BackgroundHexagon">
+              <Components>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                  <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>
+                      <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"/>
+                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                      <Orientation X="0" Y="0" Z="1.57079637"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="BackgroundHexagon">
+              <Components>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                  <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>
+                      <Percentage>0.59265931447347009</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"/>
+                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                      <Orientation X="0" Y="0" Z="4.71238899"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <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>
+                      <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"/>
+                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                      <Orientation X="0" Y="0" Z="1.57079637"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/SprintEffect.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="SprintEffect" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Animation>
-      <AnimationName1></AnimationName1>
-      <AnimationName2></AnimationName2>
-      <AnimationName3></AnimationName3>
-    </c:Animation>
-    <c:Lifetime>
-      <Lifetime>0.15</Lifetime>
-    </c:Lifetime>
-    <c:ExplosionEffect>
-      <Velocity X="0" Y="0" Z="0"/>
-      <ExplosionDuration>0.15</ExplosionDuration>
-    </c:ExplosionEffect>
-    <c:Model>
-      <Resource></Resource>
-    </c:Model>
-    <c:Transform/>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Types/Entity.xsd

@@ -51,10 +51,8 @@
 							<xs:element ref="c:Page" minOccurs="0"/>
 							<xs:element ref="c:Button" minOccurs="0"/>
 							<xs:element ref="c:WeaponAttachment" minOccurs="0"/>
-							<xs:element ref="c:AbilityCooldownHUD" minOccurs="0"/>
 							<xs:element ref="c:DefenderWeapon" minOccurs="0"/>
 							<xs:element ref="c:CapturePointArrowHUD" minOccurs="0"/>
-							<xs:element ref="c:BoostIconsHUD" minOccurs="0"/>
 							<xs:element ref="c:FloatingEffect" minOccurs="0"/>
 							<xs:element ref="c:AmmoPickup" minOccurs="0"/>
 							<xs:element ref="c:HealthPickup" minOccurs="0"/>
@@ -62,7 +60,6 @@
 							<xs:element ref="c:DoubleJump" minOccurs="0"/>
 							<xs:element ref="c:HealthHUD" minOccurs="0"/>
 							<xs:element ref="c:SpriteIndicator" minOccurs="0"/>
-							<xs:element ref="c:InputCmdButton" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

src/Engine/Collision/CollisionSystem.cpp

@@ -17,107 +17,105 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
     EntityAABB& boxA = *boundingBox;
     bool everHitTheGround = false;
 
-    if (entity == LocalPlayer) {
+    auto prevPosIt = m_PrevPositions.find(entity);
-        auto prevPosIt = m_PrevPositions.find(entity);
+    if (prevPosIt != m_PrevPositions.end()) {
-        if (prevPosIt != m_PrevPositions.end()) {
+        glm::vec3 size = boxA.Size();
-            glm::vec3 size = boxA.Size();
+        float diameter = std::min(size.x, size.z);
-            float diameter = std::min(size.x, size.z);
+        glm::vec3 prevOrigin = prevPosIt->second;
-            glm::vec3 prevOrigin = prevPosIt->second;
+        glm::vec3 toCurrentPos = boxA.Origin() - prevOrigin;
-            glm::vec3 toCurrentPos = boxA.Origin() - prevOrigin;
+        float rayLength = glm::length(toCurrentPos) + 0.5f*diameter;
-            float rayLength = glm::length(toCurrentPos) + 0.5f*diameter;
+        //If the entity has moved farther than the size of its box, we need to handle it specially.
-            //If the entity has moved farther than the size of its box, we need to handle it specially.
+        if (rayLength > diameter) {
-            if (rayLength > diameter) {
+            Ray ray(prevOrigin, toCurrentPos);
-                Ray ray(prevOrigin, toCurrentPos);
+            m_OctreeResult.clear();
-                m_OctreeResult.clear();
+            m_Octree->ObjectsPossiblyHitByRay(ray, m_OctreeResult);
-                m_Octree->ObjectsPossiblyHitByRay(ray, m_OctreeResult);
+            for (auto& boxB : m_OctreeResult) {
-                for (auto& boxB : m_OctreeResult) {
+                if (boxA.Entity == boxB.Entity) {
-                    if (boxA.Entity == boxB.Entity) {
+                    continue;
+                }
+                bool hit;
+                float dist;
+                if (boxB.Entity.HasComponent("Model")) {
+                    RawModel* model;
+                    std::string res = (std::string)boxB.Entity["Model"]["Resource"];
+                    try {
+                        model = ResourceManager::Load<RawModel, true>(res);
+                    } catch (const std::exception&) {
                         continue;
                     }
-                    bool hit;
+                    float u, v;
-                    float dist;
+                    hit = Collision::RayVsModel(ray, model->Vertices(), model->m_Indices, Transform::ModelMatrix(boxB.Entity), dist, u, v);
-                    if (boxB.Entity.HasComponent("Model")) {
+                } else {
-                        RawModel* model;
+                    hit = Collision::RayVsAABB(ray, boxB, dist);
-                        std::string res = (std::string)boxB.Entity["Model"]["Resource"];
+                }
-                        try {
+                if (hit && dist < rayLength) {
-                            model = ResourceManager::Load<RawModel, true>(res);
+                    //Set the entity to where it was colliding, minus the maximum box size. 
-                        } catch (const std::exception&) {
+                    //TODO: Perhaps this should be done slightly more properly.
-                            continue;
+                    glm::vec3 newOriginPos = ray.Origin() + (dist - 0.707107f*diameter) * ray.Direction();
-                        }
+                    glm::vec3 resolve = newOriginPos - boxA.Origin();
-                        float u, v;
+                    (glm::vec3&)cTransform["Position"] += resolve;
-                        hit = Collision::RayVsModel(ray, model->Vertices(), model->m_Indices, Transform::ModelMatrix(boxB.Entity), dist, u, v);
+                    boxA = *Collision::EntityAbsoluteAABB(entity);
-                    } else {
+                    if (resolve.y > 0) {
-                        hit = Collision::RayVsAABB(ray, boxB, dist);
+                        everHitTheGround = true;
-                    }
+                        (bool)cPhysics["IsOnGround"] = true;
-                    if (hit && dist < rayLength) {
+                        ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
-                        //Set the entity to where it was colliding, minus the maximum box size. 
-                        //TODO: Perhaps this should be done slightly more properly.
-                        glm::vec3 newOriginPos = ray.Origin() + (dist - 0.707107f*diameter) * ray.Direction();
-                        glm::vec3 resolve = newOriginPos - boxA.Origin();
-                        (glm::vec3&)cTransform["Position"] += resolve;
-                        boxA = *Collision::EntityAbsoluteAABB(entity);
-                        if (resolve.y > 0) {
-                            everHitTheGround = true;
-                            (bool)cPhysics["IsOnGround"] = true;
-                            ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
-                        }
-                        break;
                     }
+                    break;
                 }
             }
         }
+    }
 
-        // Collide against octree items
+    // Collide against octree items
-        m_OctreeResult.clear();
+    m_OctreeResult.clear();
-        m_Octree->ObjectsInSameRegion(*boundingBox, m_OctreeResult);
+    m_Octree->ObjectsInSameRegion(*boundingBox, m_OctreeResult);
-        for (auto& boxB : m_OctreeResult) {
+    for (auto& boxB : m_OctreeResult) {
-            glm::vec3 resolutionVector;
+        glm::vec3 resolutionVector;
-            if (boxA.Entity == boxB.Entity) {
+        if (boxA.Entity == boxB.Entity) {
+            continue;
+        }
+
+        if (boxB.Entity.HasComponent("Model") && Collision::AABBVsAABB(boxA, boxB)) {
+            //Here we know boxB is a entity with Collideable, AABB, and Model.
+            RawModel* model;
+            try {
+                model = ResourceManager::Load<RawModel, true>(boxB.Entity["Model"]["Resource"]);
+            } catch (const std::exception&) {
                 continue;
             }
 
-            if (boxB.Entity.HasComponent("Model") && Collision::AABBVsAABB(boxA, boxB)) {
+            glm::mat4 modelMatrix = Transform::ModelMatrix(boxB.Entity);
-                //Here we know boxB is a entity with Collideable, AABB, and Model.
-                RawModel* model;
-                try {
-                    model = ResourceManager::Load<RawModel, true>(boxB.Entity["Model"]["Resource"]);
-                } catch (const std::exception&) {
-                    continue;
-                }
 
-                glm::mat4 modelMatrix = Transform::ModelMatrix(boxB.Entity);
+            glm::vec3 inOutVelocity = (glm::vec3)cPhysics["Velocity"];
-
+            bool notMovingxz = glm::all(glm::lessThan(glm::abs(glm::vec2(inOutVelocity.x, inOutVelocity.z)), glm::vec2(0.01f))) && prevPosIt != m_PrevPositions.end();
-                glm::vec3 inOutVelocity = (glm::vec3)cPhysics["Velocity"];
+            bool isOnGround = (bool)cPhysics["IsOnGround"];
-                bool notMovingxz = glm::all(glm::lessThan(glm::abs(glm::vec2(inOutVelocity.x, inOutVelocity.z)), glm::vec2(0.01f))) && prevPosIt != m_PrevPositions.end();
+            float verticalStepHeight = (float)(double)cPhysics["VerticalStepHeight"];
-                bool isOnGround = (bool)cPhysics["IsOnGround"];
+            if (Collision::AABBvsTriangles(boxA, model->Vertices(), model->m_Indices, modelMatrix, inOutVelocity, verticalStepHeight, isOnGround, resolutionVector)) {
-                float verticalStepHeight = (float)(double)cPhysics["VerticalStepHeight"];
+                //Move the position to previous position if it is not moving in the xz-plane, else resolve with the resolution vector.
-                if (Collision::AABBvsTriangles(boxA, model->Vertices(), model->m_Indices, modelMatrix, inOutVelocity, verticalStepHeight, isOnGround, resolutionVector)) {
+                (glm::vec3&)cTransform["Position"] += notMovingxz ? prevPosIt->second - boxA.Origin() : resolutionVector;
-                    //Move the position to previous position if it is not moving in the xz-plane, else resolve with the resolution vector.
-                    (glm::vec3&)cTransform["Position"] += notMovingxz ? prevPosIt->second - boxA.Origin() : resolutionVector;
-                    boxA = *Collision::EntityAbsoluteAABB(entity);
-                    cPhysics["Velocity"] = inOutVelocity;
-                    if (isOnGround) {
-                        everHitTheGround = true;
-                        (bool)cPhysics["IsOnGround"] = true;
-                    }
-                }
-            } else if (Collision::AABBVsAABB(boxA, boxB, resolutionVector)) {
-                //Enter here if boxB has no Model.
-                (glm::vec3&)cTransform["Position"] += resolutionVector;
                 boxA = *Collision::EntityAbsoluteAABB(entity);
-                if (resolutionVector.y > 0) {
+                cPhysics["Velocity"] = inOutVelocity;
+                if (isOnGround) {
                     everHitTheGround = true;
                     (bool)cPhysics["IsOnGround"] = true;
-                    ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
                 }
             }
+        } else if (Collision::AABBVsAABB(boxA, boxB, resolutionVector)) {
+            //Enter here if boxB has no Model.
+            (glm::vec3&)cTransform["Position"] += resolutionVector;
+            boxA = *Collision::EntityAbsoluteAABB(entity);
+            if (resolutionVector.y > 0) {
+                everHitTheGround = true;
+                (bool)cPhysics["IsOnGround"] = true;
+                ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
+            }
         }
-
-        //This should apply air friction and such, iff zero models were hit.
-        if (!everHitTheGround) {
-            (bool)cPhysics["IsOnGround"] = false;
-        }
-
-        m_PrevPositions[entity] = boxA.Origin();
     }
+
+    //This should apply air friction and such, iff zero models were hit.
+    if (!everHitTheGround) {
+        (bool)cPhysics["IsOnGround"] = false;
+    }
+
+    m_PrevPositions[entity] = boxA.Origin();
 }

src/Engine/Editor/EditorGUI.cpp

@@ -157,7 +157,7 @@ void EditorGUI::drawEntitiesRecursive(World* world, EntityID parent)
     auto entityChildren = world->GetEntityChildren();
     auto range = entityChildren.equal_range(parent);
     for (auto it = range.first; it != range.second; it++) {
-        if (EditorGUI::drawEntityNode(EntityWrapper(world, it->second))) {
+        if (drawEntityNode(EntityWrapper(world, it->second))) {
             drawEntitiesRecursive(world, it->second);
             ImGui::TreePop();
         }
@@ -217,6 +217,7 @@ bool EditorGUI::drawEntityNode(EntityWrapper entity)
         ImGui::EndPopup();
     }
 
+    ImGui::PushID(("EntityNode" + std::to_string(entity.ID)).c_str());
     ImGui::SetNextTreeNodeOpened(true, ImGuiSetCond_Once);
     if (ImGui::TreeNode(formatEntityName(entity).c_str())) {
         // Handle drop events for reparenting
@@ -224,8 +225,10 @@ bool EditorGUI::drawEntityNode(EntityWrapper entity)
             entityChangeParent(m_CurrentlyDragging, entity);
             m_CurrentlyDragging = EntityWrapper::Invalid;
         }
+        ImGui::PopID();
         return true;
     } else {
+        ImGui::PopID();
         return false;
     }
 }

src/Engine/Editor/EditorRenderSystem.cpp

@@ -6,76 +6,39 @@ EditorRenderSystem::EditorRenderSystem(SystemParams params, IRenderer* renderer,
     , m_RenderFrame(renderFrame)
 {
     EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &EditorRenderSystem::OnSetCamera);
-    auto resolution = Rectangle::Rectangle(1280, 720);
+    auto resolution = renderer->Resolution();
-    m_EditorCamera = new Camera((float)resolution.Width / resolution.Height, glm::radians(45.f), 0.01f, 5000.f);
+    m_Camera = new Camera((float)resolution.Width / resolution.Height, glm::radians(45.f), 0.01f, 5000.f);
 }
 
 void EditorRenderSystem::Update(double dt)
 {
     if (m_CurrentCamera.Valid()) {
-        ComponentWrapper cameraTransform = m_CurrentCamera["Transform"];
+        m_Camera->SetPosition(Transform::AbsolutePosition(m_CurrentCamera));
-        m_EditorCamera->SetPosition(cameraTransform["Position"]);
+        m_Camera->SetOrientation(Transform::AbsoluteOrientation(m_CurrentCamera));
-        m_EditorCamera->SetOrientation(glm::quat((const glm::vec3&)cameraTransform["Orientation"]));
     }
 
     RenderScene scene;
-    scene.ClearDepth = true;
+    scene.Camera = m_Camera;
-    scene.Camera = m_EditorCamera;
-    scene.Viewport = Rectangle(1920, 1080);
 
-    auto cSceneLight = m_World->GetComponents("SceneLight");
+    auto cameras = m_World->GetComponents("Camera");
-    if (cSceneLight != nullptr) {
+    if (cameras != nullptr) {
-        //these are hardcoded since they want special light treatment and a component just for widgets is stupid.
+        for (auto& cCamera : *cameras) {
-        scene.AmbientColor = glm::vec4(0.8, 0.8, 0.8, 1.0);
+            EntityWrapper entity(m_World, cCamera.EntityID);
-    }
+            entity["Model"]["Resource"] = "Models/Widgets/Camera.mesh";
-
+            glm::mat4 modelMatrix = Transform::ModelMatrix(entity);
-    auto models = m_World->GetComponents("Model");
+            enqueueModel(scene, entity, modelMatrix, "Models/Widgets/Camera.mesh", entity["Model"], false);
-    if (models != nullptr) {
-        for (auto& cModel : *models) {
-            if (!(bool)cModel["Visible"]) {
-                continue;
-            }
-
-            const std::string& resource = cModel["Resource"];
-
-            Model* model;
-            try {
-                model = ResourceManager::Load<::Model, true>(resource);
-            } catch (const Resource::StillLoadingException&) {
-                continue;
-            } catch (const std::exception&) {
-                try {
-                    model = ResourceManager::Load<::Model>("Models/Core/Error.mesh");
-                } catch (const std::exception&) {
-                    continue;
-                }
-            }
-
-            EntityWrapper entity(m_World, cModel.EntityID);
-            glm::mat4 modelMatrix = Transform::ModelMatrix(entity.ID, entity.World);
-            for (auto matGroup : model->MaterialGroups()) {
-                std::shared_ptr<ModelJob> modelJob = std::make_shared<ModelJob>(model, scene.Camera, modelMatrix, matGroup, cModel, entity.World, glm::vec4(0), 0.f, false);
-                if (cModel["Transparent"]) {
-                    scene.Jobs.TransparentObjects.push_back(modelJob);
-                } else {
-                    scene.Jobs.OpaqueObjects.push_back(modelJob);
-                }
-            }
         }
     }
 
-    auto pointLights = m_World->GetComponents("PointLight");
+    auto aabbs = m_World->GetComponents("AABB");
-    if (pointLights != nullptr) {
+    if (aabbs != nullptr) {
-        for (auto& cPointLight : *pointLights) {
+        for (auto& cAABB : *aabbs) {
-            bool visible = cPointLight["Visible"];
+            EntityWrapper entity(m_World, cAABB.EntityID);
-            if (!visible) {
+            glm::vec3 absPosition = Transform::AbsolutePosition(entity) + (glm::vec3)cAABB["Origin"];
-                continue;
+            glm::vec3 absScale = Transform::AbsoluteScale(entity) * (glm::vec3)cAABB["Size"];
-            }
+            glm::mat4 modelMatrix = glm::translate(absPosition) * glm::scale(absScale);
-
+            entity["Model"]["Resource"] = "Models/Core/UnitCube.mesh";
-            EntityWrapper entity(m_World, cPointLight.EntityID);
+            enqueueModel(scene, entity, modelMatrix, "Models/Core/UnitCube.mesh", entity["Model"], true);
-            ComponentWrapper& cTransform = entity["Transform"];
-            std::shared_ptr<PointLightJob> pointLightJob = std::make_shared<PointLightJob>(cTransform, cPointLight, entity.World);
-            scene.Jobs.PointLight.push_back(pointLightJob);
         }
     }
 
@@ -86,12 +49,44 @@ bool EditorRenderSystem::OnSetCamera(Events::SetCamera& e)
 {
     ComponentWrapper cTransform = e.CameraEntity["Transform"];
     ComponentWrapper cCamera = e.CameraEntity["Camera"];
-    m_EditorCamera->SetFOV(static_cast<float>((double)cCamera["FOV"]));
+    m_Camera->SetFOV(static_cast<float>((double)cCamera["FOV"]));
-    m_EditorCamera->SetNearClip(static_cast<float>((double)cCamera["NearClip"]));
+    m_Camera->SetNearClip(static_cast<float>((double)cCamera["NearClip"]));
-    m_EditorCamera->SetFarClip(static_cast<float>((double)cCamera["FarClip"]));
+    m_Camera->SetFarClip(static_cast<float>((double)cCamera["FarClip"]));
-    m_EditorCamera->SetPosition(cTransform["Position"]);
+    m_Camera->SetPosition(cTransform["Position"]);
-    m_EditorCamera->SetOrientation(glm::quat((const glm::vec3&)cTransform["Orientation"]));
+    m_Camera->SetOrientation(glm::quat((const glm::vec3&)cTransform["Orientation"]));
     m_CurrentCamera = e.CameraEntity;
     return true;
 }
 
+void EditorRenderSystem::enqueueModel(RenderScene& scene, EntityWrapper entity, const glm::mat4& modelMatrix, const std::string& modelResource, ComponentWrapper cModel, bool wireframe)
+{
+    Model* model;
+    try {
+        model = ResourceManager::Load<::Model, true>(modelResource);
+    } catch (const Resource::StillLoadingException&) {
+        return;
+    } catch (const std::exception&) {
+        try {
+            model = ResourceManager::Load<::Model>("Models/Core/Error.mesh");
+        } catch (const std::exception&) {
+            return;
+        }
+    }
+
+    for (auto matGroup : model->MaterialGroups()) {
+        std::shared_ptr<ModelJob> modelJob = std::shared_ptr<ModelJob>(new ModelJob(
+                    model, 
+                    m_Camera, 
+                    modelMatrix, 
+                    matGroup, 
+                    cModel, 
+                    m_World, 
+                    glm::vec4(1.f, 1.f, 1.f, 1.f), 
+                    0.f,
+					false
+                ));
+        modelJob->Wireframe = wireframe;
+        scene.Jobs.OpaqueObjects.push_back(modelJob);
+    }
+}
+

src/Engine/Editor/EditorSystem.cpp

@@ -1,6 +1,6 @@
 #include "Editor/EditorSystem.h"
 #include "Core/UniformScaleSystem.h"
-#include "Editor/EditorRenderSystem.h"
+#include "Editor/EditorWidgetRenderSystem.h"
 #include "Editor/EditorWidgetSystem.h"
 #include "Core/EntityFile.h"
 
@@ -13,7 +13,7 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
     m_EditorWorldSystemPipeline = new SystemPipeline(m_EditorWorld, m_EventBroker, IsClient, IsServer);
     m_EditorWorldSystemPipeline->AddSystem<UniformScaleSystem>(0);
     m_EditorWorldSystemPipeline->AddSystem<EditorWidgetSystem>(0, m_Renderer);
-    m_EditorWorldSystemPipeline->AddSystem<EditorRenderSystem>(1, m_Renderer, m_RenderFrame);
+    m_EditorWorldSystemPipeline->AddSystem<EditorWidgetRenderSystem>(2, m_Renderer, m_RenderFrame);
     
     m_EditorCamera = importEntity(EntityWrapper(m_EditorWorld, EntityID_Invalid), "Schema/Entities/Empty.xml");
     m_ActualCamera = m_EditorCamera;

src/Engine/Editor/EditorWidgetRenderSystem.cpp

@@ -0,0 +1,97 @@
+#include "Editor/EditorWidgetRenderSystem.h"
+
+EditorWidgetRenderSystem::EditorWidgetRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame) 
+    : System(params)
+    , m_Renderer(renderer)
+    , m_RenderFrame(renderFrame)
+{
+    EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &EditorWidgetRenderSystem::OnSetCamera);
+    auto resolution = Rectangle::Rectangle(1280, 720);
+    m_EditorCamera = new Camera((float)resolution.Width / resolution.Height, glm::radians(45.f), 0.01f, 5000.f);
+}
+
+void EditorWidgetRenderSystem::Update(double dt)
+{
+    if (m_CurrentCamera.Valid()) {
+        ComponentWrapper cameraTransform = m_CurrentCamera["Transform"];
+        m_EditorCamera->SetPosition(cameraTransform["Position"]);
+        m_EditorCamera->SetOrientation(glm::quat((const glm::vec3&)cameraTransform["Orientation"]));
+    }
+
+    RenderScene scene;
+    scene.ClearDepth = true;
+    scene.Camera = m_EditorCamera;
+    scene.Viewport = Rectangle(1920, 1080);
+
+    auto cSceneLight = m_World->GetComponents("SceneLight");
+    if (cSceneLight != nullptr) {
+        //these are hardcoded since they want special light treatment and a component just for widgets is stupid.
+        scene.AmbientColor = glm::vec4(0.8, 0.8, 0.8, 1.0);
+    }
+
+    auto models = m_World->GetComponents("Model");
+    if (models != nullptr) {
+        for (auto& cModel : *models) {
+            if (!(bool)cModel["Visible"]) {
+                continue;
+            }
+
+            const std::string& resource = cModel["Resource"];
+
+            Model* model;
+            try {
+                model = ResourceManager::Load<::Model, true>(resource);
+            } catch (const Resource::StillLoadingException&) {
+                continue;
+            } catch (const std::exception&) {
+                try {
+                    model = ResourceManager::Load<::Model>("Models/Core/Error.mesh");
+                } catch (const std::exception&) {
+                    continue;
+                }
+            }
+
+            EntityWrapper entity(m_World, cModel.EntityID);
+            glm::mat4 modelMatrix = Transform::ModelMatrix(entity.ID, entity.World);
+            for (auto matGroup : model->MaterialGroups()) {
+                std::shared_ptr<ModelJob> modelJob = std::make_shared<ModelJob>(model, scene.Camera, modelMatrix, matGroup, cModel, entity.World, glm::vec4(0), 0.f, false);
+                if (cModel["Transparent"]) {
+                    scene.Jobs.TransparentObjects.push_back(modelJob);
+                } else {
+                    scene.Jobs.OpaqueObjects.push_back(modelJob);
+                }
+            }
+        }
+    }
+
+    auto pointLights = m_World->GetComponents("PointLight");
+    if (pointLights != nullptr) {
+        for (auto& cPointLight : *pointLights) {
+            bool visible = cPointLight["Visible"];
+            if (!visible) {
+                continue;
+            }
+
+            EntityWrapper entity(m_World, cPointLight.EntityID);
+            ComponentWrapper& cTransform = entity["Transform"];
+            std::shared_ptr<PointLightJob> pointLightJob = std::make_shared<PointLightJob>(cTransform, cPointLight, entity.World);
+            scene.Jobs.PointLight.push_back(pointLightJob);
+        }
+    }
+
+    m_RenderFrame->Add(scene);
+}
+
+bool EditorWidgetRenderSystem::OnSetCamera(Events::SetCamera& e)
+{
+    ComponentWrapper cTransform = e.CameraEntity["Transform"];
+    ComponentWrapper cCamera = e.CameraEntity["Camera"];
+    m_EditorCamera->SetFOV(static_cast<float>((double)cCamera["FOV"]));
+    m_EditorCamera->SetNearClip(static_cast<float>((double)cCamera["NearClip"]));
+    m_EditorCamera->SetFarClip(static_cast<float>((double)cCamera["FarClip"]));
+    m_EditorCamera->SetPosition(cTransform["Position"]);
+    m_EditorCamera->SetOrientation(glm::quat((const glm::vec3&)cTransform["Orientation"]));
+    m_CurrentCamera = e.CameraEntity;
+    return true;
+}
+

src/Engine/GUI/ButtonSystem.cpp

@@ -1,5 +1,4 @@
 #include "GUI/ButtonSystem.h"
-#include "Input/EInputCommand.h"
 
 ButtonSystem::ButtonSystem(SystemParams params, IRenderer* renderer)
     : System(params)
@@ -38,20 +37,10 @@ bool ButtonSystem::OnMousePress(const Events::MousePress& e)
                 m_PickEntity = EntityWrapper(m_World, m_PickData.Entity);
 
                 //You have clicked on a button entity, send pressed event.
-                if (m_World->HasComponent(m_PickData.Entity, "InputCmdButton")) {
+                Events::ButtonPressed ePressed;
-                    Events::InputCommand eInputCmd;
+                ePressed.Entity = m_PickEntity;
-                    eInputCmd.PlayerID = LocalPlayer.ID;
+                ePressed.EntityName = m_PickEntity.Name();
-                    eInputCmd.Player = LocalPlayer;
+                m_EventBroker->Publish(ePressed);
-                    EntityWrapper button = EntityWrapper(m_World, m_PickData.Entity);
-                    eInputCmd.Command = (std::string)button["InputCmdButton"]["Command"];
-                    eInputCmd.Value = (float)button["InputCmdButton"]["PressValue"];
-                    m_EventBroker->Publish(eInputCmd);
-                } else {
-                    Events::ButtonPressed ePressed;
-                    ePressed.Entity = m_PickEntity;
-                    ePressed.EntityName = m_PickEntity.Name();
-                    m_EventBroker->Publish(ePressed);
-                }
             }
         }
     }
@@ -66,20 +55,10 @@ bool ButtonSystem::OnMouseRelease(const Events::MouseRelease& e)
         if(m_PickData.Entity != EntityID_Invalid && m_PickData.World == m_World) {
             EntityWrapper ent = EntityWrapper(m_World, m_PickData.Entity);
 
-            if (m_World->HasComponent(m_PickData.Entity, "InputCmdButton")) {
+            Events::ButtonReleased eReleased;
-                Events::InputCommand eInputCmd;
+            eReleased.EntityName = m_PickEntity.Name();
-                eInputCmd.PlayerID = LocalPlayer.ID;
+            eReleased.Entity = m_PickEntity;
-                eInputCmd.Player = LocalPlayer;
+            m_EventBroker->Publish(eReleased);
-                EntityWrapper button = EntityWrapper(m_World, m_PickData.Entity);
-                eInputCmd.Command = (std::string)button["InputCmdButton"]["Command"];
-                eInputCmd.Value = 0;
-                m_EventBroker->Publish(eInputCmd);
-            } else {
-                Events::ButtonReleased eReleased;
-                eReleased.EntityName = m_PickEntity.Name();
-                eReleased.Entity = m_PickEntity;
-                m_EventBroker->Publish(eReleased);
-            }
 
             if(m_World->HasComponent(m_PickData.Entity, "Button")) {
                 if (ent == m_PickEntity) {

src/Engine/Network/Packet.cpp

@@ -49,24 +49,18 @@ void Packet::WriteString(const std::string& str)
     // Message, add one extra byte for null terminator
     size_t sizeOfString = str.size() + 1;
     if (m_Offset + sizeOfString > m_MaxPacketSize) {
-        if (m_MaxPacketSize >= 32000) {
+        //LOG_WARNING("Package::WriteString(): Data size in packet exceeded maximum package size. New size is %i bytes\n", m_MaxPacketSize*2);
-            LOG_WARNING("Package::WriteString(): New size is huge %i bytes\n", m_MaxPacketSize*2);
-        }
         resizeData();
     }
-    memcpy(m_Data + m_Offset, str.data(), str.size() * sizeof(char));
+    memcpy(m_Data + m_Offset, str.data(), sizeOfString * sizeof(char));
-    m_Offset += str.size() * sizeof(char);
+    m_Offset += sizeOfString * sizeof(char);
-    m_Data[m_Offset] = '\0';
-    m_Offset += 1;
 }
 
 void Packet::WriteData(char * data, int sizeOfData)
 {
 
     if (m_Offset + sizeOfData > m_MaxPacketSize) {
-        if (m_MaxPacketSize >= 32000) {
+        //LOG_WARNING("Packet::WriteData(): Data size in packet exceeded maximum packet size. New size is %i bytes\n", m_MaxPacketSize*2);
-            LOG_WARNING("Package::WriteData(): New size is huge %i bytes\n", m_MaxPacketSize*2);
-        }
         while (m_Offset + sizeOfData > m_MaxPacketSize) {
             resizeData();
         }

src/Engine/Network/TCPClient.cpp

@@ -74,10 +74,7 @@ size_t TCPClient::readBuffer()
         boost::asio::ip::tcp::socket::message_peek, error);
     unsigned int sizeOfPacket = 0;
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-    if (sizeOfPacket > m_Socket->available()) {
+
-        LOG_WARNING("TCPClient::readBuffer(): We haven't got the whole packet yet.");
-        return 0;
-    }
     // if the buffer is to small increase the size of it
     // TODO if message is huge 1 time the buffer will not decrease.
     if (sizeOfPacket > m_BufferSize) {

src/Engine/Network/TCPServer.cpp

@@ -106,10 +106,7 @@ int TCPServer::readBuffer(PlayerDefinition & playerDefinition)
         boost::asio::ip::tcp::socket::message_peek, error);
     unsigned int sizeOfPacket = 0;
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-    if (sizeOfPacket > playerDefinition.TCPSocket->available()) {
+
-        LOG_WARNING("TCPServer::readBuffer(): We haven't got the whole packet yet.");
-        return 0;
-    }
     // if the buffer is to small increase the size of it
     if (sizeOfPacket > m_BufferSize) {
         delete[] m_ReadBuffer;

src/Engine/Network/UDPClient.cpp

@@ -45,10 +45,7 @@ int UDPClient::readBuffer()
          boost::asio::ip::udp::socket::message_peek, error);
     int sizeOfPacket = 0;
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-    if (sizeOfPacket > m_Socket->available()) {
+
-        LOG_WARNING("UDPClient::readBuffer(): We haven't got the whole packet yet.");
-        //return 0;
-    }
     // if the buffer is to small increase the size of it
     if (sizeOfPacket > m_BufferSize) {
         delete[] m_ReadBuffer;

src/Engine/Network/UDPServer.cpp

@@ -92,11 +92,6 @@ int UDPServer::readBuffer()
     unsigned int sizeOfPacket = 0;
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
 
-    if (sizeOfPacket > m_Socket->available()) {
-        LOG_WARNING("UDPServer::readBuffer(): We haven't got the whole packet yet.");
-        //return 0;
-    }
-
     // if the buffer is to small increase the size of it
     if (sizeOfPacket > m_BufferSize) {
         delete[] m_ReadBuffer;

src/Engine/Rendering/DrawFinalPass.cpp

@@ -429,6 +429,12 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 			if (modelJob) {
 				//bind forward program
 				//TODO: JOHAN/TOBIAS: Bind shader based on ModelJob->ShaderID;
+                RenderState jobState;
+                if (modelJob->Wireframe) {
+                    jobState.Disable(GL_CULL_FACE);
+                    jobState.PolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+                }
+
 				switch (modelJob->Type) {
 				case RawModel::MaterialType::Basic:
 				case RawModel::MaterialType::SingleTextures:

src/Engine/Rendering/RenderState.cpp

@@ -155,6 +155,20 @@ bool RenderState::AlphaFunc(GLenum func, GLclampf thresholder)
 	return !GLERROR("AlphaFunc");
 }
 
+bool RenderState::PolygonMode(GLenum face, GLenum mode)
+{
+    GLint originalMode[2];
+    glGetIntegerv(GL_POLYGON_MODE, &originalMode[0]);
+    if (face == GL_FRONT || face == GL_FRONT_AND_BACK) {
+        m_ResetFunctions.push_back(std::bind(glPolygonMode, GL_FRONT, originalMode[0]));
+    }
+    if (face == GL_BACK || face == GL_FRONT_AND_BACK) {
+        m_ResetFunctions.push_back(std::bind(glPolygonMode, GL_BACK, originalMode[1]));
+    }
+    glPolygonMode(face, mode);
+    return !GLERROR("RenderState::PolygonMode");
+}
+
 RenderState::~RenderState()
 {
     for (auto& f : boost::adaptors::reverse(m_ResetFunctions)) {

src/Game/Game.cpp

@@ -4,6 +4,7 @@
 #include "Collision/EntityAABB.h"
 #include "Collision/TriggerSystem.h"
 #include "Collision/CollisionSystem.h"
+#include "Editor/EditorRenderSystem.h"
 #include "Systems/RaptorCopterSystem.h"
 #include "Systems/HealthSystem.h"
 #include "Systems/PlayerMovementSystem.h"
@@ -27,11 +28,9 @@
 #include "Rendering/AnimationSystem.h"
 #include "Network/MultiplayerSnapshotFilter.h"
 #include "Game/Systems/AmmunitionHUDSystem.h"
-#include "Game/Systems/AbilityCooldownHUDSystem.h"
 #include "Game/Systems/CapturePointArrowHUDSystem.h"
 #include "Game/Systems/KillFeedSystem.h"
 #include "Game/Systems/BoostSystem.h"
-#include "Game/Systems/BoostIconsHUDSystem.h"
 #include "GUI/ButtonSystem.h"
 #include "GUI/MainMenuSystem.h"
 
@@ -136,7 +135,6 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<AmmoPickupSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AmmunitionHUDSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<AbilityCooldownHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointArrowHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
@@ -150,7 +148,6 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<BoostSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<ButtonSystem>(updateOrderLevel, m_Renderer);
     m_SystemPipeline->AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);
-    m_SystemPipeline->AddSystem<BoostIconsHUDSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
@@ -168,6 +165,7 @@ Game::Game(int argc, char* argv[])
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<FillFrustumOctreeSystem>(updateOrderLevel, m_OctreeFrustrumCulling);
     ++updateOrderLevel;
+    m_SystemPipeline->AddSystem<EditorRenderSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);
     m_SystemPipeline->AddSystem<RenderSystem>(updateOrderLevel, m_Renderer, m_RenderFrame, m_OctreeFrustrumCulling);
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<EditorSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);

src/Game/Systems/AbilityCooldownHUDSystem.cpp

@@ -1,30 +0,0 @@
-#include "Game/Systems/AbilityCooldownHUDSystem.h"
-
-void AbilityCooldownHUDSystem::Update(double dt)
-{
-    //HUD element for tracking cooldown on the parent entity with Dashability TODO: Make sure it support other abilities when they are made.
-
-    auto abilityHUDs = m_World->GetComponents("AbilityCooldownHUD");
-    if (abilityHUDs == nullptr)
-        return;
-
-    for (auto& abilityHUDC : *abilityHUDs) {
-        EntityWrapper entity = EntityWrapper(m_World, abilityHUDC.EntityID);
-        EntityWrapper abilityEntity = entity.FirstParentWithComponent("DashAbility");
-        if (!abilityEntity.Valid())
-            return;
-        EntityWrapper cooldownTextEntity = entity.FirstChildByName("Cooldown");
-        if(cooldownTextEntity.Valid()) {
-            if(cooldownTextEntity.HasComponent("Text"))
-            {
-                double maxAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownMaxTimer"];
-                double currentAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownTimer"];
-                currentAbilityCD = currentAbilityCD >= 0.0 ? currentAbilityCD : 0.0;
-                std::string t = (std::string&)cooldownTextEntity["Text"]["Content"] = std::to_string(currentAbilityCD).substr(0, 3);
-                if(entity.HasComponent("Fill")) {
-                    entity["Fill"]["Percentage"] = currentAbilityCD/maxAbilityCD; //TODO: current time needs to be in the component.
-                }
-            }
-        }
-    }
-}

src/Game/Systems/BoostIconsHUDSystem.cpp

@@ -1,42 +0,0 @@
-#include "Game/Systems/BoostIconsHUDSystem.h"
-
-void BoostIconsHUDSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt)
-{
-    EntityWrapper assaultEntity = entity.FirstChildByName("Assault");
-    EntityWrapper defenderEntity = entity.FirstChildByName("Defender");
-    EntityWrapper sniperEntity = entity.FirstChildByName("Sniper");
-
-    if(assaultEntity.Valid()) {
-        if (assaultEntity.HasComponent("Fill")) {
-            EntityWrapper parentWithAssaultBoost = assaultEntity.FirstParentWithComponent("BoostAssault");
-            if (parentWithAssaultBoost.Valid()) {
-                (double&)assaultEntity["Fill"]["Percentage"] = 1.0;
-            } else {
-                (double&)assaultEntity["Fill"]["Percentage"] = 0.0;
-            }
-        }
-    }
-
-    if (defenderEntity.Valid()) {
-        if (defenderEntity.HasComponent("Fill")) {
-            EntityWrapper parentWithAssaultBoost = defenderEntity.FirstParentWithComponent("BoostDefender");
-            if (parentWithAssaultBoost.Valid()) {
-                (double&)defenderEntity["Fill"]["Percentage"] = 1.0;
-            } else {
-                (double&)defenderEntity["Fill"]["Percentage"] = 0.0;
-            }
-        }
-    }
-
-    if (sniperEntity.Valid()) {
-        if (sniperEntity.HasComponent("Fill")) {
-            EntityWrapper parentWithAssaultBoost = sniperEntity.FirstParentWithComponent("BoostSniper");
-            if (parentWithAssaultBoost.Valid()) {
-                (double&)sniperEntity["Fill"]["Percentage"] = 1.0;
-            } else {
-                (double&)sniperEntity["Fill"]["Percentage"] = 0.0;
-            }
-        }
-    }
-}
-

src/Game/Systems/PlayerMovementSystem.cpp

@@ -2,7 +2,6 @@
 
 PlayerMovementSystem::PlayerMovementSystem(SystemParams params)
     : System(params)
-    , m_SprintEffectTimer(0.f)
 {
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &PlayerMovementSystem::OnPlayerSpawned);
     EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &PlayerMovementSystem::OnDoubleJump);
@@ -19,49 +18,14 @@ PlayerMovementSystem::~PlayerMovementSystem()
 void PlayerMovementSystem::Update(double dt)
 {
     updateMovementControllers(dt);
-    // Only do physics calculations on client and only for themselves.
+    if (IsServer) {
-    if (IsClient) {
+        for (auto& kv : m_PlayerInputControllers) {
-        if (LocalPlayer.Valid()){
+            updateVelocity(kv.first, dt);
+        }
+    } else {
+        if (LocalPlayer.Valid()) {
             updateVelocity(LocalPlayer, dt);
         }
-        m_SprintEffectTimer += dt;
-        if (m_SprintEffectTimer < 0.016f) {
-            return;
-        }
-        m_SprintEffectTimer = 0.f;
-        const ComponentPool* pool = m_World->GetComponents("SprintAbility");
-        if (pool == nullptr) {
-            return;
-        }
-        for (auto cSprint : *pool) {
-            if (cSprint.EntityID != LocalPlayer.ID && (bool)cSprint["Active"]) {
-                // Spawn one afterimage for each player that sprints.
-                EntityWrapper player(m_World, cSprint.EntityID);
-                auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/SprintEffect.xml");
-                EntityWrapper sprintEffect = entityFile->MergeInto(m_World);
-                auto playerModel = player.FirstChildByName("PlayerModel");
-                if (!playerModel.Valid()) {
-                    continue;
-                }
-                if (!playerModel.HasComponent("Model")) {
-                    continue;
-                }
-                if (!playerModel.HasComponent("Animation")) {
-                    continue;
-                }
-                auto playerEntityModel = playerModel["Model"];
-                auto playerEntityAnimation = playerModel["Animation"];
-                playerEntityModel.Copy(sprintEffect["Model"]);
-                playerEntityAnimation.Copy(sprintEffect["Animation"]);
-                sprintEffect["ExplosionEffect"]["EndColor"] = (glm::vec4)playerEntityModel["Color"];
-                ((glm::vec4&)sprintEffect["ExplosionEffect"]["EndColor"]).w = 0.f;
-                sprintEffect["Animation"]["Speed1"] = 0.0;
-                sprintEffect["Animation"]["Speed2"] = 0.0;
-                sprintEffect["Animation"]["Speed3"] = 0.0;
-                sprintEffect["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
-                sprintEffect["Transform"]["Orientation"] = (glm::vec3)player["Transform"]["Orientation"];
-            }
-        }
     }
 }
 
@@ -103,15 +67,7 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
             playerMovementSpeed *= (double)playerBoostAssaultEntity["BoostAssault"]["StrengthOfEffect"];
             playerCrouchSpeed *= (double)playerBoostAssaultEntity["BoostAssault"]["StrengthOfEffect"];
         }
-        bool sniperSprinting = false;
+
-        if (player.HasComponent("SprintAbility")) {
-            (bool)player["SprintAbility"]["Active"] = controller->SpecialAbilityKeyDown();
-            if (controller->SpecialAbilityKeyDown()) {
-                playerMovementSpeed *= (double)player["SprintAbility"]["StrengthOfEffect"];
-                playerCrouchSpeed *= (double)player["SprintAbility"]["StrengthOfEffect"];
-                sniperSprinting = true;
-            }
-        }
 
         if (player.HasComponent("Physics")) {
             ComponentWrapper cPhysics = player["Physics"];
@@ -167,9 +123,6 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
                 if (playerBoostAssaultEntity.Valid()) {
                     accelerationSpeed *= (double)playerBoostAssaultEntity["BoostAssault"]["StrengthOfEffect"];
                 }
-                if (sniperSprinting) {
-                    accelerationSpeed *= (double)player["SprintAbility"]["StrengthOfEffect"];
-                }
                 velocity += accelerationSpeed * wishDirection;
                 ImGui::Text("velocity: (%f, %f, %f) |%f|", velocity.x, velocity.y, velocity.z, glm::length(velocity));
             }

src/Game/Systems/PlayerSpawnSystem.cpp

@@ -105,7 +105,7 @@ void PlayerSpawnSystem::Update(double dt)
 
 bool PlayerSpawnSystem::OnInputCommand(Events::InputCommand& e)
 {
-    if (e.Command != "PickTeam" && e.Command != "SwapToClassPick") {
+    if (e.Command != "PickTeam") {
         return false;
     }
 
@@ -113,12 +113,11 @@ bool PlayerSpawnSystem::OnInputCommand(Events::InputCommand& e)
         return false;
     }
 
-    // A dead client should be able to swap to the overwatch camera.
+    // A dead client should be able to swap to the spectator camera.
     if (IsClient && !LocalPlayer.Valid()) {
-        // Set the camera as active, if it exists.
+        // Set the spectator camera as active, if it exists.
-        // Find the respawn camera or class pick camera.
+        // Find the camera.
-        std::string camName = e.Command == "SwapToClassPick" ? "PickClassCamera" : "SpectatorCamera";
+        EntityWrapper spectatorCam = m_World->GetFirstEntityByName("SpectatorCamera");
-        EntityWrapper spectatorCam = m_World->GetFirstEntityByName(camName);
         if (spectatorCam.Valid() && spectatorCam.HasComponent("Camera")) {
             Events::SetCamera eSetCamera;
             eSetCamera.CameraEntity = spectatorCam;
@@ -136,18 +135,10 @@ bool PlayerSpawnSystem::OnInputCommand(Events::InputCommand& e)
     auto iter = m_SpawnRequests.begin();
     for (; iter != m_SpawnRequests.end(); ++iter) {
         if (iter->PlayerID == e.PlayerID) {
-            // If player wants to switch class, remove their spawn request.
-            if (e.Command == "SwapToClassPick") {
-                m_SpawnRequests.erase(iter);
-            }
             break;
         }
     }
 
-    if (e.Command == "SwapToClassPick") {
-        return true;
-    }
-
     if (iter != m_SpawnRequests.end()) {
         // If player is in queue to spawn, then change their team affiliation in the request.
         iter->Team = (ComponentInfo::EnumType)e.Value;