Created "EntitySystem" class as means to group a World with a SystemPipeline

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

@@ -1,18 +0,0 @@
-#ifndef EPlayerHealthPickup_h__
-#define EPlayerHealthPickup_h__
-
-#include "EventBroker.h"
-#include "../Core/EntityWrapper.h"
-
-namespace Events
-{
-
-    struct PlayerHealthPickup : Event
-    {
-        EntityWrapper Player;
-        double HealthAmount;
-    };
-
-}
-
-#endif

include/Engine/Core/EWin.h

@@ -1,20 +0,0 @@
-#ifndef EWin_h__
-#define EWin_h__
-
-#include "EventBroker.h"
-#include "../Core/Entity.h"
-#include "Engine/GLM.h"
-
-namespace Events
-{
-
-    //triggers when a team has captured all capturePoints
-struct Win : Event
-{
-    //can be 0 = none, 1,2
-    int TeamThatWon;
-};
-
-}
-
-#endif

include/Engine/Core/EntitySystem.h

@@ -0,0 +1,19 @@
+#ifndef EntitySystem_h__
+#define EntitySystem_h__
+
+#include "World.h"
+#include "SystemPipeline.h"
+
+// An "EntitySystem" is defined as the combination of a World with a SystemPipeline
+template <typename WorldType>
+class EntitySystem : public WorldType, public SystemPipeline
+{
+    static_assert(std::is_base_of<World, WorldType>::value, "WorldType must inherit from World");
+public:
+    EntitySystem(EventBroker* eventBroker, bool isClient, bool isServer)
+        : WorldType(eventBroker)
+        , SystemPipeline(this, eventBroker, isClient, isServer)
+    { }
+};
+
+#endif

include/Engine/Core/EntityWrapper.h

@@ -29,7 +29,6 @@ struct EntityWrapper
     EntityWrapper Parent();
     EntityWrapper FirstChildByName(const std::string& name);
     EntityWrapper FirstParentWithComponent(const std::string& componentType);
-    std::vector<EntityWrapper> ChildrenWithComponent(const std::string& componentType);
     bool IsChildOf(EntityWrapper potentialParent);
     bool Valid() const;
 
@@ -40,7 +39,6 @@ struct EntityWrapper
 
 private:
     EntityWrapper firstChildByNameRecursive(const std::string& name, EntityID parent);
-    void childrenWithComponentRecursive(const std::string& componentType, EntityWrapper& entity, std::vector<EntityWrapper>& childrenWithComponent);
 };
 
 namespace std

include/Engine/Network/Client.h

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

include/Engine/Network/ESearchForServers.h

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

include/Engine/Network/HybridClient.h

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

include/Engine/Network/HybridServer.h

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

include/Engine/Network/MessageType.h

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

include/Engine/Network/NetworkClient.h

@@ -9,16 +9,13 @@ typedef unsigned int PacketID;
 class NetworkClient
 {
 public:
-    NetworkClient();
-    virtual ~NetworkClient();
     virtual void Connect(std::string playerName, std::string address, int port) = 0;
     virtual void Disconnect() = 0;
     virtual void Receive(Packet& packet) = 0;
     virtual void Send(Packet & packet) = 0;
     virtual bool IsSocketAvailable() = 0;
 protected:
-    char* m_ReadBuffer;
-    unsigned int m_BufferSize = BUFFERSIZE;
+    char m_ReadBuffer[BUFFERSIZE] = { 0 };
 };
 
 #endif

include/Engine/Network/NetworkServer.h

@@ -10,15 +10,12 @@ typedef unsigned int PacketID;
 class NetworkServer
 {
 public:
-    NetworkServer();
-    virtual ~NetworkServer();
     virtual void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers) = 0;
     virtual void Receive(Packet & packet, PlayerDefinition & playerDefinition) = 0;
     virtual void Send(Packet & packet, PlayerDefinition & playerDefinition) = 0;
     virtual void Send(Packet & packet) = 0;
 protected:
-    char* m_ReadBuffer;
-    unsigned int m_BufferSize = BUFFERSIZE;
+    char m_ReadBuffer[BUFFERSIZE] = { 0 };
 };
 
 #endif

include/Engine/Network/Server.h

@@ -8,7 +8,6 @@
 
 #include "Network/TCPServer.h"
 #include "Network/UDPServer.h"
-#include "Network/UDPClient.h" //LOL
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Core/World.h"
@@ -33,7 +32,6 @@ private:
     // Network channels
     TCPServer m_Reliable;
     UDPServer m_Unreliable;
-    UDPServer m_ServerlistRequest;
     // dont forget to set these in the childrens receive logic
     boost::asio::ip::address m_Address;
     int m_Port = 27666;
@@ -56,7 +54,7 @@ private:
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
     std::clock_t m_StartPingTime;
-
+    
     // Packet loss logic
     PacketID m_PacketID = 0;
     PacketID m_PreviousPacketID = 0;
@@ -66,7 +64,6 @@ private:
     void reliableBroadcast(Packet& packet);
     void unreliableBroadcast(Packet& packet);
     void sendSnapshot();
-    void addPlayersToPacket(Packet& packet, EntityID entityID);
     void addChildrenToPacket(Packet& packet, EntityID entityID);
     void addInputCommandsToPacket(Packet& packet);
     void sendPing();
@@ -80,11 +77,10 @@ private:
     void parsePlayerTransform(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
-    void parsePing();
+    void parsePing();    
     void parseUDPConnect(Packet & packet);
     void parseTCPConnect(Packet & packet);
     void parseDisconnect();
-    void parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint);
     bool shouldSendToClient(EntityWrapper childEntity);
 
     // Debug event

include/Engine/Network/TCPClient.h

@@ -20,7 +20,7 @@ private:
     boost::asio::ip::tcp::endpoint m_Endpoint;
     boost::asio::io_service m_IOService;
     std::unique_ptr<boost::asio::ip::tcp::socket> m_Socket;
-    size_t readBuffer();
+    size_t readBuffer(char* data);
     PacketID m_SendPacketID = 0;
     bool m_IsConnected = false;
 };

include/Engine/Network/TCPServer.h

@@ -16,9 +16,6 @@ public:
     void Send(Packet & packet, PlayerDefinition & playerDefinition);
     void Send(Packet & packet);
     void Disconnect();
-    int Port() { return m_Port; }
-    std::string Address() { return m_Address; }
-
 private:
     // TCP logic
     boost::asio::io_service m_IOService;
@@ -28,11 +25,7 @@ private:
     void handle_accept(boost::shared_ptr<boost::asio::ip::tcp::socket> socket,
         int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
         const boost::system::error_code& error);
-    int readBuffer(PlayerDefinition& playerDefinition);
-    int GetPort();
-    std::string GetAddress();
-    int m_Port = 0;
-    std::string m_Address = "";
+    int readBuffer(char* data, PlayerDefinition& playerDefinition);
 };
 
 #endif

include/Engine/Network/UDPClient.h

@@ -14,14 +14,13 @@ public:
     void Disconnect();
     void Receive(Packet& packet);
     void Send(Packet & packet);
-    void Broadcast(Packet& packet, int port);
     bool IsSocketAvailable();
 private:
     // Assio UDP logic
     boost::asio::io_service m_IOService;
     boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
     boost::shared_ptr<boost::asio::ip::udp::socket> m_Socket;
-    int readBuffer();
+    int readBuffer(char* data);
     PacketID m_SendPacketID = 0;
 };
 

include/Engine/Network/UDPServer.h

@@ -8,21 +8,18 @@ class UDPServer : public NetworkServer
 {
 public:
     UDPServer();
-    UDPServer(int port);
     ~UDPServer();
     void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers);
     void Receive(Packet & packet, PlayerDefinition & playerDefinition);
     void Send(Packet & packet, PlayerDefinition & playerDefinition);
-    void Send(Packet & packet); 
-    void Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint);
-    void Broadcast(Packet & packet, int port);
+    void Send(Packet & packet);
     bool IsSocketAvailable();
 private:
     // UDP logic
     boost::asio::io_service m_IOService;
     boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
     std::unique_ptr<boost::asio::ip::udp::socket> m_Socket;
-    int readBuffer();
+    int readBuffer(char* data);
 };
 
 #endif

include/Engine/Rendering/CubeMapPass.h

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

include/Engine/Rendering/DrawFinalPass.h

@@ -4,7 +4,6 @@
 #include "IRenderer.h"
 #include "DrawFinalPassState.h"
 #include "LightCullingPass.h"
-#include "CubeMapPass.h"
 #include "FrameBuffer.h"
 #include "ShaderProgram.h"
 #include "Util/UnorderedMapVec2.h"
@@ -14,7 +13,7 @@
 class DrawFinalPass
 {
 public:
-    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass);
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass);
     ~DrawFinalPass() { }
     void InitializeTextures();
     void InitializeFrameBuffers();
@@ -63,14 +62,12 @@ private:
     GLuint m_SceneTextureLowRes;
     GLuint m_DepthBuffer;
     GLuint m_DepthBufferLowRes;
-    GLuint m_CubeMapTexture;
 
     //maqke this component based i guess?
     GLuint m_ShieldPixelRate = 16;
 
     const IRenderer* m_Renderer;
     const LightCullingPass* m_LightCullingPass;
-    const CubeMapPass* m_CubeMapPass;
 
     ShaderProgram* m_ForwardPlusProgram;
     ShaderProgram* m_ExplosionEffectProgram;

include/Engine/Rendering/ModelJob.h

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

include/Engine/Rendering/Renderer.h

@@ -17,7 +17,6 @@
 #include "DrawBloomPass.h"
 #include "DrawColorCorrectionPass.h"
 #include "SSAOPass.h"
-#include "CubeMapPass.h"
 #include "../Core/EventBroker.h"
 #include "ImGuiRenderPass.h"
 #include "Camera.h"
@@ -59,7 +58,6 @@ private:
     Model* m_UnitSphere;
 
     int m_DebugTextureToDraw = 0;
-    int m_CubeMapTexture = 0;
     bool m_ResizeWindow = false;
 	float m_SSAO_Radius = 1.0f;
 	float m_SSAO_Bias = 0.05f;
@@ -76,7 +74,6 @@ private:
     DrawBloomPass* m_DrawBloomPass;
     DrawColorCorrectionPass* m_DrawColorCorrectionPass;
 	SSAOPass* m_SSAOPass;
-    CubeMapPass* m_CubeMapPass;
 
     //----------------------Functions----------------------//
     void InitializeWindow();

include/Engine/Rendering/SSAOPass.h

@@ -14,14 +14,11 @@ class SSAOPass
 {
 public:
 	SSAOPass(IRenderer* rendere);
-	~SSAOPass() { 
-		delete m_DrawBloomPass;
-	};
+	~SSAOPass() { };
 
 	void Draw(GLuint depthBuffer, Camera* camera);
 	void Setting(float radius, float bias, float contrast, float intensityScale, int numOfSamples, int NumOfTurns);
 	void ClearBuffer();
-	void OnWindowResize();
 
 	//Return the SSAO of the texture sent to Draw
 	GLuint SSAOTexture() const { return m_DrawBloomPass->GaussianTexture(); }
@@ -34,6 +31,7 @@ private:
 
 	void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
 
+	void ComputeAO(GLuint depthBuffer, Camera* camera);
 	//void blurHorizontal(GLuint depthBuffer);
 	//void blurVertical(GLuint depthBuffer);
 

include/Engine/Rendering/SpriteJob.h

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

include/Engine/Rendering/Texture.h

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

include/Game/CapturePointsEntitySystem.h

@@ -0,0 +1,18 @@
+#include "Core/EntitySystem.h"
+#include "Rendering/IRenderer.h"
+#include "Core/Octree.h"
+#include "Collision/EntityAABB.h"
+
+class CapturePointsEntitySystem : public EntitySystem<World>
+{
+public:
+    CapturePointsEntitySystem(EventBroker* eventBroker, bool isClient, bool isServer, IRenderer* renderer, RenderFrame* renderFrame);
+    ~CapturePointsEntitySystem();
+
+private:
+    IRenderer* m_Renderer;
+    RenderFrame* m_RenderFrame;
+    Octree<EntityAABB>* m_OctreeCollision = nullptr;
+    Octree<EntityAABB>* m_OctreeTrigger = nullptr;
+    Octree<EntityAABB>* m_OctreeFrustrumCulling = nullptr;
+};

include/Game/Events/EAmmoPickup.h

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

include/Game/Events/ECaptured.h

@@ -1,14 +1,13 @@
 #ifndef ECaptured_h__
 #define ECaptured_h__
 
-#include "EventBroker.h"
-#include "../Core/Entity.h"
-#include "Engine/GLM.h"
+#include "Core/EventBroker.h"
+#include "Core/Entity.h"
 
 namespace Events
 {
 
-    //triggers when a capturePoint has been taken over
+//triggers when a capturePoint has been taken over
 struct Captured : Event
 {
     int TeamNumberThatCapturedCapturePoint;

include/Game/Events/EGameEnd.h

@@ -0,0 +1,16 @@
+#ifndef EGameEnd_h__
+#define EGameEnd_h__
+
+#include "Core/Event.h"
+
+namespace Events
+{
+
+struct GameEnd : Event
+{
+
+};
+
+}
+
+#endif

include/Game/Events/EGameStart.h

@@ -0,0 +1,16 @@
+#ifndef EGameStart_h__
+#define EGameStart_h__
+
+#include "Core/Event.h"
+
+namespace Events
+{
+
+struct GameStart : Event
+{
+
+};
+
+}
+
+#endif

include/Game/Events/EPlayerHealthPickup.h

@@ -0,0 +1,18 @@
+#ifndef EPlayerHealthPickup_h__
+#define EPlayerHealthPickup_h__
+
+#include "Core/EventBroker.h"
+#include "Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct PlayerHealthPickup : Event
+{
+    EntityWrapper Player;
+    double HealthAmount;
+};
+
+}
+
+#endif

include/Game/Events/EWin.h

@@ -0,0 +1,19 @@
+#ifndef EWin_h__
+#define EWin_h__
+
+#include "Core/EventBroker.h"
+#include "Core/Entity.h"
+
+namespace Events
+{
+
+//triggers when a team has captured all capturePoints
+struct Win : Event
+{
+    // The winning team corresponding to TeamEnum
+    ComponentInfo::EnumType Team;
+};
+
+}
+
+#endif

include/Game/Game.h

@@ -12,18 +12,16 @@
 #include "Input/InputProxy.h"
 #include "Input/KeyboardInputHandler.h"
 #include "Input/MouseInputHandler.h"
-#include "Core/EKeyDown.h"
 #include "Core/EntityFilePreprocessor.h"
-#include "Core/SystemPipeline.h"
+#include "Core/EntitySystem.h"
 #include "Systems/ExplosionEffectSystem.h"
 #include "Editor/EditorSystem.h"
 #include "Core/EntityFile.h"
-#include "Rendering/RenderSystem.h"
 #include "Core/EntityFileParser.h"
 #include "Core/Octree.h"
 #include "Rendering/Font.h"
-#include "Systems/InterpolationSystem.h"
 #include "Collision/EntityAABB.h"
+
 // Network
 #include <boost/thread.hpp>
 #include "Network/Network.h"
@@ -55,11 +53,7 @@ private:
 	IRenderer* m_Renderer;
 	InputManager* m_InputManager;
     InputProxy* m_InputProxy;
-    World* m_World;
-    Octree<EntityAABB>* m_OctreeCollision;
-    Octree<EntityAABB>* m_OctreeTrigger;
-    Octree<EntityAABB>* m_OctreeFrustrumCulling;
-    SystemPipeline* m_SystemPipeline;
+    EntitySystem<World>* m_EntitySystem;
     RenderFrame* m_RenderFrame;
     Client* m_NetworkClient = nullptr;
     Server* m_NetworkServer = nullptr;

include/Game/Systems/AmmoPickupSystem.h

@@ -5,8 +5,8 @@
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
 #include "Core/EntityFileParser.h"
-#include "Core/EPickupSpawned.h"
-#include "Core/EAmmoPickup.h"
+#include "Events/EPickupSpawned.h"
+#include "Events/EAmmoPickup.h"
 #include "Engine/Collision/ETrigger.h"
 #include "Common.h"
 
@@ -26,7 +26,6 @@ private:
         double AmmoGain;
         double RespawnTimer;
         double DecreaseThisRespawnTimer;
-        EntityID parentID;
     };
     std::vector<NewAmmoPickup> m_ETriggerTouchVector;
 };

include/Game/Systems/CapturePointSystem.h

@@ -7,8 +7,7 @@
 #include "Common.h"
 #include "Core/System.h"
 #include "Engine/Collision/ETrigger.h"
-#include "Core/ECaptured.h"
-#include "Core/EWin.h"
+#include "Events/ECaptured.h"
 
 #include <tuple>
 #include <vector>

include/Game/Systems/CapturePointsGamemode.h

@@ -0,0 +1,27 @@
+#include "Core/System.h"
+#include "Events/EGameStart.h"
+#include "Events/EGameEnd.h"
+#include "Events/ECaptured.h"
+#include "Events/EWin.h"
+
+class CapturePointsGamemode : public ImpureSystem
+{
+public:
+    CapturePointsGamemode(SystemParams params);
+
+    virtual void Update(double dt) override;
+
+private:
+    bool m_GameRuning = false;
+    double m_GameTime = 0.0;
+
+    EventRelay<CapturePointsGamemode, Events::GameStart> m_EGameStart;
+    bool OnGameStart(const Events::GameStart& e);
+    EventRelay<CapturePointsGamemode, Events::Captured> m_ECaptured;
+    bool OnCaptured(const Events::Captured& e);
+
+    boost::optional<ComponentWrapper> currentGamemode();
+    bool isCurrentGamemode();
+    boost::optional<ComponentInfo::EnumType> winCondition();
+    void setRunning(bool running);
+};

include/Game/Systems/DamageIndicatorSystem.h

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

include/Game/Systems/HealthSystem.h

@@ -7,8 +7,8 @@
 #include "Common.h"
 #include "Core/System.h"
 #include "Core/EPlayerDamage.h"
-#include "Core/EPlayerHealthPickup.h"
 #include "Core/EPlayerDeath.h"
+#include "Events/EPlayerHealthPickup.h"
 #include "Core/ConfigFile.h"
 #include "Input/EInputCommand.h"
 

include/Game/Systems/PickupSpawnSystem.h

@@ -5,8 +5,8 @@
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
 #include "Core/EntityFileParser.h"
-#include "Core/EPickupSpawned.h"
-#include "Core/EPlayerHealthPickup.h"
+#include "Events/EPickupSpawned.h"
+#include "Events/EPlayerHealthPickup.h"
 #include "Engine/Collision/ETrigger.h"
 #include "Common.h"
 #include <tuple>
@@ -27,7 +27,6 @@ private:
         double HealthGain;
         double RespawnTimer;
         double DecreaseThisRespawnTimer;
-        EntityID parentID;
     };
     std::vector<NewHealthPickup> m_ETriggerTouchVector;
 };

include/Game/Systems/PlayerMovementSystem.h

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

include/Game/Systems/SoundSystem.h

@@ -13,10 +13,10 @@
 #include "../Engine/Core/EShoot.h"
 #include "../Engine/Core/EPlayerSpawned.h"
 #include "../Engine/Input/EInputCommand.h"
-#include "../Engine/Core/ECaptured.h"
+#include "Events/ECaptured.h"
 #include "../Engine/Core/EPlayerDamage.h"
 #include "../Engine/Core/EPlayerDeath.h"
-#include "../Engine/Core/EPlayerHealthPickup.h"
+#include "Events/EPlayerHealthPickup.h"
 #include "../Engine/Collision/ETrigger.h"
 #include "../Engine/Sound/EPlaySoundOnEntity.h"
 #include "../Engine/Sound/EPlayBackgroundMusic.h"

include/Game/Systems/Weapon/AssaultWeaponBehaviour.h

@@ -1,14 +1,13 @@
-#ifndef AssaultWeaponBehaviour_h__
-#define AssaultWeaponBehaviour_h__
-
 #include "Sound/EPlaySoundOnEntity.h"
 #include "Collision/Collision.h"
+#include "Rendering/AnimationSystem.h"
 #include "Core/ConfigFile.h"
 #include "WeaponBehaviour.h"
 #include "../SpawnerSystem.h"
 #include "Core/EPlayerDamage.h"
 #include "Core/EShoot.h"
 
+
 class AssaultWeaponBehaviour : public WeaponBehaviour
 {
 public:
@@ -23,13 +22,16 @@ public:
 private:
     EntityWrapper m_FirstPersonModel;
     EntityWrapper m_ThirdPersonModel;
-
     // State
     bool m_Firing = false;
     bool m_Reloading = false;
     double m_ReloadTimer = 0.0;
+    EntityWrapper m_FirstPersonReloadImpersonator;
+    EntityWrapper m_ThirdPersonReloadImpersonator;
     double m_TimeSinceLastFire = 0.0;
-    EntityWrapper m_FirstPersonReloadImpostor;
+
+    EventRelay<WeaponBehaviour, Events::AnimationComplete> m_EAnimationComplete;
+    bool OnAnimationComplete(Events::AnimationComplete& e);
 
     bool hasAmmo();
     void fireRound();
@@ -45,5 +47,3 @@ private:
     bool shoot(double damage);
     void showHitMarker();
 };
-
-#endif

include/Game/Systems/Weapon/DefenderWeaponBehaviour.h

@@ -1,16 +0,0 @@
-#include "WeaponBehaviour.h"
-
-class DefenderWeaponBehaviour : public WeaponBehaviour
-{
-public:
-    DefenderWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper weaponEntity);
-
-    virtual void Fire() override;
-    //virtual void CeaseFire() override;
-    //virtual void Reload() override;
-
-    //virtual void Update(double dt) override;
-
-private:
-    double m_TimeSinceLastFire = 0.0;
-};

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -8,21 +8,17 @@
 
 class WeaponBehaviour : public System
 {
-    friend class WeaponSystem;
-
 public:
-    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player, EntityWrapper firstPersonWeapon, EntityWrapper thirdPersonWeapon)
+    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player)
         : System(systemParams)
         , m_Renderer(renderer)
         , m_CollisionOctree(collisionOctree)
         , m_Player(player)
-        , m_FirstPerson(firstPersonWeapon)
-        , m_ThirdPerson(thirdPersonWeapon)
     { }
     virtual ~WeaponBehaviour() = default;
 
     WeaponBehaviour(const WeaponBehaviour&) = delete;
-    WeaponBehaviour& operator=(const WeaponBehaviour&) = delete;
+    WeaponBehaviour& operator=(const WeaponBehaviour &) = delete;
 
     virtual void Fire() = 0;
     virtual void CeaseFire() { }
@@ -33,8 +29,6 @@ protected:
     IRenderer* m_Renderer;
     Octree<EntityAABB>* m_CollisionOctree;
     EntityWrapper m_Player;
-    EntityWrapper m_FirstPerson;
-    EntityWrapper m_ThirdPerson;
 };
 
 #endif

resources/Schema/Components.xsd

@@ -44,7 +44,6 @@
 	<xs:include schemaLocation="Components/Menu.xsd"/>
 	<xs:include schemaLocation="Components/KillFeed.xsd"/>
 	<xs:include schemaLocation="Components/Page.xsd"/>
-	<xs:include schemaLocation="Components/SpriteIndicator.xsd"/>
 	<xs:include schemaLocation="Components/Button.xsd"/>
-	<xs:include schemaLocation="Components/WeaponAttachment.xsd"/>
+	<xs:include schemaLocation="Components/Gamemode.xsd"/>
 </xs:schema>

resources/Schema/Components/Gamemode.xml

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

resources/Schema/Components/Gamemode.xsd

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:complexType name="GamemodeEnum" mixed="true">
+		<xs:complexContent>
+			<xs:extension base="t:enum">
+				<xs:choice>
+					<xs:element name="CapturePoints" type="t:int" fixed="1" minOccurs="0"/>
+				</xs:choice>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	
+	<xs:element name="Gamemode">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Gamemode" type="GamemodeEnum" minOccurs="0"/>
+				<xs:element name="RoundTime" type="t:double" minOccurs="0"/>
+				<xs:element name="Running" type="t:bool" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/SpriteIndicator.xml

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

resources/Schema/Components/SpriteIndicator.xsd

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="SpriteIndicator">
-		<xs:annotation>
-			<xs:documentation>Billbord a Sprite around global Y axis</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="MinScale" type="t:double" minOccurs="0"/>
-				<xs:element name="VisibleForSingleTeamOnly" type="t:bool" minOccurs="0">
-					<xs:annotation><xs:documentation>Add a Team component to this Entity or Parent to make it visible only for that team</xs:documentation></xs:annotation>
-				</xs:element>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Weapon.xml

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

resources/Schema/Components/Weapon.xsd

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="Weapon">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="MagSize" type="t:int" minOccurs="0"/>
+				<xs:element name="MaxAmmo" type="t:int" minOccurs="0"/>
+				<xs:element name="CurrentAmmoInMag" type="t:int" minOccurs="0"/>
+				<xs:element name="CurrentAmmo" type="t:int" minOccurs="0"/>
+				<xs:element name="RPM" type="t:double" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/WeaponAttachment.xml

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

resources/Schema/Components/WeaponAttachment.xsd

@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:complexType name="PersonEnum" mixed="true">
-		<xs:complexContent>
-			<xs:extension base="t:enum">
-				<xs:choice>
-					<xs:element name="FirstPerson" type="t:int" fixed="0" minOccurs="0"/>
-					<xs:element name="ThirdPerson" type="t:int" fixed="1" minOccurs="0"/>
-				</xs:choice>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="WeaponSlotEnum" mixed="true">
-		<xs:complexContent>
-			<xs:extension base="t:enum">
-				<xs:choice>
-					<xs:element name="Primary" type="t:int" fixed="1" minOccurs="0"/>
-					<xs:element name="Secondary" type="t:int" fixed="2" minOccurs="0"/>
-				</xs:choice>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:element name="WeaponAttachment">
-		<xs:annotation><xs:documentation>Combine with a spawner to define a weapon attachment point</xs:documentation></xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="Person" type="PersonEnum" minOccurs="0"/>
-				<xs:element name="Slot" type="WeaponSlotEnum" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Entities/AmmoPickup.xml

@@ -2,18 +2,18 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:AABB/>
     <c:AmmoPickup/>
     <c:Model>
       <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
     </c:Model>
     <c:RaptorCopter>
-      <Speed>8</Speed>
-      <Axis X="0" Y="0.100000001" Z="0"/>
+      <Speed>0.1</Speed>
+      <Axis X="0" Y="1" Z="0"/>
     </c:RaptorCopter>
     <c:Transform>
-      <Position X="0" Y="2.36784196" Z="0"/>
-      <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-      <Orientation X="0" Y="18717.9453" Z="0"/>
+      <Position X="0" Y="1" Z="0"/>
+      <Scale X="0.3" Y="0.3" Z="0.3"/>
     </c:Transform>
     <c:Trigger/>
   </Components>

resources/Schema/Entities/HealthPickup.xml

@@ -2,18 +2,18 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:AABB/>
     <c:HealthPickup/>
     <c:Model>
       <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
     </c:Model>
     <c:RaptorCopter>
-      <Speed>8</Speed>
-      <Axis X="0" Y="0.100000001" Z="0"/>
+      <Speed>0.1</Speed>
+      <Axis X="0" Y="1" Z="0"/>
     </c:RaptorCopter>
     <c:Transform>
-      <Position X="0" Y="2.36784196" Z="0"/>
-      <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-      <Orientation X="0" Y="18767.0273" Z="0"/>
+      <Position X="0" Y="1" Z="0"/>
+      <Scale X="0.3" Y="0.3" Z="0.3"/>
     </c:Transform>
     <c:Trigger/>
   </Components>

resources/Schema/Entities/Player.xml

@@ -13,7 +13,6 @@
     <c:DashAbility/>
     <c:Health/>
     <c:Physics>
-      <PrevOrigin X="0" Y="0.772000015" Z="0"/>
       <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
     </c:Physics>
     <c:Player>
@@ -61,7 +60,6 @@
                 <c:Sprite>
                   <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
                   <DepthSort>false</DepthSort>
-                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.200000003"/>
@@ -112,7 +110,6 @@
                     </c:Fill>
                     <c:Sprite>
                       <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.588235319" B="0" G="0" R="0"/>
                     </c:Sprite>
                     <c:HealthHUD/>
@@ -138,7 +135,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -156,7 +152,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -172,7 +167,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -191,7 +185,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -207,7 +200,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                     </c:Sprite>
                     <c:Transform>
@@ -225,7 +217,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -241,7 +232,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -259,7 +249,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -275,7 +264,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -291,7 +279,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -304,7 +291,8 @@
                   </Children>
                 </Entity>
               </Children>
-            </Entity>            <Entity name="KillFeed">
+            </Entity>
+            <Entity name="KillFeed">
               <Components>
                 <c:KillFeed/>
                 <c:Transform>
@@ -316,7 +304,6 @@
                 <Entity name="KillFeed1">
                   <Components>
                     <c:Text>
-                      <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
@@ -329,7 +316,6 @@
                 <Entity name="KillFeed2">
                   <Components>
                     <c:Text>
-                      <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
@@ -344,7 +330,6 @@
                 <Entity name="KillFeed3">
                   <Components>
                     <c:Text>
-                      <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
@@ -364,10 +349,8 @@
           <Components>
             <c:Animation>
               <AnimationName1>Idle</AnimationName1>
-              <Time1>0.97725610639912475</Time1>
+              <Time1>1.8314163732853146</Time1>
               <Speed1>1</Speed1>
-              <AnimationName2></AnimationName2>
-              <AnimationName3></AnimationName3>
             </c:Animation>
             <c:Model>
               <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
@@ -385,8 +368,8 @@
                   <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="0.12043038" Y="-0.244988307" Z="-0.181454808"/>
-                  <Orientation X="0.010404544" Y="-0.00268173823" Z="0.0428441577"/>
+                  <Position X="0.120430619" Y="-0.229687244" Z="-0.181454629"/>
+                  <Orientation X="0.0104048112" Y="-0.0026817855" Z="0.0428442657"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -423,7 +406,6 @@
                       <Components>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                           <Color A="0.588235319" B="0" G="0" R="0"/>
                         </c:Sprite>
                         <c:Transform>
@@ -493,10 +475,8 @@
       <Components>
         <c:Animation>
           <AnimationName1>Idle</AnimationName1>
-          <Time1>0.87583812735846323</Time1>
+          <Time1>0.16333512901638159</Time1>
           <Speed1>1</Speed1>
-          <AnimationName2></AnimationName2>
-          <AnimationName3></AnimationName3>
         </c:Animation>
         <c:AnimationOffset>
           <AnimationName>AimRifle</AnimationName>
@@ -519,8 +499,8 @@
               <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
             </c:Model>
             <c:Transform>
-              <Position X="0.163429111" Y="1.0235405" Z="-0.215489209"/>
-              <Orientation X="-0.0631071255" Y="-0.0576644838" Z="0.118255548"/>
+              <Position X="0.158296332" Y="1.03131664" Z="-0.21615544"/>
+              <Orientation X="-0.0626514703" Y="-0.0352048129" Z="0.12013837"/>
             </c:Transform>
           </Components>
           <Children>
@@ -590,26 +570,6 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity name="Indicator">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
-          <DepthSort>false</DepthSort>
-          <GlowMap></GlowMap>
-          <Color A="1" B="1" G="0.309803933" R="0"/>
-        </c:Sprite>
-        <c:HiddenForLocalPlayer/>
-        <c:SpriteIndicator>
-          <MinScale>50</MinScale>
-          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
-        </c:SpriteIndicator>
-        <c:Transform>
-          <Position X="0" Y="1.84019077" Z="0"/>
-          <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/PlayerRed.xml

@@ -13,7 +13,6 @@
     <c:DashAbility/>
     <c:Health/>
     <c:Physics>
-      <PrevOrigin X="0" Y="0.772000015" Z="0"/>
       <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
     </c:Physics>
     <c:Player>
@@ -61,7 +60,6 @@
                 <c:Sprite>
                   <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
                   <DepthSort>false</DepthSort>
-                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.200000003"/>
@@ -112,7 +110,6 @@
                     </c:Fill>
                     <c:Sprite>
                       <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.588235319" B="0" G="0" R="0"/>
                     </c:Sprite>
                     <c:HealthHUD/>
@@ -138,7 +135,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -156,7 +152,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -172,7 +167,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -191,7 +185,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -207,7 +200,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                     </c:Sprite>
                     <c:Transform>
@@ -225,7 +217,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -241,7 +232,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -259,7 +249,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -275,7 +264,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -291,7 +279,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -317,7 +304,6 @@
                 <Entity name="KillFeed1">
                   <Components>
                     <c:Text>
-                      <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
@@ -330,7 +316,6 @@
                 <Entity name="KillFeed2">
                   <Components>
                     <c:Text>
-                      <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
@@ -345,7 +330,6 @@
                 <Entity name="KillFeed3">
                   <Components>
                     <c:Text>
-                      <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
@@ -365,10 +349,8 @@
           <Components>
             <c:Animation>
               <AnimationName1>Idle</AnimationName1>
-              <Time1>1.2667383999985162</Time1>
+              <Time1>0.018170670865885086</Time1>
               <Speed1>1</Speed1>
-              <AnimationName2></AnimationName2>
-              <AnimationName3></AnimationName3>
             </c:Animation>
             <c:Model>
               <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
@@ -386,8 +368,8 @@
                   <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="0.120430425" Y="-0.242105931" Z="-0.181454822"/>
-                  <Orientation X="0.010404665" Y="-0.00268179877" Z="0.0428443067"/>
+                  <Position X="0.120430693" Y="-0.2284486" Z="-0.181454509"/>
+                  <Orientation X="0.0104046017" Y="-0.00268172775" Z="0.0428442247"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -424,7 +406,6 @@
                       <Components>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                           <Color A="0.588235319" B="0" G="0" R="0"/>
                         </c:Sprite>
                         <c:Transform>
@@ -494,10 +475,8 @@
       <Components>
         <c:Animation>
           <AnimationName1>Idle</AnimationName1>
-          <Time1>0.26532318661337229</Time1>
+          <Time1>0.11675631578762591</Time1>
           <Speed1>1</Speed1>
-          <AnimationName2></AnimationName2>
-          <AnimationName3></AnimationName3>
         </c:Animation>
         <c:AnimationOffset>
           <AnimationName>AimRifle</AnimationName>
@@ -520,8 +499,8 @@
               <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
             </c:Model>
             <c:Transform>
-              <Position X="0.159282878" Y="1.0300566" Z="-0.216084003"/>
-              <Orientation X="-0.0626799241" Y="-0.0390551724" Z="0.119761385"/>
+              <Position X="0.157842755" Y="1.03184748" Z="-0.216178894"/>
+              <Orientation X="-0.0626459867" Y="-0.0335309952" Z="0.120309927"/>
             </c:Transform>
           </Components>
           <Children>
@@ -591,26 +570,6 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity>
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
-          <DepthSort>false</DepthSort>
-          <GlowMap></GlowMap>
-          <Color A="1" B="0" G="0" R="1"/>
-        </c:Sprite>
-        <c:HiddenForLocalPlayer/>
-        <c:SpriteIndicator>
-          <MinScale>50</MinScale>
-          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
-        </c:SpriteIndicator>
-        <c:Transform>
-          <Position X="0" Y="1.84000003" Z="0"/>
-          <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Types/Entity.xsd

@@ -50,7 +50,7 @@
 							<xs:element ref="c:Menu" minOccurs="0"/>
 							<xs:element ref="c:Page" minOccurs="0"/>
 							<xs:element ref="c:Button" minOccurs="0"/>
-							<xs:element ref="c:WeaponAttachment" minOccurs="0"/>
+							<xs:element ref="c:Gamemode" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/ForwardPlus.frag.glsl

@@ -12,7 +12,6 @@ uniform vec4 FillColor;
 uniform vec4 AmbientColor;
 uniform float FillPercentage;
 uniform float GlowIntensity = 10;
-uniform vec3 CameraPosition;
 
 uniform vec2 DiffuseUVRepeat;
 uniform vec2 NormalUVRepeat;
@@ -23,7 +22,6 @@ layout (binding = 1) uniform sampler2D DiffuseTexture;
 layout (binding = 2) uniform sampler2D NormalMapTexture;
 layout (binding = 3) uniform sampler2D SpecularMapTexture;
 layout (binding = 4) uniform sampler2D GlowMapTexture;
-layout (binding = 5) uniform samplerCube CubeMap;
 
 #define TILE_SIZE 16
 
@@ -78,7 +76,7 @@ struct LightResult {
 };
 
 float CalcAttenuation(float radius, float dist, float falloff) {
-	return 1.0 - smoothstep(radius * falloff, radius, dist);
+	return 1.0 - smoothstep(radius * 0.3, radius, dist);
 }
 
 vec4 CalcSpecular(vec4 lightColor, vec4 viewVec,  vec4 lightVec, vec4 normal) {
@@ -134,11 +132,7 @@ void main()
 	vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate * NormalUVRepeat, NormalMapTexture);
 	normal = normalize(normal);
 	//vec4 normal = normalize(V  * vec4(Input.Normal, 0.0));
-	vec4 viewVec = normalize(-position);
-	vec3 I = normalize(vec3(M * vec4(Input.Position, 1.0)) - CameraPosition);
-	vec3 R = reflect(-I, Input.Normal);
-	//R = vec3(P * vec4(R, 1.0));
-	vec4 reflectionColor = texture(CubeMap, R);
+	vec4 viewVec = normalize(-position); 
 
 	vec2 tilePos;
 	tilePos.x = int(gl_FragCoord.x/TILE_SIZE);
@@ -169,8 +163,6 @@ void main()
 
 	vec4 color_result = mix((Color * diffuseTexel * DiffuseColor), Input.ExplosionColor, Input.ExplosionPercentageElapsed);
 	color_result = color_result * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel));
-	float specularResult = (specularTexel.r + specularTexel.g + specularTexel.b)/3.0;
-	color_result = color_result * clamp(1/specularTexel, 0, 1)*2 + reflectionColor * clamp(specularTexel, 0, 1)/2;
 	//vec4 color_result = (DiffuseColor + Input.ExplosionColor) * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel)) * diffuseTexel * Color;
 	
 
@@ -180,10 +172,9 @@ void main()
 		color_result += FillColor;
 	}
 	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
-	//sceneColor = vec4(reflectionColor.xyz, 1);
 	color_result += glowTexel*GlowIntensity;
 
-	bloomColor = vec4(clamp(color_result.xyz - 1.0, 0, 100), clamp(color_result.a, 0, 1));
+	bloomColor = vec4(clamp(color_result.xyz - 1.0, 0, 100), 1.0);
 
 	//Tiled Debug Code
 	/*

resources/Shaders/ForwardPlus.vert.glsl

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

src/Engine/Core/EntityWrapper.cpp

@@ -51,13 +51,6 @@ EntityWrapper EntityWrapper::FirstParentWithComponent(const std::string& compone
     return EntityWrapper::Invalid;
 }
 
-std::vector<EntityWrapper> EntityWrapper::ChildrenWithComponent(const std::string& componentType)
-{
-    std::vector<EntityWrapper> childrenWithComponent;
-    childrenWithComponentRecursive(componentType, *this, childrenWithComponent);
-    return childrenWithComponent;
-}
-
 bool EntityWrapper::IsChildOf(EntityWrapper potentialParent)
 {
     EntityWrapper entity = *this;
@@ -138,18 +131,3 @@ EntityWrapper EntityWrapper::firstChildByNameRecursive(const std::string& name,
     return EntityWrapper::Invalid;
 }
 
-void EntityWrapper::childrenWithComponentRecursive(const std::string& componentType, EntityWrapper& entity, std::vector<EntityWrapper>& childrenWithComponent)
-{
-    auto itPair = this->World->GetChildren(entity.ID);
-    if (itPair.first == itPair.second) {
-        return;
-    }
-
-    for (auto it = itPair.first; it != itPair.second; ++it) {
-        if (entity.HasComponent(componentType)) {
-            childrenWithComponent.push_back(entity);
-        }
-        childrenWithComponentRecursive(componentType, entity, childrenWithComponent);
-    }
-}
-

src/Engine/Network/Client.cpp

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

src/Engine/Network/HybridClient.cpp

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

src/Engine/Network/HybridServer.cpp

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

src/Engine/Network/NetworkClient.cpp

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

src/Engine/Network/NetworkServer.cpp

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

src/Engine/Network/Server.cpp

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

src/Engine/Network/TCPClient.cpp

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

src/Engine/Network/TCPServer.cpp

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

src/Engine/Network/UDPClient.cpp

@@ -15,9 +15,9 @@ void UDPClient::Connect(std::string playerName, std::string address, int port)
     if (m_Socket) {
         return;
     }
-    m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address().from_string(address), port);
+    m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address::from_string(address), port);
     m_Socket = boost::shared_ptr<boost::asio::ip::udp::socket>(new boost::asio::ip::udp::socket(m_IOService));
-    m_Socket->open(boost::asio::ip::udp::v4());
+    m_Socket->connect(m_ReceiverEndpoint);
 }
 
 void UDPClient::Disconnect()
@@ -27,66 +27,34 @@ void UDPClient::Disconnect()
 
 void UDPClient::Receive(Packet& packet)
 {
-    int bytesRead = readBuffer();
+    int bytesRead = readBuffer(m_ReadBuffer);
     if (bytesRead > 0) { 
         packet.ReconstructFromData(m_ReadBuffer, bytesRead);
     }
 }
 
-int UDPClient::readBuffer()
+int UDPClient::readBuffer(char* data)
 {
     if (!m_Socket) {
         return 0;
     }
     boost::system::error_code error;
-    // Read size of packet
-     m_Socket->receive(boost
-        ::asio::buffer((void*)m_ReadBuffer, sizeof(int)),
-         boost::asio::ip::udp::socket::message_peek, error);
-    int sizeOfPacket = 0;
-    memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-
-    // if the buffer is to small increase the size of it
-    if (sizeOfPacket > m_BufferSize) {
-        delete[] m_ReadBuffer;
-        m_ReadBuffer = new char[sizeOfPacket];
-        m_BufferSize = sizeOfPacket;
-    }
-
-    size_t availableData = m_Socket->available();
-    // Read the rest of the message
-    size_t bytesReceived = m_Socket->receive_from(boost
-        ::asio::buffer((void*)(m_ReadBuffer),
-            sizeOfPacket),
-        m_ReceiverEndpoint, 0, error);
+    int bytesReceived = m_Socket->receive_from(boost
+        ::asio::buffer((void*)data, BUFFERSIZE),
+        m_ReceiverEndpoint,
+        0, error);
     if (error) {
         //LOG_ERROR("receive: %s", error.message().c_str());
     }
-    if (sizeOfPacket > 1000000)
-        LOG_WARNING("The packets received are bigger than 1MB");
-
     return bytesReceived;
 }
 
 void UDPClient::Send(Packet& packet)
 {
-    packet.UpdateSize();
     m_Socket->send_to(boost::asio::buffer(
         packet.Data(),
         packet.Size()),
         m_ReceiverEndpoint, 0);
-} 
-
-void UDPClient::Broadcast(Packet& packet, int port)
-{
-    packet.UpdateSize();
-    m_Socket->set_option(boost::asio::socket_base::broadcast(true));
-    m_Socket->send_to(boost::asio::buffer(
-        packet.Data(),
-        packet.Size()),
-        udp::endpoint(boost::asio::ip::address_v4().broadcast(), port)
-        , 0);
-    m_Socket->set_option(boost::asio::socket_base::broadcast(false));
 }
 
 bool UDPClient::IsSocketAvailable()

src/Engine/Network/UDPServer.cpp

@@ -5,17 +5,11 @@ UDPServer::UDPServer()
     m_Socket = std::unique_ptr<boost::asio::ip::udp::socket>(new boost::asio::ip::udp::socket(m_IOService, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 27666)));
 }
 
-UDPServer::UDPServer(int port)
-{
-    m_Socket = std::unique_ptr<boost::asio::ip::udp::socket>(new boost::asio::ip::udp::socket(m_IOService, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), port)));
-}
-
 UDPServer::~UDPServer()
 { }
 
 void UDPServer::Send(Packet& packet, PlayerDefinition & playerDefinition)
 {
-    packet.UpdateSize();
     try {
         int bytesSent = m_Socket->send_to(
             boost::asio::buffer(packet.Data(), packet.Size()),
@@ -29,7 +23,6 @@ void UDPServer::Send(Packet& packet, PlayerDefinition & playerDefinition)
 // Send back to endpoint of received packet
 void UDPServer::Send(Packet & packet)
 {
-    packet.UpdateSize();
     m_Socket->send_to(
         boost::asio::buffer(
             packet.Data(),
@@ -38,35 +31,9 @@ void UDPServer::Send(Packet & packet)
         0);
 }
 
-// Broadcasting respond specific logic
-void UDPServer::Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint)
-{
-    packet.UpdateSize();
-    m_Socket->send_to(
-        boost::asio::buffer(
-            packet.Data(),
-            packet.Size()),
-        endpoint,
-        0);
-}
-
-// Broadcasting
-void UDPServer::Broadcast(Packet & packet, int port)
-{
-    packet.UpdateSize();
-    m_Socket->set_option(boost::asio::socket_base::broadcast(true));
-    m_Socket->send_to(
-        boost::asio::buffer(
-            packet.Data(),
-            packet.Size()),
-        boost::asio::ip::udp::endpoint(boost::asio::ip::address_v4().broadcast(),port),
-        0);
-    m_Socket->set_option(boost::asio::socket_base::broadcast(false));
-}
-
 void UDPServer::Receive(Packet & packet, PlayerDefinition & playerDefinition)
 {
-    int bytesRead = readBuffer();
+    int bytesRead = readBuffer(m_ReadBuffer);
     if (bytesRead > 0) {
         packet.ReconstructFromData(m_ReadBuffer, bytesRead);
     }
@@ -78,39 +45,17 @@ bool UDPServer::IsSocketAvailable()
     return m_Socket->available();
 }
 
-int UDPServer::readBuffer()
+int UDPServer::readBuffer(char* data)
 {
-    if (!m_Socket) {
-        return 0;
+    boost::system::error_code error = boost::asio::error::host_not_found;
+    unsigned int length = m_Socket->receive_from(
+        boost::asio::buffer((void*)data
+            , BUFFERSIZE)
+        , m_ReceiverEndpoint, 0, error);
+    if (error) {
+        LOG_WARNING(error.message().c_str());
     }
-    int addasdasd = m_Socket->available();
-    boost::system::error_code error;
-    // Read size of packet
-     m_Socket->receive_from(boost
-        ::asio::buffer((void*)m_ReadBuffer, sizeof(int)),
-        m_ReceiverEndpoint, boost::asio::ip::udp::socket::message_peek, error);
-    unsigned int sizeOfPacket = 0;
-    memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-
-    // if the buffer is to small increase the size of it
-    if (sizeOfPacket > m_BufferSize) {
-        delete[] m_ReadBuffer;
-        m_ReadBuffer = new char[sizeOfPacket];
-        m_BufferSize = sizeOfPacket;
-    }
-
-    // Read the rest of the message
-    size_t bytesReceived = m_Socket->receive_from(boost
-        ::asio::buffer((void*)(m_ReadBuffer),
-            sizeOfPacket),
-        m_ReceiverEndpoint, 0, error);
-        if (error) {
-            //LOG_ERROR("receive: %s", error.message().c_str());
-        }
-        if (sizeOfPacket > 1000000)
-            LOG_WARNING("The packets received are bigger than 1MB");
-
-        return bytesReceived;
+    return length;
 }
 
 void UDPServer::AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers)

src/Engine/Rendering/CubeMapPass.cpp

@@ -1,40 +0,0 @@
-#include "Rendering/CubeMapPass.h"
-
-CubeMapPass::CubeMapPass(IRenderer* renderer)
-    :m_Renderer(renderer)
-{
-    LoadTextures("Nevada");
-}
-
-void CubeMapPass::LoadTextures(std::string input)
-{
-    if (m_PreviusCubeMapTexture != input) {
-        m_CubeMapTextures.clear();
-        for (int i = 0; i < 6; i++) {
-            std::string str;
-            str = "Textures/Test/CubeMap/" + input + "/CubeMapTest0" + std::to_string(i) + ".png";
-            Texture* img = ResourceManager::Load<Texture>(str);
-            m_CubeMapTextures.push_back(img);
-        }
-        GenerateCubeMapTexture();
-    }
-}
-
-void CubeMapPass::GenerateCubeMapTexture()
-{
-    if (m_CubeMapTexture == -1) {
-        glGenTextures(1, &m_CubeMapTexture);
-    }
-    glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapTexture);
-
-    for (int i = 0; i < 6; i++) {
-        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, GL_RGBA32F, m_CubeMapTextures[0]->Width, m_CubeMapTextures[0]->Height, 0, GL_RGBA, GL_UNSIGNED_BYTE, m_CubeMapTextures[i]->Data);
-    }
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-    GLERROR("Generate Cubemap");
-}
-

src/Engine/Rendering/DrawBloomPass.cpp

@@ -52,7 +52,6 @@ void DrawBloomPass::InitializeBuffers()
 
 void DrawBloomPass::ClearBuffer()
 {
-    GLERROR("PRE");
     m_GaussianFrameBuffer_horiz.Bind();
     glClearColor(0.f, 0.f, 0.f, 0.f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -61,7 +60,6 @@ void DrawBloomPass::ClearBuffer()
     glClearColor(0.f, 0.f, 0.f, 0.f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     m_GaussianFrameBuffer_vert.Unbind();
-    GLERROR("END");
 }
 
 void DrawBloomPass::Draw(GLuint texture)

src/Engine/Rendering/DrawFinalPass.cpp

@@ -1,11 +1,10 @@
 #include "Rendering/DrawFinalPass.h"
 
-DrawFinalPass::DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass)
-    : m_Renderer(renderer)
-    , m_LightCullingPass(lightCullingPass)
-    , m_CubeMapPass(cubeMapPass)
+DrawFinalPass::DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass)
 {
     //TODO: Make sure that uniforms are not sent into shader if not needed.
+    m_Renderer = renderer;
+    m_LightCullingPass = lightCullingPass;
     m_ShieldPixelRate = 8;
     InitializeTextures();
     InitializeShaderPrograms();
@@ -193,10 +192,8 @@ void DrawFinalPass::Draw(RenderScene& scene, GLuint SSAOTexture)
     state->StencilMask(0x00);
     DrawModelRenderQueues(scene.Jobs.OpaqueObjects, scene, SSAOTexture);
     GLERROR("OpaqueObjects");
-    state->BlendFunc(GL_ONE, GL_ONE);
     DrawModelRenderQueues(scene.Jobs.TransparentObjects, scene, SSAOTexture);
     GLERROR("TransparentObjects");
-    state->BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     DrawSprites(scene.Jobs.SpriteJob, scene);
     GLERROR("SpriteJobs");
 
@@ -262,35 +259,20 @@ void DrawFinalPass::Draw(RenderScene& scene, GLuint SSAOTexture)
 
 void DrawFinalPass::ClearBuffer()
 {
-    GLERROR("PRE");
     m_FinalPassFrameBufferLowRes.Bind();
-    GLERROR("Bind LowRes");
-
     glViewport(0, 0, m_Renderer->GetViewportSize().Width/m_ShieldPixelRate, m_Renderer->GetViewportSize().Height/m_ShieldPixelRate);
     glScissor(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
-    GLERROR("ViewPort,Scissor LowRes");
-
     glClearColor(0.f, 0.f, 0.f, 0.f);
-    GLERROR("1");
-
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    GLERROR("2");
-
     glDisable(GL_SCISSOR_TEST);
-    GLERROR("3");
-
     m_FinalPassFrameBufferLowRes.Unbind();
 
-    GLERROR("prebind HighRes");
     m_FinalPassFrameBuffer.Bind();
-    GLERROR("Bind HighRes");
     glViewport(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
     glScissor(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
-    GLERROR("ViewPort,Scissor LowRes");
     glClearColor(0.f, 0.f, 0.f, 0.f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     m_FinalPassFrameBuffer.Unbind();
-    GLERROR("END");
 }
 
 
@@ -374,17 +356,12 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
             case RawModel::MaterialType::SingleTextures:
             {
                 if (explosionEffectJob->Model->IsSkinned()) {
-
                     m_ExplosionEffectSkinnedProgram->Bind();
                     GLERROR("Bind ExplosionEffectSkinned program");
                     //bind uniforms
                     BindExplosionUniforms(explosionSkinnedHandle, explosionEffectJob, scene);
                     //bind textures
                     BindExplosionTextures(explosionSkinnedHandle, explosionEffectJob);
-                    glActiveTexture(GL_TEXTURE5);
-                    glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
-                    glUniform3fv(glGetUniformLocation(forwardHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
-
                     std::vector<glm::mat4> frameBones;
                     if (explosionEffectJob->AnimationOffset.animation != nullptr) {
                         frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
@@ -399,10 +376,6 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
                     BindExplosionUniforms(explosionHandle, explosionEffectJob, scene);
                     //bind textures
                     BindExplosionTextures(explosionHandle, explosionEffectJob);
-                    glActiveTexture(GL_TEXTURE5);
-                    glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
-                    glUniform3fv(glGetUniformLocation(forwardHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
-
                 }
                 break;
             }
@@ -461,10 +434,6 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
                             BindModelUniforms(forwardSkinnedHandle, modelJob, scene);
                             //bind textures
                             BindModelTextures(forwardSkinnedHandle, modelJob);
-                            glActiveTexture(GL_TEXTURE5);
-                            glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
-                            glUniform3fv(glGetUniformLocation(forwardHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
-
                             std::vector<glm::mat4> frameBones;
                             if (modelJob->AnimationOffset.animation != nullptr) {
                                 frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
@@ -480,9 +449,6 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
                             BindModelUniforms(forwardHandle, modelJob, scene);
                             //bind textures
                             BindModelTextures(forwardHandle, modelJob);
-                            glActiveTexture(GL_TEXTURE5);
-                            glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
-                            glUniform3fv(glGetUniformLocation(forwardHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
                         }
                         break;
                     }
@@ -841,8 +807,6 @@ void DrawFinalPass::BindModelUniforms(GLuint shaderHandle, std::shared_ptr<Model
 
 void DrawFinalPass::BindExplosionTextures(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job)
 {
-
-
 	switch (job->Type) {
 	case RawModel::MaterialType::SingleTextures:
 	case RawModel::MaterialType::Basic:

src/Engine/Rendering/PickingPass.cpp

@@ -21,13 +21,23 @@ void PickingPass::InitializeTextures()
 {
     GenerateTexture(&m_PickingTexture, GL_CLAMP_TO_BORDER, GL_LINEAR,
         glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RG8, GL_RG, GL_UNSIGNED_BYTE);
-
-	GenerateTexture(&m_DepthBuffer, GL_CLAMP_TO_BORDER, GL_NEAREST,
-		glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8);
 }
 
 void PickingPass::InitializeFrameBuffers()
 {
+   /* glGenRenderbuffers(1, &m_DepthBuffer);
+    glBindRenderbuffer(GL_RENDERBUFFER, m_DepthBuffer);
+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);*/
+
+	glGenTextures(1, &m_DepthBuffer);
+
+	glBindTexture(GL_TEXTURE_2D, m_DepthBuffer);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, (int)(m_Renderer->GetViewportSize().Width), (int)(m_Renderer->GetViewportSize().Height), 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+
     m_PickingBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_DepthBuffer, GL_DEPTH_ATTACHMENT)));
     m_PickingBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_PickingTexture, GL_COLOR_ATTACHMENT0)));
     m_PickingBuffer.Generate();
@@ -54,7 +64,6 @@ void PickingPass::InitializeShaderPrograms()
 
 void PickingPass::Draw(RenderScene& scene)
 {
-    GLERROR("PRE");
     PickingPassState* state = new PickingPassState(m_PickingBuffer.GetHandle());
 
     //TODO: Render: Add code for more jobs than modeljobs.
@@ -358,7 +367,6 @@ void PickingPass::Draw(RenderScene& scene)
 
 void PickingPass::ClearPicking()
 {
-    GLERROR("PRE");
     m_PickingColorsToEntity.clear();
     m_EntityColors.clear();
     m_ColorCounter[0] = 0;
@@ -368,13 +376,14 @@ void PickingPass::ClearPicking()
     glClearColor(0.f, 0.f, 0.f, 0.f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     m_PickingBuffer.Unbind();
-    GLERROR("END");
 }
 
 
 void PickingPass::OnWindowResize()
 {
     InitializeTextures();
+    glBindRenderbuffer(GL_RENDERBUFFER, m_DepthBuffer);
+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
     m_PickingBuffer.Generate();
 }
 

src/Engine/Rendering/PickingPassState.cpp

@@ -3,9 +3,9 @@
 
 PickingPassState::PickingPassState(GLuint frameBuffer)
 {
-    GLERROR("PRE");
+    GLERROR("---2");
     BindFramebuffer(frameBuffer);
-    GLERROR("Bind Framebuffer");
+    GLERROR("---3");
     Enable(GL_DEPTH_TEST);
     Enable(GL_CULL_FACE);
     Disable(GL_BLEND);
@@ -13,7 +13,6 @@ PickingPassState::PickingPassState(GLuint frameBuffer)
     glm::vec4 clearColor = glm::vec4(0.f);
     //ClearColor(clearColor);
     //Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    GLERROR("END");
 }
 
 PickingPassState::~PickingPassState()

src/Engine/Rendering/RenderSystem.cpp

@@ -52,101 +52,6 @@ void RenderSystem::fillSprites(std::list<std::shared_ptr<RenderJob>>& jobs, Worl
             continue;
         }
 
-		glm::mat4 modelMatrix;
-
-		// See a sprite is an SpriteIndicator
-		bool isIndicator = false;
-		if (world->HasComponent(entity.ID, "SpriteIndicator"))
-		{
-			auto indicator = entity["SpriteIndicator"];
-
-			float minScale = (float)(double)indicator["MinScale"];
-			bool hasTeam = indicator["VisibleForSingleTeamOnly"];
-			isIndicator = true;
-			glm::vec3 pos = Transform::AbsolutePosition(entity);
-
-
-			EntityWrapper entityTeam;
-			if (hasTeam && (entity.HasComponent("Team") || entity.FirstParentWithComponent("Team").Valid()) && m_LocalPlayer.World != nullptr) {
-				if (!entity.HasComponent("Team")) {
-					entityTeam = entity.FirstParentWithComponent("Team");
-				}
-				else {
-					entityTeam = entity;
-				}
-
-				ComponentWrapper& entityTeamComponent = entityTeam["Team"];
-				ComponentWrapper& localComponent = m_LocalPlayer["Team"];
-				int entityTeamInt = entityTeamComponent["Team"];
-				int localComponentInt = localComponent["Team"];
-				int SpectatorInt = localComponent["Team"].Enum("Spectator");
-				if (entityTeamInt != localComponentInt && localComponentInt != SpectatorInt) {
-					continue;
-				}
-			}
-
-			// Code for check if sprite is inside or outside of screen
-			//glm::vec4 projectedPos = m_Camera->ProjectionMatrix() * m_Camera->ViewMatrix() * glm::vec4(pos, 1.0f);
-			//projectedPos /= projectedPos.w;
-			//// Check if inside of outside of screen.
-			//if (projectedPos.x < -1.0f || projectedPos.x > 1.0f || projectedPos.y < -1.0f || projectedPos.y > 1.0f) {
-			//	// is outside of screen
-			//} else {
-			//	// is inside of screen
-			//}
-
-
-			glm::vec3 zAxis = glm::vec3(0.0f, 1.0f, 0.0f);
-			glm::vec3 normal = pos - m_Camera->Position();
-
-			//float distance = glm::length(normal);
-			//if (distance < minDistance) {
-			//	pos = pos - glm::normalize(normal) * (distance - minDistance);
-			//} else if (distance > maxDistance) {
-			//	pos = pos - glm::normalize(normal) * (distance - maxDistance);
-			//}
-			normal.y = 0;
-			normal = glm::normalize(normal);
-			glm::vec3 right = glm::cross(normal, zAxis);
-			glm::vec3 up = glm::cross(right, normal);
-
-			modelMatrix[0][0] = right.x;
-			modelMatrix[0][1] = right.y;
-			modelMatrix[0][2] = right.z;
-			modelMatrix[0][3] = 0.0f;
-
-			modelMatrix[1][0] = zAxis.x;
-			modelMatrix[1][1] = zAxis.y;
-			modelMatrix[1][2] = zAxis.z;
-			modelMatrix[1][3] = 0.0f;
-
-			modelMatrix[2][0] = normal.x;
-			modelMatrix[2][1] = normal.y;
-			modelMatrix[2][2] = normal.z;
-			modelMatrix[2][3] = 0.0f;
-
-			modelMatrix[3][0] = pos.x;
-			modelMatrix[3][1] = pos.y;
-			modelMatrix[3][2] = pos.z;
-			modelMatrix[3][3] = 1.0f;
-
-			glm::mat4 tranformationMatrix = modelMatrix * glm::scale(Transform::AbsoluteScale(entity));
-			glm::vec4 tmp = tranformationMatrix * glm::vec4(glm::vec3(0.5, 0.5, 0), 1.0f);
-			glm::vec2 projectedTopRight = m_Camera->WorldToScreen(glm::vec3(tmp), m_Renderer->GetViewportSize());
-			tmp = tranformationMatrix * glm::vec4(glm::vec3(-0.5, -0.5, 0), 1.0f);
-			glm::vec2 projectedBottomLeft = m_Camera->WorldToScreen(glm::vec3(tmp), m_Renderer->GetViewportSize());
-
-			float diag = glm::length(projectedBottomLeft - projectedTopRight);
-			if (diag < minScale) {
-				tranformationMatrix = tranformationMatrix * glm::scale(glm::vec3(minScale / diag, minScale / diag, minScale / diag));
-			}
-			modelMatrix = tranformationMatrix;
-		}
-		else {
-			modelMatrix = Transform::ModelMatrix(entity.ID, world);
-		}
-
-
         std::string diffuseResource = cSprite["DiffuseTexture"];
         std::string glowResource = cSprite["GlowMap"];
         bool depthSorted = cSprite["DepthSort"];
@@ -162,7 +67,11 @@ void RenderSystem::fillSprites(std::list<std::shared_ptr<RenderJob>>& jobs, Worl
             fillColor = (glm::vec4)fillComponent["Color"];
         }
 
-        std::shared_ptr<SpriteJob> spriteJob = std::shared_ptr<SpriteJob>(new SpriteJob(cSprite, m_Camera, modelMatrix, world, fillColor, fillPercentage, depthSorted, isIndicator));
+        glm::mat4 modelMatrix = Transform::ModelMatrix(entity.ID, world);
+        //modelMatrix *= m_Camera->BillboardMatrix();
+
+
+        std::shared_ptr<SpriteJob> spriteJob = std::shared_ptr<SpriteJob>(new SpriteJob(cSprite, m_Camera, modelMatrix, world, fillColor, fillPercentage, depthSorted));
         
         jobs.push_back(spriteJob);
     }
@@ -184,6 +93,7 @@ bool RenderSystem::isEntityVisible(EntityWrapper& entity)
     ) {
         return false;
     }
+
     return true;
 }
 

src/Engine/Rendering/Renderer.cpp

@@ -30,7 +30,6 @@ void Renderer::glfwFrameBufferCallback(GLFWwindow* window, int width, int height
     currentRenderer->m_LightCullingPass->OnWindowResize();
     currentRenderer->m_PickingPass->OnWindowResize();
     currentRenderer->m_DrawBloomPass->OnWindowResize();
-	currentRenderer->m_SSAOPass->OnWindowResize();
 }
 
 void Renderer::InitializeWindow()
@@ -89,6 +88,9 @@ void Renderer::InitializeShaders()
     //m_ExplosionEffectProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/ExplosionEffect.frag.glsl")));
     //m_ExplosionEffectProgram->Compile();
     //m_ExplosionEffectProgram->Link();
+
+
+
 }
 
 void Renderer::InputUpdate(double dt)
@@ -106,14 +108,7 @@ void Renderer::Update(double dt)
 
 void Renderer::Draw(RenderFrame& frame)
 {
-    GLERROR("PRE");
     ImGui::Combo("Draw textures", &m_DebugTextureToDraw, "Final\0Scene\0Bloom\0SceneLowRes\0BloomLowRes\0Gaussian\0Picking\0Ambient Occlusion");
-    ImGui::Combo("CubeMap", &m_CubeMapTexture, "Nevada(512)\0Sky(1024)");
-    if(m_CubeMapTexture == 0) {
-        m_CubeMapPass->LoadTextures("Nevada");
-    } else if (m_CubeMapTexture == 1) {
-        m_CubeMapPass->LoadTextures("Sky");
-    }
 
 	ImGui::SliderFloat("SSAO sample radius", &m_SSAO_Radius, 0.01f, 5.0f);
 	ImGui::SliderFloat("SSAO bias", &m_SSAO_Bias, 0.0f, 0.1f);
@@ -122,7 +117,6 @@ void Renderer::Draw(RenderFrame& frame)
 	ImGui::SliderInt("SSAO Number of Samples", &m_SSAO_NumOfSamples, 2, 100);
 	ImGui::SliderInt("SSAO Number of Turns", &m_SSAO_NumOfTurns, 0, 50);
 	m_SSAOPass->Setting(m_SSAO_Radius, m_SSAO_Bias, m_SSAO_Contrast, m_SSAO_IntensityScale, m_SSAO_NumOfSamples, m_SSAO_NumOfTurns);
-    GLERROR("SSAO Settings");
     //clear buffer 0
     glClearColor(0.f, 0.f, 0.f, 0.f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -132,9 +126,7 @@ void Renderer::Draw(RenderFrame& frame)
     m_PickingPass->ClearPicking();
     m_DrawFinalPass->ClearBuffer();
     m_DrawBloomPass->ClearBuffer();
-	m_SSAOPass->ClearBuffer();
     PerformanceTimer::StopTimer("Renderer-ClearBuffers");
-    GLERROR("ClearBuffers");
 	for (auto scene : frame.RenderScenes) {
 		PerformanceTimer::StartTimer("Renderer-Depth");
 		m_PickingPass->Draw(*scene);
@@ -247,10 +239,9 @@ void Renderer::InitializeRenderPasses()
 {
     m_PickingPass = new PickingPass(this, m_EventBroker);
     m_LightCullingPass = new LightCullingPass(this);
-    m_CubeMapPass = new CubeMapPass(this);
-    m_DrawFinalPass = new DrawFinalPass(this, m_LightCullingPass, m_CubeMapPass);
+    m_DrawFinalPass = new DrawFinalPass(this, m_LightCullingPass);
     m_DrawScreenQuadPass = new DrawScreenQuadPass(this);
     m_DrawBloomPass = new DrawBloomPass(this);
     m_DrawColorCorrectionPass = new DrawColorCorrectionPass(this);
-    m_SSAOPass = new SSAOPass(this);
+	m_SSAOPass = new SSAOPass(this);
 }

src/Engine/Rendering/SSAOPass.cpp

@@ -6,7 +6,6 @@ SSAOPass::SSAOPass(IRenderer* renderer)
 
 	m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.mesh");
 
-	InitializeTexture();
 	InitializeBuffer();
 	InitializeShaderProgram();
 	Setting(0.1f, 0.012f, 1.0f, 1.0f, 13, 7);
@@ -29,16 +28,16 @@ void SSAOPass::InitializeShaderProgram()
 	m_SSAOViewSpaceZProgram->Link();
 }
 
-void SSAOPass::InitializeTexture() {
-	GenerateTexture(&m_SSAOTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_R8, GL_RED, GL_FLOAT);
-	GenerateTexture(&m_SSAOViewSpaceZTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_R32F, GL_RED, GL_FLOAT);
-}
 
 void SSAOPass::InitializeBuffer()
 {
+	GenerateTexture(&m_SSAOTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_R8, GL_RED, GL_FLOAT);
+
 	m_SSAOFramBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_SSAOTexture, GL_COLOR_ATTACHMENT0)));
 	m_SSAOFramBuffer.Generate();
 
+	GenerateTexture(&m_SSAOViewSpaceZTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_R32F, GL_RED, GL_FLOAT);
+
 	m_SSAOViewSpaceZFramBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_SSAOViewSpaceZTexture, GL_COLOR_ATTACHMENT0)));
 	m_SSAOViewSpaceZFramBuffer.Generate();
 }
@@ -46,12 +45,12 @@ void SSAOPass::InitializeBuffer()
 void SSAOPass::ClearBuffer()
 {
 	m_SSAOFramBuffer.Bind();
-	glClearColor(1.f, 1.f, 1.f, 1.f);
+	glClearColor(0.f, 0.f, 0.f, 0.f);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	m_SSAOFramBuffer.Unbind();
 
 	m_SSAOViewSpaceZFramBuffer.Bind();
-	glClearColor(1.f, 1.f, 1.f, 1.f);
+	glClearColor(0.f, 0.f, 0.f, 0.f);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	m_SSAOViewSpaceZFramBuffer.Unbind();
 }
@@ -137,9 +136,6 @@ void SSAOPass::Draw(GLuint depthBuffer, Camera* camera)
 	m_DrawBloomPass->Draw(m_SSAOTexture);
 }
 
-void SSAOPass::OnWindowResize() {
-	m_DrawBloomPass->OnWindowResize();
-	InitializeTexture();
-	m_SSAOFramBuffer.Generate();
-	m_SSAOViewSpaceZFramBuffer.Generate();
+void ComputeAO(GLuint depthBuffer, Camera* camera) {
+
 }

src/Engine/Rendering/Texture.cpp

@@ -18,7 +18,6 @@ Texture::Texture(std::string path)
 
     this->Width = img->Width;
     this->Height = img->Height;
-    this->Data = img->Data;
 
     GLint format;
     switch (img->Format) {
@@ -29,7 +28,6 @@ Texture::Texture(std::string path)
         format = GL_RGBA;
         break;
     }
-    
 
     // Construct the OpenGL texture
     glGenTextures(1, &m_Texture);

src/Game/CMakeLists.txt

@@ -33,10 +33,16 @@ file(GLOB SOURCE_FILES_Network
 	"Network/*.cpp"
 )
 source_group(Network FILES ${SOURCE_FILES_Network})
+
+file(GLOB SOURCE_FILES
+    "${INCLUDE_PATH}/*.h"
+    "*.cpp"
+)
+list(REMOVE_ITEM SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/main.cpp")
+source_group(Game FILES ${SOURCE_FILES})
+
 set(SOURCE_FILES
     ${SOURCE_FILES}
-    "Game.cpp"
-	"MiniDump.cpp"
     ${SOURCE_FILES_Systems}
     ${SOURCE_FILES_Systems_Weapon}
     ${SOURCE_FILES_Events}

src/Game/CapturePointsEntitySystem.cpp

@@ -0,0 +1,98 @@
+#include "CapturePointsEntitySystem.h"
+#include "Systems/InterpolationSystem.h"
+#include "Systems/SoundSystem.h"
+#include "Systems/RaptorCopterSystem.h"
+#include "Systems/ExplosionEffectSystem.h"
+#include "Systems/HealthSystem.h"
+#include "Systems/PlayerMovementSystem.h"
+#include "Systems/SpawnerSystem.h"
+#include "Systems/PlayerSpawnSystem.h"
+#include "Systems/Weapon/WeaponSystem.h"
+#include "Systems/LifetimeSystem.h"
+#include "Systems/CapturePointSystem.h"
+#include "Systems/CapturePointHUDSystem.h"
+#include "Systems/PickupSpawnSystem.h"
+#include "Systems/AmmoPickupSystem.h"
+#include "Systems/DamageIndicatorSystem.h"
+#include "Systems/AmmunitionHUDSystem.h"
+#include "Systems/KillFeedSystem.h"
+#include "GUI/ButtonSystem.h"
+#include "GUI/MainMenuSystem.h"
+#include "Collision/FillOctreeSystem.h"
+#include "Collision/FillFrustumOctreeSystem.h"
+#include "Rendering/AnimationSystem.h"
+#include "Core/UniformScaleSystem.h"
+#include "Systems/HealthHUDSystem.h"
+#include "Systems/PlayerDeathSystem.h"
+#include "Rendering/BoneAttachmentSystem.h"
+#include "Collision/CollisionSystem.h"
+#include "Collision/TriggerSystem.h"
+#include "Rendering/RenderSystem.h"
+#include "Editor/EditorSystem.h"
+
+CapturePointsEntitySystem::CapturePointsEntitySystem(EventBroker* eventBroker, bool isClient, bool isServer, IRenderer* renderer, RenderFrame* renderFrame)
+    : EntitySystem(eventBroker, isClient, isServer)
+    , m_Renderer(renderer)
+    , m_RenderFrame(renderFrame)
+{
+    // Create Octrees
+    // TODO: Perhaps the world bounds should be set in some non-arbitrary way instead of this.
+    AABB boxContainingTheWorld(glm::vec3(-300), glm::vec3(300));
+    m_OctreeCollision = new Octree<EntityAABB>(boxContainingTheWorld, 4);
+    m_OctreeTrigger = new Octree<EntityAABB>(boxContainingTheWorld, 4);
+    m_OctreeFrustrumCulling = new Octree<EntityAABB>(boxContainingTheWorld, 4);
+    
+    // All systems with orderlevel 0 will be updated first.
+    unsigned int updateOrderLevel = 0;
+    AddSystem<InterpolationSystem>(updateOrderLevel);
+    ++updateOrderLevel;
+    AddSystem<SoundSystem>(updateOrderLevel);
+    AddSystem<RaptorCopterSystem>(updateOrderLevel);
+    AddSystem<ExplosionEffectSystem>(updateOrderLevel);
+    AddSystem<HealthSystem>(updateOrderLevel);
+    AddSystem<PlayerMovementSystem>(updateOrderLevel);
+    AddSystem<SpawnerSystem>(updateOrderLevel);
+    AddSystem<PlayerSpawnSystem>(updateOrderLevel);
+    AddSystem<WeaponSystem>(updateOrderLevel, m_Renderer, m_OctreeCollision);
+    AddSystem<LifetimeSystem>(updateOrderLevel);
+    AddSystem<CapturePointSystem>(updateOrderLevel);
+    AddSystem<CapturePointHUDSystem>(updateOrderLevel);
+    AddSystem<PickupSpawnSystem>(updateOrderLevel);
+    AddSystem<AmmoPickupSystem>(updateOrderLevel);
+    AddSystem<DamageIndicatorSystem>(updateOrderLevel);
+    AddSystem<AmmunitionHUDSystem>(updateOrderLevel);
+    AddSystem<KillFeedSystem>(updateOrderLevel);
+    AddSystem<ButtonSystem>(updateOrderLevel, m_Renderer);
+    AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);
+    // Populate Octree with collidables
+    ++updateOrderLevel;
+    AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
+    AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
+    AddSystem<FillFrustumOctreeSystem>(updateOrderLevel, m_OctreeFrustrumCulling);
+    AddSystem<AnimationSystem>(updateOrderLevel);
+    AddSystem<UniformScaleSystem>(updateOrderLevel);
+    AddSystem<HealthHUDSystem>(updateOrderLevel);
+    AddSystem<PlayerDeathSystem>(updateOrderLevel);
+    // Collision and TriggerSystem should update after player.
+    ++updateOrderLevel;
+    AddSystem<BoneAttachmentSystem>(updateOrderLevel);
+    AddSystem<CollisionSystem>(updateOrderLevel, m_OctreeCollision);
+    AddSystem<TriggerSystem>(updateOrderLevel, m_OctreeTrigger);
+    ++updateOrderLevel;
+    AddSystem<RenderSystem>(updateOrderLevel, m_Renderer, m_RenderFrame, m_OctreeFrustrumCulling);
+    ++updateOrderLevel;
+    AddSystem<EditorSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);
+}
+
+CapturePointsEntitySystem::~CapturePointsEntitySystem()
+{
+    if (m_OctreeFrustrumCulling != nullptr) {
+        delete m_OctreeFrustrumCulling;
+    }
+    if (m_OctreeCollision != nullptr) {
+        delete m_OctreeCollision;
+    }
+    if (m_OctreeTrigger != nullptr) {
+        delete m_OctreeTrigger;
+    }
+}

src/Game/Game.cpp

@@ -1,34 +1,8 @@
 #include "Game.h"
-#include "Collision/FillOctreeSystem.h"
-#include "Collision/FillFrustumOctreeSystem.h"
-#include "Collision/EntityAABB.h"
-#include "Collision/TriggerSystem.h"
-#include "Collision/CollisionSystem.h"
-#include "Systems/RaptorCopterSystem.h"
-#include "Systems/HealthSystem.h"
-#include "Systems/PlayerMovementSystem.h"
-#include "Systems/SpawnerSystem.h"
-#include "Systems/PlayerSpawnSystem.h"
-#include "Systems/PlayerDeathSystem.h"
 #include "Core/EntityFileWriter.h"
-#include "Game/Systems/CapturePointSystem.h"
-#include "Game/Systems/CapturePointHUDSystem.h"
-#include "Game/Systems/PickupSpawnSystem.h"
-#include "Game/Systems/AmmoPickupSystem.h"
-#include "Game/Systems/DamageIndicatorSystem.h"
-#include "Game/Systems/Weapon/WeaponSystem.h"
-#include "Rendering/AnimationSystem.h"
-#include "Game/Systems/HealthHUDSystem.h"
-#include "Rendering/BoneAttachmentSystem.h"
-#include "Game/Systems/LifetimeSystem.h"
-#include "../Engine/Core/UniformScaleSystem.h"
-#include "Rendering/AnimationSystem.h"
 #include "Network/MultiplayerSnapshotFilter.h"
-#include "Game/Systems/AmmunitionHUDSystem.h"
-#include "Game/Systems/KillFeedSystem.h"
-#include "GUI/ButtonSystem.h"
-#include "GUI/MainMenuSystem.h"
-
+#include "Systems/PlayerSpawnSystem.h"
+#include "CapturePointsEntitySystem.h"
 
 Game::Game(int argc, char* argv[])
 {
@@ -48,6 +22,7 @@ Game::Game(int argc, char* argv[])
     ResourceManager::UseThreading = m_Config->Get<bool>("Multithreading.ResourceLoading", true);
     DisableMemoryPool::Value = m_Config->Get<bool>("Debug.DisableMemoryPool", false);
     LOG_LEVEL = static_cast<_LOG_LEVEL>(m_Config->Get<int>("Debug.LogLevel", 1));
+    // HACK: This shouldn't be a config variable
     PlayerSpawnSystem::SetRespawnTime(m_Config->Get<float>("Debug.RespawnTime", 15.0f));
 
     // Create the core event broker
@@ -74,91 +49,30 @@ Game::Game(int argc, char* argv[])
     m_InputProxy->AddHandler<MouseInputHandler>();
     m_InputProxy->LoadBindings("Input.ini");
 
-    // Create a world
-    m_World = new World(m_EventBroker);
-    std::string mapToLoad = m_Config->Get<std::string>("Debug.LoadMap", "");
-    if (!mapToLoad.empty()) {
-        auto file = ResourceManager::Load<EntityFile>(mapToLoad);
-        EntityFilePreprocessor fpp(file);
-        fpp.RegisterComponents(m_World);
-        EntityFileParser fp(file);
-        fp.MergeEntities(m_World);
-    }
-
     // Create the sound manager
-    m_SoundManager = new SoundManager(m_World, m_EventBroker);
+    //m_SoundManager = new SoundManager(m_World, m_EventBroker);
+
+    // Create an entity system
+    m_EntitySystem = new CapturePointsEntitySystem(m_EventBroker, m_IsClient, m_IsServer, m_Renderer, m_RenderFrame);
 
     // Initialize network
     if (m_Config->Get<bool>("Networking.StartNetwork", false)) {
         if (m_IsServer) {
-            m_NetworkServer = new Server(m_World, m_EventBroker, m_NetworkPort);
+            m_NetworkServer = new Server(m_EntitySystem, m_EventBroker, m_NetworkPort);
             m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " SERVER");
         } else if (m_IsClient) {
-            m_NetworkClient = new Client(m_World, m_EventBroker, std::make_unique<MultiplayerSnapshotFilter>(m_EventBroker));
+            m_NetworkClient = new Client(m_EntitySystem, m_EventBroker, std::make_unique<MultiplayerSnapshotFilter>(m_EventBroker));
             m_NetworkClient->Connect(m_NetworkAddress, m_NetworkPort);
             m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " CLIENT");
         }
     }
 
-    // Create Octrees
-    // TODO: Perhaps the world bounds should be set in some non-arbitrary way instead of this.
-    AABB boxContainingTheWorld(glm::vec3(-300), glm::vec3(300));
-    m_OctreeCollision = new Octree<EntityAABB>(boxContainingTheWorld, 4);
-    m_OctreeTrigger = new Octree<EntityAABB>(boxContainingTheWorld, 4);
-    m_OctreeFrustrumCulling = new Octree<EntityAABB>(boxContainingTheWorld, 4);
-    // Create system pipeline
-    m_SystemPipeline = new SystemPipeline(m_World, m_EventBroker, m_IsClient, m_IsServer);
-
-    // All systems with orderlevel 0 will be updated first.
-    unsigned int updateOrderLevel = 0;
-    m_SystemPipeline->AddSystem<InterpolationSystem>(updateOrderLevel);
-    ++updateOrderLevel;
-    m_SystemPipeline->AddSystem<SoundSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<RaptorCopterSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<ExplosionEffectSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<HealthSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<PlayerMovementSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<SpawnerSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<PlayerSpawnSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<WeaponSystem>(updateOrderLevel, m_Renderer, m_OctreeCollision);
-    m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<CapturePointHUDSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<PickupSpawnSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<AmmoPickupSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<AmmunitionHUDSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<ButtonSystem>(updateOrderLevel, m_Renderer);
-    m_SystemPipeline->AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);
-    // Populate Octree with collidables
-    ++updateOrderLevel;
-    m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
-    m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
-    m_SystemPipeline->AddSystem<FillFrustumOctreeSystem>(updateOrderLevel, m_OctreeFrustrumCulling);
-    m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<UniformScaleSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<HealthHUDSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<PlayerDeathSystem>(updateOrderLevel);
-    // Collision and TriggerSystem should update after player.
-    ++updateOrderLevel;
-    m_SystemPipeline->AddSystem<BoneAttachmentSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<CollisionSystem>(updateOrderLevel, m_OctreeCollision);
-    m_SystemPipeline->AddSystem<TriggerSystem>(updateOrderLevel, m_OctreeTrigger);
-    ++updateOrderLevel;
-    m_SystemPipeline->AddSystem<RenderSystem>(updateOrderLevel, m_Renderer, m_RenderFrame, m_OctreeFrustrumCulling);
-    ++updateOrderLevel;
-    m_SystemPipeline->AddSystem<EditorSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);
-
     m_LastTime = glfwGetTime();
 }
 
 Game::~Game()
 {
-    delete m_SystemPipeline;
-    delete m_OctreeFrustrumCulling;
-    delete m_OctreeCollision;
-    delete m_OctreeTrigger;
+    delete m_EntitySystem;
     delete m_SoundManager;
     if (m_NetworkClient != nullptr) {
         delete m_NetworkClient;
@@ -166,7 +80,6 @@ Game::~Game()
     if (m_NetworkServer != nullptr) {
         delete m_NetworkServer;
     }
-    delete m_World;
     delete m_InputProxy;
     delete m_InputManager;
     delete m_RenderFrame;
@@ -195,7 +108,7 @@ void Game::Tick()
     m_EventBroker->Swap();
 
     PerformanceTimer::StartTimerAndStopPrevious("SoundManager");
-    m_SoundManager->Update(dt);
+    //m_SoundManager->Update(dt);
 
     // Update network
     PerformanceTimer::StartTimerAndStopPrevious("Network");
@@ -209,9 +122,9 @@ void Game::Tick()
     //m_SoundManager->Update(dt);
 
     // Iterate through systems and update world!
-    PerformanceTimer::StartTimerAndStopPrevious("SystemPipeline");
+    PerformanceTimer::StartTimerAndStopPrevious("EntitySystem");
     m_EventBroker->Process<SystemPipeline>();
-    m_SystemPipeline->Update(dt);
+    m_EntitySystem->Update(dt);
     PerformanceTimer::StartTimerAndStopPrevious("RendererUpdate");
     m_Renderer->Update(dt);
     PerformanceTimer::StartTimerAndStopPrevious("RendererDraw");

src/Game/Systems/AmmoPickupSystem.cpp

@@ -29,7 +29,6 @@ void AmmoPickupSystem::Update(double dt)
             newAmmoPickupEntity["Transform"]["Position"] = ammoPickupPosition.Pos;
             newAmmoPickupEntity["AmmoPickup"]["AmmoGain"] = ammoPickupPosition.AmmoGain;
             newAmmoPickupEntity["AmmoPickup"]["RespawnTimer"] = ammoPickupPosition.RespawnTimer;
-            m_World->SetParent(newAmmoPickupEntity.ID, ammoPickupPosition.parentID);
 
             //erase the current element (AmmoPickupPosition)
             m_ETriggerTouchVector.erase(it);
@@ -70,8 +69,8 @@ bool AmmoPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
 
     //copy position, ammogain, respawntimer (twice since one of the values will be counted down to 0, the other will be set in the new object)
     //we need to copy all values since each value can be different for each ammoPickup
-    m_ETriggerTouchVector.push_back({ e.Trigger["Transform"]["Position"], e.Trigger["AmmoPickup"]["AmmoGain"],
-        e.Trigger["AmmoPickup"]["RespawnTimer"], e.Trigger["AmmoPickup"]["RespawnTimer"], m_World->GetParent(e.Trigger.ID) });
+    m_ETriggerTouchVector.push_back({ (glm::vec3)e.Trigger["Transform"]["Position"] ,e.Trigger["AmmoPickup"]["AmmoGain"],
+        e.Trigger["AmmoPickup"]["RespawnTimer"],e.Trigger["AmmoPickup"]["RespawnTimer"] });
 
     //delete the ammopickup
     m_World->DeleteEntity(e.Trigger.ID);

src/Game/Systems/CapturePointSystem.cpp

@@ -1,34 +1,32 @@
 #include "Systems/CapturePointSystem.h"
 #include <algorithm>
 
-CapturePointSystem::CapturePointSystem(SystemParams params)
+CapturePointSystem::CapturePointSystem(SystemParams params) 
     : System(params)
     , PureSystem("CapturePoint")
 {
     //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker)
-    EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &CapturePointSystem::OnTriggerTouch);
-    EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &CapturePointSystem::OnTriggerLeave);
-    EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &CapturePointSystem::OnCaptured);
-
+    if (IsClient) {
+        EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &CapturePointSystem::OnTriggerTouch);
+        EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &CapturePointSystem::OnTriggerLeave);
+        EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &CapturePointSystem::OnCaptured);
+    }
 }
 
 //here all capturepoints will update their component
 //NOTE: needs to run each frame, since we're possibly modifying the captureTimer for the capturePoints by dt
 void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, ComponentWrapper& cCapturePoint, double dt)
 {
+    if (!IsClient) {
+        return;
+    }
+
     if (m_WinnerWasFound) {
         return;
     }
     const int capturePointNumber = cCapturePoint["CapturePointNumber"];
     const bool hasTeamComponent = capturePointEntity.HasComponent("Team");
 
-    if (m_NumberOfCapturePoints != 0) {
-        if (!m_CapturePointNumberToEntityMap[0].HasComponent("CapturePoint")) {
-            //if map has changed, the capturepoints has changed, now have to redo them
-            m_NumberOfCapturePoints = 0;
-            m_CapturePointNumberToEntityMap.clear();
-        }
-    }
     //if point doesnt have a teamComponent yet, add one. since:
     //what if capture point has no team -> we cant get/use the team enum from it...
     if (!hasTeamComponent) {
@@ -73,7 +71,8 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
     std::map<std::string, int> nextPossibleCapturePoint;
     nextPossibleCapturePoint["Red"] = -1;
     nextPossibleCapturePoint["Blue"] = -1;
-    for (int i = 0; i < m_NumberOfCapturePoints; i++) {
+    for (int i = 0; i < m_NumberOfCapturePoints; i++)
+    {
         if (!m_CapturePointNumberToEntityMap[i].HasComponent("Team")) {
             continue;
         }
@@ -85,7 +84,8 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
             nextPossibleCapturePoint["Blue"] = i + 1;
         }
     }
-    for (int i = m_NumberOfCapturePoints - 1; i >= 0; i--) {
+    for (int i = m_NumberOfCapturePoints - 1; i >= 0; i--)
+    {
         if (!m_CapturePointNumberToEntityMap[i].HasComponent("Team")) {
             continue;
         }
@@ -100,7 +100,8 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
 
     //reset timers and reset the bool that triggers this
     if (m_ResetTimers) {
-        for (int i = 0; i < m_NumberOfCapturePoints; i++) {
+        for (int i = 0; i < m_NumberOfCapturePoints; i++)
+        {
             ComponentWrapper& capturePoint = m_CapturePointNumberToEntityMap[i]["CapturePoint"];
             if ((int)capturePoint["CapturePointNumber"] != nextPossibleCapturePoint["Red"] &&
                 (int)capturePoint["CapturePointNumber"] != nextPossibleCapturePoint["Blue"]) {
@@ -115,7 +116,8 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
     }
 
     //check how many players are standing inside and are healthy
-    for (size_t i = m_ETriggerTouchVector.size(); i > 0; i--) {
+    for (size_t i = m_ETriggerTouchVector.size(); i > 0; i--)
+    {
         auto triggerTouched = m_ETriggerTouchVector[i - 1];
         if (std::get<1>(triggerTouched) == capturePointEntity) {
             //some player has touched this - lets figure out: what team, health
@@ -174,8 +176,8 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
             cCapturePoint["CaptureTimer"] = (double)cCapturePoint["CaptureTimer"] + timerDeltaChange;
         }
         //if capturePoint is owned by the team, and the other team has been trying to take it, then increase/decrease the timer towards 0.0
-        if ((ownedBy == currentTeam && currentTeam == redTeam && (double)cCapturePoint["CaptureTimer"] < captureTimeToTakeOver) ||
-            (ownedBy == currentTeam && currentTeam == blueTeam && (double)cCapturePoint["CaptureTimer"] > -captureTimeToTakeOver)) {
+        if ((ownedBy == currentTeam && currentTeam == redTeam && (double)cCapturePoint["CaptureTimer"] < 0.0) ||
+            (ownedBy == currentTeam && currentTeam == blueTeam && (double)cCapturePoint["CaptureTimer"] > 0.0)) {
             cCapturePoint["CaptureTimer"] = (double)cCapturePoint["CaptureTimer"] + timerDeltaChange;
         }
         //check if captureTimer > captureTimeToTakeOver and if so change owner and publish the eCaptured event
@@ -190,24 +192,6 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
             //NextPossibleCapturePoint will be calculated in the next update...
         }
     }
-
-    //check for possible winCondition = check if the homebase is owned by the other team
-    bool checkForWinner = false;
-    if (capturePointNumber == m_RedTeamHomeCapturePoint && ownedBy != redTeam) {
-        checkForWinner = true;
-    }
-    if (capturePointNumber == m_BlueTeamHomeCapturePoint && ownedBy != blueTeam) {
-        checkForWinner = true;
-    }
-
-    if (checkForWinner && !m_WinnerWasFound) {
-        //publish Win event
-        Events::Win e;
-        e.TeamThatWon = ownedBy;
-        m_EventBroker->Publish(e);
-        m_WinnerWasFound = true;
-    }
-
 }
 
 bool CapturePointSystem::OnTriggerTouch(const Events::TriggerTouch& e)
@@ -219,7 +203,8 @@ bool CapturePointSystem::OnTriggerTouch(const Events::TriggerTouch& e)
 
 bool CapturePointSystem::OnTriggerLeave(const Events::TriggerLeave& e)
 {
-    for (size_t i = 0; i < m_ETriggerTouchVector.size(); i++) {
+    for (size_t i = 0; i < m_ETriggerTouchVector.size(); i++)
+    {
         auto triggerTouched = m_ETriggerTouchVector[i];
         if (std::get<0>(triggerTouched) == e.Entity && std::get<1>(triggerTouched) == e.Trigger) {
             m_ETriggerTouchVector.erase(m_ETriggerTouchVector.begin() + i);

src/Game/Systems/CapturePointsGamemode.cpp

@@ -0,0 +1,117 @@
+#include "Systems/CapturePointsGamemode.h"
+
+CapturePointsGamemode::CapturePointsGamemode(SystemParams params)
+    : System(params)
+{
+    EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &CapturePointsGamemode::OnCaptured);
+    EVENT_SUBSCRIBE_MEMBER(m_EGameStart, &CapturePointsGamemode::OnGameStart);
+}
+
+void CapturePointsGamemode::Update(double dt)
+{
+    if (!m_GameRuning) {
+        return;
+    }
+
+    auto cGamemode = currentGamemode();
+    if (!cGamemode) {
+        setRunning(false);
+        return;
+    }
+
+    m_GameTime += dt;
+    (double&)(*cGamemode)["RoundTime"] = m_GameTime;
+}
+
+bool CapturePointsGamemode::OnGameStart(const Events::GameStart& e)
+{
+    if (!isCurrentGamemode()) {
+        return false;
+    }
+
+    setRunning(true);
+
+    return true;
+}
+
+bool CapturePointsGamemode::OnCaptured(const Events::Captured& e)
+{
+    if (!m_GameRuning) {
+        return false;
+    }
+
+    auto cGamemode = currentGamemode();
+    if (!cGamemode) {
+        return false;
+    }
+
+    auto winningTeam = winCondition();
+    if (winningTeam) {
+        setRunning(false);
+
+        Events::Win e;
+        e.Team = *winningTeam;
+        m_EventBroker->Publish(e);
+    }
+
+    return true;
+}
+
+boost::optional<ComponentWrapper> CapturePointsGamemode::currentGamemode()
+{
+    auto cGamemodes = m_World->GetComponents("Gamemode");
+    if (cGamemodes->begin() == cGamemodes->end()) {
+        return boost::none;
+    }
+    return *cGamemodes->begin();
+}
+
+bool CapturePointsGamemode::isCurrentGamemode()
+{
+    auto cGamemode = currentGamemode();
+    if (!cGamemode) {
+        return false;
+    }
+
+    // Check that we're the current gamemode
+    if ((ComponentInfo::EnumType)(*cGamemode)["Gamemode"] == (*cGamemode)["Gamemode"].Enum("CapturePoints")) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+boost::optional<ComponentInfo::EnumType> CapturePointsGamemode::winCondition()
+{
+    auto cCapturePoints = m_World->GetComponents("CapturePoint");
+    
+    // If all capture points are owned by the same team, they won
+    ComponentInfo::EnumType winningTeam = -1;
+    for (auto& c : *cCapturePoints) {
+        EntityWrapper e(m_World, c.EntityID);
+        ComponentInfo::EnumType team = e["Team"]["Team"];
+        if (winningTeam != -1 && winningTeam != team) {
+            return boost::none;
+        } else {
+            winningTeam = team;
+        }
+    }
+
+    return winningTeam;
+}
+
+void CapturePointsGamemode::setRunning(bool running)
+{
+    m_GameRuning = running;
+    if (running) {
+        m_GameTime = 0.0;
+    }
+
+    auto cGamemode = currentGamemode();
+    if (cGamemode) {
+        m_GameRuning = running;
+        if (running) {
+            (*cGamemode)["RoundTime"] = 0.0;
+        }
+    }
+}

src/Game/Systems/DamageIndicatorSystem.cpp

@@ -12,41 +12,51 @@ DamageIndicatorSystem::DamageIndicatorSystem(SystemParams params)
     auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/DamageIndicator.xml");
 }
 
-void DamageIndicatorSystem::Update(double dt) {
-    if (!IsServer) {
-        for (auto& iter = updateDamageIndicatorVector.begin(); iter != updateDamageIndicatorVector.end(); iter++) {
-            if (!iter->spriteEntity.Valid()) {
-                updateDamageIndicatorVector.erase(iter);
-                break;
-            }
-            auto angleBetweenVectors = CalculateAngle(LocalPlayer, iter->enemyPosition);
-            //simply set the rotation z-wise to the angleBetweenVectors
-            iter->spriteEntity["Transform"]["Orientation"] = glm::vec3(0, 0, angleBetweenVectors);
-        }
-    }
-}
-
 bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
 {
     if (m_CurrentCamera == EntityID_Invalid) {
         return false;
     }
 
+    //if (e.Victim != LocalPlayer) {
+    //    return false;
+    //}
     if (e.Victim.Valid() && e.Victim != LocalPlayer && !e.Victim.IsChildOf(LocalPlayer)) {
         return false;
     }
 
     if (!e.Inflictor.Valid() || !e.Victim.Valid()) {
-        return false;
+        return false; 
     }
 
-    glm::vec3 inflictorPos = e.Inflictor["Transform"]["Position"];
-    //if testing
-#ifdef INDICATOR_TEST
-        inflictorPos = DamageIndicatorTest(e.Victim);
-#endif
+    //grab players direction
+    auto playerOrientation = glm::quat((glm::vec3)e.Victim["Transform"]["Orientation"]);
 
-    float angleBetweenVectors = CalculateAngle(e.Victim, inflictorPos);
+    //get the position vectors, but ignore the y-height
+    auto enemyPosition = (glm::vec3)e.Inflictor["Transform"]["Position"];
+    auto playerPosition = (glm::vec3)e.Victim["Transform"]["Position"];
+    enemyPosition.y = 0.0f;
+    playerPosition.y = 0.0f;
+
+    //calculate the enemy to player vector
+    auto enemyPlayerVector = glm::normalize(playerPosition - enemyPosition);
+
+    //get angle from players current rotation, this angle is how much you rotate around the y-axis
+    auto playerAngle = glm::angle(playerOrientation);
+    auto playerRotationVector = glm::normalize(glm::rotateY(glm::vec3(0, 0, 1), playerAngle));
+
+    //dot product of players direction-vector and enemys-to-playervector will give the cos of the angle between the vectors
+    auto playerRotationDot = glm::dot(playerRotationVector, enemyPlayerVector);
+    //to get the angle between the vectors just do cos-inverse
+    auto angleBetweenVectors = glm::acos(playerRotationDot);
+
+    //rotate the direction-vector 90 degrees to get the players side-vector
+    auto playerSideVector = glm::normalize(glm::rotateY(glm::vec3(0, 0, 1), playerAngle + 1.57f));
+    //dot of sidevector positive = enemy is on the right side, dot sidevector negative = left side
+    auto playerSideVectorDot = glm::dot(playerSideVector, enemyPlayerVector);
+    if (playerSideVectorDot < 0) {
+        angleBetweenVectors = -angleBetweenVectors;
+    }
 
     //load & set the "2d" sprite
     auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/DamageIndicator.xml");
@@ -57,10 +67,6 @@ bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
     //simply set the rotation z-wise to the angleBetweenVectors
     spriteWrapper["Transform"]["Orientation"] = glm::vec3(0, 0, angleBetweenVectors);
 
-    if (!IsServer) {
-        updateDamageIndicatorVector.emplace_back(spriteWrapper, inflictorPos);
-    }
-
     return true;
 }
 
@@ -68,82 +74,3 @@ bool DamageIndicatorSystem::OnSetCamera(const Events::SetCamera& e) {
     m_CurrentCamera = e.CameraEntity.ID;
     return true;
 }
-
-float DamageIndicatorSystem::CalculateAngle(EntityWrapper player, glm::vec3 enemyPos) {
-    //grab players direction
-    auto playerOrientation = glm::quat((glm::vec3)player["Transform"]["Orientation"]);
-
-    //get the position vectors, but ignore the y-height
-    auto enemyPosition = enemyPos;
-    auto playerPosition = (glm::vec3)player["Transform"]["Position"];
-    enemyPosition.y = 0.0f;
-    playerPosition.y = 0.0f;
-
-    //calculate the enemy to player vector
-    auto enemyPlayerVector = glm::normalize(playerPosition - enemyPosition);
-
-    //get the rotationvector relative to the z-axis
-    auto rotationVectorVec3 = glm::vec3(glm::toMat4(Transform::AbsoluteOrientation(player))*glm::vec4(0, 0, 1, 0));
-    //rotate the direction-vector 90 degrees to get the players side-vector
-    auto playerSideVector = glm::vec3(glm::rotateY(rotationVectorVec3, 1.57f));
-
-    //dot product of players direction-vector and enemys-to-playervector will give the cos of the angle between the vectors
-    auto playerRotationDot = glm::dot(rotationVectorVec3, enemyPlayerVector);
-    //to get the angle between the vectors just do cos-inverse
-    auto angleBetweenVectors = glm::acos(playerRotationDot);
-
-    //dot of sidevector positive = enemy is on the right side, dot sidevector negative = left side
-    auto playerSideVectorDot = glm::dot(playerSideVector, enemyPlayerVector);
-    if (playerSideVectorDot < 0) {
-        angleBetweenVectors = -angleBetweenVectors;
-    }
-
-    return angleBetweenVectors;
-}
-#ifdef INDICATOR_TEST
-glm::vec3 DamageIndicatorSystem::DamageIndicatorTest(EntityWrapper player) {
-    auto currentPos = (glm::vec3)player["Transform"]["Position"];
-
-    auto testVar = 1;
-    auto testVar2 = 1;
-    if (m_TestVar % 4 == 0) {
-        testVar = -1;
-        testVar2 = 1;
-    }
-    if (m_TestVar % 4 == 1) {
-        testVar = 1;
-        testVar2 = 1;
-    }
-    if (m_TestVar % 4 == 2) {
-        testVar *= -1;
-        testVar2 = -1;
-    }
-    if (m_TestVar % 4 == 3) {
-        testVar = 1;
-        testVar2 = -1;
-    }
-    m_TestVar++;
-
-     auto inflictorPos = glm::vec3(currentPos.x + testVar*6.0f, currentPos.y, currentPos.z + testVar2*6.0f);
-
-    //load the explosioneffect XML
-    auto deathEffect = ResourceManager::Load<EntityFile>("Schema/Entities/PlayerDeathExplosionWithCamera.xml");
-    EntityFileParser parser(deathEffect);
-    EntityID deathEffectID = parser.MergeEntities(m_World);
-    EntityWrapper deathEffectEW = EntityWrapper(m_World, deathEffectID);
-
-    //components that we need from player
-    auto playerModel = player.FirstChildByName("PlayerModel");
-    auto playerEntityModel = playerModel["Model"];
-    auto playerEntityAnimation = playerModel["Animation"];
-
-    //copy the data from player to explosioneffectmodel
-    playerEntityModel.Copy(deathEffectEW["Model"]);
-    playerEntityAnimation.Copy(deathEffectEW["Animation"]);
-
-    //copy the models position,orientation
-    deathEffectEW["Transform"]["Position"] = inflictorPos;
-    deathEffectEW["Transform"]["Orientation"] = (glm::vec3)player["Transform"]["Orientation"];
-    return inflictorPos;
-}
-#endif

src/Game/Systems/PickupSpawnSystem.cpp

@@ -29,7 +29,6 @@ void PickupSpawnSystem::Update(double dt)
             newHealthPickupEntity["Transform"]["Position"] = healthPickupPosition.Pos;
             newHealthPickupEntity["HealthPickup"]["HealthGain"] = healthPickupPosition.HealthGain;
             newHealthPickupEntity["HealthPickup"]["RespawnTimer"] = healthPickupPosition.RespawnTimer;
-            m_World->SetParent(newHealthPickupEntity.ID, healthPickupPosition.parentID);
 
             //erase the current element (healthPickupPosition)
             m_ETriggerTouchVector.erase(it);
@@ -59,7 +58,7 @@ bool PickupSpawnSystem::OnTriggerTouch(Events::TriggerTouch& e)
     //copy position, healthgain, respawntimer (twice since one of the values will be counted down to 0, the other will be set in the new object)
     //we need to copy all values since each value can be different for each healthPickup
     m_ETriggerTouchVector.push_back({ (glm::vec3)e.Trigger["Transform"]["Position"] ,e.Trigger["HealthPickup"]["HealthGain"],
-        e.Trigger["HealthPickup"]["RespawnTimer"],e.Trigger["HealthPickup"]["RespawnTimer"], m_World->GetParent(e.Trigger.ID) });
+        e.Trigger["HealthPickup"]["RespawnTimer"],e.Trigger["HealthPickup"]["RespawnTimer"] });
 
     //delete the healthpickup
     m_World->DeleteEntity(e.Trigger.ID);

src/Game/Systems/PlayerDeathSystem.cpp

@@ -33,8 +33,9 @@ void PlayerDeathSystem::createDeathEffect(EntityWrapper player)
     EntityWrapper deathEffectEW = EntityWrapper(m_World, deathEffectID);
 
     //components that we need from player
+    auto playerCamera = player.FirstChildByName("Camera");
     auto playerModel = player.FirstChildByName("PlayerModel");
-    if (!playerModel.Valid()) {
+    if (!playerCamera.Valid() || !playerModel.Valid()) {
         return;
     }
     if (!playerModel.HasComponent("Model") || !playerModel.HasComponent("Animation")) {
@@ -43,7 +44,7 @@ void PlayerDeathSystem::createDeathEffect(EntityWrapper player)
     auto playerEntityModel = playerModel["Model"];
     auto playerEntityAnimation = playerModel["Animation"];
 
-    //copy the data from player to explosioneffectmodel
+    //copy the data from player to explisioneffectmodel
     playerEntityModel.Copy(deathEffectEW["Model"]);
     playerEntityAnimation.Copy(deathEffectEW["Animation"]);
     //freeze the animation

src/Game/Systems/PlayerMovementSystem.cpp

@@ -16,15 +16,7 @@ PlayerMovementSystem::~PlayerMovementSystem()
 void PlayerMovementSystem::Update(double dt)
 {
     updateMovementControllers(dt);
-    if (IsServer) {
-        for (auto& kv : m_PlayerInputControllers) {
-            updateVelocity(kv.first, dt);
-        }
-    } else {
-        if (LocalPlayer.Valid()) {
-            updateVelocity(LocalPlayer, dt);
-        }
-    }
+    updateVelocity(dt);
 }
 
 void PlayerMovementSystem::updateMovementControllers(double dt)
@@ -229,11 +221,15 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
 }
 
 
-void PlayerMovementSystem::updateVelocity(EntityWrapper player, double dt)
+void PlayerMovementSystem::updateVelocity(double dt)
 {
     // Only apply velocity to local player
-    ComponentWrapper& cTransform = player["Transform"];
-    ComponentWrapper& cPhysics = player["Physics"];
+    if (!LocalPlayer.Valid()) {
+        return;
+    }
+
+    ComponentWrapper& cTransform = LocalPlayer["Transform"];
+    ComponentWrapper& cPhysics = LocalPlayer["Physics"];
     glm::vec3& velocity = cPhysics["Velocity"];
     bool isOnGround = (bool)cPhysics["IsOnGround"];
 

src/Game/Systems/SoundSystem.cpp

@@ -14,7 +14,7 @@ SoundSystem::SoundSystem(SystemParams params)
         EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &SoundSystem::OnPlayerDamage);
         EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &SoundSystem::OnCaptured);
         EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &SoundSystem::OnTriggerTouch);
-        EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &SoundSystem::OnPlayerDeath);
+        EVENT_SUBSCRIBE_MEMBER(m_EPlayerHealthPickup, &SoundSystem::OnPlayerHealthPickup);
     }
 }
 
@@ -91,9 +91,6 @@ bool SoundSystem::drumTimer(double dt)
 
 bool SoundSystem::OnCaptured(const Events::Captured & e)
 {
-    if (!LocalPlayer.Valid()) {
-        return false;
-    }
     int homeTeam = (int)m_World->GetComponent(e.CapturePointID, "Team")["Team"];
     int team = (int)m_World->GetComponent(LocalPlayer.ID, "Team")["Team"];
     Events::PlaySoundOnEntity ev;
@@ -112,12 +109,7 @@ bool SoundSystem::OnCaptured(const Events::Captured & e)
 // Testing purposes atm...
 bool SoundSystem::OnPlayerDamage(const Events::PlayerDamage & e)
 {
-    if (!IsClient) { // Only play for clients
-        return false;
-    }
-    if (LocalPlayer.ID = e.Victim.ID) { // You're local player was the one who took dmg
-        return false;
-    }
+    // Should check for only local players here...
     std::uniform_int_distribution<int> dist(1, 12);
     int rand = dist(generator);
     std::vector<std::string> paths;
@@ -137,16 +129,8 @@ bool SoundSystem::OnPlayerDamage(const Events::PlayerDamage & e)
 
 bool SoundSystem::OnPlayerDeath(const Events::PlayerDeath & e)
 {
-    if (e.Player.ID != LocalPlayer.ID) {
-        return false;
-    }
-    if (!IsClient) {
-        return false;
-    }
-    // The local player is dead. The local player might be invalid?
-    // Play the sound from the listener.
-    // TODO: We might want to hear other players die.
-    Events::PlayBackgroundMusic ev;
+    Events::PlaySoundOnEntity ev;
+    ev.EmitterID = LocalPlayer.ID;
     ev.FilePath = "Audio/die/die2.wav";
     m_EventBroker->Publish(ev);
     return false;

src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp

@@ -5,6 +5,7 @@ AssaultWeaponBehaviour::AssaultWeaponBehaviour(SystemParams systemParams, IRende
 {
     m_FirstPersonModel = m_Player.FirstChildByName("Hands");
     m_ThirdPersonModel = m_Player.FirstChildByName("PlayerModel");
+    EVENT_SUBSCRIBE_MEMBER(m_EAnimationComplete, &AssaultWeaponBehaviour::OnAnimationComplete);
 }
 
 void AssaultWeaponBehaviour::Fire()
@@ -35,7 +36,7 @@ void AssaultWeaponBehaviour::Reload()
         return;
     }
 
-    // Don't reload if we're completely out of ammo
+    // Don't reload if we're completly out of ammo
     if (ammo == 0) {
         playEmptySound();
         m_TimeSinceLastFire = -0.0f; // HACK: To make empty sound play with interval
@@ -55,14 +56,14 @@ void AssaultWeaponBehaviour::Update(double dt)
 {
     if (m_Reloading) {
         m_ReloadTimer -= dt;
-        // Re-enable glow on reload impostor half-way through the animation
+        // Re-enable glow on reload impersonator half-way through the animation
         if (IsClient) {
             if (m_ReloadTimer <= (double)m_Player["AssaultWeapon"]["ReloadTime"] / 2.0) {
-                if (m_FirstPersonReloadImpostor.Valid()) {
-                    m_FirstPersonReloadImpostor["Model"]["GlowMap"] = true;
+                if (m_FirstPersonReloadImpersonator.Valid()) {
+                    m_FirstPersonReloadImpersonator["Model"]["GlowMap"] = true;
                 }
-                if (m_ThirdPersonReloadImpostor.Valid()) {
-                    m_ThirdPersonReloadImpostor["Model"]["GlowMap"] = true;
+                if (m_ThirdPersonReloadImpersonator.Valid()) {
+                    m_ThirdPersonReloadImpersonator["Model"]["GlowMap"] = true;
                 }
             }
         }
@@ -95,6 +96,21 @@ void AssaultWeaponBehaviour::Update(double dt)
     }
 }
 
+bool AssaultWeaponBehaviour::OnAnimationComplete(Events::AnimationComplete& e)
+{
+    if (e.Entity != m_FirstPersonModel) {
+        return false;
+    }
+
+    //if (e.Name == "ShootRifle") {
+    //    if (!m_Firing) {
+    //        playIdleAnimation();
+    //    }
+    //}
+
+    return true;
+}
+
 bool AssaultWeaponBehaviour::hasAmmo()
 {
     ComponentWrapper& cAssaultWeapon = m_Player["AssaultWeapon"];
@@ -199,12 +215,6 @@ void AssaultWeaponBehaviour::playEmptySound()
 
 void AssaultWeaponBehaviour::viewPunch()
 {
-    // Since we send absolute client orientations to server, running this server side would
-    // cause aim desync.
-    if (!IsClient) {
-        return;
-    }
-
     EntityWrapper playerCamera = m_Player.FirstChildByName("Camera");
     if (!playerCamera.Valid()) {
         return;
@@ -313,8 +323,8 @@ void AssaultWeaponBehaviour::playReloadAnimation()
         EntityWrapper firstPersonWeaponModel = m_Player.FirstChildByName("WeaponModel");
         EntityWrapper reloadSpawner = m_Player.FirstChildByName("FirstPersonReloadSpawner");
         if (IsClient) {
-            m_FirstPersonReloadImpostor = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
-            firstPersonWeaponModel["Model"].Copy(m_FirstPersonReloadImpostor["Model"]);
+            m_FirstPersonReloadImpersonator = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
+            firstPersonWeaponModel["Model"].Copy(m_FirstPersonReloadImpersonator["Model"]);
         }
         firstPersonWeaponModel["Model"]["Visible"] = false;
     }
@@ -322,8 +332,8 @@ void AssaultWeaponBehaviour::playReloadAnimation()
         EntityWrapper thirdPersonWeaponModel = m_Player.FirstChildByName("ThirdPersonWeaponModel");
         EntityWrapper reloadSpawner = m_Player.FirstChildByName("ThirdPersonReloadSpawner");
         if (IsClient) {
-            m_ThirdPersonReloadImpostor = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
-            thirdPersonWeaponModel["Model"].Copy(m_ThirdPersonReloadImpostor["Model"]);
+            m_ThirdPersonReloadImpersonator = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
+            thirdPersonWeaponModel["Model"].Copy(m_ThirdPersonReloadImpersonator["Model"]);
         }
         thirdPersonWeaponModel["Model"]["Visible"] = false;
     }
@@ -361,7 +371,7 @@ bool AssaultWeaponBehaviour::shoot(double damage)
         return false;
     }
 
-    // Don't let us shoot ourselves in the foot somehow
+    // Don't let us shoot ourselves in the foot
     if (victim == LocalPlayer) {
         return false;
     }

src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp

@@ -1,10 +0,0 @@
-#include "Systems/Weapon/DefenderWeaponBehaviour.h"
-
-DefenderWeaponBehaviour::DefenderWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper weaponEntity)
-    : WeaponBehaviour(systemParams, renderer, collisionOctree, weaponEntity) { }
-
-void DefenderWeaponBehaviour::Fire()
-{
-
-}
-

src/Game/Systems/Weapon/WeaponSystem.cpp

@@ -13,7 +13,7 @@ WeaponSystem::WeaponSystem(SystemParams params, IRenderer* renderer, Octree<Enti
 
 void WeaponSystem::Update(double dt)
 {
-    // TODO: Clear inactive weapons
+
 }
 
 void WeaponSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPlayer, double dt)
@@ -72,64 +72,20 @@ bool WeaponSystem::OnInputCommand(Events::InputCommand& e)
 
 void WeaponSystem::selectWeapon(EntityWrapper player, ComponentInfo::EnumType slot)
 {
-    std::vector<EntityWrapper> weaponAttachments = player.ChildrenWithComponent("WeaponAttachment");
-
-    // Find the weapon attachments matching the slot selected
-    EntityWrapper firstPersonAttachment;
-    EntityWrapper thirdPersonAttachment;
-    for (auto& attachment : weaponAttachments) {
-        ComponentWrapper cWeaponAttachment = attachment["WeaponAttachment"];
-        if ((ComponentInfo::EnumType)cWeaponAttachment["Slot"] == slot) {
-            ComponentWrapper::SubscriptProxy person = cWeaponAttachment["Person"];
-            if (person == person.Enum("FirstPerson")) {
-                firstPersonAttachment = attachment;
-            } else if (person == person.Enum("ThirdPerson")) {
-                thirdPersonAttachment = attachment;
-            }
-        }
-    }
-
-    if (firstPersonAttachment.Valid() && thirdPersonAttachment.Valid()) {
-        LOG_WARNING("No weapon attachment found for slot %i of player #%i", slot, player.ID);
-        return;
-    }
-
-    // TODO: Delete old weapons
-
-    // Spawn the weapon(s)
-    EntityWrapper firstPersonWeapon;
-    EntityWrapper thirdPersonWeapon;
-    if (firstPersonAttachment.Valid()) {
-        firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
-    }
-    if (thirdPersonAttachment.Valid()) {
-        firstPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
-    }
-
-    // Create the correct behaviour
-    if (firstPersonWeapon.Valid()) {
-        if (firstPersonWeapon.HasComponent("AssaultWeapon") { 
-
-        }
-    }
-
     // Primary
     if (slot == 1) {
         // TODO: if class...
-        nextBehaviour = std::make_shared<AssaultWeaponBehaviour>(m_SystemParams, m_Renderer, m_CollisionOctree, player);
+        if (m_ActiveWeapons.count(player) == 0) {
+            m_ActiveWeapons.insert(std::make_pair(player, std::make_shared<AssaultWeaponBehaviour>(m_SystemParams, m_Renderer, m_CollisionOctree, player)));
+        } else {
+            //m_ActiveWeapons.erase(player);
+        }
     }
 
     // Secondary
     if (slot == 2) {
         //m_ActiveWeapons[player] = std::make_shared<PistolWeaponBehaviour>();
     }
-
-    if (nextBehaviour != nullptr) {
-        // TODO: Destroy previous behaviour and make new
-        if (m_ActiveWeapons.count(player) == 0) {
-            m_ActiveWeapons[player] = nextBehaviour;
-        }
-    }
 }
 
 bool WeaponSystem::OnPlayerSpawned(Events::PlayerSpawned& e)

src/Tests/HealthSystemTest.h

@@ -6,6 +6,7 @@
 #include "Core/EventBroker.h"
 #include "Rendering/Renderer.h"
 #include "Core/InputManager.h"
+#include "GUI/Frame.h"
 #include "Core/World.h"
 #include "Input/InputProxy.h"
 #include "Input/KeyboardInputHandler.h"