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,16 +15,15 @@ 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;
     std::vector<EntityAABB> m_OctreeResult;
-    std::unordered_map<EntityWrapper, glm::vec3> m_PrevPositions;
 };
 
 #endif

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/EntityWrapper.h

@@ -29,22 +29,16 @@ struct EntityWrapper
     EntityWrapper Parent();
     EntityWrapper FirstChildByName(const std::string& name);
     EntityWrapper FirstParentWithComponent(const std::string& componentType);
-    EntityWrapper Clone(EntityWrapper parent = EntityWrapper::Invalid);
-    std::vector<EntityWrapper> ChildrenWithComponent(const std::string& componentType);
-    void DeleteChildren();
     bool IsChildOf(EntityWrapper potentialParent);
     bool Valid() const;
 
     ComponentWrapper operator[](const char* componentName);
-    ComponentWrapper operator[](const std::string& componentName);
     bool operator==(const EntityWrapper& e) const;
     bool operator!=(const EntityWrapper& e) const;
     explicit operator EntityID() const;
 
 private:
     EntityWrapper firstChildByNameRecursive(const std::string& name, EntityID parent);
-    EntityWrapper cloneRecursive(EntityWrapper entity, EntityWrapper parent);
-    void childrenWithComponentRecursive(const std::string& componentType, EntityWrapper& entity, std::vector<EntityWrapper>& childrenWithComponent);
 };
 
 namespace std

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/System.h

@@ -68,7 +68,7 @@ protected:
 
     const std::string m_ComponentType;
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) = 0;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPlayer, double dt) = 0;
 };
 
 class ImpureSystem : public virtual System

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);
@@ -40,7 +39,7 @@ public:
     // Change the parent of an entity
     void SetParent(EntityID entity, EntityID parent);
     // Get children of an entity
-    const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetDirectChildren(EntityID entity);
+    const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetChildren(EntityID entity);
     // Get all component pools
     const std::unordered_map<std::string, ComponentPool*>& GetComponentPools() const { return m_ComponentPools; }
     // Get the entity children map

include/Engine/Editor/EditorGUI.h

@@ -73,12 +73,6 @@ public:
     // Called when the user means to rename an entity.
     typedef std::function<void(EntityWrapper, const std::string&)> OnEntityChangeName_t;
     void SetEntityChangeNameCallback(OnEntityChangeName_t f) { m_OnEntityChangeName = f; }
-    // Called when the user pastes an entity previously "copied"
-    // @param EntityWrapper The entity to copy
-    // @param EntityWrapper The entity to parent the new copy to
-    // @return The new copy of the entity
-    typedef std::function<EntityWrapper(EntityWrapper, EntityWrapper)> OnEntityPaste_t;
-    void SetEntityPasteCallback(OnEntityPaste_t f) { m_OnEntityPaste = f; }
     // Called when the user means to attach a new component to an entity.
     typedef std::function<void(EntityWrapper, const std::string&)> OnComponentAttach_t;
     void SetComponentAttachCallback(OnComponentAttach_t f) { m_OnComponentAttach = f; }
@@ -117,7 +111,6 @@ private:
     std::string m_DroppedFile = "";
     bool m_Paused = false;
     bool m_MouseLocked = false;
-    EntityWrapper m_CopyTarget = EntityWrapper::Invalid;
 
     // Callbacks
     OnEntitySelectedCallback_t m_OnEntitySelected = nullptr;
@@ -131,7 +124,6 @@ private:
     OnComponentDelete_t m_OnComponentDelete = nullptr;
     OnWidgetMode_t m_OnWidgetMode = nullptr;
     OnWidgetSpace_t m_OnWidgetSpace = nullptr;
-    OnEntityPaste_t m_OnEntityPaste = nullptr;
 
     // Events
     EventRelay<EditorGUI, Events::KeyDown> m_EKeyDown;

include/Engine/Editor/EditorSystem.h

@@ -56,7 +56,6 @@ private:
     void OnEntityDelete(EntityWrapper entity);
     void OnEntityChangeParent(EntityWrapper entity, EntityWrapper parent);
     void OnEntityChangeName(EntityWrapper entity, const std::string& name);
-    EntityWrapper OnEntityPaste(EntityWrapper entityToCopy, EntityWrapper parent);
     void OnComponentAttach(EntityWrapper entity, const std::string& componentType);
     void OnComponentDelete(EntityWrapper entity, const std::string& componentType);
     void OnWidgetSpace(EditorGUI::WidgetSpace widgetSpace);

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

@@ -27,7 +27,8 @@ public:
     virtual bool OnCommand(const Events::InputCommand& e) override;
     virtual void Reset();
 
-    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer);
+    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer);
+    bool SniperSprintingCheck();
     virtual bool AssaultDashDoubleTapped() const { return m_AssaultDashDoubleTapped; }
     virtual bool PlayerIsDashing() const { return m_PlayerIsDashing; }
 
@@ -41,6 +42,7 @@ protected:
     bool m_Crouching = false;
     //assault dash membervariables - needed to calculate the doubletap- and dashlogic
     double m_AssaultDashDoubleTapDeltaTime = 0.0;
+    double m_AssaultDashCoolDownTimer = 0.0;
     //i will let m_AssaultDashDoubleTapSensitivityTimer stay hardcoded, its not really a gamevariable (more an inputvariable), 
     //and its very unlikely that someone wants to change that value
     const float m_AssaultDashDoubleTapSensitivityTimer = 0.25f;
@@ -190,21 +192,21 @@ bool FirstPersonInputController<EventContext>::OnLockMouse(const Events::LockMou
 }
 
 template <typename EventContext>
-void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer) {
+void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer) {
     m_AssaultDashDoubleTapDeltaTime += dt;
-    assaultDashCoolDownTimer -= dt;
+    m_AssaultDashCoolDownTimer -= dt;
     //cooldown = assaultDashCoolDownMaxTimer sec, pretend the dash lasts 0.25 sec (for friction to do its work)
-    if (assaultDashCoolDownTimer > (assaultDashCoolDownMaxTimer - 0.25f)) {
+    if (m_AssaultDashCoolDownTimer > (assaultDashCoolDownMaxTimer - 0.25f)) {
         m_PlayerIsDashing = true;
     } else {
         m_PlayerIsDashing = false;
     }
 
     //dashing with shift
-    if (m_ShiftDashing && assaultDashCoolDownTimer <= 0.0f) {
+    if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f) {
         //player is dashing with shift
         //the wanted-direction is set in playermovement already so we dont need to check what direction we want to dash in!
-        assaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
+        m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
         m_AssaultDashDoubleTapped = true;
         m_AssaultDashDoubleTapDeltaTime = 0.f;
         return;
@@ -226,7 +228,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     }
     m_ValidDoubleTap = false;
 
-    if (!(assaultDashCoolDownTimer <= 0.0f)) {
+    if (!(m_AssaultDashCoolDownTimer <= 0.0f)) {
         //if we cant dash at the moment, then just reset the tap-sensitivity-timer
         m_AssaultDashDoubleTapDeltaTime = 0.f;
         return;
@@ -234,10 +236,18 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     //ok, we have a valid tap, lets do it
     m_AssaultDashDoubleTapped = true;
     m_AssaultDashDoubleTapDeltaTime = 0.f;
-    assaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
+    m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
 
     Events::DashAbility e;
     m_EventBroker->Publish(e);
 }
 
+template <typename EventContext>
+bool FirstPersonInputController<EventContext>::SniperSprintingCheck() {
+    if (m_SpecialAbilityKeyDown) {
+        return true;
+    } else {
+        return false;
+    }
+}
 #endif

include/Engine/Network/Client.h

@@ -19,26 +19,11 @@
 #include "Core/World.h"
 #include "Core/EventBroker.h"
 #include "Core/ConfigFile.h"
-#include "Core/EPlayerDeath.h"
 #include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"
-#include "../Game/Events/EDoubleJump.h"
 #include "Network/EInterpolate.h"
 #include "Network/SnapshotFilter.h"
 #include "Core/EPlayerSpawned.h"
-#include "Network/ESearchForServers.h"
-
-struct ServerInfo
-{
-    ServerInfo(std::string a, int b, std::string c, int d)
-    {
-        Address = a; Port = b; Name = c; PlayersConnected = d;
-    }
-    std::string Address = "";
-    int Port = 0;
-    std::string Name = "";
-    int PlayersConnected = 0;
-};
 
 class Client : public Network
 {
@@ -49,9 +34,7 @@ public:
 
     void Connect(std::string address, int port);
     void Update() override;
-private:
-    UDPClient m_Unreliable;
-    TCPClient m_Reliable;
+
     std::vector<Events::PlayerSpawned> m_PlayerSpawnEvents;
     void parseSpawnEvents();
     // Save for children
@@ -99,13 +82,10 @@ private:
     void parseTCPConnect(Packet& packet);
     void parsePlayerConnected(Packet& packet);
     void parsePing();
-    void parseServerlist(Packet& packet);
     void parseKick();
     void parsePlayersSpawned(Packet& packet);
     void parseEntityDeletion(Packet& packet);
-    void parsePlayerDamage(Packet& packet);
     void parseComponentDeletion(Packet& packet);
-    void parseDoubleJump(Packet& packet);
     void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
     void identifyPacketLoss();
@@ -114,7 +94,6 @@ private:
     void sendInputCommands();
     void sendLocalPlayerTransform();
     void becomePlayer();
-    void displayServerlist();
     // Mapping Logic
     // Returns if local EntityID exist in map
     bool clientServerMapsHasEntity(EntityID clientEntityID);
@@ -130,15 +109,10 @@ private:
     bool OnPlayerDamage(const Events::PlayerDamage& e);
     EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(const Events::PlayerSpawned& e);
-    EventRelay< Client, Events::SearchForServers> m_ESearchForServers;
-    EventRelay<Client, Events::DoubleJump> m_EDoubleJump;
-    bool OnDoubleJump(Events::DoubleJump & e);
-    bool OnSearchForServers(const Events::SearchForServers& e);
-    UDPClient m_ServerlistRequest;
-    std::vector<ServerInfo> m_Serverlist;
-    bool m_SearchingForServers = false;
-    std::clock_t m_StartSearchTime;
-    double m_SearchingTime = 2000; // Config I guess
+    void parsePlayerDamage(Packet& packet);
+private:
+    UDPClient m_Unreliable;
+    TCPClient m_Reliable;
 };
 
 #endif

include/Engine/Network/ESearchForServers.h

@@ -1,12 +0,0 @@
-#ifndef Events_SearchForServers_h__
-#define Events_SearchForServers_h__
-
-#include "Core/Event.h"
-
-namespace Events
-{
-
-struct SearchForServers : public Event { };
-
-}
-#endif

include/Engine/Network/HybridClient.h

@@ -0,0 +1,13 @@
+#ifndef HybridClient_h__
+#define HybridClient_h__
+
+class HybridClient
+{
+public:
+    HybridClient();
+    ~HybridClient();
+private:
+
+};
+
+#endif

include/Engine/Network/HybridServer.h

@@ -0,0 +1,12 @@
+#ifndef HybridServer_h__
+#define HybridServer_h__
+
+class HybridServer
+{
+public:
+    HybridServer();
+    ~HybridServer();
+private:
+};
+
+#endif

include/Engine/Network/MessageType.h

@@ -19,8 +19,6 @@ enum class MessageType
     EntityDeleted,
     ComponentDeleted,
     PlayerTransform,
-    OnDoubleJump,
-    ServerlistRequest,
     Invalid
 };
 

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

@@ -17,7 +17,6 @@
 #include "Core/EPlayerDamage.h"
 #include "Network/EPlayerDisconnected.h"
 #include "Core/EPlayerSpawned.h"
-#include "../Game/Events/EDoubleJump.h"
 #include "Core/EEntityDeleted.h"
 #include "Core/EComponentDeleted.h"
 
@@ -33,7 +32,6 @@ private:
     // Network channels
     TCPServer m_Reliable;
     UDPServer m_Unreliable;
-    UDPServer m_ServerlistRequest;
     // dont forget to set these in the childrens receive logic
     boost::asio::ip::address m_Address;
     int m_Port = 27666;
@@ -56,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;
@@ -66,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();
@@ -80,12 +77,10 @@ private:
     void parsePlayerTransform(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
-    void parsePing();
-    bool parseDoubleJump(Packet& packet);
-    void parseUDPConnect(Packet& packet);
-    void parseTCPConnect(Packet& packet);
+    void parsePing();    
+    void parseUDPConnect(Packet & packet);
+    void parseTCPConnect(Packet & packet);
     void parseDisconnect();
-    void parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint);
     bool shouldSendToClient(EntityWrapper childEntity);
 
     // Debug event

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

@@ -16,22 +16,16 @@ public:
     void Send(Packet & packet, PlayerDefinition & playerDefinition);
     void Send(Packet & packet);
     void Disconnect();
-    int Port() { return m_Port; }
-    std::string Address() { return m_Address; }
-
 private:
     // TCP logic
     boost::asio::io_service m_IOService;
     std::unique_ptr<boost::asio::ip::tcp::acceptor> acceptor;
     boost::shared_ptr<boost::asio::ip::tcp::socket> lastReceivedSocket;
 
-    int readBuffer(PlayerDefinition& playerDefinition);
-    PlayerID getPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
-        boost::asio::ip::address address, unsigned short port);
-    int GetPort();
-    std::string GetAddress();
-    int m_Port = 0;
-    std::string m_Address = "";
+    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(char* data, PlayerDefinition& playerDefinition);
 };
 
 #endif

include/Engine/Network/UDPClient.h

@@ -14,14 +14,13 @@ public:
     void Disconnect();
     void Receive(Packet& packet);
     void Send(Packet & packet);
-    void Broadcast(Packet& packet, int port);
     bool IsSocketAvailable();
 private:
     // Assio UDP logic
     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

@@ -8,21 +8,18 @@ class UDPServer : public NetworkServer
 {
 public:
     UDPServer();
-    UDPServer(int port);
     ~UDPServer();
     void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers);
     void Receive(Packet & packet, PlayerDefinition & playerDefinition);
     void Send(Packet & packet, PlayerDefinition & playerDefinition);
-    void Send(Packet & packet); 
-    void Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint);
-    void Broadcast(Packet & packet, int port);
+    void Send(Packet & packet);
     bool IsSocketAvailable();
 private:
     // UDP logic
     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/CubeMapPass.h

@@ -1,27 +0,0 @@
-#ifndef CubeMapPass_h__
-#define CubeMapPass_h__
-
-#include "IRenderer.h"
-#include "ShaderProgram.h"
-
-class CubeMapPass
-{
-public:
-    CubeMapPass(IRenderer* renderer);
-    ~CubeMapPass() { }
-
-    void LoadTextures(std::string input);
-    void FillCubeMap(glm::vec3 originPosition);
-    void GenerateCubeMapTexture();
-
-    //GLuint CubeMapTexture() const { return m_CubeMapTexture; }
-    GLuint m_CubeMapTexture = -1;
-
-private:
-    IRenderer* m_Renderer;
-    std::string m_PreviusCubeMapTexture;
-
-    std::vector<Texture*> m_CubeMapTextures;
-};
-
-#endif 

include/Engine/Rendering/DrawBloomPass.h

@@ -12,7 +12,7 @@
 class DrawBloomPass
 {
 public:
-    DrawBloomPass(IRenderer* renderer, ConfigFile* config);
+    DrawBloomPass(IRenderer* renderer /* ,Texture or finalpass*/ );
     ~DrawBloomPass() { }
     void InitializeTextures();
     void InitializeFrameBuffers();
@@ -23,33 +23,24 @@ public:
     void FillGaussianBuffer(FrameBuffer* fb);
 
     void Draw(GLuint texture);
-	void ChangeQuality(int quality);
-
-    void OnWindowResize();
 
     //Getters
     //Return the blurred result of the texture that was sent into draw
-	GLuint GaussianTexture() const { 
-		if (m_Quality == 0) { 
-			return m_BlackTexture->m_Texture;
-		} else { 
-			return m_GaussianTexture_vert;
-		} 
-	}
+    GLuint GaussianTexture() const { return m_GaussianTexture_vert; }
 
 
 private:
-    Texture* m_BlackTexture;
+    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
+
+    Texture* m_WhiteTexture;
     Model* m_ScreenQuad;
 
     const IRenderer* m_Renderer;
-	ConfigFile* m_Config;
     //const LightCullingPass* m_LightCullingPass 
-    int m_Iterations;
-	int m_Quality = 0;
+    GLuint m_iterations = 9;
 
-    GLuint m_GaussianTexture_horiz = 0;
-    GLuint m_GaussianTexture_vert = 0;
+    GLuint m_GaussianTexture_horiz;
+    GLuint m_GaussianTexture_vert;
 
     FrameBuffer m_GaussianFrameBuffer_horiz;
     FrameBuffer m_GaussianFrameBuffer_vert;

include/Engine/Rendering/DrawFinalPass.h

@@ -4,8 +4,6 @@
 #include "IRenderer.h"
 #include "DrawFinalPassState.h"
 #include "LightCullingPass.h"
-#include "CubeMapPass.h"
-#include "SSAOPass.h"
 #include "FrameBuffer.h"
 #include "ShaderProgram.h"
 #include "Util/UnorderedMapVec2.h"
@@ -15,14 +13,13 @@
 class DrawFinalPass
 {
 public:
-    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass, GLuint* depthBuffer);
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass);
     ~DrawFinalPass() { }
     void InitializeTextures();
     void InitializeFrameBuffers();
     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; }
@@ -34,7 +31,11 @@ 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;
+
     void DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, RenderScene& scene);
     void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
     void DrawShieldToStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
@@ -59,17 +60,14 @@ private:
     GLuint m_SceneTexture;
     GLuint m_BloomTextureLowRes;
     GLuint m_SceneTextureLowRes;
-    GLuint* m_DepthBuffer;
+    GLuint m_DepthBuffer;
     GLuint m_DepthBufferLowRes;
-    GLuint m_CubeMapTexture;
 
     //maqke this component based i guess?
     GLuint m_ShieldPixelRate = 16;
 
     const IRenderer* m_Renderer;
     const LightCullingPass* m_LightCullingPass;
-    const CubeMapPass* m_CubeMapPass;
-	const SSAOPass* m_SSAOPass;
 
     ShaderProgram* m_ForwardPlusProgram;
     ShaderProgram* m_ExplosionEffectProgram;

include/Engine/Rendering/IRenderer.h

@@ -5,13 +5,11 @@
 #include "../OpenGL.h"
 #include "../GLM.h"
 #include "../Core/Util/Rectangle.h"
-#include "../Core/ConfigFile.h"
 #include "Util/ScreenCoords.h"
 #include "Camera.h"
 #include "RenderQueue.h"
 #include "Model.h"
 #include "../Core/World.h" //So temp
-#include "Util/CommonFunctions.h"
 
 
 struct PickData

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;
@@ -184,7 +183,7 @@ struct ModelJob : RenderJob
 
     void CalculateHash() override
     {
-        Hash = ShaderID << 20 + ModelID << 10 + TextureID;
+        Hash = TextureID + ModelID << 10 + ShaderID << 20;
     }
 };
 

include/Engine/Rendering/PickingPass.h

@@ -22,25 +22,25 @@ 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; }
     GLuint PickingTexture() const { return m_PickingTexture; }
-    GLuint* DepthBuffer() { return &m_DepthBuffer; }
+    GLuint DepthBuffer() const { return m_DepthBuffer; }
     const FrameBuffer& PickingBuffer() const { return m_PickingBuffer; }
 
     
     PickData Pick(glm::vec2 screenCoord);
 
 private:
+    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
+
     EventBroker* m_EventBroker;
 
     const IRenderer* m_Renderer;
 
     ShaderProgram* m_PickingProgram;
-    ShaderProgram* m_PickingSkinnedProgram;
+	ShaderProgram* m_PickingSkinnedProgram;
     Camera* m_Camera;
 
     struct PickingInfo

include/Engine/Rendering/RenderState.h

@@ -24,8 +24,6 @@ public:
     bool StencilFunc(GLenum func, GLint ref, GLuint mask);
     bool StencilMask(GLuint mask);
     bool DepthMask(GLboolean flag);
-	bool DepthFunc(GLenum func);
-	bool AlphaFunc(GLenum func, GLclampf thresholder);
 
 private:
     std::vector<std::function<void(void)>> m_ResetFunctions;

include/Engine/Rendering/Renderer.h

@@ -16,8 +16,6 @@
 #include "DrawScreenQuadPass.h"
 #include "DrawBloomPass.h"
 #include "DrawColorCorrectionPass.h"
-#include "SSAOPass.h"
-#include "CubeMapPass.h"
 #include "../Core/EventBroker.h"
 #include "ImGuiRenderPass.h"
 #include "Camera.h"
@@ -25,16 +23,12 @@
 #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, ConfigFile* config)
-		: m_EventBroker(eventBroker)
-		, m_Config(config)
+    Renderer(EventBroker* eventBroker) 
+        : m_EventBroker(eventBroker)
     { }
 
     virtual void Initialize() override;
@@ -43,13 +37,8 @@ public:
 
     virtual PickData Pick(glm::vec2 screenCoord) override;
 
-
 private:
     //----------------------Variables----------------------//
-
-    static std::unordered_map <GLFWwindow*, Renderer*> m_WindowToRenderer;
-	ConfigFile* m_Config;
-
     EventBroker* m_EventBroker;
     TextPass* m_TextPass;
 
@@ -61,10 +50,6 @@ private:
     Model* m_UnitSphere;
 
     int m_DebugTextureToDraw = 0;
-    int m_CubeMapTexture = 0;
-    bool m_ResizeWindow = false;
-	int m_SSAO_Quality = 0;
-	int m_GLOW_Quality = 2;
 
     PickingPass* m_PickingPass;
     LightCullingPass* m_LightCullingPass;
@@ -73,8 +58,6 @@ private:
     DrawScreenQuadPass* m_DrawScreenQuadPass;
     DrawBloomPass* m_DrawBloomPass;
     DrawColorCorrectionPass* m_DrawColorCorrectionPass;
-	SSAOPass* m_SSAOPass;
-    CubeMapPass* m_CubeMapPass;
 
     //----------------------Functions----------------------//
     void InitializeWindow();

include/Engine/Rendering/SSAOPass.h

@@ -1,87 +0,0 @@
-#ifndef SSAOPass_h__
-#define SSAOPass_h__
-
-#include "IRenderer.h"
-#include "SSAOPassState.h"
-//#include "LightCullingPass.h" Finalpass om den skall skickas in
-#include "FrameBuffer.h"
-#include "ShaderProgram.h"
-#include "DrawBloomPass.h"
-//#include "Util/UnorderedMapVec2.h"
-#include "Texture.h"
-
-class SSAOPass
-{
-public:
-	SSAOPass(IRenderer* renderer, ConfigFile* config);
-	~SSAOPass() { };
-
-	void ChangeQuality(int quality);
-
-	void Draw(GLuint depthBuffer, Camera* camera);
-	void Setting(float radius, float bias, float contrast, float intensityScale, int numOfSamples, int numOfTurns, int iterations, int quality);
-	void ClearBuffer();
-	void OnWindowResize();
-
-	//Return the SSAO of the texture sent to Draw
-	GLuint SSAOTexture() const { 
-		if (m_Quality == 0) {
-			return m_WhiteTexture->m_Texture;
-		} else {
-			return m_Gaussian_vert;
-		}
-	}
-
-	int TextureQuality() const {
-		if (m_Quality == 0) {
-			return 13;
-		} else {
-			return m_TextureQuality;
-		}
-	}
-
-private:
-	void InitializeTexture();
-	void InitializeFrameBuffer();
-	void InitializeShaderProgram();
-	void InitializeBuffer();
-
-	//void blurHorizontal(GLuint depthBuffer);
-	//void blurVertical(GLuint depthBuffer);
-
-	Model* m_ScreenQuad;
-
-	const IRenderer* m_Renderer;
-	ConfigFile* m_Config;
-
-	float m_Radius;
-	float m_Bias;
-	float m_Contrast;
-	float m_IntensityScale;
-	int m_NumOfSamples;
-	int m_NumOfTurns;
-	int m_Iterations;
-	int m_TextureQuality;
-	int m_Quality = 0;
-
-	Texture* m_WhiteTexture;
-
-	GLuint m_SSAOTexture = 0;
-	FrameBuffer m_SSAOFramBuffer;
-
-	GLuint m_SSAOViewSpaceZTexture = 0;
-	FrameBuffer m_SSAOViewSpaceZFramBuffer;
-
-	GLuint m_Gaussian_horiz = 0;
-	GLuint m_Gaussian_vert = 0;
-
-	FrameBuffer m_GaussianFrameBuffer_horiz;
-	FrameBuffer m_GaussianFrameBuffer_vert;
-
-	ShaderProgram* m_SSAOProgram;
-	ShaderProgram* m_SSAOViewSpaceZProgram;
-	ShaderProgram* m_GaussianProgram_horiz;
-	ShaderProgram* m_GaussianProgram_vert;
-};
-
-#endif

include/Engine/Rendering/SSAOPassState.h

@@ -1,15 +0,0 @@
-#ifndef SSAOPassState_h__
-#define SSAOPassState_h__
-
-#include "Rendering/RenderState.h"
-
-class SSAOPassState : public RenderState
-{
-public:
-	SSAOPassState();
-	~SSAOPassState();
-private:
-
-};
-
-#endif

include/Engine/Rendering/SpriteJob.h

@@ -17,7 +17,7 @@
 
 struct SpriteJob : RenderJob
 {
-    SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted, bool isIndicator)
+    SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted)
         : RenderJob()
     {
         Model = ResourceManager::Load<::Model>("Models/Core/UnitQuad.mesh");
@@ -30,7 +30,7 @@ struct SpriteJob : RenderJob
 
         StartIndex = matProp.material->StartIndex;
         EndIndex = matProp.material->EndIndex;
-		Matrix = matrix;
+        Matrix = matrix;
         Color = cSprite["Color"];
         Entity = cSprite.EntityID;
         Position = Transform::AbsolutePosition(world, cSprite.EntityID);
@@ -40,8 +40,6 @@ struct SpriteJob : RenderJob
             Depth = viewpos.z;
         }
         World = world;
-        Pickable = world->HasComponent(cSprite.EntityID, "Button");
-		IsIndicator = isIndicator;
 
         FillColor = fillColor;
         FillPercentage = fillPercentage;
@@ -63,9 +61,6 @@ struct SpriteJob : RenderJob
     unsigned int EndIndex = 0;
     World* World;
 
-    bool Pickable;
-	bool IsIndicator = false;
-
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;
 

include/Engine/Rendering/Texture.h

@@ -18,7 +18,6 @@ public:
 	void Bind(GLenum textureUnit = GL_TEXTURE0);
 
 	GLuint m_Texture = 0;
-    unsigned char* Data = nullptr;
     
 };
 

include/Engine/Rendering/Util/CommonFunctions.h

@@ -9,10 +9,6 @@
 namespace CommonFunctions
 { 
 Texture* LoadTexture(std::string path, bool threaded);
-void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
-void GenerateMultiSampleTexture(GLuint* texture, int numSamples, glm::vec2 dimensions, GLint internalFormat);
-void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps);
-void DeleteTexture(GLuint* texture);
 };
 
 #endif

include/Game/Events/EDoubleJump.h

@@ -8,7 +8,7 @@ namespace Events
 
 struct DoubleJump : public Event
 {
-    EntityID entityID;
+
 };
 
 }

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/AmmoPickupSystem.h

@@ -26,7 +26,6 @@ private:
         double AmmoGain;
         double RespawnTimer;
         double DecreaseThisRespawnTimer;
-        EntityID parentID;
     };
     std::vector<NewAmmoPickup> m_ETriggerTouchVector;
 };

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/DamageIndicatorSystem.h

@@ -14,13 +14,11 @@
 #include <glm/gtx/vector_angle.hpp>
 
 #include "Rendering/Util/CommonFunctions.h"
-//#define INDICATOR_TEST
 
-class DamageIndicatorSystem : public ImpureSystem
+class DamageIndicatorSystem : public System
 {
 public:
     DamageIndicatorSystem(SystemParams params);
-    virtual void Update(double dt) override;
 
 private:
     EventRelay<DamageIndicatorSystem, Events::PlayerDamage> m_EPlayerDamage;
@@ -30,20 +28,6 @@ private:
     bool OnSetCamera(const Events::SetCamera& e);
 
     EntityID m_CurrentCamera = -1;
-    struct DamageIndicatorStruct {
-        EntityWrapper spriteEntity;
-        glm::vec3 enemyPosition;
-        DamageIndicatorStruct(EntityWrapper sprite, glm::vec3 pos)
-            : spriteEntity(sprite)
-            , enemyPosition(pos) {}
-    };
-    std::vector<DamageIndicatorStruct> updateDamageIndicatorVector;
-    float CalculateAngle(EntityWrapper player, glm::vec3 enemyPos);
 
-    //for tests
-#ifdef INDICATOR_TEST
-    glm::vec3 DamageIndicatorTest(EntityWrapper player);
-    int m_TestVar = 0;
-#endif
 };
 #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/PickupSpawnSystem.h

@@ -27,7 +27,6 @@ private:
         double HealthGain;
         double RespawnTimer;
         double DecreaseThisRespawnTimer;
-        EntityID parentID;
     };
     std::vector<NewHealthPickup> m_ETriggerTouchVector;
 };

include/Game/Systems/PlayerMovementSystem.h

@@ -34,14 +34,10 @@ private:
     glm::vec3 m_LastPosition = glm::vec3();
     // The logic for making the sound play when player is moving
     void playerStep(double dt);
-    // Spawn a hexagon at origin of an Entity
-    void spawnHexagon(EntityWrapper target);
 
     EventRelay<PlayerMovementSystem, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
-    EventRelay<PlayerMovementSystem, Events::DoubleJump> m_EDoubleJump;
-    bool PlayerMovementSystem::OnDoubleJump(Events::DoubleJump & e);
 
     void updateMovementControllers(double dt);
-    void updateVelocity(EntityWrapper player, double dt);
+    void updateVelocity(double dt);
 };

include/Game/Systems/PlayerSpawnSystem.h

@@ -13,6 +13,8 @@ public:
     PlayerSpawnSystem(SystemParams params);
 
     virtual void Update(double dt) override;
+    
+    static void SetRespawnTime(float respawnTime) { m_RespawnTime = respawnTime; };
 
 private:
     struct SpawnRequest
@@ -29,8 +31,8 @@ private:
     //EntityWrapper ID -> Player ID.
     std::map<EntityID, int> m_PlayerIDs;
 
-    float m_ForcedRespawnTime;
-    bool m_DbgConfigForceRespawn;
+    static float m_RespawnTime;
+    float m_Timer;
 
     EventRelay<PlayerSpawnSystem, Events::InputCommand> m_OnInputCommand;
     bool OnInputCommand(Events::InputCommand& e);

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

include/Game/Systems/Weapon/AssaultWeaponBehaviour.h

@@ -1,33 +1,37 @@
-#ifndef AssaultWeaponBehaviour_h__
-#define AssaultWeaponBehaviour_h__
-
 #include "Sound/EPlaySoundOnEntity.h"
 #include "Collision/Collision.h"
+#include "Rendering/AnimationSystem.h"
 #include "Core/ConfigFile.h"
 #include "WeaponBehaviour.h"
 #include "../SpawnerSystem.h"
 #include "Core/EPlayerDamage.h"
 #include "Core/EShoot.h"
 
-class AssaultWeaponBehaviour : public WeaponBehaviour<AssaultWeaponBehaviour>
+
+class AssaultWeaponBehaviour : public WeaponBehaviour
 {
 public:
-    AssaultWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree)
-        : WeaponBehaviour(systemParams, "AssaultWeapon", renderer, collisionOctree) 
-    { }
+    AssaultWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper weaponEntity);
+    
+    virtual void Fire() override;
+    virtual void CeaseFire() override;
+    virtual void Reload() override;
 
-protected:
-    virtual void OnPrimaryFire(WeaponInfo& wi) override;
-    virtual void OnCeasePrimaryFire(WeaponInfo& wi) override;
-    virtual void OnReload(WeaponInfo& wi) override;
+    virtual void Update(double dt) override;
 
 private:
+    EntityWrapper m_FirstPersonModel;
+    EntityWrapper m_ThirdPersonModel;
     // State
     bool m_Firing = false;
     bool m_Reloading = false;
     double m_ReloadTimer = 0.0;
+    EntityWrapper m_FirstPersonReloadImpersonator;
+    EntityWrapper m_ThirdPersonReloadImpersonator;
     double m_TimeSinceLastFire = 0.0;
-    EntityWrapper m_FirstPersonReloadImpostor;
+
+    EventRelay<WeaponBehaviour, Events::AnimationComplete> m_EAnimationComplete;
+    bool OnAnimationComplete(Events::AnimationComplete& e);
 
     bool hasAmmo();
     void fireRound();
@@ -43,5 +47,3 @@ private:
     bool shoot(double damage);
     void showHitMarker();
 };
-
-#endif

include/Game/Systems/Weapon/DefenderWeaponBehaviour.h

@@ -1,38 +0,0 @@
-#include "WeaponBehaviour.h"
-#include "Collision/Collision.h"
-#include "Core/EPlayerDamage.h"
-#include "Rendering/ESetCamera.h"
-
-class DefenderWeaponBehaviour : public WeaponBehaviour<DefenderWeaponBehaviour>
-{
-public:
-    DefenderWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree)
-        : System(systemParams)
-        , WeaponBehaviour(systemParams, "DefenderWeapon", renderer, collisionOctree)
-        , m_RandomEngine(m_RandomDevice())
-    {
-        EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &DefenderWeaponBehaviour::OnSetCamera);
-    }
-
-    void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override;
-    void UpdateWeapon(WeaponInfo& wi, double dt) override;
-    void OnPrimaryFire(WeaponInfo& wi) override;
-    void OnCeasePrimaryFire(WeaponInfo& wi) override;
-    bool OnInputCommand(WeaponInfo& wi, const Events::InputCommand& e) override;
-
-private:
-    std::random_device m_RandomDevice;
-    std::mt19937 m_RandomEngine;
-    EntityWrapper m_CurrentCamera;
-
-    EventRelay<DefenderWeaponBehaviour, Events::SetCamera> m_ESetCamera;
-    bool OnSetCamera(const Events::SetCamera& e);
-
-    // Weapon functions
-    void fireShell(WeaponInfo& wi);
-    void dealDamage(WeaponInfo& wi, glm::vec3 direction, double damage);
-
-    // Utility
-    float traceRayDistance(glm::vec3 origin, glm::vec3 direction);
-    Camera cameraFromEntity(EntityWrapper camera);
-};

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -5,177 +5,30 @@
 #include "Rendering/IRenderer.h"
 #include "Core/Octree.h"
 #include "Collision/EntityAABB.h"
-#include "Input/EInputCommand.h"
-#include "Systems/SpawnerSystem.h"
 
-template <typename ETYPE>
-class WeaponBehaviour : public PureSystem
+class WeaponBehaviour : public System
 {
-    friend class WeaponSystem;
-
 public:
-    WeaponBehaviour(SystemParams params, std::string componentType, IRenderer* renderer, Octree<EntityAABB>* collisionOctree)
-        : System(params)
-        , PureSystem(componentType)
+    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player)
+        : System(systemParams)
         , m_Renderer(renderer)
         , m_CollisionOctree(collisionOctree)
-    {
-        EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &WeaponBehaviour::_OnInputCommand)
-    }
+        , m_Player(player)
+    { }
     virtual ~WeaponBehaviour() = default;
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override
-    {
-        auto weapon = getActiveWeapon(entity);
-        if (!weapon) {
-            return;
-        } else {
-            UpdateWeapon(*weapon, dt);
-        }
-    }
+    WeaponBehaviour(const WeaponBehaviour&) = delete;
+    WeaponBehaviour& operator=(const WeaponBehaviour &) = delete;
+
+    virtual void Fire() = 0;
+    virtual void CeaseFire() { }
+    virtual void Reload() { }
+    virtual void Update(double dt) { }
 
 protected:
-    struct WeaponInfo
-    {
-        std::string WeaponComponent;
-        EntityWrapper Player;
-        EntityWrapper WeaponEntity;
-        EntityWrapper FirstPersonEntity;
-        EntityWrapper ThirdPersonEntity;
-        ComponentWrapper GetComponent() { return WeaponEntity[WeaponComponent]; }
-    };
-
     IRenderer* m_Renderer;
     Octree<EntityAABB>* m_CollisionOctree;
-    std::unordered_map<EntityWrapper, WeaponInfo> m_ActiveWeapons;
-
-    virtual void UpdateWeapon(WeaponInfo& wi, double dt) { }
-    virtual void OnPrimaryFire(WeaponInfo& wi) { }
-    virtual void OnCeasePrimaryFire(WeaponInfo& wi) { }
-    virtual void OnReload(WeaponInfo& wi) { }
-    virtual bool OnInputCommand(WeaponInfo& wi, const Events::InputCommand& e) { return false; }
-
-private:
-    EventRelay<ETYPE, Events::InputCommand> m_EInputCommand;
-    bool _OnInputCommand(const Events::InputCommand& e)
-    {
-        EntityWrapper player = e.Player;
-        if (e.PlayerID == -1) {
-            player = LocalPlayer;
-        }
-
-        // Make sure the player is alive
-        if (!player.Valid()) {
-            return false;
-        }
-
-        // Make sure the player has this weapon
-        auto weapon = getWeaponComponent(player);
-        if (!weapon) {
-            return false;
-        }
-
-        // Weapon selection
-        if (e.Command == "SelectWeapon") {
-            if (static_cast<ComponentInfo::EnumType>(e.Value) == static_cast<ComponentInfo::EnumType>((*weapon)["Slot"])) {
-                selectWeapon(player);
-            }
-        }
-
-        // Only handle weapon actions if the weapon is active
-        auto activeWeapon = getActiveWeapon(player);
-        if (!activeWeapon) {
-            return false;
-        }
-
-        // Fire
-        if (e.Command == "PrimaryFire") {
-            if (e.Value > 0) {
-                OnPrimaryFire(*activeWeapon);
-            } else {
-                OnCeasePrimaryFire(*activeWeapon);
-            }
-        }
-
-        // Reload
-        if (e.Command == "Reload" && e.Value != 0) {
-            OnReload(*activeWeapon);
-        }
-
-        return OnInputCommand(*activeWeapon, e);
-    }
-
-    boost::optional<ComponentWrapper> getWeaponComponent(EntityWrapper player)
-    {
-        if (!player.HasComponent(m_ComponentType)) {
-            return boost::none;
-        }
-
-        return player[m_ComponentType];
-    }
-
-    boost::optional<WeaponInfo&> getActiveWeapon(EntityWrapper player)
-    {
-        auto it = m_ActiveWeapons.find(player);
-        if (it == m_ActiveWeapons.end()) {
-            return boost::none;
-        }
-        WeaponInfo& activeWeapon = it->second;
-
-        if (!activeWeapon.FirstPersonEntity.Valid() && !activeWeapon.ThirdPersonEntity.Valid()) {
-            return boost::none;
-        }
-
-        return activeWeapon;
-    }
-
-    void selectWeapon(EntityWrapper player)
-    {
-        // Find the weapon attachments matching the weapon type
-        std::vector<EntityWrapper> weaponAttachments = player.ChildrenWithComponent("WeaponAttachment");
-        EntityWrapper firstPersonAttachment;
-        EntityWrapper thirdPersonAttachment;
-        for (auto& attachment : weaponAttachments) {
-            ComponentWrapper cWeaponAttachment = attachment["WeaponAttachment"];
-            if ((std::string&)cWeaponAttachment["Weapon"] == m_ComponentType) {
-                ComponentWrapper::SubscriptProxy person = cWeaponAttachment["Person"];
-                if ((ComponentInfo::EnumType)person == person.Enum("FirstPerson")) {
-                    firstPersonAttachment = attachment;
-                } else if ((ComponentInfo::EnumType)person == person.Enum("ThirdPerson")) {
-                    thirdPersonAttachment = attachment;
-                }
-            }
-        }
-
-        if (!firstPersonAttachment.Valid() && !thirdPersonAttachment.Valid()) {
-            LOG_WARNING("No weapon attachment found for %s of player #%i", m_ComponentType.c_str(), player.ID);
-            return;
-        }
-
-        // Purge other weapon entities
-        for (auto& attachment : weaponAttachments) {
-            //if (attachment == firstPersonAttachment || attachment == thirdPersonAttachment) {
-            //    continue;
-            //}
-            attachment.DeleteChildren();
-        }
-
-        // Spawn the weapon(s)
-        EntityWrapper firstPersonWeapon;
-        EntityWrapper thirdPersonWeapon;
-        if (firstPersonAttachment.Valid()) {
-            firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
-        }
-        if (thirdPersonAttachment.Valid()) {
-            thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
-        }
-
-        m_ActiveWeapons[player].WeaponComponent = m_ComponentType;
-        m_ActiveWeapons[player].Player = player;
-        m_ActiveWeapons[player].WeaponEntity = player;
-        m_ActiveWeapons[player].FirstPersonEntity = firstPersonWeapon;
-        m_ActiveWeapons[player].ThirdPersonEntity = thirdPersonWeapon;
-    }
+    EntityWrapper m_Player;
 };
 
 #endif

resources/DefaultConfig.ini

@@ -36,37 +36,4 @@ ResourceLoading=true
 [Sound]
 BGMVolume=1.0
 SFXVolume=1.0
-Announcer=female
-
-[SSAO]
-Quality=0
-
-[SSAO1]
-Radius=1.0
-Bias=0.02
-Contrast=1.5
-Intensity=1.0
-NumSamples=8
-NumTurns=3
-NumIterations=5
-TextureQuality=2
-
-[SSAO2]
-Radius=1.0
-Bias=0.02
-Contrast=1.5
-Intensity=1.0
-NumSamples=16
-NumTurns=13
-NumIterations=9
-TextureQuality=1
-
-[SSAO3]
-Radius=1.0
-Bias=0.02
-Contrast=1.5
-Intensity=1.0
-NumSamples=24
-NumTurns=17
-NumIterations=13
-TextureQuality=0
+Announcer=female

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,19 +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/SpriteIndicator.xsd"/>
-	<xs:include schemaLocation="Components/Button.xsd"/>
-	<xs:include schemaLocation="Components/DoubleJump.xsd"/>
-	<xs:include schemaLocation="Components/WeaponAttachment.xsd"/>
-	<xs:include schemaLocation="Components/DefenderWeapon.xsd"/>
-	<xs:include schemaLocation="Components/CapturePointGameMode.xsd"/>
 </xs:schema>

resources/Schema/Components/AssaultWeapon.xml

@@ -8,5 +8,4 @@
 	<RPM>120</RPM>
 	<ViewPunch>0.01</ViewPunch>
 	<ReloadTime>2</ReloadTime>
-	<Slot><Primary/></Slot>
 </AssaultWeapon>

resources/Schema/Components/AssaultWeapon.xsd

@@ -2,7 +2,6 @@
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-	<xs:include schemaLocation="../Types/WeaponSlotEnum.xsd"/>
 
 	<xs:element name="AssaultWeapon">
 		<xs:complexType>
@@ -29,7 +28,6 @@
 				<xs:element name="ReloadTime" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>Time it takes to reload the weapon in seconds</xs:documentation></xs:annotation>
 				</xs:element>
-				<xs:element name="Slot" type="WeaponSlotEnum" minOccurs="0"/>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

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/CapturePointGameMode.xml

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

resources/Schema/Components/CapturePointGameMode.xsd

@@ -1,18 +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="CapturePointGameMode">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="RespawnTime" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>The time since the last respawn wave. Players will be spawned when this reaches MaxRespawnTime.</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="MaxRespawnTime" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>Players will be spawned when RespawnTime reaches this.</xs:documentation></xs:annotation>
-				</xs:element>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/DashAbility.xml

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

resources/Schema/Components/DashAbility.xsd

@@ -10,10 +10,7 @@
 		<xs:complexType>
 			<xs:all>
 				<xs:element name="CoolDownMaxTimer" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>This is the max cooldown on dash</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="CoolDownTimer" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>This is the current cooldown on dash</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>This is the cooldown on dash</xs:documentation></xs:annotation>
 				</xs:element>
 			</xs:all>
 		</xs:complexType>

resources/Schema/Components/DefenderWeapon.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<DefenderWeapon xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DefenderWeapon.xsd">
-	<MagazineAmmo>8</MagazineAmmo>
-	<MagazineSize>8</MagazineSize>
-	<Ammo>64</Ammo>
-	<MaxAmmo>64</MaxAmmo>
-	<BaseDamage>90</BaseDamage>
-	<SpreadAngle>0.174533</SpreadAngle> <!-- 0.174533 = 10 degrees -->
-	<NumPellets>10</NumPellets>
-	<RPM>120</RPM>
-	<ViewPunch>0.01</ViewPunch>
-	<ReloadTime>0.5</ReloadTime>
-	<Slot><Primary/></Slot>
-	<IsFiring>false</IsFiring>
-	<TimeSinceLastFire>0</TimeSinceLastFire>
-</DefenderWeapon>

resources/Schema/Components/DefenderWeapon.xsd

@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-	<xs:include schemaLocation="../Types/WeaponSlotEnum.xsd"/>
-
-	<xs:element name="DefenderWeapon">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="MagazineAmmo" type="t:int" minOccurs="0">
-					<xs:annotation><xs:documentation>Ammo currently loaded into the magazine</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="MagazineSize" type="t:int" minOccurs="0">
-									<xs:annotation><xs:documentation>Max number of rounds in a magazine</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="Ammo" type="t:int" minOccurs="0">
-									<xs:annotation><xs:documentation>Current ammo carried</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="MaxAmmo" type="t:int" minOccurs="0">
-									<xs:annotation><xs:documentation>Maximum ammo able to be carried</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="BaseDamage" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>Damage dealt if all shotgun pellets hit</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="SpreadAngle" type="t:float" minOccurs="0">
-					<xs:annotation><xs:documentation>Spread angle in radians</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="NumPellets" type="t:int" minOccurs="0"/>
-				<xs:element name="RPM" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>Rate of fire in rounds per minute</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="ViewPunch" type="t:float" minOccurs="0">
-					<xs:annotation><xs:documentation>View punch in radians for each shell fired</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="ReloadTime" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>Time it takes to load ONE SHELL into the weapon in seconds</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="Slot" type="WeaponSlotEnum" minOccurs="0"/>
-				<xs:element name="IsFiring" type="t:bool" minOccurs="0"/>
-				<xs:element name="TimeSinceLastFire" type="t:double" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/DoubleJump.xml

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

resources/Schema/Components/DoubleJump.xsd

@@ -1,16 +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="DoubleJump">
-		<xs:annotation><xs:documentation>Enables a Player to double jump.</xs:documentation></xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="DoubleJumpSpeed" type="t:float" minOccurs="0">
-					<xs:annotation><xs:documentation>Vertical velocity set on double jump.</xs:documentation></xs:annotation>
-				</xs:element>
-			</xs:all>
-		</xs:complexType>
-	</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/Player.xml

@@ -2,7 +2,5 @@
 <Player xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Player.xsd">
 	<MovementSpeed>3</MovementSpeed>
 	<CrouchSpeed>1.5</CrouchSpeed>
-	<JumpSpeed>4.0</JumpSpeed>
 	<CurrentWishDirection X="0" Y="0" Z="0"/>
-	<CurrentWeapon></CurrentWeapon>
 </Player>

resources/Schema/Components/Player.xsd

@@ -11,11 +11,7 @@
 			<xs:all>
 				<xs:element name="MovementSpeed" type="t:float" minOccurs="0"/>
 				<xs:element name="CrouchSpeed" type="t:float" minOccurs="0"/>
-				<xs:element name="JumpSpeed" type="t:float" minOccurs="0">
-					<xs:annotation><xs:documentation>Vertical velocity set when jumping.</xs:documentation></xs:annotation>
-				</xs:element>
 				<xs:element name="CurrentWishDirection" type="t:Vector" minOccurs="0"/>
-				<xs:element name="CurrentWeapon" type="t:string" minOccurs="0"/>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

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>