Revert "Merge remote-tracking branch 'origin/master' into SniperSprint"

This reverts commit 62653cf65d, reversing
changes made to b81bb9eeea.

include/Engine/Collision/Collision.h

@@ -78,21 +78,13 @@ bool AABBvsTriangles(const AABB& box,
     bool& isOnGround,
     glm::vec3& outResolutionVector);
 
-//Detects collision, but does not resolve.
-bool AABBvsTriangles(const AABB& box,
-    const RawModel::Vertex* modelVertices,
-    const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix);
-
 //Return true if the boxes are intersecting.
 bool AABBVsAABB(const AABB& a, const AABB& b);
 //Return true if the boxes are intersecting.
 //Also outputs the minimum translation that box [a] would need in order to resolve collision.
 bool AABBVsAABB(const AABB& a, const AABB& b, glm::vec3& minimumTranslation);
 
-// Calculates an absolute AABB from an entity AABB component or Model component.
-// if takeModelBox is true, the AABB component will be ignored and box is calculated from Model.
-// if takeModelBox is false, the AABB component will be prefered, if it exists.
+// Calculates an absolute AABB from an entity AABB component
 boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity, bool takeModelBox = false);
 boost::optional<EntityAABB> AbsoluteAABBExplosionEffect(EntityWrapper& entity);
 //Returns the first entity hit by the input ray. entitiesPotentiallyHitSorted needs to be sorted 

include/Engine/Collision/CollisionSystem.h

@@ -15,11 +15,11 @@ class CollisionSystem : public PureSystem
 public:
     CollisionSystem(SystemParams params, Octree<EntityAABB>* octree)
         : System(params)
-        , PureSystem("Physics")
+        , PureSystem("Collidable")
         , m_Octree(octree)
     { }
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPhysics, double dt) override;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
 
 private:
     Octree<EntityAABB>* m_Octree;

include/Engine/Core/ComponentInfo.h

@@ -2,7 +2,6 @@
 #define ComponentInfo_h__
 
 #include "../Common.h"
-#include <boost/shared_array.hpp>
 
 struct ComponentInfo
 {
@@ -28,9 +27,8 @@ struct ComponentInfo
 	std::string Name;
     std::unordered_map<std::string, Field_t> Fields;
     std::vector<std::string> FieldsInOrder;
-    std::vector<std::string> StringFields;
     unsigned int Stride = 0;
-    boost::shared_array<char> Defaults = nullptr;
+    std::shared_ptr<char> Defaults = nullptr;
 	std::shared_ptr<Meta_t> Meta = nullptr;
 };
 

include/Engine/Core/ComponentPool.h

@@ -1,7 +1,6 @@
 #ifndef ComponentPool_h__
 #define ComponentPool_h__
 
-#include <set>
 #include "MemoryPool.h"
 #include "ComponentInfo.h"
 #include "ComponentWrapper.h"
@@ -46,8 +45,7 @@ public:
         : m_ComponentInfo(ci)
         , m_Pool(ci.Meta->Allocation, sizeof(EntityID) + ci.Stride)
     { }
-    ~ComponentPool();
-	ComponentPool(const ComponentPool& other);
+	ComponentPool(const ComponentPool& other) = delete;
 	ComponentPool(const ComponentPool&& other) = delete;
 
     const ::ComponentInfo& ComponentInfo() const { return m_ComponentInfo; }

include/Engine/Core/ComponentWrapper.h

@@ -2,29 +2,11 @@
 #define ComponentWrapper_h__
 
 #include <boost/shared_array.hpp>
-#include <boost/any.hpp>
 #include "../Common.h"
 #include "Entity.h"
 #include "ComponentInfo.h"
 #include "Util/Any.h"
 
-template <typename T, typename Enable = void>
-struct ComponentField { };
-
-template <typename T>
-struct ComponentField<T, typename std::enable_if<std::is_trivially_copyable<T>::value>::type>
-{
-    static T& Get(const ComponentInfo::Field_t& info, char* data) { return *reinterpret_cast<T*>(data); }
-    static void Set(const ComponentInfo::Field_t& info, char* data, const T& value) { Get(data) = value; }
-};
-
-template <>
-struct ComponentField<std::string, void>
-{
-    static std::string& Get(const ComponentInfo::Field_t& info, char* data) { return **reinterpret_cast<std::string**>(data); }
-    static void Set(const ComponentInfo::Field_t& info, char* data, const std::string& value) { Get(info, data) = value; }
-};
-
 struct ComponentWrapper
 {
     ComponentWrapper(const ComponentInfo& componentInfo, char* data)
@@ -65,31 +47,7 @@ struct ComponentWrapper
 
     void Copy(ComponentWrapper& destination)
     {
-        // Copy trivial data
-        memcpy(destination.Data, Data, Info.Stride);
-        // Duplicate strings
-        SolidifyStrings(destination);
-    }
-
-    // When component data has been copied, strings need to be reconstructed or they'll refer to the same data!
-    static void SolidifyStrings(ComponentWrapper& component)
-    {
-        for (auto& name : component.Info.StringFields) {
-            std::size_t offset = component.Info.Fields.at(name).Offset;
-            std::string value = *reinterpret_cast<const std::string*>(component.Data + offset);
-            new (component.Data + offset) std::string(value);
-        }
-    }
-
-    // This needs to be called to properly free component data, because strings.
-    static void Destroy(ComponentInfo info, char* data)
-    {
-        // Call std::string destructors
-        for (auto& name : info.StringFields) {
-            std::size_t offset = info.Fields.at(name).Offset;
-            auto field = reinterpret_cast<std::string*>(data + offset);
-            field->~basic_string();
-        }
+        memcpy(destination.Data, this->Data, Info.Stride);
     }
     
     struct SubscriptProxy
@@ -144,38 +102,26 @@ public:
     ComponentWrapperFactory(std::string componentTypeName, unsigned int allocation = 0)
     {
         m_ComponentInfo.Name = componentTypeName;
-        m_ComponentInfo.Meta = std::make_shared<ComponentInfo::Meta_t>();
         m_ComponentInfo.Meta->Allocation = allocation;
     }
 
     template <typename T>
     void AddProperty(std::string fieldName, T defaultValue)
     {
-        auto& field = m_ComponentInfo.Fields[fieldName];
-        field.Name = fieldName;
-        field.Type = typeid(T).name();
-        field.Offset = m_ComponentInfo.Stride;
-        field.Stride = sizeof(T);
-        m_ComponentInfo.FieldsInOrder.push_back(field.Name);
-        if (field.Type == typeid(std::string).name()) {
-            field.Type = "string";
-            m_ComponentInfo.StringFields.push_back(field.Name);
-        }
+        m_DefaultValues.push_back(defaultValue);
+        m_ComponentInfo.Fields[fieldName].Type = typeid(T).name();
+        m_ComponentInfo.Fields[fieldName].Offset = m_ComponentInfo.Stride;
+        m_ComponentInfo.Fields[fieldName].Stride = sizeof(T);
         m_ComponentInfo.Stride += sizeof(T);
-        m_DefaultValues.push_back(std::make_pair(field, defaultValue));
     }
-
+    
     ComponentInfo& Finalize()
     {
-        m_ComponentInfo.Defaults = boost::shared_array<char>(new char[m_ComponentInfo.Stride]);
+        m_ComponentInfo.Defaults = std::shared_ptr<char>(new char[m_ComponentInfo.Stride]);
         std::size_t offset = 0;
-        for (auto& pair : m_DefaultValues) {
-            if (pair.first.Type == "string") {
-                new (m_ComponentInfo.Defaults.get() + offset) std::string(*reinterpret_cast<std::string*>(pair.second.Data.get()));
-            } else {
-                memcpy(m_ComponentInfo.Defaults.get() + offset, pair.second.Data.get(), pair.second.Size);
-            }
-            offset += pair.second.Size;
+        for (auto& val : m_DefaultValues) {
+            memcpy(m_ComponentInfo.Defaults.get() + offset, val.Data.get(), val.Size);
+            offset += val.Size;
         }
 
         return m_ComponentInfo;
@@ -185,7 +131,7 @@ public:
 
 private:
     ComponentInfo m_ComponentInfo;
-    std::vector<std::pair<ComponentInfo::Field_t, Any>> m_DefaultValues;
+    std::vector<Any> m_DefaultValues;
 };
 
 #endif

include/Engine/Core/MemoryPool.h

@@ -66,25 +66,9 @@ public:
 		, m_LowestAllocatedSlot(m_NumSlots)
 	{ }
 
-    MemoryPool(const MemoryPool<T>& other)
-		: m_StartAddress(new char[other.m_NumSlots*other.m_Stride])
-		, m_SlotIsAllocated(other.m_SlotIsAllocated)
-        , m_ExtraMemory()
-		, m_NumSlots(other.m_NumSlots)
-		, m_LowestAllocatedSlot(other.m_LowestAllocatedSlot)
-		, m_NumAllocatedSlots(other.m_NumAllocatedSlots)
-		, m_Stride(other.m_Stride)
-		, m_CurrentAllocSlot(other.m_CurrentAllocSlot)
-    {
-        // Copy statically allocated pool
-        memcpy(m_StartAddress, other.m_StartAddress, m_NumSlots*m_Stride);
-        // Copy dynamically allocated memory
-        for (char* otherAddr : other.m_ExtraMemory) {
-            char* addr = (char*)malloc(m_Stride);
-            memcpy(addr, otherAddr, m_Stride);
-            m_ExtraMemory.push_back(addr);
-        }
-    }
+	//We may get problems with memory being released 
+	//prematurely, etc. if we allow copies.
+	MemoryPool(const MemoryPool<T>& other) = delete;
 	MemoryPool(const MemoryPool<T>&& other) = delete;
 
 	//Free all memory that has been allocated.
@@ -94,9 +78,8 @@ public:
 			delete[] m_StartAddress;
 			m_StartAddress = nullptr;
 		}
-        for (char* addr : m_ExtraMemory) {
-            free(addr);
-        }
+		for (char* addr : m_ExtraMemory)
+			free(addr);
 		m_ExtraMemory.clear();
 	}
 

include/Engine/Core/PerformanceTimer.h

@@ -1,25 +0,0 @@
-#ifndef PerformanceTimer_h__
-#define PerformanceTimer_h__
-
-#include "../Common.h"
-#include <boost/timer/timer.hpp>
-using boost::timer::cpu_timer;
-
-class PerformanceTimer
-{
-public:
-    static void StartTimer(std::string nameOfTimer);
-    static void StartTimerAndStopPrevious(std::string nameOfTimer);
-    static void StopTimer(std::string nameOfTimer);
-    static void SetFrameNumber(int frameNumber);
-
-    static void ResetAllTimers();
-    static void CreateExcelData();
-
-private:
-    static std::map<std::string, cpu_timer> timers;
-    static cpu_timer m_Timer;
-    static std::string currentTimerRunning;
-};
-
-#endif

include/Engine/Core/SystemPipeline.h

@@ -6,7 +6,6 @@
 #include "System.h"
 #include "World.h"
 #include "EPause.h"
-#include "PerformanceTimer.h"
 
 class SystemPipeline
 {
@@ -73,10 +72,7 @@ public:
 
             // Update
             for (auto& system : group.ImpureSystems) {
-                auto className = (std::string)typeid(*system).name();
-                PerformanceTimer::StartTimer(className);
                 system->Update(dt);
-                PerformanceTimer::StopTimer(className);
             }
             for (auto& pair : group.PureSystems) {
                 const std::string& componentName = pair.first;
@@ -87,10 +83,7 @@ public:
                 }
                 for (auto& component : *pool) {
                     for (auto& system : systems) {
-                        auto className = (std::string)typeid(*system).name();
-                        PerformanceTimer::StartTimer(className);
                         system->UpdateComponent(EntityWrapper(m_World, component.EntityID), component, dt);
-                        PerformanceTimer::StopTimer(className);
                     }
                 }
             }
@@ -113,9 +106,9 @@ private:
     std::vector<UnorderedSystems> m_OrderedSystemGroups;
 
     EventRelay<SystemPipeline, Events::Pause> m_EPause;
-    bool OnPause(const Events::Pause& e) {
-        if (e.World == m_World) {
-            m_Paused = true;
+    bool OnPause(const Events::Pause& e) { 
+        if (e.World == m_World) { 
+            m_Paused = true; 
         }
         return true;
     }

include/Engine/Core/Util/Any.h

@@ -2,7 +2,6 @@
 #define Util_Any_h__
 
 #include <memory>
-#include <boost/shared_array.hpp>
 
 struct Any
 {
@@ -11,7 +10,7 @@ struct Any
     template <typename T>
     Any(const T& value)
     {
-        Data = boost::shared_array<char>(new char[sizeof(T)]);
+        Data = std::shared_ptr<char>(new char[sizeof(T)]);
         Size = sizeof(T);
         memcpy(Data.get(), &value, Size);
     }
@@ -19,7 +18,7 @@ struct Any
     template <typename T>
     Any(T&& value)
     {
-        Data = boost::shared_array<char>(new char[sizeof(T)]);
+        Data = std::shared_ptr<char>(new char[sizeof(T)]);
         Size = sizeof(T);
         memcpy(Data.get(), &value, Size);
     }
@@ -36,7 +35,7 @@ struct Any
         return Any(value);
     }
 
-    boost::shared_array<char> Data = nullptr;
+    std::shared_ptr<char> Data = nullptr;
     std::size_t Size = 0;
 };
 

include/Engine/Core/World.h

@@ -15,7 +15,6 @@ public:
         : m_EventBroker(eventBroker)
     { }
     ~World();
-    World(const World& other);
 
     // Create empty entity
     EntityID CreateEntity(EntityID parent = 0);

include/Engine/GUI/Button.h

@@ -0,0 +1,165 @@
+#ifndef GUI_BUTTON_H__
+#define GUI_BUTTON_H__
+
+#include "GUI/TextureFrame.h"
+#include "GUI/EButtonEnter.h"
+#include "GUI/EButtonLeave.h"
+#include "GUI/EButtonPress.h"
+#include "GUI/EButtonRelease.h"
+#include "Core/EMouseMove.h"
+#include "Core/EMousePress.h"
+#include "Core/EMouseRelease.h"
+
+namespace dd
+{
+namespace GUI
+{
+
+class Button : public TextureFrame
+{
+public:
+	Button(Frame* parent, std::string name)
+		: TextureFrame(parent, name)
+	{
+		EVENT_SUBSCRIBE_MEMBER(m_EMouseMove, &Button::OnMouseMove);
+		EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &Button::OnMousePress);
+		EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &Button::OnMouseRelease);
+	}
+
+	void SetTextureHover(std::string resourceName)
+	{
+		m_TextureHover = resourceName;
+	}
+	void SetTextureReleased(std::string resourceName)
+	{
+		m_TextureReleased = resourceName;
+		SetTexture(resourceName);
+	}
+	void SetTexturePressed(std::string resourceName)
+	{
+		m_TexturePressed = resourceName;
+	}
+
+	void Draw(RenderScene& rq) override
+	{
+		if (m_Texture == nullptr && !m_TextureReleased.empty()) {
+			SetTexture(m_TextureReleased);
+		}
+
+		TextureFrame::Draw(rq);
+	}
+
+	virtual void OnEnter() { }
+	virtual void OnLeave() { }
+	virtual void OnPress() { }
+	virtual void OnRelease() { }
+
+protected:
+	bool m_MouseIsOver = false;
+	bool m_IsDown = false;
+
+	virtual bool OnMouseMove(const Events::MouseMove& event)
+	{
+		if (Hidden()) {
+			return false;
+		}
+
+		bool isOver = Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1));
+		if (isOver && !m_MouseIsOver) { // Enter
+			if (!m_IsDown) {
+				if (!m_TextureHover.empty()) {
+					SetTexture(m_TextureHover);
+				}
+			}
+			OnEnter();
+			Events::ButtonEnter e;
+			e.FrameName = m_Name;
+			EventBroker->Publish(e);
+			Events::PlaySound soundEvent;
+			soundEvent.FilePath = "Sounds/GUI/hover-n.wav";
+			EventBroker->Publish(soundEvent);
+			
+		} else if (!isOver && m_MouseIsOver) { // Leave
+			if (!m_IsDown) {
+				if (!m_TextureReleased.empty()) {
+					SetTexture(m_TextureReleased);
+				}
+			}
+			OnLeave();
+			Events::ButtonLeave e;
+			e.FrameName = m_Name;
+			EventBroker->Publish(e);
+		}
+		m_MouseIsOver = isOver;
+
+		return true;
+	}
+	virtual bool OnMousePress(const Events::MousePress& event)
+	{
+		if (Hidden()) {
+			//LOG_DEBUG("Pressed hidden button");
+			return false;
+		}
+
+		if (!Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1))) {
+			return false;
+		}
+
+		if (!m_TexturePressed.empty()) {
+			SetTexture(m_TexturePressed);
+		}
+
+		m_IsDown = true;
+		OnPress();
+		Events::ButtonPress e;
+		e.FrameName = m_Name;
+		e.Button = this;
+		EventBroker->Publish(e);
+
+		return true;
+	}
+	virtual bool OnMouseRelease(const Events::MouseRelease& event)
+	{
+		if (Hidden()) {
+			//LOG_DEBUG("Released hidden button");
+			return false;
+		}
+
+		bool isOver = Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1));
+		if (!isOver && !m_IsDown) {
+			return false;
+		}
+
+		if (m_MouseIsOver) {
+			if (!m_TextureHover.empty()) {
+				SetTexture(m_TextureHover);
+			}
+		} else {
+			if (!m_TextureReleased.empty()) {
+				SetTexture(m_TextureReleased);
+			}
+		}
+
+		m_IsDown = false;
+		OnRelease();
+		Events::ButtonRelease e;
+		e.FrameName = m_Name;
+		e.Button = this;
+		EventBroker->Publish(e);
+
+		return true;
+	}
+
+private:
+	EventRelay<Frame, Events::MouseMove> m_EMouseMove;
+	EventRelay<Frame, Events::MousePress> m_EMousePress;
+	EventRelay<Frame, Events::MouseRelease> m_EMouseRelease;
+
+	std::string m_TextureHover;
+	std::string m_TexturePressed;
+	std::string m_TextureReleased;
+};
+
+}
+}
+#endif

include/Engine/GUI/ButtonSystem.h

@@ -1,44 +0,0 @@
-#ifndef ButtonSystem_h__
-#define ButtonSystem_h__
-
-#include "../Rendering/IRenderer.h"
-#include "../Core/ConfigFile.h"
-#include "../Rendering/PickingPass.h"
-#include "../Core/ResourceManager.h"
-#include "../Core/System.h"
-#include "../Core/Event.h"
-#include "../Core/EMousePress.h"
-#include "../Core/EMouseRelease.h"
-#include "../Core/ELockMouse.h"
-
-#include "EButtonPressed.h"
-#include "EButtonReleased.h"
-#include "EButtonClicked.h"
-
-
-class ButtonSystem : public PureSystem
-{
-public:
-    ButtonSystem(SystemParams params, IRenderer* renderer);
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
-private:
-    IRenderer* m_Renderer;
-    bool m_MouseIsLocked = false;
-
-    EntityWrapper m_PickEntity = EntityWrapper::Invalid;
-    PickData m_PickData;
-
-    EventRelay<ButtonSystem, Events::LockMouse> m_EMouseLock;
-    bool OnMouseLock(const Events::LockMouse& e);
-    EventRelay<ButtonSystem, Events::UnlockMouse> m_EMouseUnlock;
-    bool OnMouseUnlock(const Events::UnlockMouse& e);
-
-    EventRelay<ButtonSystem, Events::MousePress> m_EMousePress;
-    bool OnMousePress(const Events::MousePress& e);
-    EventRelay<ButtonSystem, Events::MouseRelease> m_EMouseRelease;
-    bool OnMouseRelease(const Events::MouseRelease& e);
-};
-
-
-
-#endif

include/Engine/GUI/EButtonClicked.h

@@ -1,16 +0,0 @@
-#ifndef Events_ButtonClicked_h__
-#define Events_ButtonClicked_h__
-
-#include "Core/Event.h"
-
-namespace Events
-{
-
-struct ButtonClicked : public Event {
-    std::string EntityName;
-    EntityWrapper Entity;
-};
-
-}
-
-#endif

include/Engine/GUI/EButtonEnter.h

@@ -0,0 +1,17 @@
+#ifndef Events_ButtonEnter_h__
+#define Events_ButtonEnter_h__
+
+#include "../Core/EventBroker.h"
+
+namespace Events
+{
+
+/** Thrown on GUI button hover. */
+struct ButtonEnter : Event
+{
+	std::string FrameName;
+};
+
+}
+
+#endif

include/Engine/GUI/EButtonLeave.h

@@ -0,0 +1,17 @@
+#ifndef Events_ButtonLeave_h__
+#define Events_ButtonLeave_h__
+
+#include "../Core/EventBroker.h"
+
+namespace Events
+{
+
+/** Thrown on GUI button hover. */
+struct ButtonLeave : Event
+{
+	std::string FrameName;
+};
+
+}
+
+#endif

include/Engine/GUI/EButtonPress.h

@@ -0,0 +1,20 @@
+#ifndef Events_ButtonPress_h__
+#define Events_ButtonPress_h__
+
+#include "../Core/EventBroker.h"
+
+namespace GUI { class Button; }
+
+namespace Events
+{
+
+/** Thrown on GUI button press. */
+struct ButtonPress : Event
+{
+	std::string FrameName;
+	GUI::Button* Button;
+};
+
+}
+
+#endif

include/Engine/GUI/EButtonPressed.h

@@ -1,16 +0,0 @@
-#ifndef Events_ButtonPressed_h__
-#define Events_ButtonPressed_h__
-
-#include "Core/Event.h"
-
-namespace Events
-{
-
-struct ButtonPressed : public Event {
-    std::string EntityName;
-    EntityWrapper Entity;
-};
-
-}
-
-#endif

include/Engine/GUI/EButtonRelease.h

@@ -0,0 +1,20 @@
+#ifndef Events_ButtonRelease_h__
+#define Events_ButtonRelease_h__
+
+#include "../Core/EventBroker.h"
+
+namespace GUI { class Button; }
+
+namespace Events
+{
+
+/** Thrown on GUI button release. */
+struct ButtonRelease : Event
+{
+	std::string FrameName;
+	GUI::Button* Button;
+};
+
+}
+
+#endif

include/Engine/GUI/EButtonReleased.h

@@ -1,16 +0,0 @@
-#ifndef Events_ButtonReleased_h__
-#define Events_ButtonReleased_h__
-
-#include "Core/Event.h"
-
-namespace Events
-{
-
-struct ButtonReleased : public Event {
-    std::string EntityName;
-    EntityWrapper Entity;
-};
-
-}
-
-#endif

include/Engine/GUI/Frame.h

@@ -0,0 +1,261 @@
+#ifndef GUI_Frame_h__
+#define GUI_Frame_h__
+
+#include "../Common.h"
+#include "../Core/Util/Rectangle.h"
+#include "../Core/EventBroker.h"
+#include "../Core/EKeyDown.h"
+#include "../Core/EKeyUp.h"
+#include "../Core/ResourceManager.h"
+#include "../Rendering/RenderQueue.h"
+#include "../Rendering/Texture.h"
+#include "../Input/EInputCommand.h"
+
+namespace GUI
+{
+
+class Frame : public Rectangle
+{
+public:
+	enum class Anchor
+	{
+		Left,
+		Right,
+		Top,
+		Bottom
+	};
+
+	static const int BaseWidth = 1280;
+	static const int BaseHeight = 720;
+
+	// Set up a base frame with an event broker
+	Frame(EventBroker* eventBroker)
+		: m_EventBroker(eventBroker)
+		, BaseFrame(this)
+		, m_Name("UIParent")
+		, Rectangle() { }
+
+	// Create a frame as a child
+	Frame(Frame* parent, std::string name)
+		: m_Name(name)
+	{
+		SetParent(parent);
+		Width = parent->Width;
+		Height = parent->Height;
+		EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &Frame::OnKeyDown);
+		EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &Frame::OnKeyUp);
+		EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Frame::OnCommand);
+	}
+
+	~Frame()
+	{
+		/*for (auto layer : m_Children)
+		{
+			for (auto child : layer.second)
+			{
+				delete child.second;
+			}
+		}
+
+		if (m_Parent)
+		{
+			m_Parent->RemoveChild(this);
+		}*/
+	}
+
+	Frame* Parent() const { return m_Parent; }
+
+	void SetParent(Frame* parent)
+	{
+		if (parent == nullptr) {
+			LOG_ERROR("Failed to parent frame \"%s\": Invalid parent", m_Name.c_str());
+			return;
+		}
+
+		m_Layer = parent->Layer() + 1;
+		parent->AddChild(this);
+		m_Parent = parent;
+		m_EventBroker = parent->m_EventBroker;
+		BaseFrame = parent->BaseFrame;
+	}
+
+	void AddChild(Frame* child)
+	{
+		m_Children[child->m_Layer].insert(std::make_pair(child->Name(), child));
+		if (m_Parent) {
+			m_Parent->AddChild(child);
+		}
+	}
+
+	void RemoveChild(Frame* child)
+	{
+		auto it = m_Children.find(child->m_Layer);
+		if (it != m_Children.end()) {
+			m_Children.erase(it);
+		}
+
+		if (m_Parent) {
+			m_Parent->RemoveChild(child);
+		}
+	}
+
+	std::string Name() const { return m_Name; }
+	void SetName(std::string val) { m_Name = val; }
+
+	int Layer() const { return m_Layer; }
+
+	bool Hidden() const
+	{
+		if (m_Parent)
+			return m_Parent->Hidden() || m_Hidden;
+		else
+			return m_Hidden;
+	}
+	bool Visible() const
+	{
+		return !Hidden();
+	}
+
+	virtual void Hide() { m_Hidden = true; }
+	virtual void Show() { m_Hidden = false; }
+
+	int Left() const override
+	{
+		if (m_Parent)
+			return m_Parent->Left() + X;
+		else
+			return X;
+	}
+	void SetLeft(int absLeft) override
+	{
+		if (m_Parent) {
+			X = absLeft - m_Parent->Left();
+		} else {
+			X = absLeft;
+		}
+	}
+	int Right() const override
+	{
+		return Left() + Width;
+	}
+	void SetRight(int absRight) override
+	{
+		if (m_Parent) {
+			X = absRight - Width - m_Parent->Left();
+		} else {
+			X = absRight - Width;
+		}
+	}
+	int Top() const override
+	{
+		if (m_Parent)
+			return m_Parent->Top() + Y;
+		else
+			return Y;
+	}
+	void SetTop(int absTop) override
+	{
+		if (m_Parent) {
+			Y = absTop - m_Parent->Top();
+		} else {
+			Y = absTop;
+		}
+	}
+	int Bottom() const override
+	{
+		return Top() + Height;
+	}
+	void SetBottom(int absBottom) override
+	{
+		if (m_Parent) {
+			Y = absBottom - Height - m_Parent->Top();
+		} else {
+			Y = absBottom - Height;
+		}
+	}
+
+	glm::vec2 Scale()
+	{
+		if (m_Parent)
+			return m_Parent->Scale();
+		else
+			return glm::vec2(Width, Height) / glm::vec2(BaseWidth, BaseHeight);
+	}
+
+	Rectangle AbsoluteRectangle()
+	{
+		int left = Left();
+		if (m_Parent)
+			left = std::max(left, m_Parent->Left());
+		int top = Top();
+		if (m_Parent)
+			top = std::max(top, m_Parent->Top());
+		int width = Right() - left;
+		int height = Bottom() - top;
+		return Rectangle(left, top, width, height);
+	}
+
+	void UpdateLayered(double dt)
+	{
+		// Update ourselves
+		this->Update(dt);
+
+		// Update children
+		for (auto& pairLayer : m_Children) {
+			auto children = pairLayer.second;
+			for (auto& pairChild : children) {
+				auto child = pairChild.second;
+				child->Update(dt);
+			}
+		}
+	}
+
+	virtual void Update(double dt) { }
+
+	void DrawLayered(RenderScene& rq)
+	{
+		if (this->Hidden())
+			return;
+
+		// Draw ourselves
+		this->Draw(rq);
+
+		// Draw children
+		for (auto& pairLayer : m_Children) {
+			auto children = pairLayer.second;
+			for (auto& pairChild : children) {
+				auto child = pairChild.second;
+				if (child->Hidden())
+					continue;
+				child->Draw(rq);
+			}
+		}
+	}
+
+	virtual void Draw(RenderScene& rq) { }
+
+protected:
+	::EventBroker* m_EventBroker;
+	Frame* BaseFrame = nullptr;
+
+	std::string m_Name = "Unnamed";
+	int m_Layer = 0;
+	bool m_Hidden = false;
+
+	Frame* m_Parent = nullptr;
+	typedef std::multimap<std::string, Frame*> Children_t; // name -> frame
+	std::map<int, Children_t> m_Children; // layer -> Children_t
+
+	virtual bool OnKeyDown(const Events::KeyDown& event) { return false; }
+	virtual bool OnKeyUp(const Events::KeyUp& event) { return false; }
+	virtual bool OnCommand(const Events::InputCommand& event) { return false; }
+
+private:
+	EventRelay<Frame, Events::KeyDown> m_EKeyDown;
+	EventRelay<Frame, Events::KeyUp> m_EKeyUp;
+	EventRelay<Frame, Events::InputCommand> m_EInputCommand;
+};
+
+}
+
+#endif

include/Engine/GUI/MainMenuSystem.h

@@ -1,33 +0,0 @@
-#ifndef MainMenuSystem_h__
-#define MainMenuSystem_h__
-
-#include "../Core/System.h"
-#include "../Rendering/IRenderer.h"
-#include "../Core/ResourceManager.h"
-#include "../Core/Event.h"
-
-
-#include "EButtonClicked.h"
-#include "EButtonPressed.h"
-#include "EButtonReleased.h"
-
-
-class MainMenuSystem : public ImpureSystem
-{
-public:
-    MainMenuSystem(SystemParams params, IRenderer* renderer);
-    virtual void Update(double dt) override;
-
-private:
-    IRenderer* m_Renderer;
-
-    EventRelay<MainMenuSystem, Events::ButtonClicked> m_EClicked;
-    bool OnButtonClick(const Events::ButtonClicked& e);
-    EventRelay<MainMenuSystem, Events::ButtonReleased> m_EReleased;
-    bool OnButtonRelease(const Events::ButtonReleased& e);
-    EventRelay<MainMenuSystem, Events::ButtonPressed> m_EPressed;
-    bool OnButtonPress(const Events::ButtonPressed& e);
-
-};
-
-#endif

include/Engine/GUI/TextureFrame.h

@@ -0,0 +1,112 @@
+#ifndef GUI_TextureFrame_h__
+#define GUI_TextureFrame_h__
+
+#include "Frame.h"
+#include "../Rendering/Texture.h"
+#include "../Rendering/Util/CommonFunctions.h"
+
+namespace GUI
+{
+
+class TextureFrame : public Frame
+{
+public:
+	TextureFrame(Frame* parent, std::string name)
+		: Frame(parent, name) { }
+
+	void EnableScissor() { m_ScissorEnabled = true; }
+	void DisableScissor() { m_ScissorEnabled = false; }
+
+	void Draw(RenderScene& rq) override
+	{
+		if (m_Texture == nullptr)
+			return;
+
+		// Texture while fading
+		if (m_FadeTexture && m_CurrentFade < 1) {
+			FrameJob job;
+			job.Scissor = (m_ScissorEnabled) ? m_Parent->AbsoluteRectangle() : Rectangle();
+			job.Viewport = Rectangle(Left(), Top(), Width, Height);
+			job.TextureID = m_FadeTexture->ResourceID;
+			job.DiffuseTexture = m_FadeTexture;
+			job.Color = glm::vec4(m_Color.r, m_Color.g, m_Color.b, m_Color.a);
+			job.Name = Name();
+			rq.GUI.Add(job);
+		}
+
+		// Main texture
+		{
+			FrameJob job;
+			job.Scissor = (m_ScissorEnabled) ? m_Parent->AbsoluteRectangle() : Rectangle();
+			job.Viewport = Rectangle(Left(), Top(), Width, Height);
+			job.TextureID = m_Texture->ResourceID;
+			job.DiffuseTexture = m_Texture;
+			job.Color = glm::vec4(m_Color.r, m_Color.g, m_Color.b, m_Color.a * m_CurrentFade);
+			job.Name = Name();
+			rq.GUI.Add(job);
+		}
+	}
+
+	std::string Texture() const { return m_TextureName; }
+
+	void SetTexture(std::string resourceName)
+	{
+		if (resourceName.empty()) {
+			m_Texture = nullptr;
+			return;
+		}
+
+		m_Texture = CommonFunctions::LoadTexture(resourceName, false);
+		m_TextureName = resourceName;
+		if (m_Texture == nullptr) {
+			m_Texture = CommonFunctions::LoadTexture("Textures/Core/ErrorTexture.png", false);
+		}
+
+		SizeToTexture();
+	}
+
+	void SizeToTexture()
+	{
+		if (m_Texture != nullptr) {
+			this->Width = m_Texture->Width;
+			this->Height = m_Texture->Height;
+		}
+	}
+
+	void FadeToTexture(std::string resourceName, double duration)
+	{
+		m_FadeTexture = m_Texture;
+		SetTexture(resourceName);
+		m_FadeDuration = duration;
+		m_CurrentFade = 0.f;
+	}
+
+	void Update(double dt) override
+	{
+		if (m_CurrentFade < 1) {
+			m_CurrentFade += dt / m_FadeDuration;
+			if (m_CurrentFade > 1) {
+				m_FadeTexture = nullptr;
+				m_CurrentFade = 1;
+				m_FadeDuration = 0;
+			}
+		}
+	}
+
+	glm::vec4 Color() const { return m_Color; }
+	void SetColor(glm::vec4 val) { m_Color = val; }
+
+protected:
+	bool m_ScissorEnabled = true;
+	Texture* m_Texture = nullptr;
+	std::string m_TextureName;
+	Texture* m_FadeTexture = nullptr;
+	glm::vec4 m_Color = glm::vec4(1.f, 1.f, 1.f, 1.f);
+	float m_FadeDuration = 0.f;
+	float m_CurrentFade = 1.f;
+
+};
+
+}
+
+#endif

include/Engine/Input/FirstPersonInputController.h

@@ -28,6 +28,7 @@ public:
     virtual void Reset();
 
     void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer);
+    bool SniperSprintingCheck();
     virtual bool AssaultDashDoubleTapped() const { return m_AssaultDashDoubleTapped; }
     virtual bool PlayerIsDashing() const { return m_PlayerIsDashing; }
 
@@ -241,4 +242,12 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     m_EventBroker->Publish(e);
 }
 
+template <typename EventContext>
+bool FirstPersonInputController<EventContext>::SniperSprintingCheck() {
+    if (m_SpecialAbilityKeyDown) {
+        return true;
+    } else {
+        return false;
+    }
+}
 #endif

include/Engine/Network/NetworkClient.h

@@ -9,16 +9,13 @@ typedef unsigned int PacketID;
 class NetworkClient
 {
 public:
-    NetworkClient();
-    virtual ~NetworkClient();
     virtual void 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;
     virtual bool IsSocketAvailable() = 0;
 protected:
-    char* m_ReadBuffer;
-    unsigned int m_BufferSize = BUFFERSIZE;
+    char m_ReadBuffer[BUFFERSIZE] = { 0 };
 };
 
 #endif

include/Engine/Network/NetworkServer.h

@@ -10,15 +10,12 @@ typedef unsigned int PacketID;
 class NetworkServer
 {
 public:
-    NetworkServer();
-    virtual ~NetworkServer();
     virtual void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers) = 0;
     virtual void Receive(Packet & packet, PlayerDefinition & playerDefinition) = 0;
     virtual void Send(Packet & packet, PlayerDefinition & playerDefinition) = 0;
     virtual void Send(Packet & packet) = 0;
 protected:
-    char* m_ReadBuffer;
-    unsigned int m_BufferSize = BUFFERSIZE;
+    char m_ReadBuffer[BUFFERSIZE] = { 0 };
 };
 
 #endif

include/Engine/Network/Server.h

@@ -54,7 +54,7 @@ private:
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
     std::clock_t m_StartPingTime;
-
+    
     // Packet loss logic
     PacketID m_PacketID = 0;
     PacketID m_PreviousPacketID = 0;
@@ -64,7 +64,6 @@ private:
     void reliableBroadcast(Packet& packet);
     void unreliableBroadcast(Packet& packet);
     void sendSnapshot();
-    void addPlayersToPacket(Packet& packet, EntityID entityID);
     void addChildrenToPacket(Packet& packet, EntityID entityID);
     void addInputCommandsToPacket(Packet& packet);
     void sendPing();
@@ -78,7 +77,7 @@ private:
     void parsePlayerTransform(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
-    void parsePing();
+    void parsePing();    
     void parseUDPConnect(Packet & packet);
     void parseTCPConnect(Packet & packet);
     void parseDisconnect();

include/Engine/Network/TCPClient.h

@@ -20,7 +20,7 @@ private:
     boost::asio::ip::tcp::endpoint m_Endpoint;
     boost::asio::io_service m_IOService;
     std::unique_ptr<boost::asio::ip::tcp::socket> m_Socket;
-    size_t readBuffer();
+    size_t readBuffer(char* data);
     PacketID m_SendPacketID = 0;
     bool m_IsConnected = false;
 };

include/Engine/Network/TCPServer.h

@@ -25,7 +25,7 @@ private:
     void handle_accept(boost::shared_ptr<boost::asio::ip::tcp::socket> socket,
         int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
         const boost::system::error_code& error);
-    int readBuffer(PlayerDefinition& playerDefinition);
+    int readBuffer(char* data, PlayerDefinition& playerDefinition);
 };
 
 #endif

include/Engine/Network/UDPClient.h

@@ -20,7 +20,7 @@ private:
     boost::asio::io_service m_IOService;
     boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
     boost::shared_ptr<boost::asio::ip::udp::socket> m_Socket;
-    int readBuffer();
+    int readBuffer(char* data);
     PacketID m_SendPacketID = 0;
 };
 

include/Engine/Network/UDPServer.h

@@ -19,7 +19,7 @@ private:
     boost::asio::io_service m_IOService;
     boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
     std::unique_ptr<boost::asio::ip::udp::socket> m_Socket;
-    int readBuffer();
+    int readBuffer(char* data);
 };
 
 #endif

include/Engine/Rendering/DrawBloomPass.h

@@ -24,8 +24,6 @@ public:
 
     void Draw(GLuint texture);
 
-    void OnWindowResize();
-
     //Getters
     //Return the blurred result of the texture that was sent into draw
     GLuint GaussianTexture() const { return m_GaussianTexture_vert; }

include/Engine/Rendering/DrawFinalPass.h

@@ -20,7 +20,6 @@ public:
     void InitializeShaderPrograms();
     void Draw(RenderScene& scene);
     void ClearBuffer();
-    void OnWindowResize();
 
     //Return the texture that is used in later stages to apply the bloom effect
     GLuint BloomTexture() const { return m_BloomTexture; }
@@ -32,6 +31,7 @@ public:
     FrameBuffer* FinalPassFrameBuffer() { return &m_FinalPassFrameBuffer; }
     FrameBuffer* FinalPassFrameBufferLowRes() { return &m_FinalPassFrameBufferLowRes; }
 
+
 private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
     void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps) const;

include/Engine/Rendering/LightCullingPass.h

@@ -21,7 +21,6 @@ public:
     void SetSSBOSizes();
     void CullLights(RenderScene& scene);
     void FillLightList(RenderScene& scene);
-    void OnWindowResize();
 
     GLuint FrustumSSBO() const { return m_FrustumSSBO; }
     GLuint LightSSBO() const { return m_LightSSBO; }

include/Engine/Rendering/ModelJob.h

@@ -108,7 +108,6 @@ struct ModelJob : RenderJob
         EndIndex = matGroup->EndIndex;
         Matrix = matrix;
         Color = modelComponent["Color"];
-        GlowIntensity = ((double)modelComponent["GlowIntensity"]);
         Entity = modelComponent.EntityID;
         glm::vec3 abspos = Transform::AbsolutePosition(world, modelComponent.EntityID);
         glm::vec3 worldpos = glm::vec3(camera->ViewMatrix() * glm::vec4(abspos, 1));
@@ -171,7 +170,7 @@ struct ModelJob : RenderJob
     ::Skeleton::AnimationOffset AnimationOffset;
     
 
-    float GlowIntensity = 8.0;
+
     glm::vec4 DiffuseColor;
     glm::vec4 SpecularColor;
     glm::vec4 IncandescenceColor;

include/Engine/Rendering/PickingPass.h

@@ -22,8 +22,6 @@ public:
     void Draw(RenderScene& scene);
     void ClearPicking();
 
-    void OnWindowResize();
-
     //Getters
     const ShaderProgram& PickingProgram() const { return *m_PickingProgram; }
     //const std::unordered_map<glm::ivec2, EntityID>& PickingColorsToEntity() const { return m_PickingColorsToEntity; }
@@ -42,7 +40,7 @@ private:
     const IRenderer* m_Renderer;
 
     ShaderProgram* m_PickingProgram;
-    ShaderProgram* m_PickingSkinnedProgram;
+	ShaderProgram* m_PickingSkinnedProgram;
     Camera* m_Camera;
 
     struct PickingInfo

include/Engine/Rendering/Renderer.h

@@ -23,12 +23,9 @@
 #include "imgui/imgui.h"
 #include "TextPass.h"
 #include "Util/CommonFunctions.h"
-#include "Core/PerformanceTimer.h"
 
 class Renderer : public IRenderer
 {
-    static void glfwFrameBufferCallback(GLFWwindow* window, int width, int height);
-
 public:
     Renderer(EventBroker* eventBroker) 
         : m_EventBroker(eventBroker)
@@ -40,12 +37,8 @@ public:
 
     virtual PickData Pick(glm::vec2 screenCoord) override;
 
-
 private:
     //----------------------Variables----------------------//
-
-    static std::unordered_map <GLFWwindow*, Renderer*> m_WindowToRenderer;
-
     EventBroker* m_EventBroker;
     TextPass* m_TextPass;
 
@@ -57,7 +50,6 @@ private:
     Model* m_UnitSphere;
 
     int m_DebugTextureToDraw = 0;
-    bool m_ResizeWindow = false;
 
     PickingPass* m_PickingPass;
     LightCullingPass* m_LightCullingPass;

include/Engine/Rendering/SpriteJob.h

@@ -40,8 +40,7 @@ struct SpriteJob : RenderJob
             Depth = viewpos.z;
         }
         World = world;
-        Pickable = world->HasComponent(cSprite.EntityID, "Button");
-        
+
         FillColor = fillColor;
         FillPercentage = fillPercentage;
     };
@@ -61,7 +60,6 @@ struct SpriteJob : RenderJob
     unsigned int StartIndex = 0;
     unsigned int EndIndex = 0;
     World* World;
-    bool Pickable;
 
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;

include/Game/Game.h

@@ -8,6 +8,7 @@
 #include "Core/EventBroker.h"
 #include "Rendering/Renderer.h"
 #include "Core/InputManager.h"
+#include "GUI/Frame.h"
 #include "Core/World.h"
 #include "Input/InputProxy.h"
 #include "Input/KeyboardInputHandler.h"
@@ -34,9 +35,6 @@
 #include "Sound/SoundManager.h"
 #include "Systems/SoundSystem.h"
 
-//Performance 
-#include "Core/PerformanceTimer.h"
-
 class Game
 {
 public:
@@ -55,6 +53,7 @@ private:
 	IRenderer* m_Renderer;
 	InputManager* m_InputManager;
     InputProxy* m_InputProxy;
+	GUI::Frame* m_FrameStack;
     World* m_World;
     Octree<EntityAABB>* m_OctreeCollision;
     Octree<EntityAABB>* m_OctreeTrigger;

include/Game/Systems/BoostSystem.h

@@ -0,0 +1,21 @@
+#ifndef BoostSystem_h__
+#define BoostSystem_h__
+
+#include "Core/System.h"
+#include "Core/ResourceManager.h"
+#include "Core/EntityFileParser.h"
+#include "Core/EPlayerDamage.h"
+#include "Common.h"
+
+class BoostSystem : public System
+{
+public:
+    BoostSystem(SystemParams params);
+
+private:
+    EventRelay<BoostSystem, Events::PlayerDamage> m_EPlayerDamage;
+    bool OnPlayerDamage(Events::PlayerDamage& e);
+
+    std::string DetermineClass(EntityWrapper player);
+};
+#endif

include/Game/Systems/HealthSystem.h

@@ -27,16 +27,17 @@ public:
 private:
     bool m_NetworkEnabled;
 
-   // methods which will take care of specific events
+    //methods which will take care of specific events
     EventRelay<HealthSystem, Events::PlayerDamage> m_EPlayerDamage;
     bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e);
     EventRelay<HealthSystem, Events::PlayerHealthPickup> m_EPlayerHealthPickup;
     bool HealthSystem::OnPlayerHealthPickup(Events::PlayerHealthPickup& e);
     EventRelay<HealthSystem, Events::InputCommand> m_InputCommand;
     bool HealthSystem::OnInputCommand(Events::InputCommand& e);
-
+    
     //vector which will keep track of health changes
     std::vector<std::tuple<EntityID, double>> m_DeltaHealthVector;
+
 };
 
 #endif

include/Game/Systems/SpawnerSystem.h

@@ -15,16 +15,11 @@ class SpawnerSystem : public System
 public:
     SpawnerSystem(SystemParams params);
 
-    // If dontCollideComponent is set, to e.g. "Player", then all the spawner 
-    // will try to pick a spawn location so that the spawned entity doesn't 
-    // collide with anything that has that component and is collidable.
-    static EntityWrapper Spawn(EntityWrapper spawner, EntityWrapper parent = EntityWrapper::Invalid, const std::string& dontCollideComponent = "");
+    static EntityWrapper Spawn(EntityWrapper spawner, EntityWrapper parent = EntityWrapper::Invalid);
 
 private:
     EventRelay<SpawnerSystem, Events::SpawnerSpawn> m_OnSpawnerSpawn;
     bool OnSpawnerSpawn(Events::SpawnerSpawn& e);
-    static void transformEntityToSpawnPoint(EntityWrapper spawnedEntity, EntityWrapper spawnPoint);
-    static bool spawnedEntityIsColliding(EntityWrapper spawnedEntity, EntityWrapper spawnPoint, const std::string& dontCollideComponent);
 };
 
 #endif

resources/DefaultInput.ini

@@ -25,6 +25,4 @@ C=ConnectToServer
 N=SwitchToServer
 M=SwitchToClient
 P=SwitchToPlayer
-K=TakeDamage,1500
-F2=PerformanceTimingResetAllTimers
-F3=PerformanceTimingCreateExcelData
+K=TakeDamage,1500

resources/Schema/Components.xsd

@@ -35,14 +35,16 @@
 	<xs:include schemaLocation="Components/AmmoPickup.xsd"/>
 	<xs:include schemaLocation="Components/AnimationOffset.xsd"/>
 	<xs:include schemaLocation="Components/DashAbility.xsd"/>
+	<xs:include schemaLocation="Components/ShieldAbility.xsd"/>
+	<xs:include schemaLocation="Components/SprintAbility.xsd"/>
 	<xs:include schemaLocation="Components/AssaultWeapon.xsd"/>
+	<xs:include schemaLocation="Components/BoostAssault.xsd"/>
+	<xs:include schemaLocation="Components/BoostDefender.xsd"/>
+	<xs:include schemaLocation="Components/BoostSniper.xsd"/>
 	<xs:include schemaLocation="Components/Shield.xsd"/>
 	<xs:include schemaLocation="Components/Sprite.xsd"/>
 	<xs:include schemaLocation="Components/Shielded.xsd"/>
 	<xs:include schemaLocation="Components/CapturePointHUD.xsd"/>
 	<xs:include schemaLocation="Components/AmmunitionHUD.xsd"/>
-	<xs:include schemaLocation="Components/Menu.xsd"/>
 	<xs:include schemaLocation="Components/KillFeed.xsd"/>
-	<xs:include schemaLocation="Components/Page.xsd"/>
-	<xs:include schemaLocation="Components/Button.xsd"/>
 </xs:schema>

resources/Schema/Components/BoostAssault.xml

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

resources/Schema/Components/BoostAssault.xsd

@@ -0,0 +1,18 @@
+<?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="BoostAssault">
+		<xs:annotation>
+			<xs:documentation>This is the assault's class boost component</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="StrengthOfEffect" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>This is the strength of the boost effect</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/BoostDefender.xml

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

resources/Schema/Components/BoostDefender.xsd

@@ -0,0 +1,18 @@
+<?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="BoostDefender">
+		<xs:annotation>
+			<xs:documentation>This is the defender's class boost component</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="StrengthOfEffect" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>This is the strength of the boost effect</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/BoostSniper.xml

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

resources/Schema/Components/BoostSniper.xsd

@@ -0,0 +1,18 @@
+<?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="BoostSniper">
+		<xs:annotation>
+			<xs:documentation>This is the sniper's class boost component</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="StrengthOfEffect" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>This is the strength of the boost effect</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Button.xml

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

resources/Schema/Components/Button.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="Button">
-		<xs:annotation>
-			<xs:documentation>Makes sprites klickable.</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Menu.xml

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

resources/Schema/Components/Menu.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="Menu">
-		<xs:annotation>
-			<xs:documentation>Attach this to the center point of a menu that uses several pages.</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Model.xml

@@ -8,5 +8,4 @@
 	<NormalMap>true</NormalMap>
 	<SpecularMap>true</SpecularMap>
 	<GlowMap>true</GlowMap>
-	<GlowIntensity>3.0</GlowIntensity>
 </Model>

resources/Schema/Components/Model.xsd

@@ -33,9 +33,6 @@
 				<xs:element name="GlowMap" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Whether the model should use the Glowmap or not</xs:documentation></xs:annotation>
 				</xs:element>
-				<xs:element name="GlowIntensity" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>Intensity of the glow map</xs:documentation></xs:annotation>
-				</xs:element>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/Page.xml

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

resources/Schema/Components/Page.xsd

@@ -1,14 +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="Page">
-		<xs:annotation>
-			<xs:documentation>Use this on a child to a Menu entity and make sure that ID is not the same as other pages.</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="ID" type="t:int" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Physics.xml

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

resources/Schema/Components/Physics.xsd

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

resources/Schema/Components/ShieldAbility.xml

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

resources/Schema/Components/ShieldAbility.xsd

@@ -0,0 +1,18 @@
+<?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="ShieldAbility">
+		<xs:annotation>
+			<xs:documentation>A shield component for one of the classes</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="CoolDownMaxTimer" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>This is the cooldown on shield</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/SprintAbility.xml

@@ -0,0 +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>2.0</StrengthOfEffect>
+</SprintAbility>

resources/Schema/Components/SprintAbility.xsd

@@ -0,0 +1,18 @@
+<?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="SprintAbility">
+		<xs:annotation>
+			<xs:documentation>A sprint component for one of the classes</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="StrengthOfEffect" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>This is the strength of the sprint effect</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Entities/BoostAssault.xml

@@ -0,0 +1,14 @@
+<?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:BoostAssault/>
+    <c:Lifetime>
+      <Lifetime>10</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/BoostDefender.xml

@@ -0,0 +1,14 @@
+<?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:BoostDefender/>
+    <c:Lifetime>
+      <Lifetime>10</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/BoostSniper.xml

@@ -0,0 +1,14 @@
+<?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:BoostSniper/>
+    <c:Lifetime>
+      <Lifetime>10</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/Button.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Button" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Button/>
-    <c:Sprite>
-      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-    </c:Sprite>
-    <c:Transform>
-      <Position X="0" Y="0.375197947" Z="0.0627754927"/>
-      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="Text">
-      <Components>
-        <c:Text>
-          <Content>Play</Content>
-          <Resource>Fonts/DroidSans.ttf,64</Resource>
-          <Color A="1" B="1" G="0.847058833" R="0"/>
-        </c:Text>
-        <c:Transform>
-          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/GameMap.xml

@@ -144,7 +144,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="57.7363472" Y="4.98900032" Z="79.5"/>
+          <Position X="57.7363472" Y="2.38900018" Z="79.5"/>
         </c:Transform>
       </Components>
       <Children>
@@ -206,16 +206,14 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="-60.2567062" Y="9.40000057" Z="-78.1000061"/>
+          <Position X="-60.2567062" Y="3.4000001" Z="-78.1000061"/>
         </c:Transform>
       </Components>
       <Children>
         <Entity>
           <Components>
             <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="0" Y="2.10000014" Z="0"/>
-            </c:Transform>
+            <c:Transform/>
           </Components>
           <Children/>
         </Entity>

resources/Schema/Entities/NewMap.xml

@@ -5019,7 +5019,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="-60.3695679" Y="5.64500046" Z="-79.3789597"/>
+          <Position X="-60.3695679" Y="5.14500046" Z="-79.3789597"/>
         </c:Transform>
       </Components>
       <Children>
@@ -5089,7 +5089,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="60.0169258" Y="5.78000021" Z="76.2893906"/>
+          <Position X="60.0169258" Y="6.0800004" Z="76.2893906"/>
         </c:Transform>
       </Components>
       <Children>
@@ -5165,7 +5165,7 @@
             <c:Transform>
               <Position X="48.9189453" Y="7.06223536" Z="-78.9347992"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="75.6124268" Z="0"/>
+              <Orientation X="0" Y="74.6042328" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5184,7 +5184,7 @@
             <c:Transform>
               <Position X="-59.3499641" Y="7.46932745" Z="-20.6276321"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="72.2667694" Z="0"/>
+              <Orientation X="0" Y="71.2585754" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5203,7 +5203,7 @@
             <c:Transform>
               <Position X="-1.13644195" Y="1.38919806" Z="38.9768829"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="69.8748016" Z="0"/>
+              <Orientation X="0" Y="68.8666077" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5222,7 +5222,7 @@
             <c:Transform>
               <Position X="54.7225227" Y="6.51863909" Z="29.0052128"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="70.1887283" Z="0"/>
+              <Orientation X="0" Y="69.180542" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5241,7 +5241,7 @@
             <c:Transform>
               <Position X="-51.6792374" Y="8.44526482" Z="32.5153465"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="69.6374512" Z="0"/>
+              <Orientation X="0" Y="68.6292572" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5260,7 +5260,7 @@
             <c:Transform>
               <Position X="-42.3974304" Y="7.28327894" Z="81.9305344"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="67.7666702" Z="0"/>
+              <Orientation X="0" Y="66.7584839" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5279,7 +5279,7 @@
             <c:Transform>
               <Position X="-9.85184956" Y="8.25567532" Z="39.6119232"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="66.8154602" Z="0"/>
+              <Orientation X="0" Y="65.8073425" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5298,7 +5298,7 @@
             <c:Transform>
               <Position X="49.2257118" Y="7.39368248" Z="-31.1810112"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="64.0265808" Z="0"/>
+              <Orientation X="0" Y="63.0184822" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>

resources/Schema/Entities/QualityAssurance.xml

@@ -40,7 +40,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="8433.37305" Z="0"/>
+              <Orientation X="0" Y="7364.79053" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -77,6 +77,18 @@
             </Entity>
           </Children>
         </Entity>
+        <Entity name="ListenerText">
+          <Components>
+            <c:Text>
+              <Content>Sound Test</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+            </c:Text>
+            <c:Transform>
+              <Orientation X="0" Y="3.31600022" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
       </Children>
     </Entity>
     <Entity name="DirectionalLight">
@@ -93,7 +105,7 @@
         </c:RaptorCopter>
         <c:Transform>
           <Position X="2.1529963" Y="6.59221172" Z="0.169116676"/>
-          <Orientation X="4.16300011" Y="18271.9141" Z="0"/>
+          <Orientation X="4.16300011" Y="17199.7988" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -168,7 +180,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="2553.63574" Z="0"/>
+                  <Orientation X="0" Y="2019.28589" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -213,7 +225,7 @@
               <Axis X="1" Y="1" Z="1"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="16862.3945" Y="16862.3945" Z="16862.3945"/>
+              <Orientation X="15792.2051" Y="15792.2051" Z="15792.2051"/>
             </c:Transform>
           </Components>
           <Children>
@@ -277,7 +289,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="16658.3906" Z="0"/>
+              <Orientation X="0" Y="15589.2383" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -309,7 +321,7 @@
                       <Axis X="0.699999988" Y="1" Z="0.300000012"/>
                     </c:RaptorCopter>
                     <c:Transform>
-                      <Orientation X="12206.665" Y="17385.8008" Z="5202.3335"/>
+                      <Orientation X="11456.2695" Y="16313.6973" Z="4881.66504"/>
                     </c:Transform>
                   </Components>
                   <Children>
@@ -659,7 +671,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -706,7 +718,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -766,7 +778,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -813,7 +825,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -859,7 +871,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -906,7 +918,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -953,7 +965,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1015,7 +1027,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="0.300000012" B="0" G="0" R="1"/>
+                  <Color A="0.300000012" B="0" G="0.200000003" R="1"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team>
@@ -1065,7 +1077,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="0.300000012" B="1" G="1" R="1"/>
+                  <Color A="0.300000012" B="0" G="1" R="1"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team/>
@@ -1155,7 +1167,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="0.300000012" B="1" G="1" R="1"/>
+                  <Color A="0.300000012" B="1" G="1" R="0"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team/>
@@ -1205,7 +1217,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="0.300000012" B="1" G="0" R="0"/>
+                  <Color A="0.300000012" B="1" G="0.200000003" R="0"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team>
@@ -1367,7 +1379,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1385.11243" Z="0"/>
+                  <Orientation X="0" Y="850.207886" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1376,7 +1388,7 @@
                     <c:ExplosionEffect>
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                      <TimeSinceDeath>0.8256214817261025</TimeSinceDeath>
+                      <TimeSinceDeath>0.75205058136495551</TimeSinceDeath>
                       <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                       <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                       <Randomness>true</Randomness>
@@ -1423,7 +1435,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1385.11243" Z="0"/>
+                  <Orientation X="0" Y="850.207886" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1432,7 +1444,7 @@
                     <c:ExplosionEffect>
                       <Velocity X="0.5" Y="1" Z="0"/>
                       <ExplosionOrigin X="0" Y="0.900000036" Z="0"/>
-                      <TimeSinceDeath>1.8641349174045843</TimeSinceDeath>
+                      <TimeSinceDeath>1.2019563319790627</TimeSinceDeath>
                     </c:ExplosionEffect>
                     <c:Model>
                       <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
@@ -1475,7 +1487,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1385.11243" Z="0"/>
+                  <Orientation X="0" Y="850.207886" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1486,7 +1498,7 @@
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.300000012" Y="2" Z="0"/>
                       <ExplosionOrigin X="0" Y="1.30000007" Z="-0.200000003"/>
-                      <TimeSinceDeath>1.8641349174045843</TimeSinceDeath>
+                      <TimeSinceDeath>0.68540211563899389</TimeSinceDeath>
                       <EndColor A="0" B="0.333333343" G="0.933333337" R="3.92156863"/>
                       <Randomness>true</Randomness>
                     </c:ExplosionEffect>
@@ -1531,7 +1543,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1392.89258" Z="0"/>
+                  <Orientation X="0" Y="857.984314" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1541,7 +1553,7 @@
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0" Y="0.699999988" Z="0"/>
                       <ExplosionOrigin X="0" Y="-1.10000002" Z="0"/>
-                      <TimeSinceDeath>1.2301962937648341</TimeSinceDeath>
+                      <TimeSinceDeath>0.95150063648635763</TimeSinceDeath>
                       <ExplosionDuration>10</ExplosionDuration>
                       <EndColor A="1" B="0" G="0" R="1"/>
                       <RandomnessScalar>3</RandomnessScalar>
@@ -1589,7 +1601,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="991.007263" Z="0"/>
+                  <Orientation X="0" Y="456.136078" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1599,7 +1611,7 @@
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="6" Y="0.100000001" Z="0"/>
                       <ExplosionOrigin X="0" Y="-10" Z="0"/>
-                      <TimeSinceDeath>3.4214855659573402</TimeSinceDeath>
+                      <TimeSinceDeath>1.3515288978624223</TimeSinceDeath>
                       <ExponentialAccelaration>true</ExponentialAccelaration>
                       <ExplosionDuration>5</ExplosionDuration>
                       <Randomness>true</Randomness>
@@ -1666,10 +1678,10 @@
         </Entity>
         <Entity name="ShieldedCube">
           <Components>
-            <c:Shielded/>
             <c:Model>
               <Resource>Models/Core/UnitCube.mesh</Resource>
             </c:Model>
+            <c:Shielded/>
             <c:Transform>
               <Position X="-3.34650159" Y="1.19966424" Z="3.09996605"/>
             </c:Transform>
@@ -1780,7 +1792,7 @@
                         <c:ExplosionEffect>
                           <ColorByDistance>true</ColorByDistance>
                           <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                          <TimeSinceDeath>0.8256214817261025</TimeSinceDeath>
+                          <TimeSinceDeath>1.3682019578975679</TimeSinceDeath>
                           <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                           <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                           <Randomness>true</Randomness>
@@ -1824,12 +1836,12 @@
             <Entity name="PlayerModel">
               <Components>
                 <c:Animation/>
-                <c:Shielded/>
                 <c:HiddenForLocalPlayer/>
                 <c:Model>
                   <Resource>Models/AssaultAnimated.mesh</Resource>
                   <Color A="1" B="0" G="0" R="1"/>
                 </c:Model>
+                <c:Shielded/>
                 <c:Transform/>
               </Components>
               <Children/>
@@ -2083,7 +2095,7 @@
           <Components>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <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"/>
@@ -2095,7 +2107,7 @@
                 <c:CapturePointHUD/>
                 <c:Fill>
                   <Percentage>1</Percentage>
-                  <Color A="0.699999988" B="0" G="0" R="1"/>
+                  <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
                 </c:Fill>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
@@ -2133,355 +2145,6 @@
         </Entity>
       </Children>
     </Entity>
-    <Entity name="MenuOirign">
-      <Components>
-        <c:Transform>
-          <Position X="-23.0533829" Y="0.938369572" Z="14.068408"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="Camera">
-          <Components>
-            <c:Camera/>
-            <c:Model>
-              <Resource>Models/Widgets/Camera.mesh</Resource>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="MenuCenterPoint">
-          <Components>
-            <c:Menu/>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="Page0">
-              <Components>
-                <c:Page/>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="MenuBackground">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/ErrorTexture.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0" Z="-1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Play">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.388422519" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>Play</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Host">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.214031488" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>Host</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Connecting">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.0367300175" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>Connect</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Settings">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="-0.148274168" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>Settings</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Quit">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="-0.335298717" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>Quit</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="Page1">
-              <Components>
-                <c:Page>
-                  <ID>1</ID>
-                </c:Page>
-                <c:Transform>
-                  <Orientation X="0" Y="0.989000022" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="MenuBackground">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/ErrorTexture.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0" Z="-1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Res1080">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.375197947" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>1920x1080</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Res720">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.199327558" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>1280x720</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Res480">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.0159880854" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>854x480</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="FullScreen">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="-0.164955258" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>FullScreen</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Text">
-          <Components>
-            <c:Text>
-              <Content>Menu test area</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-            </c:Text>
-            <c:Transform>
-              <Position X="0" Y="4.22317314" Z="0"/>
-              <Orientation X="0" Y="1.68700004" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="ListenerText">
-      <Components>
-        <c:Text>
-          <Content>Sound Test</Content>
-          <Resource>Fonts/DroidSans.ttf,64</Resource>
-        </c:Text>
-        <c:Transform>
-          <Orientation X="0" Y="3.31600022" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/TestMenu.xml

@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="MenuOirign" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform>
-      <Position X="-23.0533829" Y="0.938369572" Z="14.068408"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="Camera">
-      <Components>
-        <c:Camera/>
-        <c:Model>
-          <Resource>Models/Widgets/Camera.mesh</Resource>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="MenuCenterPoint">
-      <Components>
-        <c:Menu/>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="Page0">
-          <Components>
-            <c:Page/>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="MenuBackground">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/ErrorTexture.png</DiffuseTexture>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="-1"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.388422519" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Play</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.214031488" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Host</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.0367300175" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Connect</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="-0.148274168" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Settings</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="-0.335298717" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Quit</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Page1">
-          <Components>
-            <c:Page>
-              <ID>1</ID>
-            </c:Page>
-            <c:Transform>
-              <Orientation X="0" Y="0.989000022" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="MenuBackground">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/ErrorTexture.png</DiffuseTexture>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="-1"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.375197947" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Resolution</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.199327558" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Option2</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.0159880854" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Butts</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Types/Entity.xsd

@@ -47,9 +47,6 @@
 							<xs:element ref="c:KillFeed" minOccurs="0"/>
 							<xs:element ref="c:Sprite" minOccurs="0"/>
 							<xs:element ref="c:AnimationOffset" minOccurs="0"/>
-							<xs:element ref="c:Menu" minOccurs="0"/>
-							<xs:element ref="c:Page" minOccurs="0"/>
-							<xs:element ref="c:Button" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/ForwardPlus.frag.glsl

@@ -9,7 +9,6 @@ uniform vec2 ScreenDimensions;
 uniform vec4 FillColor;
 uniform vec4 AmbientColor;
 uniform float FillPercentage;
-uniform float GlowIntensity = 10;
 
 uniform vec2 DiffuseUVRepeat;
 uniform vec2 NormalUVRepeat;
@@ -167,7 +166,7 @@ void main()
 		color_result += FillColor;
 	}
 	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
-	color_result += glowTexel*GlowIntensity;
+	color_result += glowTexel*3;
 
 	bloomColor = vec4(clamp(color_result.xyz - 1.0, 0, 100), 1.0);
 

src/Engine/CMakeLists.txt

@@ -3,7 +3,7 @@ project(TacticalZ-Engine)
 find_package(OpenGL REQUIRED)
 find_package(GLEW REQUIRED)
 find_package(GLFW REQUIRED)
-find_package(Boost REQUIRED COMPONENTS system filesystem thread chrono timer program_options)
+find_package(Boost REQUIRED COMPONENTS system filesystem thread chrono program_options)
 find_package(assimp REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(PNG REQUIRED)

src/Engine/Collision/Collision.cpp

@@ -207,7 +207,7 @@ bool RayVsModel(const Ray& ray,
         glm::vec3 v0 = Transform::TransformPoint(modelVertices[modelIndices[i++]].Position, modelMatrix);
         glm::vec3 v1 = Transform::TransformPoint(modelVertices[modelIndices[i++]].Position, modelMatrix);
         glm::vec3 v2 = Transform::TransformPoint(modelVertices[modelIndices[i++]].Position, modelMatrix);
-        float dist = outDistance;
+        float dist = INFINITY;
         float u;
         float v;
         if (RayVsTriangle(ray, v0, v1, v2, dist, u, v)) {
@@ -366,8 +366,7 @@ bool AABBvsTriangle(const AABB& box,
     float verticalStepHeight,
     bool& isOnGround,
     glm::vec3& boxVelocity,
-    glm::vec3& outResolution,
-    bool resolveCollision)
+    glm::vec3& outResolution)
 {
     //Check so we don't have a zero area triangle when calculating the normal.
     //Also, don't check a triangle facing away from the player.
@@ -427,7 +426,7 @@ bool AABBvsTriangle(const AABB& box,
         //if projections don't overlap, return false.
         if (!rectangleVsTriangle(boxMin, boxMax, t2D, resolutionVector, resolutionDist, pushedFromTriangleLine)) {
             return false;
-        } else if (resolveCollision) {
+        } else {
             //Overwrite the smallest resolution if this is smaller.
             if (resolutionDist < resolveShortest.DistanceSq) {
                 resolveShortest.Vector = glm::vec3(0.f);
@@ -464,11 +463,6 @@ bool AABBvsTriangle(const AABB& box,
     if (glm::abs(t) > 1) {
         return false;
     }
-
-    if (!resolveCollision) {
-        return true;
-    }
-
     glm::vec3 cornerResolution = (1+t) * diagonal;
     //Overwrite the smallest resolution if cornerResolution is smaller.
     float lenSq = glm::length2(cornerResolution);
@@ -543,8 +537,7 @@ bool AABBvsTriangles(const AABB& box,
     glm::vec3& boxVelocity,
     float verticalStepHeight,
     bool& isOnGround,
-    glm::vec3& outResolutionVector,
-    bool resolveCollision)
+    glm::vec3& outResolutionVector)
 {
     bool hit = false;
 
@@ -560,7 +553,7 @@ bool AABBvsTriangles(const AABB& box,
         };
         glm::vec3 outVec;
         bool collideWithGround = isOnGround;
-        if (AABBvsTriangle(newBox, triVertices, originalBoxVelocity, verticalStepHeight, collideWithGround, boxVelocity, outVec, resolveCollision)) {
+        if (AABBvsTriangle(newBox, triVertices, originalBoxVelocity, verticalStepHeight, collideWithGround, boxVelocity, outVec)) {
             hit = true;
             outResolutionVector += outVec;
             newBox = AABB::FromOriginSize(newBox.Origin() + outVec, newBox.Size());
@@ -576,44 +569,6 @@ bool AABBvsTriangles(const AABB& box,
     return hit;
 }
 
-bool AABBvsTriangles(const AABB& box,
-    const RawModel::Vertex* modelVertices,
-    const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix,
-    glm::vec3& boxVelocity,
-    float verticalStepHeight,
-    bool& isOnGround,
-    glm::vec3& outResolutionVector)
-{
-    return AABBvsTriangles(box,
-        modelVertices,
-        modelIndices,
-        modelMatrix,
-        boxVelocity,
-        verticalStepHeight,
-        isOnGround,
-        outResolutionVector,
-        true);
-}
-
-bool AABBvsTriangles(const AABB& box,
-    const RawModel::Vertex* modelVertices,
-    const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix)
-{
-    glm::vec3 vel, outres;
-    bool g;
-    return AABBvsTriangles(box,
-        modelVertices,
-        modelIndices,
-        modelMatrix,
-        vel,
-        0.f,
-        g,
-        outres,
-        false);
-}
-
 boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity, bool takeModelBox)
 {
     AABB modelSpaceBox;
@@ -693,9 +648,8 @@ boost::optional<EntityAABB> EntityFirstHitByRay(const Ray& ray, std::vector<Enti
         if (!entityBox.Entity.HasComponent("Model")) {
             continue;
         }
-        auto& cModel = entityBox.Entity["Model"];
-        std::string res = cModel["Resource"];
-        if (res.empty() || (bool)cModel["Transparent"] || !((bool)cModel["Visible"])) {
+        std::string res = entityBox.Entity["Model"]["Resource"];
+        if (res.empty()) {
             continue;
         }
         Model* model;

src/Engine/Collision/CollisionSystem.cpp

@@ -3,71 +3,24 @@
 #include "Core/AABB.h"
 #include "Rendering/Model.h"
 
-void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPhysics, double dt)
+void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
 {
-    if (!entity.HasComponent("Collidable")) {
+    if (!entity.HasComponent("Physics")) {
         return;
     }
+    ComponentWrapper& cPhysics = entity["Physics"];
+
     boost::optional<EntityAABB> boundingBox = Collision::EntityAbsoluteAABB(entity);
     if (!boundingBox) {
         return;
     }
     ComponentWrapper& cTransform = entity["Transform"];
     EntityAABB& boxA = *boundingBox;
-    bool everHitTheGround = false;
-
-    glm::vec3 size = boxA.Size();
-    float diameter = std::min(size.x, size.z);
-    glm::vec3 prevOrigin = (glm::vec3)cPhysics["PrevOrigin"];
-    glm::vec3 toCurrentPos = boxA.Origin() - prevOrigin;
-    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.
-    bool traceCollision = rayLength > diameter;
-    //hack solution: If prevOrigin is less than -9000 in all dimensions, 
-    //then it means it is not set, i.e. this is the first collision check for the entity.
-    if (traceCollision && glm::any(glm::greaterThan((glm::vec3)cPhysics["PrevOrigin"], glm::vec3(-9000.f)))) {
-        Ray ray(prevOrigin, toCurrentPos);
-        m_OctreeResult.clear();
-        m_Octree->ObjectsPossiblyHitByRay(ray, m_OctreeResult);
-        for (auto& boxB : m_OctreeResult) {
-            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;
-                }
-                float u, v;
-                hit = Collision::RayVsModel(ray, model->Vertices(), model->m_Indices, Transform::ModelMatrix(boxB.Entity), dist, u, v);
-            } else {
-                hit = Collision::RayVsAABB(ray, boxB, dist);
-            }
-            if (hit && dist < rayLength) {
-                //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;
-            }
-        }
-    }
 
     // Collide against octree items
     m_OctreeResult.clear();
     m_Octree->ObjectsInSameRegion(*boundingBox, m_OctreeResult);
+    bool everHitTheGround = false;
     for (auto& boxB : m_OctreeResult) {
         glm::vec3 resolutionVector;
         if (boxA.Entity == boxB.Entity) {
@@ -111,6 +64,4 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
     if (!everHitTheGround) {
         (bool)cPhysics["IsOnGround"] = false;
     }
-
-    (glm::vec3&)cPhysics["PrevOrigin"] = boxA.Origin();
 }

src/Engine/Core/ComponentPool.cpp

@@ -1,5 +1,7 @@
 #include "Core/ComponentPool.h"
 
+
+
 ComponentWrapper ComponentPoolForwardIterator::operator*() const
 {
     char* data = &(*m_MemoryPoolIterator);
@@ -30,34 +32,6 @@ ComponentPoolForwardIterator& ComponentPoolForwardIterator::operator++()
     return *this;
 }
 
-ComponentPool::ComponentPool(const ComponentPool& other)
-    : m_ComponentInfo(other.m_ComponentInfo)
-    , m_Pool(other.m_Pool)
-    , m_EntityToComponent()
-{
-    // Update EntityToComponent pointers
-    for (char& ptr : m_Pool) {
-        EntityID entity = *reinterpret_cast<EntityID*>(&ptr);
-        m_EntityToComponent[entity] = &ptr;
-    }
-
-    // Duplicate strings
-    for (auto& name : m_ComponentInfo.StringFields) {
-        for (auto& c : *this) {
-            std::string& val = c[name];
-            ComponentWrapper::SolidifyStrings(c);
-        }
-    }
-}
-
-ComponentPool::~ComponentPool()
-{
-    // Destroy component data
-    for (auto& c : *this) {
-        ComponentWrapper::Destroy(c.Info, c.Data);
-    }
-}
-
 //const ::ComponentInfo& ComponentPool::ComponentInfo() const
 //{
 //    return m_ComponentInfo;
@@ -65,19 +39,10 @@ ComponentPool::~ComponentPool()
 
 ComponentWrapper ComponentPool::Allocate(EntityID entity)
 {
-    // Allocate pool data
     char* data = m_Pool.Allocate();
-    // Copy EntityID
     memcpy(data, &entity, sizeof(EntityID));
-
     m_EntityToComponent[entity] = data;
-    ComponentWrapper component(m_ComponentInfo, data);
-
-    // Copy defaults
-    memcpy(component.Data, m_ComponentInfo.Defaults.get(), m_ComponentInfo.Stride);
-    ComponentWrapper::SolidifyStrings(component);
-
-    return component;
+    return ComponentWrapper(m_ComponentInfo, data);
 }
 
 ComponentWrapper ComponentPool::GetByEntity(EntityID ent)
@@ -92,7 +57,6 @@ bool ComponentPool::KnowsEntity(EntityID ent)
 
 void ComponentPool::Delete(ComponentWrapper& wrapper)
 {
-    ComponentWrapper::Destroy(wrapper.Info, wrapper.Data);
     m_EntityToComponent.erase(wrapper.EntityID);
     m_Pool.Free(wrapper.Data - sizeof(EntityID));
 }

src/Engine/Core/EntityFilePreprocessor.cpp

@@ -185,9 +185,6 @@ void EntityFilePreprocessor::parseComponentInfo()
             field.Offset = fieldOffset;
             field.Stride = stride;
             compInfo.FieldsInOrder.push_back(name);
-            if (field.Type == "string") {
-                compInfo.StringFields.push_back(name);
-            }
             fieldOffset += stride;
         }
 
@@ -204,7 +201,7 @@ void EntityFilePreprocessor::parseDefaults()
 
     for (auto& ci : m_ComponentInfo) {
         // Allocate memory for default values
-        ci.second.Defaults = boost::shared_array<char>(new char[ci.second.Stride], std::bind(&ComponentWrapper::Destroy, ci.second, std::placeholders::_1));
+        ci.second.Defaults = std::shared_ptr<char>(new char[ci.second.Stride]);
         memset(ci.second.Defaults.get(), 0, ci.second.Stride);
 
         std::string componentName = ci.first;

src/Engine/Core/PerformanceTimer.cpp

@@ -1,76 +0,0 @@
-#include "Core/PerformanceTimer.h"
-#include <ctime>
-#include <fstream>
-
-cpu_timer PerformanceTimer::m_Timer;
-std::map<std::string, cpu_timer> PerformanceTimer::timers;
-std::string PerformanceTimer::currentTimerRunning = "";
-
-void PerformanceTimer::StartTimer(std::string nameOfTimer)
-{
-    timers[nameOfTimer].stop();
-    timers[nameOfTimer].start();
-    currentTimerRunning = nameOfTimer;
-}
-
-void PerformanceTimer::StartTimerAndStopPrevious(std::string nameOfTimer)
-{
-    //stop the current timer and start some other - useful to not have to stop timers all the time
-    if (currentTimerRunning != "") {
-        timers[currentTimerRunning].stop();
-    }
-    timers[nameOfTimer].stop();
-    timers[nameOfTimer].start();
-    currentTimerRunning = nameOfTimer;
-}
-
-void PerformanceTimer::StopTimer(std::string nameOfTimer)
-{
-    timers[nameOfTimer].stop();
-    currentTimerRunning = nameOfTimer;
-}
-
-void PerformanceTimer::SetFrameNumber(int frameNumber)
-{
-}
-
-void PerformanceTimer::ResetAllTimers()
-{
-    //stop all timers
-    for (auto aTimer : timers)
-    {
-        aTimer.second.stop();
-    }
-    currentTimerRunning = "";
-    timers.clear();
-}
-
-void PerformanceTimer::CreateExcelData()
-{
-    //get time
-    std::time_t t = std::time(NULL);
-    char tStr[16];
-    std::strftime(tStr, 32, " %a %H-%M-%S", std::localtime(&t));
-    std::string time(tStr);
-    std::string path("TacticalZ");
-    path += time + ".csv";
-    std::ofstream someFileStream;
-    someFileStream.open(path, std::ofstream::out);
-    someFileStream << "classname" << ',' << "walltime" << ',' << "userTime" << ',' << "systemTime" << '\n';
-
-    //write all timers to file
-    for (auto aTimer : timers)
-    {
-        //remove the "class" name in front of the string
-        auto className = aTimer.first;
-        if (className.find("class ") != std::string::npos) {
-            className.replace(0, 6, "");
-        }
-        auto wallTime = (double)aTimer.second.elapsed().wall*1e-3;
-        auto userTime = (double)aTimer.second.elapsed().user*1e-3;
-        auto systemTime = (double)aTimer.second.elapsed().system*1e-3;
-
-        someFileStream << className << "," << wallTime << ',' << userTime << ',' << systemTime << '\n';
-    }
-    someFileStream.close();
-}

src/Engine/Core/World.cpp

@@ -9,20 +9,7 @@ World::~World()
     }
 }
 
-World::World(const World& other)
-    : m_EventBroker(other.m_EventBroker)
-    , m_CurrentEntityID(other.m_CurrentEntityID)
-    , m_EntityParents(other.m_EntityParents)
-    , m_EntityChildren(other.m_EntityChildren)
-    , m_EntityNames(other.m_EntityNames)
-{
-    // Deep copy component pools
-    for (auto& kv : other.m_ComponentPools) {
-        m_ComponentPools[kv.first] = new ComponentPool(*kv.second);
-    }
-}
-
-EntityID World::CreateEntity(EntityID parent /*= EntityID_Invalid*/)
+EntityID World::CreateEntity(EntityID parent /*= 0*/)
 {
     EntityID newEntity = generateEntityID();
     if (newEntity == parent) {
@@ -57,8 +44,10 @@ ComponentWrapper World::AttachComponent(EntityID entity, const std::string& comp
     ComponentPool* pool = m_ComponentPools.at(componentType);
     const ComponentInfo& ci = pool->ComponentInfo();
 
-    // Allocate component with default values
+    // Allocate space for the component
     ComponentWrapper c = pool->Allocate(entity);
+    // Write default values
+    memcpy(c.Data, ci.Defaults.get(), ci.Stride);
 
     return c;
 }

src/Engine/Editor/EditorSystem.cpp

@@ -225,12 +225,6 @@ bool EditorSystem::OnInputCommand(const Events::InputCommand& e)
             Enable();
         }
     }
-    if (e.Command == "PerformanceTimingResetAllTimers" && e.Value > 0) {
-        PerformanceTimer::ResetAllTimers();
-    }
-    if (e.Command == "PerformanceTimingCreateExcelData" && e.Value > 0) {
-        PerformanceTimer::CreateExcelData();
-    }
     return true;
 }
 

src/Engine/GUI/ButtonSystem.cpp

@@ -1,84 +0,0 @@
-#include "GUI/ButtonSystem.h"
-
-ButtonSystem::ButtonSystem(SystemParams params, IRenderer* renderer)
-    : System(params)
-    , PureSystem("Button")
-    , m_Renderer(renderer)
-{
-    EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &ButtonSystem::OnMousePress);
-    EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &ButtonSystem::OnMouseRelease);
-    EVENT_SUBSCRIBE_MEMBER(m_EMouseLock, &ButtonSystem::OnMouseLock);
-    EVENT_SUBSCRIBE_MEMBER(m_EMouseUnlock, &ButtonSystem::OnMouseUnlock);
-}
-
-
-bool ButtonSystem::OnMouseLock(const Events::LockMouse& e)
-{
-    m_MouseIsLocked = true;
-    return true;
-}
-
-
-bool ButtonSystem::OnMouseUnlock(const Events::UnlockMouse& e)
-{
-    m_MouseIsLocked = false;
-    return true;
-}
-
-
-bool ButtonSystem::OnMousePress(const Events::MousePress& e)
-{
-    if (e.Button == GLFW_MOUSE_BUTTON_1 && !m_MouseIsLocked) {
-        m_PickData = m_Renderer->Pick(glm::vec2(e.X, e.Y));
-        if (m_PickData.Entity != EntityID_Invalid && m_PickData.World == m_World) {
-            if(m_World->HasComponent(m_PickData.Entity, "Button")) {
-                //Entity is a button, save it and send pressed event.
-
-                m_PickEntity = EntityWrapper(m_World, m_PickData.Entity);
-
-                //You have clicked on a button entity, send pressed event.
-                Events::ButtonPressed ePressed;
-                ePressed.Entity = m_PickEntity;
-                ePressed.EntityName = m_PickEntity.Name();
-                m_EventBroker->Publish(ePressed);
-            }
-        }
-    }
-    return true;
-}
-
-bool ButtonSystem::OnMouseRelease(const Events::MouseRelease& e)
-{
-    if(!m_MouseIsLocked) {
-        //Mouse is not locked, send release event.
-        m_PickData = m_Renderer->Pick(glm::vec2(e.X, e.Y));
-        if(m_PickData.Entity != EntityID_Invalid && m_PickData.World == m_World) {
-            EntityWrapper ent = EntityWrapper(m_World, m_PickData.Entity);
-
-            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) {
-                    //The entity you released the mouse button on is the same as you pressed it on. "Clicked"
-                    Events::ButtonClicked eClicked;
-                    eClicked.Entity = m_PickEntity;
-                    eClicked.EntityName = m_PickEntity.Name();
-                    m_EventBroker->Publish(eClicked);
-                }
-            }
-        }
-    }
-    return true;
-}
-
-void ButtonSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cHealth, double dt)
-{
-
-}
-
-
-
-   

src/Engine/GUI/MainMenuSystem.cpp

@@ -1,57 +0,0 @@
-#include "GUI/MainMenuSystem.h"
-
-MainMenuSystem::MainMenuSystem(SystemParams params, IRenderer* renderer)
-    : System(params)
-    , ImpureSystem()
-    , m_Renderer(renderer)
-{
-    EVENT_SUBSCRIBE_MEMBER(m_EPressed, &MainMenuSystem::OnButtonPress);
-    EVENT_SUBSCRIBE_MEMBER(m_EReleased, &MainMenuSystem::OnButtonRelease);
-    EVENT_SUBSCRIBE_MEMBER(m_EClicked, &MainMenuSystem::OnButtonClick);
-}
-
-void MainMenuSystem::Update(double dt)
-{
-
-}
-
-bool MainMenuSystem::OnButtonClick(const Events::ButtonClicked& e)
-{
-    if(e.EntityName == "Play") {
-        //Run play code
-    } else if(e.EntityName == "Connect") {
-        //Run connect code
-    } else if(e.EntityName == "Host") {
-        //Run host code
-    } else if(e.EntityName == "Quit") {
-        printf("No, you stay");
-    } else if (e.EntityName == "Res1080") {
-        glfwSetWindowSize(m_Renderer->Window(), 1920, 1080);
-        printf("\n1080");
-    } else if (e.EntityName == "Res720") {
-        glfwSetWindowSize(m_Renderer->Window(), 1280, 720);
-        glViewport(0, 0, 1280, 720);
-        printf("\n720");
-    } else if (e.EntityName == "Res480") {
-        glfwSetWindowSize(m_Renderer->Window(), 854, 480);
-        glViewport(0, 0, 854, 480);
-        printf("\n480");
-    } else if (e.EntityName == "FullScreen") {
-        printf("No fullscreen for now");
-    }
-
-    return true;
-}
-
-bool MainMenuSystem::OnButtonRelease(const Events::ButtonReleased& e)
-{
-
-    return true;
-}
-
-bool MainMenuSystem::OnButtonPress(const Events::ButtonPressed& e)
-{
-
-    return true;
-}
-

src/Engine/Network/Client.cpp

@@ -437,12 +437,11 @@ void Client::parsePlayerDamage(Packet& packet)
 {
     Events::PlayerDamage e;
     PlayerID victimID = packet.ReadPrimitive<EntityID>();
-    PlayerID inflictorID = packet.ReadPrimitive<EntityID>();
-    if(!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)){
+    if(serverClientMapsHasEntity(victimID)){
         return;
     }
     e.Inflictor = EntityWrapper(m_World, m_ServerIDToClientID.at(victimID));
-    e.Victim = EntityWrapper(m_World, m_ServerIDToClientID.at(inflictorID));
+    e.Victim = EntityWrapper(m_World, m_ServerIDToClientID.at(packet.ReadPrimitive<EntityID>()));
     e.Damage = packet.ReadPrimitive<double>();
     // Don't rebroadcast our own player damage events or we'll have an infinite loop!
     if (e.Inflictor != m_LocalPlayer) {

src/Engine/Network/NetworkClient.cpp

@@ -1,11 +0,0 @@
-#include "Network/NetworkClient.h"
-
-NetworkClient::NetworkClient()
-{ 
-    m_ReadBuffer = new char[m_BufferSize];
-}
-
-NetworkClient::~NetworkClient()
-{ 
-    delete[] m_ReadBuffer;
-}

src/Engine/Network/NetworkServer.cpp

@@ -1,11 +0,0 @@
-#include "Network/NetworkServer.h"
-
-NetworkServer::NetworkServer()
-{
-    m_ReadBuffer = new char[m_BufferSize];
-}
-
-NetworkServer::~NetworkServer()
-{ 
-    delete[] m_ReadBuffer;
-}

src/Engine/Network/Server.cpp

@@ -84,6 +84,7 @@ void Server::Update()
     if (isReadingData) {
         Network::Update();
     }
+
 }
 
 void Server::parseMessageType(Packet& packet)
@@ -146,7 +147,7 @@ void Server::sendSnapshot()
 {
     Packet packet(MessageType::Snapshot);
     addInputCommandsToPacket(packet);
-    addPlayersToPacket(packet, EntityID_Invalid);
+    addChildrenToPacket(packet, EntityID_Invalid);
     unreliableBroadcast(packet);
 }
 
@@ -163,7 +164,7 @@ void Server::addInputCommandsToPacket(Packet& packet)
     m_InputCommandsToBroadcast.clear();
 }
 
-void Server::addPlayersToPacket(Packet & packet, EntityID entityID)
+void Server::addChildrenToPacket(Packet & packet, EntityID entityID)
 {
     auto itPair = m_World->GetChildren(entityID);
     std::unordered_map<std::string, ComponentPool*> worldComponentPools = m_World->GetComponentPools();
@@ -212,49 +213,6 @@ void Server::addPlayersToPacket(Packet & packet, EntityID entityID)
     }
 }
 
-void Server::addChildrenToPacket(Packet & packet, EntityID entityID)
-{
-    auto itPair = m_World->GetChildren(entityID);
-    std::unordered_map<std::string, ComponentPool*> worldComponentPools = m_World->GetComponentPools();
-    // Loop through every child
-    for (auto it = itPair.first; it != itPair.second; it++) {
-        EntityID childEntityID = it->second;
-        // Write EntityID and parentsID and Entity name
-        packet.WritePrimitive(childEntityID);
-        packet.WritePrimitive(entityID);
-        packet.WriteString(m_World->GetName(childEntityID));
-        // Write components to child
-        int numberOfComponents = 0;
-        for (auto& i : worldComponentPools) {
-            if (i.second->KnowsEntity(childEntityID)) {
-                numberOfComponents++;
-            }
-        }
-        // Write how many components should be read
-        packet.WritePrimitive(numberOfComponents);
-        for (auto& i : worldComponentPools) {
-            // If the entity exist in the pool
-            if (i.second->KnowsEntity(childEntityID)) {
-                ComponentWrapper componentWrapper = i.second->GetByEntity(childEntityID);
-                // ComponentType
-                packet.WriteString(componentWrapper.Info.Name);
-                // Loop through fields
-                for (auto& componentField : componentWrapper.Info.FieldsInOrder) {
-                    ComponentInfo::Field_t fieldInfo = componentWrapper.Info.Fields.at(componentField);
-                    if (fieldInfo.Type == "string") {
-                        std::string& value = componentWrapper[componentField];
-                        packet.WriteString(value);
-                    } else {
-                        packet.WriteData(componentWrapper.Data + fieldInfo.Offset, fieldInfo.Stride);
-                    }
-                }
-            }
-        }
-        // Go to to your children
-        addChildrenToPacket(packet, childEntityID);
-    }
-}
-
 void Server::sendPing()
 {
     // Prints connected players ping
@@ -347,11 +305,6 @@ void Server::parseTCPConnect(Packet & packet)
     connnectPacket.WritePrimitive(playerID);
     m_Reliable.Send(connnectPacket);
 
-    Packet firstSnapshot(MessageType::Snapshot);
-    addInputCommandsToPacket(firstSnapshot);
-    addChildrenToPacket(firstSnapshot, EntityID_Invalid);
-    m_Reliable.Send(firstSnapshot);
-
     // Send notification that a player has connected
     //Packet notificationPacket(MessageType::PlayerConnected);
     //broadcast(notificationPacket);
@@ -494,9 +447,7 @@ void Server::parsePing()
 {
     for (auto& kv : m_ConnectedPlayers) {
         if (kv.second.TCPAddress == m_Address &&
-            kv.second.TCPPort == m_Port
-            || (kv.second.Endpoint.address() == m_Address
-                && kv.second.Endpoint.port() == m_Port)) {
+            kv.second.TCPPort == m_Port) {
             kv.second.StopTime = std::clock();
             break;
         }

src/Engine/Network/TCPClient.cpp

@@ -56,62 +56,32 @@ void TCPClient::Disconnect()
 
 void TCPClient::Receive(Packet& packet)
 {
-    size_t bytesRead = readBuffer();
+    size_t bytesRead = readBuffer(m_ReadBuffer);
     if (bytesRead > 0) {
         packet.ReconstructFromData(m_ReadBuffer, bytesRead);
     }
 }
 
-size_t TCPClient::readBuffer()
+size_t TCPClient::readBuffer(char* data)
 { 
-    //if (!m_Socket) {
-    //    return 0;
-    //}
-    //boost::system::error_code error;
-    //// Read size of packet
-    //size_t bytesReceived = m_Socket->read_some(boost
-    //    ::asio::buffer((void*)data, sizeof(int)),
-    //    error);
-    //int sizeOfPacket = 0;
-    //memcpy(&sizeOfPacket, data, sizeof(int));
-
-    //// Read the rest of the message
-    //bytesReceived += m_Socket->read_some(boost
-    //    ::asio::buffer((void*)(data + bytesReceived), sizeOfPacket - bytesReceived),
-    //    error);
-    //if (error) {
-    //    //LOG_ERROR("receive: %s", error.message().c_str());
-    //}
-    //return bytesReceived;
-
     if (!m_Socket) {
         return 0;
     }
     boost::system::error_code error;
     // Read size of packet
-    m_Socket->receive(boost
-        ::asio::buffer((void*)m_ReadBuffer, sizeof(int)),
-        boost::asio::ip::tcp::socket::message_peek, error);
-    unsigned int sizeOfPacket = 0;
-    memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-
-    // 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) {
-        delete[] m_ReadBuffer;
-        m_ReadBuffer = new char[sizeOfPacket];
-        m_BufferSize = sizeOfPacket;
-    }
-    // Read the rest of the message
     size_t bytesReceived = m_Socket->read_some(boost
-        ::asio::buffer((void*)(m_ReadBuffer), sizeOfPacket),
+        ::asio::buffer((void*)data, sizeof(int)),
+        error);
+    int sizeOfPacket = 0;
+    memcpy(&sizeOfPacket, data, sizeof(int));
+
+    // Read the rest of the message
+    bytesReceived += m_Socket->read_some(boost
+        ::asio::buffer((void*)(data + bytesReceived), sizeOfPacket - bytesReceived),
         error);
     if (error) {
         //LOG_ERROR("receive: %s", error.message().c_str());
     }
-    if (sizeOfPacket > 1000000)
-        LOG_WARNING("The packets received are bigger than 1MB");
-
     return bytesReceived;
 }
 

src/Engine/Network/TCPServer.cpp

@@ -7,7 +7,8 @@ TCPServer::TCPServer()
 }
 
 TCPServer::~TCPServer()
-{ }
+{
+}
 
 void TCPServer::AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers)
 {
@@ -30,7 +31,7 @@ PlayerID GetPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& con
     return -1;
 }
 
-void TCPServer::handle_accept(boost::shared_ptr<tcp::socket> socket,
+void TCPServer::handle_accept(boost::shared_ptr<tcp::socket> socket, 
     int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
     const boost::system::error_code& error)
 {
@@ -50,8 +51,8 @@ void TCPServer::handle_accept(boost::shared_ptr<tcp::socket> socket,
 
 void TCPServer::Send(Packet & packet, PlayerDefinition & playerDefinition)
 {
-    packet.UpdateSize();
     try {
+        packet.UpdateSize();
         int bytesSent = playerDefinition.TCPSocket->send(
             boost::asio::buffer(packet.Data(), packet.Size()),
             0);
@@ -72,79 +73,38 @@ void TCPServer::Send(Packet & packet)
 }
 
 void TCPServer::Disconnect()
-{
+{ 
 
 }
 
-//void TCPServer::Receive(Packet & packet, PlayerDefinition & playerDefinition)
-//{
-//    int bytesRead = readBuffer(m_ReadBuffer, playerDefinition);
-//    if (bytesRead > 0) {
-//        packet.ReconstructFromData(m_ReadBuffer, bytesRead);
-//    }
-//    lastReceivedSocket = playerDefinition.TCPSocket;
-//}
-//
-//int TCPServer::readBuffer(char* data, PlayerDefinition & playerDefinition)
-//{
-//    if (!playerDefinition.TCPSocket) {
-//        return 0;
-//    }
-//    boost::system::error_code error;
-//    // Read size of packet
-//    size_t bytesReceived = playerDefinition.TCPSocket->read_some(boost
-//        ::asio::buffer((void*)data, sizeof(int)),
-//        error);
-//    int sizeOfPacket = 0;
-//    memcpy(&sizeOfPacket, data, sizeof(int));
-//
-//    // Read the rest of the message
-//    bytesReceived += playerDefinition.TCPSocket->read_some(boost
-//        ::asio::buffer((void*)(data + bytesReceived), sizeOfPacket - bytesReceived),
-//        error);
-//    if (error) {
-//        //LOG_ERROR("receive: %s", error.message().c_str());
-//    }
-//    return bytesReceived;
-//}
-
 void TCPServer::Receive(Packet & packet, PlayerDefinition & playerDefinition)
 {
-    int bytesRead = readBuffer(playerDefinition);
+    int bytesRead = readBuffer(m_ReadBuffer, playerDefinition);
     if (bytesRead > 0) {
         packet.ReconstructFromData(m_ReadBuffer, bytesRead);
     }
     lastReceivedSocket = playerDefinition.TCPSocket;
 }
 
-int TCPServer::readBuffer(PlayerDefinition & playerDefinition)
+int TCPServer::readBuffer(char* data, PlayerDefinition & playerDefinition)
 {
     if (!playerDefinition.TCPSocket) {
         return 0;
     }
     boost::system::error_code error;
     // Read size of packet
-    playerDefinition.TCPSocket->receive(boost
-        ::asio::buffer((void*)m_ReadBuffer, sizeof(int)),
-        boost::asio::ip::tcp::socket::message_peek, error);
-    unsigned int sizeOfPacket = 0;
-    memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-
-    // if the buffer is to small increase the size of it
-    if (sizeOfPacket > m_BufferSize) {
-        delete[] m_ReadBuffer;
-        m_ReadBuffer = new char[sizeOfPacket];
-        m_BufferSize = sizeOfPacket;
-    }
-    // Read the rest of the message
     size_t bytesReceived = playerDefinition.TCPSocket->read_some(boost
-        ::asio::buffer((void*)(m_ReadBuffer), sizeOfPacket),
+        ::asio::buffer((void*)data, sizeof(int)),
+        error);
+    int sizeOfPacket = 0;
+    memcpy(&sizeOfPacket, data, sizeof(int));
+
+    // Read the rest of the message
+    bytesReceived += playerDefinition.TCPSocket->read_some(boost
+        ::asio::buffer((void*)(data + bytesReceived), sizeOfPacket - bytesReceived),
         error);
     if (error) {
         //LOG_ERROR("receive: %s", error.message().c_str());
     }
-    if (sizeOfPacket > 1000000)
-        LOG_WARNING("The packets received are bigger than 1MB");
-
     return bytesReceived;
 }

src/Engine/Network/UDPClient.cpp

@@ -27,62 +27,30 @@ void UDPClient::Disconnect()
 
 void UDPClient::Receive(Packet& packet)
 {
-    int bytesRead = readBuffer();
+    int bytesRead = readBuffer(m_ReadBuffer);
     if (bytesRead > 0) { 
         packet.ReconstructFromData(m_ReadBuffer, bytesRead);
     }
 }
 
-int UDPClient::readBuffer()
+int UDPClient::readBuffer(char* data)
 {
-    //if (!m_Socket) {
-    //    return 0;
-    //}
-    //boost::system::error_code error;
-    //int bytesReceived = m_Socket->receive_from(boost
-    //    ::asio::buffer((void*)data, BUFFERSIZE),
-    //    m_ReceiverEndpoint,
-    //    0, error);
-    //if (error) {
-    //    //LOG_ERROR("receive: %s", error.message().c_str());
-    //}
-    //return bytesReceived;
     if (!m_Socket) {
         return 0;
     }
     boost::system::error_code error;
-    // Read size of packet
-     m_Socket->receive(boost
-        ::asio::buffer((void*)m_ReadBuffer, sizeof(int)),
-         boost::asio::ip::udp::socket::message_peek, error);
-    int sizeOfPacket = 0;
-    memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-
-    // if the buffer is to small increase the size of it
-    if (sizeOfPacket > m_BufferSize) {
-        delete[] m_ReadBuffer;
-        m_ReadBuffer = new char[sizeOfPacket];
-        m_BufferSize = sizeOfPacket;
-    }
-
-    size_t availableData = m_Socket->available();
-    // Read the rest of the message
-    size_t bytesReceived = m_Socket->receive_from(boost
-        ::asio::buffer((void*)(m_ReadBuffer),
-            sizeOfPacket),
-        m_ReceiverEndpoint, 0, error);
+    int bytesReceived = m_Socket->receive_from(boost
+        ::asio::buffer((void*)data, BUFFERSIZE),
+        m_ReceiverEndpoint,
+        0, error);
     if (error) {
         //LOG_ERROR("receive: %s", error.message().c_str());
     }
-    if (sizeOfPacket > 1000000)
-        LOG_WARNING("The packets received are bigger than 1MB");
-
     return bytesReceived;
 }
 
 void UDPClient::Send(Packet& packet)
 {
-    packet.UpdateSize();
     m_Socket->send_to(boost::asio::buffer(
         packet.Data(),
         packet.Size()),

src/Engine/Network/UDPServer.cpp

@@ -10,7 +10,6 @@ UDPServer::~UDPServer()
 
 void UDPServer::Send(Packet& packet, PlayerDefinition & playerDefinition)
 {
-    packet.UpdateSize();
     try {
         int bytesSent = m_Socket->send_to(
             boost::asio::buffer(packet.Data(), packet.Size()),
@@ -24,7 +23,6 @@ void UDPServer::Send(Packet& packet, PlayerDefinition & playerDefinition)
 // Send back to endpoint of received packet
 void UDPServer::Send(Packet & packet)
 {
-    packet.UpdateSize();
     m_Socket->send_to(
         boost::asio::buffer(
             packet.Data(),
@@ -35,7 +33,7 @@ void UDPServer::Send(Packet & packet)
 
 void UDPServer::Receive(Packet & packet, PlayerDefinition & playerDefinition)
 {
-    int bytesRead = readBuffer();
+    int bytesRead = readBuffer(m_ReadBuffer);
     if (bytesRead > 0) {
         packet.ReconstructFromData(m_ReadBuffer, bytesRead);
     }
@@ -47,47 +45,17 @@ bool UDPServer::IsSocketAvailable()
     return m_Socket->available();
 }
 
-int UDPServer::readBuffer()
+int UDPServer::readBuffer(char* data)
 {
-    //boost::system::error_code error = boost::asio::error::host_not_found;
-    //unsigned int length = m_Socket->receive_from(
-    //    boost::asio::buffer((void*)data
-    //        , BUFFERSIZE)
-    //    , m_ReceiverEndpoint, 0, error);
-    //if (error) {
-    //    LOG_WARNING(error.message().c_str());
-    //}
-    //return length;
-    if (!m_Socket) {
-        return 0;
+    boost::system::error_code error = boost::asio::error::host_not_found;
+    unsigned int length = m_Socket->receive_from(
+        boost::asio::buffer((void*)data
+            , BUFFERSIZE)
+        , m_ReceiverEndpoint, 0, error);
+    if (error) {
+        LOG_WARNING(error.message().c_str());
     }
-    boost::system::error_code error;
-    // Read size of packet
-     m_Socket->receive_from(boost
-        ::asio::buffer((void*)m_ReadBuffer, sizeof(int)),
-        m_ReceiverEndpoint, boost::asio::ip::udp::socket::message_peek, error);
-    unsigned int sizeOfPacket = 0;
-    memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-
-    // if the buffer is to small increase the size of it
-    if (sizeOfPacket > m_BufferSize) {
-        delete[] m_ReadBuffer;
-        m_ReadBuffer = new char[sizeOfPacket];
-        m_BufferSize = sizeOfPacket;
-    }
-
-    // Read the rest of the message
-    size_t bytesReceived = m_Socket->receive_from(boost
-        ::asio::buffer((void*)(m_ReadBuffer),
-            sizeOfPacket),
-        m_ReceiverEndpoint, 0, error);
-        if (error) {
-            //LOG_ERROR("receive: %s", error.message().c_str());
-        }
-        if (sizeOfPacket > 1000000)
-            LOG_WARNING("The packets received are bigger than 1MB");
-
-        return bytesReceived;
+    return length;
 }
 
 void UDPServer::AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers)

src/Engine/Rendering/DrawBloomPass.cpp

@@ -121,15 +121,6 @@ void DrawBloomPass::Draw(GLuint texture)
     GLERROR("DrawBloomPass::Draw: END");
 }
 
-
-void DrawBloomPass::OnWindowResize()
-{
-    GenerateTexture(&m_GaussianTexture_vert, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
-    m_GaussianFrameBuffer_vert.Generate();
-    GenerateTexture(&m_GaussianTexture_horiz, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
-    m_GaussianFrameBuffer_horiz.Generate();
-}
-
 void DrawBloomPass::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const
 {
     glGenTextures(1, texture);

src/Engine/Rendering/DrawFinalPass.cpp

@@ -274,27 +274,6 @@ void DrawFinalPass::ClearBuffer()
     m_FinalPassFrameBuffer.Unbind();
 }
 
-
-void DrawFinalPass::OnWindowResize()
-{
-    //InitializeFrameBuffers();
-    glBindRenderbuffer(GL_RENDERBUFFER, m_DepthBuffer);
-    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
-
-    GenerateTexture(&m_SceneTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
-    GenerateTexture(&m_BloomTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
-    m_FinalPassFrameBuffer.Generate();
-
-
-    glBindRenderbuffer(GL_RENDERBUFFER, m_DepthBufferLowRes);
-    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, (int)(m_Renderer->GetViewportSize().Width/m_ShieldPixelRate), (int)(m_Renderer->GetViewportSize().Height/m_ShieldPixelRate));
-
-    GenerateTexture(&m_SceneTextureLowRes, GL_CLAMP_TO_EDGE, GL_NEAREST, glm::vec2((int)(m_Renderer->GetViewportSize().Width/m_ShieldPixelRate), (int)(m_Renderer->GetViewportSize().Height/m_ShieldPixelRate)), GL_RGB16F, GL_RGB, GL_FLOAT);
-    GenerateTexture(&m_BloomTextureLowRes, GL_CLAMP_TO_EDGE, GL_NEAREST, glm::vec2((int)(m_Renderer->GetViewportSize().Width/m_ShieldPixelRate), (int)(m_Renderer->GetViewportSize().Height/m_ShieldPixelRate)), GL_RGB16F, GL_RGB, GL_FLOAT);
-    m_FinalPassFrameBufferLowRes.Generate();
-    GLERROR("Error changing texture resolutions");
-}
-
 void DrawFinalPass::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const
 {
     glGenTextures(1, texture);
@@ -710,6 +689,9 @@ void DrawFinalPass::DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, Rend
             glDrawElements(GL_TRIANGLES, spriteJob->EndIndex - spriteJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(spriteJob->StartIndex*sizeof(unsigned int)));
         }
     }
+
+    
+
    // m_SpriteProgram->Unbind();
 }
 
@@ -723,7 +705,7 @@ void DrawFinalPass::BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<E
     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);
+    glUniform2f(glGetUniformLocation(shaderHandle, "ScreenDimensions"), m_Renderer->Resolution().Width, m_Renderer->Resolution().Height);
 	GLERROR("Bind 5 uniform");
 
     glUniform3fv(glGetUniformLocation(shaderHandle, "ExplosionOrigin"), 1, glm::value_ptr(job->ExplosionOrigin));
@@ -756,8 +738,6 @@ void DrawFinalPass::BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<E
     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");
 }
 
@@ -775,7 +755,7 @@ void DrawFinalPass::BindModelUniforms(GLuint shaderHandle, std::shared_ptr<Model
 	GLERROR("Bind 4 uniform");
 
 	GLint Location_ScreenDimensions = glGetUniformLocation(shaderHandle, "ScreenDimensions");
-	glUniform2f(Location_ScreenDimensions, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
+	glUniform2f(Location_ScreenDimensions, m_Renderer->Resolution().Width, m_Renderer->Resolution().Height);
 	GLERROR("Bind 5 uniform");
 
 	GLint Location_FillPercentage = glGetUniformLocation(shaderHandle, "FillPercentage");
@@ -793,11 +773,6 @@ void DrawFinalPass::BindModelUniforms(GLuint shaderHandle, std::shared_ptr<Model
 	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);
-
 	GLERROR("END");
 }
 

src/Engine/Rendering/FrameBuffer.cpp

@@ -72,8 +72,8 @@ void FrameBuffer::Generate()
 
     GLenum* bufferTextures = &attachments[0];
     glDrawBuffers(attachments.size(), bufferTextures);
-    if (GLERROR("GLBufferAttachement error")) {
-        printf(": AttachmentSize %i", attachments.size());
+    if(GLERROR("4")) {
+        printf("hello");
     }
 
     if (GLenum frameBufferStatus = glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {

src/Engine/Rendering/LightCullingPass.cpp

@@ -110,34 +110,6 @@ void LightCullingPass::FillLightList(RenderScene& scene)
     }
 }
 
-
-void LightCullingPass::OnWindowResize()
-{
-    SetSSBOSizes();
-
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_FrustumSSBO);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(Frustum)*m_NumberOfTiles, nullptr, GL_DYNAMIC_COPY);
-    GLERROR("m_FrustumSSBO");
-
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightSSBO);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(LightSource) * 200, nullptr, GL_DYNAMIC_COPY);
-    GLERROR("m_LightSSBO");
-
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightGridSSBO);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(LightGrid)*m_NumberOfTiles, nullptr, GL_DYNAMIC_COPY);
-    GLERROR("m_LightGridSSBO");
-
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightOffsetSSBO);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(m_LightOffset), &m_LightOffset, GL_DYNAMIC_COPY);
-    GLERROR("m_LightOffsetSSBO");
-
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightIndexSSBO);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(float)*m_NumberOfTiles*MAX_LIGHTS_PER_TILE, m_LightIndex, GL_DYNAMIC_COPY);
-    GLERROR("m_LightIndexSSBO");
-
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
-}
-
 void LightCullingPass::InitializeSSBOs()
 {
     glGenBuffers(1, &m_FrustumSSBO);

src/Engine/Rendering/PickingPass.cpp

@@ -15,8 +15,6 @@ PickingPass::~PickingPass()
 
 }
 
-
-
 void PickingPass::InitializeTextures()
 {
     GenerateTexture(&m_PickingTexture, GL_CLAMP_TO_BORDER, GL_LINEAR,
@@ -236,52 +234,6 @@ void PickingPass::Draw(RenderScene& scene)
         }
     }
 
-    for (auto& job : scene.Jobs.SpriteJob) {
-        auto spriteJob = std::dynamic_pointer_cast<SpriteJob>(job);
-        if (!spriteJob->Pickable) {
-            continue;
-        }
-        RenderState jobState;
-
-        if (spriteJob) {
-            if (spriteJob->Depth == 0) {
-                jobState.Disable(GL_DEPTH_TEST);
-            }
-            int pickColor[2] = { m_ColorCounter[0], m_ColorCounter[1] };
-
-            PickingInfo pickInfo;
-            pickInfo.Entity = spriteJob->Entity;
-            pickInfo.World = spriteJob->World;
-            pickInfo.Camera = scene.Camera;
-
-            auto color = m_EntityColors.find(std::make_tuple(pickInfo.Entity, pickInfo.World, pickInfo.Camera));
-            if (color != m_EntityColors.end()) {
-                pickColor[0] = color->second[0];
-                pickColor[1] = color->second[1];
-            } else {
-                m_EntityColors[std::make_tuple(pickInfo.Entity, pickInfo.World, pickInfo.Camera)] = glm::ivec2(pickColor[0], pickColor[1]);
-                if (m_ColorCounter[0] > 255) {
-                    m_ColorCounter[0] = 0;
-                    m_ColorCounter[1] += 1;
-                } else {
-                    m_ColorCounter[0] += 1;
-                }
-            }
-
-            m_PickingColorsToEntity[glm::ivec2(pickColor[0], pickColor[1])] = pickInfo;
-
-            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()));
-            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);
-            glDrawElements(GL_TRIANGLES, spriteJob->EndIndex - spriteJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(spriteJob->StartIndex * sizeof(unsigned int)));
-        }
-    }
-
  /*   for (auto &job : scene.Jobs.TransparentShieldedObjects) {
         auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
 
@@ -354,6 +306,8 @@ void PickingPass::Draw(RenderScene& scene)
     delete state;
 }
 
+
+
 void PickingPass::ClearPicking()
 {
     m_PickingColorsToEntity.clear();
@@ -367,15 +321,6 @@ void PickingPass::ClearPicking()
     m_PickingBuffer.Unbind();
 }
 
-
-void PickingPass::OnWindowResize()
-{
-    InitializeTextures();
-    glBindRenderbuffer(GL_RENDERBUFFER, m_DepthBuffer);
-    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
-    m_PickingBuffer.Generate();
-}
-
 PickData PickingPass::Pick(glm::vec2 screenCoord)
 {
     int fbWidth;

src/Engine/Rendering/Renderer.cpp

@@ -1,7 +1,5 @@
 #include "Rendering/Renderer.h"
 
-std::unordered_map<GLFWwindow*, Renderer*> Renderer::m_WindowToRenderer;
-
 void Renderer::Initialize()
 {
 	InitializeWindow();
@@ -14,6 +12,7 @@ void Renderer::Initialize()
     m_TextPass = new TextPass();
     m_TextPass->Initialize();
 
+
    /* m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.obj");
     m_UnitQuad = ResourceManager::Load<Model>("Models/Core/UnitQuad.obj");
     m_UnitSphere = ResourceManager::Load<Model>("Models/Core/UnitSphere.obj");*/
@@ -21,17 +20,6 @@ void Renderer::Initialize()
     m_ImGuiRenderPass = new ImGuiRenderPass(this, m_EventBroker);
 }
 
-void Renderer::glfwFrameBufferCallback(GLFWwindow* window, int width, int height)
-{
-    glViewport(0, 0, width, height);
-    Renderer* currentRenderer = m_WindowToRenderer[window];
-    currentRenderer->m_ViewportSize = Rectangle(width, height);
-    currentRenderer->m_DrawFinalPass->OnWindowResize();
-    currentRenderer->m_LightCullingPass->OnWindowResize();
-    currentRenderer->m_PickingPass->OnWindowResize();
-    currentRenderer->m_DrawBloomPass->OnWindowResize();
-}
-
 void Renderer::InitializeWindow()
 {
 	// Initialize GLFW
@@ -51,7 +39,6 @@ void Renderer::InitializeWindow()
 		LOG_ERROR("GLFW: Failed to create window");
 		exit(EXIT_FAILURE);
 	}
-    glfwSetFramebufferSizeCallback(m_Window, &glfwFrameBufferCallback);
 	glfwMakeContextCurrent(m_Window);
 
 	// GL version info
@@ -72,10 +59,8 @@ void Renderer::InitializeWindow()
 		exit(EXIT_FAILURE);
 	}
 
-    m_WindowToRenderer[m_Window] = this;
-
     int windowSize[2];
-    glfwGetFramebufferSize(m_Window, &windowSize[0], &windowSize[1]);
+    glfwGetWindowSize(m_Window, &windowSize[0], &windowSize[1]);
     m_ViewportSize = Rectangle(windowSize[0], windowSize[1]);
 }
 
@@ -114,48 +99,34 @@ void Renderer::Draw(RenderFrame& frame)
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     //Clear other buffers
-    PerformanceTimer::StartTimer("Renderer-ClearBuffers");
     m_PickingPass->ClearPicking();
     m_DrawFinalPass->ClearBuffer();
     m_DrawBloomPass->ClearBuffer();
-    PerformanceTimer::StopTimer("Renderer-ClearBuffers");
 
     for (auto scene : frame.RenderScenes){
         
-        PerformanceTimer::StartTimer("Renderer-Depth");
         SortRenderJobsByDepth(*scene);
         GLERROR("SortByDepth");
-        PerformanceTimer::StartTimerAndStopPrevious("Renderer-Drawing PickingPass");
         m_PickingPass->Draw(*scene);
         GLERROR("Drawing pickingpass");
-        PerformanceTimer::StartTimerAndStopPrevious("Renderer-Generate Frustrums");
         m_LightCullingPass->GenerateNewFrustum(*scene);
         GLERROR("Generate frustums");
-        PerformanceTimer::StartTimerAndStopPrevious("Renderer-Filling Light List");
         m_LightCullingPass->FillLightList(*scene);
         GLERROR("Filling light list");
-        PerformanceTimer::StartTimerAndStopPrevious("Renderer-Light Culling");
         m_LightCullingPass->CullLights(*scene);
         GLERROR("LightCulling");
-        PerformanceTimer::StartTimerAndStopPrevious("Renderer-Draw Geometry+Light");
         m_DrawFinalPass->Draw(*scene);
         GLERROR("Draw Geometry+Light");
         //m_DrawScenePass->Draw(*scene);
 
-        PerformanceTimer::StartTimerAndStopPrevious("Renderer-Draw Text");
         m_TextPass->Draw(*scene, *m_DrawFinalPass->FinalPassFrameBuffer());
         GLERROR("Draw Text");
-        PerformanceTimer::StopTimer("Renderer-Draw Text");
+
     }
-    PerformanceTimer::StartTimer("Renderer-Draw Bloom");
     m_DrawBloomPass->Draw(m_DrawFinalPass->BloomTexture());
-    PerformanceTimer::StopTimer("Renderer-Draw Bloom");
     if (m_DebugTextureToDraw == 0) {
-        PerformanceTimer::StartTimer("Renderer-Color Correction Pass");
         m_DrawColorCorrectionPass->Draw(m_DrawFinalPass->SceneTexture(), m_DrawBloomPass->GaussianTexture(), m_DrawFinalPass->SceneTextureLowRes(), m_DrawFinalPass->BloomTextureLowRes(), frame.Gamma, frame.Exposure);
-        PerformanceTimer::StopTimer("Renderer-Color Correction Pass");
     }
-    PerformanceTimer::StartTimer("Renderer-Misc Debug Draws");
     if (m_DebugTextureToDraw == 1) {
         m_DrawScreenQuadPass->Draw(m_DrawFinalPass->SceneTexture());
     }
@@ -174,13 +145,10 @@ void Renderer::Draw(RenderFrame& frame)
     if (m_DebugTextureToDraw == 6) {
         m_DrawScreenQuadPass->Draw(m_PickingPass->PickingTexture());
     }
-    PerformanceTimer::StopTimer("Renderer-Misc Debug Draws");
 
-    PerformanceTimer::StartTimer("Renderer-ImGuiRenderPass");
     m_ImGuiRenderPass->Draw();
     GLERROR("Imgui draw");
     glfwSwapBuffers(m_Window);
-    PerformanceTimer::StopTimer("Renderer-ImGuiRenderPass");
 }
 
 PickData Renderer::Pick(glm::vec2 screenCoord)

src/Game/Game.cpp

@@ -26,8 +26,7 @@
 #include "Network/MultiplayerSnapshotFilter.h"
 #include "Game/Systems/AmmunitionHUDSystem.h"
 #include "Game/Systems/KillFeedSystem.h"
-#include "GUI/ButtonSystem.h"
-#include "GUI/MainMenuSystem.h"
+#include "Game/Systems/BoostSystem.h"
 
 
 Game::Game(int argc, char* argv[])
@@ -74,6 +73,11 @@ Game::Game(int argc, char* argv[])
     m_InputProxy->AddHandler<MouseInputHandler>();
     m_InputProxy->LoadBindings("Input.ini");
 
+    // Create the root level GUI frame
+    m_FrameStack = new GUI::Frame(m_EventBroker);
+    m_FrameStack->Width = m_Renderer->Resolution().Width;
+    m_FrameStack->Height = m_Renderer->Resolution().Height;
+
     // Create a world
     m_World = new World(m_EventBroker);
     std::string mapToLoad = m_Config->Get<std::string>("Debug.LoadMap", "");
@@ -129,8 +133,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AmmunitionHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<ButtonSystem>(updateOrderLevel, m_Renderer);
-    m_SystemPipeline->AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);
+    m_SystemPipeline->AddSystem<BoostSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
@@ -167,6 +170,7 @@ Game::~Game()
         delete m_NetworkServer;
     }
     delete m_World;
+    delete m_FrameStack;
     delete m_InputProxy;
     delete m_InputManager;
     delete m_RenderFrame;
@@ -185,20 +189,16 @@ void Game::Tick()
     // Handle input in a weird looking but responsive way
     m_EventBroker->Process<InputManager>();
     m_EventBroker->Swap();
-    PerformanceTimer::StartTimer("InputManager");
     m_InputManager->Update(dt);
     m_EventBroker->Swap();
-    PerformanceTimer::StartTimerAndStopPrevious("InputProxy");
     m_InputProxy->Update(dt);
     m_EventBroker->Swap();
     m_InputProxy->Process();
     m_EventBroker->Swap();
 
-    PerformanceTimer::StartTimerAndStopPrevious("SoundManager");
     m_SoundManager->Update(dt);
 
     // Update network
-    PerformanceTimer::StartTimerAndStopPrevious("Network");
     m_EventBroker->Process<MultiplayerSnapshotFilter>();
     if (m_NetworkClient != nullptr) {
         m_NetworkClient->Update();
@@ -209,14 +209,10 @@ void Game::Tick()
     //m_SoundManager->Update(dt);
 
     // Iterate through systems and update world!
-    PerformanceTimer::StartTimerAndStopPrevious("SystemPipeline");
     m_EventBroker->Process<SystemPipeline>();
     m_SystemPipeline->Update(dt);
-    PerformanceTimer::StartTimerAndStopPrevious("RendererUpdate");
     m_Renderer->Update(dt);
-    PerformanceTimer::StartTimerAndStopPrevious("RendererDraw");
     m_Renderer->Draw(*m_RenderFrame);
-    PerformanceTimer::StopTimer("RendererDraw");
     m_RenderFrame->Clear();
     m_EventBroker->Swap();
     m_EventBroker->Clear();

src/Game/Systems/BoostSystem.cpp

@@ -0,0 +1,63 @@
+#include "Systems/BoostSystem.h"
+
+BoostSystem::BoostSystem(SystemParams params)
+    : System(params)
+{
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &BoostSystem::OnPlayerDamage);
+}
+
+bool BoostSystem::OnPlayerDamage(Events::PlayerDamage& e)
+{
+    if (e.Victim.ID == e.Inflictor.ID) {
+        return false;
+    }
+    if (!e.Victim.Valid() && e.Victim != LocalPlayer && !e.Victim.IsChildOf(LocalPlayer)) {
+        return false;
+    }
+    if (!e.Inflictor.Valid() || !e.Victim.Valid()) {
+        return false;
+    }
+
+    //if its not friendly fire, return
+    if ((int)m_World->GetComponent(e.Inflictor.ID, "Team")["Team"] != (int)m_World->GetComponent(e.Victim.ID, "Team")["Team"]) {
+        return false;
+    }
+
+    //determine the inflictors class
+    auto className = DetermineClass(e.Inflictor);
+    if (className == "") {
+        return false;
+    }
+
+    //get the XML file, example: "Schema/Entities/BoostclassName.xml"
+    std::string classXML = "Schema/Entities/" + className + ".xml";
+
+    //check if player already has a child with the component, if so delete that child
+    auto playerBoostAssaultEntity = e.Victim.FirstChildByName(className);
+    if (playerBoostAssaultEntity.Valid()) {
+        m_World->DeleteEntity(playerBoostAssaultEntity.ID);
+    }
+    //load boost XML file, set it entity parented with the victim player
+    auto entityFile = ResourceManager::Load<EntityFile>(classXML);
+    EntityFileParser parser(entityFile);
+    EntityID boostAssaultEntity = parser.MergeEntities(m_World);
+    m_World->SetName(boostAssaultEntity, className);
+    m_World->SetParent(boostAssaultEntity, e.Victim.ID);
+
+    return true;
+}
+
+std::string BoostSystem::DetermineClass(EntityWrapper inflictorPlayer)
+{
+    //determine the class based on what component the inflictor-player has
+    if (m_World->HasComponent(inflictorPlayer.ID, "DashAbility")) {
+        return "BoostAssault";
+    }
+    if (m_World->HasComponent(inflictorPlayer.ID, "ShieldAbility")) {
+        return "BoostDefender";
+    }
+    if (m_World->HasComponent(inflictorPlayer.ID, "SprintAbility")) {
+        return "BoostSniper";
+    }
+    return "";
+}