WIP started on reliable messages

.gitignore

@@ -12,6 +12,3 @@ tools/MayaExporter/x64/Debug/
 
 tools/MayaExporter/MayaExporter/Debug/
 tools/MayaExporter/MayaExporter/GeneratedFiles/
-
-tools/MayaExporter/MayaExporter/x64/*
-tools/MayaExporter/x64/*

CMakeLists.txt

@@ -14,9 +14,6 @@ endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-elseif(MSVC)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif()
 
 #set(BUILD_SHARED_LIBS FALSE)
@@ -37,12 +34,6 @@ foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
 endforeach(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES)
 
-# DEBUG definition
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
-	$<$<CONFIG:Debug>:DEBUG>
-	$<$<CONFIG:RelWithDebInfo>:DEBUG>
-)
-
 include(cotire)
 add_subdirectory(src/Engine)
 add_subdirectory(src/Game)

include/Engine/Collision/CollidableOctreeSystem.h

@@ -0,0 +1,24 @@
+#ifndef CollidableOctreeSystem_h__
+#define CollidableOctreeSystem_h__
+
+#include "../Core/System.h"
+#include "../Core/Octree.h"
+#include "Collision.h"
+
+class CollidableOctreeSystem : public ImpureSystem, public PureSystem
+{
+public:
+    CollidableOctreeSystem(World* world, EventBroker* eventBroker, Octree<AABB>* octree)
+        : System(world, eventBroker)
+        , PureSystem("Collidable")
+        , m_Octree(octree)
+    { }
+
+    virtual void Update(double dt) override;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
+
+private:
+    Octree<AABB>* m_Octree;
+};
+
+#endif

include/Engine/Collision/Collision.h

@@ -15,14 +15,10 @@
 #include "../Core/Transform.h"
 #include "../Core/Entity.h"
 #include "../Core/EntityWrapper.h"
-#include "EntityAABB.h"
 
 class World;
 struct ComponentWrapper;
 
-template<typename T>
-class Octree;
-
 namespace Collision
 {
 //Return true if the ray hits the box.
@@ -31,77 +27,41 @@ bool RayVsAABB(const Ray& ray, const AABB& box);
 //Return true if the ray hits the box, also outputs distance from ray origin to intersection point in [outDistance].
 bool RayVsAABB(const Ray& ray, const AABB& box, float& outDistance);
 
-//Return true if the ray hits the triangle.
-bool RayVsTriangle(const Ray& ray,
-    const glm::vec3& v0,
-    const glm::vec3& v1,
-    const glm::vec3& v2,
-    bool trueOnNegativeDistance = false);
-//Return true if the ray hits the triangle, and the distance is less than outDistance.
-bool RayVsTriangle(const Ray& ray,
-    const glm::vec3& v0,
-    const glm::vec3& v1,
-    const glm::vec3& v2,
-    float& outDistance,
-    float& outUCoord,
-    float& outVCoord,
-    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,
+bool RayVsModel(const Ray& ray, 
-    const RawModel::Vertex* modelVertices,
+    const std::vector<RawModel::Vertex>& modelVertices,
-    const std::vector<unsigned int>& modelIndices,
+    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<RawModel::Vertex>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix,
     glm::vec3& outHitPosition);
 //Return true if the ray hits any of the triangles in the model.
 //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<RawModel::Vertex>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix,
     float& outDistance,
     float& outUCoord,
     float& outVCoord);
 
 bool AABBvsTriangles(const AABB& box,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<RawModel::Vertex>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix,
-    glm::vec3& boxVelocity,
-    float verticalStepHeight,
-    bool& isOnGround,
     glm::vec3& outResolutionVector);
 
-//Detects collision, but does not resolve.
-bool AABBvsTriangles(const AABB& box,
-    const RawModel::Vertex* modelVertices,
-    const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix);
-
 //Return true if the boxes are intersecting.
 bool AABBVsAABB(const AABB& a, const AABB& b);
 //Return true if the boxes are intersecting.
 //Also outputs the minimum translation that box [a] would need in order to resolve collision.
 bool AABBVsAABB(const AABB& a, const AABB& b, glm::vec3& minimumTranslation);
+bool IsSameBoxProbably(const AABB& first, const AABB& second, const float epsilon = 0.0001f);
 
-// Calculates an absolute AABB from an entity AABB component or Model component.
+// Calculates an absolute AABB from an entity AABB component
-// if takeModelBox is true, the AABB component will be ignored and box is calculated from Model.
+boost::optional<AABB> EntityAbsoluteAABB(EntityWrapper& entity);
-// if takeModelBox is false, the AABB component will be prefered, if it exists.
-boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity, bool takeModelBox = false);
-boost::optional<EntityAABB> AbsoluteAABBExplosionEffect(EntityWrapper& entity);
-//Returns the first entity hit by the input ray. entitiesPotentiallyHitSorted needs to be sorted 
-//by their distance to the ray, e.g. result from Octree<EntityAABB>::ObjectsPossiblyHitByRay.
-//Returns boost::none if none was hit. outDistance will be the distance to the intersection point if the ray intersects.
-boost::optional<EntityAABB> EntityFirstHitByRay(const Ray& ray, std::vector<EntityAABB> entitiesPotentiallyHitSorted, float& outDistance, glm::vec3& outIntersectPos);
-//Returns the first entity hit by the input ray that exists in the octree.
-//outDistance will be the distance to the intersection point if the ray intersects. 
-boost::optional<EntityAABB> EntityFirstHitByRay(const Ray& ray, Octree<EntityAABB>* octree, float& outDistance, glm::vec3& outIntersectPos);
 
 }
 

include/Engine/Collision/CollisionSystem.h

@@ -7,24 +7,30 @@
 #include "../Common.h"
 #include "../Core/System.h"
 #include "../Core/EventBroker.h"
+#include "../Core/EKeyUp.h"
 #include "../Core/Octree.h"
-#include "EntityAABB.h"
 
 class CollisionSystem : public PureSystem
 {
 public:
-    CollisionSystem(SystemParams params, Octree<EntityAABB>* octree)
+    CollisionSystem(World* world, EventBroker* eventBroker, Octree<AABB>* octree)
-        : System(params)
+        : System(world, eventBroker)
-        , PureSystem("Physics")
+        , PureSystem("Collidable")
         , m_Octree(octree)
-    { }
+        , zPress(false)
+    {
+        //TODO: Debug stuff, remove later.
+        EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &CollisionSystem::OnKeyUp);
+    }
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPhysics, double dt) override;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
 
 private:
-    Octree<EntityAABB>* m_Octree;
+    Octree<AABB>* m_Octree;
-    std::vector<EntityAABB> m_OctreeResult;
+    bool zPress;
-    std::unordered_map<EntityWrapper, glm::vec3> m_PrevPositions;
+
+    EventRelay<CollisionSystem, Events::KeyUp> m_EKeyUp;
+    bool OnKeyUp(const Events::KeyUp &event);
 };
 
 #endif

include/Engine/Collision/ETrigger.h

@@ -2,7 +2,7 @@
 #define Events_TriggerEnter_h__
 
 #include "../Core/EventBroker.h"
-#include "../Core/EntityWrapper.h"
+#include "../Core/Entity.h"
 
 namespace Events
 {
@@ -11,27 +11,27 @@ namespace Events
 struct TriggerTouch : Event
 {
     /** The id of the entity that touches the trigger. */
-    EntityWrapper Entity;
+    EntityID Entity;
     /** The id of the trigger entity. */
-    EntityWrapper Trigger;
+    EntityID Trigger;
 };
 
 /** Thrown once, when an entity has completely left a trigger. */
 struct TriggerLeave : Event
 {
     /** The id of the entity that left the trigger. */
-    EntityWrapper Entity;
+    EntityID Entity;
     /** The id of the trigger entity. */
-    EntityWrapper Trigger;
+    EntityID Trigger;
 };
 
 /** Thrown once, when an entity is completely contained inside a trigger. */
 struct TriggerEnter : Event
 {
     /** The id of the entity that entered the trigger. */
-    EntityWrapper Entity;
+    EntityID Entity;
     /** The id of the trigger entity. */
-    EntityWrapper Trigger;
+    EntityID Trigger;
 };
 
 }

include/Engine/Collision/EntityAABB.h

@@ -1,22 +0,0 @@
-#ifndef EntityAABB_h__
-#define EntityAABB_h__
-
-#include "../Core/AABB.h"
-#include "../Core/EntityWrapper.h"
-
-struct EntityAABB : AABB
-{
-    EntityAABB() = default;
-
-    EntityAABB(const glm::vec3& minPos, const glm::vec3& maxPos)
-        : AABB(minPos, maxPos)
-    { }
-
-    EntityAABB(const AABB& aabb)
-        : AABB(aabb)
-    { }
-
-    EntityWrapper Entity;
-};
-
-#endif

include/Engine/Collision/FillFrustumOctreeSystem.h

@@ -1,25 +0,0 @@
-#ifndef FillFrustumOctreeSystem_h__
-#define FillFrustumOctreeSystem_h__
-
-#include "../Core/System.h"
-#include "../Core/Octree.h"
-#include "Collision.h"
-#include "EntityAABB.h"
-
-class FillFrustumOctreeSystem : public ImpureSystem, public PureSystem
-{
-public:
-    FillFrustumOctreeSystem(SystemParams params, Octree<EntityAABB>* octree)
-        : System(params)
-        , PureSystem("Model")
-        , m_Octree(octree)
-    { }
-
-    virtual void Update(double dt) override;
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
-
-private:
-    Octree<EntityAABB>* m_Octree;
-};
-
-#endif

include/Engine/Collision/FillOctreeSystem.h

@@ -1,25 +0,0 @@
-#ifndef FillOctreeSystem_h__
-#define FillOctreeSystem_h__
-
-#include "../Core/System.h"
-#include "../Core/Octree.h"
-#include "Collision.h"
-#include "EntityAABB.h"
-
-class FillOctreeSystem : public ImpureSystem, public PureSystem
-{
-public:
-    FillOctreeSystem(SystemParams params, Octree<EntityAABB>* octree, const std::string& fillComponentType)
-        : System(params)
-        , PureSystem(fillComponentType)
-        , m_Octree(octree)
-    { }
-
-    virtual void Update(double dt) override;
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
-
-private:
-    Octree<EntityAABB>* m_Octree;
-};
-
-#endif

include/Engine/Collision/TriggerSystem.h

@@ -8,15 +8,14 @@
 #include "../Core/EventBroker.h"
 #include "../Core/Octree.h"
 #include "ETrigger.h"
-#include "EntityAABB.h"
 
 class AABB;
 
 class TriggerSystem : public PureSystem
 {
 public:
-    TriggerSystem(SystemParams params, Octree<EntityAABB>* octree)
+    TriggerSystem(World* world, EventBroker* eventBroker, Octree<AABB>* octree)
-        : System(params)
+        : System(world, eventBroker)
         , PureSystem("Trigger")
         , m_Octree(octree)
     {
@@ -28,10 +27,9 @@ public:
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
 
 private:
-    Octree<EntityAABB>* m_Octree;
+    Octree<AABB>* m_Octree;
-    std::vector<EntityAABB> m_OctreeOut;
+    std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesTouchingTrigger;
-    std::unordered_map<EntityWrapper, std::unordered_set<EntityWrapper>> m_EntitiesTouchingTrigger;
+    std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesCompletelyInTrigger;
-    std::unordered_map<EntityWrapper, std::unordered_set<EntityWrapper>> m_EntitiesCompletelyInTrigger;
 
     //TODO: Only exists for debug purposes, remove later.
     EventRelay<TriggerSystem, Events::TriggerEnter> m_EEnter;
@@ -42,13 +40,13 @@ private:
     bool OnLeave(const Events::TriggerLeave &event);
 
     //True if leave event was thrown.
-    bool throwLeaveIfWasInTrigger(std::unordered_set<EntityWrapper>& triggerSet, EntityWrapper colliderENtity, EntityWrapper triggerEntity);
+    bool throwLeaveIfWasInTrigger(std::unordered_set<EntityID>& triggerSet, EntityID pId, EntityID tId);
     template<typename Event>
-    void publish(EntityWrapper collider, EntityWrapper trigger)
+    void publish(EntityID pId, EntityID tId)
     {
         Event e;
-        e.Trigger = trigger;
+        e.Trigger = tId;
-        e.Entity = collider;
+        e.Entity = pId;
         m_EventBroker->Publish(e);
     }
 };

include/Engine/Common.h

@@ -5,7 +5,6 @@
 #include <map>
 #include <unordered_map>
 #include <algorithm>
-#include <array>
 
 #include "Core/Util/Logging.h"
 #include "Core/Util/IfDebug.h"

include/Engine/Core/AABB.h

@@ -9,6 +9,7 @@ public:
     AABB() = default;
     //No checks are made. Values in minPos must be less than values in maxPos, i.e. min.x < max.x, etc.
     AABB(const glm::vec3& minPos, const glm::vec3& maxPos);
+    AABB(const glm::vec4& minPos, const glm::vec4& maxPos);
     //No checks are made. Size must consist of non-negative numbers.
     static AABB FromOriginSize(const glm::vec3& origin, const glm::vec3& size);
     virtual ~AABB();

include/Engine/Core/ComponentInfo.h

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

include/Engine/Core/ComponentPool.h

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

include/Engine/Core/ComponentWrapper.h

@@ -1,30 +1,11 @@
 #ifndef ComponentWrapper_h__
 #define ComponentWrapper_h__
 
-#include <boost/shared_array.hpp>
-#include <boost/any.hpp>
 #include "../Common.h"
 #include "Entity.h"
 #include "ComponentInfo.h"
 #include "Util/Any.h"
 
-template <typename T, typename Enable = void>
-struct ComponentField { };
-
-template <typename T>
-struct ComponentField<T, typename std::enable_if<std::is_trivially_copyable<T>::value>::type>
-{
-    static T& Get(const ComponentInfo::Field_t& info, char* data) { return *reinterpret_cast<T*>(data); }
-    static void Set(const ComponentInfo::Field_t& info, char* data, const T& value) { Get(data) = value; }
-};
-
-template <>
-struct ComponentField<std::string, void>
-{
-    static std::string& Get(const ComponentInfo::Field_t& info, char* data) { return **reinterpret_cast<std::string**>(data); }
-    static void Set(const ComponentInfo::Field_t& info, char* data, const std::string& value) { Get(info, data) = value; }
-};
-
 struct ComponentWrapper
 {
     ComponentWrapper(const ComponentInfo& componentInfo, char* data)
@@ -62,35 +43,6 @@ struct ComponentWrapper
     // 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 Copy(ComponentWrapper& destination)
-    {
-        // Copy trivial data
-        memcpy(destination.Data, Data, Info.Stride);
-        // Duplicate strings
-        SolidifyStrings(destination);
-    }
-
-    // When component data has been copied, strings need to be reconstructed or they'll refer to the same data!
-    static void SolidifyStrings(ComponentWrapper& component)
-    {
-        for (auto& name : component.Info.StringFields) {
-            std::size_t offset = component.Info.Fields.at(name).Offset;
-            std::string value = *reinterpret_cast<const std::string*>(component.Data + offset);
-            new (component.Data + offset) std::string(value);
-        }
-    }
-
-    // This needs to be called to properly free component data, because strings.
-    static void Destroy(ComponentInfo info, char* data)
-    {
-        // Call std::string destructors
-        for (auto& name : info.StringFields) {
-            std::size_t offset = info.Fields.at(name).Offset;
-            auto field = reinterpret_cast<std::string*>(data + offset);
-            field->~basic_string();
-        }
-    }
     
     struct SubscriptProxy
     {
@@ -124,58 +76,34 @@ struct ComponentWrapper
     SubscriptProxy operator[](std::string propertyName) { return SubscriptProxy(this, propertyName); }
 };
 
-// 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())
-        , m_DataReference(data)
-    { }
-
-private:
-    boost::shared_array<char> m_DataReference;
-};
-
 // TODO: Move this to Tests once entity importing is finished
 class ComponentWrapperFactory
 {
 public:
     ComponentWrapperFactory() = default;
-    ComponentWrapperFactory(std::string componentTypeName, unsigned int allocation = 0)
+    ComponentWrapperFactory(std::string componentTypeName, std::size_t allocation = 0)
     {
         m_ComponentInfo.Name = componentTypeName;
-        m_ComponentInfo.Meta = std::make_shared<ComponentInfo::Meta_t>();
         m_ComponentInfo.Meta->Allocation = allocation;
     }
 
     template <typename T>
     void AddProperty(std::string fieldName, T defaultValue)
     {
-        auto& field = m_ComponentInfo.Fields[fieldName];
+        m_DefaultValues.push_back(defaultValue);
-        field.Name = fieldName;
+        m_ComponentInfo.Fields[fieldName].Type = typeid(T).name();
-        field.Type = typeid(T).name();
+        m_ComponentInfo.Fields[fieldName].Offset = m_ComponentInfo.Stride;
-        field.Offset = m_ComponentInfo.Stride;
+        m_ComponentInfo.Fields[fieldName].Stride = sizeof(T);
-        field.Stride = sizeof(T);
-        m_ComponentInfo.FieldsInOrder.push_back(field.Name);
-        if (field.Type == typeid(std::string).name()) {
-            field.Type = "string";
-            m_ComponentInfo.StringFields.push_back(field.Name);
-        }
         m_ComponentInfo.Stride += sizeof(T);
-        m_DefaultValues.push_back(std::make_pair(field, defaultValue));
     }
-
+    
     ComponentInfo& Finalize()
     {
-        m_ComponentInfo.Defaults = boost::shared_array<char>(new char[m_ComponentInfo.Stride]);
+        m_ComponentInfo.Defaults = std::shared_ptr<char>(new char[m_ComponentInfo.Stride]);
         std::size_t offset = 0;
-        for (auto& pair : m_DefaultValues) {
+        for (auto& val : m_DefaultValues) {
-            if (pair.first.Type == "string") {
+            memcpy(m_ComponentInfo.Defaults.get() + offset, val.Data.get(), val.Size);
-                new (m_ComponentInfo.Defaults.get() + offset) std::string(*reinterpret_cast<std::string*>(pair.second.Data.get()));
+            offset += val.Size;
-            } else {
-                memcpy(m_ComponentInfo.Defaults.get() + offset, pair.second.Data.get(), pair.second.Size);
-            }
-            offset += pair.second.Size;
         }
 
         return m_ComponentInfo;
@@ -185,7 +113,7 @@ public:
 
 private:
     ComponentInfo m_ComponentInfo;
-    std::vector<std::pair<ComponentInfo::Field_t, Any>> m_DefaultValues;
+    std::vector<Any> m_DefaultValues;
 };
 
 #endif

include/Engine/Core/EAmmoPickup.h

@@ -1,18 +0,0 @@
-#ifndef EAmmoPickup_h__
-#define EAmmoPickup_h__
-
-#include "EventBroker.h"
-#include "../Core/EntityWrapper.h"
-
-namespace Events
-{
-
-    struct AmmoPickup : Event
-    {
-        EntityWrapper Player;
-        int AmmoGain;
-    };
-
-}
-
-#endif

include/Engine/Core/EPickupSpawned.h

@@ -1,17 +0,0 @@
-#ifndef EPickupSpawned_h__
-#define EPickupSpawned_h__
-
-#include "Core/Event.h"
-#include "Core/EntityWrapper.h"
-
-namespace Events
-{
-
-struct PickupSpawned : Event
-{
-    EntityWrapper Pickup;
-};
-
-}
-
-#endif

include/Engine/Core/EPlayerDamage.h

@@ -9,8 +9,7 @@ namespace Events
 
 struct PlayerDamage : Event
 {
-    EntityWrapper Inflictor;
+    EntityWrapper Player;
-    EntityWrapper Victim;
     double Damage;
 };
 

include/Engine/Core/EPlayerDeath.h

@@ -2,7 +2,7 @@
 #define EPlayerDeath_h__
 
 #include "EventBroker.h"
-#include "../Core/EntityWrapper.h"
+#include "../Core/Entity.h"
 
 namespace Events
 {
@@ -10,7 +10,8 @@ namespace Events
 struct PlayerDeath : Event
 {
     //KilledBy,KilledByWhat is optional for now. It might be used later in the playerlog-system
-    EntityWrapper Player;
+    EntityID KilledBy;
+    EntityID PlayerID;
     std::string KilledByWhat;
 };
 

include/Engine/Core/EPlayerHealthPickup.h

@@ -2,16 +2,16 @@
 #define EPlayerHealthPickup_h__
 
 #include "EventBroker.h"
-#include "../Core/EntityWrapper.h"
+#include "../Core/Entity.h"
 
 namespace Events
 {
 
-    struct PlayerHealthPickup : Event
+struct PlayerHealthPickup : Event
-    {
+{
-        EntityWrapper Player;
+    double HealthAmount;
-        double HealthAmount;
+    EntityID PlayerHealedID;
-    };
+};
 
 }
 

include/Engine/Core/EShoot.h

@@ -9,8 +9,7 @@ namespace Events
 
 struct Shoot : Event
 {
-    EntityWrapper Inflictor;
+    EntityWrapper Player;
-    double Damage;
 };
 
 }

include/Engine/Core/EntityFile.h

@@ -143,7 +143,7 @@ private:
     ~EntityFile();
 
 public:
-    static unsigned int GetTypeStride(std::string typeName);
+    static std::size_t GetTypeStride(std::string typeName);
     static void WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map<std::string, std::string>& attributes);
     static void WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData);
 

include/Engine/Core/EntityFilePreprocessor.h

@@ -3,8 +3,6 @@
 
 #include <xercesc/framework/psvi/XSElementDeclaration.hpp>
 #include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
-#include <xercesc/framework/psvi/XSAttributeUse.hpp>
-#include <xercesc/framework/psvi/XSAttributeDeclaration.hpp>
 #include <xercesc/framework/psvi/XSParticle.hpp>
 #include <xercesc/framework/psvi/XSModelGroup.hpp>
 #include <xercesc/framework/psvi/XSModelGroupDefinition.hpp>

include/Engine/Core/EntityWrapper.h

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

include/Engine/Core/EventBroker.h

@@ -5,7 +5,6 @@
 #include <functional>
 #include <list>
 #include <tuple>
-#include <set>
 
 #include "../Common.h"
 #include "Event.h"
@@ -108,7 +107,7 @@ private:
     typedef std::unordered_map<ContextTypeName_t, EventRelays_t> ContextRelays_t;
     ContextRelays_t m_ContextRelays;
     std::vector<BaseEventRelay*> m_RelaysToSubscribe;
-    std::unordered_map<BaseEventRelay*, std::tuple<EventID, ContextTypeName_t, EventTypeName_t>> m_RelaysToUnsubscribe;
+    std::vector<std::tuple<EventID, ContextTypeName_t, EventTypeName_t>> m_RelaysToUnsubscribe;
 
     typedef std::list<std::pair<EventTypeName_t, std::shared_ptr<Event>>> EventQueue_t;
     std::shared_ptr<EventQueue_t> m_EventQueueRead;

include/Engine/Core/Frustum.h

@@ -1,77 +0,0 @@
-#ifndef Frustum_h__
-#define Frustum_h__
-
-#include "../GLM.h"
-#include "AABB.h"
-#include <bitset>
-
-//A frustum defined by 6 planes.
-struct Frustum
-{
-    //Contains points P in: dot(normal, P) + d = 0
-    struct Plane
-    {
-        glm::vec3 Normal;
-        float Distance;
-    };
-
-    enum class Output
-    {
-        Inside,
-        Outside,
-        Intersects
-    };
-    Plane Planes[6];
-
-    Frustum() = default;
-    Frustum(glm::mat4x4 viewProjMatrix)
-    {
-        //Order: Right, left, top, bottom, far, near.
-        int sign = 1;
-        for (int i = 0; i < 6; ++i) {
-            sign = -sign;
-            int index = i / 2;
-            Plane& plane = Planes[i];
-            plane.Normal.x = viewProjMatrix[0].w + sign * viewProjMatrix[0][index];
-            plane.Normal.y = viewProjMatrix[1].w + sign * viewProjMatrix[1][index];
-            plane.Normal.z = viewProjMatrix[2].w + sign * viewProjMatrix[2][index];
-            plane.Distance = viewProjMatrix[3].w + sign * viewProjMatrix[3][index];
-            float divByNormalLength = 1.0f / glm::length(plane.Normal);
-            plane.Normal *= divByNormalLength;
-            plane.Distance *= divByNormalLength;
-        }
-    }
-
-    Output VsAABB(const AABB& box) const
-    {
-        const glm::vec3& maxCorner = box.MaxCorner();
-        const glm::vec3& minCorner = box.MinCorner();
-        bool completelyInside = true;
-        for (const Plane& p : Planes) {
-            bool anyWasInside = false;
-            bool anyWasOutside = false;
-            //If points are on both sides of the plane, we can stop.
-            for (int i = 0; i < 8 && (!anyWasInside || !anyWasOutside); ++i) {
-                std::bitset<3> bits(i);
-                glm::vec3 corner;
-                corner.x = bits.test(0) ? maxCorner.x : minCorner.x;
-                corner.y = bits.test(1) ? maxCorner.y : minCorner.y;
-                corner.z = bits.test(2) ? maxCorner.z : minCorner.z;
-                if (glm::dot(p.Normal, corner) > -p.Distance) {
-                    anyWasInside = true;
-                } else {
-                    anyWasOutside = true;
-                }
-            }
-            if (!anyWasInside) {
-                return Output::Outside;
-            }
-            if (anyWasOutside) {
-                completelyInside = false;
-            }
-        }
-        return completelyInside ? Output::Inside : Output::Intersects;
-    }
-};
-
-#endif

include/Engine/Core/MemoryPool.h

@@ -66,25 +66,9 @@ public:
 		, m_LowestAllocatedSlot(m_NumSlots)
 	{ }
 
-    MemoryPool(const MemoryPool<T>& other)
+	//We may get problems with memory being released 
-		: m_StartAddress(new char[other.m_NumSlots*other.m_Stride])
+	//prematurely, etc. if we allow copies.
-		, m_SlotIsAllocated(other.m_SlotIsAllocated)
+	MemoryPool(const MemoryPool<T>& other) = delete;
-        , m_ExtraMemory()
-		, m_NumSlots(other.m_NumSlots)
-		, m_LowestAllocatedSlot(other.m_LowestAllocatedSlot)
-		, m_NumAllocatedSlots(other.m_NumAllocatedSlots)
-		, m_Stride(other.m_Stride)
-		, m_CurrentAllocSlot(other.m_CurrentAllocSlot)
-    {
-        // Copy statically allocated pool
-        memcpy(m_StartAddress, other.m_StartAddress, m_NumSlots*m_Stride);
-        // Copy dynamically allocated memory
-        for (char* otherAddr : other.m_ExtraMemory) {
-            char* addr = (char*)malloc(m_Stride);
-            memcpy(addr, otherAddr, m_Stride);
-            m_ExtraMemory.push_back(addr);
-        }
-    }
 	MemoryPool(const MemoryPool<T>&& other) = delete;
 
 	//Free all memory that has been allocated.
@@ -94,9 +78,8 @@ public:
 			delete[] m_StartAddress;
 			m_StartAddress = nullptr;
 		}
-        for (char* addr : m_ExtraMemory) {
+		for (char* addr : m_ExtraMemory)
-            free(addr);
+			free(addr);
-        }
 		m_ExtraMemory.clear();
 	}
 
@@ -119,7 +102,7 @@ public:
 			m_ExtraMemory.push_back((char*)malloc(m_Stride));
 			//We should preferably not enter here to avoid performance issues. Set more numMaxElements in constructor instead.
             if (!DisableMemoryPool::Value) {
-			    LOG_DEBUG("Allocated slots exceed Pool size, extra memory allocated dynamically. Pool size: %u, dynamic size: %u.", m_NumSlots, m_ExtraMemory.size());
+			    LOG_WARNING("Allocated slots exceed Pool size, extra memory allocated dynamically. Pool size: %u, dynamic size: %u.", m_NumSlots, m_ExtraMemory.size());
             }
 			return m_ExtraMemory.back();
 		}

include/Engine/Core/Octree.h

@@ -5,8 +5,9 @@
 
 #include "../Common.h"
 #include "AABB.h"
-#include "Frustum.h"
+
-#include "Ray.h"
+//Fwd declarations.
+class Ray;
 
 namespace OctSpace
 {
@@ -39,10 +40,6 @@ public:
     //The type Box must be AABB, or inherit from AABB.
     template<typename Box>
     void ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects);
-    //Get the objects that are inside the frustum, the objects are put in outObjects.
-    void ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects);
-    //Get objects, which AABB the input ray intersects, the objects are put in outObjects.
-    void ObjectsPossiblyHitByRay(const Ray& ray, std::vector<T>& outObjects);
     //Empty the tree of all objects, static and dynamic.
     void ClearObjects();
     //Empty the tree of all dynamic objects. Static objects remain in the tree.
@@ -100,10 +97,6 @@ struct Child
     void AddStaticObject(const AABB& box);
     template<typename T, typename Box>
     void ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects) const;
-    template<typename T>
-    void ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects, bool takeAllDontTest) const;
-    template<typename T>
-    void ObjectsPossiblyHitByRay(const Ray& ray, std::vector<T>& outObjects) const;
     void ClearObjects();
     void ClearDynamicObjects();
     bool RayCollides(const Ray& ray, Output& data) const;
@@ -118,20 +111,11 @@ struct Child
     std::vector<ContainedObject>& m_StaticObjectsRef;
     std::vector<ContainedObject>& m_DynamicObjectsRef;
 
-    inline bool hasChildren() const { return m_Children[0] != nullptr; }
+    bool hasChildren() const;
     int childIndexContainingPoint(const glm::vec3& point) const;
     std::vector<int> childIndicesContainingBox(const AABB& box) const;
 };
 
-//To be able to sort child nodes and contained objects based on distance to ray origin.
-struct RaySorterInfo
-{
-    int Index;
-    float Distance;
-};
-
-bool isFirstLower(const RaySorterInfo& first, const RaySorterInfo& second);
-
 }
 
 template<typename T>
@@ -170,20 +154,6 @@ void Octree<T>::ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects)
     m_Root->ObjectsInSameRegion(box, outObjects);
 }
 
-template<typename T>
-void Octree<T>::ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects)
-{
-    falsifyObjectChecks();
-    m_Root->ObjectsInFrustum(frustum, outObjects, false);
-}
-
-template<typename T>
-void Octree<T>::ObjectsPossiblyHitByRay(const Ray& ray, std::vector<T>& outObjects)
-{
-    falsifyObjectChecks();
-    m_Root->ObjectsPossiblyHitByRay(ray, outObjects);
-}
-
 template<typename T>
 void Octree<T>::ClearObjects()
 {
@@ -260,101 +230,4 @@ void OctSpace::Child::ObjectsInSameRegion(const Box& box, std::vector<T>& outObj
     }
 }
 
-template<typename T>
-void OctSpace::Child::ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects, bool takeAllDontTest) const
-{
-    if (hasChildren()) {
-        for (const Child* c : m_Children) {
-            Frustum::Output out = Frustum::Output::Inside;
-            if (!takeAllDontTest) {
-                out = frustum.VsAABB(c->m_Box);
-                if (out == Frustum::Output::Outside) {
-                    continue;
-                }
-            }
-            c->ObjectsInFrustum(frustum, outObjects, out == Frustum::Output::Inside);
-        }
-    } else {
-        size_t startIndex = outObjects.size();
-        int numDuplicates = 0;
-        outObjects.resize(outObjects.size() + m_StaticObjIndices.size() + m_DynamicObjIndices.size());
-        for (size_t i = 0; i < m_StaticObjIndices.size(); ++i) {
-            ContainedObject& obj = m_StaticObjectsRef[m_StaticObjIndices[i]];
-            if (obj.Checked || frustum.VsAABB(*obj.Box) == Frustum::Output::Outside) {
-                ++numDuplicates;
-            } else {
-                obj.Checked = true;
-                outObjects[startIndex + i - numDuplicates] = *static_cast<T*>(obj.Box.get());
-            }
-        }
-        for (size_t i = 0; i < m_DynamicObjIndices.size(); ++i) {
-            ContainedObject& obj = m_DynamicObjectsRef[m_DynamicObjIndices[i]];
-            if (obj.Checked || frustum.VsAABB(*obj.Box) == Frustum::Output::Outside) {
-                ++numDuplicates;
-            } else {
-                obj.Checked = true;
-                outObjects[startIndex + i - numDuplicates] = *static_cast<T*>(obj.Box.get());
-            }
-        }
-        for (size_t i = 0; i < numDuplicates; ++i) {
-            outObjects.pop_back();
-        }
-    }
-}
-
-template<typename T>
-void OctSpace::Child::ObjectsPossiblyHitByRay(const Ray& ray, std::vector<T>& outObjects) const
-{
-    //If the node AABB is missed, everything it contains is missed.
-    if (Collision::RayAABBIntr(ray, m_Box)) {
-        //If the ray shoots the tree, and it is a parent.
-        if (hasChildren()) {
-            //Sort children according to their distance from the ray origin.
-            std::vector<RaySorterInfo> childInfos;
-            childInfos.resize(8);
-            for (int i = 0; i < 8; ++i) {
-                childInfos[i] = { i, glm::distance(ray.Origin(), m_Children[i]->m_Box.Origin()) };
-            }
-            std::sort(childInfos.begin(), childInfos.end(), isFirstLower);
-            //Loop through the children, starting with the one closest to the ray origin. I.e the first to be hit.
-            for (const RaySorterInfo& info : childInfos) {
-                m_Children[info.Index]->ObjectsPossiblyHitByRay(ray, outObjects);
-            }
-        } else {
-            //Check against boxes in the node.
-            bool intersected = false;
-            float dist;
-            //Sort all contained objects according to the distance from the ray origin to 
-            //the intersection, if they are intersecting.
-            std::vector<RaySorterInfo> objectHitInfos;
-            objectHitInfos.reserve(m_StaticObjIndices.size() + m_DynamicObjIndices.size());
-            for (int i : m_StaticObjIndices) {
-                //If we haven't tested against this object before, and the ray hits.
-                if (!m_StaticObjectsRef[i].Checked &&
-                        Collision::RayVsAABB(ray, *m_StaticObjectsRef[i].Box, dist)) {
-                    objectHitInfos.push_back({ i, dist });
-                }
-                m_StaticObjectsRef[i].Checked = true;
-            }
-            for (int i : m_DynamicObjIndices) {
-                //If we haven't tested against this object before, and the ray hits.
-                if (!m_DynamicObjectsRef[i].Checked &&
-                        Collision::RayVsAABB(ray, *m_DynamicObjectsRef[i].Box, dist)) {
-                    objectHitInfos.push_back({ i + (int)m_StaticObjIndices.size(), dist });
-                }
-                m_DynamicObjectsRef[i].Checked = true;
-            }
-            std::sort(objectHitInfos.begin(), objectHitInfos.end(), isFirstLower);
-            int startSize = (int)outObjects.size();
-            outObjects.resize(startSize + objectHitInfos.size());
-            for (int i = 0; i < objectHitInfos.size(); ++i) {
-                outObjects[startSize + i] = (objectHitInfos[i].Index < m_StaticObjIndices.size()) ?
-                    *static_cast<T*>(m_StaticObjectsRef[objectHitInfos[i].Index].Box.get()) :
-                    *static_cast<T*>(m_DynamicObjectsRef[objectHitInfos[i].Index - m_StaticObjIndices.size()].Box.get());
-            }
-        }
-    }
-}
-
-
 #endif

include/Engine/Core/PerformanceTimer.h

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

include/Engine/Core/Ray.h

@@ -7,10 +7,6 @@
 class Ray
 {
 public:
-    Ray()
-        : m_Origin(glm::vec3(0.f))
-        , m_Direction(glm::vec3(0, 0, 1))
-    {}
     Ray(const glm::vec3& origin, const glm::vec3& dir)
         : m_Origin(origin)
         , m_Direction(glm::normalize(dir))

include/Engine/Core/ResourceManager.h

@@ -200,16 +200,13 @@ static T* ResourceManager::Load(const std::string& resourceName, Resource* paren
     }
 
     //If resource has already been cached and completely loaded.
-    {
+    it = m_ResourceCache.find(cacheKey);
-        boost::lock_guard<decltype(m_Mutex)> guard(m_Mutex);
+    if (it != m_ResourceCache.end()) {
-        it = m_ResourceCache.find(cacheKey);
+        if (it->second != nullptr) {
-        if (it != m_ResourceCache.end()) {
+            return static_cast<T*>(it->second);
-            if (it->second != nullptr) {
+        } else {
-                return static_cast<T*>(it->second);
+            //Don't return null on failure, exception instead.
-            } else {
+            throw Resource::FailedLoadingException();
-                //Don't return null on failure, exception instead.
-                throw Resource::FailedLoadingException();
-            }
         }
     }
 

include/Engine/Core/System.h

@@ -5,55 +5,21 @@
 #include "World.h"
 #include "EntityWrapper.h"
 #include "ComponentWrapper.h"
-#include "EPlayerSpawned.h"
-
-struct SystemParams
-{
-    SystemParams(::World* World, ::EventBroker* EventBroker, bool IsClient, bool IsServer)
-        : World(World)
-        , EventBroker(EventBroker)
-        , IsClient(IsClient)
-        , IsServer(IsServer)
-    { }
-
-    ::World* World;
-    ::EventBroker* EventBroker;
-    bool IsClient = false;
-    bool IsServer = false;
-};
 
 class System
 {
     friend class SystemPipeline;
 
 protected:
-    System(SystemParams params)
+    System(World* world, EventBroker) { }
-        : m_World(params.World)
+    System(World* world, EventBroker* eventBroker)
-        , m_EventBroker(params.EventBroker)
+        : m_World(world)
-        , IsClient(params.IsClient)
+        , m_EventBroker(eventBroker)
-        , IsServer(params.IsServer)
+    { }
-    {
-        if (IsClient) {
-            EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &System::setLocalPlayer);
-        }
-    }
     virtual ~System() = default;
 
     World* m_World;
     EventBroker* m_EventBroker;
-    bool IsClient = false;
-    bool IsServer = false;
-    EntityWrapper LocalPlayer = EntityWrapper::Invalid;
-
-private:
-    EventRelay<System, Events::PlayerSpawned> m_EPlayerSpawned;
-    virtual bool setLocalPlayer(Events::PlayerSpawned& e)
-    {
-        if (e.PlayerID == -1) {
-            LocalPlayer = e.Player;
-        }
-        return true;
-    }
 };
 
 class PureSystem : public virtual System
@@ -68,7 +34,7 @@ protected:
 
     const std::string m_ComponentType;
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) = 0;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cComponent, double dt) = 0;
 };
 
 class ImpureSystem : public virtual System

include/Engine/Core/SystemPipeline.h

@@ -6,16 +6,13 @@
 #include "System.h"
 #include "World.h"
 #include "EPause.h"
-#include "PerformanceTimer.h"
 
 class SystemPipeline
 {
 public:
-    SystemPipeline(World* world, EventBroker* eventBroker, bool isClient, bool isServer)
+    SystemPipeline(World* world, EventBroker* eventBroker)
         : m_World(world)
         , m_EventBroker(eventBroker)
-        , m_IsClient(isClient)
-        , m_IsServer(isServer)
     {
         EVENT_SUBSCRIBE_MEMBER(m_EPause, &SystemPipeline::OnPause);
         EVENT_SUBSCRIBE_MEMBER(m_EResume, &SystemPipeline::OnResume);
@@ -38,7 +35,7 @@ public:
             m_OrderedSystemGroups.resize(updateOrderLevel + 1);
         }
         UnorderedSystems& group = m_OrderedSystemGroups[updateOrderLevel];
-        System* system = new T(SystemParams(m_World, m_EventBroker, m_IsClient, m_IsServer), args...);
+        System* system = new T(m_World, m_EventBroker, args...);
         group.Systems[typeid(T).name()] = system;
 
         PureSystem* pureSystem = dynamic_cast<PureSystem*>(system);
@@ -62,9 +59,6 @@ public:
             dt = 0.0;
         }
 
-        // Process utility events for the System base class
-        m_EventBroker->Process<System>();
-
         for (UnorderedSystems& group : m_OrderedSystemGroups) {
             // Process events
             for (auto& pair : group.Systems) {
@@ -73,10 +67,7 @@ public:
 
             // Update
             for (auto& system : group.ImpureSystems) {
-                auto className = (std::string)typeid(*system).name();
-                PerformanceTimer::StartTimer(className);
                 system->Update(dt);
-                PerformanceTimer::StopTimer(className);
             }
             for (auto& pair : group.PureSystems) {
                 const std::string& componentName = pair.first;
@@ -87,10 +78,7 @@ public:
                 }
                 for (auto& component : *pool) {
                     for (auto& system : systems) {
-                        auto className = (std::string)typeid(*system).name();
-                        PerformanceTimer::StartTimer(className);
                         system->UpdateComponent(EntityWrapper(m_World, component.EntityID), component, dt);
-                        PerformanceTimer::StopTimer(className);
                     }
                 }
             }
@@ -100,8 +88,6 @@ public:
 private:
     World* m_World;
     EventBroker* m_EventBroker;
-    bool m_IsClient = false;
-    bool m_IsServer = false;
     bool m_Paused = false;
 
     struct UnorderedSystems
@@ -113,9 +99,9 @@ private:
     std::vector<UnorderedSystems> m_OrderedSystemGroups;
 
     EventRelay<SystemPipeline, Events::Pause> m_EPause;
-    bool OnPause(const Events::Pause& e) {
+    bool OnPause(const Events::Pause& e) { 
-        if (e.World == m_World) {
+        if (e.World == m_World) { 
-            m_Paused = true;
+            m_Paused = true; 
         }
         return true;
     }

include/Engine/Core/Transform.h

@@ -8,17 +8,14 @@
 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);
 
 }
 

include/Engine/Core/UniformScaleSystem.h

@@ -8,7 +8,7 @@
 class UniformScaleSystem : public PureSystem
 {
 public:
-    UniformScaleSystem(SystemParams params);
+    UniformScaleSystem(World* world, EventBroker* eventBroker);
 
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cUniformScale, double dt) override;
 

include/Engine/Core/Util/Any.h

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

include/Engine/Core/Util/FileWatcher.h

@@ -42,7 +42,7 @@ enum class FileWatcher::FileEventFlags
 };
 
 inline FileWatcher::FileEventFlags operator|(FileWatcher::FileEventFlags a, FileWatcher::FileEventFlags b) { return static_cast<FileWatcher::FileEventFlags>(static_cast<int>(a) | static_cast<int>(b)); }
-inline bool operator&(FileWatcher::FileEventFlags a, FileWatcher::FileEventFlags b) { return (static_cast<int>(a) & static_cast<int>(b)) != 0; }
+inline bool operator&(FileWatcher::FileEventFlags a, FileWatcher::FileEventFlags b) { return static_cast<int>(a)& static_cast<int>(b); }
 
 class FileWatcher::Worker
 {
@@ -54,7 +54,7 @@ public:
 private:
 	struct FileInfo
 	{
-		std::size_t Size;
+		int Size;
 		std::time_t Timestamp;
 	};
 

include/Engine/Core/Util/IfDebug.h

@@ -4,7 +4,7 @@
 // }
 // NOTE: condition statement is not executed at all in release mode.
 #ifndef DEBUG_IF
-#ifdef DEBUG
+#ifndef DEBUG
 #define DEBUG_IF(c) if(c)
 #else
 #define DEBUG_IF(c) if(false)

include/Engine/Core/Util/Logging.h

@@ -29,9 +29,41 @@ enum _LOG_LEVEL
 
 extern _LOG_LEVEL LOG_LEVEL;
 
-extern const char* _LOG_LEVEL_PREFIX[];
+const static char* _LOG_LEVEL_PREFIX[] =
+{
+	"EE: ",
+	"",
+	"WW: ",
+	"DD: "
+};
 
-extern void _LOG(_LOG_LEVEL logLevel, const char* file, const char* func, unsigned int line, const char* format, ...);
+static void _LOG(_LOG_LEVEL logLevel, const char* file, const char* func, unsigned int line, const char* format, ...)
+{
+	if (logLevel > LOG_LEVEL) {
+		return;
+	}
+
+	char* message = nullptr;
+	va_list args;
+
+	va_start(args, format);
+	size_t size = vsnprintf(message, 0, format, args) + 1;
+	va_end(args);
+
+	va_start(args, format);
+	message = new char[size];
+	vsnprintf(message, size, format, args);
+	va_end(args);
+
+	if (logLevel == LOG_LEVEL_ERROR) {
+		std::cerr << file << ":" << line << " " << func << std::endl;
+		std::cerr << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
+	} else {
+		std::cout << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
+	}
+
+	delete[] message;
+}
 
 #define LOG(logLevel, format, ...) \
 	_LOG(logLevel, __BASE_FILE__, __func__, __LINE__, format, ##__VA_ARGS__)
@@ -45,11 +77,7 @@ extern void _LOG(_LOG_LEVEL logLevel, const char* file, const char* func, unsign
 #define LOG_INFO(format, ...) \
 	LOG(LOG_LEVEL_INFO, format, ##__VA_ARGS__)
 
-#ifdef DEBUG
 #define LOG_DEBUG(format, ...) \
 	LOG(LOG_LEVEL_DEBUG, format, ##__VA_ARGS__)
-#else
-#define LOG_DEBUG(format, ...) 
-#endif
 
 #endif // Logging_h__

include/Engine/Core/World.h

@@ -15,7 +15,6 @@ public:
         : m_EventBroker(eventBroker)
     { }
     ~World();
-    World(const World& other);
 
     // Create empty entity
     EntityID CreateEntity(EntityID parent = 0);
@@ -40,7 +39,7 @@ public:
     // Change the parent of an entity
     void SetParent(EntityID entity, EntityID parent);
     // Get children of an entity
-    const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetDirectChildren(EntityID entity);
+    const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetChildren(EntityID entity);
     // Get all component pools
     const std::unordered_map<std::string, ComponentPool*>& GetComponentPools() const { return m_ComponentPools; }
     // Get the entity children map

include/Engine/Editor/EditorCameraInputController.h

@@ -23,7 +23,7 @@ public:
         m_SpeedMultiplier = m_Config->Get<float>("Editor.CameraSpeed", 3.f);
     }
     
-    virtual const glm::vec3 Movement() const override { return m_Movement * static_cast<float>(m_SpeedMultiplier); }
+    virtual const glm::vec3 Movement() const override { return m_Movement * m_SpeedMultiplier; }
 
     void Enable() { m_Enabled = true; }
     void Disable() { m_Enabled = false; }
@@ -69,7 +69,7 @@ public:
 protected:
     ConfigFile* m_Config;
     bool m_Enabled = false;
-    double m_SpeedMultiplier = 1.f;
+    float m_SpeedMultiplier = 1.f;
 
     EventRelay<EventContext, Events::MousePress> m_EMousePress;
     bool OnMousePress(const Events::MousePress& e)
@@ -105,7 +105,7 @@ protected:
             return false;
         }
 
-        m_SpeedMultiplier += e.DeltaY * (0.1 * m_SpeedMultiplier);
+        m_SpeedMultiplier += e.DeltaY * (0.1f * m_SpeedMultiplier);
         m_Config->Set("Editor.CameraSpeed", m_SpeedMultiplier);
         m_Config->SaveToDisk();
         return true;

include/Engine/Editor/EditorGUI.h

@@ -7,7 +7,6 @@
 #include <nativefiledialog/nfd.h>
 #include <boost/filesystem.hpp>
 #include <boost/any.hpp>
-#include <boost/algorithm/string/replace.hpp>
 #include "../Common.h"
 #include "../GLM.h"
 #include <glm/gtx/common.hpp>
@@ -19,8 +18,6 @@
 #include "../Core/ResourceManager.h"
 #include "../Core/EPause.h"
 #include "../Core/EKeyDown.h"
-#include "../Core/ELockMouse.h"
-#include "../Core/EFileDropped.h"
 #include "../Rendering/Texture.h"
 
 class EditorGUI
@@ -35,12 +32,6 @@ public:
         Scale
     };
 
-    enum class WidgetSpace
-    {
-        Global,
-        Local
-    };
-
     void Draw();
 
     void SelectEntity(EntityWrapper entity);
@@ -73,12 +64,6 @@ public:
     // Called when the user means to rename an entity.
     typedef std::function<void(EntityWrapper, const std::string&)> OnEntityChangeName_t;
     void SetEntityChangeNameCallback(OnEntityChangeName_t f) { m_OnEntityChangeName = f; }
-    // Called when the user pastes an entity previously "copied"
-    // @param EntityWrapper The entity to copy
-    // @param EntityWrapper The entity to parent the new copy to
-    // @return The new copy of the entity
-    typedef std::function<EntityWrapper(EntityWrapper, EntityWrapper)> OnEntityPaste_t;
-    void SetEntityPasteCallback(OnEntityPaste_t f) { m_OnEntityPaste = f; }
     // Called when the user means to attach a new component to an entity.
     typedef std::function<void(EntityWrapper, const std::string&)> OnComponentAttach_t;
     void SetComponentAttachCallback(OnComponentAttach_t f) { m_OnComponentAttach = f; }
@@ -88,9 +73,6 @@ public:
     // Called when the user selects a widget mode.
     typedef std::function<void(WidgetMode)> OnWidgetMode_t;
     void SetWidgetModeCallback(OnWidgetMode_t f) { m_OnWidgetMode = f; }
-    // Called when the user selects a widget space.
-    typedef std::function<void(WidgetSpace)> OnWidgetSpace_t;
-    void SetWidgetSpaceCallback(OnWidgetSpace_t f) { m_OnWidgetSpace = f; }
 
 private:
     World* m_World;
@@ -111,13 +93,8 @@ private:
     EntityWrapper m_CurrentlyDragging = EntityWrapper::Invalid;
     std::string m_LastErrorMessage;
     WidgetMode m_CurrentWidgetMode = WidgetMode::Translate;
-    WidgetSpace m_CurrentWidgetSpace = WidgetSpace::Global;
     std::set<std::string> m_ModalsToOpen;
     std::map<std::string, boost::any> m_ModalData;
-    std::string m_DroppedFile = "";
-    bool m_Paused = false;
-    bool m_MouseLocked = false;
-    EntityWrapper m_CopyTarget = EntityWrapper::Invalid;
 
     // Callbacks
     OnEntitySelectedCallback_t m_OnEntitySelected = nullptr;
@@ -130,22 +107,10 @@ private:
     OnComponentAttach_t m_OnComponentAttach = nullptr;
     OnComponentDelete_t m_OnComponentDelete = nullptr;
     OnWidgetMode_t m_OnWidgetMode = nullptr;
-    OnWidgetSpace_t m_OnWidgetSpace = nullptr;
-    OnEntityPaste_t m_OnEntityPaste = nullptr;
 
     // Events
     EventRelay<EditorGUI, Events::KeyDown> m_EKeyDown;
     bool OnKeyDown(const Events::KeyDown& e);
-    EventRelay<EditorGUI, Events::FileDropped> m_EFileDropped;
-    bool OnFileDropped(const Events::FileDropped& e);
-    EventRelay<EditorGUI, Events::Pause> m_EPause;
-    bool OnPause(const Events::Pause& e);
-    EventRelay<EditorGUI, Events::Resume> m_EResume;
-    bool OnResume(const Events::Resume& e);
-    EventRelay<EditorGUI, Events::LockMouse> m_ELockMouse;
-    bool OnLockMouse(const Events::LockMouse& e);
-    EventRelay<EditorGUI, Events::UnlockMouse> m_EUnlockMouse;
-    bool OnUnlockMouse(const Events::UnlockMouse& e);
 
     // Utility functions
     boost::filesystem::path fileOpenDialog();
@@ -153,9 +118,6 @@ private:
     const std::string formatEntityName(EntityWrapper entity);
     GLuint tryLoadTexture(std::string filePath);
     void openModal(const std::string& modal);
-    void setWidgetMode(WidgetMode mode);
-    void toggleWidgetSpace();
-    static bool compareCharArray(const char* c1, const char* c2);
 
     // Entity file handling methods
     void entityImport(World* world);

include/Engine/Editor/EditorRenderSystem.h

@@ -10,7 +10,7 @@
 class EditorRenderSystem : public ImpureSystem
 {
 public:
-    EditorRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame);
+    EditorRenderSystem(World* world, EventBroker* eventBroker, IRenderer* renderer, RenderFrame* renderFrame);
 
     virtual void Update(double dt) override;
 

include/Engine/Editor/EditorSystem.h

@@ -17,7 +17,7 @@
 class EditorSystem : public ImpureSystem
 {
 public:
-    EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame);
+    EditorSystem(World* world, EventBroker* eventBroker, IRenderer* renderer, RenderFrame* renderFrame);
     ~EditorSystem();
 
     void Update(double dt);
@@ -41,7 +41,6 @@ private:
     double m_LastTime = 0.f;
     bool m_Enabled = true;
     EditorGUI::WidgetMode m_WidgetMode = EditorGUI::WidgetMode::Translate;
-    EditorGUI::WidgetSpace m_WidgetSpace = EditorGUI::WidgetSpace::Global;
     EntityWrapper m_Widget = EntityWrapper::Invalid;
     EntityWrapper m_CurrentSelection = EntityWrapper::Invalid;
 
@@ -56,10 +55,8 @@ private:
     void OnEntityDelete(EntityWrapper entity);
     void OnEntityChangeParent(EntityWrapper entity, EntityWrapper parent);
     void OnEntityChangeName(EntityWrapper entity, const std::string& name);
-    EntityWrapper OnEntityPaste(EntityWrapper entityToCopy, EntityWrapper parent);
     void OnComponentAttach(EntityWrapper entity, const std::string& componentType);
     void OnComponentDelete(EntityWrapper entity, const std::string& componentType);
-    void OnWidgetSpace(EditorGUI::WidgetSpace widgetSpace);
 
     // Events
     EventRelay<EditorSystem, Events::MousePress> m_EMousePress;

include/Engine/Editor/EditorWidgetSystem.h

@@ -25,7 +25,7 @@ struct WidgetDelta : Event
 class EditorWidgetSystem : public ImpureSystem, PureSystem
 {
 public:
-    EditorWidgetSystem(SystemParams params, IRenderer* renderer);
+    EditorWidgetSystem(World* world, EventBroker* eventBroker, IRenderer* renderer);
 
     virtual void Update(double dt) override;
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cEditorWidget, double dt) override;

include/Engine/GUI/Button.h

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

include/Engine/GUI/ButtonSystem.h

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

include/Engine/GUI/EButtonClicked.h

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

include/Engine/GUI/EButtonEnter.h

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

include/Engine/GUI/EButtonLeave.h

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

include/Engine/GUI/EButtonPress.h

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

include/Engine/GUI/EButtonPressed.h

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

include/Engine/GUI/EButtonRelease.h

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

include/Engine/GUI/EButtonReleased.h

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

include/Engine/GUI/Frame.h

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

include/Engine/GUI/MainMenuSystem.h

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

include/Engine/GUI/TextureFrame.h

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

include/Engine/Input/EInputCommand.h

@@ -2,7 +2,6 @@
 #define Events_InputCommand_h__
 
 #include "Core/EventBroker.h"
-#include "Core/EntityWrapper.h"
 
 namespace Events
 {
@@ -11,7 +10,6 @@ struct InputCommand : Event
 {
 	/** Numerical ID of the player. */
 	int PlayerID;
-    EntityWrapper Player;
 	/** The command that was sent. */
 	std::string Command;
 	/** The value of the command. */

include/Engine/Input/FirstPersonInputController.h

@@ -4,8 +4,6 @@
 #include "../GLM.h"
 #include "../Core/InputController.h"
 #include "../Core/ELockMouse.h"
-#include "../Game/Events/EDashAbility.h"
-#include "InputHandler.h"
 
 template <typename EventContext>
 class FirstPersonInputController : public InputController<EventContext>
@@ -17,46 +15,20 @@ public:
     virtual const glm::vec3 Rotation() const { return m_Rotation; }
     virtual bool Jumping() const { return m_Jumping; }
     virtual bool Crouching() const { return m_Crouching; }
-    virtual bool DoubleJumping() const { return m_DoubleJumping; }
+    
-    virtual void SetDoubleJumping(bool isDoubleJumping) {
-        m_DoubleJumping = isDoubleJumping;
-    }
-
     void LockMouse();
     void UnlockMouse();
     virtual bool OnCommand(const Events::InputCommand& e) override;
     virtual void Reset();
 
-    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer);
-    virtual bool AssaultDashDoubleTapped() const { return m_AssaultDashDoubleTapped; }
-    virtual bool PlayerIsDashing() const { return m_PlayerIsDashing; }
-
 protected:
     const int m_PlayerID;
     bool m_MouseLocked = false;
     glm::vec3 m_Rotation;
     glm::vec3 m_Movement;
     bool m_Jumping = false;
-    bool m_DoubleJumping = false;
     bool m_Crouching = false;
-    //assault dash membervariables - needed to calculate the doubletap- and dashlogic
+    
-    double m_AssaultDashDoubleTapDeltaTime = 0.0;
-    double m_AssaultDashCoolDownTimer = 0.0;
-    //i will let m_AssaultDashDoubleTapSensitivityTimer stay hardcoded, its not really a gamevariable (more an inputvariable), 
-    //and its very unlikely that someone wants to change that value
-    const float m_AssaultDashDoubleTapSensitivityTimer = 0.25f;
-    std::string m_AssaultDashTapDirection = "";
-    std::string m_CurrentDirectionVector = "";
-    bool m_AssaultDashDoubleTapped = false;
-    bool m_PlayerIsDashing = false;
-    bool m_ShiftDashing = false;
-    bool m_ValidDoubleTap = false;
-
-    //specialabilitys
-    bool m_MovementKeyDown = false;
-    bool m_SpecialAbilityKeyDown = false;
-    int m_NumberOfMovementKeysDown = 0;
-
     EventRelay<EventContext, Events::LockMouse> m_ELockMouse;
     bool OnLockMouse(const Events::LockMouse& e);
     EventRelay<EventContext, Events::UnlockMouse> m_EUnlockMouse;
@@ -64,7 +36,7 @@ protected:
 };
 
 template <typename EventContext>
-FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID)
+FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID) 
     : InputController(eventBroker)
     , m_PlayerID(playerID)
 {
@@ -127,31 +99,6 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
         }
     }
 
-    if (e.Command == "Forward" || e.Command == "Right") {
-        if (e.Value != 0) {
-            m_CurrentDirectionVector = e.Command == "Right" ? (e.Value > 0 ? "Right" : "Left") : (e.Value > 0 ? "Forward" : "Backward");
-        }
-        //if value = 0 then you have just released this key
-        if (e.Value != 0) {
-            m_NumberOfMovementKeysDown++;
-            m_MovementKeyDown = true;
-            //if you pressed the same key within m_AssaultDashDoubleTapSensitivityTimer then you have doubletapped it
-            if (m_AssaultDashDoubleTapDeltaTime < m_AssaultDashDoubleTapSensitivityTimer && m_AssaultDashTapDirection == m_CurrentDirectionVector) {
-                m_ValidDoubleTap = true;
-            }
-        } else {
-            //== 0
-            m_NumberOfMovementKeysDown--;
-            if (m_NumberOfMovementKeysDown == 0) {
-                m_MovementKeyDown = false;
-            }
-                //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
-                m_AssaultDashTapDirection = m_CurrentDirectionVector;
-                m_AssaultDashDoubleTapDeltaTime = 0.f;
-            
-        }
-    }
-
     if (e.Command == "Jump") {
         m_Jumping = e.Value > 0;
     }
@@ -160,85 +107,21 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
         m_Crouching = e.Value > 0;
     }
 
-    if (e.Command == "SpecialAbility") {
-        if (e.Value > 0) {
-            m_SpecialAbilityKeyDown = true;
-        } else {
-            m_SpecialAbilityKeyDown = false;
-        }
-    }
-    if (m_SpecialAbilityKeyDown && m_MovementKeyDown) {
-        m_ShiftDashing = true;
-    } else {
-        m_ShiftDashing = false;
-    }
-
     return true;
 }
 
 template <typename EventContext>
 bool FirstPersonInputController<EventContext>::OnUnlockMouse(const Events::UnlockMouse& e)
 {
-    m_MouseLocked = false;
+    m_MouseLocked = false; 
     return true;
 }
 
 template <typename EventContext>
 bool FirstPersonInputController<EventContext>::OnLockMouse(const Events::LockMouse& e)
 {
-    m_MouseLocked = true;
+    m_MouseLocked = true; 
     return true;
 }
 
-template <typename EventContext>
-void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer) {
-    m_AssaultDashDoubleTapDeltaTime += dt;
-    m_AssaultDashCoolDownTimer -= dt;
-    //cooldown = assaultDashCoolDownMaxTimer sec, pretend the dash lasts 0.25 sec (for friction to do its work)
-    if (m_AssaultDashCoolDownTimer > (assaultDashCoolDownMaxTimer - 0.25f)) {
-        m_PlayerIsDashing = true;
-    } else {
-        m_PlayerIsDashing = false;
-    }
-
-    //dashing with shift
-    if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f) {
-        //player is dashing with shift
-        //the wanted-direction is set in playermovement already so we dont need to check what direction we want to dash in!
-        m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
-        m_AssaultDashDoubleTapped = true;
-        m_AssaultDashDoubleTapDeltaTime = 0.f;
-        return;
-    }
-
-    //reset the DoubleTapped state in case we recently doubleTapped (doubletap will only happen during 1 frame)
-    if (m_AssaultDashDoubleTapped) {
-        m_AssaultDashDoubleTapped = false;
-    }
-
-    //dashing with doubletap - check if doubletap to dash enabled
-    if (!ResourceManager::Load<ConfigFile>("Input.ini")->Get<bool>("Keyboard.DoubleTapToDash", false)) {
-        return;
-    }
-
-    //check if we have received a valid doubletap
-    if (!m_ValidDoubleTap) {
-        return;
-    }
-    m_ValidDoubleTap = false;
-
-    if (!(m_AssaultDashCoolDownTimer <= 0.0f)) {
-        //if we cant dash at the moment, then just reset the tap-sensitivity-timer
-        m_AssaultDashDoubleTapDeltaTime = 0.f;
-        return;
-    }
-    //ok, we have a valid tap, lets do it
-    m_AssaultDashDoubleTapped = true;
-    m_AssaultDashDoubleTapDeltaTime = 0.f;
-    m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
-
-    Events::DashAbility e;
-    m_EventBroker->Publish(e);
-}
-
 #endif

include/Engine/Network/Client.h

@@ -13,63 +13,43 @@
 #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/EventBroker.h"
 #include "Core/ConfigFile.h"
-#include "Core/EPlayerDeath.h"
 #include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"
-#include "../Game/Events/EDoubleJump.h"
 #include "Network/EInterpolate.h"
-#include "Network/SnapshotFilter.h"
 #include "Core/EPlayerSpawned.h"
-#include "Network/ESearchForServers.h"
-
-struct ServerInfo
-{
-    ServerInfo(std::string a, int b, std::string c, int d)
-    {
-        Address = a; Port = b; Name = c; PlayersConnected = d;
-    }
-    std::string Address = "";
-    int Port = 0;
-    std::string Name = "";
-    int PlayersConnected = 0;
-};
 
 class Client : public Network
 {
 public:
-    Client(World* world, EventBroker* eventBroker);
+    Client(ConfigFile* config);
-    Client(World* world, EventBroker* eventBroker, std::unique_ptr<SnapshotFilter> snapshotFilter);
     ~Client();
-
+    void Start(World* world, EventBroker* eventBroker) override;
-    void Connect(std::string address, int port);
     void Update() override;
 private:
-    UDPClient m_Unreliable;
+    // Assio UDP logic
-    TCPClient m_Reliable;
+    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
-    std::vector<Events::PlayerSpawned> m_PlayerSpawnEvents;
+    boost::asio::io_service m_IOService;
-    void parseSpawnEvents();
+    boost::asio::ip::udp::socket m_Socket;
-    // Save for children
-    std::unique_ptr<SnapshotFilter> m_SnapshotFilter = nullptr;
 
-    std::string m_Address;
-    int m_Port = 0;
     // Sending message to server logic
-    size_t bytesRead = 0;
+    int bytesRead = -1;
+    char readBuf[INPUTSIZE] = { 0 };
 
     // Packet loss logic
     PacketID m_PacketID = 0;
     PacketID m_PreviousPacketID = 0;
     PacketID m_SendPacketID = 0;
+    AckBitPattern ackBitField = 0;
 
     // Game logic
+    World* m_World;
     std::string m_PlayerName;
     PlayerID m_PlayerID = -1;
+    EntityID m_ServerEntityID = std::numeric_limits<EntityID>::max();
     bool m_IsConnected = false;
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
     // Server Client Lookup map
@@ -89,32 +69,28 @@ private:
     std::vector<Events::InputCommand> m_InputCommandBuffer;
 
     // Private member functions
-    size_t  receive(char* data);
+    void readFromServer();
+    int  receive(char* data);
+    void send(Packet& packet);
+    void connect();
     void disconnect();
     void parseMessageType(Packet& packet);
-    void updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID);
+    void updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID, const std::string& componentType);
-    SharedComponentWrapper createSharedComponent(Packet& packet, EntityID entityID, const ComponentInfo& componentInfo);
+    void parseConnect(Packet& packet);
-    void ignoreFields(Packet& packet, const ComponentInfo& componentInfo);
-    void parseUDPConnect(Packet& packet);
-    void parseTCPConnect(Packet& packet);
     void parsePlayerConnected(Packet& packet);
     void parsePing();
-    void parseServerlist(Packet& packet);
     void parseKick();
     void parsePlayersSpawned(Packet& packet);
     void parseEntityDeletion(Packet& packet);
-    void parsePlayerDamage(Packet& packet);
     void parseComponentDeletion(Packet& packet);
-    void parseDoubleJump(Packet& packet);
     void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
     void identifyPacketLoss();
-    void hasServerTimedOut();
+    bool hasServerTimedOut();
     EntityID createPlayer();
     void sendInputCommands();
     void sendLocalPlayerTransform();
     void becomePlayer();
-    void displayServerlist();
     // Mapping Logic
     // Returns if local EntityID exist in map
     bool clientServerMapsHasEntity(EntityID clientEntityID);
@@ -124,21 +100,13 @@ private:
     void deleteFromServerClientMaps(EntityID serverEntityID, EntityID clientEntityID);
 
     // Events
+    EventBroker* m_EventBroker;
     EventRelay<Client, Events::InputCommand> m_EInputCommand;
     bool OnInputCommand(const Events::InputCommand& e);
     EventRelay<Client, Events::PlayerDamage> m_EPlayerDamage;
     bool OnPlayerDamage(const Events::PlayerDamage& e);
     EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(const Events::PlayerSpawned& e);
-    EventRelay< Client, Events::SearchForServers> m_ESearchForServers;
-    EventRelay<Client, Events::DoubleJump> m_EDoubleJump;
-    bool OnDoubleJump(Events::DoubleJump & e);
-    bool OnSearchForServers(const Events::SearchForServers& e);
-    UDPClient m_ServerlistRequest;
-    std::vector<ServerInfo> m_Serverlist;
-    bool m_SearchingForServers = false;
-    std::clock_t m_StartSearchTime;
-    double m_SearchingTime = 2000; // Config I guess
 };
 
 #endif

include/Engine/Network/EInterpolate.h

@@ -11,13 +11,8 @@ namespace Events
 
 struct Interpolate : Event
 {
-    Interpolate(EntityWrapper Entity, SharedComponentWrapper Component)
+    EntityID Entity;
-        : Entity(Entity)
+    boost::shared_array<char> DataArray;
-        , Component(Component)
-    { }
-
-    EntityWrapper Entity;
-    SharedComponentWrapper Component;
 };
 
 }

include/Engine/Network/ESearchForServers.h

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

include/Engine/Network/MessageType.h

@@ -18,10 +18,7 @@ enum class MessageType
     OnPlayerSpawned,
     EntityDeleted,
     ComponentDeleted,
-    PlayerTransform,
+    PlayerTransform
-    OnDoubleJump,
-    ServerlistRequest,
-    Invalid
 };
 
 #endif

include/Engine/Network/Network.h

@@ -11,34 +11,30 @@
 #include "Core/ConfigFile.h"
 #include <fstream>
 #include <iostream>
+#include <bitset>
 
-#define BUFFERSIZE 32000
+#define INPUTSIZE 4097
 typedef unsigned int PlayerID;
 typedef unsigned int PacketID;
+typedef unsigned int AckBitPattern;
 
 class Network
 {
 public:
-    Network(World* world, EventBroker* eventBroker);
     virtual ~Network() { };
-
+    virtual void Start(World* m_world, EventBroker *eventBroker) = 0;
     virtual void Update() = 0;
-
 protected:
-    World* m_World;
-    EventBroker* m_EventBroker;
-
     // For Debug 
     bool isReadingData = false;
     NetworkData m_NetworkData;
     unsigned int m_SaveDataIntervalMs = 1000;
     std::clock_t m_SaveDataTimer;
     unsigned int m_MaxConnections;
-    double m_TimeoutMs;
+    unsigned int m_TimeoutMs;
-    void logSentData(int bytesSent);
-    void logReceivedData(int bytesReceived);
     void saveToFile();
     void updateNetworkData();
+    void initialize();
 };
 
 #endif

include/Engine/Network/NetworkClient.h

@@ -1,24 +0,0 @@
-#ifndef NetworkClient_h__
-#define NetworkClient_h__
-
-#include "Network/Packet.h"
-#define BUFFERSIZE 64000
-typedef unsigned int PlayerID;
-typedef unsigned int PacketID;
-
-class NetworkClient
-{
-public:
-    NetworkClient();
-    virtual ~NetworkClient();
-    virtual void Connect(std::string playerName, std::string address, int port) = 0;
-    virtual void Disconnect() = 0;
-    virtual void Receive(Packet& packet) = 0;
-    virtual void Send(Packet & packet) = 0;
-    virtual bool IsSocketAvailable() = 0;
-protected:
-    char* m_ReadBuffer;
-    unsigned int m_BufferSize = BUFFERSIZE;
-};
-
-#endif

include/Engine/Network/NetworkData.h

@@ -3,16 +3,16 @@
 #include <vector>
 
 struct NetworkData {
-    double TotalTime = 0;
+    unsigned int TotalTime = 0;
-    size_t TotalDataReceived = 0;
+    unsigned int TotalDataReceived = 0;
-    size_t TotalDataSent = 0;
+    unsigned int TotalDataSent = 0;
-    size_t AmountOfMessagesReceived = 0;
+    unsigned int AmountOfMessagesReceived = 0;
     unsigned int AmountOfMessagesSent = 0;
     // Interval based
-    size_t DataReceivedThisInterval = 0;
+    unsigned int DataReceivedThisInterval = 0;
-    size_t DataSentThisInterval = 0;
+    unsigned int DataSentThisInterval = 0;
     // pair: first=reveived, second=send 
-    std::vector<std::pair<size_t, size_t>> BandwidthBytes;
+    std::vector<std::pair<unsigned int, unsigned int>> BandwidthBytes;
 };
 
-#endif
+#endif

include/Engine/Network/NetworkServer.h

@@ -1,24 +0,0 @@
-#ifndef NetworkServer_h__
-#define NetworkServer_h__
-#include <boost/asio.hpp>
-#include "Network/Packet.h"
-#include "Network/PlayerDefinition.h"
-#define BUFFERSIZE 64000
-typedef unsigned int PlayerID;
-typedef unsigned int PacketID;
-
-class NetworkServer
-{
-public:
-    NetworkServer();
-    virtual ~NetworkServer();
-    virtual void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers) = 0;
-    virtual void Receive(Packet & packet, PlayerDefinition & playerDefinition) = 0;
-    virtual void Send(Packet & packet, PlayerDefinition & playerDefinition) = 0;
-    virtual void Send(Packet & packet) = 0;
-protected:
-    char* m_ReadBuffer;
-    unsigned int m_BufferSize = BUFFERSIZE;
-};
-
-#endif

include/Engine/Network/Packet.h

@@ -11,12 +11,12 @@ class Packet
 public:
     // arg1: Type of message (Connect, Disconnect...)
     // arg2: PacketID for identifying packet loss.
-    Packet(MessageType type, unsigned int& packetID);
+    Packet(MessageType type, unsigned int& packetID, unsigned int lastReceivedPacket, unsigned int ackBitField);
     // Used to create packet from already existing data buffer.
-    Packet(char* data, const size_t sizeOfPacket);
+    Packet(char* data, const int sizeOfPacket);
     Packet(MessageType type);
     ~Packet();
-    void Init(MessageType type, unsigned int& packetID);
+    void Init(MessageType type, unsigned int& packetID, unsigned int lastReceivedPacket, unsigned int ackBitField);
 
     // Add primitive types like int, float, char...
     template<typename T>
@@ -49,27 +49,23 @@ public:
     void WriteData(char* data, int sizeOfData);
     // Pops the first element as if it was a string.
     std::string ReadString();
-    // Construct a packet
-    void ReconstructFromData(char* data, size_t SizeOfData);
-    // Update size of packet variable in header
-    void UpdateSize();
     char* ReadData(int SizeOfData);
-    void ChangePacketID(unsigned int& packetID);
+    // No purpose any more 
-    size_t Size() { return m_Offset; };
+    //void ChangePacketID(unsigned int& packetID);
+    void ChangeHeaderInfo(unsigned int& packetID, unsigned int lastReceivedPacket, unsigned int ackBitField);
+    int Size() { return m_Offset; };
     char* Data() { return m_Data; };
-    MessageType GetMessageType();
+    unsigned int DataReadSize() { return m_ReturnDataOffset; }
-    size_t DataReadSize() { return m_ReturnDataOffset; }
+    unsigned int MaxSize() { return m_MaxPacketSize; }
-    size_t MaxSize() { return m_MaxPacketSize; }
+    unsigned int HeaderSize() { return m_HeaderSize; }
-    size_t HeaderSize() { return m_HeaderSize; }
 
 private:
     char* m_Data;
-    size_t m_ReturnDataOffset = 0;
+    unsigned int m_ReturnDataOffset = 0;
-    size_t m_Offset = 0;
+    int m_Offset = 0;
-    size_t m_MaxPacketSize = 512;
+    unsigned int m_MaxPacketSize = 512;
-    size_t m_HeaderSize = 0;
+    unsigned int m_HeaderSize = 0;
     void resizeData();
-    void resizeData(int size);
 };
 
 #endif

include/Engine/Network/PlayerDefinition.h

@@ -2,18 +2,19 @@
 #define PlayerDefinition_h__
 #include <string>
 #include "../Core/Entity.h"
-#include <boost/asio.hpp>
 
 struct PlayerDefinition {
     ::EntityID EntityID = EntityID_Invalid;
     std::string Name = "";
     boost::asio::ip::udp::endpoint Endpoint;
+    // The ID of the last sent packet. (Local sequence number)
     unsigned int PacketID;
+    // The ID of the last received packet. (Remote sequence number)
+    // This is sent as the ackNumber.
+    unsigned int LastPacketReceivedID;
+    // The bit pattern of the last 32 received packets.
+    unsigned int AckBitField;
     std::clock_t StopTime;
-    boost::asio::ip::address TCPAddress;
-    unsigned short TCPPort;
-    // use for tcp connections
-    boost::shared_ptr<boost::asio::ip::tcp::socket> TCPSocket;
 };
 
 #endif

include/Engine/Network/Server.h

@@ -5,9 +5,8 @@
 #include <ctime>
 
 #include <glm/common.hpp>
+#include <boost/asio/ip/udp.hpp>
 
-#include "Network/TCPServer.h"
-#include "Network/UDPServer.h"
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Core/World.h"
@@ -17,77 +16,69 @@
 #include "Core/EPlayerDamage.h"
 #include "Network/EPlayerDisconnected.h"
 #include "Core/EPlayerSpawned.h"
-#include "../Game/Events/EDoubleJump.h"
 #include "Core/EEntityDeleted.h"
 #include "Core/EComponentDeleted.h"
 
 class Server : public Network
 {
 public:
-    Server(World* world, EventBroker* eventBroker, int port);
+    Server();
     ~Server();
-
+    void Start(World* m_world, EventBroker *eventBroker) override;
     void Update() override;
-
 private:
-    // Network channels
+    // UDP logic
-    TCPServer m_Reliable;
+    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
-    UDPServer m_Unreliable;
+    boost::asio::io_service m_IOService;
-    UDPServer m_ServerlistRequest;
+    boost::asio::ip::udp::socket m_Socket;
-    // dont forget to set these in the childrens receive logic
+
-    boost::asio::ip::address m_Address;
-    int m_Port = 27666;
     // Sending messages to client logic
     std::map<PlayerID, PlayerDefinition> m_ConnectedPlayers;
-    std::vector<PlayerID> m_PlayersToDisconnect;
+    char readBuffer[INPUTSIZE] = { 0 };
-    // HACK: Fix INPUTSIZE
+    int bytesRead = 0;
-    char readBuffer[BUFFERSIZE] = { 0 };
-    size_t bytesRead = 0;
     // time for previouse message
-    std::clock_t previousePingMessage = std::clock();
+    std::clock_t previousPingMessage = std::clock();
     std::clock_t previousSnapshotMessage = std::clock();
     std::clock_t timOutTimer = std::clock();
-
     // How often we send messages (milliseconds)
-    float pingIntervalMs;
+    int pingIntervalMs;
-    float snapshotInterval;
+    int snapshotInterval;
     int checkTimeOutInterval = 100;
     int m_NextPlayerID = 0;
-    std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
+
     //Timers
     std::clock_t m_StartPingTime;
 
+    // Game logic
+    World* m_World;
+    EventBroker* m_EventBroker;
+    
     // Packet loss logic
     PacketID m_PacketID = 0;
     PacketID m_PreviousPacketID = 0;
 
     // Private member functions
-    //int  receive(char* data);
-    void reliableBroadcast(Packet& packet);
-    void unreliableBroadcast(Packet& packet);
-    void sendSnapshot();
-    void addPlayersToPacket(Packet& packet, EntityID entityID);
     void addChildrenToPacket(Packet& packet, EntityID entityID);
-    void addInputCommandsToPacket(Packet& packet);
+    void broadcast(Packet& packet);
-    void sendPing();
     void checkForTimeOuts();
     void disconnect(PlayerID playerID);
-    void parseMessageType(Packet& packet);
-    void parseOnPlayerDamage(Packet& packet);
     void identifyPacketLoss();
     void kick(PlayerID player);
-    PlayerID GetPlayerIDFromEndpoint();
+    int  receive(char* data);
-    void parsePlayerTransform(Packet& packet);
+    void readFromClients();
-    void parseOnInputCommand(Packet& packet);
+    void send(PlayerID playerID, Packet& packet);
-    void parseClientPing();
+    void send(Packet& packet);
-    void parsePing();
+    void sendSnapshot();
-    bool parseDoubleJump(Packet& packet);
+    void sendPing();
-    void parseUDPConnect(Packet& packet);
+    void parseClientPing(PlayerID playerID);
-    void parseTCPConnect(Packet& packet);
+    void parseConnect(Packet& packet, PlayerID playerID);
     void parseDisconnect();
-    void parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint);
+    void parseMessageType(Packet& packet);
-    bool shouldSendToClient(EntityWrapper childEntity);
+    void parseOnInputCommand(Packet& packet);
+    void parseOnPlayerDamage(Packet& packet);
+    void parsePing();
 
+    PlayerID GetPlayerIDFromEndpoint(boost::asio::ip::udp::endpoint endpoint);
     // Debug event
     EventRelay<Server, Events::InputCommand> m_EInputCommand;
     bool OnInputCommand(const Events::InputCommand& e);
@@ -97,8 +88,7 @@ private:
     bool OnEntityDeleted(const Events::EntityDeleted& e);
     EventRelay<Server, Events::ComponentDeleted> m_EComponentDeleted;
     bool OnComponentDeleted(const Events::ComponentDeleted& e);
-    EventRelay<Server, Events::PlayerDamage> m_EPlayerDamage;
+    void parsePlayerTransform(Packet& packet);
-    bool OnPlayerDamage(const Events::PlayerDamage& e);
 };
 
 #endif

include/Engine/Network/SnapshotFilter.h

@@ -1,19 +0,0 @@
-#ifndef SnapshotFilter_h__
-#define SnapshotFilter_h__
-
-#include "../Core/EntityWrapper.h"
-#include "../Core/ComponentWrapper.h"
-
-class SnapshotFilter
-{
-public:
-    // Filters an incoming snapshot. 
-    // Modify the component and return true if the component snapshot should be applied. 
-    // Otherwise return false and it will be ignored.
-    virtual bool FilterComponent(EntityWrapper entity, SharedComponentWrapper& component) 
-    {
-        return true;
-    }
-};
-
-#endif

include/Engine/Network/TCPClient.h

@@ -1,28 +0,0 @@
-#ifndef TCPClient_h__
-#define TCPClient_h__
-
-#include <boost/asio.hpp>
-#include "NetworkClient.h"
-
-class TCPClient : public NetworkClient
-{
-public:
-    TCPClient();
-    ~TCPClient();
-
-    void Connect(std::string playerName, std::string address, int port);
-    void Disconnect();
-    void Receive(Packet& packet);
-    void Send(Packet & packet);
-    bool IsSocketAvailable();
-private:
-    // Assio TCP logic
-    boost::asio::ip::tcp::endpoint m_Endpoint;
-    boost::asio::io_service m_IOService;
-    std::unique_ptr<boost::asio::ip::tcp::socket> m_Socket;
-    size_t readBuffer();
-    PacketID m_SendPacketID = 0;
-    bool m_IsConnected = false;
-};
-
-#endif

include/Engine/Network/TCPServer.h

@@ -1,37 +0,0 @@
-#ifndef TCPServer_h__
-#define TCPServer_h__
-
-#include <boost/asio.hpp>
-#include <boost/bind.hpp>
-#include <map>
-#include "NetworkServer.h"
-
-class TCPServer : public NetworkServer
-{
-public:
-    TCPServer();
-    ~TCPServer();
-    void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers);
-    void Receive(Packet & packet, PlayerDefinition & playerDefinition);
-    void Send(Packet & packet, PlayerDefinition & playerDefinition);
-    void Send(Packet & packet);
-    void Disconnect();
-    int Port() { return m_Port; }
-    std::string Address() { return m_Address; }
-
-private:
-    // TCP logic
-    boost::asio::io_service m_IOService;
-    std::unique_ptr<boost::asio::ip::tcp::acceptor> acceptor;
-    boost::shared_ptr<boost::asio::ip::tcp::socket> lastReceivedSocket;
-
-    int readBuffer(PlayerDefinition& playerDefinition);
-    PlayerID getPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
-        boost::asio::ip::address address, unsigned short port);
-    int GetPort();
-    std::string GetAddress();
-    int m_Port = 0;
-    std::string m_Address = "";
-};
-
-#endif

include/Engine/Network/UDPClient.h

@@ -1,28 +0,0 @@
-#ifndef UDPClient_h__
-#define UDPClient_h__
-
-#include <boost/asio.hpp>
-#include "Network/NetworkClient.h"
-
-class UDPClient : public NetworkClient
-{
-public:
-    UDPClient();
-    ~UDPClient();
-
-    void Connect(std::string playerName, std::string address, int port);
-    void Disconnect();
-    void Receive(Packet& packet);
-    void Send(Packet & packet);
-    void Broadcast(Packet& packet, int port);
-    bool IsSocketAvailable();
-private:
-    // Assio UDP logic
-    boost::asio::io_service m_IOService;
-    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
-    boost::shared_ptr<boost::asio::ip::udp::socket> m_Socket;
-    int readBuffer();
-    PacketID m_SendPacketID = 0;
-};
-
-#endif

include/Engine/Network/UDPServer.h

@@ -1,28 +0,0 @@
-#ifndef UDPServer_h__
-#define UDPServer_h__
-
-#include "NetworkServer.h"
-#include <boost/asio/ip/udp.hpp>
-
-class UDPServer : public NetworkServer
-{
-public:
-    UDPServer();
-    UDPServer(int port);
-    ~UDPServer();
-    void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers);
-    void Receive(Packet & packet, PlayerDefinition & playerDefinition);
-    void Send(Packet & packet, PlayerDefinition & playerDefinition);
-    void Send(Packet & packet); 
-    void Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint);
-    void Broadcast(Packet & packet, int port);
-    bool IsSocketAvailable();
-private:
-    // UDP logic
-    boost::asio::io_service m_IOService;
-    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
-    std::unique_ptr<boost::asio::ip::udp::socket> m_Socket;
-    int readBuffer();
-};
-
-#endif

include/Engine/Rendering/AnimationSystem.h

@@ -1,29 +0,0 @@
-#ifndef AnimationSystem_h__
-#define AnimationSystem_h__
-
-#include "GLM.h"
-
-#include "Common.h"
-#include "Core/System.h"
-#include "Core/ResourceManager.h"
-#include "Rendering/Model.h"
-#include "Rendering/EAnimationComplete.h"
-#include "Rendering/Skeleton.h"
-#include <imgui/imgui.h>
-
-class AnimationSystem : public PureSystem
-{
-public:
-    AnimationSystem(SystemParams params)
-        : System(params)
-        , PureSystem("Animation")
-    {
-
-    }
-    ~AnimationSystem() { }
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& animationComponent, double dt) override;
-private:
-
-};
-
-#endif

include/Engine/Rendering/BoneAttachmentSystem.h

@@ -1,29 +0,0 @@
-#ifndef BoneAttachmentSystem_h__
-#define BoneAttachmentSystem_h__
-
-#include "GLM.h"
-
-#include "Common.h"
-#include "Core/System.h"
-#include "Core/ResourceManager.h"
-#include "Rendering/Model.h"
-#include "Rendering/Skeleton.h"
-
-//Needs to be a higher orderlevel than AnimationSystem
-class BoneAttachmentSystem : public PureSystem
-{
-public:
-    BoneAttachmentSystem(SystemParams params)
-        : System(params)
-        , PureSystem("BoneAttachment")
-    {
-
-    }
-    ~BoneAttachmentSystem() { }
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& BoneAttachmentComponent, double dt) override;
-private:
-
-
-};
-
-#endif

include/Engine/Rendering/Camera.h

@@ -33,8 +33,6 @@ public:
 	glm::mat4 ViewMatrix() const { return m_ViewMatrix; }
     void SetViewMatrix(glm::mat4 val);
 
-    glm::mat4 BillboardMatrix();
-
 	float AspectRatio() const { return m_AspectRatio; }
 	void SetAspectRatio(float val);
 

include/Engine/Rendering/CubeMapPass.h

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

include/Engine/Rendering/DrawBloomPass.h

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

include/Engine/Rendering/DrawColorCorrectionPass.h

@@ -7,7 +7,6 @@
 #include "ShaderProgram.h"
 //#include "Util/UnorderedMapVec2.h"
 #include "Texture.h"
-#include "imgui/imgui.h"
 
 class DrawColorCorrectionPass
 {
@@ -17,13 +16,14 @@ public:
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
 
-    void Draw(GLuint sceneTexture, GLuint bloomTexture, GLuint sceneTextureLowRes, GLuint bloomTextureLowRes, GLfloat gamma, GLfloat exposure);
+    void Draw(GLuint sceneTexture, GLuint bloomTexture);
 private:
     const IRenderer* m_Renderer;
 
     ShaderProgram* m_ColorCorrectionProgram;
 
     Model* m_ScreenQuad;
+    GLfloat m_Exposure;
 };
 
 #endif 

include/Engine/Rendering/DrawFinalPass.h

@@ -4,95 +4,45 @@
 #include "IRenderer.h"
 #include "DrawFinalPassState.h"
 #include "LightCullingPass.h"
-#include "CubeMapPass.h"
-#include "SSAOPass.h"
 #include "FrameBuffer.h"
 #include "ShaderProgram.h"
 #include "Util/UnorderedMapVec2.h"
-#include "Util/CommonFunctions.h"
 #include "Texture.h"
 
 class DrawFinalPass
 {
 public:
-    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass, GLuint* depthBuffer);
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass);
     ~DrawFinalPass() { }
     void InitializeTextures();
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
     void Draw(RenderScene& scene);
     void ClearBuffer();
-    void OnWindowResize();
 
     //Return the texture that is used in later stages to apply the bloom effect
     GLuint BloomTexture() const { return m_BloomTexture; }
-    GLuint BloomTextureLowRes() const { return m_BloomTextureLowRes; }
     //Return the texture with diffuse and lighting of the scene.
     GLuint SceneTexture() const { return m_SceneTexture; }
-    GLuint SceneTextureLowRes() const { return m_SceneTextureLowRes; }
-    //Return the framebuffer used in the scene rendering stage.
     FrameBuffer* FinalPassFrameBuffer() { return &m_FinalPassFrameBuffer; }
-    FrameBuffer* FinalPassFrameBufferLowRes() { return &m_FinalPassFrameBufferLowRes; }
+
 
 private:
-    void DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, RenderScene& scene);
+    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
-    void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
+    void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps) const;
-    void DrawShieldToStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
-    void DrawShieldedModelRenderQueue(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
-    void DrawToDepthBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
-
-	void MergeLayers();
-
-    void BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job, RenderScene& scene);
-    void BindModelUniforms(GLuint shaderHandle, std::shared_ptr<ModelJob>& job, RenderScene& scene);
-
-    void BindExplosionTextures(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job);
-    void BindModelTextures(GLuint shaderHandle, std::shared_ptr<ModelJob>& job);
 
     Texture* m_WhiteTexture;
     Texture* m_BlackTexture;
-    Texture* m_NeutralNormalTexture;
-    Texture* m_GreyTexture;
-    Texture* m_ErrorTexture;
 
-	Model* m_ScreenQuad;
-
-	FrameBuffer m_MergeFrameBuffer;
     FrameBuffer m_FinalPassFrameBuffer;
-    FrameBuffer m_FinalPassFrameBufferLowRes;
     GLuint m_BloomTexture;
     GLuint m_SceneTexture;
-    GLuint m_BloomTextureLowRes;
+    GLuint m_DepthBuffer;
-    GLuint m_SceneTextureLowRes;
-    GLuint* m_DepthBuffer;
-    GLuint m_DepthBufferLowRes;
-    GLuint m_CubeMapTexture;
-
-    //maqke this component based i guess?
-    GLuint m_ShieldPixelRate = 16;
 
     const IRenderer* m_Renderer;
     const LightCullingPass* m_LightCullingPass;
-    const CubeMapPass* m_CubeMapPass;
-	const SSAOPass* m_SSAOPass;
-
-	ShaderProgram* m_MergeProgram;
 
     ShaderProgram* m_ForwardPlusProgram;
-    ShaderProgram* m_ExplosionEffectProgram;
-	ShaderProgram* m_ExplosionEffectSplatMapProgram;
-    ShaderProgram* m_SpriteProgram;
-	ShaderProgram* m_ForwardPlusSplatMapProgram;
-    ShaderProgram* m_ShieldToStencilProgram;
-    ShaderProgram* m_FillDepthBufferProgram;
-
-
-	ShaderProgram* m_ForwardPlusSkinnedProgram;
-	ShaderProgram* m_ExplosionEffectSkinnedProgram;
-	ShaderProgram* m_ExplosionEffectSplatMapSkinnedProgram;
-	ShaderProgram* m_ForwardPlusSplatMapSkinnedProgram;
-    ShaderProgram* m_ShieldToStencilSkinnedProgram;
-    ShaderProgram* m_FillDepthBufferSkinnedProgram;
 };
 
 #endif 

include/Engine/Rendering/DrawFinalPassState.h

@@ -12,11 +12,4 @@ private:
 
 };
 
-class DrawStencilState : public RenderState
-{
-public:
-    DrawStencilState(GLuint frameBuffer);
-    ~DrawStencilState();
-};
-
 #endif

include/Engine/Rendering/EAnimationComplete.h

@@ -1,18 +0,0 @@
-#ifndef Events_AnimationComplete_h__
-#define Events_AnimationComplete_h__
-
-#include "../Core/EventBroker.h"
-#include "../Core/EntityWrapper.h"
-
-namespace Events
-{
-
-struct AnimationComplete : Event
-{
-    EntityWrapper Entity;
-    std::string Name;
-};
-
-}
-
-#endif

include/Engine/Rendering/ExplosionEffectJob.h

@@ -1,106 +0,0 @@
-#ifndef ExplosionEffectJob_h__
-#define ExplosionEffectJob_h__
-
-#include <cstdint>
-
-#include "../Common.h"
-#include "../GLM.h"
-#include "../Core/ComponentWrapper.h"
-#include "Texture.h"
-#include "Model.h"
-#include "RenderJob.h"
-#include "../Core/ResourceManager.h"
-#include "Camera.h"
-#include "../Core/World.h"
-
-struct ExplosionEffectJob : ModelJob
-{
-    ExplosionEffectJob(ComponentWrapper explosionEffectComponent, ::Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matGroup, ComponentWrapper modelComponent, ::World* world, glm::vec4 fillColor, float fillPercentage)
-        : ModelJob(model, camera, matrix, matGroup, modelComponent, world, fillColor, fillPercentage)
-    {
-        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"];
-    };
-
-    glm::vec3 ExplosionOrigin;
-    double TimeSinceDeath = 0.f; //Seconds
-    double ExplosionDuration = 2.f;
-    //bool Gravity = true;
-    //double GravityForce = 1.f; // Speed
-    //double ObjectRadius = 2.f; // TODO: Change this for object radius when it's available
-    glm::vec4 EndColor;
-    bool Randomness = false;
-    
-    float RandomnessScalar = 1.f;
-    glm::vec2 Velocity;
-    bool ColorByDistance = false;
-    //bool ReverseAnimation = false;
-    //bool Wireframe = false;
-    bool ExponentialAccelaration = false;
-
-    std::array<float, 50> RandomNumbers = {
-        0.3257552917701f,
-        0.07601508315467f,
-        0.57408909014151f,
-        0.0f,
-        0.8618231368539f,
-        0.074957156588769f,
-        0.39413607511396f,
-        0.54579346698979f,
-        0.83222648353885f,
-        0.83635707285086f,
-        0.34473986148124f,
-        0.98092448710507f,
-        0.46346380070944f,
-        0.7308761201477f,
-        0.70832470371776f,
-        0.28268750909841f,
-        0.26291620883295f,
-        0.07685032816457f,
-        0.30760929515008f,
-        0.2781575388639f   ,
-        0.016950582161988f  ,
-        0.25787915254844f   ,
-        0.76293767279151f   ,
-        0.67730279903733f   ,
-        0.49042877018937f   ,
-        0.13002237823327f   ,
-        0.62803373841012f   ,
-        0.94525353747665f   ,
-        0.32893980076953f   ,
-        0.95952951719962f   ,
-        0.056386206790985f  ,
-        0.012030893476694f  ,
-        0.93090049220757f,
-        0.83579883064879f,
-        0.79733513938139f,
-        0.8796381046435f    ,
-        0.94160434600972f   ,
-        0.76901855588379f   ,
-        0.50253688101775f   ,
-        0.82457069578793f   ,
-        0.80157403359263f   ,
-        0.87291810189975f   ,
-        0.64679548919517f   ,
-        0.42664138899494f   ,
-        0.77171308303797f   ,
-        0.75567959237643f   ,
-        0.45190826265696f   ,
-        0.59844922628181f   ,
-        0.56534937655802f   ,
-        0.195656257307f};
-
-    void CalculateHash() override
-    {
-        Hash = 0;
-    }
-};
-
-#endif

include/Engine/Rendering/IRenderer.h

@@ -5,13 +5,11 @@
 #include "../OpenGL.h"
 #include "../GLM.h"
 #include "../Core/Util/Rectangle.h"
-#include "../Core/ConfigFile.h"
 #include "Util/ScreenCoords.h"
 #include "Camera.h"
 #include "RenderQueue.h"
 #include "Model.h"
 #include "../Core/World.h" //So temp
-#include "Util/CommonFunctions.h"
 
 
 struct PickData
@@ -27,31 +25,26 @@ class IRenderer
 {
 public:
 	GLFWwindow* Window() const { return m_Window; }
-    //Returns screen size including window border and header
 	Rectangle Resolution() const { return m_Resolution; }
-	virtual void SetResolution(const Rectangle& resolution) { m_Resolution = resolution; }
+	void SetResolution(const Rectangle& resolution) { m_Resolution = resolution; }
 	bool Fullscreen() { return m_Fullscreen; }
-	virtual void SetFullscreen(bool fullscreen) { m_Fullscreen = fullscreen; }
+	void SetFullscreen(bool fullscreen) { m_Fullscreen = fullscreen; }
 	bool VSYNC() const { return m_VSYNC; }
-	virtual void SetVSYNC(bool vsync) { m_VSYNC = vsync; }
+	void SetVSYNC(bool vsync) { m_VSYNC = vsync; }
-    std::string WindowTitle() const { return m_WindowTitle; }
-    virtual void SetWindowTitle(const std::string& title) { glfwSetWindowTitle(m_Window, title.c_str()); m_WindowTitle = title; }
-    //Returns screen size excluding window border and header
-    Rectangle GetViewportSize() const { return m_ViewportSize; }
 	virtual void Initialize() = 0;
 	virtual void Update(double dt) = 0;
 	virtual void Draw(RenderFrame& rq) = 0;
     virtual PickData Pick(glm::vec2 screenCord) = 0;
 
+    World* m_World; //Temp world, untill viktor merge.
+
 protected:
 	Rectangle m_Resolution = Rectangle::Rectangle(1280, 720);
-    Rectangle m_ViewportSize = Rectangle::Rectangle(1280, 720);
 	bool m_Fullscreen = false;
 	bool m_VSYNC = false;
 	int m_GLVersion[2];
 	std::string m_GLVendor;
 	GLFWwindow* m_Window = nullptr;
-    std::string m_WindowTitle;
 };
 
 #endif // Renderer_h__

include/Engine/Rendering/LightCullingPass.h

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

include/Engine/Rendering/Model.h

@@ -2,10 +2,8 @@
 #define Model_h__
 
 #include "Rendering/RawModelCustom.h"
-#include "Util/CommonFunctions.h"
 //#include "Rendering/RawModelAssimp.h"
 #include "../OpenGL.h"
-#include "Core/AABB.h"
 
 class Model : public ThreadUnsafeResource
 {
@@ -16,19 +14,16 @@ private:
 
 public:
 	~Model();
-    const std::vector<RawModel::MaterialProperties>& MaterialGroups() const { return m_RawModel->m_Materials; }
+    const std::vector<RawModel::MaterialGroup>& MaterialGroups() const { return m_RawModel->MaterialGroups; }
     const glm::mat4& Matrix() const { return m_RawModel->m_Matrix; }
-    const RawModel::Vertex* Vertices() const { return m_RawModel->Vertices(); }
+    const std::vector<RawModel::Vertex>& Vertices() const { return m_RawModel->m_Vertices; }
-	unsigned int NumberOfVertices() const { return m_RawModel->NumVertices(); }
+
-    const AABB& Box() const { return m_Box; }
-	bool IsSkinned() const { return m_RawModel->IsSkinned(); }
 	GLuint VAO;
 	GLuint ElementBuffer;
     RawModel* m_RawModel;
 
 private:
-    AABB m_Box;
+    
-
 	GLuint VertexBuffer;
 	GLuint NormalBuffer;
 	GLuint TangentNormalsBuffer;

include/Engine/Rendering/ModelJob.h

@@ -13,165 +13,44 @@
 #include "Camera.h"
 #include "../Core/World.h"
 #include "../Core/Transform.h"
-#include "Skeleton.h"
-#include "ShaderProgram.h"
 
 struct ModelJob : RenderJob
 {
-    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matProp, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage)
+    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialGroup matGroup, ComponentWrapper modelComponent, World* world)
         : RenderJob()
     {
         Model = model;
-		ModelID = model->ResourceID;
+        TextureID = (matGroup.Texture) ? matGroup.Texture->ResourceID : 0;
-		Type = matProp.type;
+        DiffuseTexture = matGroup.Texture.get();
-		::RawModel::MaterialBasic* matGroup = matProp.material;
+        NormalTexture = matGroup.NormalMap.get();
-		switch(matProp.type){
+        SpecularTexture = matGroup.SpecularMap.get();
-		case ::RawModel::MaterialType::Basic:
+        IncandescenceTexture = matGroup.IncandescenceMap.get();
-			if (Model->IsSkinned()) {
+        DiffuseColor = matGroup.DiffuseColor;
-				ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSkinnedProgram")->ResourceID;
+        SpecularColor = matGroup.SpecularColor;
-			}
+        IncandescenceColor = matGroup.IncandescenceColor;
-			else {
+        StartIndex = matGroup.StartIndex;
-				ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusProgram")->ResourceID;
+        EndIndex = matGroup.EndIndex;
-			}
-			TextureID = 0;
-			break;
-		case ::RawModel::MaterialType::SingleTextures:
-			{
-				if (Model->IsSkinned()) {
-					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSkinnedProgram")->ResourceID;
-				}
-				else {
-					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusProgram")->ResourceID;
-				}
-				::RawModel::MaterialSingleTextures* singleTextures = static_cast<::RawModel::MaterialSingleTextures*>(matProp.material);
-				TextureID = (singleTextures->ColorMap.Texture) ? singleTextures->ColorMap.Texture->ResourceID : 0;
-				if (modelComponent["DiffuseTexture"]) {
-					DiffuseTexture.push_back(&singleTextures->ColorMap);
-				}
-
-				if (modelComponent["NormalMap"]) {
-					NormalTexture.push_back(&singleTextures->NormalMap);
-				}
-
-				if (modelComponent["SpecularMap"]) {
-					SpecularTexture.push_back(&singleTextures->SpecularMap);
-				}
-
-				if (modelComponent["GlowMap"]) {
-					IncandescenceTexture.push_back(&singleTextures->IncandescenceMap);
-				}
-			}
-			break;
-		case ::RawModel::MaterialType::SplatMapping:
-			{
-				if (Model->IsSkinned()) {
-					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSplatMapSkinnedProgram")->ResourceID;
-				}
-				else {
-					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSplatMapProgram")->ResourceID;
-				}
-				::RawModel::MaterialSplatMapping* SplatTextures = static_cast<::RawModel::MaterialSplatMapping*>(matProp.material);
-
-				SplatMap = &SplatTextures->SplatMap;
-
-				TextureID = (SplatTextures->ColorMaps[0].Texture) ? SplatTextures->ColorMaps[0].Texture->ResourceID : 0;
-				if (modelComponent["DiffuseTexture"]) {
-					for (auto& texture : SplatTextures->ColorMaps) {
-						DiffuseTexture.push_back(&texture);
-					}
-				}
-
-				if (modelComponent["NormalMap"]) {
-					for (auto& texture : SplatTextures->NormalMaps) {
-						NormalTexture.push_back(&texture);
-					}
-				}
-
-				if (modelComponent["SpecularMap"]) {
-					for (auto& texture : SplatTextures->SpecularMaps) {
-						SpecularTexture.push_back(&texture);
-					}
-				}
-
-				if (modelComponent["GlowMap"]) {
-					for (auto& texture : SplatTextures->IncandescenceMaps) {
-						IncandescenceTexture.push_back(&texture);
-					}
-				}
-			}
-			break;
-		}
-        DiffuseColor = matGroup->DiffuseColor;
-        SpecularColor = matGroup->SpecularColor;
-        IncandescenceColor = matGroup->IncandescenceColor;
-        StartIndex = matGroup->StartIndex;
-        EndIndex = matGroup->EndIndex;
         Matrix = matrix;
         Color = modelComponent["Color"];
-        GlowIntensity = ((double)modelComponent["GlowIntensity"]);
         Entity = modelComponent.EntityID;
         glm::vec3 abspos = Transform::AbsolutePosition(world, modelComponent.EntityID);
         glm::vec3 worldpos = glm::vec3(camera->ViewMatrix() * glm::vec4(abspos, 1));
         Depth = worldpos.z;
         World = world;
-
-        FillColor = fillColor;
-        FillPercentage = fillPercentage;
-
-
-        if (model->IsSkinned()) {
-            Skeleton = Model->m_RawModel->m_Skeleton;
-
-            if (Skeleton != nullptr) {
-                if (world->HasComponent(Entity, "Animation")) {
-                    auto animationComponent = world->GetComponent(Entity, "Animation");
-
-                    for (int i = 1; i <= 3; i++) {
-                        ::Skeleton::AnimationData animationData;
-                        animationData.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationComponent["AnimationName" + std::to_string(i)]);
-                        if (animationData.animation == nullptr) {
-                            continue;
-                        }
-                        animationData.time = (double)animationComponent["Time" + std::to_string(i)];
-                        animationData.weight = (double)animationComponent["Weight" + std::to_string(i)];
-
-                        Animations.push_back(animationData);
-                    }
-                }
-
-                if (world->HasComponent(Entity, "AnimationOffset")) {
-                    auto animationOffsetComponent = world->GetComponent(Entity, "AnimationOffset");
-                    AnimationOffset.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationOffsetComponent["AnimationName"]);
-                    AnimationOffset.time = (double)animationOffsetComponent["Time"];
-                } else {
-                    AnimationOffset.animation = nullptr;
-                }
-            }
-        }
-            
     };
 
     unsigned int TextureID;
     unsigned int ShaderID;
-	unsigned int ModelID;
 
-	::RawModel::MaterialType Type;
     EntityID Entity;
     glm::mat4 Matrix;
-	const ::RawModel::TextureProperties* SplatMap;
+    const Texture* DiffuseTexture;
-    std::vector<const ::RawModel::TextureProperties*> DiffuseTexture;
+    const Texture* NormalTexture;
-	std::vector<const ::RawModel::TextureProperties*> NormalTexture;
+    const Texture* SpecularTexture;
-	std::vector<const ::RawModel::TextureProperties*> SpecularTexture;
+    const Texture* IncandescenceTexture;
-	std::vector<const ::RawModel::TextureProperties*> IncandescenceTexture;
     float Shininess = 0.f;
     glm::vec4 Color;
     const ::Model* Model = nullptr;
-    ::Skeleton* Skeleton = nullptr;
-    std::vector<::Skeleton::AnimationData> Animations;
-    ::Skeleton::AnimationOffset AnimationOffset;
-    
-
-    float GlowIntensity = 8.0;
     glm::vec4 DiffuseColor;
     glm::vec4 SpecularColor;
     glm::vec4 IncandescenceColor;
@@ -179,12 +58,9 @@ struct ModelJob : RenderJob
     unsigned int EndIndex = 0;
     World* World;
 
-    glm::vec4 FillColor = glm::vec4(0);
-    float FillPercentage = 0.0;
-
     void CalculateHash() override
     {
-        Hash = ShaderID << 20 + ModelID << 10 + TextureID;
+        Hash = TextureID;
     }
 };
 

include/Engine/Rendering/PNG.h

@@ -6,10 +6,9 @@
 #include <png.h>
 
 #include "../Common.h"
-#include "../Core/ResourceManager.h"
 #include "Image.h"
 
-class PNG : public Image, public Resource
+class PNG : public Image
 {
 public:
 	PNG(std::string path);

include/Engine/Rendering/PickingPass.h

@@ -1,6 +1,8 @@
 #ifndef PickingPass_h__
 #define PickingPass_h__
 
+
+
 #include "IRenderer.h"
 #include "PickingPassState.h"
 #include "FrameBuffer.h"
@@ -8,7 +10,8 @@
 #include "Util/UnorderedMapiVec2.h"
 #include "../Core/EventBroker.h"
 #include "../Core/World.h"
-#include "Rendering/Skeleton.h"
+
+
 
 class PickingPass
 {
@@ -22,25 +25,24 @@ public:
     void Draw(RenderScene& scene);
     void ClearPicking();
 
-    void OnWindowResize();
-
     //Getters
     const ShaderProgram& PickingProgram() const { return *m_PickingProgram; }
     //const std::unordered_map<glm::ivec2, EntityID>& PickingColorsToEntity() const { return m_PickingColorsToEntity; }
     GLuint PickingTexture() const { return m_PickingTexture; }
-    GLuint* DepthBuffer() { return &m_DepthBuffer; }
+    GLuint DepthBuffer() const { return m_DepthBuffer; }
     const FrameBuffer& PickingBuffer() const { return m_PickingBuffer; }
 
     
     PickData Pick(glm::vec2 screenCoord);
 
 private:
+    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
+
     EventBroker* m_EventBroker;
 
     const IRenderer* m_Renderer;
 
     ShaderProgram* m_PickingProgram;
-    ShaderProgram* m_PickingSkinnedProgram;
     Camera* m_Camera;
 
     struct PickingInfo

include/Engine/Rendering/RawModelCustom.h

@@ -33,27 +33,18 @@ protected:
 public:
     ~RawModelCustom();
     
-	struct Vertex
+    struct Vertex
-	{
+    {
-		glm::vec3 Position;
+        glm::vec3 Position;
-		glm::vec3 Normal;
+        glm::vec3 Normal;
-		glm::vec3 Tangent;
+        glm::vec3 Tangent;
-		glm::vec3 BiNormal;
+        glm::vec3 BiNormal;
-		glm::vec2 TextureCoords;
+        glm::vec2 TextureCoords;
-	};
-
-    struct SkinedVertex : public Vertex {
         glm::vec4 BoneIndices;
         glm::vec4 BoneWeights;
     };
 
-	struct TextureProperties {
+    struct MaterialGroup
-		std::string TexturePath;
-		glm::vec2 UVRepeat;
-		Texture* Texture;	
-	};
-	
-    struct MaterialBasic
     {
         float SpecularExponent;
         float ReflectionFactor;
@@ -63,90 +54,42 @@ public:
         unsigned int StartIndex;
         unsigned int EndIndex;
         //float Transparency;
+        std::string TexturePath;
+        std::shared_ptr<::Texture> Texture;
+        std::string NormalMapPath;
+        std::shared_ptr<::Texture> NormalMap;
+        std::string SpecularMapPath;
+        std::shared_ptr<::Texture> SpecularMap;
+        std::string IncandescenceMapPath;
+        std::shared_ptr<::Texture> IncandescenceMap;
     };
 
-	struct MaterialSplatMapping : public MaterialBasic
+    std::vector<MaterialGroup> MaterialGroups;
-	{
-		TextureProperties SplatMap;
-		std::vector<TextureProperties> ColorMaps;
-		std::vector<TextureProperties> NormalMaps;
-		std::vector<TextureProperties> SpecularMaps;
-		std::vector<TextureProperties> IncandescenceMaps;
-	};
-
-	struct MaterialSingleTextures : public MaterialBasic
-	{
-		TextureProperties ColorMap;
-		TextureProperties NormalMap;
-		TextureProperties SpecularMap;
-		TextureProperties IncandescenceMap;
-	};
-
-	enum class MaterialType { Basic = 1, SplatMapping, SingleTextures };
-
-	struct MaterialProperties {
-		MaterialType type;
-		MaterialBasic* material;
-	};
-
-	const Vertex*	Vertices() const {
-		if (hasSkin) { 
-			return m_SkinedVertices.data(); 
-		} else {
-			return m_Vertices.data();
-		}
-	};
-
-	unsigned int	VertexSize() const {
-		if (hasSkin) {
-			return sizeof(SkinedVertex);
-		}
-		else {
-			return sizeof(Vertex);
-		}
-	};
-
-	unsigned int	NumVertices() const {
-		if (hasSkin) {
-			return m_SkinedVertices.size();
-		} else {
-			return m_Vertices.size();
-		}
-	};
-
-	bool IsSkinned() const { return hasSkin; };
-
-	std::vector<MaterialProperties> m_Materials;
 
+    std::vector<Vertex> m_Vertices;
     std::vector<unsigned int> m_Indices;
     Skeleton* m_Skeleton = nullptr;
     glm::mat4 m_Matrix;
 
 private:
-   	bool hasSkin;
+   
-	std::vector<Vertex> m_Vertices;
-	std::vector<SkinedVertex> m_SkinedVertices;
 
     void ReadMeshFile(std::string filePath);
-    void ReadMeshFileHeader(std::size_t& offset, char* fileData);
+    void ReadMeshFileHeader(unsigned int& offset, char* fileData, unsigned int& fileByteSize);
-    void ReadMesh(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
+    void ReadMesh(unsigned int& offset, char* fileData, unsigned int& fileByteSize);
-    void ReadVertices(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
+    void ReadVertices(unsigned int& offset, char* fileData, unsigned int& fileByteSize);
-    void ReadIndices(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
+    void ReadIndices(unsigned int& offset, char* fileData, unsigned int& fileByteSize);
 
     void ReadMaterialFile(std::string filePath);
-    void ReadMaterials(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
+    void ReadMaterials(unsigned int &offset, char* fileData, unsigned int& fileByteSize);
-    void ReadMaterialSingle(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
+    void ReadMaterialSingle(unsigned int &offset, char* fileData, unsigned int& fileByteSize);
-	void ReadMaterialBasic(MaterialBasic* Material, std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
-	void ReadMaterialSingleTexture(MaterialSingleTextures* Material, std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
-	void ReadMaterialSplatMapping(MaterialSplatMapping* Material, std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
-	void ReadMaterialTextureProperties(TextureProperties& texture, std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
 
     void ReadAnimationFile(std::string filePath);
-    void ReadAnimationBindPoses(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
+    void ReadAnimationBindPoses(unsigned int &offset, char* fileData, unsigned int& fileByteSize);
-    void ReadAnimationJoint(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
+    void ReadAnimationJoint(unsigned int &offset, char* fileData, unsigned int& fileByteSize);
-    void ReadAnimationClips(std::size_t& offset, char* fileData, const unsigned int& fileByteSize, unsigned int numberOfClips);
+    void ReadAnimationClips(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int numberOfClips);
-    void ReadAnimationClipSingle(std::size_t& offset, char* fileData, const unsigned int& fileByteSize, unsigned int clipIndex);
+    void ReadAnimationClipSingle(unsigned int &offset, char* fileData, 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 ReadAnimationKeyFrame(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int numberOfJoints, Skeleton::Animation& animation);
     
     //void CreateSkeleton(std::vector<std::tuple<std::string, glm::mat4>> &boneInfo, std::map<std::string, int> &boneNameMapping, aiNode* node, int parentID);
 };

include/Engine/Rendering/RenderQueue.h

@@ -14,46 +14,29 @@
 #include "TextJob.h"
 #include "PointLightJob.h"
 #include "DirectionalLightJob.h"
-#include "ExplosionEffectJob.h"
-#include "SpriteJob.h"
 
 struct RenderScene
 {
     ::Camera* Camera = nullptr;
-    struct Queues {
+    std::list<std::shared_ptr<RenderJob>> ForwardJobs;
-        std::list<std::shared_ptr<RenderJob>> OpaqueObjects;
+    std::list<std::shared_ptr<RenderJob>> PointLightJobs;
-        std::list<std::shared_ptr<RenderJob>> TransparentObjects;
+    std::list<std::shared_ptr<RenderJob>> TextJobs;
-        std::list<std::shared_ptr<RenderJob>> OpaqueShieldedObjects;
+    std::list<std::shared_ptr<RenderJob>> DirectionalLightJobs;
-        std::list<std::shared_ptr<RenderJob>> TransparentShieldedObjects;
-        std::list<std::shared_ptr<RenderJob>> ShieldObjects;
-        std::list<std::shared_ptr<RenderJob>> SpriteJob;
-        std::list<std::shared_ptr<RenderJob>> PointLight;
-        std::list<std::shared_ptr<RenderJob>> Text;
-        std::list<std::shared_ptr<RenderJob>> DirectionalLight;
-    } Jobs;
-
     Rectangle Viewport;
     bool ClearDepth = false;
-    glm::vec4 AmbientColor;
 
 	void Clear()
 	{
-        Jobs.OpaqueObjects.clear();
+        ForwardJobs.clear();
-        Jobs.TransparentObjects.clear();
+        PointLightJobs.clear();
-        Jobs.OpaqueShieldedObjects.clear();
+        TextJobs.clear();
-        Jobs.TransparentShieldedObjects.clear();
+        DirectionalLightJobs.clear();
-        Jobs.ShieldObjects.clear();
-        Jobs.SpriteJob.clear();
-        Jobs.DirectionalLight.clear();
 	}
 };
 
 struct RenderFrame
 {
 public:
-    //TODO: Getters
-    GLfloat Gamma = 2.2f;
-    GLfloat Exposure = 1.f;
 
     void Add(RenderScene &scene)
     {

include/Engine/Rendering/RenderState.h

@@ -2,7 +2,6 @@
 #define RenderState_h__
 
 #include <functional>
-#include <boost/range/adaptor/reversed.hpp>
 #include "../Common.h"
 #include "../OpenGL.h"
 #include "../GLM.h"
@@ -20,12 +19,7 @@ public:
     bool BindFramebuffer(GLint framebuffer);
     bool BlendEquation(GLenum mode);
     bool BlendFunc(GLenum sfactor, GLenum dfactor);
-    bool StencilOp(GLenum sfail, GLenum dpfail, GLenum dppass);
-    bool StencilFunc(GLenum func, GLint ref, GLuint mask);
-    bool StencilMask(GLuint mask);
     bool DepthMask(GLboolean flag);
-	bool DepthFunc(GLenum func);
-	bool AlphaFunc(GLenum func, GLclampf thresholder);
 
 private:
     std::vector<std::function<void(void)>> m_ResetFunctions;

include/Engine/Rendering/RenderSystem.h

@@ -16,14 +16,11 @@
 #include "PointLightJob.h"
 #include "../Core/Transform.h"
 #include "../Core/EPlayerSpawned.h"
-#include "../Core/Octree.h"
-#include "../Collision/EntityAABB.h"
-#include "../Core/ConfigFile.h"
 
 class RenderSystem : public ImpureSystem
 {
 public:
-    RenderSystem(SystemParams params, const IRenderer* renderer, RenderFrame* renderFrame, Octree<EntityAABB>* frustumCullOctree);
+    RenderSystem(World* world, EventBroker* eventBrokerer, const IRenderer* renderer, RenderFrame* renderFrame);
     ~RenderSystem();
 
     virtual void Update(double dt) override;
@@ -34,26 +31,20 @@ private:
     Camera* m_Camera;
     EntityWrapper m_CurrentCamera = EntityWrapper::Invalid;
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
-    Octree<EntityAABB>* m_Octree;
 
     EventRelay<RenderSystem, Events::SetCamera> m_ESetCamera;
     bool OnSetCamera(Events::SetCamera &event);
-    EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;
-    bool OnInputCommand(const Events::InputCommand& e);
-    EventRelay<RenderSystem, Events::PlayerSpawned> m_EPlayerSpawned;
-    bool OnPlayerSpawned(Events::PlayerSpawned& e);
-
-    void fillModels(RenderScene::Queues &jobs);
     void fillText(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
     void fillPointLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
     void fillDirectionalLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
+    EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
+
+    void fillModels(std::list<std::shared_ptr<RenderJob>>& jobs);
     void fillLight(std::list<std::shared_ptr<RenderJob>>& jobs);
-    void fillSprites(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
 
-    bool isEntityVisible(EntityWrapper& entity);
+    EventRelay<RenderSystem, Events::PlayerSpawned> m_EPlayerSpawned;
-
+    bool OnPlayerSpawned(Events::PlayerSpawned& e);
-    bool isChildOfACamera(EntityWrapper entity);
-    bool isChildOfCurrentCamera(EntityWrapper entity);
 };
 
 #endif

include/Engine/Rendering/Renderer.h

@@ -16,25 +16,18 @@
 #include "DrawScreenQuadPass.h"
 #include "DrawBloomPass.h"
 #include "DrawColorCorrectionPass.h"
-#include "SSAOPass.h"
-#include "CubeMapPass.h"
 #include "../Core/EventBroker.h"
 #include "ImGuiRenderPass.h"
 #include "Camera.h"
 #include "../Core/Transform.h"
 #include "imgui/imgui.h"
 #include "TextPass.h"
-#include "Util/CommonFunctions.h"
-#include "Core/PerformanceTimer.h"
 
 class Renderer : public IRenderer
 {
-    static void glfwFrameBufferCallback(GLFWwindow* window, int width, int height);
-
 public:
-	Renderer(EventBroker* eventBroker, ConfigFile* config)
+    Renderer(EventBroker* eventBroker) 
-		: m_EventBroker(eventBroker)
+        : m_EventBroker(eventBroker)
-		, m_Config(config)
     { }
 
     virtual void Initialize() override;
@@ -43,13 +36,8 @@ public:
 
     virtual PickData Pick(glm::vec2 screenCoord) override;
 
-
 private:
     //----------------------Variables----------------------//
-
-    static std::unordered_map <GLFWwindow*, Renderer*> m_WindowToRenderer;
-	ConfigFile* m_Config;
-
     EventBroker* m_EventBroker;
     TextPass* m_TextPass;
 
@@ -61,10 +49,6 @@ private:
     Model* m_UnitSphere;
 
     int m_DebugTextureToDraw = 0;
-    int m_CubeMapTexture = 0;
-    bool m_ResizeWindow = false;
-	int m_SSAO_Quality = 0;
-	int m_GLOW_Quality = 2;
 
     PickingPass* m_PickingPass;
     LightCullingPass* m_LightCullingPass;
@@ -73,8 +57,6 @@ private:
     DrawScreenQuadPass* m_DrawScreenQuadPass;
     DrawBloomPass* m_DrawBloomPass;
     DrawColorCorrectionPass* m_DrawColorCorrectionPass;
-	SSAOPass* m_SSAOPass;
-    CubeMapPass* m_CubeMapPass;
 
     //----------------------Functions----------------------//
     void InitializeWindow();
@@ -91,8 +73,6 @@ private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
 	//--------------------ShaderPrograms-------------------//
     ShaderProgram* m_BasicForwardProgram;
-    ShaderProgram* m_ExplosionEffectProgram;
-
 };
 
 #endif

include/Engine/Rendering/SSAOPass.h

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

include/Engine/Rendering/SSAOPassState.h

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