WIP multi-weapon behaviours

2016-02-25 16:24:38 +01:00
43 changed files with 334 additions and 453 deletions
@@ -24,7 +24,6 @@ public:
 private:
    Octree<EntityAABB>* m_Octree;
    std::vector<EntityAABB> m_OctreeResult;
-    std::unordered_map<EntityWrapper, glm::vec3> m_PrevPositions;
 };

 #endif
@@ -65,8 +65,6 @@ public:
 	iterator end() const;
    size_t size() const;

-    std::size_t MemoryUsage() const;
-
 	//Dumps information about what the pool memory looks like right now 
 	//into an output stream (e.g. file/std::cout, anything that has an operator<<)
 	//Interpret the data in the memory as InterpretType.
@@ -27,10 +27,9 @@ struct EntityWrapper
    bool HasComponent(const std::string& componentType);
    void AttachComponent(const char* componentName);
    EntityWrapper Parent();
-    EntityWrapper BaseParent();
    EntityWrapper FirstChildByName(const std::string& name);
    EntityWrapper FirstParentWithComponent(const std::string& componentType);
-    EntityWrapper Clone(EntityWrapper parent = EntityWrapper::Invalid);
+    std::vector<EntityWrapper> ChildrenWithComponent(const std::string& componentType);
    bool IsChildOf(EntityWrapper potentialParent);
    bool Valid() const;

@@ -41,7 +40,7 @@ struct EntityWrapper

 private:
    EntityWrapper firstChildByNameRecursive(const std::string& name, EntityID parent);
-    EntityWrapper cloneRecursive(EntityWrapper entity, EntityWrapper parent);
+    void childrenWithComponentRecursive(const std::string& componentType, EntityWrapper& entity, std::vector<EntityWrapper>& childrenWithComponent);
 };

 namespace std
@@ -194,11 +194,6 @@ public:
 		return m_ExtraMemory.size();
 	}

-    std::size_t MemoryUsage() const
-    {
-        return size() * m_Stride;
-    }
-
 	//Dumps information about what the pool memory looks like right now 
 	//into an output stream (e.g. file/std::cout, anything that has an operator<<)
 	//Interpret the data in the memory as InterpretType.
@@ -18,7 +18,7 @@ public:
    World(const World& other);

    // Create empty entity
-    EntityID CreateEntity(EntityID parent = EntityID_Invalid);
+    EntityID CreateEntity(EntityID parent = 0);
    // Delete entity and all components within
    void DeleteEntity(EntityID entity);
    // Check if an entity exists
@@ -40,7 +40,7 @@ public:
    // Change the parent of an entity
    void SetParent(EntityID entity, EntityID parent);
    // Get children of an entity
-    const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetDirectChildren(EntityID entity);
+    const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetChildren(EntityID entity);
    // Get all component pools
    const std::unordered_map<std::string, ComponentPool*>& GetComponentPools() const { return m_ComponentPools; }
    // Get the entity children map
@@ -50,9 +50,6 @@ public:
    // Get the textual name of an entity
    std::string GetName(EntityID entity) const;

-    // Get an approximate number for component pool memory usage
-    std::size_t MemoryUsage() const;
-
 private:
    EventBroker* m_EventBroker = nullptr;
    EntityID m_CurrentEntityID = 0;
@@ -73,12 +73,6 @@ public:
    // Called when the user means to rename an entity.
    typedef std::function<void(EntityWrapper, const std::string&)> OnEntityChangeName_t;
    void SetEntityChangeNameCallback(OnEntityChangeName_t f) { m_OnEntityChangeName = f; }
-    // Called when the user pastes an entity previously "copied"
-    // @param EntityWrapper The entity to copy
-    // @param EntityWrapper The entity to parent the new copy to
-    // @return The new copy of the entity
-    typedef std::function<EntityWrapper(EntityWrapper, EntityWrapper)> OnEntityPaste_t;
-    void SetEntityPasteCallback(OnEntityPaste_t f) { m_OnEntityPaste = f; }
    // Called when the user means to attach a new component to an entity.
    typedef std::function<void(EntityWrapper, const std::string&)> OnComponentAttach_t;
    void SetComponentAttachCallback(OnComponentAttach_t f) { m_OnComponentAttach = f; }
@@ -91,13 +85,7 @@ public:
    // Called when the user selects a widget space.
    typedef std::function<void(WidgetSpace)> OnWidgetSpace_t;
    void SetWidgetSpaceCallback(OnWidgetSpace_t f) { m_OnWidgetSpace = f; }
-    // Called when anything is modified making the world dirty
-    // @param EntityWrapper The entity that was changed and marked as dirty
-    typedef std::function<void(EntityWrapper)> OnDirty_t;
-    void SetDirtyCallback(OnDirty_t f) { m_OnDirty = f; }
-    // Called when the user wishes to undo
-    typedef std::function<void()> OnUndo_t;
-    void SetUndoCallback(OnUndo_t f) { m_OnUndo = f; }
+
 private:
    World* m_World;
    EventBroker* m_EventBroker;
@@ -123,7 +111,6 @@ private:
    std::string m_DroppedFile = "";
    bool m_Paused = false;
    bool m_MouseLocked = false;
-    EntityWrapper m_CopyTarget = EntityWrapper::Invalid;

    // Callbacks
    OnEntitySelectedCallback_t m_OnEntitySelected = nullptr;
@@ -137,9 +124,6 @@ private:
    OnComponentDelete_t m_OnComponentDelete = nullptr;
    OnWidgetMode_t m_OnWidgetMode = nullptr;
    OnWidgetSpace_t m_OnWidgetSpace = nullptr;
-    OnEntityPaste_t m_OnEntityPaste = nullptr;
-    OnDirty_t m_OnDirty = nullptr;
-    OnUndo_t m_OnUndo = nullptr;

    // Events
    EventRelay<EditorGUI, Events::KeyDown> m_EKeyDown;
@@ -36,7 +36,6 @@ private:
    EditorCameraInputController<EditorSystem>* m_EditorCameraInputController;
    EditorGUI* m_EditorGUI;
    EditorStats* m_EditorStats;
-    std::vector<World> m_UndoLevels;

    // State
    double m_LastTime = 0.f;
@@ -45,7 +44,6 @@ private:
    EditorGUI::WidgetSpace m_WidgetSpace = EditorGUI::WidgetSpace::Global;
    EntityWrapper m_Widget = EntityWrapper::Invalid;
    EntityWrapper m_CurrentSelection = EntityWrapper::Invalid;
-    bool m_SaveUndoLevel = false; // Only save undo state once per update

    // Utility functions
    EntityWrapper importEntity(EntityWrapper parent, boost::filesystem::path filePath);
@@ -58,12 +56,9 @@ private:
    void OnEntityDelete(EntityWrapper entity);
    void OnEntityChangeParent(EntityWrapper entity, EntityWrapper parent);
    void OnEntityChangeName(EntityWrapper entity, const std::string& name);
-    EntityWrapper OnEntityPaste(EntityWrapper entityToCopy, EntityWrapper parent);
    void OnComponentAttach(EntityWrapper entity, const std::string& componentType);
    void OnComponentDelete(EntityWrapper entity, const std::string& componentType);
    void OnWidgetSpace(EditorGUI::WidgetSpace widgetSpace);
-    void OnDirty(EntityWrapper entity);
-    void OnUndo();

    // Events
    EventRelay<EditorSystem, Events::MousePress> m_EMousePress;
@@ -19,10 +19,8 @@
 #include "Core/World.h"
 #include "Core/EventBroker.h"
 #include "Core/ConfigFile.h"
-#include "Core/EPlayerDeath.h"
 #include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"
-#include "../Game/Events/EDoubleJump.h"
 #include "Network/EInterpolate.h"
 #include "Network/SnapshotFilter.h"
 #include "Core/EPlayerSpawned.h"
@@ -49,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
@@ -105,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();
@@ -131,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;
@@ -19,7 +19,6 @@ enum class MessageType
    EntityDeleted,
    ComponentDeleted,
    PlayerTransform,
-    OnDoubleJump,
    ServerlistRequest,
    Invalid
 };
@@ -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);
@@ -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;
@@ -8,7 +8,7 @@ namespace Events

 struct DoubleJump : public Event
 {
-    EntityID entityID;
+
 };

 }
@@ -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);
@@ -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
@@ -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;
+};
@@ -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
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -5,20 +5,6 @@
    <c:Transform/>
  </Components>

-  <Children>
-    <Entity>
-      <Components>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
+  <Children/>

 </Entity>
@@ -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>
@@ -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>
@@ -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>
@@ -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();
 }
@@ -112,11 +112,6 @@ size_t ComponentPool::size() const
    return m_Pool.size();
 }

-std::size_t ComponentPool::MemoryUsage() const
-{
-    return m_Pool.MemoryUsage();
-}
-
 template <typename InterpretType /*= char*/>
 void ComponentPool::Dump() const
 {
@@ -34,15 +34,6 @@ EntityWrapper EntityWrapper::Parent()
    }
 }

-EntityWrapper EntityWrapper::BaseParent()
-{
-    EntityWrapper baseParent = Parent();
-    while (baseParent.Parent().Valid()) {
-        baseParent = baseParent.Parent();
-    }
-    return baseParent;
-}
-
 EntityWrapper EntityWrapper::FirstChildByName(const std::string& name)
 {
    return firstChildByNameRecursive(name, this->ID);
@@ -60,15 +51,11 @@ EntityWrapper EntityWrapper::FirstParentWithComponent(const std::string& compone
    return EntityWrapper::Invalid;
 }

-EntityWrapper EntityWrapper::Clone(EntityWrapper parent /*= Invalid*/)
+std::vector<EntityWrapper> EntityWrapper::ChildrenWithComponent(const std::string& componentType)
 {
-    if (!Valid()) {
-        return EntityWrapper::Invalid;
-    }
-
-    EntityWrapper clone = cloneRecursive(*this, EntityWrapper::Invalid);
-    this->World->SetParent(clone.ID, parent.ID);
-    return clone;
+    std::vector<EntityWrapper> childrenWithComponent;
+    childrenWithComponentRecursive(componentType, *this, childrenWithComponent);
+    return childrenWithComponent;
 }

 bool EntityWrapper::IsChildOf(EntityWrapper potentialParent)
@@ -131,7 +118,7 @@ EntityWrapper EntityWrapper::firstChildByNameRecursive(const std::string& name,
        return EntityWrapper::Invalid;
    }

-    auto itPair = this->World->GetDirectChildren(parent);
+    auto itPair = this->World->GetChildren(parent);
    if (itPair.first == itPair.second) {
        return EntityWrapper::Invalid;
    }
@@ -151,27 +138,18 @@ EntityWrapper EntityWrapper::firstChildByNameRecursive(const std::string& name,
    return EntityWrapper::Invalid;
 }

-EntityWrapper EntityWrapper::cloneRecursive(EntityWrapper entity, EntityWrapper parent)
+void EntityWrapper::childrenWithComponentRecursive(const std::string& componentType, EntityWrapper& entity, std::vector<EntityWrapper>& childrenWithComponent)
 {
-    EntityWrapper clone = EntityWrapper(entity.World, entity.World->CreateEntity(parent.ID));
-    entity.World->SetName(clone.ID, entity.Name());
+    auto itPair = this->World->GetChildren(entity.ID);
+    if (itPair.first == itPair.second) {
+        return;
+    }

-    // Clone components
-    for (auto& kv : entity.World->GetComponentPools()) {
-        if (kv.second->KnowsEntity(entity.ID)) {
-            ComponentWrapper c1 = kv.second->GetByEntity(entity.ID);
-            ComponentWrapper c2 = entity.World->AttachComponent(clone.ID, kv.first);
-            c1.Copy(c2);
+    for (auto it = itPair.first; it != itPair.second; ++it) {
+        if (entity.HasComponent(componentType)) {
+            childrenWithComponent.push_back(entity);
        }
+        childrenWithComponentRecursive(componentType, entity, childrenWithComponent);
    }
-
-    // Clone children
-    auto children = entity.World->GetDirectChildren(entity.ID);
-    for (auto it = children.first; it != children.second; ++it) {
-        EntityWrapper child(entity.World, it->second);
-        cloneRecursive(child, clone);
-    }
-      
-    return clone;
 }

@@ -127,7 +127,7 @@ void World::SetParent(EntityID entity, EntityID parent)
    m_EntityChildren.insert(std::make_pair(parent, entity));
 }

-const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> World::GetDirectChildren(EntityID entity)
+const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> World::GetChildren(EntityID entity)
 {
    return m_EntityChildren.equal_range(entity);
 }
@@ -151,17 +151,6 @@ std::string World::GetName(EntityID entity) const
    }
 }

-std::size_t World::MemoryUsage() const
-{
-    std::size_t mem = 0;
-
-    for (auto& kv : m_ComponentPools) {
-        mem += kv.second->MemoryUsage();
-    }
-
-    return mem;
-}
-
 EntityID World::generateEntityID()
 {
    // TODO: Make EntityID generation smarter
@@ -598,28 +598,6 @@ bool EditorGUI::OnKeyDown(const Events::KeyDown& e)
        entityImport(m_World);
    }

-    if (e.ModCtrl && e.KeyCode == GLFW_KEY_C) {
-        m_CopyTarget = m_CurrentSelection;
-    }
-
-    if (e.ModCtrl && e.KeyCode == GLFW_KEY_Z) {
-        if (m_OnUndo != nullptr) {
-            m_OnUndo();
-            if (!m_CurrentSelection.Valid()) {
-                SelectEntity(EntityWrapper::Invalid);
-            }
-        }
-    }
-
-    if (e.ModCtrl && e.KeyCode == GLFW_KEY_V) {
-        if (m_OnEntityPaste != nullptr) {
-            EntityWrapper copy = m_OnEntityPaste(m_CopyTarget, m_CurrentSelection);
-            if (copy != EntityWrapper::Invalid) {
-                SelectEntity(copy);
-            }
-        }
-    }
-
    if (e.KeyCode == GLFW_KEY_DELETE) {
        if (m_CurrentSelection.Valid()) {
            entityDelete(m_CurrentSelection);
@@ -783,13 +761,13 @@ bool EditorGUI::compareCharArray(const char* c1, const char* c2)

 void EditorGUI::SetDirty(EntityWrapper entity)
 {
-    EntityWrapper baseParent = entity.BaseParent();
+    EntityWrapper baseParent = entity;
+    while (baseParent.Parent().Valid()) {
+        baseParent = baseParent.Parent();
+    }
    if (m_EntityFiles.find(baseParent) != m_EntityFiles.end()) {
        m_EntityFiles.at(baseParent).Dirty = true;
    }
-    if (m_OnDirty != nullptr) {
-        m_OnDirty(entity);
-    }
 }

 void EditorGUI::entityImport(World* world)
@@ -839,7 +817,6 @@ void EditorGUI::entityCreate(World* world, EntityWrapper parent)
            parent.World = world;
        }
        EntityWrapper newEntity = m_OnEntityCreate(parent);
-        SetDirty(newEntity);
        SelectEntity(newEntity);
    }
 }
@@ -855,9 +832,9 @@ void EditorGUI::entityDelete(EntityWrapper entity)
        if (boost::any_cast<EntityWrapper>(m_ModalData[modalName]) == entity) {
            EntityWrapper parent = entity.Parent();
            if (m_OnEntityDelete != nullptr) {
+                SetDirty(entity);
                m_OnEntityDelete(entity);
                m_EntityFiles.erase(entity);
-                SetDirty(parent);
            }
            if (!m_CurrentSelection.Valid()) {
                SelectEntity(parent);
@@ -874,8 +851,8 @@ void EditorGUI::entityChangeParent(EntityWrapper entity, EntityWrapper parent)
    }

    if (m_OnEntityChangeParent != nullptr) {
-        m_OnEntityChangeParent(entity, parent);
        SetDirty(entity);
+        m_OnEntityChangeParent(entity, parent);
        LOG_DEBUG("Changed parent of %i to %i", entity.ID, parent.ID);
    }
 }
@@ -28,13 +28,10 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
    m_EditorGUI->SetEntityDeleteCallback(std::bind(&EditorSystem::OnEntityDelete, this, std::placeholders::_1));
    m_EditorGUI->SetEntityChangeParentCallback(std::bind(&EditorSystem::OnEntityChangeParent, this, std::placeholders::_1, std::placeholders::_2));
    m_EditorGUI->SetEntityChangeNameCallback(std::bind(&EditorSystem::OnEntityChangeName, this, std::placeholders::_1, std::placeholders::_2));
-    m_EditorGUI->SetEntityPasteCallback(std::bind(&EditorSystem::OnEntityPaste, this, std::placeholders::_1, std::placeholders::_2));
    m_EditorGUI->SetComponentAttachCallback(std::bind(&EditorSystem::OnComponentAttach, this, std::placeholders::_1, std::placeholders::_2));
    m_EditorGUI->SetComponentDeleteCallback(std::bind(&EditorSystem::OnComponentDelete, this, std::placeholders::_1, std::placeholders::_2));
    m_EditorGUI->SetWidgetModeCallback(std::bind(&EditorSystem::setWidgetMode, this, std::placeholders::_1));
    m_EditorGUI->SetWidgetSpaceCallback(std::bind(&EditorSystem::OnWidgetSpace, this, std::placeholders::_1));
-    m_EditorGUI->SetDirtyCallback(std::bind(&EditorSystem::OnDirty, this, std::placeholders::_1));
-    m_EditorGUI->SetUndoCallback(std::bind(&EditorSystem::OnUndo, this));

    EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &EditorSystem::OnMousePress);
    EVENT_SUBSCRIBE_MEMBER(m_EWidgetDelta, &EditorSystem::OnWidgetDelta);
@@ -89,11 +86,6 @@ void EditorSystem::Update(double dt)
        glm::vec3& pos = cameraTransform["Position"];
        pos += m_EditorCameraInputController->Movement() * glm::inverse(glm::quat(ori)) * (float)actualDelta;
    }
-
-    if (m_SaveUndoLevel) {
-        m_UndoLevels.push_back(*m_World);
-        m_SaveUndoLevel = false;
-    }
 }

 void EditorSystem::Enable()
@@ -168,11 +160,6 @@ void EditorSystem::OnEntityChangeName(EntityWrapper entity, const std::string& n
    }
 }

-EntityWrapper EditorSystem::OnEntityPaste(EntityWrapper entityToCopy, EntityWrapper parent)
-{
-    return entityToCopy.Clone(parent);
-}
-
 void EditorSystem::OnComponentAttach(EntityWrapper entity, const std::string& componentType)
 {
    if (entity.Valid()) {
@@ -192,19 +179,6 @@ void EditorSystem::OnWidgetSpace(EditorGUI::WidgetSpace widgetSpace)
    m_WidgetSpace = widgetSpace;
 }

-void EditorSystem::OnDirty(EntityWrapper entity)
-{
-    m_SaveUndoLevel = true;
-}
-
-void EditorSystem::OnUndo()
-{
-    // The last "undo level" is always the most recent change
-    if (m_UndoLevels.size() >= 2) {
-        *m_World = m_UndoLevels.at(m_UndoLevels.size() - 2);
-    }
-}
-
 bool EditorSystem::OnMousePress(const Events::MousePress& e)
 {
    ImGuiIO& io = ImGui::GetIO();
@@ -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;
    }
@@ -261,14 +257,8 @@ void Client::parseEntityDeletion(Packet & packet)
    if (m_ServerIDToClientID.find(entityToDelete) != m_ServerIDToClientID.end()) {
        EntityID localEntity = m_ServerIDToClientID.at(entityToDelete);
        if (m_World->ValidEntity(localEntity)) {
-            if (m_World->HasComponent(localEntity,"Player")) {
-                Events::PlayerDeath e;
-                e.Player = EntityWrapper(m_World, localEntity);
-                m_EventBroker->Publish(e);
-            } else {
-                m_World->DeleteEntity(localEntity);
-                deleteFromServerClientMaps(entityToDelete, localEntity);
-            }
+            m_World->DeleteEntity(localEntity);
+            deleteFromServerClientMaps(entityToDelete, localEntity);
        }
    }
 }
@@ -282,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) {
@@ -372,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
@@ -383,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 {
@@ -400,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);
@@ -414,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;
@@ -486,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));
@@ -525,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));
@@ -537,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()) {
@@ -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;
@@ -186,7 +183,7 @@ void Server::addInputCommandsToPacket(Packet& packet)

 void Server::addPlayersToPacket(Packet & packet, EntityID entityID)
 {
-    auto itPair = m_World->GetDirectChildren(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++) {
@@ -194,47 +191,49 @@ 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);
    }
 }

 void Server::addChildrenToPacket(Packet & packet, EntityID entityID)
 {
-    auto itPair = m_World->GetDirectChildren(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++) {
@@ -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->GetDirectChildren(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()
@@ -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();
@@ -17,7 +17,6 @@ void CubeMapPass::LoadTextures(std::string input)
            m_CubeMapTextures.push_back(img);
        }
        GenerateCubeMapTexture();
-        m_PreviusCubeMapTexture = input;
    }
 }

@@ -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;
    }
@@ -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"];
-}
@@ -36,7 +36,7 @@ EntityWrapper SpawnerSystem::Spawn(EntityWrapper spawner, EntityWrapper parent /
    }

    // Find any SpawnPoints existing as children of spawner
-    auto children = spawner.World->GetDirectChildren(spawner.ID);
+    auto children = spawner.World->GetChildren(spawner.ID);
    std::vector<EntityWrapper> spawnPoints;
    for (auto kv = children.first; kv != children.second; ++kv) {
        const EntityID& child = kv->second;
@@ -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;
    }
@@ -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()
+{
+
+}
+
@@ -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)