WIP started on reliable messages

include/Engine/Core/EntityWrapper.h

@@ -23,7 +23,6 @@ struct EntityWrapper
 
     static const EntityWrapper Invalid;
 
-    const std::string Name();
     bool HasComponent(const std::string& componentType);
     EntityWrapper Parent();
     EntityWrapper FirstChildByName(const std::string& name);
@@ -36,9 +35,6 @@ struct EntityWrapper
     bool operator!=(const EntityWrapper& e) const;
     explicit operator EntityID() const;
     operator bool();
-
-private:
-    EntityWrapper firstChildByNameRecursive(const std::string& name, EntityID parent);
 };
 
 namespace std

include/Engine/Core/Transform.h

@@ -8,10 +8,8 @@
 namespace Transform
 {
 
-glm::mat4 AbsoluteTransformation(EntityWrapper entity);
 glm::vec3 AbsolutePosition(EntityWrapper entity);
 glm::vec3 AbsolutePosition(World* world, EntityID entity);
-glm::vec3 AbsoluteOrientationEuler(EntityWrapper entity);
 glm::quat AbsoluteOrientation(EntityWrapper entity);
 glm::quat AbsoluteOrientation(World* world, EntityID entity);
 glm::vec3 AbsoluteScale(EntityWrapper entity);

include/Engine/Input/EInputCommand.h

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

include/Engine/Network/Client.h

@@ -43,6 +43,7 @@ private:
     PacketID m_PacketID = 0;
     PacketID m_PreviousPacketID = 0;
     PacketID m_SendPacketID = 0;
+    AckBitPattern ackBitField = 0;
 
     // Game logic
     World* m_World;

include/Engine/Network/Network.h

@@ -11,10 +11,12 @@
 #include "Core/ConfigFile.h"
 #include <fstream>
 #include <iostream>
+#include <bitset>
 
-#define INPUTSIZE 32000
+#define INPUTSIZE 4097
 typedef unsigned int PlayerID;
 typedef unsigned int PacketID;
+typedef unsigned int AckBitPattern;
 
 class Network
 {

include/Engine/Network/Packet.h

@@ -11,12 +11,12 @@ class Packet
 public:
     // arg1: Type of message (Connect, Disconnect...)
     // arg2: PacketID for identifying packet loss.
-    Packet(MessageType type, unsigned int& packetID);
+    Packet(MessageType type, unsigned int& packetID, unsigned int lastReceivedPacket, unsigned int ackBitField);
     // Used to create packet from already existing data buffer.
     Packet(char* data, const int sizeOfPacket);
     Packet(MessageType type);
     ~Packet();
-    void Init(MessageType type, unsigned int& packetID);
+    void Init(MessageType type, unsigned int& packetID, unsigned int lastReceivedPacket, unsigned int ackBitField);
 
     // Add primitive types like int, float, char...
     template<typename T>
@@ -50,7 +50,9 @@ public:
     // Pops the first element as if it was a string.
     std::string ReadString();
     char* ReadData(int SizeOfData);
-    void ChangePacketID(unsigned int& packetID);
+    // No purpose any more 
+    //void ChangePacketID(unsigned int& packetID);
+    void ChangeHeaderInfo(unsigned int& packetID, unsigned int lastReceivedPacket, unsigned int ackBitField);
     int Size() { return m_Offset; };
     char* Data() { return m_Data; };
     unsigned int DataReadSize() { return m_ReturnDataOffset; }

include/Engine/Network/PlayerDefinition.h

@@ -7,7 +7,13 @@ struct PlayerDefinition {
     ::EntityID EntityID = EntityID_Invalid;
     std::string Name = "";
     boost::asio::ip::udp::endpoint Endpoint;
+    // The ID of the last sent packet. (Local sequence number)
     unsigned int PacketID;
+    // The ID of the last received packet. (Remote sequence number)
+    // This is sent as the ackNumber.
+    unsigned int LastPacketReceivedID;
+    // The bit pattern of the last 32 received packets.
+    unsigned int AckBitField;
     std::clock_t StopTime;
 };
 

include/Engine/Network/Server.h

@@ -34,11 +34,10 @@ private:
 
     // Sending messages to client logic
     std::map<PlayerID, PlayerDefinition> m_ConnectedPlayers;
-    // HACK: Fix INPUTSIZE
     char readBuffer[INPUTSIZE] = { 0 };
     int bytesRead = 0;
     // time for previouse message
-    std::clock_t previousePingMessage = std::clock();
+    std::clock_t previousPingMessage = std::clock();
     std::clock_t previousSnapshotMessage = std::clock();
     std::clock_t timOutTimer = std::clock();
     // How often we send messages (milliseconds)
@@ -59,25 +58,26 @@ private:
     PacketID m_PreviousPacketID = 0;
 
     // Private member functions
-    int  receive(char* data);
-    void readFromClients();
-    void send(PlayerID player, Packet& packet);
-    void send(Packet& packet);
-    void broadcast(Packet& packet);
-    void sendSnapshot();
     void addChildrenToPacket(Packet& packet, EntityID entityID);
-    void sendPing();
+    void broadcast(Packet& packet);
     void checkForTimeOuts();
     void disconnect(PlayerID playerID);
+    void identifyPacketLoss();
+    void kick(PlayerID player);
+    int  receive(char* data);
+    void readFromClients();
+    void send(PlayerID playerID, Packet& packet);
+    void send(Packet& packet);
+    void sendSnapshot();
+    void sendPing();
+    void parseClientPing(PlayerID playerID);
+    void parseConnect(Packet& packet, PlayerID playerID);
+    void parseDisconnect();
     void parseMessageType(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseOnPlayerDamage(Packet& packet);
-    void parseConnect(Packet& packet);
-    void parseDisconnect();
-    void parseClientPing();
     void parsePing();
-    void identifyPacketLoss();
-    void kick(PlayerID player);
+
     PlayerID GetPlayerIDFromEndpoint(boost::asio::ip::udp::endpoint endpoint);
     // Debug event
     EventRelay<Server, Events::InputCommand> m_EInputCommand;

include/Engine/Rendering/AnimationSystem.h

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

include/Engine/Rendering/EAnimationComplete.h

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

include/Engine/Rendering/ModelJob.h

@@ -13,11 +13,10 @@
 #include "Camera.h"
 #include "../Core/World.h"
 #include "../Core/Transform.h"
-#include "Skeleton.h"
 
 struct ModelJob : RenderJob
 {
-    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialGroup matGroup, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage)
+    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialGroup matGroup, ComponentWrapper modelComponent, World* world)
         : RenderJob()
     {
         Model = model;
@@ -38,17 +37,6 @@ struct ModelJob : RenderJob
         glm::vec3 worldpos = glm::vec3(camera->ViewMatrix() * glm::vec4(abspos, 1));
         Depth = worldpos.z;
         World = world;
-
-
-        FillColor = fillColor;
-        FillPercentage = fillPercentage;
-        Skeleton = Model->m_RawModel->m_Skeleton;
-
-        if (world->HasComponent(Entity, "Animation") && Skeleton != nullptr) {
-            auto animationComponent = world->GetComponent(Entity, "Animation");
-            Animation = model->m_RawModel->m_Skeleton->GetAnimation(animationComponent["Name"]);
-            AnimationTime = (double)animationComponent["Time"];
-        }
     };
 
     unsigned int TextureID;
@@ -63,11 +51,6 @@ struct ModelJob : RenderJob
     float Shininess = 0.f;
     glm::vec4 Color;
     const ::Model* Model = nullptr;
-    ::Skeleton* Skeleton = nullptr;
-    const ::Skeleton::Animation* Animation = nullptr;
-
-    float AnimationTime = 0.f;
-
     glm::vec4 DiffuseColor;
     glm::vec4 SpecularColor;
     glm::vec4 IncandescenceColor;
@@ -75,9 +58,6 @@ struct ModelJob : RenderJob
     unsigned int EndIndex = 0;
     World* World;
 
-    glm::vec4 FillColor = glm::vec4(0);
-    float FillPercentage = 0.0;
-
     void CalculateHash() override
     {
         Hash = TextureID;

include/Engine/Rendering/PickingPass.h

@@ -1,6 +1,8 @@
 #ifndef PickingPass_h__
 #define PickingPass_h__
 
+
+
 #include "IRenderer.h"
 #include "PickingPassState.h"
 #include "FrameBuffer.h"
@@ -8,7 +10,8 @@
 #include "Util/UnorderedMapiVec2.h"
 #include "../Core/EventBroker.h"
 #include "../Core/World.h"
-#include "Rendering/Skeleton.h"
+
+
 
 class PickingPass
 {

include/Engine/Rendering/RenderSystem.h

@@ -29,25 +29,22 @@ private:
     const IRenderer* m_Renderer;
     RenderFrame* m_RenderFrame;
     Camera* m_Camera;
-    World* m_World;
     EntityWrapper m_CurrentCamera = EntityWrapper::Invalid;
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
 
     EventRelay<RenderSystem, Events::SetCamera> m_ESetCamera;
     bool OnSetCamera(Events::SetCamera &event);
-    EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;
-    bool OnInputCommand(const Events::InputCommand& e);
-    EventRelay<RenderSystem, Events::PlayerSpawned> m_EPlayerSpawned;
-    bool OnPlayerSpawned(Events::PlayerSpawned& e);
-
     void fillText(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
     void fillPointLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
     void fillDirectionalLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
+    EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
+
     void fillModels(std::list<std::shared_ptr<RenderJob>>& jobs);
     void fillLight(std::list<std::shared_ptr<RenderJob>>& jobs);
-    bool isChildOfACamera(EntityWrapper entity);
-    bool isChildOfCurrentCamera(EntityWrapper entity);
 
+    EventRelay<RenderSystem, Events::PlayerSpawned> m_EPlayerSpawned;
+    bool OnPlayerSpawned(Events::PlayerSpawned& e);
 };
 
 #endif

include/Game/Systems/HealthSystem.h

@@ -24,7 +24,7 @@ public:
 private:
     //methods which will take care of specific events
     EventRelay<HealthSystem, Events::PlayerDamage> m_EPlayerDamage;
-    bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e);
+    bool HealthSystem::OnPlayerDamaged(const Events::PlayerDamage& e);
     EventRelay<HealthSystem, Events::PlayerHealthPickup> m_EPlayerHealthPickup;
     bool HealthSystem::OnPlayerHealthPickup(const Events::PlayerHealthPickup& e);
 

include/Game/Systems/LifetimeSystem.h

@@ -1,21 +0,0 @@
-#ifndef LifetimeSystem_h__
-#define LifetimeSystem_h__
-
-#include "Core/System.h"
-
-class LifetimeSystem : public ImpureSystem, PureSystem
-{
-public:
-    LifetimeSystem(World* world, EventBroker* eventBroker)
-        : System(world, eventBroker)
-        , PureSystem("Lifetime")
-    { }
-
-    virtual void Update(double dt) override;
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cLifetime, double dt) override;
-
-private:
-    std::vector<EntityWrapper> m_Deletions;
-};
-
-#endif

include/Game/Systems/PlayerHUD.h

@@ -1,23 +0,0 @@
-#ifndef PlayerHUD_h__
-#define PlayerHUD_h__
-
-#include "../../Engine/Core/System.h"
-#include "../../Engine/GLM.h"
-#include "../../Engine/Rendering/ESetCamera.h"
-#include <imgui/imgui.h>
-
-class PlayerHUD : public ImpureSystem
-{
-public:
-    PlayerHUD(World* world, EventBroker* eventBrokerer);
-    ~PlayerHUD();
-
-    virtual void Update(double dt) override;
-
-private:
-    World* m_World;
-    EventBroker* m_EventBroker;
-
-};
-
-#endif

include/Game/Systems/WeaponSystem.h

@@ -11,8 +11,6 @@
 #include "Core/EShoot.h"
 #include "Core/EPlayerSpawned.h"
 #include "Input/EInputCommand.h"
-#include "Core/EntityFile.h"
-#include "Core/EntityFileParser.h"
 
 #include <tuple>
 #include <vector>
@@ -35,7 +33,7 @@ private:
     EventRelay<WeaponSystem, Events::PlayerSpawned> m_EPlayerSpawned;
     bool WeaponSystem::OnPlayerSpawned(const Events::PlayerSpawned& e);
     EventRelay<WeaponSystem, Events::Shoot> m_EShoot;
-    bool WeaponSystem::OnShoot(Events::Shoot& e);
+    bool WeaponSystem::OnShoot(const Events::Shoot& e);
     EventRelay<WeaponSystem, Events::InputCommand> m_EInputCommand;
     bool WeaponSystem::OnInputCommand(const Events::InputCommand& e);
 };

resources/Schema/Components.xsd

@@ -23,8 +23,4 @@
 	<xs:include schemaLocation="Components/Team.xsd"/>
 	<xs:include schemaLocation="Components/UniformScale.xsd"/>
 	<xs:include schemaLocation="Components/EditorWidget.xsd"/>
-	<xs:include schemaLocation="Components/HealthHUD.xsd"/>
-	<xs:include schemaLocation="Components/Animation.xsd"/>
-	<xs:include schemaLocation="Components/Fill.xsd"/>
-	<xs:include schemaLocation="Components/Lifetime.xsd"/>
 </xs:schema>

resources/Schema/Components/Animation.xml

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

resources/Schema/Components/Animation.xsd

@@ -1,16 +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="Animation">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="Name" type="t:string" minOccurs="0"/>
-				<xs:element name="Time" type="t:double" minOccurs="0"/>
-				<xs:element name="Speed" type="t:double" minOccurs="0"/>
-				<xs:element name="Loop" type="t:bool" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Fill.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Fill xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Fill.xsd">
-	<Percentage>0.0</Percentage>
-	<Color R="1" G="1" B="1" A="1"/>
-</Fill>

resources/Schema/Components/Fill.xsd

@@ -1,14 +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="Fill">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="Percentage" type="t:double" minOccurs="0"/>
-				<xs:element name="Color" type="t:Color" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/HealthHUD.xml

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

resources/Schema/Components/HealthHUD.xsd

@@ -1,8 +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="HealthHUD">
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Lifetime.xml

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

resources/Schema/Components/Lifetime.xsd

@@ -1,13 +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="Lifetime">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="Lifetime" type="t:double" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Entities/Empty.xml

@@ -5,6 +5,16 @@
     <c:Transform/>
   </Components>
 
-  <Children/>
+  <Children>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource></Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
 
 </Entity>

resources/Schema/Entities/FastWorld.xml

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="GotToGoFast" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform>
-      <Position X="0" Y="-0.00432979874" Z="0"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitSphere.mesh</Resource>
-          <Color A="1" B="1" G="39.2156868" R="392.15686"/>
-        </c:Model>
-        <c:RaptorCopter>
-          <Axis X="1.50000012" Y="-2.20000005" Z="2.10000014"/>
-        </c:RaptorCopter>
-        <c:Transform>
-          <Position X="0" Y="2.87819886" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:Animation>
-              <Name>Crouch Walk</Name>
-              <Time>701.10570384634161</Time>
-              <Speed>32</Speed>
-            </c:Animation>
-            <c:Model>
-              <Resource>Models/AssaultAnimated.mesh</Resource>
-              <Color A="1" B="392156.875" G="1" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="0.5" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity>
-              <Components>
-                <c:Text>
-                  <Content>pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew pew </Content>
-                  <Resource>Fonts/DroidSans.ttf,60</Resource>
-                  <Color A="0" B="0.972549021" G="3.92156863" R="39.2156868"/>
-                  <Alignment>
-                    <Left/>
-                  </Alignment>
-                </c:Text>
-                <c:Transform>
-                  <Position X="0.245514169" Y="0.817000031" Z="-0.883219421"/>
-                  <Scale X="0.300000012" Y="0.300000012" Z="1"/>
-                  <Orientation X="0" Y="1.52600002" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:DirectionalLight/>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/GameMap.xml

@@ -123,121 +123,6 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity name="BluSpawn">
-      <Components>
-        <c:PlayerSpawn/>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/Player.xml</EntityFile>
-        </c:Spawner>
-        <c:Team>
-          <Team>
-            <Blue/>
-          </Team>
-        </c:Team>
-        <c:Transform>
-          <Position X="57.7363472" Y="1.18853188" Z="79.5"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="-2.05988312" Y="0" Z="2.79573512"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:Transform>
-              <Position X="1.85022807" Y="0" Z="-2.08909845"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:Transform>
-              <Position X="2.98651481" Y="0" Z="-4.67667246"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:Transform>
-              <Position X="-5.16323137" Y="0" Z="3.62892342"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="RedSpawn">
-      <Components>
-        <c:PlayerSpawn/>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/Player.xml</EntityFile>
-        </c:Spawner>
-        <c:Team>
-          <Team>
-            <Red/>
-          </Team>
-        </c:Team>
-        <c:Transform>
-          <Position X="-60.2567062" Y="1.60000002" Z="-78.1000061"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:Transform>
-              <Position X="0" Y="0" Z="2.24403"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:Transform>
-              <Position X="2.20245028" Y="0" Z="-1.97843659"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:Transform>
-              <Position X="4.79769945" Y="0" Z="-5.2088728"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/MovementTest.xml

@@ -146,6 +146,7 @@
         </c:Team>
         <c:Transform>
           <Position X="0.300000012" Y="0.0270000007" Z="6.67400026"/>
+          <Orientation X="0" Y="3.20700026" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
@@ -177,123 +178,6 @@
         </Entity>
       </Children>
     </Entity>
-    <Entity name="Player">
-      <Components>
-        <c:AABB>
-          <Origin X="0" Y="0.772000015" Z="0"/>
-          <Size X="1" Y="1.60000002" Z="1"/>
-        </c:AABB>
-        <c:Collidable/>
-        <c:Model/>
-        <c:Physics>
-          <Gravity>false</Gravity>
-        </c:Physics>
-        <c:Player>
-          <MovementSpeed>5</MovementSpeed>
-        </c:Player>
-        <c:Team>
-          <Team>
-            <Red/>
-          </Team>
-        </c:Team>
-        <c:Transform>
-          <Position X="-1.68112314" Y="0.0264999866" Z="3.06287026"/>
-          <Orientation X="0" Y="2.14675093" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="Camera">
-          <Components>
-            <c:Camera/>
-            <c:Transform>
-              <Position X="0" Y="1.37700009" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="PlayerName">
-              <Components>
-                <c:Text>
-                  <Resource>Fonts/DroidSans.ttf,100</Resource>
-                  <Color A="1" B="0" G="1" R="0"/>
-                  <Visible>false</Visible>
-                </c:Text>
-                <c:Transform>
-                  <Position X="0" Y="0.247910097" Z="-0.447844714"/>
-                  <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
-                  <Orientation X="0" Y="3.14199996" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="CameraModel">
-              <Components>
-                <c:Model>
-                  <Resource>Models/Camera.mesh</Resource>
-                </c:Model>
-                <c:Transform>
-                  <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
-                  <Scale X="1.30000007" Y="1.50000012" Z="1"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="ThirdPersonCamera">
-          <Components>
-            <c:Camera/>
-            <c:Model>
-              <Resource>Models/Camera.mesh</Resource>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform>
-              <Position X="-0.284000009" Y="1.83800006" Z="1.18900001"/>
-              <Orientation X="5.95600033" Y="0" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="PlayerModel">
-          <Components>
-            <c:Model>
-              <Resource>Models/AssaultHeadless.mesh</Resource>
-              <Color A="1" B="0" G="0" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Orientation X="0" Y="3.14159274" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="AABBStanding">
-          <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="0.427450985" B="1" G="1" R="1"/>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="0.772000015" Z="0"/>
-              <Scale X="1" Y="1.60000002" Z="1"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="AABBCrouching">
-          <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="0.745098054" B="1" G="0" R="1"/>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="0.772000015" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/Player.xml

@@ -2,15 +2,13 @@
 <Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:Health/>
     <c:AABB>
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>
     </c:AABB>
     <c:Collidable/>
-    <c:Physics>
-      <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
-    </c:Physics>
+    <c:Model/>
+    <c:Physics/>
     <c:Player>
       <MovementSpeed>5</MovementSpeed>
     </c:Player>
@@ -20,7 +18,8 @@
       </Team>
     </c:Team>
     <c:Transform>
-      <Orientation X="0" Y="2.24449515" Z="0"/>
+      <Position X="-0.246963501" Y="0.0265000071" Z="3.01600003"/>
+      <Orientation X="0" Y="2.14675093" Z="0"/>
     </c:Transform>
   </Components>
 
@@ -38,9 +37,10 @@
             <c:Text>
               <Resource>Fonts/DroidSans.ttf,100</Resource>
               <Color A="1" B="0" G="1" R="0"/>
+              <Visible>false</Visible>
             </c:Text>
             <c:Transform>
-              <Position X="0.100000001" Y="0.248000011" Z="-0.248000011"/>
+              <Position X="0" Y="0.247910097" Z="-0.447844714"/>
               <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
               <Orientation X="0" Y="3.14199996" Z="0"/>
             </c:Transform>
@@ -51,7 +51,6 @@
           <Components>
             <c:Model>
               <Resource>Models/Camera.mesh</Resource>
-              <Visible>false</Visible>
             </c:Model>
             <c:Transform>
               <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
@@ -60,67 +59,6 @@
           </Components>
           <Children/>
         </Entity>
-        <Entity name="HUD">
-          <Components>
-            <c:Transform>
-              <Position X="0" Y="0" Z="-0.5"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="HealthBar">
-              <Components>
-                <c:Fill>
-                  <Percentage>1</Percentage>
-                  <Color A="0" B="1" G="0" R="0"/>
-                </c:Fill>
-                <c:HealthHUD/>
-                <c:Model>
-                  <Resource>Models/Core/UnitHexagon.mesh</Resource>
-                  <Color A="1" B="0.70588237" G="0.70588237" R="0.70588237"/>
-                </c:Model>
-                <c:Transform>
-                  <Position X="-0.383000016" Y="-0.185000002" Z="0"/>
-                  <Scale X="0.150000006" Y="0.150000006" Z="0.150000006"/>
-                  <Orientation X="0" Y="0.594000041" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="Crosshair">
-              <Components>
-                <c:Model>
-                  <Resource>Models/CrosshairQuad.mesh</Resource>
-                </c:Model>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.200000003"/>
-                  <Scale X="0.00600000005" Y="1" Z="0.00600000005"/>
-                  <Orientation X="1.57000005" Y="0" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="Weapon">
-              <Components>
-                <c:Model>
-                  <Resource>Models/AssaultWeapon.mesh</Resource>
-                </c:Model>
-                <c:Transform>
-                  <Position X="0.180000007" Y="-0.183000013" Z="0"/>
-                  <Orientation X="0" Y="4.64700031" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="WeaponMuzzle">
-              <Components>
-                <c:Transform>
-                  <Position X="0.215000004" Y="-0.153000012" Z="-0.266000003"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
       </Children>
     </Entity>
     <Entity name="ThirdPersonCamera">
@@ -139,16 +77,13 @@
     </Entity>
     <Entity name="PlayerModel">
       <Components>
-        <c:Animation>
-          <Name>Hold Pos</Name>
-          <Time>0.9779997896222552</Time>
-          <Speed>1</Speed>
-        </c:Animation>
         <c:Model>
-          <Resource>Models/AssaultAnimated.mesh</Resource>
+          <Resource>Models/AssaultHeadless.mesh</Resource>
           <Color A="1" B="0" G="0" R="1"/>
         </c:Model>
-        <c:Transform/>
+        <c:Transform>
+          <Orientation X="0" Y="3.14159274" Z="0"/>
+        </c:Transform>
       </Components>
       <Children/>
     </Entity>

resources/Schema/Entities/RayBlue

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Model>
-      <Resource>Models/Core/UnitCylinder.mesh</Resource>
-      <Color A="0" B="0" G="0" R="39.2156868"/>
-    </c:Model>
-    <c:Transform>
-      <Scale X="0.0400000028" Y="26.2000008" Z="0.0400000028"/>
-      <Orientation X="1.57070005" Y="0" Z="0"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/RayBlue.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Lifetime>
-      <Lifetime>0.25</Lifetime>
-    </c:Lifetime>
-    <c:Model>
-      <Resource>Models/CylinderBullet.mesh</Resource>
-      <Color A="1" B="39.2156868" G="7.84313726" R="0"/>
-    </c:Model>
-    <c:Transform>
-      <Scale X="0.0109999999" Y="0.0289999992" Z="100"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/RayRed

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Model>
-      <Resource>Models/Core/UnitCylinder.mesh</Resource>
-      <Color A="0" B="0" G="0" R="39.2156868"/>
-    </c:Model>
-    <c:Transform>
-      <Scale X="0.0400000028" Y="26.2000008" Z="0.0400000028"/>
-      <Orientation X="1.57070005" Y="0" Z="0"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/RayRed.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Lifetime>
-      <Lifetime>0.25</Lifetime>
-    </c:Lifetime>
-    <c:Model>
-      <Resource>Models/CylinderBullet.mesh</Resource>
-      <Color A="1" B="0" G="0.525490224" R="39.2156868"/>
-    </c:Model>
-    <c:Transform>
-      <Scale X="0.0110000009" Y="0.029000001" Z="100"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/RenderingWorld.xml

@@ -6,115 +6,34 @@
   </Components>
 
   <Children>
-    <Entity name="Player">
+    <Entity>
       <Components>
-        <c:Health>
-          <Health>65.990005493164063</Health>
-        </c:Health>
-        <c:Player/>
+        <c:Camera>
+          <Name>ActionCamera</Name>
+        </c:Camera>
+        <c:Model>
+          <Resource>Models/Camera.mesh</Resource>
+        </c:Model>
         <c:Transform>
-          <Position X="0" Y="0" Z="2.5"/>
+          <Position X="-0.504807115" Y="6.00582743" Z="9.68687439"/>
+          <Orientation X="-0.733036518" Y="0.000105090476" Z="5.12391125e-07"/>
         </c:Transform>
       </Components>
       <Children>
-        <Entity name="Model">
+        <Entity>
           <Components>
-            <c:Model>
-              <Resource>Models/Assault.obj</Resource>
-              <Color A="1" B="3.92156863" G="3.92156863" R="3.92156863"/>
-            </c:Model>
+            <c:Text>
+              <Content>Camera #2</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>0</Alignment>
+            </c:Text>
             <c:Transform>
-              <Orientation X="0" Y="3.14159203" Z="0"/>
+              <Position X="0.700063765" Y="0.310270816" Z="-1"/>
+              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
             </c:Transform>
           </Components>
           <Children/>
         </Entity>
-        <Entity name="Camera">
-          <Components>
-            <c:Camera>
-              <FOV>80</FOV>
-            </c:Camera>
-            <c:Model>
-              <Resource>Models/Camera.mesh</Resource>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="1.39121652" Z="-0.043014247"/>
-              <Orientation X="6.28300047" Y="0" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="HUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="-0.000463247066" Z="-0.744767368"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="Hexagon">
-                  <Components>
-                    <c:HealthHUD/>
-                    <c:Fill>
-                      <Percentage>0.65990006923675537</Percentage>
-                      <Color A="0" B="0.659900069" G="0" R="0.340099931"/>
-                    </c:Fill>
-                    <c:Model>
-                      <Resource>Models/Core/UnitHexagon.mesh</Resource>
-                      <Color A="0.313725501" B="0.70588237" G="0.70588237" R="0.70588237"/>
-                    </c:Model>
-                    <c:Transform>
-                      <Position X="-0.285538822" Y="-0.282350302" Z="-1.52214652e-05"/>
-                      <Scale X="0.200000003" Y="0.200000003" Z="0.5"/>
-                      <Orientation X="0" Y="0.666000009" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Ammo">
-                      <Components>
-                        <c:Text>
-                          <Content>24</Content>
-                          <Resource>Fonts/DroidSans.ttf,60</Resource>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-1.43861985e-06" Y="0.0125972452" Z="0.0100018298"/>
-                          <Scale X="0.349999994" Y="0.349999994" Z="0.200000003"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity>
-                          <Components>
-                            <c:Text>
-                              <Content>262</Content>
-                              <Resource>Fonts/DroidSans.ttf,60</Resource>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-4.27209579e-06" Y="-0.0390000008" Z="5.43686883e-06"/>
-                              <Scale X="0.65200001" Y="0.643000007" Z="1"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity>
-                  <Components>
-                    <c:HealthHUD/>
-                    <c:Text>
-                      <Content>65/100</Content>
-                      <Resource>Fonts/DroidSans.ttf,60</Resource>
-                      <Color A="1" B="0.659900069" G="0" R="0.340099931"/>
-                    </c:Text>
-                    <c:Transform>
-                      <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
       </Children>
     </Entity>
     <Entity>
@@ -123,7 +42,7 @@
           <Resource>Models/Core/UnitPlane.mesh</Resource>
         </c:Model>
         <c:Transform>
-          <Position X="0" Y="-0.689623177" Z="0.600000024"/>
+          <Position X="0" Y="-1" Z="0.600000024"/>
           <Scale X="100" Y="1" Z="100"/>
         </c:Transform>
       </Components>
@@ -133,7 +52,6 @@
       <Components>
         <c:Model>
           <Resource>Models/Assault.mesh</Resource>
-          <Color A="1" B="3.92156863" G="1" R="1"/>
         </c:Model>
         <c:Transform>
           <Position X="-2.5" Y="0" Z="1"/>
@@ -146,7 +64,6 @@
         <c:Text>
           <Content>Welcome!</Content>
           <Resource>Fonts/DroidSans.ttf,1280</Resource>
-          <Color A="0" B="3.92156863" G="3.92156863" R="3.92156863"/>
         </c:Text>
         <c:Transform>
           <Position X="0" Y="0" Z="0.700000048"/>
@@ -157,40 +74,32 @@
     <Entity>
       <Components>
         <c:RaptorCopter>
-          <Speed>3</Speed>
-          <Axis X="0.200000003" Y="3.4000001" Z="0.5"/>
+          <Speed>2</Speed>
+          <Axis X="0" Y="1" Z="0"/>
         </c:RaptorCopter>
         <c:Transform>
-          <Orientation X="758.058899" Y="20632.8691" Z="1320.68018"/>
+          <Position X="0" Y="2.37320328" Z="0"/>
+          <Orientation X="0" Y="8252.15918" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
         <Entity>
           <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitSphere.obj</Resource>
-              <Color A="1" B="7.84313726" G="0" R="7.84313726"/>
-            </c:Model>
             <c:PointLight>
               <Color A="1" B="1" G="0" R="1"/>
-              <Radius>70</Radius>
+              <Radius>6</Radius>
               <Intensity>0.5</Intensity>
             </c:PointLight>
             <c:Transform>
               <Position X="-2.5" Y="0" Z="0"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
             </c:Transform>
           </Components>
           <Children>
             <Entity>
               <Components>
-                <c:Model>
-                  <Resource>Models/Core/UnitSphere.obj</Resource>
-                  <Color A="1" B="0" G="0" R="7.84313726"/>
-                </c:Model>
                 <c:PointLight>
                   <Color A="1" B="0" G="0" R="1"/>
-                  <Radius>70</Radius>
+                  <Radius>8</Radius>
                 </c:PointLight>
                 <c:Transform>
                   <Position X="-5" Y="0" Z="0"/>
@@ -202,30 +111,21 @@
         </Entity>
         <Entity>
           <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitSphere.obj</Resource>
-              <Color A="1" B="0" G="7.84313726" R="7.84313726"/>
-            </c:Model>
             <c:PointLight>
               <Color A="1" B="0" G="1" R="1"/>
-              <Radius>70</Radius>
+              <Radius>6</Radius>
               <Intensity>0.5</Intensity>
             </c:PointLight>
             <c:Transform>
               <Position X="0" Y="0" Z="-2.5"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
             </c:Transform>
           </Components>
           <Children>
             <Entity>
               <Components>
-                <c:Model>
-                  <Resource>Models/Core/UnitSphere.obj</Resource>
-                  <Color A="1" B="0" G="7.84313726" R="0"/>
-                </c:Model>
                 <c:PointLight>
                   <Color A="1" B="0" G="1" R="0"/>
-                  <Radius>70</Radius>
+                  <Radius>8</Radius>
                 </c:PointLight>
                 <c:Transform>
                   <Position X="0" Y="0" Z="-5"/>
@@ -237,30 +137,21 @@
         </Entity>
         <Entity>
           <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitSphere.obj</Resource>
-              <Color A="1" B="7.84313726" G="7.84313726" R="0"/>
-            </c:Model>
             <c:PointLight>
               <Color A="1" B="1" G="1" R="0"/>
-              <Radius>70</Radius>
+              <Radius>6</Radius>
               <Intensity>0.5</Intensity>
             </c:PointLight>
             <c:Transform>
               <Position X="0" Y="0" Z="2.5"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
             </c:Transform>
           </Components>
           <Children>
             <Entity>
               <Components>
-                <c:Model>
-                  <Resource>Models/Core/UnitSphere.obj</Resource>
-                  <Color A="1" B="7.84313726" G="0" R="0"/>
-                </c:Model>
                 <c:PointLight>
-                  <Color A="1" B="1" G="0" R="0"/>
-                  <Radius>70</Radius>
+                  <Color A="1" B="1" G="0.00784313772" R="0"/>
+                  <Radius>8</Radius>
                 </c:PointLight>
                 <c:Transform>
                   <Position X="0" Y="0" Z="5"/>
@@ -272,28 +163,19 @@
         </Entity>
         <Entity>
           <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitSphere.obj</Resource>
-              <Color A="1" B="7.84313726" G="7.84313726" R="7.84313726"/>
-            </c:Model>
             <c:PointLight>
-              <Radius>70</Radius>
+              <Radius>6</Radius>
               <Intensity>0.5</Intensity>
             </c:PointLight>
             <c:Transform>
               <Position X="2.5" Y="0" Z="0"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
             </c:Transform>
           </Components>
           <Children>
             <Entity>
               <Components>
-                <c:Model>
-                  <Resource>Models/Core/UnitSphere.obj</Resource>
-                  <Color A="1" B="7.84313726" G="7.84313726" R="7.84313726"/>
-                </c:Model>
                 <c:PointLight>
-                  <Radius>70</Radius>
+                  <Radius>8</Radius>
                 </c:PointLight>
                 <c:Transform>
                   <Position X="5" Y="0" Z="0"/>
@@ -309,7 +191,6 @@
       <Components>
         <c:Model>
           <Resource>Models/Assault.mesh</Resource>
-          <Color A="1" B="1" G="1" R="3.92156863"/>
         </c:Model>
         <c:Transform>
           <Position X="2.5" Y="0" Z="1"/>
@@ -317,15 +198,46 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity name="DirectionalLight">
+    <Entity>
+      <Components>
+        <c:Camera>
+          <Name>MainCamera</Name>
+        </c:Camera>
+        <c:Listener/>
+        <c:Model>
+          <Resource>Models/Camera.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Transform>
+          <Position X="-1.27354908" Y="5.18422079" Z="10.6223917"/>
+          <Orientation X="-0.436328411" Y="-0.0523675606" Z="1.67869363e-08"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Text>
+              <Content>Taiwan #1</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>0</Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="0.716896772" Y="0.296712071" Z="-1"/>
+              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
       <Components>
         <c:DirectionalLight>
           <Color A="1" B="0.996078432" G="1" R="1"/>
-          <Intensity>0.10000000149011612</Intensity>
+          <Intensity>0.80000001192092896</Intensity>
         </c:DirectionalLight>
         <c:Model>
           <Resource>Models/DirectionalLightWidget.mesh</Resource>
-          <Color A="1" B="0" G="3.92156863" R="3.92156863"/>
         </c:Model>
         <c:Transform>
           <Position X="-0.0013256073" Y="1.89540339" Z="6.53467274"/>
@@ -338,7 +250,6 @@
       <Components>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="39.2156868" R="1"/>
         </c:Model>
         <c:Transform>
           <Position X="-5.4082036" Y="0" Z="-1.84950542"/>

resources/Schema/Entities/Spawnpoint

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="BluSpawn" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:PlayerSpawn/>
-    <c:Model>
-      <Resource>Models/Core/UnitCube.mesh</Resource>
-    </c:Model>
-    <c:Spawner>
-      <EntityFile>Schema/Entities/Player.xml</EntityFile>
-    </c:Spawner>
-    <c:Team>
-      <Team>
-        <Blue/>
-      </Team>
-    </c:Team>
-    <c:Transform>
-      <Position X="57.7363472" Y="1.18853188" Z="79.5"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:SpawnPoint/>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Types/Entity.xsd

@@ -32,7 +32,6 @@
 							<xs:element ref="c:DirectionalLight" minOccurs="0"/>
 							<xs:element ref="c:UniformScale" minOccurs="0"/>
 							<xs:element ref="c:EditorWidget" minOccurs="0"/>
-							<xs:element ref="c:Lifetime" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/ForwardPlus.frag.glsl

@@ -6,12 +6,9 @@ uniform mat4 P;
 uniform vec4 Color;
 uniform vec4 DiffuseColor;
 uniform vec2 ScreenDimensions;
-uniform vec4 FillColor;
-uniform float FillPercentage;
 layout (binding = 0) uniform sampler2D DiffuseTexture;
 layout (binding = 1) uniform sampler2D GlowMap;
 
-
 #define TILE_SIZE 16
 
 struct LightSource {
@@ -139,21 +136,10 @@ void main()
 
 	//sceneColor += Input.DiffuseColor;
 	vec4 color_result = DiffuseColor * (totalLighting.Diffuse + totalLighting.Specular) * diffuseTexel * Color;
-	
-
-	float pos = ((P * vec4(Input.Position, 1)).y + 1.0)/2.0;
-
-	if(pos <= FillPercentage) {
-		color_result += FillColor;
-	}
 	//bloomColor = vec4(0.3, 0.8, 0.6, 1.0);
 	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
 	//These if statements should be removed if they are slow.
 	color_result += glowTexel;
-
-
-	
-
 	bloomColor = vec4(clamp(color_result.xyz - 1.0, 0, 100), 1.0);
 	/*
 	if(color_result.x > 1 || color_result.y > 1 || color_result.z > 1) {
@@ -164,9 +150,8 @@ void main()
 	
 	//sceneColor += Input.DiffuseColor * (totalLighting.Diffuse) * diffuseTexel * Color;
 	//sceneColor += Input.DiffuseColor + vec4(0.0, LightGrids.Data[currentTile].Amount/3, 0, 1);
-
-	
-
+	//sceneColor = diffuseTexel * Input.DiffuseColor * Color;
+	//sceneColor += vec4(currentTile/3600.f, 0, 0, 1);
 
 	//Tiled Debug Code
 	/*

resources/Shaders/Picking.vert.glsl

@@ -3,15 +3,18 @@
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
-uniform mat4 Bones[100];
 
 layout(location = 0) in vec3 Position;
 layout(location = 1) in vec3 Normal;
 layout(location = 2) in vec3 Tangent;
 layout(location = 3) in vec3 BiTangent;
 layout(location = 4) in vec2 TextureCoords;
-layout(location = 5) in vec4 BoneIndices;
-layout(location = 6) in vec4 BoneWeights;
+layout(location = 5) in vec4 DiffuseVertexColor;
+layout(location = 6) in vec4 SpecularVertexColor;
+layout(location = 7) in vec4 BoneIndices1;
+layout(location = 8) in vec4 BoneIndices2;
+layout(location = 9) in vec4 BoneWeights1;
+layout(location = 10) in vec4 BoneWeights2;
 
 out VertexData{
 	vec3 Position;
@@ -19,14 +22,7 @@ out VertexData{
 
 void main()
 {
-	mat4 boneTransform = mat4(1);
-	if(BoneWeights[0] > 0.0f){
-	boneTransform = BoneWeights[0] * Bones[int(BoneIndices[0])]
-				  + BoneWeights[1] * Bones[int(BoneIndices[1])]
-				  + BoneWeights[2] * Bones[int(BoneIndices[2])]
-				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
-	}
+	gl_Position = P * V* M * vec4(Position, 1.0);
 
-	gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
-	Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
+	Output.Position = Position;
 }

src/Engine/Core/EntityWrapper.cpp

@@ -3,11 +3,6 @@
 
 const EntityWrapper EntityWrapper::Invalid = EntityWrapper(nullptr, EntityID_Invalid);
 
-const std::string EntityWrapper::Name()
-{
-    return World->GetName(ID);
-}
-
 bool EntityWrapper::HasComponent(const std::string& componentName)
 {
     if (!Valid()) {
@@ -27,7 +22,18 @@ EntityWrapper EntityWrapper::Parent()
 
 EntityWrapper EntityWrapper::FirstChildByName(const std::string& name)
 {
-    return firstChildByNameRecursive(name, this->ID);
+    auto itPair = this->World->GetChildren(this->ID);
+    if (itPair.first == itPair.second) {
+        return EntityWrapper::Invalid;
+    }
+
+    for (auto it = itPair.first; it != itPair.second; ++it) {
+        if (this->World->GetName(it->second) == name) {
+            return EntityWrapper(this->World, it->second);
+        }
+    }
+
+    return EntityWrapper::Invalid;
 }
 
 EntityWrapper EntityWrapper::FirstParentWithComponent(const std::string& componentType)
@@ -102,29 +108,3 @@ EntityWrapper::operator bool()
     return this->Valid();
 }
 
-EntityWrapper EntityWrapper::firstChildByNameRecursive(const std::string& name, EntityID parent)
-{
-    if (!this->World->ValidEntity(parent)) {
-        return EntityWrapper::Invalid;
-    }
-
-    auto itPair = this->World->GetChildren(parent);
-    if (itPair.first == itPair.second) {
-        return EntityWrapper::Invalid;
-    }
-
-    for (auto it = itPair.first; it != itPair.second; ++it) {
-        std::string itName = this->World->GetName(it->second);
-        if (itName == name) {
-            return EntityWrapper(this->World, it->second);
-        } else if (it->second != EntityID_Invalid) {
-            EntityWrapper result = firstChildByNameRecursive(name, it->second);
-            if (result != EntityWrapper::Invalid) {
-                return result;
-            }
-        }
-    }
-
-    return EntityWrapper::Invalid;
-}
-

src/Engine/Core/Transform.cpp

@@ -1,17 +1,5 @@
 #include "Core/Transform.h"
 
-glm::mat4 Transform::AbsoluteTransformation(EntityWrapper entity)
-{
-    glm::mat4 t = glm::mat4(1.f);
-
-    while (entity.Valid()) {
-        t = glm::translate((glm::vec3&)entity["Transform"]["Position"]) * glm::toMat4(glm::quat((glm::vec3&)entity["Transform"]["Orientation"])) * glm::scale((glm::vec3&)entity["Transform"]["Scale"]) * t;
-        entity = entity.Parent();
-    }
-
-    return t;
-}
-
 glm::vec3 Transform::AbsolutePosition(EntityWrapper entity)
 {
     return AbsolutePosition(entity.World, entity.ID);
@@ -31,19 +19,6 @@ glm::vec3 Transform::AbsolutePosition(World* world, EntityID entity)
     return position;
 }
 
-glm::vec3 Transform::AbsoluteOrientationEuler(EntityWrapper entity)
-{
-    glm::vec3 orientation;
-
-    while (entity.Valid()) {
-        ComponentWrapper transform = entity["Transform"];
-        orientation += (glm::vec3)transform["Orientation"];
-        entity = entity.Parent();
-    }
-
-    return orientation;
-}
-
 glm::quat Transform::AbsoluteOrientation(EntityWrapper entity)
 {
     return AbsoluteOrientation(entity.World, entity.ID);
@@ -87,8 +62,6 @@ glm::mat4 Transform::ModelMatrix(EntityWrapper entity)
 
 glm::mat4 Transform::ModelMatrix(EntityID entity, World* world)
 {
-    return AbsoluteTransformation(EntityWrapper(world, entity));
-
     glm::vec3 position = Transform::AbsolutePosition(world, entity);
     glm::quat orientation = Transform::AbsoluteOrientation(world, entity);
     glm::vec3 scale = Transform::AbsoluteScale(world, entity);

src/Engine/Editor/EditorGUI.cpp

@@ -1,5 +1,4 @@
 #include "Editor/EditorGUI.h"
-#include "Rendering/ESetCamera.h"
 
 EditorGUI::EditorGUI(World* world, EventBroker* eventBroker) 
     : m_World(world)
@@ -306,14 +305,6 @@ bool EditorGUI::drawComponentNode(EntityWrapper entity, const ComponentInfo& ci)
         }
     }
 
-    if (ci.Name == "Camera") {
-        if (ImGui::Button("Activate")) {
-            Events::SetCamera e;
-            e.CameraEntity = entity;
-            m_EventBroker->Publish(e);
-        }
-    }
-
     return true;
 }
 

src/Engine/Editor/EditorRenderSystem.cpp

@@ -48,7 +48,7 @@ void EditorRenderSystem::Update(double dt)
             EntityWrapper entity(m_World, cModel.EntityID);
             glm::mat4 modelMatrix = Transform::ModelMatrix(entity.ID, entity.World);
             for (auto matGroup : model->MaterialGroups()) {
-                std::shared_ptr<ModelJob> modelJob = std::make_shared<ModelJob>(model, scene.Camera, modelMatrix, matGroup, cModel, entity.World, glm::vec4(0), 0.f);
+                std::shared_ptr<ModelJob> modelJob = std::make_shared<ModelJob>(model, scene.Camera, modelMatrix, matGroup, cModel, entity.World);
                 scene.ForwardJobs.push_back(modelJob);
             }
         }

src/Engine/Editor/EditorSystem.cpp

@@ -203,7 +203,7 @@ bool EditorSystem::OnSetCamera(const Events::SetCamera& e)
         m_ActualCamera = e.CameraEntity;
         Events::SetCamera e2;
         e2.CameraEntity = m_EditorCamera;
-        //m_EventBroker->Publish(e2);
+        m_EventBroker->Publish(e2);
     }
     return true;
 }

src/Engine/Network/Client.cpp

@@ -130,7 +130,7 @@ void Client::parsePing()
     LOG_INFO("%i: response time with ctime(ms): %f", m_PacketID, m_DurationOfPingTime);
     m_StartPingTime = std::clock();
 
-    Packet packet(MessageType::Ping, m_SendPacketID);
+    Packet packet(MessageType::Ping, m_SendPacketID, m_PacketID, ackBitField);
     packet.WriteString("Ping recieved");
     send(packet);
 }
@@ -294,7 +294,7 @@ void Client::send(Packet& packet)
 
 void Client::connect()
 {
-    Packet packet(MessageType::Connect, m_SendPacketID);
+    Packet packet(MessageType::Connect, m_SendPacketID, m_PacketID, ackBitField);
     packet.WriteString(m_PlayerName);
     m_StartPingTime = std::clock();
     send(packet);
@@ -304,7 +304,7 @@ void Client::disconnect()
 {
     m_PreviousPacketID = 0;
     m_PacketID = 0;
-    Packet packet(MessageType::Disconnect, m_SendPacketID);
+    Packet packet(MessageType::Disconnect, m_SendPacketID, m_PacketID, ackBitField);
     send(packet);
 }
 
@@ -344,9 +344,9 @@ bool Client::OnInputCommand(const Events::InputCommand & e)
 
 bool Client::OnPlayerDamage(const Events::PlayerDamage & e)
 {
-    Packet packet(MessageType::OnPlayerDamage, m_SendPacketID);
+    Packet packet(MessageType::OnPlayerDamage, m_SendPacketID, m_PacketID, ackBitField);
     packet.WritePrimitive(e.Damage);
-    packet.WritePrimitive(m_ClientIDToServerID.at(e.Player.ID));
+    packet.WritePrimitive(e.Player.ID);
     send(packet);
     return false;
 }
@@ -368,7 +368,7 @@ void Client::sendLocalPlayerTransform()
     ComponentWrapper cTransform = m_LocalPlayer["Transform"];
     glm::vec3& position = cTransform["Position"];
     glm::vec3& orientation = cTransform["Orientation"];
-    Packet packet(MessageType::PlayerTransform, m_SendPacketID);
+    Packet packet(MessageType::PlayerTransform, m_SendPacketID, m_PacketID, ackBitField);
     packet.WritePrimitive(position.x);
     packet.WritePrimitive(position.y);
     packet.WritePrimitive(position.z);
@@ -413,7 +413,7 @@ EntityID Client::createPlayer()
 void Client::sendInputCommands()
 {
     if (m_InputCommandBuffer.size() > 0) {
-        Packet packet(MessageType::OnInputCommand, m_SendPacketID);
+        Packet packet(MessageType::OnInputCommand, m_SendPacketID, m_PacketID, ackBitField);
         for (int i = 0; i < m_InputCommandBuffer.size(); i++) {
             packet.WriteString(m_InputCommandBuffer[i].Command);
             packet.WritePrimitive(m_InputCommandBuffer[i].Value);
@@ -425,7 +425,7 @@ void Client::sendInputCommands()
 
 void Client::becomePlayer()
 {
-    Packet packet = Packet(MessageType::BecomePlayer, m_SendPacketID);
+    Packet packet(MessageType::BecomePlayer, m_SendPacketID, m_PacketID, ackBitField);
     send(packet);
 }
 

src/Engine/Network/Packet.cpp

@@ -1,9 +1,9 @@
 #include "Network/Packet.h"
 
-Packet::Packet(MessageType type, unsigned int& packetID)
+Packet::Packet(MessageType type, unsigned int& packetID, unsigned int lastReceivedPacket, unsigned int ackBitField)
 {
     m_Data = new char[m_MaxPacketSize];
-    Init(type, packetID);
+    Init(type, packetID, lastReceivedPacket, ackBitField);
 }
 
 // Create message
@@ -21,7 +21,9 @@ Packet::Packet(MessageType type)
 {
     m_Data = new char[m_MaxPacketSize];
     unsigned int dummy = 0;
-    Init(type, dummy);
+    // Dummy allocates memory for later insertion of
+    // correct values
+    Init(type, dummy, dummy, dummy);
 }
 
 Packet::~Packet()
@@ -29,15 +31,17 @@ Packet::~Packet()
     delete[] m_Data;
 }
 
-void Packet::Init(MessageType type, unsigned int & packetID)
+void Packet::Init(MessageType type, unsigned int & packetID, unsigned int lastReceivedPacket, unsigned int ackBitField)
 {
     m_ReturnDataOffset = 0;
     m_Offset = 0;
     // Create message header
     // Add message type
     int messageType = static_cast<int>(type);
-    Packet::WritePrimitive<int>(messageType);
-    Packet::WritePrimitive<int>(packetID);
+    WritePrimitive<int>(messageType);
+    WritePrimitive<unsigned int>(packetID);
+    WritePrimitive<unsigned int>(lastReceivedPacket);
+    WritePrimitive<unsigned int>(ackBitField);
     packetID++;
     m_HeaderSize = m_Offset;
 }
@@ -87,16 +91,31 @@ char * Packet::ReadData(int SizeOfData)
     return (m_Data + oldReturnDataOffset);
 }
 
-void Packet::ChangePacketID(unsigned int & packetID)
+//void Packet::ChangePacketID(unsigned int & packetID)
+//{
+//    packetID = packetID + 1;
+//    // Overwrite old PacketID
+//    memcpy(m_Data + sizeof(int), &packetID, sizeof(int));
+//}
+
+void Packet::ChangeHeaderInfo(unsigned int& packetID, unsigned int lastReceivedPacket, unsigned int ackBitField)
 {
     packetID = packetID + 1;
+    // Start at sizeOf(int) cause of MessageType
+    int offset = sizeof(int);
     // Overwrite old PacketID
-    memcpy(m_Data + sizeof(int), &packetID, sizeof(int));
+    memcpy(m_Data + sizeof(unsigned int), &packetID, offset);
+    offset += sizeof(unsigned int);
+    // Overwrite old LastReceivedPacket
+    memcpy(m_Data + sizeof(unsigned int), &lastReceivedPacket, offset);
+    offset += sizeof(unsigned int);
+    // Overwrite old ackBitField
+    memcpy(m_Data + sizeof(unsigned int), &ackBitField, offset);
+    offset += sizeof(unsigned int);
 }
 
 void Packet::resizeData()
 {
-
     // Allocate memory to store our data in
     char* holdData = new char[m_MaxPacketSize];
     // Copy our data to the newly allocated memory

src/Engine/Network/Server.cpp

@@ -32,6 +32,16 @@ void Server::Update()
     m_EventBroker->Process<Server>();
     if (isReadingData) {
         Network::Update();
+        // Test bit patterns
+        //std::bitset<32> bitPattern;
+        //bitPattern[0].flip();
+        //bitPattern[15].flip();
+        //bitPattern[31].flip();
+        //std::cout << "bitPattern: " << bitPattern << '\n';
+        //unsigned int bitPatternInt = static_cast<unsigned int>(bitPattern.to_ulong());
+        //std::cout << "Int pattern: " << bitPatternInt << '\n';
+        //std::bitset<32> bitPatternRev(bitPatternInt);
+        //std::cout << "bitPatternReverted: " << bitPatternRev << '\n';
     }
 
 }
@@ -55,9 +65,9 @@ void Server::readFromClients()
     }
 
     // Send pings each 
-    if (pingIntervalMs < (1000 * (currentTime - previousePingMessage) / (double)CLOCKS_PER_SEC)) {
+    if (pingIntervalMs < (1000 * (currentTime - previousPingMessage) / (double)CLOCKS_PER_SEC)) {
         sendPing();
-        previousePingMessage = currentTime;
+        previousPingMessage = currentTime;
     }
 
     // Time out logic
@@ -69,15 +79,19 @@ void Server::readFromClients()
 
 void Server::parseMessageType(Packet& packet)
 {
-    int messageType = packet.ReadPrimitive<int>(); // Read what type off message was sent from server
+    PlayerID playerID = GetPlayerIDFromEndpoint(m_ReceiverEndpoint);
 
+    int messageType = packet.ReadPrimitive<int>(); // Read what type off message was sent from server
     // Read packet ID 
-    m_PreviousPacketID = m_PacketID;    // Set previous packet id
-    m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
+    if (playerID != -1) {
+        // TODO: Bit pattern stuff!"#!"#
+        m_ConnectedPlayers[playerID].LastPacketReceivedID = packet.ReadPrimitive<PacketID>();
+    }
+
     //identifyPacketLoss();
     switch (static_cast<MessageType>(messageType)) {
     case MessageType::Connect:
-        parseConnect(packet);
+        parseConnect(packet, playerID);
         break;
     case MessageType::Ping:
         parsePing();
@@ -118,12 +132,12 @@ int Server::receive(char * data)
     return length;
 }
 
-void Server::send(PlayerID player, Packet& packet)
+void Server::send(PlayerID playerID, Packet& packet)
 {
     try {
         int bytesSent = m_Socket.send_to(
             boost::asio::buffer(packet.Data(), packet.Size()),
-            m_ConnectedPlayers[player].Endpoint,
+            m_ConnectedPlayers[playerID].Endpoint,
             0);
         // Network Debug data
         if (isReadingData) {
@@ -133,7 +147,7 @@ void Server::send(PlayerID player, Packet& packet)
         }
     } catch (const boost::system::system_error& e) {
         // TODO: Clean up invalid endpoints out of m_ConnectedPlayers later
-        m_ConnectedPlayers[player].Endpoint = boost::asio::ip::udp::endpoint();
+        m_ConnectedPlayers[playerID].Endpoint = boost::asio::ip::udp::endpoint();
     }
 }
 
@@ -155,7 +169,11 @@ void Server::send(Packet & packet)
 void Server::broadcast(Packet& packet)
 {
     for (auto& kv : m_ConnectedPlayers) {
-        packet.ChangePacketID(kv.second.PacketID);
+        packet.ChangeHeaderInfo(
+            kv.second.PacketID,
+            kv.second.LastPacketReceivedID, 
+            kv.second.AckBitField
+            );
         send(kv.first, packet);
     }
 }
@@ -269,7 +287,6 @@ void Server::parseOnInputCommand(Packet& packet)
             Events::InputCommand e;
             e.Command = packet.ReadString();
             e.PlayerID = player; // Set correct player id
-            e.Player = EntityWrapper(m_World, m_ConnectedPlayers.at(player).EntityID);
             e.Value = packet.ReadPrimitive<float>();
             m_EventBroker->Publish(e);
             //LOG_INFO("Server::parseOnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
@@ -286,20 +303,13 @@ void Server::parseOnPlayerDamage(Packet & packet)
     //LOG_DEBUG("Server::parseOnPlayerDamage: Command is %s. Value is %f. PlayerID is %i.", e.DamageAmount, e.PlayerDamagedID, e.TypeOfDamage.c_str());
 }
 
-void Server::parseConnect(Packet& packet)
+void Server::parseConnect(Packet& packet, PlayerID playerID)
 {
     LOG_INFO("Parsing connections");
     // Check if player is already connected
-    if (GetPlayerIDFromEndpoint(m_ReceiverEndpoint) != -1) {
+    if (playerID != -1) {
         return;
     }
-    for (auto& kv : m_ConnectedPlayers) {
-        if (kv.second.Endpoint.address() == m_ReceiverEndpoint.address() &&
-            kv.second.Endpoint.port() == m_ReceiverEndpoint.port()) {
-            // Already connected 
-            return;
-        }
-    }
     // Create a new player
     PlayerDefinition pd;
     pd.EntityID = 0; // Overlook this
@@ -307,11 +317,11 @@ void Server::parseConnect(Packet& packet)
     pd.Name = packet.ReadString();
     pd.PacketID = 0;
     pd.StopTime = std::clock();
+    Packet connnectPacket(MessageType::Connect, pd.PacketID, pd.LastPacketReceivedID, pd.AckBitField);
     m_ConnectedPlayers[m_NextPlayerID++] = pd;
     LOG_INFO("Spectator \"%s\" connected on IP: %s", pd.Name.c_str(), pd.Endpoint.address().to_string().c_str());
 
     // Send a message to the player that connected
-    Packet connnectPacket(MessageType::Connect, pd.PacketID);
     send(connnectPacket);
 
     // Send notification that a player has connected
@@ -332,15 +342,18 @@ void Server::parseDisconnect()
     }
 }
 
-void Server::parseClientPing()
+void Server::parseClientPing(PlayerID player)
 {
-    LOG_INFO("%i: Parsing ping", m_PacketID);
-    PlayerID player = GetPlayerIDFromEndpoint(m_ReceiverEndpoint);
     if (player == -1) {
         return;
     }
     // Return ping
-    Packet packet(MessageType::Ping, m_ConnectedPlayers[player].PacketID);
+    Packet packet(
+        MessageType::Ping, 
+        m_ConnectedPlayers[player].PacketID, 
+        m_ConnectedPlayers[player].LastPacketReceivedID, 
+        m_ConnectedPlayers[player].AckBitField
+        );
     packet.WriteString("Ping received");
     send(packet);
 }

src/Engine/Rendering/AnimationSystem.cpp

@@ -1,47 +0,0 @@
-#include "Rendering/AnimationSystem.h"
-
-void AnimationSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& animationComponent, double dt)
-{
-    if(!entity.HasComponent("Model")) {
-        return;
-    }
-
-    Model* model;
-    try {
-        model = ResourceManager::Load<::Model, true>(entity["Model"]["Resource"]);
-    } catch (const std::exception&) {
-        return;
-    }
-    
-
-    Skeleton* skeleton = model->m_RawModel->m_Skeleton;
-    const Skeleton::Animation* animation = skeleton->GetAnimation(animationComponent["Name"]);
-
-    if(animation != nullptr) {
-        double animationSpeed = (double)animationComponent["Speed"];
-
-        if (animationSpeed != 0.0) {
-            double nextTime = (double)animationComponent["Time"] + animationSpeed * dt;
-
-
-            if (!(bool)animationComponent["Loop"] && glm::abs(nextTime) > animation->Duration) {
-                (double&)animationComponent["Time"] = glm::sign(nextTime) * animation->Duration;
-                (double&)animationComponent["Speed"] = 0.0;
-                Events::AnimationComplete e;
-                e.Entity = entity;
-                e.Name = (std::string)animationComponent["Name"];
-                m_EventBroker->Publish(e);
-            } else {
-                if (glm::abs(nextTime) > animation->Duration) {
-                    (double&)animationComponent["Time"] = glm::abs(nextTime) - animation->Duration;
-                } else {
-                    (double&)animationComponent["Time"] = nextTime;
-                }
-            }
-        }
-    }
-
-    
-
-}
-

src/Engine/Rendering/DrawFinalPass.cpp

@@ -75,10 +75,6 @@ void DrawFinalPass::Draw(RenderScene& scene)
             glUniform4fv(glGetUniformLocation(shaderHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
             glUniform4fv(glGetUniformLocation(shaderHandle, "DiffuseColor"), 1, glm::value_ptr(modelJob->DiffuseColor));
 
-            glUniform4fv(glGetUniformLocation(shaderHandle, "FillColor"), 1, glm::value_ptr(modelJob->FillColor));
-            glUniform1f(glGetUniformLocation(shaderHandle, "FillPercentage"), modelJob->FillPercentage);
-
-
             glActiveTexture(GL_TEXTURE0);
             if(modelJob->DiffuseTexture != nullptr) {
                 glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture->m_Texture);
@@ -100,9 +96,12 @@ void DrawFinalPass::Draw(RenderScene& scene)
 
             //TODO: Fixa så att modelsJobs kan spela upp olika animationer och så att den kan få in en tid istället för 1.0f - Hälsningar Johan och Andreas :)
             if (modelJob->Model->m_RawModel->m_Skeleton != nullptr) {
-               
-                if (modelJob->Animation != nullptr) {
-                    std::vector<glm::mat4> frameBones = modelJob->Skeleton->GetFrameBones( *modelJob->Animation, modelJob->AnimationTime);
+                auto animation = modelJob->Model->m_RawModel->m_Skeleton->GetAnimation("running");
+                if (animation != nullptr) {
+                    std::vector<glm::mat4> frameBones = modelJob->Model->m_RawModel->m_Skeleton->GetFrameBones(
+                        *animation,
+                        0.0f
+                        );
                     glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
                 }
             }

src/Engine/Rendering/PickingPass.cpp

@@ -48,7 +48,7 @@ void PickingPass::Draw(RenderScene& scene)
     PickingPassState* state = new PickingPassState(m_PickingBuffer.GetHandle());
     
     //TODO: Render: Add code for more jobs than modeljobs.
-    GLuint shaderHandle = m_PickingProgram->GetHandle();
+    GLuint ShaderHandle = m_PickingProgram->GetHandle();
     m_PickingProgram->Bind();
 
     if (scene.ClearDepth) {
@@ -75,30 +75,22 @@ void PickingPass::Draw(RenderScene& scene)
                 m_EntityColors[std::make_tuple(pickInfo.Entity, pickInfo.World, pickInfo.Camera)] = glm::ivec2(pickColor[0], pickColor[1]);
                 if (m_ColorCounter[0] > 255) {
                     m_ColorCounter[0] = 0;
-                        m_ColorCounter[1] += 5;
+                        m_ColorCounter[1]++;
                 } else {
-                        m_ColorCounter[0] += 50;
+                        m_ColorCounter[0]++;
                 }
             }
 
             m_PickingColorsToEntity[glm::ivec2(pickColor[0], pickColor[1])] = pickInfo;
 
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
-            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
-            glUniform2fv(glGetUniformLocation(shaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
-
-            if (modelJob->Model->m_RawModel->m_Skeleton != nullptr) {
-
-                if (modelJob->Animation != nullptr) {
-                    std::vector<glm::mat4> frameBones = modelJob->Skeleton->GetFrameBones(*modelJob->Animation, modelJob->AnimationTime);
-                    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
-                }
-            }
+            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
+            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+            glUniform2fv(glGetUniformLocation(ShaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
             glBindVertexArray(modelJob->Model->VAO);
             glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
-            glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
+            glDrawElementsBaseVertex(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, nullptr, modelJob->StartIndex);
         }
     }
     

src/Engine/Rendering/RenderSystem.cpp

@@ -4,7 +4,6 @@ RenderSystem::RenderSystem(World* world, EventBroker* eventBroker, const IRender
     : System(world, eventBroker)
     , m_Renderer(renderer)
     , m_RenderFrame(renderFrame)
-    , m_World(world)
 {
     EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &RenderSystem::OnSetCamera);
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &RenderSystem::OnInputCommand);
@@ -31,16 +30,6 @@ bool RenderSystem::OnSetCamera(Events::SetCamera& e)
     return true;
 }
 
-bool RenderSystem::isChildOfACamera(EntityWrapper entity)
-{
-    return entity.FirstParentWithComponent("Camera").Valid();
-}
-
-bool RenderSystem::isChildOfCurrentCamera(EntityWrapper entity)
-{
-    return entity == m_Camera || entity.IsChildOf(m_Camera);
-}
-
 void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& jobs)
 {
     auto models = m_World->GetComponents("Model");
@@ -60,18 +49,8 @@ void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& jobs)
 
         EntityWrapper entity(m_World, modelComponent.EntityID);
 
-        // Only render children of a camera if that camera is currently active
-        if (isChildOfACamera(entity) && !isChildOfCurrentCamera(entity)) {
-            continue;
-        }
         // Don't render the local player
         if (entity == m_LocalPlayer || entity.IsChildOf(m_LocalPlayer)) {
-            if (!entity.HasComponent("HealthHUD") && entity.Name() != "Crosshair" && entity.Name() != "Weapon") { //Should work but needs to be fixed. Should only render the things "childed" to the local player camera
-                continue;
-            }
-        }
-
-        if ((entity.Name() == "Weapon" || entity.HasComponent("HealthHUD")) && !entity.IsChildOf(m_LocalPlayer)) {
             continue;
         }
 
@@ -89,21 +68,9 @@ void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& jobs)
             }
         }
 
-
-        float fillPercentage = 0.f;
-        glm::vec4 fillColor = glm::vec4(0);
-
-        if(m_World->HasComponent(modelComponent.EntityID, "Fill")) {
-            auto fillComponent = m_World->GetComponent(modelComponent.EntityID, "Fill");
-            fillPercentage = (float)(double)fillComponent["Percentage"];
-            fillColor = (glm::vec4)fillComponent["Color"];
-        }
-
-        
-
         glm::mat4 modelMatrix = Transform::ModelMatrix(modelComponent.EntityID, m_World);
         for (auto matGroup : model->MaterialGroups()) {
-            std::shared_ptr<ModelJob> modelJob = std::shared_ptr<ModelJob>(new ModelJob(model, m_Camera, modelMatrix, matGroup, modelComponent, m_World, fillColor, fillPercentage));
+            std::shared_ptr<ModelJob> modelJob = std::shared_ptr<ModelJob>(new ModelJob(model, m_Camera, modelMatrix, matGroup, modelComponent, m_World));
             jobs.push_back(modelJob);
         }
     }
@@ -189,8 +156,8 @@ void RenderSystem::fillText(std::list<std::shared_ptr<RenderJob>>& jobs, World*
         }
 
         glm::mat4 modelMatrix = Transform::ModelMatrix(textComponent.EntityID, world);
-        std::shared_ptr<TextJob> textJob = std::shared_ptr<TextJob>(new TextJob(modelMatrix, font, textComponent));
-        jobs.push_back(textJob);
+        std::shared_ptr<TextJob> modelJob = std::shared_ptr<TextJob>(new TextJob(modelMatrix, font, textComponent));
+        jobs.push_back(modelJob);
 
     }
 }
@@ -210,6 +177,7 @@ void RenderSystem::Update(double dt)
         m_Camera->SetOrientation(Transform::AbsoluteOrientation(m_CurrentCamera));
     }
 
+    //Only supports opaque geometry atm
 
     RenderScene scene;
     scene.Camera = m_Camera;

src/Game/Game.cpp

@@ -10,9 +10,6 @@
 #include "Core/EntityFileWriter.h"
 #include "Game/Systems/CapturePointSystem.h"
 #include "Game/Systems/WeaponSystem.h"
-#include "Game/Systems/PlayerHUD.h"
-#include "Game/Systems/LifetimeSystem.h"
-#include "../Engine/Rendering/AnimationSystem.h"
 
 Game::Game(int argc, char* argv[])
 {
@@ -80,19 +77,15 @@ Game::Game(int argc, char* argv[])
     // All systems with orderlevel 0 will be updated first.
     unsigned int updateOrderLevel = 0;
     m_SystemPipeline->AddSystem<RaptorCopterSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<HealthSystem>(updateOrderLevel);
+    //m_SystemPipeline->AddSystem<HealthSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PlayerMovementSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<InterpolationSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<SpawnerSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PlayerSpawnSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<WeaponSystem>(updateOrderLevel, m_Renderer);
-    m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeCollision);
-    m_SystemPipeline->AddSystem<PlayerHUD>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel);
-
     // Collision and TriggerSystem should update after player.
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<CollisionSystem>(updateOrderLevel, m_OctreeCollision);

src/Game/Systems/HealthSystem.cpp

@@ -45,16 +45,10 @@ void HealthSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& comp
     }
 }
 
-bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
+bool HealthSystem::OnPlayerDamaged(const Events::PlayerDamage& e)
 {
-    ComponentWrapper cHealth = e.Player["Health"];
-    double& health = cHealth["Health"];
-    health -= e.Damage;
-    
-    if (health <= 0.0) {
-        m_World->DeleteEntity(e.Player.ID);
-    }
-
+    //save the changed HP to a vector. it will be taken care of in UpdateComponent
+    //m_DeltaHealthVector.push_back(std::make_tuple(e.PlayerDamagedID, -e.DamageAmount));
     return true;
 }
 

src/Game/Systems/LifetimeSystem.cpp

@@ -1,27 +0,0 @@
-#include "Systems/LifetimeSystem.h"
-
-void LifetimeSystem::Update(double dt)
-{
-    for (auto& e : m_Deletions) {
-        m_World->DeleteEntity(e.ID);
-    }
-    m_Deletions.clear();
-}
-
-void LifetimeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cLifetime, double dt)
-{
-    if (dt == 0.0) {
-        return;
-    }
-
-    if (!entity.Valid()) {
-        return;
-    }
-
-    double& lifetime = cLifetime["Lifetime"];
-    lifetime -= dt;
-
-    if (lifetime <= 0.0) {
-        m_Deletions.push_back(entity);
-    }
-}

src/Game/Systems/PlayerHUD.cpp

@@ -1,57 +0,0 @@
-#include "Game/Systems/PlayerHUD.h"
-
-PlayerHUD::PlayerHUD(World* world, EventBroker* eventBrokerer)
-    :System(world, eventBrokerer)
-    , m_World(world)
-    , m_EventBroker(eventBrokerer)
-{
-    
-    
-}
-
-PlayerHUD::~PlayerHUD()
-{
-    
-
-}
-
-void PlayerHUD::Update(double dt)
-{
-    auto healthHUDs = m_World->GetComponents("HealthHUD");
-    if (healthHUDs == nullptr) {
-        return;
-    }
-
-    for (auto& healthHUDComponent : *healthHUDs) {
-        EntityWrapper entity = EntityWrapper(m_World, healthHUDComponent.EntityID);
-
-        EntityWrapper entityIDParent = entity;
-        while (entityIDParent.Parent().Valid()) {
-            entityIDParent = entityIDParent.Parent();
-                
-            if (entityIDParent.HasComponent("Health")) {
-                break;
-            }
-        }
-
-        if (entityIDParent.HasComponent("Health")) {
-
-            if (entity.HasComponent("Text")) {
-                std::string s = "";
-                s = s + std::to_string((int)(double)entityIDParent["Health"]["Health"]);
-                s = s + "/";
-                s = s + std::to_string((int)(double)entityIDParent["Health"]["MaxHealth"]);
-                float healthPercentage = (double)entityIDParent["Health"]["Health"]/(double)entityIDParent["Health"]["MaxHealth"];
-                (glm::vec4&)entity["Text"]["Color"] = glm::vec4(1.0 - healthPercentage, 0.f, healthPercentage, 1.f);
-                entity["Text"]["Content"] = s;
-            }
-
-            if(entity.HasComponent("Fill")) {
-                float healthPercentage = (double)entityIDParent["Health"]["Health"]/(double)entityIDParent["Health"]["MaxHealth"];
-                (glm::vec4&)entity["Fill"]["Color"] = glm::vec4(1.0 - healthPercentage, 0.f, healthPercentage, 0.f);
-                (double&)entity["Fill"]["Percentage"] = healthPercentage;
-
-            }
-        }
-    }
-}

src/Game/Systems/PlayerMovementSystem.cpp

@@ -36,18 +36,15 @@ void PlayerMovementSystem::Update(double dt)
         glm::vec3& ori = cTransform["Orientation"];
         ori.y += controller->Rotation().y;
 
-        float playerMovementSpeed = player["Player"]["MovementSpeed"];
-        float playerCrouchSpeed = player["Player"]["CrouchSpeed"];
-
         if (player.HasComponent("Physics")) {
             ComponentWrapper cPhysics = player["Physics"];
 
             glm::vec3 wishDirection = controller->Movement() * glm::inverse(glm::quat(ori));
             float wishSpeed;
             if (controller->Crouching()) {
-                wishSpeed = playerCrouchSpeed;
+                wishSpeed = player["Player"]["CrouchSpeed"];
             } else {
-                wishSpeed = playerMovementSpeed;
+                wishSpeed = player["Player"]["MovementSpeed"];
             }
             glm::vec3& velocity = cPhysics["Velocity"];
             ImGui::Text("velocity: (%f, %f, %f)", velocity.x, velocity.y, velocity.z);
@@ -88,33 +85,8 @@ void PlayerMovementSystem::Update(double dt)
             //        size = glm::vec3(1.f, 1.6f, 1.f);
             //    }
             //}
-
-            // Animations
-            EntityWrapper playerModel = player.FirstChildByName("PlayerModel");
-            if (playerModel.Valid()) {
-                ComponentWrapper cAnimation = playerModel["Animation"];
-
-                float movementLength = glm::length(groundVelocity);
-                if (glm::length(controller->Movement()) > 0.f) {
-                    if (controller->Crouching()) {
-                        cAnimation["Name"] = "Crouch Walk";
-                        (double&)cAnimation["Speed"] = 1.f * -glm::sign(controller->Movement().z);
-                    } else {
-                        cAnimation["Name"] = "Run";
-                        (double&)cAnimation["Speed"] = 2.f * -glm::sign(controller->Movement().z);
-                    }
-                } else {
-                    if (controller->Crouching()) {
-                        cAnimation["Name"] = "Crouch";
-                        (double&)cAnimation["Speed"] = 1.f;
-                    } else {
-                        cAnimation["Name"] = "Hold Pos";
-                        (double&)cAnimation["Speed"] = 1.f;
-                    }
-                }
-            }
         }
-
+        
         controller->Reset();
     }
 }

src/Game/Systems/PlayerSpawnSystem.cpp

@@ -102,10 +102,10 @@ bool PlayerSpawnSystem::OnPlayerSpawned(Events::PlayerSpawned& e)
     }
 
     // TODO: Set the player name to whatever
-    EntityWrapper playerName = e.Player.FirstChildByName("PlayerName");
-    if (playerName.Valid()) {
-        playerName["Text"]["Content"] = e.PlayerName;
-    }
+    //EntityWrapper playerName = e.Player.FirstChildByName("PlayerName");
+    //if (playerName.Valid()) {
+    //    playerName["Text"]["Content"] = ???;
+    //}
 
     return true;
 }

src/Game/Systems/SpawnerSystem.cpp

@@ -50,8 +50,7 @@ EntityWrapper SpawnerSystem::Spawn(EntityWrapper spawner, EntityWrapper parent /
 
     // Set its position and orientation to that of the SpawnPoint
     spawnedEntity["Transform"]["Position"] = Transform::AbsolutePosition(spawnPoint.World, spawnPoint.ID);
-    // TODO: Quaternions, bitch
-    //spawnedEntity["Transform"]["Orientation"] = glm::eulerAngles(Transform::AbsoluteOrientation(spawnPoint.World, spawnPoint.ID));
+    spawnedEntity["Transform"]["Orientation"] = glm::eulerAngles(Transform::AbsoluteOrientation(spawnPoint.World, spawnPoint.ID));
 
     return spawnedEntity;
 }

src/Game/Systems/WeaponSystem.cpp

@@ -25,75 +25,28 @@ bool WeaponSystem::OnPlayerSpawned(const Events::PlayerSpawned& e)
 
 bool WeaponSystem::OnInputCommand(const Events::InputCommand& e)
 {
+    // Only shoot client-side!
+    if (e.PlayerID != -1) {
+        return false;
+    }
+
+    // Only shoot if the player is alive
+    if (!m_LocalPlayer.Valid()) {
+        return false;
+    }
+
     if (e.Command == "PrimaryFire" && e.Value > 0) {
         Events::Shoot eShoot;
-        if (e.PlayerID == -1) {
-            eShoot.Player = m_LocalPlayer;
-        } else {
-            eShoot.Player = e.Player;
-        }
+        eShoot.Player = m_LocalPlayer;
         m_EventBroker->Publish(eShoot);
     }
 
     return true;
 }
 
-bool WeaponSystem::OnShoot(Events::Shoot& eShoot) 
-{
-    if (!eShoot.Player.Valid()) {
-        return false;
-    }
-
-    // TODO: Weapon firing effects here
-
-    auto rayRed = ResourceManager::Load<EntityFile>("Schema/Entities/RayRed.xml");
-    auto rayBlue = ResourceManager::Load<EntityFile>("Schema/Entities/RayBlue.xml");
-
-    EntityWrapper weapon = eShoot.Player.FirstChildByName("WeaponMuzzle");
-    if (weapon.Valid()) {
-        EntityWrapper ray;
-        if ((ComponentInfo::EnumType)eShoot.Player["Team"]["Team"] == eShoot.Player["Team"]["Team"].Enum("Red")) {
-            EntityFileParser parser(rayRed);
-            EntityID rayID = parser.MergeEntities(m_World);
-            ray = EntityWrapper(m_World, rayID);
-        } else {
-            EntityFileParser parser(rayBlue);
-            EntityID rayID = parser.MergeEntities(m_World);
-            ray = EntityWrapper(m_World, rayID);
-        }
-
-        glm::mat4 transformation = Transform::AbsoluteTransformation(weapon);
-        glm::vec3 scale;
-        glm::vec3 translation;
-        glm::quat orientation;
-        glm::vec3 skew;
-        glm::vec4 perspective;
-        glm::decompose(transformation, scale, orientation, translation, skew, perspective);
-        
-        // Matrix to euler angles
-        glm::vec3 euler;
-        euler.y = glm::asin(-transformation[0][2]);
-        if (cos(euler.y) != 0) {
-            euler.x = atan2(transformation[1][2], transformation[2][2]);
-            euler.z = atan2(transformation[0][1], transformation[0][0]);
-        } else {
-            euler.x = atan2(-transformation[2][0], transformation[1][1]);
-            euler.z = 0;
-        }
-
-        //LOG_DEBUG("rotation: %f %f %f", euler.x, euler.y, euler.z);
-        (glm::vec3&)ray["Transform"]["Position"] = translation;
-        (glm::vec3&)ray["Transform"]["Orientation"] = euler;
-        //(glm::vec3&)ray["Transform"]["Orientation"] = Transform::AbsoluteOrientationEuler(weapon);
-    }
-
-    // Only run further picking code client-side!
-    if (eShoot.Player != m_LocalPlayer) {
-        return false;
-    }
-
+bool WeaponSystem::OnShoot(const Events::Shoot& eShoot) {
     // Screen center, based on current resolution!
-    // TODO: check if player has enough ammo and if weapon has a cooldown or not
+    //TODO: check if player has enough ammo and if weapon has a cooldown or not
     Rectangle screenResolution = m_Renderer->Resolution();
     glm::vec2 centerScreen = glm::vec2(screenResolution.Width / 2, screenResolution.Height / 2);
 

src/Tests/CollisionTest.cpp

@@ -29,7 +29,7 @@ void RayTest(std::string fileName) {
     Ray ray(glm::vec3(-50, 0, 0), glm::vec3(1, 0, 0));
     //using a 
     
-    here, else we have to init the renderingsystem
+    //here, else we have to init the renderingsystem
     ResourceManager::RegisterType<RawModel>("RawModel");
     auto unitBox = ResourceManager::Load<RawModel>(fileName);
     BOOST_REQUIRE(unitBox != nullptr);

src/Tests/HealthSystemTest.cpp

@@ -69,8 +69,8 @@ GameHealthSystemTest::GameHealthSystemTest()
     m_EventBroker->Publish(e3);
     //damage player with 50
     Events::PlayerDamage e;
-    e.DamageAmount = 50.0f;
-    e.PlayerDamagedID = healthsID;
+    e.Damage = 50.0f;
+    //e.Player = healthsID;
     m_EventBroker->Publish(e);
     //heal some other player with 40
     Events::PlayerHealthPickup e2;