Crudely caching model matrix calculations, work in progress.

Tobbe sa att jag fick pusha direkt

include/Engine/Collision/CollisionSystem.h

@@ -24,6 +24,7 @@ public:
 private:
     Octree<EntityAABB>* m_Octree;
     std::vector<EntityAABB> m_OctreeResult;
+    std::unordered_map<EntityWrapper, glm::vec3> m_PrevPositions;
 };
 
 #endif

include/Engine/Core/ECaptured.h

@@ -12,7 +12,9 @@ namespace Events
 struct Captured : Event
 {
     int TeamNumberThatCapturedCapturePoint;
-    EntityID CapturePointID;
+    EntityID CapturePointTakenID;
+    EntityWrapper BlueTeamNextCapturePoint;
+    EntityWrapper RedTeamNextCapturePoint;
 };
 
 }

include/Engine/Core/EPlayerDeath.h

@@ -10,8 +10,9 @@ namespace Events
 struct PlayerDeath : Event
 {
     //KilledBy,KilledByWhat is optional for now. It might be used later in the playerlog-system
-    EntityWrapper Player;
-    std::string KilledByWhat;
+    EntityWrapper Player = EntityWrapper::Invalid;
+    EntityWrapper Killer = EntityWrapper::Invalid;
+    std::string KilledByWhat = "";
 };
 
 }

include/Engine/Core/EntityFile.h

@@ -1,164 +1,21 @@
 #ifndef EntityFile_h__
 #define EntityFile_h__
 
-#include <stack>
-#include <boost/lexical_cast.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/sax2/SAX2XMLReader.hpp>
-#include <xercesc/sax2/XMLReaderFactory.hpp>
-#include <xercesc/sax2/DefaultHandler.hpp>
-#include <xercesc/sax2/Attributes.hpp>
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/util/XMLChar.hpp>
-#include <xercesc/sax2/DefaultHandler.hpp>
-#include <xercesc/framework/XMLDocumentHandler.hpp>
-#include <xercesc/framework/psvi/XSElementDeclaration.hpp>
-#include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
-#include <xercesc/framework/psvi/XSParticle.hpp>
-#include <xercesc/framework/psvi/XSModelGroup.hpp>
-#include <xercesc/framework/psvi/XSAnnotation.hpp>
-#include <xercesc/framework/psvi/XSValue.hpp>
-#include <xercesc/framework/XMLGrammarPoolImpl.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/dom/DOMLSInput.hpp>
-#include <xercesc/dom/DOMElement.hpp>
+#include "World.h"
+#include "EntityXMLFile.h"
+#include "EntityXMLFilePreprocessor.h"
+#include "EntityXMLFileParser.h"
+#include "EntityWrapper.h"
 
-#include "../GLM.h"
-#include "Util/XercesString.h"
-#include "ResourceManager.h"
-#include "Entity.h"
-#include "ComponentInfo.h"
-
-class EntityFileHandler
-{
-    friend class EntityFileSAXHandler;
-public:
-    // @param EntityID The entity found
-    // @param EntityID The parent of the entity
-    typedef std::function<void(EntityID, EntityID, const std::string&)> OnStartEntityCallback;
-    void SetStartEntityCallback(OnStartEntityCallback c) { m_OnStartEntityCallback = c; }
-    // @param EntityID The entity the component corresponds to
-    // @param std::string Type name of the component
-    typedef std::function<void(EntityID, const std::string&)> OnStartComponentCallback;
-    void SetStartComponentCallback(OnStartComponentCallback c) { m_OnStartComponentCallback = c; }
-    // @param EntityID Entity 
-    // @param std::string Component name 
-    // @param std::string Field name
-    // @param std::map<std::string, std::string> Field attribute names and values
-    typedef std::function<void(EntityID, const std::string&, const std::string&, const std::map<std::string, std::string>&)> OnStartFieldCallback;
-    void SetStartFieldCallback(OnStartFieldCallback c) { m_OnStartFieldCallback = c; }
-    // @param EntityID Entity 
-    // @param std::string Component name 
-    // @param std::string Field name
-    // @param char* Field data
-    typedef std::function<void(EntityID, const std::string&, const std::string&, const char*)> OnStartFieldDataCallback;
-    void SetStartFieldDataCallback(OnStartFieldDataCallback c) { m_OnStartFieldDataCallback = c; }
-
-private:
-    OnStartEntityCallback m_OnStartEntityCallback = nullptr;
-    OnStartComponentCallback m_OnStartComponentCallback = nullptr;
-    OnStartFieldCallback m_OnStartFieldCallback = nullptr;
-    OnStartFieldDataCallback m_OnStartFieldDataCallback = nullptr;
-};
-
-class EntityFileSAXHandler : public xercesc::DefaultHandler
+class EntityFile : private World, public Resource
 {
 public:
-    enum class State
-    {
-        Unknown,
-        Entity,
-        Component,
-        ComponentField
-    };
+    EntityFile(std::string path);
 
-    EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader);
-
-    void startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs) override;
-    void characters(const XMLCh* const chars, const XMLSize_t length) override;
-    void endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname) override;
-
-    void warning(const xercesc::SAXParseException& e);
-    void error(const xercesc::SAXParseException& e);
-    void fatalError(const xercesc::SAXParseException& e);
+    EntityWrapper MergeInto(World* other);
 
 private:
-    const EntityFileHandler* m_Handler;
-    xercesc::XMLGrammarPool* m_GrammarPool;
-    xercesc::SAX2XMLReader* m_Reader;
-    //State m_CurrentScope = State::Unknown;
-    std::stack<State> m_StateStack;
-    unsigned int m_NextEntityID = 0;
-    std::stack<EntityID> m_EntityStack;
-    std::string m_CurrentComponent;
-    std::string m_CurrentField;
-    std::map<std::string, std::string> m_CurrentAttributes;
-
-    void onStartEntity(const xercesc::Attributes& attrs); 
-    void onEndEntity();
-    void onStartEntityRef(const xercesc::Attributes& attrs);
-    void onStartComponent(const std::string& name);
-    void onEndComponent(const std::string& name);
-    void onStartComponentField(const std::string& field, const xercesc::Attributes& attrs);
-    void onEndComponentField(const std::string& field);
-    void onFieldData(char* data);
-};
-
-class EntityFileXMLErrorHandler : public xercesc::ErrorHandler
-{
-public:
-	void warning(const xercesc::SAXParseException& e) override
-	{
-		reportParseException("Warning", e);
-	}
-	void error(const xercesc::SAXParseException& e) override
-	{
-		reportParseException("Error", e);
-	}
-	void fatalError(const xercesc::SAXParseException& e) override
-	{
-		reportParseException("FATAL ERROR", e);
-	}
-	void resetErrors() override { }
-
-private:
-	void reportParseException(std::string type, const xercesc::SAXParseException& e)
-	{
-		char* message = xercesc::XMLString::transcode(e.getMessage());
-		char* systemID = xercesc::XMLString::transcode(e.getSystemId());
-		std::cerr << systemID << ":" << e.getLineNumber() << ":" << e.getColumnNumber() << std::endl;
-		std::cerr << type << ": " << message << std::endl;
-		xercesc::XMLString::release(&systemID);
-		xercesc::XMLString::release(&message);
-	}
-};
-
-class EntityFile : public Resource
-{
-    friend class ResourceManager;
-    friend class EntityFileSAXHandler;
-private:
-    EntityFile(boost::filesystem::path path);
-    ~EntityFile();
-
-public:
-    static unsigned int GetTypeStride(std::string typeName);
-    static void WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map<std::string, std::string>& attributes);
-    static void WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData);
-
-    xercesc::XMLGrammarPool* GrammarPool() const { return m_GrammarPool; }
-
-    void Parse(const EntityFileHandler* handler) const;
-
-private:
-    boost::filesystem::path m_FilePath;
-    xercesc::XMLGrammarPool* m_GrammarPool;
-    xercesc::SAX2XMLReader* m_SAX2XMLReader;
-	//std::map<std::string, ::ComponentInfo> m_ComponentInfo;
-    //std::vector<std::string> m_EntityReferences;
-
-    static void setReaderFeatures(xercesc::SAX2XMLReader* reader);
+    EntityID m_RootEntity = EntityID_Invalid;
 };
 
 #endif

include/Engine/Core/EntityWrapper.h

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

include/Engine/Core/EntityXMLFile.h

@@ -0,0 +1,164 @@
+#ifndef EntityXMLFile_h__
+#define EntityXMLFile_h__
+
+#include <stack>
+#include <boost/lexical_cast.hpp>
+#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+#include <xercesc/sax2/SAX2XMLReader.hpp>
+#include <xercesc/sax2/XMLReaderFactory.hpp>
+#include <xercesc/sax2/DefaultHandler.hpp>
+#include <xercesc/sax2/Attributes.hpp>
+#include <xercesc/util/XMLString.hpp>
+#include <xercesc/util/XMLChar.hpp>
+#include <xercesc/sax2/DefaultHandler.hpp>
+#include <xercesc/framework/XMLDocumentHandler.hpp>
+#include <xercesc/framework/psvi/XSElementDeclaration.hpp>
+#include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
+#include <xercesc/framework/psvi/XSParticle.hpp>
+#include <xercesc/framework/psvi/XSModelGroup.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
+#include <xercesc/framework/psvi/XSValue.hpp>
+#include <xercesc/framework/XMLGrammarPoolImpl.hpp>
+#include <xercesc/dom/DOM.hpp>
+#include <xercesc/dom/DOMLSInput.hpp>
+#include <xercesc/dom/DOMElement.hpp>
+
+#include "../GLM.h"
+#include "Util/XercesString.h"
+#include "ResourceManager.h"
+#include "Entity.h"
+#include "ComponentInfo.h"
+
+class EntityFileHandler
+{
+    friend class EntityFileSAXHandler;
+public:
+    // @param EntityID The entity found
+    // @param EntityID The parent of the entity
+    typedef std::function<void(EntityID, EntityID, const std::string&)> OnStartEntityCallback;
+    void SetStartEntityCallback(OnStartEntityCallback c) { m_OnStartEntityCallback = c; }
+    // @param EntityID The entity the component corresponds to
+    // @param std::string Type name of the component
+    typedef std::function<void(EntityID, const std::string&)> OnStartComponentCallback;
+    void SetStartComponentCallback(OnStartComponentCallback c) { m_OnStartComponentCallback = c; }
+    // @param EntityID Entity 
+    // @param std::string Component name 
+    // @param std::string Field name
+    // @param std::map<std::string, std::string> Field attribute names and values
+    typedef std::function<void(EntityID, const std::string&, const std::string&, const std::map<std::string, std::string>&)> OnStartFieldCallback;
+    void SetStartFieldCallback(OnStartFieldCallback c) { m_OnStartFieldCallback = c; }
+    // @param EntityID Entity 
+    // @param std::string Component name 
+    // @param std::string Field name
+    // @param char* Field data
+    typedef std::function<void(EntityID, const std::string&, const std::string&, const char*)> OnStartFieldDataCallback;
+    void SetStartFieldDataCallback(OnStartFieldDataCallback c) { m_OnStartFieldDataCallback = c; }
+
+private:
+    OnStartEntityCallback m_OnStartEntityCallback = nullptr;
+    OnStartComponentCallback m_OnStartComponentCallback = nullptr;
+    OnStartFieldCallback m_OnStartFieldCallback = nullptr;
+    OnStartFieldDataCallback m_OnStartFieldDataCallback = nullptr;
+};
+
+class EntityFileSAXHandler : public xercesc::DefaultHandler
+{
+public:
+    enum class State
+    {
+        Unknown,
+        Entity,
+        Component,
+        ComponentField
+    };
+
+    EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader);
+
+    void startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs) override;
+    void characters(const XMLCh* const chars, const XMLSize_t length) override;
+    void endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname) override;
+
+    void warning(const xercesc::SAXParseException& e);
+    void error(const xercesc::SAXParseException& e);
+    void fatalError(const xercesc::SAXParseException& e);
+
+private:
+    const EntityFileHandler* m_Handler;
+    xercesc::XMLGrammarPool* m_GrammarPool;
+    xercesc::SAX2XMLReader* m_Reader;
+    //State m_CurrentScope = State::Unknown;
+    std::stack<State> m_StateStack;
+    unsigned int m_NextEntityID = 0;
+    std::stack<EntityID> m_EntityStack;
+    std::string m_CurrentComponent;
+    std::string m_CurrentField;
+    std::map<std::string, std::string> m_CurrentAttributes;
+
+    void onStartEntity(const xercesc::Attributes& attrs); 
+    void onEndEntity();
+    void onStartEntityRef(const xercesc::Attributes& attrs);
+    void onStartComponent(const std::string& name);
+    void onEndComponent(const std::string& name);
+    void onStartComponentField(const std::string& field, const xercesc::Attributes& attrs);
+    void onEndComponentField(const std::string& field);
+    void onFieldData(char* data);
+};
+
+class EntityFileXMLErrorHandler : public xercesc::ErrorHandler
+{
+public:
+	void warning(const xercesc::SAXParseException& e) override
+	{
+		reportParseException("Warning", e);
+	}
+	void error(const xercesc::SAXParseException& e) override
+	{
+		reportParseException("Error", e);
+	}
+	void fatalError(const xercesc::SAXParseException& e) override
+	{
+		reportParseException("FATAL ERROR", e);
+	}
+	void resetErrors() override { }
+
+private:
+	void reportParseException(std::string type, const xercesc::SAXParseException& e)
+	{
+		char* message = xercesc::XMLString::transcode(e.getMessage());
+		char* systemID = xercesc::XMLString::transcode(e.getSystemId());
+		std::cerr << systemID << ":" << e.getLineNumber() << ":" << e.getColumnNumber() << std::endl;
+		std::cerr << type << ": " << message << std::endl;
+		xercesc::XMLString::release(&systemID);
+		xercesc::XMLString::release(&message);
+	}
+};
+
+class EntityXMLFile : public Resource
+{
+    friend class ResourceManager;
+    friend class EntityFileSAXHandler;
+private:
+    EntityXMLFile(boost::filesystem::path path);
+    ~EntityXMLFile();
+
+public:
+    static unsigned int GetTypeStride(std::string typeName);
+    static void WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map<std::string, std::string>& attributes);
+    static void WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData);
+
+    xercesc::XMLGrammarPool* GrammarPool() const { return m_GrammarPool; }
+
+    void Parse(const EntityFileHandler* handler) const;
+
+private:
+    boost::filesystem::path m_FilePath;
+    xercesc::XMLGrammarPool* m_GrammarPool;
+    xercesc::SAX2XMLReader* m_SAX2XMLReader;
+	//std::map<std::string, ::ComponentInfo> m_ComponentInfo;
+    //std::vector<std::string> m_EntityReferences;
+
+    static void setReaderFeatures(xercesc::SAX2XMLReader* reader);
+};
+
+#endif

include/Engine/Core/EntityXMLFileParser.h

@@ -1,18 +1,19 @@
-#ifndef EntityFileParser_h__
-#define EntityFileParser_h__
+#ifndef EntityXMLFileParser_h__
+#define EntityXMLFileParser_h__
 
-#include "EntityFile.h"
+#include "EntityXMLFile.h"
 #include "World.h"
 
-class EntityFileParser
+class EntityXMLFileParser
 {
+    friend class EntityFile;
 public:
-    EntityFileParser(const EntityFile* entityFile);
-
-    EntityID MergeEntities(World* world, EntityID baseParent = EntityID_Invalid);
+    EntityXMLFileParser(const EntityXMLFile* entityFile);
 
 private:
-    const EntityFile* m_EntityFile;
+    EntityID MergeEntities(World* world, EntityID baseParent = EntityID_Invalid);
+
+    const EntityXMLFile* m_EntityFile;
     EntityFileHandler m_Handler;
     World* m_World = nullptr;
     EntityID m_FirstEntity = EntityID_Invalid;

include/Engine/Core/EntityXMLFilePreprocessor.h

@@ -1,5 +1,5 @@
-#ifndef EntityFilePreprocessor_h__
-#define EntityFilePreprocessor_h__
+#ifndef EntityXMLFilePreprocessor_h__
+#define EntityXMLFilePreprocessor_h__
 
 #include <xercesc/framework/psvi/XSElementDeclaration.hpp>
 #include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
@@ -17,17 +17,18 @@
 #include "Util/XercesString.h"
 #include "ResourceManager.h"
 #include "World.h"
-#include "EntityFile.h"
+#include "EntityXMLFile.h"
 
-class EntityFilePreprocessor
+class EntityXMLFilePreprocessor
 {
+    friend class EntityFile;
 public:
-    EntityFilePreprocessor(const EntityFile* entityFile);
-
-    void RegisterComponents(World* world);
+    EntityXMLFilePreprocessor(const EntityXMLFile* entityFile);
 
 private:
-    const EntityFile* m_EntityFile;
+    void RegisterComponents(World* world);
+
+    const EntityXMLFile* m_EntityFile;
     std::map<std::string, unsigned int> m_ComponentCounts;
 	std::map<std::string, ComponentInfo> m_ComponentInfo;
 

include/Engine/Core/EntityXMLFileWriter.h

@@ -1,5 +1,5 @@
-#ifndef EntityFileWriter_h__
-#define EntityFileWriter_h__
+#ifndef EntityXMLFileWriter_h__
+#define EntityXMLFileWriter_h__
 
 #include <boost/filesystem.hpp>
 #include <xercesc/dom/DOM.hpp>
@@ -8,13 +8,13 @@
 #include <xercesc/framework/LocalFileFormatTarget.hpp>
 
 #include "Util/XercesString.h"
-#include "EntityFile.h"
+#include "EntityXMLFile.h"
 #include "World.h"
 
-class EntityFileWriter
+class EntityXMLFileWriter
 {
 public:
-    EntityFileWriter(boost::filesystem::path file)
+    EntityXMLFileWriter(boost::filesystem::path file)
         : m_FilePath(file)
     {
         using namespace xercesc;

include/Engine/Core/MemoryPool.h

@@ -118,9 +118,6 @@ public:
 		else {
 			m_ExtraMemory.push_back((char*)malloc(m_Stride));
 			//We should preferably not enter here to avoid performance issues. Set more numMaxElements in constructor instead.
-            if (!DisableMemoryPool::Value) {
-			    LOG_DEBUG("Allocated slots exceed Pool size, extra memory allocated dynamically. Pool size: %u, dynamic size: %u.", m_NumSlots, m_ExtraMemory.size());
-            }
 			return m_ExtraMemory.back();
 		}
 	}

include/Engine/Core/System.h

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

include/Engine/Core/Transform.h

@@ -4,11 +4,11 @@
 #include "../GLM.h"
 #include "World.h"
 #include "EntityWrapper.h"
+#include "System.h"
 
 namespace Transform
 {
 
-glm::mat4 AbsoluteTransformation(EntityWrapper entity);
 glm::vec3 AbsolutePosition(EntityWrapper entity);
 glm::vec3 AbsolutePosition(World* world, EntityID entity);
 glm::vec3 AbsoluteOrientationEuler(EntityWrapper entity);
@@ -20,6 +20,16 @@ glm::mat4 ModelMatrix(EntityWrapper entity);
 glm::mat4 ModelMatrix(EntityID entity, World* world);
 glm::vec3 TransformPoint(const glm::vec3& point, const glm::mat4& matrix);
 
+class ClearCache : public ImpureSystem
+{
+public:
+    ClearCache(SystemParams params)
+        : System(params)
+    { }
+
+    virtual void Update(double dt) override;
+};
+
 }
 
 #endif

include/Engine/Core/World.h

@@ -6,6 +6,7 @@
 #include "ObjectPool.h"
 #include "ComponentPool.h"
 #include "EventBroker.h"
+struct EntityWrapper;
 
 class World
 {
@@ -18,13 +19,13 @@ public:
     World(const World& other);
 
     // Create empty entity
-    EntityID CreateEntity(EntityID parent = 0);
+    EntityID CreateEntity(EntityID parent = EntityID_Invalid);
     // Delete entity and all components within
     void DeleteEntity(EntityID entity);
     // Check if an entity exists
     bool ValidEntity(EntityID entity) const;
     // Register a component type and allocate space for it
-    void RegisterComponent(ComponentInfo& ci);
+    void RegisterComponent(const ComponentInfo& ci);
     // Attach a component to an entity and fill it with default values
     ComponentWrapper AttachComponent(EntityID entity, const std::string& componentType);
     // Check if an entity has a component
@@ -40,7 +41,7 @@ public:
     // Change the parent of an entity
     void SetParent(EntityID entity, EntityID parent);
     // Get children of an entity
-    const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetChildren(EntityID entity);
+    const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetDirectChildren(EntityID entity);
     // Get all component pools
     const std::unordered_map<std::string, ComponentPool*>& GetComponentPools() const { return m_ComponentPools; }
     // Get the entity children map
@@ -49,6 +50,12 @@ public:
     void SetName(EntityID entity, const std::string& name);
     // Get the textual name of an entity
     std::string GetName(EntityID entity) const;
+    // Get the first entity in the world with the name.
+    EntityWrapper GetFirstEntityByName(const std::string& name);
+
+    // Merge another world into this one
+    // Returns a map that maps entities from the other world to their copies in this one
+    std::unordered_map<EntityID, EntityID> Merge(const World* other);
 
 private:
     EventBroker* m_EventBroker = nullptr;

include/Engine/Editor/EditorCameraInputController.h

@@ -12,8 +12,8 @@ template <typename EventContext>
 class EditorCameraInputController : public FirstPersonInputController<EventContext>
 {
 public:
-    EditorCameraInputController(EventBroker* eventBroker, unsigned int playerID)
-        : FirstPersonInputController(eventBroker, playerID)
+    EditorCameraInputController(EventBroker* eventBroker, unsigned int playerID, EntityWrapper playerEntity)
+        : FirstPersonInputController(eventBroker, playerID, playerEntity)
     {
         EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &EditorCameraInputController::OnMousePress);
         EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &EditorCameraInputController::OnMouseRelease);
@@ -104,6 +104,11 @@ protected:
         if (!m_Enabled) {
             return false;
         }
+            
+        ImGuiIO& io = ImGui::GetIO();
+        if (io.WantCaptureMouse || io.WantCaptureKeyboard) {
+            return false;
+        }
 
         m_SpeedMultiplier += e.DeltaY * (0.1 * m_SpeedMultiplier);
         m_Config->Set("Editor.CameraSpeed", m_SpeedMultiplier);

include/Engine/Editor/EditorGUI.h

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

include/Engine/Editor/EditorSystem.h

@@ -5,9 +5,8 @@
 #include "../Core/World.h"
 #include "../Core/SystemPipeline.h"
 #include "../Core/ResourceManager.h"
-#include "../Core/EntityFilePreprocessor.h"
-#include "../Core/EntityFileParser.h"
-#include "../Core/EntityFileWriter.h"
+#include "../Core/EntityFile.h"
+#include "../Core/EntityXMLFileWriter.h"
 #include "../Core/EMousePress.h"
 #include "../Input/EInputCommand.h"
 #include "EditorGUI.h"
@@ -56,6 +55,7 @@ private:
     void OnEntityDelete(EntityWrapper entity);
     void OnEntityChangeParent(EntityWrapper entity, EntityWrapper parent);
     void OnEntityChangeName(EntityWrapper entity, const std::string& name);
+    EntityWrapper OnEntityPaste(EntityWrapper entityToCopy, EntityWrapper parent);
     void OnComponentAttach(EntityWrapper entity, const std::string& componentType);
     void OnComponentDelete(EntityWrapper entity, const std::string& componentType);
     void OnWidgetSpace(EditorGUI::WidgetSpace widgetSpace);

include/Engine/Input/FirstPersonInputController.h

@@ -6,12 +6,14 @@
 #include "../Core/ELockMouse.h"
 #include "../Game/Events/EDashAbility.h"
 #include "InputHandler.h"
+#include "Rendering/EAutoAnimationBlend.h"
+#include "Rendering/ESetBlendWeight.h"
 
 template <typename EventContext>
 class FirstPersonInputController : public InputController<EventContext>
 {
 public:
-    FirstPersonInputController(EventBroker* eventBroker, int playerID);
+    FirstPersonInputController(EventBroker* eventBroker, int playerID, EntityWrapper playerEntity);
 
     virtual const glm::vec3 Movement() const { return m_Movement; }
     virtual const glm::vec3 Rotation() const { return m_Rotation; }
@@ -27,12 +29,15 @@ public:
     virtual bool OnCommand(const Events::InputCommand& e) override;
     virtual void Reset();
 
-    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer);
+    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer, EntityID playerID);
     virtual bool AssaultDashDoubleTapped() const { return m_AssaultDashDoubleTapped; }
     virtual bool PlayerIsDashing() const { return m_PlayerIsDashing; }
+    bool SpecialAbilityKeyDown() const { return m_SpecialAbilityKeyDown; }
 
 protected:
     const int m_PlayerID;
+    EntityWrapper m_PlayerEntity;
+
     bool m_MouseLocked = false;
     glm::vec3 m_Rotation;
     glm::vec3 m_Movement;
@@ -41,7 +46,6 @@ protected:
     bool m_Crouching = false;
     //assault dash membervariables - needed to calculate the doubletap- and dashlogic
     double m_AssaultDashDoubleTapDeltaTime = 0.0;
-    double m_AssaultDashCoolDownTimer = 0.0;
     //i will let m_AssaultDashDoubleTapSensitivityTimer stay hardcoded, its not really a gamevariable (more an inputvariable), 
     //and its very unlikely that someone wants to change that value
     const float m_AssaultDashDoubleTapSensitivityTimer = 0.25f;
@@ -52,7 +56,7 @@ protected:
     bool m_ShiftDashing = false;
     bool m_ValidDoubleTap = false;
 
-    //specialabilitys
+    //specialabilities
     bool m_MovementKeyDown = false;
     bool m_SpecialAbilityKeyDown = false;
     int m_NumberOfMovementKeysDown = 0;
@@ -64,9 +68,10 @@ protected:
 };
 
 template <typename EventContext>
-FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID)
+FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID, EntityWrapper playerEntity)
     : InputController(eventBroker)
     , m_PlayerID(playerID)
+    , m_PlayerEntity(playerEntity)
 {
     EVENT_SUBSCRIBE_MEMBER(m_ELockMouse, &FirstPersonInputController::OnLockMouse);
     EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &FirstPersonInputController::OnUnlockMouse);
@@ -105,7 +110,6 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
     if (e.Command == "Pitch") {
         float val = glm::radians(e.Value);
         m_Rotation.x += -val;
-        //m_Rotation.x = glm::clamp(m_Rotation.x, -glm::half_pi<float>(), glm::half_pi<float>());
     }
 
     if (e.Command == "Yaw") {
@@ -117,16 +121,155 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
         if (e.Command == "Forward") {
             float val = glm::clamp(e.Value, -1.f, 1.f);
             m_Movement.z = -val;
+
+            //Animation
+            if (m_PlayerEntity.Valid()) {
+                EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+                if (playerModel.Valid()) {
+                    if (val > 0) {  // Walk/Run
+                        Events::AutoAnimationBlend aeb;
+                        aeb.Duration = 0.1;
+                        if (m_Crouching) {
+                            aeb.NodeName = "Walk";
+                        } else {
+                            aeb.NodeName = "Run";
+                        }
+                        aeb.RootNode = playerModel;
+                        aeb.Start = true;
+                        aeb.SingleLevelBlend = true;
+                        m_EventBroker->Publish(aeb);
+                    } else if (val < 0) {   // Walk/run Backwards
+                        Events::AutoAnimationBlend aeb;
+                        aeb.Duration = 0.1;
+                        if (m_Crouching) {
+                            aeb.NodeName = "Walk";
+                        } else {
+                            aeb.NodeName = "Run";
+                        }
+                        aeb.RootNode = playerModel;
+                        aeb.Start = true;
+                        aeb.SingleLevelBlend = true;
+                        aeb.Reverse = true;
+                        m_EventBroker->Publish(aeb);
+                    }
+                }
+
+
+                EntityWrapper firstPersonModel = m_PlayerEntity.FirstChildByName("Hands");
+                if (firstPersonModel.Valid()) {
+                    if (val > 0) {  // Walk/Run
+                        if (!m_Crouching) {
+                            Events::AutoAnimationBlend aeb;
+                            aeb.Duration = 0.1;
+                            aeb.NodeName = "Run";
+                            aeb.RootNode = firstPersonModel;
+                            aeb.Start = true;
+                            m_EventBroker->Publish(aeb);
+                        }
+                    } else if (val < 0) {   // Walk/run Backwards
+                        if (!m_Crouching) {
+                            Events::AutoAnimationBlend aeb;
+                            aeb.Duration = 0.1;
+                            aeb.NodeName = "Run";
+                            aeb.RootNode = firstPersonModel;
+                            aeb.Start = true;
+                            aeb.Reverse = true;
+                            m_EventBroker->Publish(aeb);
+                        }
+                    }
+                }
+            }
         }
         if (e.Command == "Right") {
             float val = glm::clamp(e.Value, -1.f, 1.f);
             m_Movement.x = val;
-        }
-        if (glm::length2(m_Movement) > 0) {
-            m_Movement = glm::normalize(m_Movement);
+
+
+            //Animation
+            if (m_PlayerEntity.Valid()) {
+                EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+                if (playerModel.Valid()) { //Right Strafe
+                    if (val > 0) {
+                        Events::AutoAnimationBlend aeb;
+                        aeb.Duration = 0.1;
+                        aeb.NodeName = "Right";
+                        aeb.RootNode = playerModel;
+                        aeb.SingleLevelBlend = true;
+                        aeb.Start = true;
+                        m_EventBroker->Publish(aeb);
+                    } else if (val < 0) { //LeftStrafe
+                        Events::AutoAnimationBlend aeb;
+                        aeb.Duration = 0.1;
+                        aeb.NodeName = "Left";
+                        aeb.RootNode = playerModel;
+                        aeb.SingleLevelBlend = true;
+                        aeb.Start = true;
+                        m_EventBroker->Publish(aeb);
+                    }
+                }
+            }
         }
     }
 
+    //Animation
+    if (glm::length2(m_Movement) < 0.25f) {
+        //Blend to Idle
+        if (m_PlayerEntity.Valid()) {
+            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+            if (playerModel.Valid()) {
+                Events::AutoAnimationBlend aeb;
+                aeb.Duration = 0.1;
+                aeb.NodeName = "Idle";
+                aeb.RootNode = playerModel;
+                aeb.Start = true;
+                m_EventBroker->Publish(aeb);
+            }
+            EntityWrapper firstPersonModel = m_PlayerEntity.FirstChildByName("Hands");
+            if (firstPersonModel.Valid()) {
+                Events::AutoAnimationBlend aeb;
+                aeb.Duration = 0.1;
+                aeb.NodeName = "Idle";
+                aeb.RootNode = firstPersonModel;
+                aeb.Start = true;
+                m_EventBroker->Publish(aeb);
+            }
+        }
+    } else {
+        //Blend to movement
+        if (m_PlayerEntity.Valid()) {
+            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+            if (playerModel.Valid()) {
+                Events::AutoAnimationBlend aeb;
+                aeb.Duration = 0.1;
+                aeb.NodeName = "DirectionBlend";
+                aeb.RootNode = playerModel;
+                m_EventBroker->Publish(aeb);
+            }
+        }
+    }
+
+
+    if (glm::length2(m_Movement) > 0) {
+        m_Movement = glm::normalize(m_Movement);
+
+        //Animation
+        // movement direction blend
+        if (m_PlayerEntity.Valid()) {
+            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+            if (playerModel.Valid()) {
+                glm::vec2 direction = glm::normalize(glm::vec2(m_Movement.x, m_Movement.z));
+                double weight = glm::abs(glm::dot(glm::vec2(1, 0), direction));
+                Events::SetBlendWeight sbw;
+                sbw.NodeName = "DirectionBlend";
+                sbw.Weight = weight;
+                sbw.RootNode = playerModel;
+                m_EventBroker->Publish(sbw);
+            }
+        }
+    }
+
+        
+
     if (e.Command == "Forward" || e.Command == "Right") {
         if (e.Value != 0) {
             m_CurrentDirectionVector = e.Command == "Right" ? (e.Value > 0 ? "Right" : "Left") : (e.Value > 0 ? "Forward" : "Backward");
@@ -145,10 +288,10 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
             if (m_NumberOfMovementKeysDown == 0) {
                 m_MovementKeyDown = false;
             }
-                //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
-                m_AssaultDashTapDirection = m_CurrentDirectionVector;
-                m_AssaultDashDoubleTapDeltaTime = 0.f;
-            
+            //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
+            m_AssaultDashTapDirection = m_CurrentDirectionVector;
+            m_AssaultDashDoubleTapDeltaTime = 0.f;
+
         }
     }
 
@@ -158,21 +301,42 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
 
     if (e.Command == "Crouch") {
         m_Crouching = e.Value > 0;
+
+
+        //Animation
+        if (m_PlayerEntity.Valid()) {
+            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+            if (playerModel.Valid()) {
+                if (e.Value == 0.f) {
+                    Events::AutoAnimationBlend aeb;
+                    aeb.Duration = 0.3;
+                    aeb.NodeName = "StandMovement";
+                    aeb.RootNode = playerModel;
+                    aeb.Start = true;
+                    aeb.Restart = true;
+                    aeb.SingleLevelBlend = true;
+                    m_EventBroker->Publish(aeb);
+                } else if(e.Value == 1.0f) {
+                    Events::AutoAnimationBlend aeb;
+                    aeb.Duration = 0.3;
+                    aeb.NodeName = "CrouchMovement";
+                    aeb.RootNode = playerModel;
+                    aeb.Start = true;
+                    aeb.Restart = true;
+                    aeb.SingleLevelBlend = true;
+                    m_EventBroker->Publish(aeb);
+                }
+            }
+        }
+        
     }
 
     if (e.Command == "SpecialAbility") {
-        if (e.Value > 0) {
-            m_SpecialAbilityKeyDown = true;
-        } else {
-            m_SpecialAbilityKeyDown = false;
-        }
-    }
-    if (m_SpecialAbilityKeyDown && m_MovementKeyDown) {
-        m_ShiftDashing = true;
-    } else {
-        m_ShiftDashing = false;
+        m_SpecialAbilityKeyDown = e.Value > 0;
     }
 
+    m_ShiftDashing = m_SpecialAbilityKeyDown && m_MovementKeyDown;
+
     return true;
 }
 
@@ -191,23 +355,27 @@ bool FirstPersonInputController<EventContext>::OnLockMouse(const Events::LockMou
 }
 
 template <typename EventContext>
-void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer) {
+void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer, EntityID playerID) {
     m_AssaultDashDoubleTapDeltaTime += dt;
-    m_AssaultDashCoolDownTimer -= dt;
+    assaultDashCoolDownTimer -= dt;
     //cooldown = assaultDashCoolDownMaxTimer sec, pretend the dash lasts 0.25 sec (for friction to do its work)
-    if (m_AssaultDashCoolDownTimer > (assaultDashCoolDownMaxTimer - 0.25f)) {
+    if (assaultDashCoolDownTimer > (assaultDashCoolDownMaxTimer - 0.25f)) {
         m_PlayerIsDashing = true;
     } else {
         m_PlayerIsDashing = false;
     }
 
     //dashing with shift
-    if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f) {
+    if (m_ShiftDashing && assaultDashCoolDownTimer <= 0.0f) {
         //player is dashing with shift
         //the wanted-direction is set in playermovement already so we dont need to check what direction we want to dash in!
-        m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
+        assaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
         m_AssaultDashDoubleTapped = true;
         m_AssaultDashDoubleTapDeltaTime = 0.f;
+
+        Events::DashAbility e;
+        e.Player = playerID;
+        m_EventBroker->Publish(e);
         return;
     }
 
@@ -227,7 +395,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     }
     m_ValidDoubleTap = false;
 
-    if (!(m_AssaultDashCoolDownTimer <= 0.0f)) {
+    if (!(assaultDashCoolDownTimer <= 0.0f)) {
         //if we cant dash at the moment, then just reset the tap-sensitivity-timer
         m_AssaultDashDoubleTapDeltaTime = 0.f;
         return;
@@ -235,9 +403,10 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     //ok, we have a valid tap, lets do it
     m_AssaultDashDoubleTapped = true;
     m_AssaultDashDoubleTapDeltaTime = 0.f;
-    m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
+    assaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
 
     Events::DashAbility e;
+    e.Player = playerID;
     m_EventBroker->Publish(e);
 }
 

include/Engine/Input/InputProxy.h

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

include/Engine/Network/Client.h

@@ -17,27 +17,21 @@
 #include "Network/TCPClient.h"
 #include "Network/SnapshotDefinitions.h"
 #include "Core/World.h"
+#include "Core/EntityFile.h"
 #include "Core/EventBroker.h"
 #include "Core/ConfigFile.h"
+#include "Core/EPlayerDeath.h"
 #include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"
+#include "../Game/Events/EDoubleJump.h"
 #include "Network/EInterpolate.h"
 #include "Network/SnapshotFilter.h"
 #include "Core/EPlayerSpawned.h"
+#include "Core/EAmmoPickup.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;
-};
-
+#include "../Game/Events/EDashAbility.h"
+#include "Network/EDisplayServerlist.h"
+#include "Network/EConnectRequest.h"
 class Client : public Network
 {
 public:
@@ -47,7 +41,9 @@ public:
 
     void Connect(std::string address, int port);
     void Update() override;
-
+private:
+    //UDPClient m_Unreliable;
+    TCPClient m_Reliable;
     std::vector<Events::PlayerSpawned> m_PlayerSpawnEvents;
     void parseSpawnEvents();
     // Save for children
@@ -101,9 +97,11 @@ public:
     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 parseDoubleJump(Packet& packet);
+    void parseDashEffect(Packet& packet);
+    void parseAmmoPickup(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();
@@ -111,6 +109,8 @@ public:
     void sendLocalPlayerTransform();
     void becomePlayer();
     void displayServerlist();
+    void removeWorld();
+    void createMainMenu();
     // Mapping Logic
     // Returns if local EntityID exist in map
     bool clientServerMapsHasEntity(EntityID clientEntityID);
@@ -127,11 +127,15 @@ public:
     EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(const Events::PlayerSpawned& e);
     EventRelay< Client, Events::SearchForServers> m_ESearchForServers;
+    EventRelay<Client, Events::DoubleJump> m_EDoubleJump;
+    bool OnDoubleJump(Events::DoubleJump & e);
+    EventRelay<Client, Events::DashAbility> m_EDashAbility;
+    bool OnDashAbility(const Events::DashAbility& e);
+    EventRelay<Client, Events::ConnectRequest> m_EConnectRequest;
+    bool OnConnectRequest(const Events::ConnectRequest& e);
+
     bool OnSearchForServers(const Events::SearchForServers& e);
-private:
-    UDPClient m_Unreliable;
     UDPClient m_ServerlistRequest;
-    TCPClient m_Reliable;
     std::vector<ServerInfo> m_Serverlist;
     bool m_SearchingForServers = false;
     std::clock_t m_StartSearchTime;

include/Engine/Network/EConnectRequest.h

@@ -0,0 +1,17 @@
+#ifndef Events_ConnectRequest_h__
+#define Events_ConnectRequest_h__
+
+#include "Core/EventBroker.h"
+
+namespace Events
+{
+
+struct ConnectRequest : public Event
+{
+    std::string IP = "";
+    int Port = 0;
+};
+
+}
+#endif
+

include/Engine/Network/EDisplayServerlist.h

@@ -0,0 +1,29 @@
+#ifndef Events_DisplayServerlist_h__
+#define Events_DisplayServerlist_h__
+
+#include <string>
+#include <vector>
+#include "Core/Event.h"
+
+struct ServerInfo
+{
+    ServerInfo(std::string address, int port, std::string name, int players)
+    {
+        Address = address; Port = port; Name = name; PlayersConnected = players;
+    }
+    std::string Address = "";
+    int Port = 0;
+    std::string Name = "";
+    int PlayersConnected = 0;
+};
+
+namespace Events
+{
+
+struct DisplayServerlist : public Event 
+{
+    std::vector<ServerInfo> Serverlist;
+};
+
+}
+#endif

include/Engine/Network/EKillDeath.h

@@ -0,0 +1,19 @@
+#ifndef Events_KillDeath_h__
+#define Events_KillDeath_h__
+
+#include "Core/EventBroker.h"
+
+typedef unsigned int PlayerID;
+
+namespace Events
+{
+
+struct KillDeath : public Event 
+{
+    PlayerID Casualty = -1;
+    PlayerID Killer = -1;
+};
+
+}
+
+#endif

include/Engine/Network/EPlayerConnected.h

@@ -0,0 +1,17 @@
+#ifndef Events_PlayerConnected
+#define Events_PlayerConnected
+
+#include "Core/EventBroker.h"
+
+namespace Events
+{
+
+struct PlayerConnected : public Event
+{
+    std::string PlayerName = "";
+    int PlayerID = -1;
+};
+
+}
+#endif // !Events_PlayerConnected
+

include/Engine/Network/MessageType.h

@@ -19,7 +19,10 @@ enum class MessageType
     EntityDeleted,
     ComponentDeleted,
     PlayerTransform,
+    OnDoubleJump,
+    OnDashEffect,
     ServerlistRequest,
+    AmmoPickup,
     Invalid
 };
 

include/Engine/Network/NetworkClient.h

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

include/Engine/Network/Packet.h

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

include/Engine/Network/Server.h

@@ -8,7 +8,6 @@
 
 #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"
@@ -18,8 +17,13 @@
 #include "Core/EPlayerDamage.h"
 #include "Network/EPlayerDisconnected.h"
 #include "Core/EPlayerSpawned.h"
+#include "../Game/Events/EDoubleJump.h"
 #include "Core/EEntityDeleted.h"
 #include "Core/EComponentDeleted.h"
+#include "Core/EAmmoPickup.h"
+#include "Core/EPlayerDeath.h"
+#include "Network/EPlayerConnected.h"
+#include "Network/EKillDeath.h"
 
 class Server : public Network
 {
@@ -32,7 +36,7 @@ public:
 private:
     // Network channels
     TCPServer m_Reliable;
-    UDPServer m_Unreliable;
+    //UDPServer m_Unreliable;
     UDPServer m_ServerlistRequest;
     // dont forget to set these in the childrens receive logic
     boost::asio::ip::address m_Address;
@@ -56,6 +60,7 @@ private:
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
     std::clock_t m_StartPingTime;
+    std::string m_ServerName = "";
 
     // Packet loss logic
     PacketID m_PacketID = 0;
@@ -76,18 +81,21 @@ private:
     void parseOnPlayerDamage(Packet& packet);
     void identifyPacketLoss();
     void kick(PlayerID player);
-    PlayerID GetPlayerIDFromEndpoint();
+    PlayerID getPlayerIDFromEndpoint();
+    PlayerID getPlayerIDFromEntityID(EntityID entityID);
     void parsePlayerTransform(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
     void parsePing();
-    void parseUDPConnect(Packet & packet);
-    void parseTCPConnect(Packet & packet);
+    bool parseDoubleJump(Packet& packet);
+    void parseDashEffect(Packet& packet);
+    void parseUDPConnect(Packet& packet);
+    void parseTCPConnect(Packet& packet);
     void parseDisconnect();
     void parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint);
     bool shouldSendToClient(EntityWrapper childEntity);
 
-    // Debug event
+    // Events
     EventRelay<Server, Events::InputCommand> m_EInputCommand;
     bool OnInputCommand(const Events::InputCommand& e);
     EventRelay<Server, Events::PlayerSpawned> m_EPlayerSpawned;
@@ -98,6 +106,10 @@ private:
     bool OnComponentDeleted(const Events::ComponentDeleted& e);
     EventRelay<Server, Events::PlayerDamage> m_EPlayerDamage;
     bool OnPlayerDamage(const Events::PlayerDamage& e);
+    EventRelay<Server, Events::AmmoPickup> m_EAmmoPickup;
+    bool OnAmmoPickup(const Events::AmmoPickup& e);
+    EventRelay<Server, Events::PlayerDeath> m_EPlayerDeath;
+    bool OnPlayerDeath(const Events::PlayerDeath& e);
 };
 
 #endif

include/Engine/Network/TCPClient.h

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

include/Engine/Network/TCPServer.h

@@ -25,10 +25,9 @@ private:
     std::unique_ptr<boost::asio::ip::tcp::acceptor> acceptor;
     boost::shared_ptr<boost::asio::ip::tcp::socket> lastReceivedSocket;
 
-    void handle_accept(boost::shared_ptr<boost::asio::ip::tcp::socket> socket,
-        int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
-        const boost::system::error_code& error);
     int readBuffer(PlayerDefinition& playerDefinition);
+    PlayerID getPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
+        boost::asio::ip::address address, unsigned short port);
     int GetPort();
     std::string GetAddress();
     int m_Port = 0;

include/Engine/Network/UDPClient.h

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

include/Engine/Rendering/AnimationSystem.h

@@ -3,27 +3,41 @@
 
 #include "GLM.h"
 
-#include "Common.h"
-#include "Core/System.h"
-#include "Core/ResourceManager.h"
+#include "../Common.h"
+#include "../Core/System.h"
+#include "../Core/ResourceManager.h"
 #include "Rendering/Model.h"
-#include "Rendering/EAnimationComplete.h"
 #include "Rendering/Skeleton.h"
-#include <imgui/imgui.h>
+#include "Rendering/BlendTree.h"
+#include "Rendering/EAutoAnimationBlend.h"
+#include "../Core/EntityWrapper.h"
+#include "Rendering/AutoBlendQueue.h"
+#include "../Input/EInputCommand.h"
+#include "../Core/EEntityDeleted.h"
+#include "Rendering/ESetBlendWeight.h"
+#include "imgui/imgui.h"
 
-class AnimationSystem : public PureSystem
+class AnimationSystem : public ImpureSystem
 {
 public:
-    AnimationSystem(SystemParams params)
-        : System(params)
-        , PureSystem("Animation")
-    {
-
-    }
+    AnimationSystem(SystemParams params);
     ~AnimationSystem() { }
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& animationComponent, double dt) override;
+    virtual void Update(double dt) override;
 private:
+    void CreateBlendTrees();
+    void UpdateAnimations(double dt);
+    void UpdateWeights(double dt);
 
+    EventRelay<AnimationSystem, Events::AutoAnimationBlend> m_EAutoAnimationBlend;
+    bool OnAutoAnimationBlend(Events::AutoAnimationBlend& e);
+
+    EventRelay<AnimationSystem, Events::EntityDeleted> m_EEntityDeleted;
+    bool OnEntityDeleted(Events::EntityDeleted& e);
+
+    EventRelay<AnimationSystem, Events::SetBlendWeight> m_ESetBlendWeight;
+    bool OnSetBlendWeight(Events::SetBlendWeight& e);
+
+    std::unordered_map<EntityWrapper, AutoBlendQueue> m_AutoBlendQueues;
 };
 
 #endif

include/Engine/Rendering/AutoBlendQueue.h

@@ -0,0 +1,48 @@
+#ifndef AutoBlendQueue_h__
+#define AutoBlendQueue_h__
+
+#include "../Core/ResourceManager.h"
+#include "Skeleton.h"
+#include "Model.h"
+#include "BlendTree.h"
+#include "../Core/EntityWrapper.h"
+
+class AutoBlendQueue
+{
+public:
+    struct AutoBlendJob
+    {
+        EntityWrapper RootNode = EntityWrapper::Invalid;
+        double Duration;
+        double CurrentTime = 0.0;
+        double Delay = 0.0;
+        EntityWrapper AnimationEntity = EntityWrapper::Invalid;
+        BlendTree::AutoBlendInfo BlendInfo;
+    };
+
+    struct AutoblendNode
+    {
+        AutoBlendJob BlendJob;
+        double StartTime;
+        double EndTime;
+    };
+
+    AutoBlendQueue() { };
+
+    void Insert(AutoBlendJob autoBlendJob);
+    void UpdateTime(double dt);
+
+    void PrintQueue();
+    bool HasActiveBlendJob();
+    std::shared_ptr<BlendTree> GetBlendTree();
+
+    AutoBlendQueue::AutoBlendJob& GetActiveBlendJob();
+
+    bool Empty() { return m_BlendQueue.empty(); }
+private:
+     std::list<AutoblendNode> m_BlendQueue;
+    
+
+};
+
+#endif

include/Engine/Rendering/BlendTree.h

@@ -0,0 +1,104 @@
+#ifndef BlendTree_h__
+#define BlendTree_h__
+
+#include "Common.h"
+#include "../GLM.h"
+#include "Skeleton.h"
+#include "../Core/EntityWrapper.h"
+#include "../Core/World.h"
+#include <stack>
+
+class BlendTree
+{
+public:
+    enum class NodeType
+    {
+        Additive,
+        Blend,
+        Override,
+        Animation,
+    };
+
+    
+
+    struct Node
+    {
+        std::string Name;
+        EntityWrapper Entity;
+        Node* Parent = nullptr;
+        Node* Child[2] = { nullptr, nullptr };
+        NodeType Type;
+        std::map<int, Skeleton::PoseData> Pose;
+        bool SubTreeRoot = false;
+        double Weight = 0.0;
+
+        Node* Next() {
+            Node* next = this;
+
+            if (next->Child[1] == nullptr) {
+                // Node has no right child
+                next = this;
+                while (next->Parent != nullptr && next == next->Parent->Child[1]) {
+                    next = next->Parent;
+                }
+                next = next->Parent;
+            } else {
+                // Find the leftmost node in the right subtree
+                next = next->Child[1];
+                while (next->Child[0] != nullptr) {
+                    next = next->Child[0];
+                }
+            }
+
+            return next;
+
+        }
+    };
+
+  
+    struct AutoBlendInfo
+    {
+        std::string NodeName;
+        double progress;
+        bool Start;
+        bool SingleBlend;
+        double Weight;
+        std::unordered_map<EntityWrapper, double> StartWeights;
+    };
+
+    
+
+    BlendTree(EntityWrapper ModelEntity, Skeleton* skeleton);
+    ~BlendTree();
+
+
+    std::vector<glm::mat4> GetFinalPose() { return m_FinalPose; }
+    glm::mat4 GetBoneTransform(int boneID);
+    bool IsValid() { return  (m_Root == nullptr ? false : true); }
+    void PrintTree();
+    BlendTree::AutoBlendInfo AutoBlendStep(AutoBlendInfo blendInfo);
+
+    BlendTree::Node* GetCommonParent(std::string NodeName1, std::string NodeName2);
+    BlendTree::Node* FirstCommonParent(Node* node1, Node* node2);
+
+    EntityWrapper GetSubTreeRoot(std::string nodeName);
+
+    std::vector<EntityWrapper> GetSingleLevelRoots(std::string name);
+    std::vector<EntityWrapper> GetEntitesByName(std::string name);
+
+    void SetWeightByName(std::string name, double weight);
+
+private:
+    Skeleton* m_Skeleton = nullptr;
+    Node* m_Root = nullptr;
+
+    std::vector<glm::mat4> m_FinalPose;
+    std::map<int, glm::mat4> m_FinalBoneTransforms;
+    std::vector<BlendTree::Node*> FindNodesByName(std::string name);
+    std::vector<glm::mat4> AccumulateFinalPose();
+    BlendTree::Node* FillTreeByName(Node* parentNode, std::string name, EntityWrapper parentEntity);
+
+    void Blend(std::map<int, Skeleton::PoseData>& pose);
+};
+
+#endif

include/Engine/Rendering/BlurHUD.h

@@ -0,0 +1,70 @@
+#ifndef BlurHUD_h__
+#define BlurHUD_h__
+
+#include "IRenderer.h"
+#include "DrawBloomPassState.h"
+//#include "LightCullingPass.h" Finalpass om den skall skickas in
+#include "FrameBuffer.h"
+#include "ShaderProgram.h"
+//#include "Util/UnorderedMapVec2.h"
+#include "Texture.h"
+
+class BlurHUD
+{
+public:
+    BlurHUD(IRenderer* renderer);
+    ~BlurHUD() { }
+    void InitializeTextures();
+    void InitializeFrameBuffers();
+    void InitializeShaderPrograms();
+    void InitializeBuffers();
+    void ClearBuffer();
+
+    void FillGaussianBuffer(FrameBuffer* fb);
+
+    GLuint Draw(GLuint texture, RenderScene& scene);
+
+    void OnWindowResize();
+    void FillStencil(RenderScene& scene);
+    GLuint CombineTextures(GLuint texture1, GLuint texture2);
+
+    //Getters
+    //Return the blurred result of the texture that was sent into draw
+	GLuint GaussianTexture() const { 
+		if (m_Quality == 0) { 
+			return m_BlackTexture->m_Texture;
+		} else { 
+			return m_GaussianTexture_vert;
+		} 
+	}
+
+
+private:
+    Texture* m_BlackTexture;
+    Model* m_ScreenQuad;
+
+    const IRenderer* m_Renderer;
+	ConfigFile* m_Config;
+    //const LightCullingPass* m_LightCullingPass 
+    int m_Iterations = 3;
+	int m_Quality = 0;
+    float m_BlurQuality = 4.f;
+
+    GLuint m_GaussianTexture_horiz = 0;
+    GLuint m_GaussianTexture_vert = 0;
+    GLuint m_DepthStencil_horiz = 0;
+    GLuint m_DepthStencil_vert = 0;
+    GLuint m_CombinedTexture = 0;
+
+    FrameBuffer m_GaussianFrameBuffer_horiz;
+    FrameBuffer m_GaussianFrameBuffer_vert;
+    FrameBuffer m_CombinedTextureBuffer;
+
+    ShaderProgram* m_GaussianProgram_horiz;
+    ShaderProgram* m_GaussianProgram_vert;
+    ShaderProgram* m_FillDepthStencilProgram;
+    ShaderProgram* m_CombineTexturesProgram;
+
+};
+
+#endif 

include/Engine/Rendering/BoneAttachmentSystem.h

@@ -8,6 +8,7 @@
 #include "Core/ResourceManager.h"
 #include "Rendering/Model.h"
 #include "Rendering/Skeleton.h"
+#include "Rendering/BlendTree.h"
 
 //Needs to be a higher orderlevel than AnimationSystem
 class BoneAttachmentSystem : public PureSystem

include/Engine/Rendering/CubeMapPass.h

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

include/Engine/Rendering/DrawBloomPass.h

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

include/Engine/Rendering/DrawColorCorrectionPass.h

@@ -17,7 +17,7 @@ public:
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
 
-    void Draw(GLuint sceneTexture, GLuint bloomTexture, GLuint sceneTextureLowRes, GLuint bloomTextureLowRes, GLfloat gamma, GLfloat exposure);
+    void Draw(GLuint sceneTexture, GLuint bloomTexture, GLfloat gamma, GLfloat exposure);
 private:
     const IRenderer* m_Renderer;
 

include/Engine/Rendering/DrawFinalPass.h

@@ -5,43 +5,44 @@
 #include "DrawFinalPassState.h"
 #include "LightCullingPass.h"
 #include "CubeMapPass.h"
+#include "SSAOPass.h"
 #include "FrameBuffer.h"
 #include "ShaderProgram.h"
 #include "Util/UnorderedMapVec2.h"
 #include "Util/CommonFunctions.h"
 #include "Texture.h"
+#include "ShadowPass.h"
+#include "BlurHUD.h"
 
 class DrawFinalPass
 {
 public:
-    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass);
-    ~DrawFinalPass() { }
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass, ShadowPass* shadowPass);
+	~DrawFinalPass();
     void InitializeTextures();
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
-    void Draw(RenderScene& scene, GLuint SSAOTexture);
+    void Draw(RenderScene& scene, BlurHUD* blurHUDPass);
     void ClearBuffer();
     void OnWindowResize();
 
     //Return the texture that is used in later stages to apply the bloom effect
     GLuint BloomTexture() const { return m_BloomTexture; }
-    GLuint BloomTextureLowRes() const { return m_BloomTextureLowRes; }
     //Return the texture with diffuse and lighting of the scene.
     GLuint SceneTexture() const { return m_SceneTexture; }
-    GLuint SceneTextureLowRes() const { return m_SceneTextureLowRes; }
+    //Return the SceneTexture with the blurred HUD bits.
+    GLuint CombinedSceneTexture() const { return m_CombinedTexture; }
+    //Return the blurred scene texture.
+    GLuint FullBlurredTexture() const { return m_FullBlurredTexture; }
     //Return the framebuffer used in the scene rendering stage.
     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, GLuint SSAOTexture);
-    void DrawShieldToStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
+    void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
+	void DrawModelRenderQueuesWithShieldCheck(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);
+    void DrawToDepthStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
 
     void BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job, RenderScene& scene);
     void BindModelUniforms(GLuint shaderHandle, std::shared_ptr<ModelJob>& job, RenderScene& scene);
@@ -56,14 +57,14 @@ private:
     Texture* m_ErrorTexture;
 
     FrameBuffer m_FinalPassFrameBuffer;
-    FrameBuffer m_FinalPassFrameBufferLowRes;
-    GLuint m_BloomTexture;
-    GLuint m_SceneTexture;
-    GLuint m_BloomTextureLowRes;
-    GLuint m_SceneTextureLowRes;
-    GLuint m_DepthBuffer;
-    GLuint m_DepthBufferLowRes;
-    GLuint m_CubeMapTexture;
+	FrameBuffer m_ShieldDepthFrameBuffer;
+    GLuint m_BloomTexture = 0;
+    GLuint m_SceneTexture = 0;
+    GLuint m_DepthBuffer = 0;
+	GLuint m_ShieldBuffer = 0;
+    GLuint m_CubeMapTexture = 0;
+    GLuint m_FullBlurredTexture;
+    GLuint m_CombinedTexture; //This can be removed for less memory usage, just set m_sceneTexture to the return from m_BlurHUDPass.CombineTextures 
 
     //maqke this component based i guess?
     GLuint m_ShieldPixelRate = 16;
@@ -71,22 +72,35 @@ private:
     const IRenderer* m_Renderer;
     const LightCullingPass* m_LightCullingPass;
     const CubeMapPass* m_CubeMapPass;
+	const SSAOPass* m_SSAOPass;
+	const ShadowPass* m_ShadowPass;
 
     ShaderProgram* m_ForwardPlusProgram;
     ShaderProgram* m_ExplosionEffectProgram;
 	ShaderProgram* m_ExplosionEffectSplatMapProgram;
     ShaderProgram* m_SpriteProgram;
 	ShaderProgram* m_ForwardPlusSplatMapProgram;
-    ShaderProgram* m_ShieldToStencilProgram;
-    ShaderProgram* m_FillDepthBufferProgram;
+    ShaderProgram* m_FillDepthStencilBufferProgram;
+
+	ShaderProgram* m_ForwardPlusShieldCheckProgram;
+	ShaderProgram* m_ExplosionEffectShieldCheckProgram;
+	ShaderProgram* m_ExplosionEffectSplatMapShieldCheckProgram;
+	ShaderProgram* m_SpriteShieldCheckProgram;
+	ShaderProgram* m_ForwardPlusSplatMapShieldCheckProgram;
+
 
 
 	ShaderProgram* m_ForwardPlusSkinnedProgram;
 	ShaderProgram* m_ExplosionEffectSkinnedProgram;
 	ShaderProgram* m_ExplosionEffectSplatMapSkinnedProgram;
 	ShaderProgram* m_ForwardPlusSplatMapSkinnedProgram;
-    ShaderProgram* m_ShieldToStencilSkinnedProgram;
-    ShaderProgram* m_FillDepthBufferSkinnedProgram;
+    ShaderProgram* m_FillDepthStencilBufferSkinnedProgram;
+
+	ShaderProgram* m_ForwardPlusSkinnedShieldCheckProgram;
+	ShaderProgram* m_ExplosionEffectSkinnedShieldCheckProgram;
+	ShaderProgram* m_ExplosionEffectSplatMapSkinnedShieldCheckProgram;
+	ShaderProgram* m_ForwardPlusSplatMapSkinnedShieldCheckProgram;
+	ShaderProgram* m_FillDepthBufferSkinnedShieldCheckProgram;
 };
 
 #endif 

include/Engine/Rendering/EAutoAnimationBlend.h

@@ -0,0 +1,28 @@
+#ifndef Events_AutoAnimationBlend_h__
+#define Events_AutoAnimationBlend_h__
+
+#include "../Core/EventBroker.h"
+#include "../Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct AutoAnimationBlend : Event
+{
+    EntityWrapper RootNode = EntityWrapper::Invalid;
+    std::string NodeName;
+    double Duration = 0.0;
+    double Delay = 0.0;
+    
+    bool Start = false;
+    bool Reverse = false;
+    bool Restart = false;
+    bool SingleLevelBlend = false;
+    double Weight = -1.0;
+
+    EntityWrapper AnimationEntity = EntityWrapper::Invalid;
+};
+
+}
+
+#endif

include/Engine/Rendering/EResolutionChanged.h

@@ -0,0 +1,19 @@
+#ifndef EResolutionChanged_h__
+#define EResolutionChanged_h__
+
+#include "../Core/Event.h"
+#include "../Core/Util/Rectangle.h"
+
+namespace Events
+{
+
+// Fired when the framebuffer size changes
+struct ResolutionChanged : Event
+{
+    Rectangle OldResolution;
+    Rectangle NewResolution;
+};
+
+}
+
+#endif

include/Engine/Rendering/ESetBlendWeight.h

@@ -0,0 +1,20 @@
+#ifndef Events_SetBlendWeight_h__
+#define Events_SetBlendWeight_h__
+
+#include "../Core/EventBroker.h"
+#include "../Core/EntityWrapper.h"
+
+namespace Events
+{
+
+//Sets the blend weight for all nodes with "NodeName"
+struct SetBlendWeight : Event
+{
+    EntityWrapper RootNode = EntityWrapper::Invalid;
+    std::string NodeName;
+    double Weight;
+};
+
+}
+
+#endif

include/Engine/Rendering/ExplosionEffectJob.h

@@ -15,8 +15,8 @@
 
 struct ExplosionEffectJob : ModelJob
 {
-    ExplosionEffectJob(ComponentWrapper explosionEffectComponent, ::Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matGroup, ComponentWrapper modelComponent, ::World* world, glm::vec4 fillColor, float fillPercentage)
-        : ModelJob(model, camera, matrix, matGroup, modelComponent, world, fillColor, fillPercentage)
+    ExplosionEffectJob(ComponentWrapper explosionEffectComponent, ::Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matGroup, ComponentWrapper modelComponent, ::World* world, glm::vec4 fillColor, float fillPercentage, bool isShielded, bool shadow)
+        : ModelJob(model, camera, matrix, matGroup, modelComponent, world, fillColor, fillPercentage, isShielded, shadow)
     {
         ExplosionOrigin = (glm::vec3)explosionEffectComponent["ExplosionOrigin"];
         TimeSinceDeath = (double)explosionEffectComponent["TimeSinceDeath"];

include/Engine/Rendering/FrameBuffer.h

@@ -7,11 +7,12 @@
 class BufferResource
 {
 public:
-    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment);
+    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment, GLuint mipMapLod);
     
     GLuint* m_ResourceHandle;
     GLenum m_ResourceType;
     GLenum m_Attachment;
+    GLuint m_MipMapLod = 0;
 private:
     
 };
@@ -20,15 +21,15 @@ template <GLenum RESOURCETYPE>
 class ResourceType : public BufferResource
 {
 public:
-    ResourceType(GLuint* resourceHandle, GLenum attachment)
-        : BufferResource(resourceHandle, RESOURCETYPE, attachment) { }
+    ResourceType(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod)
+        : BufferResource(resourceHandle, RESOURCETYPE, attachment, mipMapLod) { }
 };
 
 class Texture2D : public ResourceType<GL_TEXTURE_2D>
 {
 public:
-    Texture2D(GLuint* resourceHandle, GLenum attachment)
-        : ResourceType(resourceHandle, attachment) { };
+    Texture2D(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod = 0)
+        : ResourceType(resourceHandle, attachment, mipMapLod) { };
 
     ~Texture2D();
 };
@@ -37,12 +38,22 @@ class RenderBuffer : public ResourceType<GL_RENDERBUFFER>
 {
 public:
     RenderBuffer(GLuint* resourceHandle, GLenum attachment)
-        : ResourceType(resourceHandle, attachment)
+        : ResourceType(resourceHandle, attachment, 0)
     { };
 
     ~RenderBuffer();
 };
 
+class Texture2DArray : public ResourceType<GL_TEXTURE_2D_ARRAY>
+{
+public:
+	Texture2DArray(GLuint* resourceHandle, GLenum attachment)
+		: ResourceType(resourceHandle, attachment, 0)
+	{ };
+
+	~Texture2DArray();
+};
+
 class FrameBuffer
 {
 public:

include/Engine/Rendering/IRenderer.h

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

include/Engine/Rendering/LightCullingPass.h

@@ -54,7 +54,7 @@ private:
     struct Frustum {
         Plane Planes[4];
     };
-    Frustum* m_Frustums;
+    Frustum* m_Frustums = nullptr;
 
     //This should be a component
     struct LightSource {
@@ -74,11 +74,11 @@ private:
         glm::vec2 Padding = glm::vec2(1.f, 2.f);
     };
 
-    LightGrid* m_LightGrid;
+    LightGrid* m_LightGrid = nullptr;
 
     int m_LightOffset = 0;
 
-    float* m_LightIndex;
+    float* m_LightIndex = nullptr;
 };
 
 

include/Engine/Rendering/ModelJob.h

@@ -15,10 +15,11 @@
 #include "../Core/Transform.h"
 #include "Skeleton.h"
 #include "ShaderProgram.h"
+#include "BlendTree.h"
 
 struct ModelJob : RenderJob
 {
-    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matProp, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage)
+    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matProp, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage, bool isShielded, bool shadow)
         : RenderJob()
     {
         Model = model;
@@ -110,45 +111,28 @@ struct ModelJob : RenderJob
         Color = modelComponent["Color"];
         GlowIntensity = ((double)modelComponent["GlowIntensity"]);
         Entity = modelComponent.EntityID;
-        glm::vec3 abspos = Transform::AbsolutePosition(world, modelComponent.EntityID);
+        glm::vec3 abspos = glm::vec3(matrix[3][0], matrix[3][1], matrix[3][2]);
         glm::vec3 worldpos = glm::vec3(camera->ViewMatrix() * glm::vec4(abspos, 1));
         Depth = worldpos.z;
         World = world;
+		Shadow = shadow;
 
         FillColor = fillColor;
         FillPercentage = fillPercentage;
-
+		IsShielded = isShielded;
 
         if (model->IsSkinned()) {
             Skeleton = Model->m_RawModel->m_Skeleton;
 
             if (Skeleton != nullptr) {
-                if (world->HasComponent(Entity, "Animation")) {
-                    auto animationComponent = world->GetComponent(Entity, "Animation");
+                
+                EntityWrapper entityWrapper = EntityWrapper(world, modelComponent.EntityID);
 
-                    for (int i = 1; i <= 3; i++) {
-                        ::Skeleton::AnimationData animationData;
-                        animationData.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationComponent["AnimationName" + std::to_string(i)]);
-                        if (animationData.animation == nullptr) {
-                            continue;
-                        }
-                        animationData.time = (double)animationComponent["Time" + std::to_string(i)];
-                        animationData.weight = (double)animationComponent["Weight" + std::to_string(i)];
-
-                        Animations.push_back(animationData);
-                    }
-                }
-
-                if (world->HasComponent(Entity, "AnimationOffset")) {
-                    auto animationOffsetComponent = world->GetComponent(Entity, "AnimationOffset");
-                    AnimationOffset.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationOffsetComponent["AnimationName"]);
-                    AnimationOffset.time = (double)animationOffsetComponent["Time"];
-                } else {
-                    AnimationOffset.animation = nullptr;
+                if(Skeleton->BlendTrees.find(entityWrapper) != Skeleton->BlendTrees.end()) {
+                    BlendTree = Skeleton->BlendTrees.at(entityWrapper);
                 }
             }
         }
-            
     };
 
     unsigned int TextureID;
@@ -167,10 +151,7 @@ struct ModelJob : RenderJob
     glm::vec4 Color;
     const ::Model* Model = nullptr;
     ::Skeleton* Skeleton = nullptr;
-    std::vector<::Skeleton::AnimationData> Animations;
-    ::Skeleton::AnimationOffset AnimationOffset;
-    
-
+    std::shared_ptr<::BlendTree> BlendTree = nullptr;
     float GlowIntensity = 8.0;
     glm::vec4 DiffuseColor;
     glm::vec4 SpecularColor;
@@ -181,10 +162,14 @@ struct ModelJob : RenderJob
 
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;
+	bool IsShielded;
+	bool Shadow;
 
     void CalculateHash() override
     {
-        Hash = ShaderID << 20 + ModelID << 10 + TextureID;
+		Hash = TextureID;
+		Hash += ModelID << 10;
+		Hash += ShaderID << 20;
     }
 };
 

include/Engine/Rendering/PickingPass.h

@@ -28,15 +28,13 @@ public:
     const ShaderProgram& PickingProgram() const { return *m_PickingProgram; }
     //const std::unordered_map<glm::ivec2, EntityID>& PickingColorsToEntity() const { return m_PickingColorsToEntity; }
     GLuint PickingTexture() const { return m_PickingTexture; }
-    GLuint DepthBuffer() const { return m_DepthBuffer; }
+    GLuint* DepthBuffer() { return &m_DepthBuffer; }
     const FrameBuffer& PickingBuffer() const { return m_PickingBuffer; }
 
     
     PickData Pick(glm::vec2 screenCoord);
 
 private:
-    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
-
     EventBroker* m_EventBroker;
 
     const IRenderer* m_Renderer;
@@ -54,8 +52,8 @@ private:
 
     std::unordered_map<glm::ivec2, PickingInfo> m_PickingColorsToEntity;
 
-    GLuint m_PickingTexture;
-    GLuint m_DepthBuffer;
+    GLuint m_PickingTexture = 0;
+    GLuint m_DepthBuffer = 0;
 
     FrameBuffer m_PickingBuffer;
 

include/Engine/Rendering/RenderJob.h

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

include/Engine/Rendering/RenderQueue.h

@@ -24,7 +24,6 @@ struct RenderScene
         std::list<std::shared_ptr<RenderJob>> OpaqueObjects;
         std::list<std::shared_ptr<RenderJob>> TransparentObjects;
         std::list<std::shared_ptr<RenderJob>> OpaqueShieldedObjects;
-        std::list<std::shared_ptr<RenderJob>> TransparentShieldedObjects;
         std::list<std::shared_ptr<RenderJob>> ShieldObjects;
         std::list<std::shared_ptr<RenderJob>> SpriteJob;
         std::list<std::shared_ptr<RenderJob>> PointLight;
@@ -34,6 +33,7 @@ struct RenderScene
 
     Rectangle Viewport;
     bool ClearDepth = false;
+    bool ShouldBlur = false;
     glm::vec4 AmbientColor;
 
 	void Clear()
@@ -41,7 +41,6 @@ struct RenderScene
         Jobs.OpaqueObjects.clear();
         Jobs.TransparentObjects.clear();
         Jobs.OpaqueShieldedObjects.clear();
-        Jobs.TransparentShieldedObjects.clear();
         Jobs.ShieldObjects.clear();
         Jobs.SpriteJob.clear();
         Jobs.DirectionalLight.clear();

include/Engine/Rendering/RenderState.h

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

include/Engine/Rendering/RenderSystem.h

@@ -19,6 +19,7 @@
 #include "../Core/Octree.h"
 #include "../Collision/EntityAABB.h"
 #include "../Core/ConfigFile.h"
+#include "EResolutionChanged.h"
 
 class RenderSystem : public ImpureSystem
 {
@@ -36,6 +37,8 @@ private:
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
     Octree<EntityAABB>* m_Octree;
 
+    EventRelay<RenderSystem, Events::ResolutionChanged> m_EResolutionChanged;
+    bool OnResolutionChanged(Events::ResolutionChanged &event);
     EventRelay<RenderSystem, Events::SetCamera> m_ESetCamera;
     bool OnSetCamera(Events::SetCamera &event);
     EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;

include/Engine/Rendering/Renderer.h

@@ -18,6 +18,7 @@
 #include "DrawColorCorrectionPass.h"
 #include "SSAOPass.h"
 #include "CubeMapPass.h"
+#include "BlurHUD.h"
 #include "../Core/EventBroker.h"
 #include "ImGuiRenderPass.h"
 #include "Camera.h"
@@ -26,15 +27,22 @@
 #include "TextPass.h"
 #include "Util/CommonFunctions.h"
 #include "Core/PerformanceTimer.h"
+#include "ShadowPass.h"
+#include "EResolutionChanged.h"
 
 class Renderer : public IRenderer
 {
     static void glfwFrameBufferCallback(GLFWwindow* window, int width, int height);
+    static void glfwWindowSizeCallback(GLFWwindow* window, int width, int height);
 
 public:
-    Renderer(EventBroker* eventBroker) 
-        : m_EventBroker(eventBroker)
+	Renderer(EventBroker* eventBroker, ConfigFile* config)
+		: m_EventBroker(eventBroker)
+		, m_Config(config)
     { }
+	~Renderer();
+
+    virtual void SetResolution(const Rectangle& resolution) override;
 
     virtual void Initialize() override;
     virtual void Update(double dt) override;
@@ -42,11 +50,11 @@ public:
 
     virtual PickData Pick(glm::vec2 screenCoord) override;
 
-
 private:
     //----------------------Variables----------------------//
 
     static std::unordered_map <GLFWwindow*, Renderer*> m_WindowToRenderer;
+	ConfigFile* m_Config;
 
     EventBroker* m_EventBroker;
     TextPass* m_TextPass;
@@ -61,12 +69,8 @@ private:
     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;
+	int m_SSAO_Quality = 0;
+	int m_GLOW_Quality = 2;
 
     PickingPass* m_PickingPass;
     LightCullingPass* m_LightCullingPass;
@@ -77,6 +81,8 @@ private:
     DrawColorCorrectionPass* m_DrawColorCorrectionPass;
 	SSAOPass* m_SSAOPass;
     CubeMapPass* m_CubeMapPass;
+	ShadowPass* m_ShadowPass;
+    BlurHUD* m_BlurHUDPass;
 
     //----------------------Functions----------------------//
     void InitializeWindow();
@@ -87,11 +93,14 @@ private:
     void InputUpdate(double dt);
     //void PickingPass(RenderQueueCollection& rq);
     //void DrawScreenQuad(GLuint textureToDraw);
+    void setWindowSize(Rectangle size);
+    void updateFramebufferSize();
 
     static bool DepthSort(const std::shared_ptr<RenderJob> &i, const std::shared_ptr<RenderJob> &j) { return (i->Depth < j->Depth); }
     void SortRenderJobsByDepth(RenderScene &scene);
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
-	//--------------------ShaderPrograms-------------------//
+
+    //--------------------ShaderPrograms-------------------//
     ShaderProgram* m_BasicForwardProgram;
     ShaderProgram* m_ExplosionEffectProgram;
 

include/Engine/Rendering/SSAOPass.h

@@ -13,18 +13,32 @@
 class SSAOPass
 {
 public:
-	SSAOPass(IRenderer* rendere);
-	~SSAOPass() { 
-		delete m_DrawBloomPass;
-	};
+	SSAOPass(IRenderer* renderer, ConfigFile* config);
+	~SSAOPass();
+
+	void ChangeQuality(int quality);
 
 	void Draw(GLuint depthBuffer, Camera* camera);
-	void Setting(float radius, float bias, float contrast, float intensityScale, int numOfSamples, int NumOfTurns);
+	void Setting(float radius, float bias, float contrast, float intensityScale, int numOfSamples, int numOfTurns, int iterations, int quality);
 	void ClearBuffer();
 	void OnWindowResize();
 
 	//Return the SSAO of the texture sent to Draw
-	GLuint SSAOTexture() const { return m_DrawBloomPass->GaussianTexture(); }
+	GLuint SSAOTexture() const { 
+		if (m_Quality == 0) {
+			return m_WhiteTexture->m_Texture;
+		} else {
+			return m_Gaussian_vert;
+		}
+	}
+
+	int TextureQuality() const {
+		if (m_Quality == 0) {
+			return 13;
+		} else {
+			return m_TextureQuality;
+		}
+	}
 
 private:
 	void InitializeTexture();
@@ -32,14 +46,13 @@ private:
 	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;
+	ConfigFile* m_Config;
 
 	float m_Radius;
 	float m_Bias;
@@ -47,17 +60,28 @@ private:
 	float m_IntensityScale;
 	int m_NumOfSamples;
 	int m_NumOfTurns;
+	int m_Iterations;
+	int m_TextureQuality;
+	int m_Quality = 0;
 
-	GLuint m_SSAOTexture;
+	Texture* m_WhiteTexture;
+
+	GLuint m_SSAOTexture = 0;
 	FrameBuffer m_SSAOFramBuffer;
 
-	GLuint m_SSAOViewSpaceZTexture;
+	GLuint m_SSAOViewSpaceZTexture = 0;
 	FrameBuffer m_SSAOViewSpaceZFramBuffer;
 
+	GLuint m_Gaussian_horiz = 0;
+	GLuint m_Gaussian_vert = 0;
+
+	FrameBuffer m_GaussianFrameBuffer_horiz;
+	FrameBuffer m_GaussianFrameBuffer_vert;
+
 	ShaderProgram* m_SSAOProgram;
 	ShaderProgram* m_SSAOViewSpaceZProgram;
-
-	DrawBloomPass* m_DrawBloomPass;
+	ShaderProgram* m_GaussianProgram_horiz;
+	ShaderProgram* m_GaussianProgram_vert;
 };
 
 #endif

include/Engine/Rendering/ShaderProgram.h

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

include/Engine/Rendering/ShadowPass.h

@@ -0,0 +1,88 @@
+#ifndef ShadowPass_h__
+#define ShadowPass_h__
+
+#include "IRenderer.h"
+#include "FrameBuffer.h"
+#include "ShaderProgram.h"
+#include "../Core/EventBroker.h"
+#include "../Core/World.h"
+#include "ShadowPassState.h"
+#include "imgui/imgui.h"
+
+#define MAX_SPLITS 4
+
+enum NearFar { NEAR = 0, FAR = 1 };
+enum LRBT { LEFT = 0, RIGHT = 1, BOTTOM = 2, TOP = 3 };
+
+struct ShadowFrustum
+{
+	float NearClip;
+	float FarClip;
+	float FOV;
+	float AspectRatio;
+	glm::vec3 MiddlePoint;
+	float Radius;
+	std::array<float, 4> LRBT;
+	std::array<glm::vec3, 8> CornerPoint;
+};
+
+class ShadowPass
+{
+public:
+	ShadowPass(IRenderer* renderer);
+	ShadowPass(IRenderer * renderer, int ShadowResX, int ShadowResY);
+	~ShadowPass();
+
+	void InitializeFrameBuffers();
+	void InitializeShaderPrograms();
+	void ClearBuffer();
+	void Draw(RenderScene& scene);
+
+	void DebugGUI();
+
+	GLuint DepthMap() const { return m_DepthMap; }
+	std::array<glm::mat4, MAX_SPLITS> LightP() const { return m_LightProjection; }
+	std::array<glm::mat4, MAX_SPLITS> LightV() const { return m_LightView; }
+	std::array<float, MAX_SPLITS> FarDistance() const { std::array<float, MAX_SPLITS> f; for (int i = 0; i < MAX_SPLITS; i++) f[i] = m_shadowFrusta[i].FarClip; return f; }
+	int CurrentNrOfSplits() const { return m_CurrentNrOfSplits; }
+
+	void SetSplitWeight(float split_weight) { m_SplitWeight = split_weight; };
+private:
+	void InitializeCameras(RenderScene & scene);
+	void UpdateSplitDist(std::array<ShadowFrustum, MAX_SPLITS>& frusta, float near_distance, float far_distance);
+	void UpdateFrustumPoints(ShadowFrustum& frustum, glm::vec3 camera_position, glm::vec3 view_dir);
+	void UpdateFrustumPoints(ShadowFrustum& frustum, glm::mat4 p, glm::mat4 v);
+
+	void PointsToLightspace(ShadowFrustum& frustum, glm::mat4 v);
+
+	float FindRadius(ShadowFrustum& frustum);
+	void RadiusToLightspace(ShadowFrustum& frustum);
+
+	EventBroker* m_EventBroker;
+	const IRenderer* m_Renderer;
+
+	GLuint m_DepthMap;
+	FrameBuffer m_DepthBuffer;
+    ShaderProgram* m_ShadowProgram;
+    ShaderProgram* m_ShadowProgramSkinned;
+
+	std::array<glm::mat4, MAX_SPLITS> m_LightProjection;
+	std::array<glm::mat4, MAX_SPLITS> m_LightView;
+
+	GLfloat m_NearFarPlane[2] = { -34.f, 27.f };
+	GLuint m_ResolutionSizeWidth = 1024 * 2;
+	GLuint m_ResolutionSizeHeight = 1024 * 2;
+
+	bool m_TransparentObjects = false;
+	bool m_TexturedShadows = false;
+	bool m_EnableShadows = true;
+
+	int m_CurrentNrOfSplits = 4;
+	float m_SplitWeight = 0.962f;
+
+	std::array<ShadowFrustum, MAX_SPLITS> m_shadowFrusta;
+
+	Texture* m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/White.png");
+};
+
+#endif

include/Engine/Rendering/ShadowPassState.h

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

include/Engine/Rendering/Skeleton.h

@@ -6,27 +6,9 @@
 #include "../GLM.h"
 #include <glm/gtx/matrix_decompose.hpp>
 #include <imgui/imgui.h>
+#include "../Core/EntityWrapper.h"
 
-//struct Bone
-//{
-//	Bone(std::string name, glm::mat4 offsetMatrix)
-//		: Name(name)
-//		, OffsetMatrix(offsetMatrix)
-//	{ }
-//
-//	~Bone()
-//	{
-//		for (auto kv : Children) {
-//			delete kv.second;
-//		}
-//	}
-//
-//	std::string Name;
-//	glm::mat4 OffsetMatrix;
-//	glm::mat4 LocalMatrix;
-//
-//	std::map<std::string, Bone*> Children;
-//};
+class BlendTree;
 
 class Skeleton
 {
@@ -68,58 +50,43 @@ public:
         std::map<int, std::vector<Keyframe>> JointAnimations;
 	};
 
-    struct AnimationData
-    {
-        const Animation* animation;
-        float time;
-        float weight;
-    };
-
-    struct JointFrameTransform {
-        glm::vec3 PositionInterp = glm::vec3(0);
-        glm::quat RotationInterp = glm::quat();
-        glm::vec3 ScaleInterp = glm::vec3(0);
-        float Weight;
-    };
-
-    struct AnimationOffset {
-        const Animation* animation;
-        float time;
+    struct PoseData {
+        glm::vec3 Translation;
+        glm::quat Orientation;
+        glm::vec3 Scale;
     };
 
 	Skeleton() { }
 	~Skeleton();
 
 	Bone* RootBone;
-
 	std::map<int, Bone*> Bones;
 
+    std::unordered_map<EntityWrapper, std::shared_ptr<BlendTree>> BlendTrees;
+
 	// Attach a new bone to the skeleton
 	// Returns: New bone index
 	int CreateBone(int ID, int parentID, std::string name, glm::mat4 offsetMatrix);
-
 	int GetBoneID(std::string name);
-
-    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, AnimationOffset animationOffset, bool noRootMotion = false);
-    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, bool noRootMotion = false);
-
     const Animation* GetAnimation(std::string name);
 
-    void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
-    void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, AnimationOffset animationOffset, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
+    std::map<int, Skeleton::PoseData> GetFrameBones(const Animation* animation, double time, bool additive, bool noRootMotion = false);
+    
+    std::map<int, Skeleton::PoseData> BlendPoses(const std::map<int, PoseData>& pose1, const std::map<int, PoseData>& pose2, double weight);
+    std::map<int, Skeleton::PoseData> OverridePose(const std::map<int, PoseData>& overridePose, const std::map<int, PoseData>& targetPose);
+    std::map<int, Skeleton::PoseData> BlendPoseAdditive(const std::map<int, PoseData>& additivePose, const std::map<int, PoseData>& targetPose);
+    void GetFinalPose(std::map<int, Skeleton::PoseData>& boneMatrices, std::vector<glm::mat4>& finalPose, std::map<int, glm::mat4>& boneTransforms);
+    
+    std::vector<glm::mat4> GetTPose();
 
-    void PrintSkeleton();
-	void PrintSkeleton(const Bone* parent, int depthCount);
-	std::map<std::string, Animation> Animations;
-
-    glm::mat4 GetBoneTransform(const Bone* bone, const Animation* animation, float time, glm::mat4 childMatrix);
-    glm::mat4 GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, AnimationOffset animationOffset, glm::mat4 childMatrix);
-    glm::mat4 GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, glm::mat4 childMatrix);
-    int GetKeyframe(const Animation& animation, double time);
 
+    std::map<std::string, Animation> Animations;
 private:
-
-    glm::mat4 GetOffsetTransform(const Bone* bone, AnimationOffset animationOffset);
+    Skeleton::PoseData GetAdditiveBonePose(const Bone* bone, const Animation* animation, double time);
+    
+    void AccumulateFinalPose(std::map<int, glm::mat4>& boneMatrices, std::map<int, Skeleton::PoseData>& poseDatas, std::map<int, glm::mat4>& boneTransforms, const Bone* bone, glm::mat4 parentMatrix);
+    void AdditiveBoneTransforms(const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone);
+    void AccumulateBoneTransforms(bool noRootMotion, const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone);
 
 	std::map<std::string, Bone*> m_BonesByName;
     

include/Engine/Rendering/SpriteJob.h

@@ -7,6 +7,7 @@
 #include "../GLM.h"
 #include "../Core/ComponentWrapper.h"
 #include "Texture.h"
+#include "TextureSprite.h"
 #include "Model.h"
 #include "RenderJob.h"
 #include "../Core/ResourceManager.h"
@@ -20,18 +21,21 @@ struct SpriteJob : RenderJob
     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");
+        Model = ResourceManager::Load<::Model>((std::string)cSprite["Model"]);
         ::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
         TextureID = 0;
 
-        DiffuseTexture = CommonFunctions::LoadTexture(cSprite["DiffuseTexture"], true);
+        DiffuseTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["DiffuseTexture"]);
+        IncandescenceTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["GlowMap"]);
 
-        IncandescenceTexture = CommonFunctions::LoadTexture(cSprite["GlowMap"], true);
+        Linear = (bool)cSprite["Linear"];
 
         StartIndex = matProp.material->StartIndex;
         EndIndex = matProp.material->EndIndex;
 		Matrix = matrix;
         Color = cSprite["Color"];
+        BlurBackground = (bool)cSprite["BlurBackground"];
+
         Entity = cSprite.EntityID;
         Position = Transform::AbsolutePosition(world, cSprite.EntityID);
         Depth = 0;
@@ -45,6 +49,26 @@ struct SpriteJob : RenderJob
 
         FillColor = fillColor;
         FillPercentage = fillPercentage;
+
+        glm::vec3 scale = Transform::AbsoluteScale(world, cSprite.EntityID);
+
+        if((bool)cSprite["KeepRatio"] == true) {
+            if(scale.y >= scale.x) {
+                ScaleY = (scale.x)/(scale.y);
+                ScaleX = 1.f;
+            } else {
+                ScaleY = 1.f;
+                ScaleX = (scale.x)/(scale.y);
+            }
+        } else {
+            if ((bool)cSprite["KeepRatioX"] == true) {
+                ScaleX = scale.x;
+            }
+            if ((bool)cSprite["KeepRatioY"] == true) {
+                ScaleY = scale.y;
+            }
+        }
+
     };
 
     unsigned int TextureID;
@@ -65,6 +89,10 @@ struct SpriteJob : RenderJob
 
     bool Pickable;
 	bool IsIndicator = false;
+    bool BlurBackground = false;
+    float ScaleX = 1;
+    float ScaleY = 1;
+    bool Linear = false;
 
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;

include/Engine/Rendering/Texture.h

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

include/Engine/Rendering/TextureSprite.h

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

include/Engine/Rendering/Util/CommonFunctions.h

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

include/Engine/Rendering/Util/GLError.h

@@ -16,7 +16,11 @@ inline bool _GLERROR(const char* info, const char* file, const char* func, unsig
 	return false;
 }
 
+#ifdef DEBUG
 #define GLERROR(function) \
 	_GLERROR(function, __BASE_FILE__, __func__, __LINE__)
+#else
+#define GLERROR(function) false
+#endif
 
 #endif

include/Game/Events/EDashAbility.h

@@ -2,11 +2,15 @@
 #define Events_DashAbility_h__
 
 #include "Core/Event.h"
+#include "Core/EntityWrapper.h"
 
 namespace Events
 {
 
-struct DashAbility : public Event { };
+struct DashAbility : public Event 
+{
+    EntityID Player;
+};
 
 }
 

include/Game/Events/EDoubleJump.h

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

include/Game/Game.h

@@ -13,13 +13,13 @@
 #include "Input/KeyboardInputHandler.h"
 #include "Input/MouseInputHandler.h"
 #include "Core/EKeyDown.h"
-#include "Core/EntityFilePreprocessor.h"
+#include "Core/EntityXMLFilePreprocessor.h"
 #include "Core/SystemPipeline.h"
 #include "Systems/ExplosionEffectSystem.h"
 #include "Editor/EditorSystem.h"
-#include "Core/EntityFile.h"
+#include "Core/EntityXMLFile.h"
 #include "Rendering/RenderSystem.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityXMLFileParser.h"
 #include "Core/Octree.h"
 #include "Rendering/Font.h"
 #include "Systems/InterpolationSystem.h"

include/Game/Systems/AbilityCooldownHUDSystem.h

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

include/Game/Systems/AmmoPickupSystem.h

@@ -4,7 +4,7 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPickupSpawned.h"
 #include "Core/EAmmoPickup.h"
 #include "Engine/Collision/ETrigger.h"
@@ -20,13 +20,37 @@ public:
 private:
     EventRelay<AmmoPickupSystem, Events::TriggerTouch> m_ETriggerTouch;
     bool OnTriggerTouch(Events::TriggerTouch& e);
+    EventRelay<AmmoPickupSystem, Events::TriggerLeave> m_ETriggerLeave;
+    bool OnTriggerLeave(Events::TriggerLeave& e);
+
+    EventRelay<AmmoPickupSystem, Events::AmmoPickup> m_EAmmoPickup;
+    bool OnAmmoPickup(Events::AmmoPickup& e);
 
     struct NewAmmoPickup {
         glm::vec3 Pos;
         double AmmoGain;
         double RespawnTimer;
         double DecreaseThisRespawnTimer;
+        EntityID parentID;
     };
     std::vector<NewAmmoPickup> m_ETriggerTouchVector;
+    struct EntityAtMaxValuePickupStruct {
+        EntityWrapper player;
+        EntityWrapper trigger;
+    };
+    std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
+    void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
+    //class
+    enum class PlayerClass {
+        Assault,
+        Defender,
+        Sniper,
+        None
+    };
+    //helper methods
+    bool DoesPlayerHaveMaxAmmo(EntityWrapper &player);
+    PlayerClass DetermineClass(EntityWrapper &player);
+    void SetPlayerAmmo(EntityWrapper &player, int ammoGain);
+    int GetPlayerMaxAmmo(EntityWrapper &player);
 };
 #endif

include/Game/Systems/AmmunitionHUDSystem.h

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

include/Game/Systems/BoostIconsHUDSystem.h

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

include/Game/Systems/BoostSystem.h

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

include/Game/Systems/CapturePointArrowHUDSystem.h

@@ -0,0 +1,30 @@
+#ifndef CapturePointArrowHUDSystem_h__
+#define CapturePointArrowHUDSystem_h__
+
+#include <GLFW/glfw3.h>
+#include <glm/common.hpp>
+#include <glm/gtx/vector_angle.hpp>
+
+#include "Common.h"
+#include "Core/System.h"
+#include "Core/Transform.h"
+#include "Core/ECaptured.h"
+
+
+class CapturePointArrowHUDSystem : public ImpureSystem
+{
+public:
+    CapturePointArrowHUDSystem(SystemParams params);
+
+    virtual void Update(double dt) override;
+
+private:
+    EventRelay<CapturePointArrowHUDSystem, Events::Captured> m_ECapturedEvent;
+    bool OnCapturePointCaptured(Events::Captured& e);
+
+    bool m_InitialtargetsSet = false;
+    glm::vec3 m_RedTeamCurrentTarget;
+    glm::vec3 m_BlueTeamCurrentTarget;
+};
+
+#endif

include/Game/Systems/CapturePointHUDSystem.h

@@ -7,7 +7,7 @@
 
 #include "Common.h"
 #include "Core/System.h"
-#include "Engine/Collision/ETrigger.h"
+#include "Collision/ETrigger.h"
 
 class CapturePointHUDSystem : public ImpureSystem
 {

include/Game/Systems/CapturePointSystem.h

@@ -30,6 +30,7 @@ private:
     bool CapturePointSystem::OnTriggerLeave(const Events::TriggerLeave& e);
     EventRelay<CapturePointSystem, Events::Captured> m_ECaptured;
     bool CapturePointSystem::OnCaptured(const Events::Captured& e);
+    void ChangeCapturePointModelsVisibility(EntityWrapper &capturePointModels, bool isOwner);
 
     bool m_WinnerWasFound = false;
     //need to track these variables for the captureSystem to work as per design!
@@ -42,9 +43,9 @@ private:
     int m_NumberOfCapturePoints = 0;
     std::map<int, EntityWrapper> m_CapturePointNumberToEntityMap;
 
-    //std::vector<ComponentWrapper>
-
     bool m_ResetTimers = false;
+    bool m_RecentlyCapturedNeedNextCapturePointNow = false;
+    Events::Captured m_CapturedEvent;
 
     //vectors which will keep track of enter/leave changes
     std::vector<std::tuple<EntityWrapper, EntityWrapper>> m_ETriggerTouchVector;

include/Game/Systems/DamageIndicatorSystem.h

@@ -4,7 +4,7 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPlayerDamage.h"
 #include "Common.h"
 #include <tuple>
@@ -15,6 +15,7 @@
 
 #include "Rendering/Util/CommonFunctions.h"
 //#define INDICATOR_TEST
+#include "Core/ConfigFile.h"
 
 class DamageIndicatorSystem : public ImpureSystem
 {
@@ -40,6 +41,8 @@ private:
     std::vector<DamageIndicatorStruct> updateDamageIndicatorVector;
     float CalculateAngle(EntityWrapper player, glm::vec3 enemyPos);
 
+    bool m_NetworkEnabled;
+
     //for tests
 #ifdef INDICATOR_TEST
     glm::vec3 DamageIndicatorTest(EntityWrapper player);

include/Game/Systems/FloatingEffectSystem.h

@@ -0,0 +1,19 @@
+#include "Common.h"
+#include "Core/System.h"
+
+class FloatingEffectSystem : public PureSystem
+{
+public:
+    FloatingEffectSystem(SystemParams params)
+        : System(params)
+        , PureSystem("FloatingEffect")
+    { }
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override
+    {
+        ComponentWrapper& transform = m_World->GetComponent(component.EntityID, "Transform");
+        (double&)component["Time"] += dt;
+        (glm::vec3&)transform["Position"] = (float)(double)component["Amplitude"] * glm::sin((glm::two_pi<float>() / (float)(double)component["Period"]) *  (float)(double)component["Time"]) * (glm::vec3)component["Axis"];
+
+    }
+};

include/Game/Systems/LifetimeSystem.h

@@ -10,7 +10,7 @@ public:
         : System(params)
         , PureSystem("Lifetime")
     {
-        LOG_INFO("ASDASDASSA");
+
     }
 
     virtual void Update(double dt) override;

include/Game/Systems/MainMenuSystem.h

@@ -1,15 +1,19 @@
 #ifndef MainMenuSystem_h__
 #define MainMenuSystem_h__
 
-#include "../Core/System.h"
-#include "../Rendering/IRenderer.h"
-#include "../Core/ResourceManager.h"
-#include "../Core/Event.h"
+#include "Core/System.h"
+#include "Rendering/IRenderer.h"
+#include "Core/ResourceManager.h"
+#include "Core/Event.h"
+#include "Systems/SpawnerSystem.h"
 
 
-#include "EButtonClicked.h"
-#include "EButtonPressed.h"
-#include "EButtonReleased.h"
+#include "GUI/EButtonClicked.h"
+#include "GUI/EButtonPressed.h"
+#include "GUI/EButtonReleased.h"
+#include "Input/EInputCommand.h"
+#include "Network/ESearchForServers.h"
+#include "Network/EConnectRequest.h"
 
 
 class MainMenuSystem : public ImpureSystem
@@ -27,6 +31,11 @@ private:
     bool OnButtonRelease(const Events::ButtonReleased& e);
     EventRelay<MainMenuSystem, Events::ButtonPressed> m_EPressed;
     bool OnButtonPress(const Events::ButtonPressed& e);
+    EventRelay<MainMenuSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
+
+    std::string m_CurrentCommand = "";
+    EntityWrapper m_OpenSubMenu = EntityWrapper::Invalid;
 
 };
 

include/Game/Systems/PickupSpawnSystem.h

@@ -4,12 +4,11 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPickupSpawned.h"
 #include "Core/EPlayerHealthPickup.h"
 #include "Engine/Collision/ETrigger.h"
 #include "Common.h"
-#include <tuple>
 
 class PickupSpawnSystem : public ImpureSystem
 {
@@ -21,13 +20,22 @@ public:
 private:
     EventRelay<PickupSpawnSystem, Events::TriggerTouch> m_ETriggerTouch;
     bool OnTriggerTouch(Events::TriggerTouch& e);
+    EventRelay<PickupSpawnSystem, Events::TriggerLeave> m_ETriggerLeave;
+    bool OnTriggerLeave(Events::TriggerLeave& e);
 
     struct NewHealthPickup {
         glm::vec3 Pos;
         double HealthGain;
         double RespawnTimer;
         double DecreaseThisRespawnTimer;
+        EntityID parentID;
     };
     std::vector<NewHealthPickup> m_ETriggerTouchVector;
+    struct EntityAtMaxValuePickupStruct {
+        EntityWrapper player;
+        EntityWrapper trigger;
+    };
+    std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
+    void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
 };
 #endif

include/Game/Systems/PlayerDeathSystem.h

@@ -6,11 +6,9 @@
 #include "GLM.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
-
 #include "Core/EntityFile.h"
-#include "Core/EntityFileParser.h"
-
 #include "Core/EPlayerDeath.h"
+#include "Core/EEntityDeleted.h"
 
 class PlayerDeathSystem : public ImpureSystem
 {
@@ -20,9 +18,16 @@ public:
     virtual void Update(double dt) override;
 
 private:
+    EntityWrapper m_LocalPlayerDeathEffect;
+
     EventRelay<PlayerDeathSystem, Events::PlayerDeath> m_OnPlayerDeath;
     bool OnPlayerDeath(Events::PlayerDeath& e);
+    EventRelay<PlayerDeathSystem, Events::EntityDeleted> m_EEntityDeleted;
+    bool OnEntityDeleted(Events::EntityDeleted& e);
+    EventRelay<PlayerDeathSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(Events::InputCommand& e);
 
+    void setSpectatorCamera();
     void createDeathEffect(EntityWrapper player);
 
 };

include/Game/Systems/PlayerMovementSystem.h

@@ -6,9 +6,7 @@
 #include <imgui/imgui.h>
 #include "Events/EDoubleJump.h"
 #include "../Engine/Sound/EPlaySoundOnEntity.h"
-
 #include "Core/EntityFile.h"
-#include "Core/EntityFileParser.h"
 
 class PlayerMovementSystem : public ImpureSystem
 {
@@ -32,11 +30,19 @@ private:
     bool m_LeftFoot = false;
     // To get a difference when calculating the walking state.
     glm::vec3 m_LastPosition = glm::vec3();
+    // Used to track afterimages for sprint effect.
+    float m_SprintEffectTimer;
     // The logic for making the sound play when player is moving
     void playerStep(double dt);
+    // Spawn a hexagon at origin of an Entity
+    void spawnHexagon(EntityWrapper target);
 
     EventRelay<PlayerMovementSystem, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
+    EventRelay<PlayerMovementSystem, Events::DoubleJump> m_EDoubleJump;
+    bool PlayerMovementSystem::OnDoubleJump(Events::DoubleJump & e);
+    EventRelay<PlayerMovementSystem, Events::DashAbility> m_EDashAbility;
+    bool PlayerMovementSystem::OnDashAbility(Events::DashAbility & e);
 
     void updateMovementControllers(double dt);
     void updateVelocity(EntityWrapper player, double dt);

include/Game/Systems/PlayerSpawnSystem.h

@@ -13,14 +13,21 @@ public:
     PlayerSpawnSystem(SystemParams params);
 
     virtual void Update(double dt) override;
-    
-    static void SetRespawnTime(float respawnTime) { m_RespawnTime = respawnTime; };
 
 private:
+    // This enum must correspond to the command values for PickTeam buttons.
+    enum class PlayerClass
+    {
+        None = 0,
+        Assault,
+        Defender,
+        Sniper
+    };
     struct SpawnRequest
     {
         int PlayerID;
         ComponentInfo::EnumType Team;
+        PlayerClass Class;
     };
 
     bool m_NetworkEnabled = false;
@@ -31,8 +38,8 @@ private:
     //EntityWrapper ID -> Player ID.
     std::map<EntityID, int> m_PlayerIDs;
 
-    static float m_RespawnTime;
-    float m_Timer;
+    float m_ForcedRespawnTime;
+    bool m_DbgConfigForceRespawn;
 
     EventRelay<PlayerSpawnSystem, Events::InputCommand> m_OnInputCommand;
     bool OnInputCommand(Events::InputCommand& e);

include/Game/Systems/ScoreScreenSystem.h

@@ -0,0 +1,44 @@
+#ifndef ScoreScreenSystem_h__
+#define ScoreScreenSystem_h__
+
+#include "Core/System.h"
+#include "Core/ResourceManager.h"
+#include "Core/EntityFile.h"
+#include "Network/EKillDeath.h"
+#include "Core/EPlayerSpawned.h"
+#include "Network/EPlayerConnected.h"
+#include "Network/EPlayerDisconnected.h"
+#include "GLM.h"
+
+class ScoreScreenSystem : public PureSystem
+{
+public:
+    ScoreScreenSystem(SystemParams params);
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& scoreScreen, double dt) override;
+
+    EventRelay<ScoreScreenSystem, Events::KillDeath> m_EPlayerDeath;
+    bool OnPlayerDeath(const Events::KillDeath& e);
+    EventRelay<ScoreScreenSystem, Events::PlayerSpawned> m_EPlayerSpawned;
+    bool OnPlayerSpawn(const Events::PlayerSpawned& e);
+    EventRelay<ScoreScreenSystem, Events::PlayerConnected> m_EPlayerConnected;
+    bool OnPlayerConnected(const Events::PlayerConnected& e);
+    EventRelay<ScoreScreenSystem, Events::PlayerDisconnected> m_EPlayerDisconnected;
+    bool OnPlayerDisconnected(const Events::PlayerDisconnected& e);
+
+private:
+    struct PlayerData {
+        int ID = -1;
+        std::string Name = "";
+        int Team = 1;
+        int Kills = 0;
+        int Deaths = 0;
+        EntityWrapper Player = EntityWrapper::Invalid;
+    };
+
+    std::vector<int> m_DisconnectedIdentities;
+    int m_PlayerCounter = 0;
+    std::unordered_map<int, PlayerData> m_PlayerIdentities;
+};
+
+#endif

include/Game/Systems/ServerListSystem.h

@@ -0,0 +1,29 @@
+#ifndef ServerListSystem_h__
+#define ServerListSystem_h__
+
+#include "Core/System.h"
+#include "Rendering/IRenderer.h"
+#include "Core/ResourceManager.h"
+#include "Core/Event.h"
+#include "Systems/SpawnerSystem.h"
+#include "Core/EventBroker.h"
+
+#include "Network/ESearchForServers.h"
+#include "Network/EDisplayServerlist.h"
+
+class ServerListSystem : public PureSystem
+{
+public:
+    ServerListSystem(SystemParams params, IRenderer* renderer);
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cServerList, double dt) override;
+
+    void RefreshList();
+
+private:
+    IRenderer* m_Renderer;
+
+    EventRelay<ServerListSystem, Events::DisplayServerlist> m_EServerListRecieved;
+    bool OnServerListRecieved(const Events::DisplayServerlist& e);
+};
+
+#endif

include/Game/Systems/SpawnerSystem.h

@@ -7,8 +7,7 @@
 #include "Core/System.h"
 #include "Events/ESpawnerSpawn.h"
 #include "Core/Transform.h"
-#include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityFile.h"
 
 class SpawnerSystem : public System
 {

include/Game/Systems/SpectatorCameraSystem.h

@@ -0,0 +1,22 @@
+#ifndef SpectatorCameraSystem_h__
+#define SpectatorCameraSystem_h__
+
+#include "Core/System.h"
+#include "Input/EInputCommand.h"
+
+class SpectatorCameraSystem : public ImpureSystem
+{
+public:
+    SpectatorCameraSystem(SystemParams params);
+
+    virtual void Update(double dt) override;
+
+private:
+    int m_PickedTeam;
+    bool m_CamSetToTeamPick;
+
+    EventRelay<SpectatorCameraSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
+};
+
+#endif

include/Game/Systems/StartSystem.h

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

include/Game/Systems/TextFieldReader.h

@@ -0,0 +1,21 @@
+#ifndef AmmunitionHUDSystem_h__
+#define AmmunitionHUDSystem_h__
+
+#include <boost/lexical_cast.hpp>
+#include <sstream>
+#include <iomanip>
+#include "../../Engine/Core/System.h"
+#include "../../Engine/GLM.h"
+
+class TextFieldReader : public PureSystem
+{
+public:
+    TextFieldReader(SystemParams params)
+        : System(params)
+        , PureSystem("TextFieldReader")
+    { }
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cTextFieldReader, double dt) override;
+};
+
+#endif

include/Game/Systems/Weapon/AssaultWeaponBehaviour.h

@@ -1,49 +1,42 @@
-#include "Sound/EPlaySoundOnEntity.h"
-#include "Collision/Collision.h"
-#include "Rendering/AnimationSystem.h"
-#include "Core/ConfigFile.h"
+#ifndef AssaultWeaponBehaviour_h__
+#define AssaultWeaponBehaviour_h__
+
 #include "WeaponBehaviour.h"
-#include "../SpawnerSystem.h"
+#include "Collision/Collision.h"
 #include "Core/EPlayerDamage.h"
-#include "Core/EShoot.h"
+#include "Sound/EPlaySoundOnEntity.h"
+#include "Rendering/EAutoAnimationBlend.h"
 
-
-class AssaultWeaponBehaviour : public WeaponBehaviour
+class AssaultWeaponBehaviour : public WeaponBehaviour<AssaultWeaponBehaviour>
 {
 public:
-    AssaultWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper weaponEntity);
-    
-    virtual void Fire() override;
-    virtual void CeaseFire() override;
-    virtual void Reload() override;
+    AssaultWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree)
+        : System(systemParams)
+        , WeaponBehaviour(systemParams, "AssaultWeapon", renderer, collisionOctree)
+        , m_RandomEngine(m_RandomDevice())
+    { }
 
-    virtual void Update(double dt) override;
+    void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override;
+    void UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo& wi, double dt) override;
+    void OnPrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnCeasePrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnReload(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnEquip(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    //bool OnInputCommand(ComponentWrapper cWeapon, WeaponInfo& wi, const Events::InputCommand& e) override;
 
 private:
-    EntityWrapper m_FirstPersonModel;
-    EntityWrapper m_ThirdPersonModel;
-    // State
-    bool m_Firing = false;
-    bool m_Reloading = false;
-    double m_ReloadTimer = 0.0;
-    EntityWrapper m_FirstPersonReloadImpersonator;
-    EntityWrapper m_ThirdPersonReloadImpersonator;
-    double m_TimeSinceLastFire = 0.0;
+    std::random_device m_RandomDevice;
+    std::mt19937 m_RandomEngine;
 
-    EventRelay<WeaponBehaviour, Events::AnimationComplete> m_EAnimationComplete;
-    bool OnAnimationComplete(Events::AnimationComplete& e);
+    // Weapon functions
+    void fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi);
+    //void dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi, glm::vec3 direction, double damage);
+    bool canFire(ComponentWrapper cWeapon, WeaponInfo& wi);
+    bool dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi);
 
-    bool hasAmmo();
-    void fireRound();
-    void spawnTracer();
-    float traceRayDistance(glm::vec3 origin, glm::vec3 direction);
-    void playFireSound();
-    void playEmptySound();
-    void viewPunch();
-    void finishReload();
-    void playShootAnimation();
-    void playIdleAnimation();
-    void playReloadAnimation();
-    bool shoot(double damage);
-    void showHitMarker();
+    // Utility
+    //Camera cameraFromEntity(EntityWrapper camera);
 };
+
+#endif

include/Game/Systems/Weapon/DefenderWeaponBehaviour.h

@@ -0,0 +1,39 @@
+#ifndef DefenderWeaponBehaviour_h__
+#define DefenderWeaponBehaviour_h__
+
+#include "WeaponBehaviour.h"
+#include "Collision/Collision.h"
+#include "Core/EPlayerDamage.h"
+#include "Sound/EPlaySoundOnEntity.h"
+
+class DefenderWeaponBehaviour : public WeaponBehaviour<DefenderWeaponBehaviour>
+{
+public:
+    DefenderWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree)
+        : System(systemParams)
+        , WeaponBehaviour(systemParams, "DefenderWeapon", renderer, collisionOctree)
+        , m_RandomEngine(m_RandomDevice())
+    { }
+
+    void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override;
+    void UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo& wi, double dt) override;
+    void OnPrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnCeasePrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnReload(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    bool OnInputCommand(ComponentWrapper cWeapon, WeaponInfo& wi, const Events::InputCommand& e) override;
+
+private:
+    std::random_device m_RandomDevice;
+    std::mt19937 m_RandomEngine;
+
+    // Weapon functions
+    void fireShell(ComponentWrapper cWeapon, WeaponInfo& wi);
+    void dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi, glm::vec3 direction, double damage);
+    bool canFire(ComponentWrapper cWeapon, WeaponInfo& wi);
+
+    // Utility
+    Camera cameraFromEntity(EntityWrapper camera);
+};
+
+#endif

include/Game/Systems/Weapon/SidearmWeaponBehaviour.h

@@ -0,0 +1,38 @@
+#ifndef SidearmWeaponBehaviour_h__
+#define SidearmWeaponBehaviour_h__
+
+#include "WeaponBehaviour.h"
+#include "Collision/Collision.h"
+#include "Core/EPlayerDamage.h"
+
+class SidearmWeaponBehaviour : public WeaponBehaviour<SidearmWeaponBehaviour>
+{
+public:
+    SidearmWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree)
+        : System(systemParams)
+        , WeaponBehaviour(systemParams, "SidearmWeapon", renderer, collisionOctree)
+        , m_RandomEngine(m_RandomDevice())
+    { }
+
+    void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override;
+    void UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo& wi, double dt) override;
+    void OnPrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnCeasePrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnEquip(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+
+private:
+    std::random_device m_RandomDevice;
+    std::mt19937 m_RandomEngine;
+
+    // Weapon functions
+    void fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi);
+    //void dealDamage(WeaponInfo& wi, glm::vec3 direction, double damage);
+
+    // Utility
+    bool canFire(ComponentWrapper cWeapon);
+    bool playerInFirstPerson(EntityWrapper player);
+    //float traceRayDistance(glm::vec3 origin, glm::vec3 direction);
+};
+
+#endif

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -5,30 +5,331 @@
 #include "Rendering/IRenderer.h"
 #include "Core/Octree.h"
 #include "Collision/EntityAABB.h"
+#include "Input/EInputCommand.h"
+#include "Systems/SpawnerSystem.h"
+#include "Rendering/ESetCamera.h"
+#include "Core/ConfigFile.h"
+#include "Rendering/EAutoAnimationBlend.h"
 
-class WeaponBehaviour : public System
+template <typename ETYPE>
+class WeaponBehaviour : public PureSystem
 {
+    friend class WeaponSystem;
+
 public:
-    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player)
-        : System(systemParams)
+    WeaponBehaviour(SystemParams params, std::string componentType, IRenderer* renderer, Octree<EntityAABB>* collisionOctree)
+        : System(params)
+        , PureSystem(componentType)
         , m_Renderer(renderer)
         , m_CollisionOctree(collisionOctree)
-        , m_Player(player)
-    { }
+    {
+        EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &WeaponBehaviour::_OnInputCommand);
+        EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &WeaponBehaviour::_OnSetCamera);
+        auto config = ResourceManager::Load<ConfigFile>("Config.ini");
+        m_ConfigAutoReload = config->Get<bool>("Gameplay.AutoReload", true);
+    }
     virtual ~WeaponBehaviour() = default;
 
-    WeaponBehaviour(const WeaponBehaviour&) = delete;
-    WeaponBehaviour& operator=(const WeaponBehaviour &) = delete;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override
+    {
+        /* EntityWrapper firstPersonWeapon = entity.FirstChildByName("Hands").FirstChildByName("AssaultWeapon");
+         EntityWrapper thirdPersonWeapon = entity.FirstChildByName("PlayerModel").FirstChildByName("AssaultWeapon");
+         if (IsClient && (firstPersonWeapon.Valid() || thirdPersonWeapon.Valid())) {
+             if (m_ActiveWeapons.count(entity) == 0) {
+                 WeaponInfo& wi = m_ActiveWeapons[entity];
+                 wi.Player = entity;
+                 wi.WeaponEntity = entity;
+                 wi.FirstPersonEntity = firstPersonWeapon;
+                 wi.ThirdPersonEntity = thirdPersonWeapon;
 
-    virtual void Fire() = 0;
-    virtual void CeaseFire() { }
-    virtual void Reload() { }
-    virtual void Update(double dt) { }
+                 OnEquip(cWeapon, wi);
+             }
+         }*/
+
+        auto weapon = getActiveWeapon(entity);
+        if (!weapon) {
+            return;
+        } else {
+            UpdateWeapon(cWeapon, *weapon, dt);
+        }
+    }
 
 protected:
+    struct WeaponInfo
+    {
+        EntityWrapper Player;
+        EntityWrapper WeaponEntity;
+        EntityWrapper FirstPersonEntity;
+        EntityWrapper FirstPersonPlayerModel;
+        EntityWrapper ThirdPersonEntity;
+        EntityWrapper ThirdPersonPlayerModel;
+    };
+
     IRenderer* m_Renderer;
+    EntityWrapper m_CurrentCamera;
     Octree<EntityAABB>* m_CollisionOctree;
-    EntityWrapper m_Player;
+    std::unordered_map<EntityWrapper, WeaponInfo> m_ActiveWeapons;
+    bool m_ConfigAutoReload;
+
+    virtual void UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo& wi, double dt) { }
+    virtual void OnPrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) { }
+    virtual void OnCeasePrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) { }
+    virtual void OnReload(ComponentWrapper cWeapon, WeaponInfo& wi) { }
+    virtual void OnEquip(ComponentWrapper cWeapon, WeaponInfo& wi) { }
+    virtual void OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi) { }
+    virtual bool OnInputCommand(ComponentWrapper cWeapon, WeaponInfo& wi, const Events::InputCommand& e) { return false; }
+
+    bool isPlayerInFirstPerson(EntityWrapper player)
+    {
+        if (!m_CurrentCamera.Valid()) {
+            return false;
+        } else {
+            return m_CurrentCamera == player || m_CurrentCamera.IsChildOf(player);
+        }
+    }
+
+    // Returns wi.FirstPersonEntity or wi.ThirdPersonEntity depending on
+    // if the player is in first person mode or not.
+    EntityWrapper getRelevantWeaponEntity(WeaponInfo& wi)
+    {
+        if (isPlayerInFirstPerson(wi.Player)) {
+            return wi.FirstPersonEntity;
+        } else {
+            return wi.ThirdPersonEntity;
+        }
+    }
+
+    float traceRayDistance(glm::vec3 origin, glm::vec3 direction)
+    {
+        float distance;
+        glm::vec3 pos;
+        auto entity = Collision::EntityFirstHitByRay(Ray(origin, direction), m_CollisionOctree, distance, pos);
+        if (entity) {
+            return distance;
+        } else {
+            return 100.f;
+        }
+    }
+
+    void playAnimation(EntityWrapper weaponModelEntity, const std::string& subTreeName, const std::string& animationNodeName)
+    {
+        EntityWrapper root = weaponModelEntity.FirstParentWithComponent("Model");
+        if (!root.Valid()) {
+            return;
+        }
+
+        EntityWrapper subTree = root.FirstChildByName(subTreeName);
+        if (!subTree.Valid()) {
+            return;
+        }
+
+        EntityWrapper animationNode = subTree.FirstChildByName(animationNodeName);
+        if (!animationNode.Valid()) {
+            return;
+        }
+
+        Events::AutoAnimationBlend eFireBlend;
+        eFireBlend.RootNode = root;
+        eFireBlend.NodeName = animationNodeName;
+        eFireBlend.Restart = true;
+        eFireBlend.Start = true;
+        m_EventBroker->Publish(eFireBlend);
+    }
+
+    void playAnimationAndReturn(EntityWrapper weaponModelEntity, const std::string& subTreeName, const std::string& animationNodeName)
+    {
+        EntityWrapper root = weaponModelEntity;
+        if (!root.Valid()) {
+            return;
+        }
+
+        EntityWrapper subTree = root.FirstChildByName(subTreeName);
+        if (!subTree.Valid()) {
+            return;
+        }
+
+        EntityWrapper animationNode = subTree.FirstChildByName(animationNodeName);
+        if (!animationNode.Valid()) {
+            return;
+        }
+
+        Events::AutoAnimationBlend eFireBlend;
+        eFireBlend.RootNode = root;
+        eFireBlend.NodeName = animationNodeName;
+        eFireBlend.Restart = true;
+        eFireBlend.Start = true;
+        m_EventBroker->Publish(eFireBlend);
+
+        Events::AutoAnimationBlend eIdleBlend;
+        eIdleBlend.RootNode = root;
+        eIdleBlend.NodeName = "Idle";
+        eIdleBlend.AnimationEntity = animationNode;
+        eIdleBlend.Delay = -0.2;
+        eIdleBlend.Duration = 0.2;
+        m_EventBroker->Publish(eIdleBlend);
+    }
+
+private:
+    EventRelay<ETYPE, Events::SetCamera> m_ESetCamera;
+    bool _OnSetCamera(const Events::SetCamera& e)
+    {
+        m_CurrentCamera = e.CameraEntity;
+        return true;
+    }
+    EventRelay<ETYPE, Events::InputCommand> m_EInputCommand;
+    bool _OnInputCommand(const Events::InputCommand& e)
+    {
+        EntityWrapper player = e.Player;
+        if (e.PlayerID == -1) {
+            player = LocalPlayer;
+        }
+
+        // Make sure the player is alive
+        if (!player.Valid()) {
+            return false;
+        }
+
+        // Make sure the player has this weapon
+        auto cWeapon = getWeaponComponent(player);
+        if (!cWeapon) {
+            return false;
+        }
+
+        // Weapon selection
+        if (e.Command == "SelectWeapon") {
+            if (e.Value > 0) {
+                if (static_cast<ComponentInfo::EnumType>(e.Value) == static_cast<ComponentInfo::EnumType>((*cWeapon)["Slot"])) {
+                    selectWeapon(*cWeapon, player);
+                } else {
+                    holsterWeapon(*cWeapon, player);
+                }
+            }
+        }
+
+        // Only handle weapon actions if the weapon is active
+        auto activeWeapon = getActiveWeapon(player);
+        if (!activeWeapon) {
+            return false;
+        }
+
+        // Fire
+        if (e.Command == "PrimaryFire") {
+            if (e.Value > 0) {
+                OnPrimaryFire(*cWeapon, *activeWeapon);
+            } else {
+                OnCeasePrimaryFire(*cWeapon, *activeWeapon);
+            }
+        }
+
+        // Reload
+        if (e.Command == "Reload" && e.Value != 0) {
+            OnReload(*cWeapon, *activeWeapon);
+        }
+
+        return OnInputCommand(*cWeapon, *activeWeapon, e);
+    }
+
+    boost::optional<ComponentWrapper> getWeaponComponent(EntityWrapper player)
+    {
+        if (!player.HasComponent(m_ComponentType)) {
+            return boost::none;
+        }
+
+        return player[m_ComponentType];
+    }
+
+    boost::optional<WeaponInfo&> getActiveWeapon(EntityWrapper player)
+    {
+        auto it = m_ActiveWeapons.find(player);
+        if (it == m_ActiveWeapons.end()) {
+            return boost::none;
+        }
+        WeaponInfo& activeWeapon = it->second;
+
+        if (!activeWeapon.FirstPersonEntity.Valid() && !activeWeapon.ThirdPersonEntity.Valid()) {
+            return boost::none;
+        }
+
+        return activeWeapon;
+    }
+
+    void selectWeapon(ComponentWrapper cWeapon, EntityWrapper player)
+    {
+        //if (!IsServer) {
+        //    return;
+        //}
+
+        // Don't reselect weapon if it's already active
+        if (getActiveWeapon(player)) {
+            return;
+        }
+
+        // Find the weapon attachments matching the weapon type
+        std::vector<EntityWrapper> weaponAttachments = player.ChildrenWithComponent("WeaponAttachment");
+        EntityWrapper firstPersonAttachment;
+        EntityWrapper thirdPersonAttachment;
+        for (auto& attachment : weaponAttachments) {
+            ComponentWrapper cWeaponAttachment = attachment["WeaponAttachment"];
+            if ((std::string&)cWeaponAttachment["Weapon"] == m_ComponentType) {
+                ComponentWrapper::SubscriptProxy person = cWeaponAttachment["Person"];
+                if ((ComponentInfo::EnumType)person == person.Enum("FirstPerson")) {
+                    firstPersonAttachment = attachment;
+                } else if ((ComponentInfo::EnumType)person == person.Enum("ThirdPerson")) {
+                    thirdPersonAttachment = attachment;
+                }
+            }
+        }
+
+        if (!firstPersonAttachment.Valid() && !thirdPersonAttachment.Valid()) {
+            LOG_WARNING("No weapon attachment found for %s of player #%i", m_ComponentType.c_str(), player.ID);
+            return;
+        }
+
+        // Spawn the weapon(s)
+        EntityWrapper firstPersonWeapon;
+        EntityWrapper thirdPersonWeapon;
+        if (IsClient) {
+            if (firstPersonAttachment.Valid()) {
+                firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
+            }
+        }
+        if (thirdPersonAttachment.Valid()) {
+            thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
+        }
+
+        WeaponInfo& wi = m_ActiveWeapons[player];
+        wi.Player = player;
+        wi.WeaponEntity = player;
+        wi.FirstPersonEntity = firstPersonWeapon;
+        wi.FirstPersonPlayerModel = firstPersonWeapon;
+        wi.ThirdPersonEntity = thirdPersonWeapon;
+        wi.ThirdPersonPlayerModel = thirdPersonWeapon.FirstParentWithComponent("Model");
+        
+        OnEquip(cWeapon, wi);
+    }
+
+    void holsterWeapon(ComponentWrapper cWeapon, EntityWrapper player)
+    {
+        auto activeWeapon = getActiveWeapon(player);
+        if (!activeWeapon) {
+            return;
+        }
+        WeaponInfo& wi = *activeWeapon;
+
+        // Send holster event
+        OnHolster(cWeapon, wi);
+
+        // Delete weapon entities
+        if (wi.FirstPersonEntity.Valid()) {
+            m_World->DeleteEntity(wi.FirstPersonEntity.ID);
+        }
+        if (wi.ThirdPersonEntity.Valid()) {
+            m_World->DeleteEntity(wi.ThirdPersonEntity.ID);
+        }
+
+        // Make weapon inactive
+        m_ActiveWeapons.erase(player);
+    }
 };
 
 #endif

include/Game/Systems/Weapon/WeaponSystem.h

@@ -9,8 +9,8 @@
 #include "Core/EShoot.h"
 #include "Core/EPlayerSpawned.h"
 #include "Input/EInputCommand.h"
-#include "Core/EntityFile.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityXMLFile.h"
+#include "Core/EntityXMLFileParser.h"
 #include "Core/Octree.h"
 #include "Collision/EntityAABB.h"
 #include "Systems/SpawnerSystem.h"

resources/DefaultConfig.ini

@@ -1,10 +1,13 @@
+[Gameplay]
+AutoReload=true
+
 [Debug]
 LogLevel=1
 LoadMap=
 ; if true -> Pool allocation is not used when calling Allocate/Free, just use regular dynamic allocation. 
 ; if false -> Use pool allocation.
 DisableMemoryPool=false
-RespawnTime = 8.0
+RespawnTime = -1.0
 EditorEnabled=false
 OutOfBodyExperience=false
 
@@ -36,4 +39,49 @@ ResourceLoading=true
 [Sound]
 BGMVolume=1.0
 SFXVolume=1.0
-Announcer=female
+Announcer=female
+
+[SSAO]
+Quality=0
+
+[SSAO1]
+Radius=1.0
+Bias=0.02
+Contrast=1.5
+Intensity=1.0
+NumSamples=8
+NumTurns=3
+NumIterations=5
+TextureQuality=2
+
+[SSAO2]
+Radius=1.0
+Bias=0.02
+Contrast=1.5
+Intensity=1.0
+NumSamples=16
+NumTurns=13
+NumIterations=9
+TextureQuality=1
+
+[SSAO3]
+Radius=1.0
+Bias=0.02
+Contrast=1.5
+Intensity=1.0
+NumSamples=24
+NumTurns=17
+NumIterations=9
+TextureQuality=0
+
+[GLOW]
+Quality=3
+
+[GLOW1]
+NumIterations=5
+
+[GLOW2]
+NumIterations=9
+
+[GLOW3]
+NumIterations=13

resources/DefaultInput.ini

@@ -27,4 +27,6 @@ M=SwitchToClient
 P=SwitchToPlayer
 K=TakeDamage,1500
 F2=PerformanceTimingResetAllTimers
-F3=PerformanceTimingCreateExcelData
+F3=PerformanceTimingCreateExcelData
+Comma=SwapToClassPick
+Period=SwapToTeamPick

resources/Schema/Components.xsd

@@ -33,17 +33,39 @@
 	<xs:include schemaLocation="Components/HiddenForLocalPlayer.xsd"/>
 	<xs:include schemaLocation="Components/HealthPickup.xsd"/>
 	<xs:include schemaLocation="Components/AmmoPickup.xsd"/>
-	<xs:include schemaLocation="Components/AnimationOffset.xsd"/>
 	<xs:include schemaLocation="Components/DashAbility.xsd"/>
+	<xs:include schemaLocation="Components/ShieldAbility.xsd"/>
+	<xs:include schemaLocation="Components/SprintAbility.xsd"/>
 	<xs:include schemaLocation="Components/AssaultWeapon.xsd"/>
+	<xs:include schemaLocation="Components/BoostAssault.xsd"/>
+	<xs:include schemaLocation="Components/BoostDefender.xsd"/>
+	<xs:include schemaLocation="Components/BoostSniper.xsd"/>
 	<xs:include schemaLocation="Components/Shield.xsd"/>
 	<xs:include schemaLocation="Components/Sprite.xsd"/>
 	<xs:include schemaLocation="Components/Shielded.xsd"/>
 	<xs:include schemaLocation="Components/CapturePointHUD.xsd"/>
-	<xs:include schemaLocation="Components/AmmunitionHUD.xsd"/>
+	<xs:include schemaLocation="Components/TextFieldReader.xsd"/>
 	<xs:include schemaLocation="Components/Menu.xsd"/>
 	<xs:include schemaLocation="Components/KillFeed.xsd"/>
+	<xs:include schemaLocation="Components/BlendOverride.xsd"/>
+	<xs:include schemaLocation="Components/Blend.xsd"/>
+	<xs:include schemaLocation="Components/BlendAdditive.xsd"/>
 	<xs:include schemaLocation="Components/Page.xsd"/>
 	<xs:include schemaLocation="Components/SpriteIndicator.xsd"/>
 	<xs:include schemaLocation="Components/Button.xsd"/>
+	<xs:include schemaLocation="Components/AbilityCooldownHUD.xsd"/>
+	<xs:include schemaLocation="Components/DoubleJump.xsd"/>
+	<xs:include schemaLocation="Components/WeaponAttachment.xsd"/>
+	<xs:include schemaLocation="Components/DefenderWeapon.xsd"/>
+	<xs:include schemaLocation="Components/SidearmWeapon.xsd"/>
+	<xs:include schemaLocation="Components/CapturePointGameMode.xsd"/>
+	<xs:include schemaLocation="Components/CapturePointArrowHUD.xsd"/>
+	<xs:include schemaLocation="Components/FloatingEffect.xsd"/>
+	<xs:include schemaLocation="Components/BoostIconsHUD.xsd"/>
+	<xs:include schemaLocation="Components/InputCmdButton.xsd"/>
+	<xs:include schemaLocation="Components/ScoreScreen.xsd"/>
+	<xs:include schemaLocation="Components/ScoreIdentity.xsd"/>
+	<xs:include schemaLocation="Components/NetworkComponent.xsd"/>
+	<xs:include schemaLocation="Components/ServerIdentity.xsd"/>
+	<xs:include schemaLocation="Components/ServerList.xsd"/>
 </xs:schema>

resources/Schema/Components/AbilityCooldownHUD.xml

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

resources/Schema/Components/AbilityCooldownHUD.xsd

@@ -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="AbilityCooldownHUD">
+		<xs:annotation>
+			<xs:documentation>HUD element for tracking ability cooldown. If it has a sprite and fill component it will fill the sprite with chosen color depending on the cooldown.\n A child with text component named "Cooldown"</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/AmmunitionHUD.xml

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