Merge remote-tracking branch 'origin/Recording' into Recording

WIP STUFF
Merge branch 'master' into Recording
2016-03-14 16:33:53 +01:00 · 2016-03-14 08:33:33 +01:00 · 2016-03-14 06:13:23 +01:00 · 2016-03-14 06:05:11 +01:00 · 2016-03-14 06:02:47 +01:00 · 2016-03-14 06:00:12 +01:00
263 changed files with 86903 additions and 46741 deletions
@@ -12,7 +12,7 @@
 #include "../Core/AABB.h"
 #include "Rendering/RawModelCustom.h"
 //#include "Rendering/RawModelAssimp.h"
-#include "../Core/Transform.h"
+#include "../Core/TransformSystem.h"
 #include "../Core/Entity.h"
 #include "../Core/EntityWrapper.h"
 #include "EntityAABB.h"
@@ -48,13 +48,13 @@ bool RayVsTriangle(const Ray& ray,
    bool trueOnNegativeDistance = false);
 //Return true if the ray hits any of the triangles in the model. Stops checking when a hit is detected.
 bool RayVsModel(const Ray& ray,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<glm::vec3>& modelVertices,
    const std::vector<unsigned int>& modelIndices,
    const glm::mat4& modelMatrix);
 //Return true if the ray hits any of the triangles in the model.
 //Also returns the position of the intersection point. Will loop through all the whole model indices.
 bool RayVsModel(const Ray& ray,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<glm::vec3>& modelVertices,
    const std::vector<unsigned int>& modelIndices,
    const glm::mat4& modelMatrix,
    glm::vec3& outHitPosition);
@@ -62,7 +62,7 @@ bool RayVsModel(const Ray& ray,
 //Also returns the distance from the ray origin to the closest 
 //intersection point, and the barycentric u,v-coordinates. Will loop through all the whole model indices.
 bool RayVsModel(const Ray& ray,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<glm::vec3>& modelVertices,
    const std::vector<unsigned int>& modelIndices,
    const glm::mat4& modelMatrix,
    float& outDistance,
@@ -70,7 +70,7 @@ bool RayVsModel(const Ray& ray,
    float& outVCoord);

 bool AABBvsTriangles(const AABB& box,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<glm::vec3>& modelVertices,
    const std::vector<unsigned int>& modelIndices,
    const glm::mat4& modelMatrix,
    glm::vec3& boxVelocity,
@@ -80,7 +80,7 @@ bool AABBvsTriangles(const AABB& box,

 //Detects collision, but does not resolve.
 bool AABBvsTriangles(const AABB& box,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<glm::vec3>& modelVertices,
    const std::vector<unsigned int>& modelIndices,
    const glm::mat4& modelMatrix);

@@ -92,7 +92,7 @@ enum Output
 };
 //Detects intersection and containment.
 Output AABBvsTrianglesWContainment(const AABB& box,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<glm::vec3>& modelVertices,
    const std::vector<unsigned int>& modelIndices,
    const glm::mat4& modelMatrix);

@@ -2,6 +2,7 @@
 #define ComponentInfo_h__

 #include "../Common.h"
+#include "Entity.h"
 #include <boost/shared_array.hpp>

 struct ComponentInfo
@@ -21,6 +22,7 @@ struct ComponentInfo
    {
        std::string Name;
        std::string Type;
+        unsigned char Index;
        unsigned int Offset;
        unsigned int Stride;
    };
@@ -32,6 +34,16 @@ struct ComponentInfo
    unsigned int Stride = 0;
    boost::shared_array<char> Defaults = nullptr;
 	std::shared_ptr<Meta_t> Meta = nullptr;
+
+    std::size_t GetHeaderSize() const
+    {
+        std::size_t size = 0;
+
+        // A component block starts with an entity ID
+        size += sizeof(EntityID);
+
+        return size;
+    }
 };

 template<>
@@ -5,16 +5,15 @@
 #include "MemoryPool.h"
 #include "ComponentInfo.h"
 #include "ComponentWrapper.h"
+#include "DirtySet.h"

+
+class ComponentPool;
 class ComponentPoolForwardIterator
 	: public std::iterator<std::forward_iterator_tag, ComponentWrapper>
 {
 public:
-    ComponentPoolForwardIterator(const ComponentInfo& componentInfo, const MemoryPool<char>::iterator begin, const MemoryPool<char>::iterator end) 
-        : m_ComponentInfo(componentInfo)
-        , m_MemoryPoolIterator(begin)
-        , m_MemoryPoolEnd(end)
-    { }
+    ComponentPoolForwardIterator(ComponentPool* pool, const MemoryPool<char>::iterator begin, const MemoryPool<char>::iterator end);

 	ComponentPoolForwardIterator(const ComponentPoolForwardIterator& other) = default;
 	ComponentPoolForwardIterator(ComponentPoolForwardIterator&& other) = default;
@@ -27,6 +26,7 @@ public:
 	ComponentWrapper operator*() const;

 private:
+    ComponentPool* m_ComponentPool;
    const ComponentInfo& m_ComponentInfo;
 	MemoryPool<char>::iterator m_MemoryPoolIterator;
 	const MemoryPool<char>::iterator m_MemoryPoolEnd;
@@ -34,6 +34,7 @@ private:

 class ComponentPool
 {
+    friend class ComponentPoolForwardIterator;
 public:
 	typedef ComponentPoolForwardIterator iterator;
 	typedef ptrdiff_t difference_type;
@@ -42,9 +43,10 @@ public:
 	typedef ComponentWrapper* pointer;
 	typedef ComponentWrapper& reference;

-    ComponentPool(const ::ComponentInfo& ci) 
+    ComponentPool(const ::ComponentInfo& ci, World* world) 
        : m_ComponentInfo(ci)
-        , m_Pool(ci.Meta->Allocation, sizeof(EntityID) + ci.Stride)
+        , m_Pool(ci.Meta->Allocation, ci.GetHeaderSize() + ci.Stride)
+        , m_World(world)
    { }
    ~ComponentPool();
 	ComponentPool(const ComponentPool& other);
@@ -61,8 +63,8 @@ public:
    // Delete a component and free its memory
    void Delete(ComponentWrapper& wrapper);

-	iterator begin() const;
-	iterator end() const;
+    iterator begin();
+	iterator end();
    size_t size() const;

 	//Dumps information about what the pool memory looks like right now 
@@ -80,6 +82,8 @@ private:
    ::ComponentInfo m_ComponentInfo;
    MemoryPool<char> m_Pool;
    std::unordered_map<EntityID, char*> m_EntityToComponent;
+    DirtySet m_DirtySet;
+    World* m_World;
 };

 #endif
@@ -4,46 +4,32 @@
 #include <boost/shared_array.hpp>
 #include <boost/any.hpp>
 #include "../Common.h"
+#include "../GLM.h"
 #include "Entity.h"
 #include "ComponentInfo.h"
+#include "DirtySet.h"
 #include "Util/Any.h"

-template <typename T, typename Enable = void>
-struct ComponentField { };
-
-template <typename T>
-struct ComponentField<T, typename std::enable_if<std::is_trivially_copyable<T>::value>::type>
-{
-    static T& Get(const ComponentInfo::Field_t& info, char* data) { return *reinterpret_cast<T*>(data); }
-    static void Set(const ComponentInfo::Field_t& info, char* data, const T& value) { Get(data) = value; }
-};
-
-template <>
-struct ComponentField<std::string, void>
-{
-    static std::string& Get(const ComponentInfo::Field_t& info, char* data) { return **reinterpret_cast<std::string**>(data); }
-    static void Set(const ComponentInfo::Field_t& info, char* data, const std::string& value) { Get(info, data) = value; }
-};
+class World;

 struct ComponentWrapper
 {
-    ComponentWrapper(const ComponentInfo& componentInfo, char* data)
-        : Info(componentInfo)
-        , EntityID(*reinterpret_cast<::EntityID*>(data))
-        , Data(data + sizeof(::EntityID))
-    { }
+    ComponentWrapper(const ComponentInfo& componentInfo, char* data, ::DirtyBitField* dirtyBitField, World* world);

+    World* m_World;
    const ComponentInfo& Info;
    const ::EntityID EntityID;
    char* Data;
+    ::DirtyBitField* DirtyBitField = nullptr;

-    ComponentInfo::EnumType Enum(const char* fieldName, const char* enumKey)
-    {
-        return Info.Meta->FieldEnumDefinitions.at(fieldName).at(enumKey);
-    }
+    ComponentInfo::EnumType Enum(const char* fieldName, const char* enumKey);
+
+    bool Dirty(DirtySetType type, const std::string& fieldName);
+    void SetDirty(DirtySetType type, const std::string& fieldName, bool dirty = true);
+    void SetAllDirty(const std::string& fieldName, bool dirty = true);

    template <typename T>
-    T& Field(std::string name)
+    T& Field(const std::string& name)
    {
        const ComponentInfo::Field_t& field = Info.Fields.at(name);
        if (sizeof(T) > field.Stride) {
@@ -55,13 +41,15 @@ struct ComponentWrapper
    }

    template <typename T>
-    void SetField(std::string name, const T value) { Field<T>(name) = value; }
-    //template <typename T>
-    //void SetField(std::string name, T& value) { Field<T>(name) = value; }
+    void SetField(const std::string& name, const T& value) 
+    { 
+        Field<T>(name) = value; 
+        SetAllDirty(name);
+    }

    // Specialization for string literals
    template <std::size_t N>
-    void SetField(std::string name, const char(&value)[N]) { Field<std::string>(name) = std::string(value); }
+    void SetField(const std::string& name, const char(&value)[N]) { SetField(name, std::string(value)); }

    void Copy(ComponentWrapper& destination)
    {
@@ -95,40 +83,163 @@ struct ComponentWrapper
    struct SubscriptProxy
    {
        friend struct ComponentWrapper;
-    private:
-        SubscriptProxy(ComponentWrapper* component, std::string propertyName)
+  
+    public:
+        SubscriptProxy(ComponentWrapper* component, std::string fieldName)
            : m_Component(component)
-            , m_PropertyName(propertyName)
+            , m_FieldName(fieldName)
        { }

        ComponentWrapper* m_Component;
-        std::string m_PropertyName;
+        std::string m_FieldName;

    public:
        // Return the integer value of an enum type key for this field
-        ComponentInfo::EnumType Enum(const char* enumKey) { return m_Component->Enum(m_PropertyName.c_str(), enumKey); }
+        ComponentInfo::EnumType Enum(const char* enumKey) { return m_Component->Enum(m_FieldName.c_str(), enumKey); }
+        bool Dirty(DirtySetType type) { return m_Component->Dirty(type, m_FieldName); }
+        void SetDirty(DirtySetType type, bool dirty = true) { m_Component->SetDirty(type, m_FieldName, dirty); }
+        void SetAllDirty(bool dirty = true) { m_Component->SetAllDirty(m_FieldName, dirty); }

-        template <typename T>
-        operator T&() { return m_Component->Field<T>(m_PropertyName); }
+        operator const double&() { return m_Component->Field<double>(m_FieldName); }
+        operator const float&() { return m_Component->Field<float>(m_FieldName); }
+        operator const int&() { return m_Component->Field<int>(m_FieldName); }
+        operator const glm::vec3&() { return m_Component->Field<glm::vec3>(m_FieldName); }
+        operator const glm::vec4&() { return m_Component->Field<glm::vec4>(m_FieldName); }
+        operator const glm::quat&() { return m_Component->Field<glm::quat>(m_FieldName); }
+        operator const bool&() { return m_Component->Field<bool>(m_FieldName); }
+        operator const std::string&() { return m_Component->Field<std::string>(m_FieldName); }

+        // Don't allow non-const references
+        // If this wasn't deleted, the above overloads would still get called for some reason...
+        template <
+            typename T,
+            typename = typename std::enable_if<!std::is_base_of<::FIELDLOL, T>::value>::type
+        >
+        //operator T&() = delete;
+        operator T&() { static_assert(constexpr(false), "https://github.com/teamfisk/TacticalZ/pull/212"); }
+
+        // Value assignment
        template <typename T>
-        void operator=(const T val) { m_Component->SetField<T>(m_PropertyName, val); }
-        // TODO: Pass by reference and rvalue (universal reference?)
-        //template <typename T>
-        //void operator=(T& val) { m_Component->SetField<T>(m_PropertyName, val); }
+        void operator=(const T& val) { m_Component->SetField<T>(m_FieldName, val); }

        // Specialization for string literals
        template <std::size_t N>
-        void operator=(const char(&val)[N]) { m_Component->SetField<N>(m_PropertyName, val); }
+        void operator=(const char(&val)[N]) { m_Component->SetField<N>(m_FieldName, val); }
    };
-    SubscriptProxy operator[](std::string propertyName) { return SubscriptProxy(this, propertyName); }
+    SubscriptProxy operator[](const std::string& propertyName) { return SubscriptProxy(this, propertyName); }
 };

+struct FIELDLOL { }; // lol
+
+template <typename T>
+struct FieldBase : FIELDLOL
+{
+    FieldBase(ComponentWrapper::SubscriptProxy& Proxy)
+        : Proxy(Proxy)
+        , Data(Proxy.m_Component->Field<T>(Proxy.m_FieldName))
+    { }
+
+    void SetAllDirty() { Proxy.SetAllDirty(); }
+
+    FieldBase& operator=(const FieldBase& rhs) { Data = rhs.Data; SetAllDirty(); return *this; }
+    FieldBase& operator=(const T& rhs) { Data = rhs; SetAllDirty(); return *this; }
+
+    template <typename T2> FieldBase& operator+=(const T2& rhs) { Data += rhs; SetAllDirty(); return *this; }
+    template <typename T2> FieldBase& operator-=(const T2& rhs) { Data -= rhs; SetAllDirty(); return *this; }
+    template <typename T2> FieldBase& operator*=(const T2& rhs) { Data *= rhs; SetAllDirty(); return *this; }
+    template <typename T2> FieldBase& operator/=(const T2& rhs) { Data /= rhs; SetAllDirty(); return *this; }
+    template <typename T2> FieldBase& operator%=(const T2& rhs) { Data %= rhs; SetAllDirty(); return *this; }
+    template <typename T2> FieldBase& operator&=(const T2& rhs) { Data &= rhs; SetAllDirty(); return *this; }
+    template <typename T2> FieldBase& operator|=(const T2& rhs) { Data |= rhs; SetAllDirty(); return *this; }
+    template <typename T2> FieldBase& operator^=(const T2& rhs) { Data ^= rhs; SetAllDirty(); return *this; }
+    template <typename T2> FieldBase& operator<<=(const T2& rhs) { Data <<= rhs; SetAllDirty(); return *this; }
+    template <typename T2> FieldBase& operator>>=(const T2& rhs) { Data >>= rhs; SetAllDirty(); return *this; }
+
+    T operator+() const { return +Data; }
+    T operator-() const { return -Data; }
+    T operator~() const { return ~Data; }
+
+    FieldBase& operator++() { Data++; SetAllDirty(); return *this; }
+    T operator++(int) { T tmp = Data; operator++(); return tmp; }
+    FieldBase& operator--() { Data--; SetAllDirty(); return *this; }
+    T operator--(int) { T tmp = Data; operator--(); return tmp; }
+
+    operator const T&() const { return Data; }
+    const T& operator*() const { return operator const T&(); }
+
+protected:
+    ComponentWrapper::SubscriptProxy Proxy;
+    T& Data;
+};
+
+template <typename T>
+struct Field : FieldBase<T>
+{
+    using FieldBase<T>::FieldBase;
+    using FieldBase<T>::operator=;
+};
+
+template <>
+struct Field<glm::vec3> : FieldBase<glm::vec3>
+{
+    using FieldBase<glm::vec3>::FieldBase;
+    using FieldBase<glm::vec3>::operator=;
+
+    glm::vec3::value_type x() const { return Data.x; }
+    void x(glm::vec3::value_type val) { Data.x = val; SetAllDirty(); }
+    glm::vec3::value_type y() const { return Data.y; }
+    void y(glm::vec3::value_type val) { Data.y = val; SetAllDirty(); }
+    glm::vec3::value_type z() const { return Data.z; }
+    void z(glm::vec3::value_type val) { Data.z = val; SetAllDirty(); }
+
+    template <typename T> friend glm::vec3 operator+(const Field<glm::vec3>& lhs, const T& rhs) { return static_cast<glm::vec3>(lhs) + glm::vec3(rhs); }
+    template <typename T> friend glm::vec3 operator-(const Field<glm::vec3>& lhs, const T& rhs) { return static_cast<glm::vec3>(lhs) - glm::vec3(rhs); }
+    template <typename T> friend glm::vec3 operator*(const Field<glm::vec3>& lhs, const T& rhs) { return static_cast<glm::vec3>(lhs) * glm::vec3(rhs); }
+    template <typename T> friend glm::vec3 operator/(const Field<glm::vec3>& lhs, const T& rhs) { return static_cast<glm::vec3>(lhs) / glm::vec3(rhs); }
+    template <typename T> friend glm::vec3 operator+(const T& lhs, const Field<glm::vec3>& rhs) { return glm::vec3(lhs) + static_cast<glm::vec3>(rhs); }
+    template <typename T> friend glm::vec3 operator-(const T& lhs, const Field<glm::vec3>& rhs) { return glm::vec3(lhs) - static_cast<glm::vec3>(rhs); }
+    template <typename T> friend glm::vec3 operator*(const T& lhs, const Field<glm::vec3>& rhs) { return glm::vec3(lhs) * static_cast<glm::vec3>(rhs); }
+    template <typename T> friend glm::vec3 operator/(const T& lhs, const Field<glm::vec3>& rhs) { return glm::vec3(lhs) / static_cast<glm::vec3>(rhs); }
+
+    friend glm::vec3& operator+=(glm::vec3& lhs, const Field<glm::vec3>& rhs) { lhs += *rhs; return lhs; }
+};
+
+template <>
+struct Field<glm::vec4> : FieldBase<glm::vec4>
+{
+    //Field(glm::vec4& Data)
+    //    : FieldBase(Data)
+    //{ }
+    using FieldBase<glm::vec4>::FieldBase;
+    using FieldBase<glm::vec4>::operator=;
+
+    glm::vec4::value_type x() const { return Data.x; }
+    void x(glm::vec4::value_type val) { Data.x = val; SetAllDirty(); }
+    glm::vec4::value_type y() const { return Data.y; }
+    void y(glm::vec4::value_type val) { Data.y = val; SetAllDirty(); }
+    glm::vec4::value_type z() const { return Data.z; }
+    void z(glm::vec4::value_type val) { Data.z = val; SetAllDirty(); }
+    glm::vec4::value_type w() const { return Data.w; }
+    void w(glm::vec4::value_type val) { Data.w = val; SetAllDirty(); }
+
+    template <typename T> friend glm::vec4 operator+(const Field<glm::vec4>& lhs, const T& rhs) { return static_cast<glm::vec4>(lhs) + glm::vec4(rhs); }
+    template <typename T> friend glm::vec4 operator-(const Field<glm::vec4>& lhs, const T& rhs) { return static_cast<glm::vec4>(lhs) - glm::vec4(rhs); }
+    template <typename T> friend glm::vec4 operator*(const Field<glm::vec4>& lhs, const T& rhs) { return static_cast<glm::vec4>(lhs) * glm::vec4(rhs); }
+    template <typename T> friend glm::vec4 operator/(const Field<glm::vec4>& lhs, const T& rhs) { return static_cast<glm::vec4>(lhs) / glm::vec4(rhs); }
+    template <typename T> friend glm::vec4 operator+(const T& lhs, const Field<glm::vec4>& rhs) { return glm::vec4(lhs) + static_cast<glm::vec4>(rhs); }
+    template <typename T> friend glm::vec4 operator-(const T& lhs, const Field<glm::vec4>& rhs) { return glm::vec4(lhs) - static_cast<glm::vec4>(rhs); }
+    template <typename T> friend glm::vec4 operator*(const T& lhs, const Field<glm::vec4>& rhs) { return glm::vec4(lhs) * static_cast<glm::vec4>(rhs); }
+    template <typename T> friend glm::vec4 operator/(const T& lhs, const Field<glm::vec4>& rhs) { return glm::vec4(lhs) / static_cast<glm::vec4>(rhs); }
+
+    friend glm::vec4& operator+=(glm::vec4& lhs, const Field<glm::vec4>& rhs) { lhs += *rhs; return lhs; }
+};
+
+
 // A component wrapper that "owns" its data through a shared pointer
 struct SharedComponentWrapper : ComponentWrapper
 {
    SharedComponentWrapper(const ComponentInfo& componentInfo, boost::shared_array<char> data)
-        : ComponentWrapper(componentInfo, data.get())
+        : ComponentWrapper(componentInfo, data.get(), nullptr, nullptr)
        , m_DataReference(data)
    { }

@@ -0,0 +1,16 @@
+#ifndef DirtySet_h__
+#define DirtySet_h__
+
+#include <set>
+#include "ComponentInfo.h"
+
+enum class DirtySetType
+{
+    Transform,
+    Network
+};
+
+typedef std::unordered_map<DirtySetType, std::set<decltype(ComponentInfo::Field_t::Index)>> DirtyBitField;
+typedef std::unordered_map<EntityID, DirtyBitField> DirtySet;
+
+#endif
@@ -1,5 +1,5 @@
-#ifndef ECaptured_h__
-#define ECaptured_h__
+#ifndef Events_Captured_h__
+#define Events_Captured_h__

 #include "EventBroker.h"
 #include "../Core/Entity.h"
@@ -2,14 +2,14 @@
 #define EEntityDeleted_h__

 #include "Event.h"
-#include "Entity.h"
+#include "EntityWrapper.h"

 namespace Events
 {

 struct EntityDeleted : Event
 {
-    EntityID DeletedEntity;
+    EntityWrapper DeletedEntity;
    // True if the entity deletion was triggered because the entity's parent was deleted before it
    bool Cascaded;
 };
@@ -45,8 +45,9 @@ struct EntityWrapper

 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);
+    static void fillRelationships(std::unordered_multimap<EntityWrapper, EntityWrapper>& relationMap, EntityWrapper entity);
+    static void recreateRelationships(const std::unordered_multimap<EntityWrapper, EntityWrapper>& relationMap, EntityWrapper templateEntity, EntityWrapper parent = EntityWrapper::Invalid);
 };

 namespace std
@@ -2,8 +2,11 @@
 #define PerformanceTimer_h__

 #include "../Common.h"
+
+#ifdef DEBUG
 #include <boost/timer/timer.hpp>
 using boost::timer::cpu_timer;
+#endif //DEBUG

 class PerformanceTimer
 {
@@ -17,9 +20,11 @@ public:
    static void CreateExcelData();

 private:
+#ifdef DEBUG
    static std::map<std::string, cpu_timer> timers;
    static cpu_timer m_Timer;
    static std::string currentTimerRunning;
+#endif //DEBUG
 };

 #endif
@@ -19,6 +19,7 @@ class Resource

 protected:
 	Resource() { }
+    virtual ~Resource() = default;

 public:
    //Should be thrown in a Resource's constructor if it cannot complete because another resource is still loading.
@@ -68,7 +68,7 @@ protected:

    const std::string m_ComponentType;

-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& scoreScreen, double dt) = 0;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cFade, double dt) = 0;
 };

 class ImpureSystem : public virtual System
@@ -81,7 +81,7 @@ public:
            for (auto& pair : group.PureSystems) {
                const std::string& componentName = pair.first;
                auto& systems = pair.second;
-                const ComponentPool* pool = m_World->GetComponents(componentName);
+                ComponentPool* pool = m_World->GetComponents(componentName);
                if (pool == nullptr) {
                    continue;
                }
@@ -1,25 +0,0 @@
-#ifndef Transform_h__
-#define Transform_h__
-
-#include "../GLM.h"
-#include "World.h"
-#include "EntityWrapper.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);
-glm::quat AbsoluteOrientation(EntityWrapper entity);
-glm::quat AbsoluteOrientation(World* world, EntityID entity);
-glm::vec3 AbsoluteScale(EntityWrapper entity);
-glm::vec3 AbsoluteScale(World* world, EntityID entity);
-glm::mat4 ModelMatrix(EntityWrapper entity);
-glm::mat4 ModelMatrix(EntityID entity, World* world);
-glm::vec3 TransformPoint(const glm::vec3& point, const glm::mat4& matrix);
-
-}
-
-#endif
@@ -0,0 +1,39 @@
+#ifndef Transform_h__
+#define Transform_h__
+
+#include "../GLM.h"
+#include "System.h"
+#include "EEntityDeleted.h"
+
+class TransformSystem : public System
+{
+public:
+    TransformSystem(SystemParams params);
+
+    //glm::mat4 AbsoluteTransformation(EntityWrapper entity);
+    static glm::vec3 AbsolutePosition(EntityWrapper entity);
+    static glm::vec3 AbsolutePosition(World* world, EntityID entity);
+    static glm::vec3 AbsoluteOrientationEuler(EntityWrapper entity);
+    static glm::quat AbsoluteOrientation(EntityWrapper entity);
+    static glm::quat AbsoluteOrientation(World* world, EntityID entity);
+    static glm::vec3 AbsoluteScale(EntityWrapper entity);
+    static glm::vec3 AbsoluteScale(World* world, EntityID entity);
+    static glm::mat4 ModelMatrix(EntityWrapper entity);
+    static glm::mat4 ModelMatrix(EntityID entity, World* world);
+    static glm::vec3 TransformPoint(const glm::vec3& point, const glm::mat4& matrix);
+
+    static int RecalculatedPositions;
+    static int RecalculatedOrientations;
+    static int RecalculatedScales;
+
+private:
+    static std::unordered_map<EntityWrapper, glm::vec3> PositionCache;
+    static std::unordered_map<EntityWrapper, glm::quat> OrientationCache;
+    static std::unordered_map<EntityWrapper, glm::vec3> ScaleCache;
+    static std::unordered_map<EntityWrapper, glm::mat4> MatrixCache;
+
+    EventRelay<TransformSystem, Events::EntityDeleted> m_EEntityDeleted;
+    bool OnEntityDeleted(const Events::EntityDeleted& e);
+};
+
+#endif
@@ -35,7 +35,7 @@ public:
    // Delete a component off an entity
    void DeleteComponent(EntityID entity, const std::string& componentType);
    // Get all components of the specified type
-    const ComponentPool* GetComponents(const std::string& componentType);
+    ComponentPool* GetComponents(const std::string& componentType);
    // Get entity parent
    EntityID GetParent(EntityID entity);
    // Change the parent of an entity
@@ -43,6 +43,7 @@ private:
    EditorGUI::WidgetSpace m_WidgetSpace = EditorGUI::WidgetSpace::Global;
    EntityWrapper m_Widget = EntityWrapper::Invalid;
    EntityWrapper m_CurrentSelection = EntityWrapper::Invalid;
+    glm::vec3 m_CamVelocity;

    // Utility functions
    EntityWrapper importEntity(EntityWrapper parent, boost::filesystem::path filePath);
@@ -30,7 +30,7 @@ public:
    virtual bool OnCommand(const Events::InputCommand& e) override;
    virtual void Reset();

-    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer, EntityID playerID);
+    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, Field<double> assaultDashCoolDownTimer, EntityID playerID);
    virtual bool AssaultDashDoubleTapped() const { return m_AssaultDashDoubleTapped; }
    virtual bool PlayerIsDashing() const { return m_PlayerIsDashing; }
    bool SpecialAbilityKeyDown() const { return m_SpecialAbilityKeyDown; }
@@ -166,6 +166,7 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
                            aeb.Duration = 0.1;
                            aeb.NodeName = "Run";
                            aeb.RootNode = firstPersonModel;
+                            aeb.SingleLevelBlend = true;
                            aeb.Start = true;
                            m_EventBroker->Publish(aeb);
                        }
@@ -175,6 +176,7 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
                            aeb.Duration = 0.1;
                            aeb.NodeName = "Run";
                            aeb.RootNode = firstPersonModel;
+                            aeb.SingleLevelBlend = true;
                            aeb.Start = true;
                            aeb.Reverse = true;
                            m_EventBroker->Publish(aeb);
@@ -210,14 +212,40 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
                        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.SingleLevelBlend = true;
+                            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.SingleLevelBlend = true;
+                            aeb.Start = true;
+                            aeb.Reverse = true;
+                            m_EventBroker->Publish(aeb);
+                        }
+                    }
+                }
            }
        }
    }

-    //Animation
-    if (glm::length2(m_Movement) < 0.25f) {
-        //Blend to Idle
-        if (m_PlayerEntity.Valid()) {
+    if (m_PlayerEntity.Valid()) {
+        glm::vec2 movementXZ = glm::vec2(m_Movement.x, m_Movement.z);
+        if (glm::length(movementXZ) < 0.1f) {
+            //Blend to Idle
            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
            if (playerModel.Valid()) {
                Events::AutoAnimationBlend aeb;
@@ -236,10 +264,8 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
                aeb.Start = true;
                m_EventBroker->Publish(aeb);
            }
-        }
-    } else {
-        //Blend to movement
-        if (m_PlayerEntity.Valid()) {
+        } else {
+            //Blend to movement
            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
            if (playerModel.Valid()) {
                Events::AutoAnimationBlend aeb;
@@ -251,8 +277,7 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
        }
    }

-
-    if (glm::length2(m_Movement) > 0) {
+    if (glm::length(m_Movement) > 0) {
        m_Movement = glm::normalize(m_Movement);

        //Animation
@@ -358,7 +383,7 @@ bool FirstPersonInputController<EventContext>::OnLockMouse(const Events::LockMou
 }

 template <typename EventContext>
-void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer, EntityID playerID) {
+void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, Field<double> assaultDashCoolDownTimer, EntityID playerID) {
    m_AssaultDashDoubleTapDeltaTime += dt;
    assaultDashCoolDownTimer -= dt;
    //cooldown = assaultDashCoolDownMaxTimer sec, pretend the dash lasts 0.25 sec (for friction to do its work)
@@ -10,28 +10,34 @@
 #include <boost/asio.hpp>
 #include <boost/shared_array.hpp>

+#include "Network/EKillDeath.h"
+#include "Core/World.h"
+#include "Core/EntityFile.h"
+#include "Core/EventBroker.h"
+#include "Core/ConfigFile.h"
+#include "Core/EPlayerDeath.h"
+#include "Core/EPlayerDamage.h"
+#include "Core/EPlayerSpawned.h"
+#include "Core/EAmmoPickup.h"
+#include "Game/Events/EDoubleJump.h"
+#include "Game/Events/EDashAbility.h"
+#include "Game/Events/EReset.h"
+#include "Input/EInputCommand.h"
+#include "imgui/imgui.h"
 #include "Network/Network.h"
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Network/UDPClient.h"
 #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"
-#include "../Game/Events/EDashAbility.h"
 #include "Network/EDisplayServerlist.h"
 #include "Network/EConnectRequest.h"
+#include "Network/EPlayerDisconnected.h"
+#include "Network/ESearchForServers.h"
+#include "Network/EInterpolate.h"
+#include "Network/SnapshotFilter.h"
+#include "Core/EWin.h"
+
 class Client : public Network
 {
 public:
@@ -40,7 +46,7 @@ public:
    ~Client();

    void Connect(std::string address, int port);
-    void Update() override;
+    void Update(double dt) override;
 private:
    UDPClient m_Unreliable;
    TCPClient m_Reliable;
@@ -74,10 +80,10 @@ private:
    // Network logic
    PlayerDefinition m_PlayerDefinitions[8];
    SnapshotDefinitions m_NextSnapshot;
-    double m_DurationOfPingTime;
-    std::clock_t m_StartPingTime;
-    std::clock_t m_TimeSinceSentInputs;
-    unsigned int m_SendInputIntervalMs;
+    double m_DurationOfPingTime = 0;
+    double m_StartPingTime = 0;
+    double m_TimeSinceSentInputs = 0;
+    double m_SendInputInterval = 0.033;
    std::vector<Events::InputCommand> m_InputCommandBuffer;

    // Private member functions
@@ -100,6 +106,9 @@ private:
    void parseDoubleJump(Packet& packet);
    void parseDashEffect(Packet& packet);
    void parseAmmoPickup(Packet& packet);
+    void parseRemoveWorld(Packet& packet);
+    void parseKDEvent(Packet& packet);
+    void parseWin(Packet& packet);
    void InterpolateFields(Packet& packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
    void parseSnapshot(Packet& packet);
    void identifyPacketLoss();
@@ -109,7 +118,6 @@ private:
    void sendLocalPlayerTransform();
    void becomePlayer();
    void displayServerlist();
-    void removeWorld();
    void createMainMenu();
    // Mapping Logic
    // Returns if local EntityID exist in map
@@ -138,8 +146,8 @@ private:
    UDPClient m_ServerlistRequest;
    std::vector<ServerInfo> m_Serverlist;
    bool m_SearchingForServers = false;
-    std::clock_t m_StartSearchTime;
-    double m_SearchingTime = 200; // Config I guess
+    double m_TimeSearched = 0;
+    double m_SearchingTime = 0.2; // Config I guess
 };

 #endif
@@ -10,8 +10,19 @@ namespace Events

 struct KillDeath : public Event 
 {
+    int CasualtyTeam;
    PlayerID Casualty = -1;
+    std::string CasualtyName;
+
+    //1 = assault, 2 = defender, 3 = sniper
+    int CasualtyClass;
+
+    int KillerTeam;
    PlayerID Killer = -1;
+    std::string KillerName;
+
+    //1 = assault, 2 = defender, 3 = sniper
+    int KillerClass;
 };

 }
@@ -23,6 +23,9 @@ enum class MessageType
    OnDashEffect,
    ServerlistRequest,
    AmmoPickup,
+    RemoveWorld,
+    KD,
+    Win,
    Invalid
 };

@@ -22,7 +22,7 @@ public:
    Network(World* world, EventBroker* eventBroker);
    virtual ~Network() { };

-    virtual void Update() = 0;
+    virtual void Update(double dt) = 0;

 protected:
    World* m_World;
@@ -40,6 +40,7 @@ protected:
    void saveToFile();
    void updateNetworkData();
    void popNetworkSegmentOfHeader(Packet& packet);
+    void removeWorld();
 };

 #endif
@@ -11,6 +11,7 @@
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Core/World.h"
+#include "Core/EntityFile.h"
 #include "Core/EventBroker.h"
 #include "../Network/Network.h"
 #include "Input/EInputCommand.h"
@@ -24,6 +25,8 @@
 #include "Core/EPlayerDeath.h"
 #include "Network/EPlayerConnected.h"
 #include "Network/EKillDeath.h"
+#include "Core/EWin.h"
+#include "Game/Events/EReset.h"

 class Server : public Network
 {
@@ -31,7 +34,7 @@ public:
    Server(World* world, EventBroker* eventBroker, int port);
    ~Server();

-    void Update() override;
+    void Update(double dt) override;

 private:
    // Network channels
@@ -41,6 +44,7 @@ private:
    // dont forget to set these in the childrens receive logic
    boost::asio::ip::address m_Address;
    int m_Port = 27666;
+    bool m_GameIsOver = false;
    // Sending messages to client logic
    std::map<PlayerID, PlayerDefinition> m_ConnectedPlayers;
    std::vector<PlayerID> m_PlayersToDisconnect;
@@ -48,14 +52,14 @@ private:
    char readBuffer[BUFFERSIZE] = { 0 };
    size_t bytesRead = 0;
    // time for previouse message
-    std::clock_t previousePingMessage = std::clock();
-    std::clock_t previousSnapshotMessage = std::clock();
-    std::clock_t timOutTimer = std::clock();
+    double previousPingMessage = 0;
+    double previousSnapshotMessage = 0;
+    double timeOutTimer = 0;

-    // How often we send messages (milliseconds)
-    float pingIntervalMs;
-    float snapshotInterval;
-    int checkTimeOutInterval = 100;
+    // How often we send messages (seconds)
+    double pingInterval = 1;
+    double snapshotInterval = 0.05;
+    double checkTimeOutInterval = 0.1;
    int m_NextPlayerID = 0;
    std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
    //Timers
@@ -71,6 +75,7 @@ private:
    void reliableBroadcast(Packet& packet);
    void unreliableBroadcast(Packet& packet);
    void sendSnapshot();
+    void createWorldSnapshot(Packet& packet);
    void addPlayersToPacket(Packet& packet, EntityID entityID);
    void addChildrenToPacket(Packet& packet, EntityID entityID);
    void addInputCommandsToPacket(Packet& packet);
@@ -83,6 +88,7 @@ private:
    void kick(PlayerID player);
    PlayerID getPlayerIDFromEndpoint();
    PlayerID getPlayerIDFromEntityID(EntityID entityID);
+    void resetMap();
    void parsePlayerTransform(Packet& packet);
    void parseOnInputCommand(Packet& packet);
    void parseClientPing();
@@ -110,6 +116,8 @@ private:
    bool OnAmmoPickup(const Events::AmmoPickup& e);
    EventRelay<Server, Events::PlayerDeath> m_EPlayerDeath;
    bool OnPlayerDeath(const Events::PlayerDeath& e);
+    EventRelay<Server, Events::Win> m_EWin;
+    bool OnWin(const Events::Win& e);
 };

 #endif
@@ -49,9 +49,7 @@ public:
                    next = next->Child[0];
                }
            }
-
            return next;
-
        }
    };

@@ -82,6 +80,7 @@ public:
    BlendTree::Node* FirstCommonParent(Node* node1, Node* node2);

    EntityWrapper GetSubTreeRoot(std::string nodeName);
+    std::vector<EntityWrapper> GetSubTreeRoots(std::string nodeName);

    std::vector<EntityWrapper> GetSingleLevelRoots(std::string name);
    std::vector<EntityWrapper> GetEntitesByName(std::string name);
@@ -3,6 +3,7 @@

 #include "IRenderer.h"
 #include "ShaderProgram.h"
+#include "PNG.h"

 class CubeMapPass
 {
@@ -21,7 +22,7 @@ private:
    IRenderer* m_Renderer;
    std::string m_PreviusCubeMapTexture;

-    std::vector<Texture*> m_CubeMapTextures;
+    std::vector<std::string> m_CubeMapTextures;
 };

 #endif 
@@ -7,7 +7,7 @@
 #include "../GLM.h"
 #include "../Core/ComponentWrapper.h"
 #include "RenderJob.h"
-#include "../Core/Transform.h"
+#include "../Core/TransformSystem.h"
 #include "../Core/World.h"

 struct DirectionalLightJob : RenderJob
@@ -16,7 +16,7 @@ struct DirectionalLightJob : RenderJob
        : RenderJob()
    {

-        Direction = glm::vec4(0,0,-1,0) * glm::inverse(Transform::AbsoluteOrientation(m_World, transformComponent.EntityID));
+        Direction = glm::vec4(0,0,-1,0) * glm::inverse(TransformSystem::AbsoluteOrientation(m_World, transformComponent.EntityID));
        //Direction = glm::vec4((glm::vec3)directionalLightComponent["Direction"], 0.f);
        Color = (glm::vec4)directionalLightComponent["Color"];
        Intensity = (double)directionalLightComponent["Intensity"];
@@ -17,7 +17,7 @@
 class DrawFinalPass
 {
 public:
-    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass, ShadowPass* shadowPass);
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass, ShadowPass* shadowPass, ConfigFile* config);
 	~DrawFinalPass();
    void InitializeTextures();
    void InitializeFrameBuffers();
@@ -25,17 +25,77 @@ public:
    void Draw(RenderScene& scene, BlurHUD* blurHUDPass);
    void ClearBuffer();
    void OnWindowResize();
+	void setMSAA(unsigned int numberOfSamples);

    //Return the texture that is used in later stages to apply the bloom effect
-    GLuint BloomTexture() const { return m_BloomTexture; }
+	GLuint BloomTexture() {
+		if (m_MSAA){
+			m_AntiAliasedFrameBuffer->Bind();
+			glClearColor(0.f, 0.f, 0.f, 0.f);
+			glClear(GL_COLOR_BUFFER_BIT);
+			m_AntiAliasedFrameBuffer->Unbind();
+			m_FinalPassFrameBuffer->Read();
+			glReadBuffer(GL_COLOR_ATTACHMENT1);
+			m_AntiAliasedFrameBuffer->Draw();
+			glBlitFramebuffer(
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				GL_COLOR_BUFFER_BIT, GL_NEAREST);
+			return m_AntiAliasedTexture;
+		}
+		return m_BloomTexture; }
    //Return the texture with diffuse and lighting of the scene.
-    GLuint SceneTexture() const { return m_SceneTexture; }
+	GLuint DrawFinalPass::SceneTexture() {
+		if (m_MSAA) {
+			m_AntiAliasedFrameBuffer->Bind();
+			glClearColor(0.f, 0.f, 0.f, 0.f);
+			glClear(GL_COLOR_BUFFER_BIT);
+			m_AntiAliasedFrameBuffer->Unbind();
+			m_FinalPassFrameBuffer->Read();
+			glReadBuffer(GL_COLOR_ATTACHMENT0);
+			m_AntiAliasedFrameBuffer->Draw();
+			glBlitFramebuffer(
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				GL_COLOR_BUFFER_BIT, GL_NEAREST);
+			return m_AntiAliasedTexture;
+		}
+		return m_SceneTexture;
+	}
    //Return the SceneTexture with the blurred HUD bits.
-    GLuint CombinedSceneTexture() const { return m_CombinedTexture; }
+    GLuint CombinedSceneTexture() {
+		if (m_MSAA) {
+			m_AntiAliasedFrameBuffer->Bind();
+			glClearColor(0.f, 0.f, 0.f, 0.f);
+			glClear(GL_COLOR_BUFFER_BIT);
+			m_AntiAliasedFrameBuffer->Unbind();
+			m_FinalPassFrameBuffer->Read();
+			m_AntiAliasedFrameBuffer->Draw();
+			glBlitFramebuffer(
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				GL_COLOR_BUFFER_BIT, GL_NEAREST);
+			return m_AntiAliasedTexture;
+		}
+		return m_CombinedTexture; }
    //Return the blurred scene texture.
-    GLuint FullBlurredTexture() const { return m_FullBlurredTexture; }
+    GLuint FullBlurredTexture() { 
+		if (m_MSAA) {
+			m_AntiAliasedFrameBuffer->Bind();
+			glClearColor(0.f, 0.f, 0.f, 0.f);
+			glClear(GL_COLOR_BUFFER_BIT);
+			m_AntiAliasedFrameBuffer->Unbind();
+			m_FinalPassFrameBuffer->Read();
+			m_AntiAliasedFrameBuffer->Draw();
+			glBlitFramebuffer(
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				GL_COLOR_BUFFER_BIT, GL_NEAREST);
+			return m_AntiAliasedTexture;
+		}
+		return m_FullBlurredTexture; }
    //Return the framebuffer used in the scene rendering stage.
-    FrameBuffer* FinalPassFrameBuffer() { return &m_FinalPassFrameBuffer; }
+    FrameBuffer* FinalPassFrameBuffer() { return m_FinalPassFrameBuffer; }

 private:
    void DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, RenderScene& scene);
@@ -56,18 +116,21 @@ private:
    Texture* m_GreyTexture;
    Texture* m_ErrorTexture;

-    FrameBuffer m_FinalPassFrameBuffer;
-	FrameBuffer m_ShieldDepthFrameBuffer;
+    FrameBuffer* m_FinalPassFrameBuffer = nullptr;
+	FrameBuffer* m_ShieldDepthFrameBuffer = nullptr;
+	FrameBuffer* m_AntiAliasedFrameBuffer = nullptr;
    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 
+    GLuint m_FullBlurredTexture = 0;
+    GLuint m_CombinedTexture = 0; //This can be removed for less memory usage, just set m_sceneTexture to the return from m_BlurHUDPass.CombineTextures
+	GLuint m_AntiAliasedTexture = 0; //Is only used when MSAA is active;

    //maqke this component based i guess?
    GLuint m_ShieldPixelRate = 16;
+	unsigned int m_MSAA = 0;

    const IRenderer* m_Renderer;
    const LightCullingPass* m_LightCullingPass;
@@ -18,15 +18,17 @@ 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, bool isShielded, bool shadow)
        : ModelJob(model, camera, matrix, matGroup, modelComponent, world, fillColor, fillPercentage, isShielded, shadow)
    {
-        ExplosionOrigin = (glm::vec3)explosionEffectComponent["ExplosionOrigin"];
-        TimeSinceDeath = (double)explosionEffectComponent["TimeSinceDeath"];
-        ExplosionDuration = (double)explosionEffectComponent["ExplosionDuration"];
-        EndColor = (glm::vec4)explosionEffectComponent["EndColor"];
-        Randomness = (bool)explosionEffectComponent["Randomness"];
-        RandomnessScalar = (double)explosionEffectComponent["RandomnessScalar"];
-        Velocity = (glm::vec2)explosionEffectComponent["Velocity"];
-        ColorByDistance = (bool)explosionEffectComponent["ColorByDistance"];
-        ExponentialAccelaration = (bool)explosionEffectComponent["ExponentialAccelaration"];
+        ExplosionOrigin = (Field<glm::vec3>)explosionEffectComponent["ExplosionOrigin"];
+        TimeSinceDeath = (Field<double>)explosionEffectComponent["TimeSinceDeath"];
+        ExplosionDuration = (Field<double>)explosionEffectComponent["ExplosionDuration"];
+        EndColor = (Field<glm::vec4>)explosionEffectComponent["EndColor"];
+        Randomness = (Field<bool>)explosionEffectComponent["Randomness"];
+        RandomnessScalar = (Field<double>)explosionEffectComponent["RandomnessScalar"];
+        Velocity = (Field<glm::vec2>)explosionEffectComponent["Velocity"];
+        ColorByDistance = (Field<bool>)explosionEffectComponent["ColorByDistance"];
+        ExponentialAccelaration = (Field<bool>)explosionEffectComponent["ExponentialAccelaration"];
+        Reverse = (Field<bool>)explosionEffectComponent["Reverse"];Reverse = (bool)explosionEffectComponent["Reverse"];
+        ColorDistanceScalar = (Field<double>)explosionEffectComponent["ColorDistanceScalar"];ColorDistanceScalar = (double)explosionEffectComponent["ColorDistanceScalar"];
    };

    glm::vec3 ExplosionOrigin;
@@ -38,12 +40,14 @@ struct ExplosionEffectJob : ModelJob
    glm::vec4 EndColor;
    bool Randomness = false;
    
-    float RandomnessScalar = 1.f;
+    double RandomnessScalar = 1.f;
    glm::vec2 Velocity;
    bool ColorByDistance = false;
    //bool ReverseAnimation = false;
    //bool Wireframe = false;
    bool ExponentialAccelaration = false;
+	bool Reverse = false;
+	double ColorDistanceScalar = 1.f;

    std::array<float, 50> RandomNumbers = {
        0.3257552917701f,
@@ -7,12 +7,13 @@
 class BufferResource
 {
 public:
-    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment, GLuint mipMapLod);
+    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment, GLuint mipMapLod, bool multiSampling);
    
    GLuint* m_ResourceHandle;
    GLenum m_ResourceType;
    GLenum m_Attachment;
    GLuint m_MipMapLod = 0;
+	bool m_MultiSampling = false;
 private:
    
 };
@@ -21,24 +22,33 @@ template <GLenum RESOURCETYPE>
 class ResourceType : public BufferResource
 {
 public:
-    ResourceType(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod)
-        : BufferResource(resourceHandle, RESOURCETYPE, attachment, mipMapLod) { }
+    ResourceType(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod, bool multiSampling)
+        : BufferResource(resourceHandle, RESOURCETYPE, attachment, mipMapLod, multiSampling) { }
 };

 class Texture2D : public ResourceType<GL_TEXTURE_2D>
 {
 public:
    Texture2D(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod = 0)
-        : ResourceType(resourceHandle, attachment, mipMapLod) { };
+        : ResourceType(resourceHandle, attachment, mipMapLod, false) { };

    ~Texture2D();
 };

+class Texture2DMultiSample : public ResourceType<GL_TEXTURE_2D_MULTISAMPLE>
+{
+public:
+	Texture2DMultiSample(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod = 0)
+		: ResourceType(resourceHandle, attachment, mipMapLod, true) { };
+
+	~Texture2DMultiSample();
+};
+
 class RenderBuffer : public ResourceType<GL_RENDERBUFFER>
 {
 public:
-    RenderBuffer(GLuint* resourceHandle, GLenum attachment)
-        : ResourceType(resourceHandle, attachment, 0)
+    RenderBuffer(GLuint* resourceHandle, GLenum attachment, bool multiSampling = false)
+        : ResourceType(resourceHandle, attachment, 0, multiSampling)
    { };

    ~RenderBuffer();
@@ -48,12 +58,13 @@ class Texture2DArray : public ResourceType<GL_TEXTURE_2D_ARRAY>
 {
 public:
 	Texture2DArray(GLuint* resourceHandle, GLenum attachment)
-		: ResourceType(resourceHandle, attachment, 0)
+		: ResourceType(resourceHandle, attachment, 0, false)
 	{ };

 	~Texture2DArray();
 };

+
 class FrameBuffer
 {
 public:
@@ -65,9 +76,13 @@ public:
    void Generate();
    void Bind();
    void Unbind();
+	void Read();
+	void Draw();
    GLuint GetHandle();
+	bool MultiSampling() { return m_MultiSampling; };

 private:
+	bool m_MultiSampling = true;
    GLuint m_BufferHandle;
    std::vector<std::shared_ptr<BufferResource>> m_Resources;
 };
@@ -3,6 +3,8 @@

 struct Image
 {
+    virtual ~Image() = default;
+
 	enum class ImageFormat
 	{
 		Unknown,
@@ -16,15 +16,18 @@ private:

 public:
 	~Model();
-    const std::vector<RawModel::MaterialProperties>& MaterialGroups() const { return m_RawModel->m_Materials; }
-    const glm::mat4& Matrix() const { return m_RawModel->m_Matrix; }
-    const RawModel::Vertex* Vertices() const { return m_RawModel->Vertices(); }
-	unsigned int NumberOfVertices() const { return m_RawModel->NumVertices(); }
+    const std::vector<RawModel::MaterialProperties>& MaterialGroups() const { return m_Materials; }
+	unsigned int NumberOfVertices() const { return m_Vertices.size(); }
+
    const AABB& Box() const { return m_Box; }
-	bool IsSkinned() const { return m_RawModel->IsSkinned(); }
+	bool IsSkinned() const { return m_IsSkinned; }
 	GLuint VAO;
 	GLuint ElementBuffer;
-    RawModel* m_RawModel;
+    //RawModel* m_RawModel;
+
+    Skeleton* m_Skeleton = nullptr;
+    std::vector<glm::vec3> m_Vertices;
+    std::vector<unsigned int> m_Indices;

 private:
    AABB m_Box;
@@ -34,6 +37,9 @@ private:
 	GLuint TangentNormalsBuffer;
 	GLuint BiTangentNormalsBuffer;
 	GLuint TextureCoordBuffer;
+
+	std::vector<RawModel::MaterialProperties> m_Materials;
+    bool m_IsSkinned;
 };

 #endif
@@ -12,7 +12,7 @@
 #include "../Core/ResourceManager.h"
 #include "Camera.h"
 #include "../Core/World.h"
-#include "../Core/Transform.h"
+#include "../Core/TransformSystem.h"
 #include "Skeleton.h"
 #include "ShaderProgram.h"
 #include "BlendTree.h"
@@ -104,12 +104,17 @@ struct ModelJob : RenderJob
        FillPercentage = fillPercentage;
 		IsShielded = isShielded;

+        
+        if (world->HasComponent(Entity, "Unpickable")) {
+            NotPickable = true;
+        }
+
        if (model->IsSkinned()) {
-            Skeleton = Model->m_RawModel->m_Skeleton;
+            Skeleton = Model->m_Skeleton;

            if (Skeleton != nullptr) {
-                
                EntityWrapper entityWrapper = EntityWrapper(world, modelComponent.EntityID);
+                

                if(Skeleton->BlendTrees.find(entityWrapper) != Skeleton->BlendTrees.end()) {
                    BlendTree = Skeleton->BlendTrees.at(entityWrapper);
@@ -147,6 +152,7 @@ struct ModelJob : RenderJob
    float FillPercentage = 0.0;
 	bool IsShielded;
 	bool Shadow;
+    bool NotPickable = false;

    void CalculateHash() override
    {
@@ -7,7 +7,7 @@
 #include "../GLM.h"
 #include "../Core/ComponentWrapper.h"
 #include "RenderJob.h"
-#include "../Core/Transform.h"
+#include "../Core/TransformSystem.h"
 #include "../Core/World.h"

 struct PointLightJob : RenderJob
@@ -16,7 +16,7 @@ struct PointLightJob : RenderJob
        : RenderJob()
    {
        Position = glm::vec4((glm::vec3)transformComponent["Position"], 1.0f);
-        Position = glm::vec4(Transform::AbsolutePosition(m_World, transformComponent.EntityID), 1.f);
+        Position = glm::vec4(TransformSystem::AbsolutePosition(m_World, transformComponent.EntityID), 1.f);
        Color = (glm::vec4)pointLightComponent["Color"];
        Radius = (double)pointLightComponent["Radius"];
        Intensity = (double)pointLightComponent["Intensity"];
@@ -13,6 +13,7 @@

 #include <boost/filesystem/path.hpp>

+#include <boost/endian/buffers.hpp>
 #include "../Common.h"
 #include "../GLM.h"
 #include "../Core/ResourceManager.h"
@@ -20,22 +21,17 @@
 #include "Skeleton.h"
 #include "ShaderProgram.h"

-#include "boost\endian\buffers.hpp"
-
-
-
 class RawModelCustom : public Resource
 {
    friend class ResourceManager;
-
+    friend class Model;
 protected:
    RawModelCustom(std::string fileName);

 public:
    ~RawModelCustom();
-    
-	struct Vertex
-	{
+
+	struct RenderVertex {
 		glm::vec3 Position;
 		glm::vec3 Normal;
 		glm::vec3 Tangent;
@@ -43,7 +39,7 @@ public:
 		glm::vec2 TextureCoords;
 	};

-    struct SkinedVertex : public Vertex {
+    struct SkinedVertex : public RenderVertex {
        glm::vec4 BoneIndices;
        glm::vec4 BoneWeights;
    };
@@ -91,7 +87,7 @@ public:
 		unsigned int ShaderID = 0;
 	};

-	const Vertex*	Vertices() const {
+	const RenderVertex* Vertices() const {
 		if (hasSkin) { 
 			return m_SkinedVertices.data(); 
 		} else {
@@ -99,16 +95,16 @@ public:
 		}
 	};

-	unsigned int	VertexSize() const {
+	unsigned int VertexSize() const {
 		if (hasSkin) {
 			return sizeof(SkinedVertex);
 		}
 		else {
-			return sizeof(Vertex);
+			return sizeof(RenderVertex);
 		}
 	};

-	unsigned int	NumVertices() const {
+	size_t NumVertices() const {
 		if (hasSkin) {
 			return m_SkinedVertices.size();
 		} else {
@@ -116,17 +112,39 @@ public:
 		}
 	};

+	const std::vector<unsigned int>& Indices() const {
+		return m_Indices;
+	}
+
 	bool IsSkinned() const { return hasSkin; };

+	const std::vector<glm::vec3>& CollisionVertices();
+
+	size_t NumCollisionVertices() const {
+		return m_CollisionVertices.size();
+	};
+
+	const std::vector<unsigned int>& CollisionIndices() const {
+		if (hasCollisionMesh) {
+			return m_CollisionIndices;
+		} else {
+			return m_Indices;
+		}
+	};
+
 	std::vector<MaterialProperties> m_Materials;

-    std::vector<unsigned int> m_Indices;
+    
    Skeleton* m_Skeleton = nullptr;
    glm::mat4 m_Matrix;

 private:
   	bool hasSkin;
-	std::vector<Vertex> m_Vertices;
+	bool hasCollisionMesh = false;
+	std::vector<unsigned int> m_Indices;
+	std::vector<unsigned int> m_CollisionIndices;
+	std::vector<glm::vec3> m_CollisionVertices;
+	std::vector<RenderVertex> m_Vertices;
 	std::vector<SkinedVertex> m_SkinedVertices;

    void ReadMeshFile(std::string filePath);
@@ -149,7 +167,12 @@ private:
    void ReadAnimationClips(std::size_t& offset, char* fileData, const unsigned int& fileByteSize, unsigned int numberOfClips);
    void ReadAnimationClipSingle(std::size_t& offset, char* fileData, const unsigned int& fileByteSize, unsigned int clipIndex);
    void ReadAnimationKeyFrame(std::size_t& offset, char* fileData, const unsigned int& fileByteSize, std::vector<Skeleton::Animation::Keyframe>& animation);
-    
+
+
+	void ReadCollisionFile(std::string filePath);
+	void ReadCollisionFileData(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
+
+	const std::vector<glm::vec3>& ConstructCollisionList();
    //void CreateSkeleton(std::vector<std::tuple<std::string, glm::mat4>> &boneInfo, std::map<std::string, int> &boneNameMapping, aiNode* node, int parentID);
 };

@@ -14,7 +14,7 @@
 #include "ModelJob.h"
 #include "Renderer.h"
 #include "PointLightJob.h"
-#include "../Core/Transform.h"
+#include "../Core/TransformSystem.h"
 #include "../Core/EPlayerSpawned.h"
 #include "../Core/Octree.h"
 #include "../Collision/EntityAABB.h"
@@ -22,7 +22,7 @@
 #include "../Core/EventBroker.h"
 #include "ImGuiRenderPass.h"
 #include "Camera.h"
-#include "../Core/Transform.h"
+#include "../Core/TransformSystem.h"
 #include "imgui/imgui.h"
 #include "TextPass.h"
 #include "Util/CommonFunctions.h"
@@ -71,6 +71,7 @@ private:
    bool m_ResizeWindow = false;
 	int m_SSAO_Quality = 0;
 	int m_GLOW_Quality = 2;
+	unsigned int m_MSAA_Level = 0;

    PickingPass* m_PickingPass;
    LightCullingPass* m_LightCullingPass;
@@ -69,7 +69,7 @@ private:
 	std::array<glm::mat4, MAX_SPLITS> m_LightProjection;
 	std::array<glm::mat4, MAX_SPLITS> m_LightView;

-	GLfloat m_NearFarPlane[2] = { -34.f, 27.f };
+	GLfloat m_NearFarPlane[2] = { -128.f, 128.f };
 	GLuint m_ResolutionSizeWidth = 1024 * 2;
 	GLuint m_ResolutionSizeHeight = 1024 * 2;

@@ -20,11 +20,14 @@ public:
 			, Parent(parent)
 			, Name(name)
 			, OffsetMatrix(offsetMatrix)
-		{ }
+		{
+			BindTransformMatrix = glm::inverse(offsetMatrix);
+		}

 		std::string Name;
 		glm::mat4 OffsetMatrix;
        int ID;
+		glm::mat4 BindTransformMatrix;

 		Bone* Parent;
 		std::vector<Bone*> Children;
@@ -13,7 +13,7 @@
 #include "../Core/ResourceManager.h"
 #include "Camera.h"
 #include "../Core/World.h"
-#include "../Core/Transform.h"
+#include "../Core/TransformSystem.h"
 #include "Skeleton.h"

 struct SpriteJob : RenderJob
@@ -21,7 +21,7 @@ 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>((std::string)cSprite["Model"]);
+        Model = ResourceManager::Load<::Model>(cSprite["Model"]);
        ::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
        TextureID = 0;

@@ -29,6 +29,7 @@ struct SpriteJob : RenderJob
        IncandescenceTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["GlowMap"]);

        Linear = (bool)cSprite["Linear"];
+		ClampToBorder = (bool)cSprite["ClampToBorder"];

        StartIndex = matProp.material->StartIndex;
        EndIndex = matProp.material->EndIndex;
@@ -37,7 +38,7 @@ struct SpriteJob : RenderJob
        BlurBackground = (bool)cSprite["BlurBackground"];

        Entity = cSprite.EntityID;
-        Position = Transform::AbsolutePosition(world, cSprite.EntityID);
+        Position = TransformSystem::AbsolutePosition(world, cSprite.EntityID);
        Depth = 0;
        if (depthSorted) {
            glm::vec3 viewpos = glm::vec3(camera->ViewMatrix() * glm::vec4(Position, 1));
@@ -50,11 +51,11 @@ struct SpriteJob : RenderJob
        FillColor = fillColor;
        FillPercentage = fillPercentage;

-        glm::vec3 scale = Transform::AbsoluteScale(world, cSprite.EntityID);
+        glm::vec3 scale = TransformSystem::AbsoluteScale(world, cSprite.EntityID);

        if((bool)cSprite["KeepRatio"] == true) {
            if(scale.y >= scale.x) {
-                ScaleY = (scale.x)/(scale.y);
+                ScaleY = (scale.y)/(scale.x);
                ScaleX = 1.f;
            } else {
                ScaleY = 1.f;
@@ -90,9 +91,10 @@ struct SpriteJob : RenderJob
    bool Pickable;
 	bool IsIndicator = false;
    bool BlurBackground = false;
-    float ScaleX = 1;
-    float ScaleY = 1;
+    float ScaleX = 1.f;
+    float ScaleY = 1.f;
    bool Linear = false;
+	bool ClampToBorder = false;

    glm::vec4 FillColor = glm::vec4(0);
    float FillPercentage = 0.0;
@@ -17,8 +17,8 @@ struct TextJob : RenderJob
        : RenderJob()
    {
        Matrix = matrix;
-        Color = (glm::vec4)textComponent["Color"];
-        Content = (std::string)textComponent["Content"];
+        Color = (const glm::vec4&)textComponent["Color"];
+        Content = (const std::string&)textComponent["Content"];
        Resource = font;

        if ((int)textComponent["Alignment"] == textComponent["Alignment"].Enum("Left")) {
@@ -14,8 +14,6 @@ protected:
 	TextureSprite(std::string path);

 public:
-	~TextureSprite();
-
 	void Bind(GLenum textureUnit = GL_TEXTURE0);

 	GLuint m_Texture = 0;
@@ -27,7 +27,7 @@ Texture* TryLoadResource(std::string path)

 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 GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type, GLint numMipMaps, GLint MAGFilter, GLint MINFilter);
 void DeleteTexture(GLuint* texture);
 };

@@ -13,7 +13,7 @@
 #include "../Engine/Core/EventBroker.h"
 #include "../Engine/Core/ResourceManager.h"
 #include "../Engine/Core/ConfigFile.h"
-#include "../Engine/Core/Transform.h"
+#include "../Engine/Core/TransformSystem.h"
 #include "../Engine/Sound/Sound.h"
 #include "../Engine/Sound/EPlayQueueOnEntity.h"
 #include "../Engine/Sound/EPlaySoundOnEntity.h"
@@ -30,6 +30,7 @@
 #include "../Engine/Core/EPause.h"
 #include "../Engine/Core/EComponentAttached.h"
 #include "../Core/EPlayerSpawned.h"
+#include "../Rendering/ESetCamera.h"


 typedef std::pair<ALuint, std::vector<ALuint>> QueuedBuffers;
@@ -80,6 +81,7 @@ private:
    void setSoundProperties(Source* source, ComponentWrapper* soundComponent);
    float getDurationSeconds(Source* source);
    float getTimeOffsetSeconds(Source* source);
+    void setTimeOffsetSeconds(Source* source, float timeOffset);

    // Specific logic
    void playSound(Source* source);
@@ -91,7 +93,6 @@ private:
    void matchBGMLoop();
    Source* m_CurrentBGM = nullptr;
    Source* m_CurrentBGMCombo = nullptr;
-    bool m_DrumLoopHasBeenStarted = false;

    // Logic
    World* m_World = nullptr;
@@ -139,6 +140,8 @@ private:
    bool OnPlayQueueOnEntity(const Events::PlayQueueOnEntity &e);
    EventRelay<SoundManager, Events::ChangeBGM> m_EChangeBGM;
    bool OnChangeBGM(const Events::ChangeBGM &e);
+    EventRelay<SoundManager, Events::SetCamera> m_ESetCamera;
+    bool OnSetCamera(const Events::SetCamera& e);


 };
@@ -0,0 +1,16 @@
+#ifndef Events_Reset_h__
+#define Events_Reset_h__
+
+#include "Core/EventBroker.h"
+#include "Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct Reset : Event
+{
+};
+
+}
+
+#endif
@@ -2,7 +2,7 @@
 #define AmmoPickupSystem_h__

 #include "Core/System.h"
-#include "Core/Transform.h"
+#include "Core/TransformSystem.h"
 #include "Core/ResourceManager.h"
 #include "Core/EntityFile.h"
 #include "Core/EPickupSpawned.h"
@@ -6,6 +6,7 @@
 #include "Core/EntityFile.h"
 #include "Core/EPlayerDamage.h"
 #include "Common.h"
+#include "SpawnerSystem.h"

 class BoostSystem : public System
 {
@@ -17,5 +18,7 @@ private:
    bool OnPlayerDamage(Events::PlayerDamage& e);

    std::string DetermineClass(EntityWrapper player);
+
+    void giveAmmo(EntityWrapper giver, EntityWrapper receiver);
 };
 #endif
@@ -7,7 +7,7 @@

 #include "Common.h"
 #include "Core/System.h"
-#include "Core/Transform.h"
+#include "Core/TransformSystem.h"
 #include "Core/ECaptured.h"


@@ -9,6 +9,7 @@
 #include "Engine/Collision/ETrigger.h"
 #include "Core/ECaptured.h"
 #include "Core/EWin.h"
+#include "Game/Events/EReset.h"

 #include <tuple>
 #include <vector>
@@ -23,6 +24,7 @@ public:
    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt) override;

 private:
+    void Init();
    //methods which will take care of specific events
    EventRelay<CapturePointSystem, Events::TriggerTouch> m_ETriggerTouch;
    bool CapturePointSystem::OnTriggerTouch(const Events::TriggerTouch& e);
@@ -30,6 +32,8 @@ private:
    bool CapturePointSystem::OnTriggerLeave(const Events::TriggerLeave& e);
    EventRelay<CapturePointSystem, Events::Captured> m_ECaptured;
    bool CapturePointSystem::OnCaptured(const Events::Captured& e);
+    EventRelay<CapturePointSystem, Events::Reset> m_EReset;
+    bool CapturePointSystem::OnReset(const Events::Reset& e);
    void ChangeCapturePointModelsVisibility(EntityWrapper &capturePointModels, bool isOwner);

    bool m_WinnerWasFound = false;
@@ -2,7 +2,7 @@
 #define DamageIndicatorSystem_h__

 #include "Core/System.h"
-#include "Core/Transform.h"
+#include "Core/TransformSystem.h"
 #include "Core/ResourceManager.h"
 #include "Core/EntityFile.h"
 #include "Core/EPlayerDamage.h"
@@ -0,0 +1,21 @@
+#ifndef EndScreenSystem_h__
+#define EndScreenSystem_h__
+
+#include "Core/System.h"
+#include "Input/EInputCommand.h"
+#include "Rendering/ESetCamera.h"
+#include "Core/EWin.h"
+
+class EndScreenSystem : public ImpureSystem
+{
+public:
+    EndScreenSystem(SystemParams params);
+
+    virtual void Update(double dt) override;
+
+private:
+    EventRelay<EndScreenSystem, Events::Win> m_EWin;
+    bool OnWin(const Events::Win& e);
+};
+
+#endif
@@ -3,6 +3,7 @@

 #include "Common.h"
 #include "Core/System.h"
+#include "Engine/GLM.h"

 class ExplosionEffectSystem : public PureSystem
 {
@@ -0,0 +1,22 @@
+#ifndef FadeSystem_h__
+#define FadeSystem_h__
+
+#include "Core/System.h"
+#include "GLM.h"
+
+class FadeSystem : public PureSystem
+{
+public:
+    FadeSystem(SystemParams params)
+        : System(params)
+        , PureSystem("Fade")
+    {
+
+    }
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cFadeOut, double dt) override;
+
+private:
+};
+
+#endif
@@ -12,8 +12,8 @@ public:
    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"];
+        (Field<double>)component["Time"] += dt;
+        (Field<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"];

    }
 };
@@ -3,7 +3,7 @@

 #include "../../Engine/Core/System.h"
 #include "../../Engine/GLM.h"
-#include "Core/EPlayerDeath.h"
+#include "Network/EKillDeath.h"

 class KillFeedSystem : public ImpureSystem
 {
@@ -11,8 +11,7 @@ public:
    KillFeedSystem(SystemParams params)
        : System(params)
    {
-        EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &KillFeedSystem::OnPlayerDeath);
-
+        EVENT_SUBSCRIBE_MEMBER(m_EKillDeath, &KillFeedSystem::OnPlayerKillDeath)
    }

    virtual void Update(double dt) override;
@@ -22,16 +21,30 @@ private:



-    EventRelay<KillFeedSystem, Events::PlayerDeath> m_EPlayerDeath;
-    bool KillFeedSystem::OnPlayerDeath(Events::PlayerDeath& e);
+    EventRelay<KillFeedSystem, Events::KillDeath> m_EKillDeath;
+    bool KillFeedSystem::OnPlayerKillDeath(Events::KillDeath& e);

    struct KillFeedInfo
    {
-        std::string Content;
-        glm::vec4 Color;
+        std::string KillerName = "";
+        int KillerClass = 0;
+        int KillerID = -1;
+        int KillerTeam = 0;
+        std::string KillerColor = "";
+
+        std::string VictimName = "";
+        int VictimClass = 0;
+        int VictimID = -1;
+        int VictimTeam = 0;
+        std::string VictimColor = "";
+
+        bool redused;
        float TimeToLive = 5.f;
    };

+    std::string m_RedColor = "\\C08366D";
+    std::string m_BlueColor = "\\C6A1208";
+
    std::list<KillFeedInfo> m_DeathQueue;

 };
@@ -13,6 +13,7 @@
 #include "Input/EInputCommand.h"
 #include "Network/ESearchForServers.h"
 #include "Network/EConnectRequest.h"
+#include <stdlib.h>


 class MainMenuSystem : public ImpureSystem
@@ -24,6 +25,7 @@ public:
 private:
    IRenderer* m_Renderer;
    void OpenSubMenu(const Events::InputCommand& e);
+    void OpenDropDown(const Events::InputCommand& e);

    EventRelay<MainMenuSystem, Events::ButtonClicked> m_EClicked;
    bool OnButtonClick(const Events::ButtonClicked& e);
@@ -36,6 +38,7 @@ private:

    std::string m_CurrentCommand = "";
    EntityWrapper m_OpenSubMenu = EntityWrapper::Invalid;
+    EntityWrapper m_DropDown = EntityWrapper::Invalid;

 };

@@ -2,7 +2,7 @@
 #define PickupSpawnSystem_h__

 #include "Core/System.h"
-#include "Core/Transform.h"
+#include "Core/TransformSystem.h"
 #include "Core/ResourceManager.h"
 #include "Core/EntityFile.h"
 #include "Core/EPickupSpawned.h"
@@ -32,6 +32,8 @@ private:
    glm::vec3 m_LastPosition = glm::vec3();
    // Used to track afterimages for sprint effect.
    float m_SprintEffectTimer;
+    // Used to track afterimages for dash effect.
+    float m_DashEffectTimer;
    // The logic for making the sound play when player is moving
    void playerStep(double dt, EntityWrapper player);
    // Spawn a hexagon at origin of an Entity
@@ -46,4 +48,6 @@ private:

    void updateMovementControllers(double dt);
    void updateVelocity(EntityWrapper player, double dt);
+
+    void setAim(EntityWrapper root, std::string weaponNodeName, double time);
 };
@@ -19,9 +19,9 @@ private:
    enum class PlayerClass
    {
        None = 0,
-        Assault,
-        Defender,
-        Sniper
+        Assault = 1,
+        Defender = 2,
+        Sniper = 2
    };
    struct SpawnRequest
    {
@@ -1,6 +1,25 @@
 #include "Common.h"
 #include "Core/System.h"

+
+
+ //struct FSubscriptProxy
+ //   {
+ //       friend struct ComponentWrapper;
+ //       FSubscriptProxy(ComponentWrapper* component, std::string fieldName)
+ //           : m_Component(component)
+ //           , m_FieldName(fieldName)
+ //       { }
+
+ //       ComponentWrapper* m_Component;
+ //       std::string m_FieldName;
+
+ //   public:
+ //       template <typename T>
+ //       operator Field<T>() { return Field<T>(m_Component->Field<T>(m_FieldName)); }
+
+ //   };
+
 class RaptorCopterSystem : public PureSystem
 {
 public:
@@ -9,9 +28,11 @@ public:
        , PureSystem("RaptorCopter")
    { }

-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cRaptorCopter, double dt) override
    {
-        ComponentWrapper& transform = m_World->GetComponent(component.EntityID, "Transform");
-        (glm::vec3&)transform["Orientation"] += (float)(double)component["Speed"] * (float)dt * (glm::vec3)component["Axis"];
+        ComponentWrapper& cTransform = entity["Transform"];
+        //FSubscriptProxy subOri(&cTransform, "Orientation");
+        //Field<glm::vec3> orientation = subOri;
+        (Field<glm::vec3>)cTransform["Orientation"] += (float)(const double&)cRaptorCopter["Speed"] * (float)dt * (glm::vec3)cRaptorCopter["Axis"];
    }
 };
@@ -8,6 +8,8 @@
 #include "Core/EPlayerSpawned.h"
 #include "Network/EPlayerConnected.h"
 #include "Network/EPlayerDisconnected.h"
+#include "Game/Events/EReset.h"
+#include "Engine/Input/EInputCommand.h"
 #include "GLM.h"

 class ScoreScreenSystem : public PureSystem
@@ -25,6 +27,10 @@ public:
    bool OnPlayerConnected(const Events::PlayerConnected& e);
    EventRelay<ScoreScreenSystem, Events::PlayerDisconnected> m_EPlayerDisconnected;
    bool OnPlayerDisconnected(const Events::PlayerDisconnected& e);
+    EventRelay<ScoreScreenSystem, Events::Reset> m_EReset;
+    bool OnReset(const Events::Reset& e);
+    EventRelay<ScoreScreenSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);

 private:
    struct PlayerData {
@@ -6,8 +6,9 @@
 #include "GLM.h"
 #include "Core/System.h"
 #include "Events/ESpawnerSpawn.h"
-#include "Core/Transform.h"
+#include "Core/TransformSystem.h"
 #include "Core/EntityFile.h"
+#include "Rendering/Model.h"

 class SpawnerSystem : public System
 {
@@ -18,6 +19,7 @@ public:
    // will try to pick a spawn location so that the spawned entity doesn't 
    // collide with anything that has that component and is collidable.
    static EntityWrapper Spawn(EntityWrapper spawner, EntityWrapper parent = EntityWrapper::Invalid, const std::string& dontCollideComponent = "");
+    static EntityWrapper SpawnEntityFile(const std::string& entityFilePath, EntityWrapper spawner, EntityWrapper parent = EntityWrapper::Invalid, const std::string& dontCollideComponent = "");

 private:
    EventRelay<SpawnerSystem, Events::SpawnerSpawn> m_OnSpawnerSpawn;
@@ -4,6 +4,7 @@
 #include "Core/System.h"
 #include "Input/EInputCommand.h"
 #include "Network/EPlayerDisconnected.h"
+#include "Game/Events/EReset.h"

 class SpectatorCameraSystem : public ImpureSystem
 {
@@ -15,11 +16,14 @@ public:
 private:
    int m_PickedTeam;
    bool m_CamSetToTeamPick;
+    void reset();

    EventRelay<SpectatorCameraSystem, Events::InputCommand> m_EInputCommand;
    bool OnInputCommand(const Events::InputCommand& e);
    EventRelay<SpectatorCameraSystem, Events::PlayerDisconnected> m_EDisconnect;
    bool OnDisconnect(const Events::PlayerDisconnected& e);
+    EventRelay<SpectatorCameraSystem, Events::Reset> m_EReset;
+    bool OnReset(const Events::Reset& e);
 };

 #endif
@@ -31,12 +31,14 @@ private:

    // 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);

    // Utility
    //Camera cameraFromEntity(EntityWrapper camera);
+
+    void CheckBoost(ComponentWrapper cWeapon, WeaponInfo& wi);
+
 };

 #endif
@@ -6,6 +6,7 @@
 #include "Core/EPlayerDamage.h"
 #include "Sound/EPlaySoundOnEntity.h"
 #include "Sound/EPlaySoundOnEntity.h"
+#include <glm/gtx/vector_angle.hpp>

 class DefenderWeaponBehaviour : public WeaponBehaviour<DefenderWeaponBehaviour>
 {
@@ -23,18 +24,24 @@ public:
    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;
+    void OnEquip(ComponentWrapper cWeapon, WeaponInfo& wi) 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);
+    void dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi, const std::vector<glm::vec2>& pattern);
+    void spawnTracers(ComponentWrapper cWeapon, WeaponInfo& wi, std::vector<glm::vec2> pattern);
    bool canFire(ComponentWrapper cWeapon, WeaponInfo& wi);

    // Utility
    Camera cameraFromEntity(EntityWrapper camera);
+    void CheckBoost(ComponentWrapper cWeapon, WeaponInfo& wi);
 };

 #endif
@@ -4,6 +4,8 @@
 #include "WeaponBehaviour.h"
 #include "Collision/Collision.h"
 #include "Core/EPlayerDamage.h"
+#include "Sound/EPlaySoundOnEntity.h"
+#include "Rendering/EAutoAnimationBlend.h"

 class SidearmWeaponBehaviour : public WeaponBehaviour<SidearmWeaponBehaviour>
 {
@@ -18,6 +20,7 @@ public:
    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;

@@ -32,6 +35,16 @@ private:
    // Utility
    bool canFire(ComponentWrapper cWeapon);
    bool playerInFirstPerson(EntityWrapper player);
+
+    bool dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi);
+   // void giveAmmo(ComponentWrapper cWeapon, WeaponInfo& wi, EntityWrapper receiver);
+
+    void spawnTracer(ComponentWrapper cWeapon, WeaponInfo& wi);
+
+    void CheckAmmo(ComponentWrapper cWeapon, WeaponInfo& wi);
+    void RemoveFrindlyAmmoHUD(WeaponInfo& wi);
+
+
    //float traceRayDistance(glm::vec3 origin, glm::vec3 direction);
 };

@@ -270,7 +270,8 @@ private:
        EntityWrapper thirdPersonAttachment;
        for (auto& attachment : weaponAttachments) {
            ComponentWrapper cWeaponAttachment = attachment["WeaponAttachment"];
-            if ((std::string&)cWeaponAttachment["Weapon"] == m_ComponentType) {
+            Field<std::string> weaponType = cWeaponAttachment["Weapon"];
+            if (*weaponType == m_ComponentType) {
                ComponentWrapper::SubscriptProxy person = cWeaponAttachment["Person"];
                if ((ComponentInfo::EnumType)person == person.Enum("FirstPerson")) {
                    firstPersonAttachment = attachment;
@@ -305,6 +306,8 @@ private:
        wi.ThirdPersonEntity = thirdPersonWeapon;
        wi.ThirdPersonPlayerModel = thirdPersonWeapon.FirstParentWithComponent("Model");
        
+        player["Player"]["CurrentWeapon"] = cWeapon.Info.Name;
+
        OnEquip(cWeapon, wi);
    }

@@ -76,13 +76,16 @@ NumIterations=9
 TextureQuality=0

 [GLOW]
-Quality=3
+Quality=1

 [GLOW1]
-NumIterations=5
+NumIterations=2

 [GLOW2]
-NumIterations=9
+NumIterations=4

 [GLOW3]
-NumIterations=13
+NumIterations=6
+
+[MSAA]
+Level = 0;
@@ -29,6 +29,4 @@ K=TakeDamage,1500
 F2=PerformanceTimingResetAllTimers
 F3=PerformanceTimingCreateExcelData
 Comma=SwapToClassPick
-Period=SwapToTeamPick
-Enter=PickClass,1
-F5=DisconnectFromServer
+Period=SwapToTeamPick
@@ -68,6 +68,9 @@
 	<xs:include schemaLocation="Components/NetworkComponent.xsd"/>
 	<xs:include schemaLocation="Components/ServerIdentity.xsd"/>
 	<xs:include schemaLocation="Components/ServerList.xsd"/>
+	<xs:include schemaLocation="Components/Unpickable.xsd"/>
 	<xs:include schemaLocation="Components/ConfigBtnResolution.xsd"/>
 	<xs:include schemaLocation="Components/ConfigBtnFloat.xsd"/>
+	<xs:include schemaLocation="Components/EndScreen.xsd"/>
+	<xs:include schemaLocation="Components/Fade.xsd"/>
 </xs:schema>
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <BoostAssault xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BoostAssault.xsd">
-  <StrengthOfEffect>2</StrengthOfEffect>
+  <StrengthOfEffect>1.35</StrengthOfEffect>
 </BoostAssault>
@@ -2,5 +2,5 @@
 <Camera xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Camera.xsd">
 	<FOV>59</FOV> <!-- 90 horizontal FOV at 1080p -->
 	<NearClip>0.01</NearClip>
-	<FarClip>5000</FarClip>
+	<FarClip>300</FarClip>
 </Camera>
@@ -2,4 +2,5 @@
 <CapturePointGameMode xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CapturePointGameMode.xsd">
 	<RespawnTime>0.0</RespawnTime>
 	<MaxRespawnTime>8.0</MaxRespawnTime>
+	<ResetCountdown>10.0</ResetCountdown>
 </CapturePointGameMode>
@@ -12,6 +12,9 @@
 				<xs:element name="MaxRespawnTime" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>Players will be spawned when RespawnTime reaches this.</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="ResetCountdown" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>The map will be reset when time reaches 0.</xs:documentation></xs:annotation>
+				</xs:element>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <DefenderWeapon xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DefenderWeapon.xsd">
 	<Slot><Primary/></Slot>
-	<MagazineAmmo>8</MagazineAmmo>
+	<MagazineAmmo>9999</MagazineAmmo>
 	<MagazineSize>8</MagazineSize>
 	<Ammo>64</Ammo>
 	<MaxAmmo>64</MaxAmmo>
 	<BaseDamage>90</BaseDamage>
-	<SpreadAngle>0.174533</SpreadAngle> <!-- 0.174533 = 10 degrees -->
+	<SpreadAngle>10</SpreadAngle>
 	<MaxTravelAngle>0.174533</MaxTravelAngle> <!-- 0.174533 = 10 degrees -->
-	<NumPellets>10</NumPellets>
+	<NumPellets>9</NumPellets>
 	<RPM>120</RPM>
-	<ViewPunch>0.03</ViewPunch>
-	<ViewReturnSpeed>0.2</ViewReturnSpeed>
+	<ViewPunch>0.15</ViewPunch>
+	<ViewReturnSpeed>0.3</ViewReturnSpeed>
 	<ReloadTime>0.5</ReloadTime>
 	<TriggerHeld>false</TriggerHeld>
 	<FireCooldown>0</FireCooldown>
@@ -36,7 +36,7 @@
 					<xs:annotation><xs:documentation>Damage dealt if all shotgun pellets hit</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="SpreadAngle" type="t:float" minOccurs="0">
-					<xs:annotation><xs:documentation>Spread angle in radians</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>The spread angle radius.</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="MaxTravelAngle" type="t:float" minOccurs="0">
 					<xs:annotation><xs:documentation>Maximum vertical aim travel angle in radians</xs:documentation></xs:annotation>
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<EndScreen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="EndScreen.xsd">
+</EndScreen>
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="EndScreen">
+		<xs:annotation>
+			<xs:documentation>Put this on the camera that will show the final screen.</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <ExplosionEffect xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ExplosionEffect.xsd">
 	<ExplosionOrigin X="0" Y="0" Z="0"/>
-	<TimeSinceDeath>0</TimeSinceDeath>
-	<ExplosionDuration>2</ExplosionDuration>
+	<TimeSinceDeath>0.0</TimeSinceDeath>
+	<ExplosionDuration>2.0</ExplosionDuration>
 	<Speed>1</Speed>
 	<Delay>0</Delay>
 	<!--<Gravity>1</Gravity>-->
 	<!--<GravityForce>1</GravityForce>-->
 	<!--<ObjectRadius>2</ObjectRadius>-->
 	<EndColor R="0" G="0" B="0" A="0"/>
-	<Randomness>0</Randomness>
-	<RandomnessScalar>1</RandomnessScalar>
+	<Randomness>false</Randomness>
+	<RandomnessScalar>1.0</RandomnessScalar>
 	<Velocity X="2" Y="2"/>
-	<ColorByDistance>0</ColorByDistance>
-	<!--<ReverseAnimation>0</ReverseAnimation>-->
+	<ColorByDistance>false</ColorByDistance>
 	<!--<Wireframe>0</Wireframe>-->
-	<ExponentialAccelaration>0</ExponentialAccelaration>
+	<ExponentialAccelaration>false</ExponentialAccelaration>
+	<Pulsate>false</Pulsate>
+	<Reverse>false</Reverse>
+	<ColorDistanceScalar>1.0</ColorDistanceScalar>
 </ExplosionEffect>
@@ -44,15 +44,21 @@
 				<xs:element name="ColorByDistance" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Change the color by its moved distance instead of by its time</xs:documentation></xs:annotation>
 				</xs:element>
-				<!--<xs:element name="ReverseAnimation" type="t:bool" minOccurs="0">
-					<xs:annotation><xs:documentation>Implosions are cooler</xs:documentation></xs:annotation>
-				</xs:element>-->
 				<!--<xs:element name="Wireframe" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Enable/disable wireframe</xs:documentation></xs:annotation>
 				</xs:element>-->
 				<xs:element name="ExponentialAccelaration" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Linear/Exponential accelaration</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="Pulsate" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Pulsate the effect</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Reverse" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Reverse the effect</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ColorDistanceScalar" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Scale the distance of the color change</xs:documentation></xs:annotation>
+				</xs:element>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Fade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Fade.xsd">
+	<FadeTime>1</FadeTime>
+	<Time>0</Time>
+	<Out>true</Out>
+	<Loop>true</Loop>
+	<Reverse>false</Reverse>
+</Fade>
@@ -0,0 +1,23 @@
+<?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="Fade">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="FadeTime" type="t:double" minOccurs="0"/>
+				<xs:element name="Time" type="t:double" minOccurs="0"/>
+				<xs:element name="Out" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>If the entity should fade out or in.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Loop" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>If the effect should loop when it is done.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Reverse" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>If the entity should reverse the fade after finishing, this will double the speed.</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
@@ -1,2 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<PlayerSpawn xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="PlayerSpawn.xsd"/>
+<PlayerSpawn xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="PlayerSpawn.xsd">
+	<AssaultFile>Schema/Entities/PlayerAssaultBlue.xml</AssaultFile>
+	<DefenderFile>Schema/Entities/PlayerDefenderBlue.xml</DefenderFile>
+	<SniperFile></SniperFile>
+</PlayerSpawn>
@@ -7,5 +7,12 @@
 		<xs:annotation>
 			<xs:documentation>Combined with a Spawner and a Team component, defines a spawn point for a player team.</xs:documentation>
 		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="AssaultFile" type="t:string" minOccurs="0"/>
+				<xs:element name="DefenderFile" type="t:string" minOccurs="0"/>
+				<xs:element name="SniperFile" type="t:string" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
 	</xs:element>
 </xs:schema>
@@ -6,11 +6,15 @@
 	<BaseDamage>20</BaseDamage>
 	<RPM>500</RPM>
 	<Automatic>false</Automatic>
-	<ViewPunch>0.01</ViewPunch>
-	<ReloadTime>0.5</ReloadTime>
+	<ViewPunch>0.05</ViewPunch>
+	<MaxTravelAngle>0.174533</MaxTravelAngle> <!-- 0.174533 = 10 degrees -->
+	<ViewReturnSpeed>0.2</ViewReturnSpeed>
+	<ReloadTime>1.0</ReloadTime>
 	<EquipTime>0.5</EquipTime>
 	<TriggerHeld>false</TriggerHeld>
 	<FireCooldown>0</FireCooldown>
+	<ReloadQueued>false</ReloadQueued>
 	<IsReloading>false</IsReloading>
 	<ReloadTimer>0</ReloadTimer>
+	<CurrentTravel>0</CurrentTravel>	
 </SidearmWeapon>
@@ -36,6 +36,12 @@
 				<xs:element name="ViewPunch" type="t:float" minOccurs="0">
 					<xs:annotation><xs:documentation>View punch in radians for each shell fired</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="MaxTravelAngle" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>Maximum vertical aim travel angle in radians</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ViewReturnSpeed" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>The speed in radians per second the view returns to its original position after being punched</xs:documentation></xs:annotation>
+				</xs:element>
 				<xs:element name="ReloadTime" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>Time it takes to load ONE SHELL into the weapon in seconds</xs:documentation></xs:annotation>
 				</xs:element>
@@ -44,8 +50,10 @@
 				</xs:element>
 				<xs:element name="TriggerHeld" type="t:bool" minOccurs="0"/>
 				<xs:element name="FireCooldown" type="t:double" minOccurs="0"/>
+				<xs:element name="ReloadQueued" type="t:bool" minOccurs="0"/>
 				<xs:element name="IsReloading" type="t:bool" minOccurs="0"/>
 				<xs:element name="ReloadTimer" type="t:double" minOccurs="0"/>
+				<xs:element name="CurrentTravel" type="t:float" minOccurs="0"/>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>
@@ -10,5 +10,6 @@
 	<KeepRatioY>false</KeepRatioY>
 	<KeepRatio>false</KeepRatio>
 	<Linear>true</Linear>
+	<ClampToBorder>false</ClampToBorder>
 	<BlurBackground>false</BlurBackground>
 </Sprite>
@@ -39,6 +39,9 @@
 				<xs:element name="Linear" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>If it should use Linear or Nearest sampling method.</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="ClampToBorder" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>If it should clamp to border or repeat the texture.</xs:documentation></xs:annotation>
+				</xs:element>
 				<xs:element name="BlurBackground" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Wether the background should be blurred begind this sprite.</xs:documentation></xs:annotation>
 				</xs:element>
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Unpickable xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Unpickable.xsd">
+</Unpickable>
@@ -0,0 +1,11 @@
+<?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="Unpickable">
+		<xs:annotation>
+			<xs:documentation>Makes the entity unpickable</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="RayBlue">
+      <Components>
+        <c:Transform>
+          <Orientation X="0" Y="0.174532995" Z="0"/>
+          <Scale X="0" Y="1" Z="100"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Sprite>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Effects/Ray.png</DiffuseTexture>
+              <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.5"/>
+              <Orientation X="0" Y="-1.57099998" Z="0"/>
+              <Scale X="1" Y="0.0260000005" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Sprite>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Effects/Ray.png</DiffuseTexture>
+              <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.5"/>
+              <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
+              <Scale X="1" Y="0.0260000005" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="RayBlue">
+      <Components>
+        <c:Transform>
+          <Scale X="0" Y="1" Z="100"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Sprite>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Effects/Ray.png</DiffuseTexture>
+              <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.5"/>
+              <Orientation X="0" Y="-1.57099998" Z="0"/>
+              <Scale X="1" Y="0.0260000005" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Sprite>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Effects/Ray.png</DiffuseTexture>
+              <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.5"/>
+              <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
+              <Scale X="1" Y="0.0260000005" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:SceneLight>
+      <AmbientColor A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
+      <Gamma>1</Gamma>
+      <Exposure>0.82000017166137695</Exposure>
+    </c:SceneLight>
+    <c:CapturePointGameMode>
+      <RespawnTime>0.32289272439493288</RespawnTime>
+      <MaxRespawnTime>0.5</MaxRespawnTime>
+    </c:CapturePointGameMode>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:Collidable/>
+        <c:Model>
+          <GlowIntensity>1.0199999809265137</GlowIntensity>
+          <Resource>Models/Props/Walls/SciFiWallTop.mesh</Resource>
+          <Color A="1" B="3.92156863" G="1" R="1"/>
+          <Shadow>false</Shadow>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="58.718792" Z="15.6310005"/>
+          <Orientation X="0" Y="0" Z="3.14199996"/>
+          <Scale X="0.279000014" Y="1" Z="0.279000014"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Collidable/>
+        <c:Model>
+          <GlowIntensity>1.5</GlowIntensity>
+          <Resource>Models/Props/Pillars/SciFiPillar2Blue.mesh</Resource>
+          <Shadow>false</Shadow>
+        </c:Model>
+        <c:Transform>
+          <Position X="-14.4384613" Y="-1.2316848" Z="0"/>
+          <Orientation X="0" Y="2.64800024" Z="0"/>
+          <Scale X="2" Y="3.60000014" Z="1.9000001"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Collidable/>
+        <c:Model>
+          <GlowIntensity>1.5</GlowIntensity>
+          <Resource>Models/Props/Pillars/SciFiPillar2Blue.mesh</Resource>
+          <Shadow>false</Shadow>
+        </c:Model>
+        <c:Transform>
+          <Position X="14.3019333" Y="-1.12725353" Z="0"/>
+          <Orientation X="0" Y="3.84800029" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Dir">
+      <Components>
+        <c:DirectionalLight>
+          <Color A="1" B="0.725490212" G="0.75686276" R="0.741176486"/>
+          <Intensity>1.0699999332427979</Intensity>
+        </c:DirectionalLight>
+        <c:Transform>
+          <Orientation X="3.68318534" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Cam">
+      <Components>
+        <c:Camera>
+          <FOV>47</FOV>
+        </c:Camera>
+        <c:Model>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
+          <Shadow>false</Shadow>
+          <NormalMap>false</NormalMap>
+          <DiffuseTexture>false</DiffuseTexture>
+          <SpecularMap>false</SpecularMap>
+          <GlowMap>false</GlowMap>
+        </c:Model>
+        <c:Transform>
+          <Position X="0.100000001" Y="-0.0670000017" Z="-32.8670006"/>
+          <Orientation X="0" Y="3.1400001" Z="0"/>
+          <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Spawn">
+      <Components>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:PlayerSpawn>
+          <AssaultFile>Schema/Entities/PlayerAssaultBlue.xml</AssaultFile>
+          <DefenderFile>Schema/Entities/PlayerDefenderBlue.xml</DefenderFile>
+          <SniperFile></SniperFile>
+        </c:PlayerSpawn>
+        <c:Model>
+          <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Spawner>
+          <EntityFile></EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.100000001" Y="2.8398931" Z="-29.0827847"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>Models/Highgrounds/Hg21.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="-1.75605178" Z="-20.9220009"/>
+          <Scale X="0.407000005" Y="0.407000005" Z="0.407000005"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>1.2000000476837158</Lifetime>
+    </c:Lifetime>
+    <c:ExplosionEffect>
+      <Velocity X="2.08100009" Y="3.37400007" Z="0"/>
+      <ExplosionOrigin X="0" Y="0" Z="2.91200018"/>
+      <TimeSinceDeath>1.2000000476837158</TimeSinceDeath>
+      <Speed>-1</Speed>
+      <ExplosionDuration>1.2000000476837158</ExplosionDuration>
+      <EndColor A="0.262745112" B="19.6078434" G="3.92156863" R="0"/>
+      <Randomness>true</Randomness>
+      <ColorByDistance>true</ColorByDistance>
+    </c:ExplosionEffect>
+    <c:Model>
+      <GlowIntensity>16.040000915527344</GlowIntensity>
+      <Resource>Models/Effects/JumpEffectHexagon.mesh</Resource>
+      <Color A="0" B="1.96078432" G="0" R="3.92156863"/>
+      <Transparent>true</Transparent>
+    </c:Model>
+    <c:NetworkComponent/>
+    <c:Transform>
+      <Position X="0" Y="-0.0900000036" Z="-0.00600000005"/>
+      <Orientation X="1.57000005" Y="0" Z="0"/>
+      <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+    </c:Transform>
+  </Components>
+
+  <Children/>
+
+</Entity>
--- a/Show More
+++ b/Show More