WIP multi-weapon behaviours

include/Engine/Collision/CollisionSystem.h

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

include/Engine/Core/EntityWrapper.h

@@ -29,6 +29,7 @@ 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;
 
@@ -39,6 +40,7 @@ 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

@@ -21,7 +21,6 @@
 #include "Core/ConfigFile.h"
 #include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"
-#include "../Game/Events/EDoubleJump.h"
 #include "Network/EInterpolate.h"
 #include "Network/SnapshotFilter.h"
 #include "Core/EPlayerSpawned.h"
@@ -48,9 +47,7 @@ public:
 
     void Connect(std::string address, int port);
     void Update() override;
-private:
-    UDPClient m_Unreliable;
-    TCPClient m_Reliable;
+
     std::vector<Events::PlayerSpawned> m_PlayerSpawnEvents;
     void parseSpawnEvents();
     // Save for children
@@ -104,9 +101,9 @@ private:
     void parseEntityDeletion(Packet& packet);
     void parsePlayerDamage(Packet& packet);
     void parseComponentDeletion(Packet& packet);
-    void parseDoubleJump(Packet& packet);
     void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
+    void UpdateLocalCapturePointHUD(EntityWrapper capturePointHUD);
     void identifyPacketLoss();
     void hasServerTimedOut();
     EntityID createPlayer();
@@ -130,10 +127,11 @@ private:
     EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(const Events::PlayerSpawned& e);
     EventRelay< Client, Events::SearchForServers> m_ESearchForServers;
-    EventRelay<Client, Events::DoubleJump> m_EDoubleJump;
-    bool OnDoubleJump(Events::DoubleJump & e);
     bool OnSearchForServers(const Events::SearchForServers& e);
+private:
+    UDPClient m_Unreliable;
     UDPClient m_ServerlistRequest;
+    TCPClient m_Reliable;
     std::vector<ServerInfo> m_Serverlist;
     bool m_SearchingForServers = false;
     std::clock_t m_StartSearchTime;

include/Engine/Network/MessageType.h

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

include/Engine/Network/Server.h

@@ -8,6 +8,7 @@
 
 #include "Network/TCPServer.h"
 #include "Network/UDPServer.h"
+#include "Network/UDPClient.h" //LOL
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Core/World.h"
@@ -17,7 +18,6 @@
 #include "Core/EPlayerDamage.h"
 #include "Network/EPlayerDisconnected.h"
 #include "Core/EPlayerSpawned.h"
-#include "../Game/Events/EDoubleJump.h"
 #include "Core/EEntityDeleted.h"
 #include "Core/EComponentDeleted.h"
 
@@ -81,9 +81,8 @@ private:
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
     void parsePing();
-    bool parseDoubleJump(Packet& packet);
-    void parseUDPConnect(Packet& packet);
-    void parseTCPConnect(Packet& packet);
+    void parseUDPConnect(Packet & packet);
+    void parseTCPConnect(Packet & packet);
     void parseDisconnect();
     void parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint);
     bool shouldSendToClient(EntityWrapper childEntity);

include/Engine/Network/TCPServer.h

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

include/Engine/Rendering/ShaderProgram.h

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

include/Game/Events/EDoubleJump.h

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

include/Game/Systems/PlayerMovementSystem.h

@@ -34,13 +34,9 @@ private:
     glm::vec3 m_LastPosition = glm::vec3();
     // The logic for making the sound play when player is moving
     void playerStep(double dt);
-    // Spawn a hexagon at origin of an Entity
-    void spawnHexagon(EntityWrapper target);
 
     EventRelay<PlayerMovementSystem, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
-    EventRelay<PlayerMovementSystem, Events::DoubleJump> m_EDoubleJump;
-    bool PlayerMovementSystem::OnDoubleJump(Events::DoubleJump & e);
 
     void updateMovementControllers(double dt);
     void updateVelocity(EntityWrapper player, double dt);

include/Game/Systems/Weapon/AssaultWeaponBehaviour.h

@@ -1,13 +1,14 @@
+#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:
@@ -22,16 +23,13 @@ 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;
-
-    EventRelay<WeaponBehaviour, Events::AnimationComplete> m_EAnimationComplete;
-    bool OnAnimationComplete(Events::AnimationComplete& e);
+    EntityWrapper m_FirstPersonReloadImpostor;
 
     bool hasAmmo();
     void fireRound();
@@ -47,3 +45,5 @@ private:
     bool shoot(double damage);
     void showHitMarker();
 };
+
+#endif

include/Game/Systems/Weapon/DefenderWeaponBehaviour.h

@@ -0,0 +1,16 @@
+#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,17 +8,21 @@
 
 class WeaponBehaviour : public System
 {
+    friend class WeaponSystem;
+
 public:
-    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player)
+    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player, EntityWrapper firstPersonWeapon, EntityWrapper thirdPersonWeapon)
         : 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() { }
@@ -29,6 +33,8 @@ protected:
     IRenderer* m_Renderer;
     Octree<EntityAABB>* m_CollisionOctree;
     EntityWrapper m_Player;
+    EntityWrapper m_FirstPerson;
+    EntityWrapper m_ThirdPerson;
 };
 
 #endif

resources/Schema/Components.xsd

@@ -46,4 +46,5 @@
 	<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:schema>

resources/Schema/Components/Physics.xml

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

resources/Schema/Components/Physics.xsd

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

resources/Schema/Components/Weapon.xml

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

@@ -1,17 +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="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

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

@@ -0,0 +1,37 @@
+<?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/Player.xml

@@ -13,6 +13,7 @@
     <c:DashAbility/>
     <c:Health/>
     <c:Physics>
+      <PrevOrigin X="0" Y="0.772000015" Z="0"/>
       <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
     </c:Physics>
     <c:Player>

resources/Schema/Entities/PlayerRed.xml

@@ -13,6 +13,7 @@
     <c:DashAbility/>
     <c:Health/>
     <c:Physics>
+      <PrevOrigin X="0" Y="0.772000015" Z="0"/>
       <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
     </c:Physics>
     <c:Player>

resources/Schema/Types/Entity.xsd

@@ -50,6 +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:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/ForwardPlus.frag.glsl

@@ -116,7 +116,12 @@ LightResult CalcDirectionalLightSource(vec4 direction, vec4 color, float intensi
 	return result;
 }
 
-#include "Shaders/Util/CommonUniforms.glsl"
+vec4 CalcNormalMappedValue(vec3 normal, vec3 tangent, vec3 bitangent, vec2 textureCoordinate, sampler2D normalMap)
+{
+	mat3 TBN = mat3(tangent, bitangent, normal);
+	vec3 NormalMap = texture(normalMap, textureCoordinate).xyz * 2.0 - vec3(1.0);
+	return vec4(TBN * normalize(NormalMap), 0.0);
+}
 
 void main()
 {
@@ -175,7 +180,6 @@ void main()
 		color_result += FillColor;
 	}
 	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
-	//sceneColor = CommonUniforms.testColour;
 	//sceneColor = vec4(reflectionColor.xyz, 1);
 	color_result += glowTexel*GlowIntensity;
 

resources/Shaders/Util/CommonUniforms.glsl

@@ -1,6 +0,0 @@
-vec4 CalcNormalMappedValue(vec3 normal, vec3 tangent, vec3 bitangent, vec2 textureCoordinate, sampler2D normalMap)
-{
-	mat3 TBN = mat3(tangent, bitangent, normal);
-	vec3 NormalMap = texture(normalMap, textureCoordinate).xyz * 2.0 - vec3(1.0);
-	return vec4(TBN * normalize(NormalMap), 0.0);
-}

src/Engine/Collision/CollisionSystem.cpp

@@ -16,51 +16,51 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
     EntityAABB& boxA = *boundingBox;
     bool everHitTheGround = false;
 
-    auto prevPosIt = m_PrevPositions.find(entity);
-    if (prevPosIt != m_PrevPositions.end()) {
-        glm::vec3 size = boxA.Size();
-        float diameter = std::min(size.x, size.z);
-        glm::vec3 prevOrigin = prevPosIt->second;
-        glm::vec3 toCurrentPos = boxA.Origin() - prevOrigin;
-        float rayLength = glm::length(toCurrentPos) + 0.5f*diameter;
-        //If the entity has moved farther than the size of its box, we need to handle it specially.
-        if (rayLength > diameter) {
-            Ray ray(prevOrigin, toCurrentPos);
-            m_OctreeResult.clear();
-            m_Octree->ObjectsPossiblyHitByRay(ray, m_OctreeResult);
-            for (auto& boxB : m_OctreeResult) {
-                if (boxA.Entity == boxB.Entity) {
+    glm::vec3 size = boxA.Size();
+    float diameter = std::min(size.x, size.z);
+    glm::vec3 prevOrigin = (glm::vec3)cPhysics["PrevOrigin"];
+    glm::vec3 toCurrentPos = boxA.Origin() - prevOrigin;
+    float rayLength = glm::length(toCurrentPos) + 0.5f*diameter;
+    //If the entity has moved farther than the size of its box, we need to handle it specially.
+    bool traceCollision = rayLength > diameter;
+    //hack solution: If prevOrigin is less than -9000 in all dimensions, 
+    //then it means it is not set, i.e. this is the first collision check for the entity.
+    if (traceCollision && glm::any(glm::greaterThan((glm::vec3)cPhysics["PrevOrigin"], glm::vec3(-9000.f)))) {
+        Ray ray(prevOrigin, toCurrentPos);
+        m_OctreeResult.clear();
+        m_Octree->ObjectsPossiblyHitByRay(ray, m_OctreeResult);
+        for (auto& boxB : m_OctreeResult) {
+            if (boxA.Entity == boxB.Entity) {
+                continue;
+            }
+            bool hit;
+            float dist;
+            if (boxB.Entity.HasComponent("Model")) {
+                RawModel* model;
+                std::string res = (std::string)boxB.Entity["Model"]["Resource"];
+                try {
+                    model = ResourceManager::Load<RawModel, true>(res);
+                } catch (const std::exception&) {
                     continue;
                 }
-                bool hit;
-                float dist;
-                if (boxB.Entity.HasComponent("Model")) {
-                    RawModel* model;
-                    std::string res = (std::string)boxB.Entity["Model"]["Resource"];
-                    try {
-                        model = ResourceManager::Load<RawModel, true>(res);
-                    } catch (const std::exception&) {
-                        continue;
-                    }
-                    float u, v;
-                    hit = Collision::RayVsModel(ray, model->Vertices(), model->m_Indices, Transform::ModelMatrix(boxB.Entity), dist, u, v);
-                } else {
-                    hit = Collision::RayVsAABB(ray, boxB, dist);
-                }
-                if (hit && dist < rayLength) {
-                    //Set the entity to where it was colliding, minus the maximum box size. 
-                    //TODO: Perhaps this should be done slightly more properly.
-                    glm::vec3 newOriginPos = ray.Origin() + (dist - 0.707107f*diameter) * ray.Direction();
-                    glm::vec3 resolve = newOriginPos - boxA.Origin();
-                    (glm::vec3&)cTransform["Position"] += resolve;
-                    boxA = *Collision::EntityAbsoluteAABB(entity);
-                    if (resolve.y > 0) {
-                        everHitTheGround = true;
-                        (bool)cPhysics["IsOnGround"] = true;
-                        ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
-                    }
-                    break;
+                float u, v;
+                hit = Collision::RayVsModel(ray, model->Vertices(), model->m_Indices, Transform::ModelMatrix(boxB.Entity), dist, u, v);
+            } else {
+                hit = Collision::RayVsAABB(ray, boxB, dist);
+            }
+            if (hit && dist < rayLength) {
+                //Set the entity to where it was colliding, minus the maximum box size. 
+                //TODO: Perhaps this should be done slightly more properly.
+                glm::vec3 newOriginPos = ray.Origin() + (dist - 0.707107f*diameter) * ray.Direction();
+                glm::vec3 resolve = newOriginPos - boxA.Origin();
+                (glm::vec3&)cTransform["Position"] += resolve;
+                boxA = *Collision::EntityAbsoluteAABB(entity);
+                if (resolve.y > 0) {
+                    everHitTheGround = true;
+                    (bool)cPhysics["IsOnGround"] = true;
+                    ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
                 }
+                break;
             }
         }
     }
@@ -90,7 +90,6 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
             float verticalStepHeight = (float)(double)cPhysics["VerticalStepHeight"];
             if (Collision::AABBvsTriangles(boxA, model->Vertices(), model->m_Indices, modelMatrix, inOutVelocity, verticalStepHeight, isOnGround, resolutionVector)) {
                 (glm::vec3&)cTransform["Position"] += resolutionVector;
-                boxA = *Collision::EntityAbsoluteAABB(entity);
                 cPhysics["Velocity"] = inOutVelocity;
                 if (isOnGround) {
                     everHitTheGround = true;
@@ -100,7 +99,6 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
         } else if (Collision::AABBVsAABB(boxA, boxB, resolutionVector)) {
             //Enter here if boxB has no Model.
             (glm::vec3&)cTransform["Position"] += resolutionVector;
-            boxA = *Collision::EntityAbsoluteAABB(entity);
             if (resolutionVector.y > 0) {
                 everHitTheGround = true;
                 (bool)cPhysics["IsOnGround"] = true;
@@ -114,5 +112,5 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
         (bool)cPhysics["IsOnGround"] = false;
     }
 
-    m_PrevPositions[entity] = boxA.Origin();
+    (glm::vec3&)cPhysics["PrevOrigin"] = boxA.Origin();
 }

src/Engine/Core/EntityWrapper.cpp

@@ -51,6 +51,13 @@ 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;
@@ -131,3 +138,18 @@ 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

@@ -32,7 +32,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_EDoubleJump, &Client::OnDoubleJump);
     EVENT_SUBSCRIBE_MEMBER(m_ESearchForServers, &Client::OnSearchForServers);
     auto config = ResourceManager::Load<ConfigFile>("Config.ini");
     m_Address = address;
@@ -141,9 +140,6 @@ void Client::parseMessageType(Packet& packet)
     case MessageType::OnPlayerDamage:
         parsePlayerDamage(packet);
         break;
-    case MessageType::OnDoubleJump:
-        parseDoubleJump(packet);
-        break;
     default:
         break;
     }
@@ -276,20 +272,6 @@ void Client::parseComponentDeletion(Packet & packet)
     }
 }
 
-void Client::parseDoubleJump(Packet & packet)
-{
-    EntityID serverID = packet.ReadPrimitive<EntityID>();
-    if (!serverClientMapsHasEntity(serverID)) {
-        return;
-    }
-    Events::DoubleJump e;
-    e.entityID = m_ServerIDToClientID.at(serverID);
-    // If player is local player do not publish to prevent infinite feedback loop
-    if (e.entityID != m_LocalPlayer.ID) {
-        m_EventBroker->Publish(e);
-    }
-}
-
 void Client::updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID)
 {
     for (auto field : componentInfo.FieldsInOrder) {
@@ -366,7 +348,9 @@ void Client::parseSnapshot(Packet& packet)
                 EntityWrapper localEntity(m_World, localEntityID);
                 // Update entity
                 if (m_World->HasComponent(localEntityID, componentType)) {
-                    // TODO Fix memory leak here
+                    if (localEntity.Name() == "CapturePointHUD") {
+                        UpdateLocalCapturePointHUD(localEntity);
+                    }
                     SharedComponentWrapper newComponent = createSharedComponent(packet, localEntityID, componentInfo);
                     bool shouldApply = true;
                     // Apply potential filter function
@@ -377,7 +361,6 @@ void Client::parseSnapshot(Packet& packet)
                         ComponentWrapper currentComponent = m_World->GetComponent(localEntityID, componentType);
                         memcpy(currentComponent.Data, newComponent.Data, componentInfo.Stride);
                     }
-
                     //if (localEntity != m_LocalPlayer && !localEntity.IsChildOf(m_LocalPlayer)) {
                     //    updateFields(packet, componentInfo, localEntityID);
                     //} else {
@@ -394,11 +377,7 @@ void Client::parseSnapshot(Packet& packet)
                 if (serverParentID == EntityID_Invalid) {
                     newLocalEntityID = m_World->CreateEntity(EntityID_Invalid);
                 } else {
-                    if (serverClientMapsHasEntity(serverParentID)) {
-                        newLocalEntityID = m_World->CreateEntity(m_ServerIDToClientID.at(serverParentID));
-                    } else {
-                        newLocalEntityID = m_World->CreateEntity(EntityID_Invalid);
-                    }
+                    newLocalEntityID = m_World->CreateEntity(m_ServerIDToClientID.at(serverParentID));
                 }
                 m_World->SetName(newLocalEntityID, serverEntityName);
                 insertIntoServerClientMaps(serverEntityID, newLocalEntityID);
@@ -408,16 +387,26 @@ void Client::parseSnapshot(Packet& packet)
         }
         // Parent logic
         // This should be enough beacause we know that the entities arives in pre-order (there will always be a parent)
-        if (serverParentID != EntityID_Invalid && serverClientMapsHasEntity(serverParentID)) {
+        if (serverParentID != EntityID_Invalid) {
             EntityID localEntityID = m_ServerIDToClientID.at(serverEntityID);
-            if (m_World->GetParent(localEntityID) != m_ServerIDToClientID.at(serverParentID)) {
-                m_World->SetParent(localEntityID, m_ServerIDToClientID.at(serverParentID));
-            }
+            m_World->SetParent(localEntityID, m_ServerIDToClientID.at(serverParentID));
         }
     }
     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;
@@ -480,11 +469,6 @@ bool Client::OnPlayerDamage(const Events::PlayerDamage & e)
     if (e.Inflictor != m_LocalPlayer) {
         return false;
     }
-    // Could this happen?
-    //if (!clientServerMapsHasEntity(e.Inflictor.ID) 
-    //    || !clientServerMapsHasEntity(e.Victim.ID)) {
-    //    return;
-    //}
 
     Packet packet(MessageType::OnPlayerDamage, m_SendPacketID);
     packet.WritePrimitive(m_ClientIDToServerID.at(e.Inflictor.ID));
@@ -519,7 +503,7 @@ void Client::parsePlayerDamage(Packet& packet)
     Events::PlayerDamage e;
     PlayerID victimID = packet.ReadPrimitive<EntityID>();
     PlayerID inflictorID = packet.ReadPrimitive<EntityID>();
-    if (!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)) {
+    if(!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)){
         return;
     }
     e.Inflictor = EntityWrapper(m_World, m_ServerIDToClientID.at(victimID));
@@ -531,17 +515,6 @@ void Client::parsePlayerDamage(Packet& packet)
     }
 }
 
-bool Client::OnDoubleJump(Events::DoubleJump & e)
-{
-    if (!clientServerMapsHasEntity(e.entityID) || e.entityID != m_LocalPlayer.ID) {
-        return false;
-    }
-    Packet packet(MessageType::OnDoubleJump);
-    packet.WritePrimitive(m_ClientIDToServerID.at(e.entityID));
-    m_Reliable.Send(packet);
-    return true;
-}
-
 void Client::sendLocalPlayerTransform()
 {
     if (!m_LocalPlayer.Valid()) {

src/Engine/Network/Server.cpp

@@ -29,8 +29,9 @@ Server::~Server()
 
 void Server::Update()
 {
-    m_Reliable.AcceptNewConnections(m_NextPlayerID, m_ConnectedPlayers);
+    PlayerDefinition pd;
 
+    m_Reliable.AcceptNewConnections(m_NextPlayerID, m_ConnectedPlayers);
     for (auto& kv : m_ConnectedPlayers) {
         while (kv.second.TCPSocket->available()) {
             // Packet will get real data in receive
@@ -46,7 +47,6 @@ void Server::Update()
         }
     }
 
-    PlayerDefinition pd;
     while (m_Unreliable.IsSocketAvailable()) {
         // Packet will get real data in receive
         Packet packet(MessageType::Invalid);
@@ -65,7 +65,7 @@ void Server::Update()
         PlayerDefinition localArea;
         localArea.Endpoint = boost::asio::ip::udp::endpoint();
         m_ServerlistRequest.Receive(packet, localArea);
-        if (packet.GetMessageType() == MessageType::ServerlistRequest) {
+        if(packet.GetMessageType() == MessageType::ServerlistRequest) {
             packet.ReadPrimitive<int>(); // Pop size
             packet.ReadPrimitive<int>(); // Pop MsgType
             packet.ReadPrimitive<int>(); // Pop packet ID
@@ -76,7 +76,7 @@ void Server::Update()
     }
 
     // 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();
@@ -136,10 +136,7 @@ void Server::parseMessageType(Packet& packet)
         parseOnPlayerDamage(packet);
         break;
     case MessageType::PlayerTransform:
-        parsePlayerTransform(packet);
-        break;
-    case MessageType::OnDoubleJump:
-        parseDoubleJump(packet);
+       parsePlayerTransform(packet);
         break;
     default:
         break;
@@ -194,41 +191,43 @@ void Server::addPlayersToPacket(Packet & packet, EntityID entityID)
         // 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)) {
-            // 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++;
-                }
+        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);
-                        }
+        }
+        // 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
-        addPlayersToPacket(packet, childEntityID);
+        addChildrenToPacket(packet, childEntityID);
     }
 }
 
@@ -344,7 +343,7 @@ void Server::parseTCPConnect(Packet & packet)
     // Read packet ID 
     m_PreviousPacketID = m_PacketID;    // Set previous packet id
     m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
-
+    
     LOG_INFO("Parsing connections");
     // Check if player is already connected
     // Ska vara till lagd i TCPServer receive
@@ -456,7 +455,8 @@ bool Server::OnInputCommand(const Events::InputCommand & e)
         }
         isReadingData = !isReadingData;
         m_SaveDataTimer = std::clock();
-    } else if (e.Command == "KickPlayer" && e.Value > 0) {
+    }
+    else if (e.Command == "KickPlayer" && e.Value > 0) {
         kick(0);
     }
 
@@ -507,7 +507,7 @@ bool Server::OnPlayerDamage(const Events::PlayerDamage& e)
     packet.WritePrimitive(e.Damage);
     reliableBroadcast(packet);
 
-    return true;
+    return false;
 }
 
 void Server::parseClientPing()
@@ -536,12 +536,6 @@ void Server::parsePing()
     }
 }
 
-bool Server::parseDoubleJump(Packet & packet)
-{
-    reliableBroadcast(packet);
-    return true;
-}
-
 void Server::parseOnInputCommand(Packet& packet)
 {
     PlayerID player = -1;
@@ -601,15 +595,8 @@ void Server::parsePlayerTransform(Packet& packet)
 
 bool Server::shouldSendToClient(EntityWrapper childEntity)
 {
-    auto children = m_World->GetChildren(childEntity.ID);
-    for (auto it = children.first; it != children.second; it++) {
-        EntityWrapper child(m_World, it->second);
-        if(child.HasComponent("CapturePoint")) {
-            return true;
-        }
-    }
     return childEntity.HasComponent("Player") || childEntity.FirstParentWithComponent("Player").Valid()
-        || childEntity.HasComponent("CapturePoint");
+        || childEntity.HasComponent("CapturePoint") || childEntity.FirstParentWithComponent("CapturePoint").Valid();
 }
 
 PlayerID Server::GetPlayerIDFromEndpoint()

src/Engine/Network/TCPServer.cpp

@@ -4,8 +4,6 @@ using namespace boost::asio::ip;
 TCPServer::TCPServer() 
 {
     acceptor = std::unique_ptr<tcp::acceptor>(new tcp::acceptor(m_IOService, tcp::endpoint(tcp::v4(), 27666)));
-    // Make the acceptor non-blocking so we wont get stuck in AcceptNewConnections().
-    acceptor->non_blocking(true);
     m_Port = GetPort();
     m_Address = GetAddress();
 }
@@ -15,24 +13,14 @@ TCPServer::~TCPServer()
 
 void TCPServer::AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers)
 {
-    boost::system::error_code error;
     boost::shared_ptr<tcp::socket> newSocket = boost::shared_ptr<tcp::socket>(new tcp::socket(m_IOService));
-    acceptor->accept(*newSocket, error);
-    // If no error occured add new tcp connection
-    if (!error) {
-        // Add tcp socket to connections
-        boost::asio::ip::tcp::no_delay option(true);
-        newSocket->set_option(option);
-        PlayerDefinition pd;
-        pd.StopTime = std::clock();
-        pd.TCPSocket = newSocket;
-        pd.TCPAddress = newSocket.get()->remote_endpoint().address();
-        pd.TCPPort = newSocket.get()->remote_endpoint().port();
-        connectedPlayers[nextPlayerID++] = pd;
-    }
+    m_IOService.poll();
+    acceptor->async_accept(*newSocket,
+        boost::bind(&TCPServer::handle_accept, this, newSocket, boost::ref(nextPlayerID), boost::ref(connectedPlayers),
+            boost::asio::placeholders::error));
 }
 
-PlayerID TCPServer::getPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
+PlayerID GetPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
     boost::asio::ip::address address, unsigned short port)
 {
     for (auto& kv : connectedPlayers) {
@@ -44,6 +32,24 @@ PlayerID TCPServer::getPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefin
     return -1;
 }
 
+void TCPServer::handle_accept(boost::shared_ptr<tcp::socket> socket,
+    int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
+    const boost::system::error_code& error)
+{
+    if (!error && GetPlayerIDFromEndpoint(connectedPlayers, socket->remote_endpoint().address(),
+        socket->remote_endpoint().port()) == -1) {
+        // Add tcp socket to connections
+        boost::asio::ip::tcp::no_delay option(true);
+        socket->set_option(option);
+        PlayerDefinition pd;
+        pd.StopTime = std::clock();
+        pd.TCPSocket = socket;
+        pd.TCPAddress = socket.get()->remote_endpoint().address();
+        pd.TCPPort = socket.get()->remote_endpoint().port();
+        connectedPlayers[nextPlayerID++] = pd;
+    }
+}
+
 void TCPServer::Send(Packet & packet, PlayerDefinition & playerDefinition)
 {
     packet.UpdateSize();

src/Engine/Rendering/ShaderProgram.cpp

@@ -4,32 +4,22 @@ GLuint Shader::CompileShader(GLenum shaderType, std::string fileName)
 {
 	LOG_INFO("Compiling shader \"%s\"", fileName.c_str());
 
-    std::string shaderFile = ReadFile(fileName);
+	std::string shaderFile;
+	std::ifstream in(fileName, std::ios::in);
+	if (!in) {
+		LOG_ERROR("Error: Failed to open shader file \"%s\"", fileName.c_str());
+		return 0;
+	}
+	in.seekg(0, std::ios::end);
+	shaderFile.resize((int)in.tellg());
+	in.seekg(0, std::ios::beg);
+	in.read(&shaderFile[0], shaderFile.size());
+	in.close();
 
 	GLuint shader = glCreateShader(shaderType);
 	if (GLERROR("glCreateShader"))
 		return 0;
 
-    std::size_t startPos = 0;
-    std::size_t SEofNewFile[2];
-    std::string key = "#include";
-    while((startPos = shaderFile.find(key, startPos)) != std::string::npos)
-    {
-        SEofNewFile[0] = shaderFile.find('"', startPos+key.length())+1;
-        SEofNewFile[1] = shaderFile.find('"', SEofNewFile[0]);
-        if (SEofNewFile[0] == std::string::npos || SEofNewFile[1] == std::string::npos)
-            return 0;
-
-        std::string replacementFileName = shaderFile.substr(SEofNewFile[0], SEofNewFile[1] - SEofNewFile[0]);
-        std::string replacementString = ReadFile(replacementFileName);
-        size_t firstof = replacementString.find_first_of((char)0);
-        replacementString.erase(firstof, replacementString.size() - firstof);
-        if (replacementString.length() <= 0)
-            return 0;
-        shaderFile.replace(startPos, SEofNewFile[1]+2 - startPos, replacementString + "\n");
-        startPos += replacementString.length(); //This might not be wanted.
-    }
-
 	const GLchar* shaderFiles = shaderFile.c_str();
 	const GLint length = static_cast<GLint>(shaderFile.length());
 	glShaderSource(shader, 1, &shaderFiles, &length);
@@ -56,24 +46,6 @@ GLuint Shader::CompileShader(GLenum shaderType, std::string fileName)
 	return shader;
 }
 
-std::string Shader::ReadFile(std::string fileName)
-{
-    std::string shaderFile;
-    std::ifstream in(fileName, std::ios::in);
-    if (!in) {
-        LOG_ERROR("Error: Failed to open shader file \"%s\"", fileName.c_str());
-        return "";
-    }
-
-    in.seekg(0, std::ios::end);
-    shaderFile.resize((int)in.tellg());
-    in.seekg(0, std::ios::beg);
-    in.read(&shaderFile[0], shaderFile.size());
-    in.close();
-    return shaderFile;
-}
-
-
 Shader::Shader(GLenum shaderType, std::string fileName) : m_ShaderType(shaderType), m_FileName(fileName)
 {
 	m_ShaderHandle = 0;

src/Game/Systems/CapturePointSystem.cpp

@@ -6,11 +6,9 @@ CapturePointSystem::CapturePointSystem(SystemParams params)
     , PureSystem("CapturePoint")
 {
     //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker)
-    if (!IsClient) {
-        EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &CapturePointSystem::OnTriggerTouch);
-        EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &CapturePointSystem::OnTriggerLeave);
-        EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &CapturePointSystem::OnCaptured);
-    }
+    EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &CapturePointSystem::OnTriggerTouch);
+    EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &CapturePointSystem::OnTriggerLeave);
+    EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &CapturePointSystem::OnCaptured);
 
 }
 
@@ -18,9 +16,6 @@ CapturePointSystem::CapturePointSystem(SystemParams params)
 //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;
     }

src/Game/Systems/PlayerMovementSystem.cpp

@@ -4,7 +4,6 @@ PlayerMovementSystem::PlayerMovementSystem(SystemParams params)
     : System(params)
 {
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &PlayerMovementSystem::OnPlayerSpawned);
-    EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &PlayerMovementSystem::OnDoubleJump);
 }
 
 PlayerMovementSystem::~PlayerMovementSystem()
@@ -37,6 +36,7 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
         if (!player.Valid()) {
             continue;
         }
+
         // Aim pitch
         EntityWrapper cameraEntity = player.FirstChildByName("Camera");
         if (cameraEntity.Valid()) {
@@ -122,14 +122,15 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
                 if (isOnGround) {
                     controller->SetDoubleJumping(false);
                 } else {
-                    // If IsServer and network is off this will not work
                     if (IsClient) {
                         //put a hexagon at the players feet
-                        spawnHexagon(player);
+                        auto hexagonEffect = ResourceManager::Load<EntityFile>("Schema/Entities/DoubleJumpHexagon.xml");
+                        EntityFileParser parser(hexagonEffect);
+                        EntityID hexagonEffectID = parser.MergeEntities(m_World);
+                        EntityWrapper hexagonEW = EntityWrapper(m_World, hexagonEffectID);
+                        hexagonEW["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
                         controller->SetDoubleJumping(true);
-                        // Publish event for client to listen to
                         Events::DoubleJump e;
-                        e.entityID = player.ID;
                         m_EventBroker->Publish(e);
                     }
                 }
@@ -294,26 +295,3 @@ bool PlayerMovementSystem::OnPlayerSpawned(Events::PlayerSpawned& e)
     }
     return true;
 }
-
-bool PlayerMovementSystem::OnDoubleJump(Events::DoubleJump & e)
-{
-    // If entity does not exist, exit
-    if (!EntityWrapper(m_World, e.entityID).Valid()) { 
-        return false;
-    }
-    // If entity IsLocalPlayer, exit
-    if (e.entityID == m_LocalPlayer.ID) { 
-        return false;
-    }
-    spawnHexagon(EntityWrapper(m_World, e.entityID));
-}
-
-void PlayerMovementSystem::spawnHexagon(EntityWrapper target)
-{ 
-    //put a hexagon at the entitys... feet?
-    auto hexagonEffect = ResourceManager::Load<EntityFile>("Schema/Entities/DoubleJumpHexagon.xml");
-    EntityFileParser parser(hexagonEffect);
-    EntityID hexagonEffectID = parser.MergeEntities(m_World);
-    EntityWrapper hexagonEW = EntityWrapper(m_World, hexagonEffectID);
-    hexagonEW["Transform"]["Position"] = (glm::vec3)target["Transform"]["Position"];
-}

src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp

@@ -5,7 +5,6 @@ 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()
@@ -36,7 +35,7 @@ void AssaultWeaponBehaviour::Reload()
         return;
     }
 
-    // Don't reload if we're completly out of ammo
+    // Don't reload if we're completely out of ammo
     if (ammo == 0) {
         playEmptySound();
         m_TimeSinceLastFire = -0.0f; // HACK: To make empty sound play with interval
@@ -56,14 +55,14 @@ void AssaultWeaponBehaviour::Update(double dt)
 {
     if (m_Reloading) {
         m_ReloadTimer -= dt;
-        // Re-enable glow on reload impersonator half-way through the animation
+        // Re-enable glow on reload impostor half-way through the animation
         if (IsClient) {
             if (m_ReloadTimer <= (double)m_Player["AssaultWeapon"]["ReloadTime"] / 2.0) {
-                if (m_FirstPersonReloadImpersonator.Valid()) {
-                    m_FirstPersonReloadImpersonator["Model"]["GlowMap"] = true;
+                if (m_FirstPersonReloadImpostor.Valid()) {
+                    m_FirstPersonReloadImpostor["Model"]["GlowMap"] = true;
                 }
-                if (m_ThirdPersonReloadImpersonator.Valid()) {
-                    m_ThirdPersonReloadImpersonator["Model"]["GlowMap"] = true;
+                if (m_ThirdPersonReloadImpostor.Valid()) {
+                    m_ThirdPersonReloadImpostor["Model"]["GlowMap"] = true;
                 }
             }
         }
@@ -96,21 +95,6 @@ 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"];
@@ -215,6 +199,12 @@ 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;
@@ -323,8 +313,8 @@ void AssaultWeaponBehaviour::playReloadAnimation()
         EntityWrapper firstPersonWeaponModel = m_Player.FirstChildByName("WeaponModel");
         EntityWrapper reloadSpawner = m_Player.FirstChildByName("FirstPersonReloadSpawner");
         if (IsClient) {
-            m_FirstPersonReloadImpersonator = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
-            firstPersonWeaponModel["Model"].Copy(m_FirstPersonReloadImpersonator["Model"]);
+            m_FirstPersonReloadImpostor = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
+            firstPersonWeaponModel["Model"].Copy(m_FirstPersonReloadImpostor["Model"]);
         }
         firstPersonWeaponModel["Model"]["Visible"] = false;
     }
@@ -332,8 +322,8 @@ void AssaultWeaponBehaviour::playReloadAnimation()
         EntityWrapper thirdPersonWeaponModel = m_Player.FirstChildByName("ThirdPersonWeaponModel");
         EntityWrapper reloadSpawner = m_Player.FirstChildByName("ThirdPersonReloadSpawner");
         if (IsClient) {
-            m_ThirdPersonReloadImpersonator = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
-            thirdPersonWeaponModel["Model"].Copy(m_ThirdPersonReloadImpersonator["Model"]);
+            m_ThirdPersonReloadImpostor = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
+            thirdPersonWeaponModel["Model"].Copy(m_ThirdPersonReloadImpostor["Model"]);
         }
         thirdPersonWeaponModel["Model"]["Visible"] = false;
     }
@@ -371,7 +361,7 @@ bool AssaultWeaponBehaviour::shoot(double damage)
         return false;
     }
 
-    // Don't let us shoot ourselves in the foot
+    // Don't let us shoot ourselves in the foot somehow
     if (victim == LocalPlayer) {
         return false;
     }

src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp

@@ -0,0 +1,10 @@
+#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,20 +72,64 @@ 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...
-        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);
-        }
+        nextBehaviour = std::make_shared<AssaultWeaponBehaviour>(m_SystemParams, m_Renderer, m_CollisionOctree, 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)