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

# Conflicts:
#	src/Engine/Rendering/Renderer.cpp

include/Engine/Collision/Collision.h

@@ -78,13 +78,21 @@ 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
+// 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.
 boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity, bool takeModelBox = false);
 boost::optional<EntityAABB> AbsoluteAABBExplosionEffect(EntityWrapper& entity);
 //Returns the first entity hit by the input ray. entitiesPotentiallyHitSorted needs to be sorted 

include/Engine/Collision/CollisionSystem.h

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

include/Engine/Core/ComponentInfo.h

@@ -2,6 +2,7 @@
 #define ComponentInfo_h__
 
 #include "../Common.h"
+#include <boost/shared_array.hpp>
 
 struct ComponentInfo
 {
@@ -27,8 +28,9 @@ 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;
-    std::shared_ptr<char> Defaults = nullptr;
+    boost::shared_array<char> Defaults = nullptr;
 	std::shared_ptr<Meta_t> Meta = nullptr;
 };
 

include/Engine/Core/ComponentPool.h

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

include/Engine/Core/ComponentWrapper.h

@@ -2,11 +2,29 @@
 #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)
@@ -47,7 +65,31 @@ struct ComponentWrapper
 
     void Copy(ComponentWrapper& destination)
     {
-        memcpy(destination.Data, this->Data, Info.Stride);
+        // 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();
+        }
     }
     
     struct SubscriptProxy
@@ -102,26 +144,38 @@ 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)
     {
-        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);
+        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_ComponentInfo.Stride += sizeof(T);
+        m_DefaultValues.push_back(std::make_pair(field, defaultValue));
     }
-    
+
     ComponentInfo& Finalize()
     {
-        m_ComponentInfo.Defaults = std::shared_ptr<char>(new char[m_ComponentInfo.Stride]);
+        m_ComponentInfo.Defaults = boost::shared_array<char>(new char[m_ComponentInfo.Stride]);
         std::size_t offset = 0;
-        for (auto& val : m_DefaultValues) {
-            memcpy(m_ComponentInfo.Defaults.get() + offset, val.Data.get(), val.Size);
-            offset += val.Size;
+        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;
         }
 
         return m_ComponentInfo;
@@ -131,7 +185,7 @@ public:
 
 private:
     ComponentInfo m_ComponentInfo;
-    std::vector<Any> m_DefaultValues;
+    std::vector<std::pair<ComponentInfo::Field_t, Any>> m_DefaultValues;
 };
 
 #endif

include/Engine/Core/MemoryPool.h

@@ -66,9 +66,25 @@ public:
 		, m_LowestAllocatedSlot(m_NumSlots)
 	{ }
 
-	//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)
+		: 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);
+        }
+    }
 	MemoryPool(const MemoryPool<T>&& other) = delete;
 
 	//Free all memory that has been allocated.
@@ -78,8 +94,9 @@ 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

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

include/Engine/Core/SystemPipeline.h

@@ -6,6 +6,7 @@
 #include "System.h"
 #include "World.h"
 #include "EPause.h"
+#include "PerformanceTimer.h"
 
 class SystemPipeline
 {
@@ -72,7 +73,10 @@ 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;
@@ -83,7 +87,10 @@ 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);
                     }
                 }
             }
@@ -106,9 +113,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,6 +2,7 @@
 #define Util_Any_h__
 
 #include <memory>
+#include <boost/shared_array.hpp>
 
 struct Any
 {
@@ -10,7 +11,7 @@ struct Any
     template <typename T>
     Any(const T& value)
     {
-        Data = std::shared_ptr<char>(new char[sizeof(T)]);
+        Data = boost::shared_array<char>(new char[sizeof(T)]);
         Size = sizeof(T);
         memcpy(Data.get(), &value, Size);
     }
@@ -18,7 +19,7 @@ struct Any
     template <typename T>
     Any(T&& value)
     {
-        Data = std::shared_ptr<char>(new char[sizeof(T)]);
+        Data = boost::shared_array<char>(new char[sizeof(T)]);
         Size = sizeof(T);
         memcpy(Data.get(), &value, Size);
     }
@@ -35,7 +36,7 @@ struct Any
         return Any(value);
     }
 
-    std::shared_ptr<char> Data = nullptr;
+    boost::shared_array<char> Data = nullptr;
     std::size_t Size = 0;
 };
 

include/Engine/Core/World.h

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

include/Engine/GUI/Button.h

@@ -1,165 +0,0 @@
-#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

@@ -0,0 +1,44 @@
+#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

@@ -0,0 +1,16 @@
+#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

@@ -1,17 +0,0 @@
-#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

@@ -1,17 +0,0 @@
-#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

@@ -1,20 +0,0 @@
-#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

@@ -0,0 +1,16 @@
+#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

@@ -1,20 +0,0 @@
-#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

@@ -0,0 +1,16 @@
+#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

@@ -1,261 +0,0 @@
-#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

@@ -0,0 +1,33 @@
+#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

@@ -1,112 +0,0 @@
-#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/Network/Client.h

@@ -24,6 +24,19 @@
 #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
 {
@@ -82,18 +95,22 @@ public:
     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 InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
+    void UpdateLocalCapturePointHUD(EntityWrapper capturePointHUD);
     void identifyPacketLoss();
     void hasServerTimedOut();
     EntityID createPlayer();
     void sendInputCommands();
     void sendLocalPlayerTransform();
     void becomePlayer();
+    void displayServerlist();
     // Mapping Logic
     // Returns if local EntityID exist in map
     bool clientServerMapsHasEntity(EntityID clientEntityID);
@@ -109,10 +126,16 @@ public:
     bool OnPlayerDamage(const Events::PlayerDamage& e);
     EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(const Events::PlayerSpawned& e);
-    void parsePlayerDamage(Packet& packet);
+    EventRelay< Client, Events::SearchForServers> m_ESearchForServers;
+    bool OnSearchForServers(const Events::SearchForServers& e);
 private:
     UDPClient m_Unreliable;
+    UDPClient m_ServerlistRequest;
     TCPClient m_Reliable;
+    std::vector<ServerInfo> m_Serverlist;
+    bool m_SearchingForServers = false;
+    std::clock_t m_StartSearchTime;
+    double m_SearchingTime = 2000; // Config I guess
 };
 
 #endif

include/Engine/Network/ESearchForServers.h

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

include/Engine/Network/HybridClient.h

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

include/Engine/Network/HybridServer.h

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

include/Engine/Network/MessageType.h

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

include/Engine/Network/NetworkClient.h

@@ -9,13 +9,16 @@ 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[BUFFERSIZE] = { 0 };
+    char* m_ReadBuffer;
+    unsigned int m_BufferSize = BUFFERSIZE;
 };
 
 #endif

include/Engine/Network/NetworkServer.h

@@ -10,12 +10,15 @@ 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[BUFFERSIZE] = { 0 };
+    char* m_ReadBuffer;
+    unsigned int m_BufferSize = BUFFERSIZE;
 };
 
 #endif

include/Engine/Network/Server.h

@@ -8,6 +8,7 @@
 
 #include "Network/TCPServer.h"
 #include "Network/UDPServer.h"
+#include "Network/UDPClient.h" //LOL
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Core/World.h"
@@ -32,6 +33,7 @@ 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;
@@ -54,7 +56,7 @@ private:
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
     std::clock_t m_StartPingTime;
-    
+
     // Packet loss logic
     PacketID m_PacketID = 0;
     PacketID m_PreviousPacketID = 0;
@@ -64,6 +66,7 @@ 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();
@@ -77,10 +80,11 @@ private:
     void parsePlayerTransform(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
-    void parsePing();    
+    void parsePing();
     void parseUDPConnect(Packet & packet);
     void parseTCPConnect(Packet & packet);
     void parseDisconnect();
+    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(char* data);
+    size_t readBuffer();
     PacketID m_SendPacketID = 0;
     bool m_IsConnected = false;
 };

include/Engine/Network/TCPServer.h

@@ -16,6 +16,9 @@ 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;
@@ -25,7 +28,11 @@ private:
     void handle_accept(boost::shared_ptr<boost::asio::ip::tcp::socket> socket,
         int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
         const boost::system::error_code& error);
-    int readBuffer(char* data, PlayerDefinition& playerDefinition);
+    int readBuffer(PlayerDefinition& playerDefinition);
+    int GetPort();
+    std::string GetAddress();
+    int m_Port = 0;
+    std::string m_Address = "";
 };
 
 #endif

include/Engine/Network/UDPClient.h

@@ -14,13 +14,14 @@ 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(char* data);
+    int readBuffer();
     PacketID m_SendPacketID = 0;
 };
 

include/Engine/Network/UDPServer.h

@@ -8,18 +8,21 @@ 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); 
+    void Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint);
+    void Broadcast(Packet & packet, int port);
     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(char* data);
+    int readBuffer();
 };
 
 #endif

include/Engine/Rendering/CubeMapPass.h

@@ -0,0 +1,27 @@
+#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

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

include/Engine/Rendering/DrawFinalPass.h

@@ -4,6 +4,7 @@
 #include "IRenderer.h"
 #include "DrawFinalPassState.h"
 #include "LightCullingPass.h"
+#include "CubeMapPass.h"
 #include "FrameBuffer.h"
 #include "ShaderProgram.h"
 #include "Util/UnorderedMapVec2.h"
@@ -13,13 +14,14 @@
 class DrawFinalPass
 {
 public:
-    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass);
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass);
     ~DrawFinalPass() { }
     void InitializeTextures();
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
-    void Draw(RenderScene& scene);
+    void Draw(RenderScene& scene, GLuint SSAOTexture);
     void ClearBuffer();
+    void OnWindowResize();
 
     //Return the texture that is used in later stages to apply the bloom effect
     GLuint BloomTexture() const { return m_BloomTexture; }
@@ -31,13 +33,12 @@ 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 DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene, GLuint SSAOTexture);
     void DrawShieldToStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
     void DrawShieldedModelRenderQueue(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
     void DrawToDepthBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
@@ -62,12 +63,14 @@ private:
     GLuint m_SceneTextureLowRes;
     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;
 
     ShaderProgram* m_ForwardPlusProgram;
     ShaderProgram* m_ExplosionEffectProgram;

include/Engine/Rendering/LightCullingPass.h

@@ -21,6 +21,7 @@ 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,6 +108,7 @@ 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));
@@ -170,7 +171,7 @@ struct ModelJob : RenderJob
     ::Skeleton::AnimationOffset AnimationOffset;
     
 
-
+    float GlowIntensity = 8.0;
     glm::vec4 DiffuseColor;
     glm::vec4 SpecularColor;
     glm::vec4 IncandescenceColor;
@@ -183,7 +184,7 @@ struct ModelJob : RenderJob
 
     void CalculateHash() override
     {
-        Hash = TextureID + ModelID << 10 + ShaderID << 20;
+        Hash = ShaderID << 20 + ModelID << 10 + TextureID;
     }
 };
 

include/Engine/Rendering/PickingPass.h

@@ -22,6 +22,8 @@ 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; }
@@ -40,7 +42,7 @@ private:
     const IRenderer* m_Renderer;
 
     ShaderProgram* m_PickingProgram;
-	ShaderProgram* m_PickingSkinnedProgram;
+    ShaderProgram* m_PickingSkinnedProgram;
     Camera* m_Camera;
 
     struct PickingInfo

include/Engine/Rendering/Renderer.h

@@ -16,6 +16,8 @@
 #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"
@@ -23,9 +25,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) 
         : m_EventBroker(eventBroker)
@@ -37,8 +42,12 @@ public:
 
     virtual PickData Pick(glm::vec2 screenCoord) override;
 
+
 private:
     //----------------------Variables----------------------//
+
+    static std::unordered_map <GLFWwindow*, Renderer*> m_WindowToRenderer;
+
     EventBroker* m_EventBroker;
     TextPass* m_TextPass;
 
@@ -50,6 +59,14 @@ private:
     Model* m_UnitSphere;
 
     int m_DebugTextureToDraw = 0;
+    int m_CubeMapTexture = 0;
+    bool m_ResizeWindow = false;
+	float m_SSAO_Radius = 1.0f;
+	float m_SSAO_Bias = 0.05f;
+	float m_SSAO_Contrast = 1.5f;
+	float m_SSAO_IntensityScale = 1.0f;
+	int m_SSAO_NumOfSamples = 24;
+	int m_SSAO_NumOfTurns = 7;
 
     PickingPass* m_PickingPass;
     LightCullingPass* m_LightCullingPass;
@@ -58,6 +75,8 @@ private:
     DrawScreenQuadPass* m_DrawScreenQuadPass;
     DrawBloomPass* m_DrawBloomPass;
     DrawColorCorrectionPass* m_DrawColorCorrectionPass;
+	SSAOPass* m_SSAOPass;
+    CubeMapPass* m_CubeMapPass;
 
     //----------------------Functions----------------------//
     void InitializeWindow();

include/Engine/Rendering/SSAOPass.h

@@ -0,0 +1,63 @@
+#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* rendere);
+	~SSAOPass() { 
+		delete m_DrawBloomPass;
+	};
+
+	void Draw(GLuint depthBuffer, Camera* camera);
+	void Setting(float radius, float bias, float contrast, float intensityScale, int numOfSamples, int NumOfTurns);
+	void ClearBuffer();
+	void OnWindowResize();
+
+	//Return the SSAO of the texture sent to Draw
+	GLuint SSAOTexture() const { return m_DrawBloomPass->GaussianTexture(); }
+
+private:
+	void InitializeTexture();
+	void InitializeFrameBuffer();
+	void InitializeShaderProgram();
+	void InitializeBuffer();
+
+	void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
+
+	//void blurHorizontal(GLuint depthBuffer);
+	//void blurVertical(GLuint depthBuffer);
+
+	Model* m_ScreenQuad;
+
+	const IRenderer* m_Renderer;
+
+	float m_Radius;
+	float m_Bias;
+	float m_Contrast;
+	float m_IntensityScale;
+	int m_NumOfSamples;
+	int m_NumOfTurns;
+
+	GLuint m_SSAOTexture;
+	FrameBuffer m_SSAOFramBuffer;
+
+	GLuint m_SSAOViewSpaceZTexture;
+	FrameBuffer m_SSAOViewSpaceZFramBuffer;
+
+	ShaderProgram* m_SSAOProgram;
+	ShaderProgram* m_SSAOViewSpaceZProgram;
+
+	DrawBloomPass* m_DrawBloomPass;
+};
+
+#endif

include/Engine/Rendering/SSAOPassState.h

@@ -0,0 +1,15 @@
+#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)
+    SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted, bool isIndicator)
         : 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,6 +40,8 @@ struct SpriteJob : RenderJob
             Depth = viewpos.z;
         }
         World = world;
+        Pickable = world->HasComponent(cSprite.EntityID, "Button");
+		IsIndicator = isIndicator;
 
         FillColor = fillColor;
         FillPercentage = fillPercentage;
@@ -61,6 +63,9 @@ 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,6 +18,7 @@ public:
 	void Bind(GLenum textureUnit = GL_TEXTURE0);
 
 	GLuint m_Texture = 0;
+    unsigned char* Data = nullptr;
     
 };
 

include/Game/Game.h

@@ -8,7 +8,6 @@
 #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"
@@ -35,6 +34,9 @@
 #include "Sound/SoundManager.h"
 #include "Systems/SoundSystem.h"
 
+//Performance 
+#include "Core/PerformanceTimer.h"
+
 class Game
 {
 public:
@@ -53,7 +55,6 @@ 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/DamageIndicatorSystem.h

@@ -14,11 +14,13 @@
 #include <glm/gtx/vector_angle.hpp>
 
 #include "Rendering/Util/CommonFunctions.h"
+//#define INDICATOR_TEST
 
-class DamageIndicatorSystem : public System
+class DamageIndicatorSystem : public ImpureSystem
 {
 public:
     DamageIndicatorSystem(SystemParams params);
+    virtual void Update(double dt) override;
 
 private:
     EventRelay<DamageIndicatorSystem, Events::PlayerDamage> m_EPlayerDamage;
@@ -28,6 +30,20 @@ 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,17 +27,16 @@ 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/PlayerMovementSystem.h

@@ -39,5 +39,5 @@ private:
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
 
     void updateMovementControllers(double dt);
-    void updateVelocity(double dt);
+    void updateVelocity(EntityWrapper player, double dt);
 };

include/Game/Systems/SpawnerSystem.h

@@ -15,11 +15,16 @@ class SpawnerSystem : public System
 public:
     SpawnerSystem(SystemParams params);
 
-    static EntityWrapper Spawn(EntityWrapper spawner, EntityWrapper parent = EntityWrapper::Invalid);
+    // 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 = "");
 
 private:
     EventRelay<SpawnerSystem, Events::SpawnerSpawn> m_OnSpawnerSpawn;
     bool OnSpawnerSpawn(Events::SpawnerSpawn& e);
+    static void transformEntityToSpawnPoint(EntityWrapper spawnedEntity, EntityWrapper spawnPoint);
+    static bool spawnedEntityIsColliding(EntityWrapper spawnedEntity, EntityWrapper spawnPoint, const std::string& dontCollideComponent);
 };
 
 #endif

resources/DefaultInput.ini

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

resources/Schema/Components.xsd

@@ -41,5 +41,9 @@
 	<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:schema>

resources/Schema/Components/Button.xml

@@ -0,0 +1,3 @@
+<?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

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="Button">
+		<xs:annotation>
+			<xs:documentation>Makes sprites klickable.</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Menu.xml

@@ -0,0 +1,3 @@
+<?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

@@ -0,0 +1,9 @@
+<?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,4 +8,5 @@
 	<NormalMap>true</NormalMap>
 	<SpecularMap>true</SpecularMap>
 	<GlowMap>true</GlowMap>
+	<GlowIntensity>3.0</GlowIntensity>
 </Model>

resources/Schema/Components/Model.xsd

@@ -33,6 +33,9 @@
 				<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

@@ -0,0 +1,4 @@
+<?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

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	<xs:element name="Page">
+		<xs:annotation>
+			<xs:documentation>Use this on a child to a Menu entity and make sure that ID is not the same as other pages.</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="ID" type="t:int" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Physics.xml

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

resources/Schema/Components/Physics.xsd

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

resources/Schema/Components/SpriteIndicator.xml

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

resources/Schema/Components/SpriteIndicator.xsd

@@ -0,0 +1,19 @@
+<?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="SpriteIndicator">
+		<xs:annotation>
+			<xs:documentation>Billbord a Sprite around global Y axis</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="MinScale" type="t:double" minOccurs="0"/>
+				<xs:element name="VisibleForSingleTeamOnly" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Add a Team component to this Entity or Parent to make it visible only for that team</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Entities/AmmoPickup.xml

@@ -5,10 +5,15 @@
     <c:AABB/>
     <c:AmmoPickup/>
     <c:Model>
-      <Resource>Models/Core/UnitSphere.mesh</Resource>
+      <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
     </c:Model>
+    <c:RaptorCopter>
+      <Speed>0.1</Speed>
+      <Axis X="0" Y="1" Z="0"/>
+    </c:RaptorCopter>
     <c:Transform>
       <Position X="0" Y="1" Z="0"/>
+      <Scale X="0.3" Y="0.3" Z="0.3"/>
     </c:Transform>
     <c:Trigger/>
   </Components>

resources/Schema/Entities/Button.xml

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

resources/Schema/Entities/GameMap.xml

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

resources/Schema/Entities/HealthPickup.xml

@@ -5,10 +5,15 @@
     <c:AABB/>
     <c:HealthPickup/>
     <c:Model>
-      <Resource>Models/Core/UnitSphere.mesh</Resource>
+      <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
     </c:Model>
+    <c:RaptorCopter>
+      <Speed>0.1</Speed>
+      <Axis X="0" Y="1" Z="0"/>
+    </c:RaptorCopter>
     <c:Transform>
       <Position X="0" Y="1" Z="0"/>
+      <Scale X="0.3" Y="0.3" Z="0.3"/>
     </c:Transform>
     <c:Trigger/>
   </Components>

resources/Schema/Entities/Player.xml

@@ -13,6 +13,7 @@
     <c:DashAbility/>
     <c:Health/>
     <c:Physics>
+      <PrevOrigin X="0" Y="0.772000015" Z="0"/>
       <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
     </c:Physics>
     <c:Player>
@@ -60,6 +61,7 @@
                 <c:Sprite>
                   <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
                   <DepthSort>false</DepthSort>
+                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.200000003"/>
@@ -110,6 +112,7 @@
                     </c:Fill>
                     <c:Sprite>
                       <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.588235319" B="0" G="0" R="0"/>
                     </c:Sprite>
                     <c:HealthHUD/>
@@ -135,6 +138,7 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -152,6 +156,7 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -167,6 +172,7 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -185,6 +191,7 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -200,6 +207,7 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                     </c:Sprite>
                     <c:Transform>
@@ -217,6 +225,7 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -232,6 +241,7 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -249,6 +259,7 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -264,6 +275,7 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -279,6 +291,7 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -291,8 +304,7 @@
                   </Children>
                 </Entity>
               </Children>
-            </Entity>
-            <Entity name="KillFeed">
+            </Entity>            <Entity name="KillFeed">
               <Components>
                 <c:KillFeed/>
                 <c:Transform>
@@ -304,6 +316,7 @@
                 <Entity name="KillFeed1">
                   <Components>
                     <c:Text>
+                      <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
@@ -316,6 +329,7 @@
                 <Entity name="KillFeed2">
                   <Components>
                     <c:Text>
+                      <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
@@ -330,6 +344,7 @@
                 <Entity name="KillFeed3">
                   <Components>
                     <c:Text>
+                      <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
@@ -349,13 +364,14 @@
           <Components>
             <c:Animation>
               <AnimationName1>Idle</AnimationName1>
-              <Time1>1.6050530664521858</Time1>
+              <Time1>0.97725610639912475</Time1>
               <Speed1>1</Speed1>
+              <AnimationName2></AnimationName2>
+              <AnimationName3></AnimationName3>
             </c:Animation>
             <c:Model>
               <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
               <Color A="1" B="1" G="0.309803933" R="0"/>
-              <Transparent>true</Transparent>
             </c:Model>
             <c:Transform/>
           </Components>
@@ -367,11 +383,10 @@
                 </c:BoneAttachment>
                 <c:Model>
                   <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-                  <Transparent>true</Transparent>
                 </c:Model>
                 <c:Transform>
-                  <Position X="0.12043035" Y="-0.234149337" Z="-0.181454644"/>
-                  <Orientation X="0.0104045281" Y="-0.00268131681" Z="0.0428438708"/>
+                  <Position X="0.12043038" Y="-0.244988307" Z="-0.181454808"/>
+                  <Orientation X="0.010404544" Y="-0.00268173823" Z="0.0428441577"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -408,6 +423,7 @@
                       <Components>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                           <Color A="0.588235319" B="0" G="0" R="0"/>
                         </c:Sprite>
                         <c:Transform>
@@ -477,8 +493,10 @@
       <Components>
         <c:Animation>
           <AnimationName1>Idle</AnimationName1>
-          <Time1>1.620305457513453</Time1>
+          <Time1>0.87583812735846323</Time1>
           <Speed1>1</Speed1>
+          <AnimationName2></AnimationName2>
+          <AnimationName3></AnimationName3>
         </c:Animation>
         <c:AnimationOffset>
           <AnimationName>AimRifle</AnimationName>
@@ -501,8 +519,8 @@
               <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
             </c:Model>
             <c:Transform>
-              <Position X="0.160351232" Y="1.02591991" Z="-0.215102971"/>
-              <Orientation X="-0.0627480298" Y="-0.0432248674" Z="0.119431816"/>
+              <Position X="0.163429111" Y="1.0235405" Z="-0.215489209"/>
+              <Orientation X="-0.0631071255" Y="-0.0576644838" Z="0.118255548"/>
             </c:Transform>
           </Components>
           <Children>
@@ -572,6 +590,26 @@
       </Components>
       <Children/>
     </Entity>
+    <Entity name="Indicator">
+      <Components>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
+          <DepthSort>false</DepthSort>
+          <GlowMap></GlowMap>
+          <Color A="1" B="1" G="0.309803933" R="0"/>
+        </c:Sprite>
+        <c:HiddenForLocalPlayer/>
+        <c:SpriteIndicator>
+          <MinScale>50</MinScale>
+          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
+        </c:SpriteIndicator>
+        <c:Transform>
+          <Position X="0" Y="1.84019077" Z="0"/>
+          <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/PlayerRed.xml

@@ -13,6 +13,7 @@
     <c:DashAbility/>
     <c:Health/>
     <c:Physics>
+      <PrevOrigin X="0" Y="0.772000015" Z="0"/>
       <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
     </c:Physics>
     <c:Player>
@@ -60,6 +61,7 @@
                 <c:Sprite>
                   <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
                   <DepthSort>false</DepthSort>
+                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.200000003"/>
@@ -110,6 +112,7 @@
                     </c:Fill>
                     <c:Sprite>
                       <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.588235319" B="0" G="0" R="0"/>
                     </c:Sprite>
                     <c:HealthHUD/>
@@ -135,6 +138,7 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -152,6 +156,7 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -167,6 +172,7 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -185,6 +191,7 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -200,6 +207,7 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                     </c:Sprite>
                     <c:Transform>
@@ -217,6 +225,7 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -232,6 +241,7 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -249,6 +259,7 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -264,6 +275,7 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -279,6 +291,7 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -304,6 +317,7 @@
                 <Entity name="KillFeed1">
                   <Components>
                     <c:Text>
+                      <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
@@ -316,6 +330,7 @@
                 <Entity name="KillFeed2">
                   <Components>
                     <c:Text>
+                      <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
@@ -330,6 +345,7 @@
                 <Entity name="KillFeed3">
                   <Components>
                     <c:Text>
+                      <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
@@ -349,13 +365,14 @@
           <Components>
             <c:Animation>
               <AnimationName1>Idle</AnimationName1>
-              <Time1>1.6050530664521858</Time1>
+              <Time1>1.2667383999985162</Time1>
               <Speed1>1</Speed1>
+              <AnimationName2></AnimationName2>
+              <AnimationName3></AnimationName3>
             </c:Animation>
             <c:Model>
               <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
               <Color A="1" B="0" G="0" R="1"/>
-              <Transparent>true</Transparent>
             </c:Model>
             <c:Transform/>
           </Components>
@@ -367,11 +384,10 @@
                 </c:BoneAttachment>
                 <c:Model>
                   <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
-                  <Transparent>true</Transparent>
                 </c:Model>
                 <c:Transform>
-                  <Position X="0.12043035" Y="-0.234149337" Z="-0.181454644"/>
-                  <Orientation X="0.0104045281" Y="-0.00268131681" Z="0.0428438708"/>
+                  <Position X="0.120430425" Y="-0.242105931" Z="-0.181454822"/>
+                  <Orientation X="0.010404665" Y="-0.00268179877" Z="0.0428443067"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -408,6 +424,7 @@
                       <Components>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                           <Color A="0.588235319" B="0" G="0" R="0"/>
                         </c:Sprite>
                         <c:Transform>
@@ -477,8 +494,10 @@
       <Components>
         <c:Animation>
           <AnimationName1>Idle</AnimationName1>
-          <Time1>1.620305457513453</Time1>
+          <Time1>0.26532318661337229</Time1>
           <Speed1>1</Speed1>
+          <AnimationName2></AnimationName2>
+          <AnimationName3></AnimationName3>
         </c:Animation>
         <c:AnimationOffset>
           <AnimationName>AimRifle</AnimationName>
@@ -501,8 +520,8 @@
               <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
             </c:Model>
             <c:Transform>
-              <Position X="0.160351232" Y="1.02591991" Z="-0.215102971"/>
-              <Orientation X="-0.0627480298" Y="-0.0432248674" Z="0.119431816"/>
+              <Position X="0.159282878" Y="1.0300566" Z="-0.216084003"/>
+              <Orientation X="-0.0626799241" Y="-0.0390551724" Z="0.119761385"/>
             </c:Transform>
           </Components>
           <Children>
@@ -572,6 +591,26 @@
       </Components>
       <Children/>
     </Entity>
+    <Entity>
+      <Components>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
+          <DepthSort>false</DepthSort>
+          <GlowMap></GlowMap>
+          <Color A="1" B="0" G="0" R="1"/>
+        </c:Sprite>
+        <c:HiddenForLocalPlayer/>
+        <c:SpriteIndicator>
+          <MinScale>50</MinScale>
+          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
+        </c:SpriteIndicator>
+        <c:Transform>
+          <Position X="0" Y="1.84000003" Z="0"/>
+          <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/QualityAssurance.xml

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

resources/Schema/Entities/TestMenu.xml

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

resources/Schema/Types/Entity.xsd

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

resources/Shaders/DrawColorCorrection.frag.glsl

@@ -19,6 +19,8 @@ void main()
 	vec4 bloomColor = texture(BloomTexture, Input.TextureCoordinate);
 	vec4 hdrColorLowRes = texture(SceneTextureLowRes, Input.TextureCoordinate);
 	vec4 bloomColorLowRes = texture(BloomTextureLowRes, Input.TextureCoordinate);
+
+	//hdrColor = hdrColor * SSAO;
 	hdrColor += bloomColor;
 	hdrColorLowRes;
 
@@ -33,7 +35,6 @@ void main()
 
 	//gamme correction
 	result = pow(result, vec3(1.0 / Gamma));
-
 	fragmentColor = vec4(result, 1.0);
 	//fragmentColor = hdrColor;
 	//fragmentColor = bloomColor;

resources/Shaders/ForwardPlus.frag.glsl

@@ -1,5 +1,7 @@
 #version 430
 
+#define MIN_AMBIENT_LIGHT 0.3
+
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -9,15 +11,19 @@ uniform vec2 ScreenDimensions;
 uniform vec4 FillColor;
 uniform vec4 AmbientColor;
 uniform float FillPercentage;
+uniform float GlowIntensity = 10;
+uniform vec3 CameraPosition;
 
 uniform vec2 DiffuseUVRepeat;
 uniform vec2 NormalUVRepeat;
 uniform vec2 SpecularUVRepeat;
 uniform vec2 GlowUVRepeat;
-layout (binding = 0) uniform sampler2D DiffuseTexture;
-layout (binding = 1) uniform sampler2D NormalMapTexture;
-layout (binding = 2) uniform sampler2D SpecularMapTexture;
-layout (binding = 3) uniform sampler2D GlowMapTexture;
+layout (binding = 0) uniform sampler2D AOTexture;
+layout (binding = 1) uniform sampler2D DiffuseTexture;
+layout (binding = 2) uniform sampler2D NormalMapTexture;
+layout (binding = 3) uniform sampler2D SpecularMapTexture;
+layout (binding = 4) uniform sampler2D GlowMapTexture;
+layout (binding = 5) uniform samplerCube CubeMap;
 
 #define TILE_SIZE 16
 
@@ -72,7 +78,7 @@ struct LightResult {
 };
 
 float CalcAttenuation(float radius, float dist, float falloff) {
-	return 1.0 - smoothstep(radius * 0.3, radius, dist);
+	return 1.0 - smoothstep(radius * falloff, radius, dist);
 }
 
 vec4 CalcSpecular(vec4 lightColor, vec4 viewVec,  vec4 lightVec, vec4 normal) {
@@ -119,6 +125,8 @@ vec4 CalcNormalMappedValue(vec3 normal, vec3 tangent, vec3 bitangent, vec2 textu
 
 void main()
 {
+	float ao = texelFetch(AOTexture, ivec2(gl_FragCoord.xy), 0).r;
+	ao = (clamp(1.0 - (1.0 - ao), 0.0, 1.0) + MIN_AMBIENT_LIGHT) /  (1.0 + MIN_AMBIENT_LIGHT);
 	vec4 diffuseTexel = texture2D(DiffuseTexture, Input.TextureCoordinate * DiffuseUVRepeat);
 	vec4 glowTexel = texture2D(GlowMapTexture, Input.TextureCoordinate * GlowUVRepeat);
 	vec4 specularTexel = texture2D(SpecularMapTexture, Input.TextureCoordinate * SpecularUVRepeat);
@@ -126,14 +134,18 @@ void main()
 	vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate * NormalUVRepeat, NormalMapTexture);
 	normal = normalize(normal);
 	//vec4 normal = normalize(V  * vec4(Input.Normal, 0.0));
-	vec4 viewVec = normalize(-position); 
+	vec4 viewVec = normalize(-position);
+	vec3 I = normalize(vec3(M * vec4(Input.Position, 1.0)) - CameraPosition);
+	vec3 R = reflect(-I, Input.Normal);
+	//R = vec3(P * vec4(R, 1.0));
+	vec4 reflectionColor = texture(CubeMap, R);
 
 	vec2 tilePos;
 	tilePos.x = int(gl_FragCoord.x/TILE_SIZE);
 	tilePos.y = int(gl_FragCoord.y/TILE_SIZE);
 
 	LightResult totalLighting;
-	totalLighting.Diffuse = vec4(AmbientColor.rgb, 1.0);
+	totalLighting.Diffuse = vec4(AmbientColor.rgb * ao, 1.0);
 	int currentTile = int(floor(gl_FragCoord.x/TILE_SIZE) + (floor(gl_FragCoord.y/TILE_SIZE) * int(ScreenDimensions.x/TILE_SIZE)));
 
 	int start = int(LightGrids.Data[currentTile].Start);
@@ -151,12 +163,14 @@ void main()
 		} else if (light.Type == 2) { //Directional
 			light_result = CalcDirectionalLightSource(V * light.Direction, light.Color, light.Intensity, viewVec, normal);
 		}
-		totalLighting.Diffuse += light_result.Diffuse;
-		totalLighting.Specular += light_result.Specular;
+		totalLighting.Diffuse += vec4(light_result.Diffuse.rgb * ao, light_result.Diffuse.a);
+		totalLighting.Specular += vec4(light_result.Specular.rgb * ao, light_result.Specular.a);
 	}
 
 	vec4 color_result = mix((Color * diffuseTexel * DiffuseColor), Input.ExplosionColor, Input.ExplosionPercentageElapsed);
 	color_result = color_result * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel));
+	float specularResult = (specularTexel.r + specularTexel.g + specularTexel.b)/3.0;
+	color_result = color_result * clamp(1/specularTexel, 0, 1)*2 + reflectionColor * clamp(specularTexel, 0, 1)/2;
 	//vec4 color_result = (DiffuseColor + Input.ExplosionColor) * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel)) * diffuseTexel * Color;
 	
 
@@ -166,9 +180,10 @@ void main()
 		color_result += FillColor;
 	}
 	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
-	color_result += glowTexel*3;
+	//sceneColor = vec4(reflectionColor.xyz, 1);
+	color_result += glowTexel*GlowIntensity;
 
-	bloomColor = vec4(clamp(color_result.xyz - 1.0, 0, 100), 1.0);
+	bloomColor = vec4(clamp(color_result.xyz - 1.0, 0, 100), clamp(color_result.a, 0, 1));
 
 	//Tiled Debug Code
 	/*

resources/Shaders/ForwardPlus.vert.glsl

@@ -23,12 +23,12 @@ out VertexData{
 void main()
 {
 	gl_Position = P*V*M * vec4(Position, 1.0);
-	
+	mat4 TIM = transpose(inverse(M));
 	Output.Position = Position;
 	Output.TextureCoordinate = TextureCoords;
-	Output.Normal = vec3(M * vec4(Normal, 0.0));
-	Output.Tangent = vec3(M * vec4(Tangent, 0.0));
- 	Output.BiTangent = vec3(M * vec4(BiTangent, 0.0));
+	Output.Normal = vec3(TIM * vec4(Normal, 0.0));
+	Output.Tangent = vec3(TIM * vec4(Tangent, 0.0));
+ 	Output.BiTangent = vec3(TIM * vec4(BiTangent, 0.0));
 	Output.ExplosionColor = vec4(1.0);
 	Output.ExplosionPercentageElapsed = 0.0;
 }

resources/Shaders/ForwardPlusSplatMapRGB.frag.glsl

@@ -1,5 +1,7 @@
 #version 430
 
+#define MIN_AMBIENT_LIGHT 0.3
+
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -23,19 +25,20 @@ uniform vec2 SpecularUVRepeat3;
 uniform vec2 GlowUVRepeat1;
 uniform vec2 GlowUVRepeat2;
 uniform vec2 GlowUVRepeat3;
-layout (binding = 0) uniform sampler2D SplatMapTexture;
-layout (binding = 1) uniform sampler2D DiffuseTexture1;
-layout (binding = 2) uniform sampler2D DiffuseTexture2;
-layout (binding = 3) uniform sampler2D DiffuseTexture3;
-layout (binding = 4) uniform sampler2D NormalMapTexture1;
-layout (binding = 5) uniform sampler2D NormalMapTexture2;
-layout (binding = 6) uniform sampler2D NormalMapTexture3;
-layout (binding = 7) uniform sampler2D SpecularMapTexture1;
-layout (binding = 8) uniform sampler2D SpecularMapTexture2;
-layout (binding = 9) uniform sampler2D SpecularMapTexture3;
-layout (binding = 10) uniform sampler2D GlowMapTexture1;
-layout (binding = 11) uniform sampler2D GlowMapTexture2;
-layout (binding = 12) uniform sampler2D GlowMapTexture3;
+layout (binding = 0) uniform sampler2D AOTexture;
+layout (binding = 1) uniform sampler2D SplatMapTexture;
+layout (binding = 2) uniform sampler2D DiffuseTexture1;
+layout (binding = 3) uniform sampler2D DiffuseTexture2;
+layout (binding = 4) uniform sampler2D DiffuseTexture3;
+layout (binding = 5) uniform sampler2D NormalMapTexture1;
+layout (binding = 6) uniform sampler2D NormalMapTexture2;
+layout (binding = 7) uniform sampler2D NormalMapTexture3;
+layout (binding = 8) uniform sampler2D SpecularMapTexture1;
+layout (binding = 9) uniform sampler2D SpecularMapTexture2;
+layout (binding = 10) uniform sampler2D SpecularMapTexture3;
+layout (binding = 11) uniform sampler2D GlowMapTexture1;
+layout (binding = 12) uniform sampler2D GlowMapTexture2;
+layout (binding = 13) uniform sampler2D GlowMapTexture3;
 
 #define TILE_SIZE 16
 
@@ -174,6 +177,9 @@ vec4 CalcBlendedNormal(vec4 blendValue, sampler2D R, sampler2D G, sampler2D B,
 
 void main()
 {
+	float ao = texelFetch(AOTexture, ivec2(gl_FragCoord.xy), 0).r;
+	ao = (clamp(1.0 - (1.0 - ao), 0.0, 1.0) + MIN_AMBIENT_LIGHT) /  (1.0 + MIN_AMBIENT_LIGHT);
+
 	vec4 splatTexel = texture2D(SplatMapTexture, Input.TextureCoordinate);
 
 	vec4 diffuseTexel = CalcBlendedTexel(splatTexel, DiffuseTexture1, DiffuseTexture2, DiffuseTexture3,
@@ -195,7 +201,7 @@ void main()
 	tilePos.y = int(gl_FragCoord.y/TILE_SIZE);
 
 	LightResult totalLighting;
-	totalLighting.Diffuse = vec4(AmbientColor.rgb, 1.0);
+	totalLighting.Diffuse = vec4(AmbientColor.rgb * ao, 1.0);
 	int currentTile = int(floor(gl_FragCoord.x/TILE_SIZE) + (floor(gl_FragCoord.y/TILE_SIZE) * int(ScreenDimensions.x/TILE_SIZE)));
 
 	int start = int(LightGrids.Data[currentTile].Start);
@@ -213,8 +219,8 @@ void main()
 		} else if (light.Type == 2) { //Directional
 			light_result = CalcDirectionalLightSource(V * light.Direction, light.Color, light.Intensity, viewVec, normal);
 		}
-		totalLighting.Diffuse += light_result.Diffuse;
-		totalLighting.Specular += light_result.Specular;
+		totalLighting.Diffuse += vec4(light_result.Diffuse.rgb * ao, light_result.Diffuse.a);
+		totalLighting.Specular += vec4(light_result.Specular.rgb * ao, light_result.Specular.a);
 	}
 
 	vec4 color_result = mix((Color * diffuseTexel * DiffuseColor), Input.ExplosionColor, Input.ExplosionPercentageElapsed);

resources/Shaders/SSAO.frag.glsl

@@ -0,0 +1,114 @@
+#version 430
+
+//Number of samples per pixel
+uniform int           uNumOfSamples;
+//#define NUM_SAMPLES (11)
+
+//Number of turns around the cirle
+uniform int           uNumOfTurns;
+//#define NUM_TURNS (7)
+
+layout (binding = 0) uniform sampler2D ViewSpaceZ;
+
+uniform vec4 uProjInfo;
+
+uniform float           uProjScale;
+//#define ProjScale 500
+
+uniform float           uRadius;
+//#define Radius 1.0f
+
+uniform float           uBias;
+//#define Bias 0.012f
+
+uniform float           uContrast;
+//#define IntensityDivR6 1
+
+uniform float           uIntensityScale;
+
+out float				AO;
+
+vec3 getVSPosition(ivec2 ScreenSpaceCoord) {
+    float z = texelFetch(ViewSpaceZ, ScreenSpaceCoord, 0).r;
+    //Get the xy view space coordinates and add the z value from ViewSpaceZ buffer.
+    return vec3((uProjInfo[0] + (ScreenSpaceCoord.x * uProjInfo[1])) * z, (uProjInfo[2] + (ScreenSpaceCoord.y * uProjInfo[3])) * z, z);
+}
+
+vec3 getVSFaceNormal(vec3 ViewSpacePosition) {
+	// Get tangets vector for the plane and ViewSpacePositin... don't ask how this functions works. It's pure magic. 
+	// They do this and it just works... I would guess that they approximate the function of a plane from pixels close to the pixel were on now.
+	return normalize(cross(dFdx(ViewSpacePosition), dFdy(ViewSpacePosition)));
+}
+
+
+vec3 getSampleViewSpacePos(ivec2 ScreenSpaceCoord, int SampleIndex, float RotationAngle, float ScreenSpaceSampleRadius){
+	// Pure Magic...
+	float alpha = float(SampleIndex) * (1.0 / uNumOfSamples);
+
+	// Angle to where to sample
+    float angle = alpha * (uNumOfTurns * 6.28) + RotationAngle;
+
+	//Lenght to were to sample
+    ScreenSpaceSampleRadius = ScreenSpaceSampleRadius * alpha;
+
+    vec2 screenSpaceSampleOffsetVecor = vec2(cos(angle), sin(angle));
+
+    // Get texel coordinate on where to sample by going screenSpaceSampleOffsetVecor direction in ScreenSpaceSampleRadius units from ScreenSpaceCoord (the point being shaded);
+    ivec2 screenSpaceSampleTexel = ivec2(ScreenSpaceSampleRadius * screenSpaceSampleOffsetVecor) + ScreenSpaceCoord;
+
+    return getVSPosition(screenSpaceSampleTexel);
+}
+
+
+
+float sampleAO(ivec2 ScreenSpaceCoord, vec3 Origin, vec3 OriginNormal, float ScreenSpaceSampleRadius, int SampleIndex, float RotationAngle, float Radius) {
+	float radius2 = Radius * Radius;
+	vec3 sampleViewSpacePosition = getSampleViewSpacePos(ScreenSpaceCoord, SampleIndex, RotationAngle, ScreenSpaceSampleRadius);
+
+	vec3 sampleVector = Origin - sampleViewSpacePosition;
+
+	// vv = sampleVectorLenght ^ 2
+	float vv = dot(sampleVector, sampleVector);
+	// vn = angle between sampleVector and Normal
+	float vn = dot(sampleVector, OriginNormal);
+
+	const float epsilon = 0.0001f;
+
+	// vv < radius2 if the vector is shorter then the radius;
+	// vn - bias, offset the angle to reduse self occlusion. 
+	// epsilon is here to make divison by 0 impossible.
+	return float(vv < radius2) * max((vn - uBias) / (epsilon + vv), 0.0);
+	//float f = max(radius2 - vv, 0.0); 
+	//return f * f * f * max((vn - uBias) / (epsilon + vv), 0.0);
+}
+
+
+void main() {
+	ivec2 originScreenCoord = ivec2(gl_FragCoord.xy);
+
+	vec3 origin = getVSPosition(originScreenCoord);
+
+	float radius;
+	if(origin.z < uRadius){
+		radius = origin.z;
+	} else {
+		radius = uRadius;
+	}
+
+
+	vec3 originNormal = getVSFaceNormal(origin);
+
+	float screenSpaceSampleRadius = -uProjScale * radius / origin.z;
+
+	float rotationAngleOffset = 30 * originScreenCoord.x ^ originScreenCoord.y + 10 * originScreenCoord.x * originScreenCoord.y;
+
+	float sum = 0.0;
+    for (int i = 0; i < uNumOfSamples; i++) {
+        sum += sampleAO(originScreenCoord, origin, originNormal, screenSpaceSampleRadius, i, rotationAngleOffset, radius);
+    }
+
+    //float A = max(0.0, 1.0 - sum * (2.0f / uNumOfSamples));
+    float A = 1.0 - sum * (2.0f * uIntensityScale / float(uNumOfSamples));
+    AO = clamp(pow(A, uContrast), 0.0f, 1.0f);
+	//AO = vec4(originNormal, 1.0f);
+}

resources/Shaders/SSAO.vert.glsl

@@ -0,0 +1,8 @@
+#version 430
+
+layout (location = 0) in vec3 Position;
+
+void main()
+{
+	gl_Position = vec4(Position, 1.0);
+}

resources/Shaders/SSAOViewSpaceZ.frag.glsl

@@ -0,0 +1,14 @@
+#version 430
+
+layout (binding = 0) uniform sampler2D DepthBuffer;
+uniform vec3 ClipInfo;
+
+out float depthLinear;
+//Just for Debug, should be depthLinear
+//out vec4 fragmentColor;
+void main() {
+	float depthSample = texelFetch(DepthBuffer, ivec2(gl_FragCoord.xy), 0).r;
+	depthLinear = ClipInfo[0] / (ClipInfo[1] * depthSample + ClipInfo[2]);
+	//float depthLinear = (NearClip) / ( -depthSample + 1.0f);
+	//fragmentColor = vec4(depthLinear, depthLinear, depthLinear, 1.0f);
+}

resources/Shaders/Sprite.frag.glsl

@@ -7,8 +7,8 @@ uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
 
-layout (binding = 0) uniform sampler2D DiffuseTexture;
-layout (binding = 1) uniform sampler2D GlowMapTexture;
+layout (binding = 1) uniform sampler2D DiffuseTexture;
+layout (binding = 2) uniform sampler2D GlowMapTexture;
 
 
 in VertexData{

src/Engine/CMakeLists.txt

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

src/Engine/Collision/Collision.cpp

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

src/Engine/Collision/CollisionSystem.cpp

@@ -3,24 +3,71 @@
 #include "Core/AABB.h"
 #include "Rendering/Model.h"
 
-void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
+void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPhysics, double dt)
 {
-    if (!entity.HasComponent("Physics")) {
+    if (!entity.HasComponent("Collidable")) {
         return;
     }
-    ComponentWrapper& cPhysics = entity["Physics"];
-
     boost::optional<EntityAABB> boundingBox = Collision::EntityAbsoluteAABB(entity);
     if (!boundingBox) {
         return;
     }
     ComponentWrapper& cTransform = entity["Transform"];
     EntityAABB& boxA = *boundingBox;
+    bool everHitTheGround = false;
+
+    glm::vec3 size = boxA.Size();
+    float diameter = std::min(size.x, size.z);
+    glm::vec3 prevOrigin = (glm::vec3)cPhysics["PrevOrigin"];
+    glm::vec3 toCurrentPos = boxA.Origin() - prevOrigin;
+    float rayLength = glm::length(toCurrentPos) + 0.5f*diameter;
+    //If the entity has moved farther than the size of its box, we need to handle it specially.
+    bool traceCollision = rayLength > diameter;
+    //hack solution: If prevOrigin is less than -9000 in all dimensions, 
+    //then it means it is not set, i.e. this is the first collision check for the entity.
+    if (traceCollision && glm::any(glm::greaterThan((glm::vec3)cPhysics["PrevOrigin"], glm::vec3(-9000.f)))) {
+        Ray ray(prevOrigin, toCurrentPos);
+        m_OctreeResult.clear();
+        m_Octree->ObjectsPossiblyHitByRay(ray, m_OctreeResult);
+        for (auto& boxB : m_OctreeResult) {
+            if (boxA.Entity == boxB.Entity) {
+                continue;
+            }
+            bool hit;
+            float dist;
+            if (boxB.Entity.HasComponent("Model")) {
+                RawModel* model;
+                std::string res = (std::string)boxB.Entity["Model"]["Resource"];
+                try {
+                    model = ResourceManager::Load<RawModel, true>(res);
+                } catch (const std::exception&) {
+                    continue;
+                }
+                float u, v;
+                hit = Collision::RayVsModel(ray, model->Vertices(), model->m_Indices, Transform::ModelMatrix(boxB.Entity), dist, u, v);
+            } else {
+                hit = Collision::RayVsAABB(ray, boxB, dist);
+            }
+            if (hit && dist < rayLength) {
+                //Set the entity to where it was colliding, minus the maximum box size. 
+                //TODO: Perhaps this should be done slightly more properly.
+                glm::vec3 newOriginPos = ray.Origin() + (dist - 0.707107f*diameter) * ray.Direction();
+                glm::vec3 resolve = newOriginPos - boxA.Origin();
+                (glm::vec3&)cTransform["Position"] += resolve;
+                boxA = *Collision::EntityAbsoluteAABB(entity);
+                if (resolve.y > 0) {
+                    everHitTheGround = true;
+                    (bool)cPhysics["IsOnGround"] = true;
+                    ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
+                }
+                break;
+            }
+        }
+    }
 
     // Collide against octree items
     m_OctreeResult.clear();
     m_Octree->ObjectsInSameRegion(*boundingBox, m_OctreeResult);
-    bool everHitTheGround = false;
     for (auto& boxB : m_OctreeResult) {
         glm::vec3 resolutionVector;
         if (boxA.Entity == boxB.Entity) {
@@ -64,4 +111,6 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
     if (!everHitTheGround) {
         (bool)cPhysics["IsOnGround"] = false;
     }
+
+    (glm::vec3&)cPhysics["PrevOrigin"] = boxA.Origin();
 }

src/Engine/Core/ComponentPool.cpp

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

src/Engine/Core/EntityFilePreprocessor.cpp

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

src/Engine/Core/PerformanceTimer.cpp

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

src/Engine/Core/World.cpp

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

src/Engine/Editor/EditorSystem.cpp

@@ -43,6 +43,8 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
     m_Enabled = ResourceManager::Load<ConfigFile>("Config.ini")->Get<bool>("Debug.EditorEnabled", false);
     if (m_Enabled) {
         Enable();
+    } else {
+        Disable();
     }
 }
 
@@ -223,6 +225,12 @@ bool EditorSystem::OnInputCommand(const Events::InputCommand& e)
             Enable();
         }
     }
+    if (e.Command == "PerformanceTimingResetAllTimers" && e.Value > 0) {
+        PerformanceTimer::ResetAllTimers();
+    }
+    if (e.Command == "PerformanceTimingCreateExcelData" && e.Value > 0) {
+        PerformanceTimer::CreateExcelData();
+    }
     return true;
 }
 

src/Engine/GUI/ButtonSystem.cpp

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

src/Engine/GUI/MainMenuSystem.cpp

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

src/Engine/Network/Client.cpp

@@ -1,7 +1,7 @@
 #include "Network/Client.h"
 using namespace boost::asio::ip;
 
-Client::Client(World* world, EventBroker* eventBroker) 
+Client::Client(World* world, EventBroker* eventBroker)
     : Network(world, eventBroker)
 {
     // Asumes root node is EntityID_Invalid
@@ -13,6 +13,8 @@ Client::Client(World* world, EventBroker* eventBroker)
     m_PlayerName = config->Get<std::string>("Networking.Name", "Raptorcopter");
     m_SendInputIntervalMs = config->Get<int>("Networking.SendInputIntervalMs", 33);
     LOG_INFO("Client initialized");
+
+    m_ServerlistRequest.Connect(m_PlayerName, "192.168.1.255", 32554);
 }
 
 Client::Client(World* world, EventBroker* eventBroker, std::unique_ptr<SnapshotFilter> snapshotFilter)
@@ -30,6 +32,7 @@ void Client::Connect(std::string address, int port)
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Client::OnInputCommand);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Client::OnPlayerDamage);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &Client::OnPlayerSpawned);
+    EVENT_SUBSCRIBE_MEMBER(m_ESearchForServers, &Client::OnSearchForServers);
     auto config = ResourceManager::Load<ConfigFile>("Config.ini");
     m_Address = address;
     if (address.empty()) {
@@ -66,6 +69,21 @@ void Client::Update()
 
     }
 
+    while (m_ServerlistRequest.IsSocketAvailable()) {
+        Packet packet(MessageType::Invalid);
+        m_ServerlistRequest.Receive(packet);
+        if (packet.GetMessageType() == MessageType::ServerlistRequest) {
+            parseServerlist(packet);
+        }
+    }
+
+    if (m_SearchingForServers) {
+        if (m_SearchingTime < (1000* (std::clock() - m_StartSearchTime) / (double)CLOCKS_PER_SEC)) {
+            m_SearchingForServers = false;
+            displayServerlist();
+        }
+    }
+
     if (m_IsConnected) {
         // Don't send 1 input in 1 packet, bunch em up.
         if (m_SendInputIntervalMs < (1000 * (std::clock() - m_TimeSinceSentInputs) / (double)CLOCKS_PER_SEC)) {
@@ -173,6 +191,22 @@ void Client::parsePing()
     m_Reliable.Send(packet);
 }
 
+
+void Client::parseServerlist(Packet& packet)
+{
+    // Pop size, message type, and ID
+    packet.ReadPrimitive<int>();
+    packet.ReadPrimitive<int>();
+    packet.ReadPrimitive<int>();
+    std::string address = packet.ReadString();
+    int port = packet.ReadPrimitive<int>();
+    std::string serverName = packet.ReadString();
+    int playersConnected = packet.ReadPrimitive<int>();
+    //TODO: This should not happen when a client is connected to a server
+
+    m_Serverlist.push_back({ address, port, serverName, playersConnected });
+}
+
 void Client::parseKick()
 {
     LOG_WARNING("You have been kicked from the server.");
@@ -190,12 +224,12 @@ void Client::parseSpawnEvents()
         }
         e.Player = EntityWrapper(m_World, m_ServerIDToClientID.at(m_PlayerSpawnEvents.at(i).Player.ID));
         //e.Spawner = EntityWrapper(m_World, m_ServerIDToClientID.at(m_PlayerSpawnEvents.at(i).Spawner.ID));
-        e.PlayerID = -1; 
+        e.PlayerID = -1;
         e.PlayerName = m_PlayerSpawnEvents.at(i).PlayerName;
         m_EventBroker->Publish(e);
     }
     m_PlayerSpawnEvents = tempSpawn;
-   // m_PlayerSpawnEvents.clear();
+    // m_PlayerSpawnEvents.clear();
 }
 
 void Client::parsePlayersSpawned(Packet& packet)
@@ -312,16 +346,18 @@ void Client::parseSnapshot(Packet& packet)
             if (serverClientMapsHasEntity(serverEntityID)) {
                 EntityID localEntityID = m_ServerIDToClientID.at(serverEntityID);
                 EntityWrapper localEntity(m_World, localEntityID);
-                
                 // Update entity
                 if (m_World->HasComponent(localEntityID, componentType)) {
+                    if (localEntity.Name() == "CapturePointHUD") {
+                        UpdateLocalCapturePointHUD(localEntity);
+                    }
                     SharedComponentWrapper newComponent = createSharedComponent(packet, localEntityID, componentInfo);
                     bool shouldApply = true;
                     // Apply potential filter function
                     if (m_SnapshotFilter != nullptr) {
                         shouldApply = m_SnapshotFilter->FilterComponent(localEntity, newComponent);
                     }
-                    if (shouldApply) {
+                    if (shouldApply) {                        
                         ComponentWrapper currentComponent = m_World->GetComponent(localEntityID, componentType);
                         memcpy(currentComponent.Data, newComponent.Data, componentInfo.Stride);
                     }
@@ -359,6 +395,18 @@ void Client::parseSnapshot(Packet& packet)
     parseSpawnEvents();
 }
 
+
+void Client::UpdateLocalCapturePointHUD(EntityWrapper capturePointHUD)
+{
+    //auto children = m_World->GetChildren(capturePointHUD.ID);
+    //for (auto it = children.first; it != children.second; it++) {
+    //    it->first
+    //}
+    //
+    //EntityWrapper& localHUD = m_LocalPlayer.FirstChildByName("HUD").FirstChildByName("CapturePointHUD");
+    //m_World->GetComponentPools()
+}
+
 void Client::disconnect()
 {
     m_IsConnected = false;
@@ -371,6 +419,12 @@ void Client::disconnect()
 
 bool Client::OnInputCommand(const Events::InputCommand & e)
 {
+    // TEMP
+    if (e.Command == "SearchForServers" && e.Value > 0) {
+        Events::SearchForServers e;
+        m_EventBroker->Publish(e);
+    }
+
     if (e.PlayerID != -1) {
         return false;
     }
@@ -433,15 +487,27 @@ bool Client::OnPlayerSpawned(const Events::PlayerSpawned& e)
     return true;
 }
 
+bool Client::OnSearchForServers(const Events::SearchForServers& e)
+{
+    m_SearchingForServers = true;
+    m_StartSearchTime = std::clock();
+    m_Serverlist.clear();
+    LOG_INFO("Searching for LAN servers...\n");
+    Packet packet(MessageType::ServerlistRequest);
+    m_ServerlistRequest.Broadcast(packet, 13); // TODO: Config
+    return true;
+}
+
 void Client::parsePlayerDamage(Packet& packet)
 {
     Events::PlayerDamage e;
     PlayerID victimID = packet.ReadPrimitive<EntityID>();
-    if(serverClientMapsHasEntity(victimID)){
+    PlayerID inflictorID = packet.ReadPrimitive<EntityID>();
+    if(!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)){
         return;
     }
     e.Inflictor = EntityWrapper(m_World, m_ServerIDToClientID.at(victimID));
-    e.Victim = EntityWrapper(m_World, m_ServerIDToClientID.at(packet.ReadPrimitive<EntityID>()));
+    e.Victim = EntityWrapper(m_World, m_ServerIDToClientID.at(inflictorID));
     e.Damage = packet.ReadPrimitive<double>();
     // Don't rebroadcast our own player damage events or we'll have an infinite loop!
     if (e.Inflictor != m_LocalPlayer) {
@@ -466,7 +532,7 @@ void Client::sendLocalPlayerTransform()
     packet.WritePrimitive(orientation.x);
     packet.WritePrimitive(orientation.y);
     packet.WritePrimitive(orientation.z);
- 
+
     bool hasAssaultWeapon = m_LocalPlayer.HasComponent("AssaultWeapon");
     packet.WritePrimitive(hasAssaultWeapon);
     if (hasAssaultWeapon) {
@@ -474,7 +540,7 @@ void Client::sendLocalPlayerTransform()
         packet.WritePrimitive((int)cAssaultWeapon["MagazineAmmo"]);
         packet.WritePrimitive((int)cAssaultWeapon["Ammo"]);
     }
-    
+
     m_Unreliable.Send(packet);
 }
 
@@ -527,6 +593,16 @@ void Client::becomePlayer()
     m_Reliable.Send(packet);
 }
 
+
+void Client::displayServerlist()
+{
+    LOG_INFO("This is a serverlist:\n");
+    for (int i = 0; i < m_Serverlist.size(); i++) {
+        ServerInfo si = m_Serverlist[i];
+        LOG_INFO("%s:%i\t%s\t%i\n", si.Address.c_str(), si.Port, si.Name.c_str(), si.PlayersConnected);
+    }
+}
+
 bool Client::clientServerMapsHasEntity(EntityID clientEntityID)
 {
     if (m_ClientIDToServerID.find(clientEntityID) != m_ClientIDToServerID.end()) {

src/Engine/Network/HybridClient.cpp

@@ -1,10 +0,0 @@
-#include "Network/HybridClient.h"
-
-
-HybridClient::HybridClient()
-{
-}
-
-HybridClient::~HybridClient()
-{
-}

src/Engine/Network/HybridServer.cpp

@@ -1,9 +0,0 @@
-#include "Network/HybridServer.h"
-
-HybridServer::HybridServer()
-{ 
-}
-
-HybridServer::~HybridServer()
-{
-}

src/Engine/Network/NetworkClient.cpp

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

src/Engine/Network/NetworkServer.cpp

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

src/Engine/Network/Server.cpp

@@ -1,7 +1,8 @@
 #include "Network/Server.h"
 
-Server::Server(World* world, EventBroker* eventBroker, int port) 
+Server::Server(World* world, EventBroker* eventBroker, int port)
     : Network(world, eventBroker)
+    , m_ServerlistRequest(13)
 {
     ConfigFile* config = ResourceManager::Load<ConfigFile>("Config.ini");
     snapshotInterval = 1000 * config->Get<float>("Networking.SnapshotInterval", 0.05f);
@@ -13,7 +14,7 @@ Server::Server(World* world, EventBroker* eventBroker, int port)
     EVENT_SUBSCRIBE_MEMBER(m_EComponentDeleted, &Server::OnComponentDeleted);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Server::OnPlayerDamage);
 
-    // Bind
+    // BindWW
     if (port == 0) {
         port = config->Get<float>("Networking.Port", 27666);
     }
@@ -58,8 +59,24 @@ void Server::Update()
             parseMessageType(packet);
         }
     }
+
+    while (m_ServerlistRequest.IsSocketAvailable()) {
+        Packet packet(MessageType::Invalid);
+        PlayerDefinition localArea;
+        localArea.Endpoint = boost::asio::ip::udp::endpoint();
+        m_ServerlistRequest.Receive(packet, localArea);
+        if(packet.GetMessageType() == MessageType::ServerlistRequest) {
+            packet.ReadPrimitive<int>(); // Pop size
+            packet.ReadPrimitive<int>(); // Pop MsgType
+            packet.ReadPrimitive<int>(); // Pop packet ID
+            int port = packet.ReadPrimitive<int>();
+            std::string address = localArea.Endpoint.address().to_string();
+            parseServerlistRequest(boost::asio::ip::udp::endpoint(boost::asio::ip::address().from_string(address), port));
+        }
+    }
+
     // Check if players have disconnected
-    for (int i = 0; i < m_PlayersToDisconnect.size(); i++) {
+     for (int i = 0; i < m_PlayersToDisconnect.size(); i++) {
         disconnect(m_PlayersToDisconnect.at(i));
     }
     m_PlayersToDisconnect.clear();
@@ -75,6 +92,7 @@ void Server::Update()
         sendPing();
         previousePingMessage = currentTime;
     }
+
     // Time out logic
     if (checkTimeOutInterval < (1000 * (currentTime - timOutTimer) / (double)CLOCKS_PER_SEC)) {
         checkForTimeOuts();
@@ -84,7 +102,6 @@ void Server::Update()
     if (isReadingData) {
         Network::Update();
     }
-
 }
 
 void Server::parseMessageType(Packet& packet)
@@ -119,7 +136,7 @@ void Server::parseMessageType(Packet& packet)
         parseOnPlayerDamage(packet);
         break;
     case MessageType::PlayerTransform:
-        parsePlayerTransform(packet);
+       parsePlayerTransform(packet);
         break;
     default:
         break;
@@ -147,7 +164,7 @@ void Server::sendSnapshot()
 {
     Packet packet(MessageType::Snapshot);
     addInputCommandsToPacket(packet);
-    addChildrenToPacket(packet, EntityID_Invalid);
+    addPlayersToPacket(packet, EntityID_Invalid);
     unreliableBroadcast(packet);
 }
 
@@ -164,7 +181,7 @@ void Server::addInputCommandsToPacket(Packet& packet)
     m_InputCommandsToBroadcast.clear();
 }
 
-void Server::addChildrenToPacket(Packet & packet, EntityID entityID)
+void Server::addPlayersToPacket(Packet & packet, EntityID entityID)
 {
     auto itPair = m_World->GetChildren(entityID);
     std::unordered_map<std::string, ComponentPool*> worldComponentPools = m_World->GetComponentPools();
@@ -172,6 +189,7 @@ void Server::addChildrenToPacket(Packet & packet, EntityID entityID)
     for (auto it = itPair.first; it != itPair.second; it++) {
         EntityID childEntityID = it->second;
         // HACK: Only sync players for now, since the map turned out to be TOO LARGE to send in one snapshot and Simon's computer shits itself
+        // HACK: Also checked CapturePointHUD for now. (this would get out of sync);
         EntityWrapper childEntity(m_World, childEntityID);
         if (!shouldSendToClient(childEntity)) {
             continue;
@@ -213,6 +231,49 @@ void Server::addChildrenToPacket(Packet & packet, EntityID entityID)
     }
 }
 
+void Server::addChildrenToPacket(Packet & packet, EntityID entityID)
+{
+    auto itPair = m_World->GetChildren(entityID);
+    std::unordered_map<std::string, ComponentPool*> worldComponentPools = m_World->GetComponentPools();
+    // Loop through every child
+    for (auto it = itPair.first; it != itPair.second; it++) {
+        EntityID childEntityID = it->second;
+        // Write EntityID and parentsID and Entity name
+        packet.WritePrimitive(childEntityID);
+        packet.WritePrimitive(entityID);
+        packet.WriteString(m_World->GetName(childEntityID));
+        // Write components to child
+        int numberOfComponents = 0;
+        for (auto& i : worldComponentPools) {
+            if (i.second->KnowsEntity(childEntityID)) {
+                numberOfComponents++;
+            }
+        }
+        // Write how many components should be read
+        packet.WritePrimitive(numberOfComponents);
+        for (auto& i : worldComponentPools) {
+            // If the entity exist in the pool
+            if (i.second->KnowsEntity(childEntityID)) {
+                ComponentWrapper componentWrapper = i.second->GetByEntity(childEntityID);
+                // ComponentType
+                packet.WriteString(componentWrapper.Info.Name);
+                // Loop through fields
+                for (auto& componentField : componentWrapper.Info.FieldsInOrder) {
+                    ComponentInfo::Field_t fieldInfo = componentWrapper.Info.Fields.at(componentField);
+                    if (fieldInfo.Type == "string") {
+                        std::string& value = componentWrapper[componentField];
+                        packet.WriteString(value);
+                    } else {
+                        packet.WriteData(componentWrapper.Data + fieldInfo.Offset, fieldInfo.Stride);
+                    }
+                }
+            }
+        }
+        // Go to to your children
+        addChildrenToPacket(packet, childEntityID);
+    }
+}
+
 void Server::sendPing()
 {
     // Prints connected players ping
@@ -231,6 +292,8 @@ void Server::sendPing()
     reliableBroadcast(packet);
 }
 
+
+
 void Server::checkForTimeOuts()
 {
     double startPing = 1000 * m_StartPingTime
@@ -305,6 +368,11 @@ void Server::parseTCPConnect(Packet & packet)
     connnectPacket.WritePrimitive(playerID);
     m_Reliable.Send(connnectPacket);
 
+    Packet firstSnapshot(MessageType::Snapshot);
+    addInputCommandsToPacket(firstSnapshot);
+    addChildrenToPacket(firstSnapshot, EntityID_Invalid);
+    m_Reliable.Send(firstSnapshot);
+
     // Send notification that a player has connected
     //Packet notificationPacket(MessageType::PlayerConnected);
     //broadcast(notificationPacket);
@@ -323,6 +391,17 @@ void Server::parseDisconnect()
     }
 }
 
+
+void Server::parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint)
+{
+    Packet packet(MessageType::ServerlistRequest);
+    packet.WriteString(m_Reliable.Address());
+    packet.WritePrimitive<int>(m_Reliable.Port());
+    packet.WriteString("SERVERNAME");
+    packet.WritePrimitive<int>(m_ConnectedPlayers.size());
+    m_ServerlistRequest.Send(packet);
+}
+
 void Server::disconnect(PlayerID playerID)
 {
     //broadcast("A player disconnected");
@@ -347,6 +426,7 @@ void Server::parseOnPlayerDamage(Packet & packet)
     e.Victim = EntityWrapper(m_World, packet.ReadPrimitive<EntityID>());
     e.Damage = packet.ReadPrimitive<double>();
     m_EventBroker->Publish(e);
+
     //LOG_DEBUG("Server::parseOnPlayerDamage: Command is %s. Value is %f. PlayerID is %i.", e.DamageAmount, e.PlayerDamagedID, e.TypeOfDamage.c_str());
 }
 
@@ -376,7 +456,7 @@ bool Server::OnInputCommand(const Events::InputCommand & e)
         isReadingData = !isReadingData;
         m_SaveDataTimer = std::clock();
     }
-    if (e.Command == "KickPlayer" && e.Value > 0) {
+    else if (e.Command == "KickPlayer" && e.Value > 0) {
         kick(0);
     }
 
@@ -447,7 +527,9 @@ void Server::parsePing()
 {
     for (auto& kv : m_ConnectedPlayers) {
         if (kv.second.TCPAddress == m_Address &&
-            kv.second.TCPPort == m_Port) {
+            kv.second.TCPPort == m_Port
+            || (kv.second.Endpoint.address() == m_Address
+                && kv.second.Endpoint.port() == m_Port)) {
             kv.second.StopTime = std::clock();
             break;
         }
@@ -513,7 +595,8 @@ void Server::parsePlayerTransform(Packet& packet)
 
 bool Server::shouldSendToClient(EntityWrapper childEntity)
 {
-    return childEntity.HasComponent("Player") || childEntity.FirstParentWithComponent("Player").Valid();
+    return childEntity.HasComponent("Player") || childEntity.FirstParentWithComponent("Player").Valid()
+        || childEntity.HasComponent("CapturePoint") || childEntity.FirstParentWithComponent("CapturePoint").Valid();
 }
 
 PlayerID Server::GetPlayerIDFromEndpoint()

src/Engine/Network/TCPClient.cpp

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

src/Engine/Network/TCPServer.cpp

@@ -1,14 +1,15 @@
 #include "Network/TCPServer.h"
 using namespace boost::asio::ip;
 
-TCPServer::TCPServer()
+TCPServer::TCPServer() 
 {
     acceptor = std::unique_ptr<tcp::acceptor>(new tcp::acceptor(m_IOService, tcp::endpoint(tcp::v4(), 27666)));
+    m_Port = GetPort();
+    m_Address = GetAddress();
 }
 
 TCPServer::~TCPServer()
-{
-}
+{ }
 
 void TCPServer::AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers)
 {
@@ -31,7 +32,7 @@ PlayerID GetPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& con
     return -1;
 }
 
-void TCPServer::handle_accept(boost::shared_ptr<tcp::socket> socket, 
+void TCPServer::handle_accept(boost::shared_ptr<tcp::socket> socket,
     int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
     const boost::system::error_code& error)
 {
@@ -51,8 +52,8 @@ void TCPServer::handle_accept(boost::shared_ptr<tcp::socket> socket,
 
 void TCPServer::Send(Packet & packet, PlayerDefinition & playerDefinition)
 {
+    packet.UpdateSize();
     try {
-        packet.UpdateSize();
         int bytesSent = playerDefinition.TCPSocket->send(
             boost::asio::buffer(packet.Data(), packet.Size()),
             0);
@@ -73,38 +74,60 @@ void TCPServer::Send(Packet & packet)
 }
 
 void TCPServer::Disconnect()
-{ 
+{
+}
 
+int TCPServer::GetPort()
+{
+    return acceptor->local_endpoint().port();
+}
+
+std::string TCPServer::GetAddress()
+{
+    boost::asio::ip::tcp::resolver resolver(m_IOService);
+    boost::asio::ip::tcp::resolver::query query(boost::asio::ip::tcp::v4(), boost::asio::ip::host_name(), "");
+    boost::asio::ip::tcp::resolver::iterator it = resolver.resolve(query);
+    boost::asio::ip::tcp::endpoint endpoint = *it;
+    return endpoint.address().to_string().c_str();
 }
 
 void TCPServer::Receive(Packet & packet, PlayerDefinition & playerDefinition)
 {
-    int bytesRead = readBuffer(m_ReadBuffer, playerDefinition);
+    int bytesRead = readBuffer(playerDefinition);
     if (bytesRead > 0) {
         packet.ReconstructFromData(m_ReadBuffer, bytesRead);
     }
     lastReceivedSocket = playerDefinition.TCPSocket;
 }
 
-int TCPServer::readBuffer(char* data, PlayerDefinition & playerDefinition)
+int TCPServer::readBuffer(PlayerDefinition & playerDefinition)
 {
     if (!playerDefinition.TCPSocket) {
         return 0;
     }
     boost::system::error_code error;
     // Read size of packet
-    size_t bytesReceived = playerDefinition.TCPSocket->read_some(boost
-        ::asio::buffer((void*)data, sizeof(int)),
-        error);
-    int sizeOfPacket = 0;
-    memcpy(&sizeOfPacket, data, sizeof(int));
+    playerDefinition.TCPSocket->receive(boost
+        ::asio::buffer((void*)m_ReadBuffer, sizeof(int)),
+        boost::asio::ip::tcp::socket::message_peek, error);
+    unsigned int sizeOfPacket = 0;
+    memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
 
+    // if the buffer is to small increase the size of it
+    if (sizeOfPacket > m_BufferSize) {
+        delete[] m_ReadBuffer;
+        m_ReadBuffer = new char[sizeOfPacket];
+        m_BufferSize = sizeOfPacket;
+    }
     // Read the rest of the message
-    bytesReceived += playerDefinition.TCPSocket->read_some(boost
-        ::asio::buffer((void*)(data + bytesReceived), sizeOfPacket - bytesReceived),
+    size_t bytesReceived = playerDefinition.TCPSocket->read_some(boost
+        ::asio::buffer((void*)(m_ReadBuffer), sizeOfPacket),
         error);
     if (error) {
         //LOG_ERROR("receive: %s", error.message().c_str());
     }
+    if (sizeOfPacket > 1000000)
+        LOG_WARNING("The packets received are bigger than 1MB");
+
     return bytesReceived;
 }