WIP

Weapon RayZ

.gitignore

@@ -4,3 +4,11 @@ bin/
 lib/
 # Because apparently nobody has any self control
 *.orig
+
+*.suo
+*.sdf
+tools/MayaExporter/MayaExporter/x64/Debug/
+tools/MayaExporter/x64/Debug/
+
+tools/MayaExporter/MayaExporter/Debug/
+tools/MayaExporter/MayaExporter/GeneratedFiles/

include/Engine/Collision/Collision.h

@@ -10,7 +10,8 @@
 
 #include "../Core/Ray.h"
 #include "../Core/AABB.h"
-#include "../Rendering/RawModel.h"
+#include "Rendering/RawModelCustom.h"
+//#include "Rendering/RawModelAssimp.h"
 #include "../Core/Transform.h"
 #include "../Core/Entity.h"
 #include "../Core/EntityWrapper.h"

include/Engine/Core/EComponentDeleted.h

@@ -0,0 +1,21 @@
+#ifndef EComponentDeleted_h__
+#define EComponentDeleted_h__
+
+#include "../Common.h"
+#include "Event.h"
+#include "Entity.h"
+
+namespace Events
+{
+
+struct ComponentDeleted : Event
+{
+    EntityID Entity;
+    std::string ComponentType;
+    // True if the component was deleted as a result of the entity it was attached to being deleted
+    bool Cascaded;
+};
+
+}
+
+#endif

include/Engine/Core/EEntityDeleted.h

@@ -0,0 +1,19 @@
+#ifndef EEntityDeleted_h__
+#define EEntityDeleted_h__
+
+#include "Event.h"
+#include "Entity.h"
+
+namespace Events
+{
+
+struct EntityDeleted : Event
+{
+    EntityID DeletedEntity;
+    // True if the entity deletion was triggered because the entity's parent was deleted before it
+    bool Cascaded;
+};
+
+}
+
+#endif

include/Engine/Core/EPlayerDamage.h

@@ -2,15 +2,15 @@
 #define EPlayerDamage_h__
 
 #include "EventBroker.h"
-#include "../Core/Entity.h"
+#include "../Core/EntityWrapper.h"
 
 namespace Events
 {
 
 struct PlayerDamage : Event
 {
-    double DamageAmount;
+    EntityWrapper Player;
-    EntityID PlayerDamagedID;
+    double Damage;
 };
 
 }

include/Engine/Core/EPlayerSpawned.h

@@ -12,6 +12,7 @@ struct PlayerSpawned : Event
     int PlayerID;
     EntityWrapper Player;
     EntityWrapper Spawner;
+    std::string PlayerName;
 };
 
 }

include/Engine/Core/EShoot.h

@@ -2,16 +2,14 @@
 #define EShoot_h__
 
 #include "EventBroker.h"
-#include "../Core/Entity.h"
+#include "../Core/EntityWrapper.h"
-#include "Engine/GLM.h"
 
 namespace Events
 {
 
 struct Shoot : Event
 {
-    //ID for who made the shot
+    EntityWrapper Player;
-    EntityID shooter;
 };
 
 }

include/Engine/Core/EntityWrapper.h

@@ -23,9 +23,11 @@ struct EntityWrapper
 
     static const EntityWrapper Invalid;
 
-    bool HasComponent(const std::string& componentName);
+    const std::string Name();
+    bool HasComponent(const std::string& componentType);
     EntityWrapper Parent();
     EntityWrapper FirstChildByName(const std::string& name);
+    EntityWrapper FirstParentWithComponent(const std::string& componentType);
     bool IsChildOf(EntityWrapper potentialParent);
     bool Valid();
 
@@ -34,6 +36,9 @@ 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/ResourceManager.h

@@ -32,10 +32,10 @@ public:
     };
     struct FailedLoadingException : public std::exception
     {
-        virtual const char* what() const throw()
+        FailedLoadingException(char const* const _Message)
-        {
+            : std::exception(_Message)
-            return "Resource is failed to load.";
+        { }
-        }
+        FailedLoadingException() :std::exception("Resource failed to load.") { };
     };
 
 	// Pretend that this is a pure virtual function that you have to implement

include/Engine/Core/Transform.h

@@ -8,8 +8,10 @@
 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/Core/World.h

@@ -5,11 +5,15 @@
 #include "Entity.h"
 #include "ObjectPool.h"
 #include "ComponentPool.h"
+#include "EventBroker.h"
 
 class World
 {
 public:
     World() = default;
+    World(EventBroker* eventBroker) 
+        : m_EventBroker(eventBroker)
+    { }
     ~World();
 
     // Create empty entity
@@ -46,6 +50,7 @@ public:
     std::string GetName(EntityID entity) const;
 
 private:
+    EventBroker* m_EventBroker = nullptr;
     EntityID m_CurrentEntityID = 0;
 
     std::unordered_map<EntityID, EntityID> m_EntityParents;
@@ -55,6 +60,7 @@ private:
     std::unordered_map<EntityID, std::string> m_EntityNames;
 
     EntityID generateEntityID();
+    void deleteEntityRecursive(EntityID entity, bool cascaded = false);
 };
 
 #endif

include/Engine/Input/EInputCommand.h

@@ -2,6 +2,7 @@
 #define Events_InputCommand_h__
 
 #include "Core/EventBroker.h"
+#include "Core/EntityWrapper.h"
 
 namespace Events
 {
@@ -10,6 +11,7 @@ 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

@@ -50,6 +50,7 @@ private:
     PlayerID m_PlayerID = -1;
     EntityID m_ServerEntityID = std::numeric_limits<EntityID>::max();
     bool m_IsConnected = false;
+    EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
     // Server Client Lookup map
     // Assumes that root node for client and server is EntityID 0.
 
@@ -79,12 +80,15 @@ private:
     void parsePing();
     void parseKick();
     void parsePlayersSpawned(Packet& packet);
+    void parseEntityDeletion(Packet& packet);
+    void parseComponentDeletion(Packet& packet);
     void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
     void identifyPacketLoss();
     bool hasServerTimedOut();
     EntityID createPlayer();
     void sendInputCommands();
+    void sendLocalPlayerTransform();
     void becomePlayer();
     // Mapping Logic
     // Returns if local EntityID exist in map
@@ -92,13 +96,16 @@ private:
     // Returns if server EntityID exist in map
     bool serverClientMapsHasEntity(EntityID serverEntityID);
     void insertIntoServerClientMaps(EntityID serverEntityID, EntityID clientEntityID);
+    void deleteFromServerClientMaps(EntityID serverEntityID, EntityID clientEntityID);
 
     // Events
     EventBroker* m_EventBroker;
     EventRelay<Client, Events::InputCommand> m_EInputCommand;
     bool OnInputCommand(const Events::InputCommand& e);
-    EventRelay<Client, Events::PlayerDamage> m_EPlayeDamage;
+    EventRelay<Client, Events::PlayerDamage> m_EPlayerDamage;
     bool OnPlayerDamage(const Events::PlayerDamage& e);
+    EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
+    bool OnPlayerSpawned(const Events::PlayerSpawned& e);
 };
 
 #endif

include/Engine/Network/MessageType.h

@@ -15,7 +15,10 @@ enum class MessageType
     PlayerConnected,
     BecomePlayer,
     Kick,
-    OnPlayerSpawned
+    OnPlayerSpawned,
+    EntityDeleted,
+    ComponentDeleted,
+    PlayerTransform
 };
 
 #endif

include/Engine/Network/Network.h

@@ -12,10 +12,9 @@
 #include <fstream>
 #include <iostream>
 
-#define INPUTSIZE 4097
+#define INPUTSIZE 32000
 typedef unsigned int PlayerID;
 typedef unsigned int PacketID;
-typedef unsigned int UserID;
 
 class Network
 {

include/Engine/Network/PlayerDefinition.h

@@ -1,9 +1,10 @@
 #ifndef PlayerDefinition_h__
 #define PlayerDefinition_h__
 #include <string>
+#include "../Core/Entity.h"
 
 struct PlayerDefinition {
-    int EntityID = -1;
+    ::EntityID EntityID = EntityID_Invalid;
     std::string Name = "";
     boost::asio::ip::udp::endpoint Endpoint;
     unsigned int PacketID;

include/Engine/Network/Server.h

@@ -16,6 +16,8 @@
 #include "Core/EPlayerDamage.h"
 #include "Network/EPlayerDisconnected.h"
 #include "Core/EPlayerSpawned.h"
+#include "Core/EEntityDeleted.h"
+#include "Core/EComponentDeleted.h"
 
 class Server : public Network
 {
@@ -31,8 +33,8 @@ private:
     boost::asio::ip::udp::socket m_Socket;
 
     // Sending messages to client logic
-    PlayerDefinition m_PlayerDefinitions[8]; // 
+    std::map<PlayerID, PlayerDefinition> m_ConnectedPlayers;
-    std::vector<PlayerDefinition> m_ConnectedUsers;
+    // HACK: Fix INPUTSIZE
     char readBuffer[INPUTSIZE] = { 0 };
     int bytesRead = 0;
     // time for previouse message
@@ -43,6 +45,7 @@ private:
     int pingIntervalMs;
     int snapshotInterval;
     int checkTimeOutInterval = 100;
+    int m_NextPlayerID = 0;
 
     //Timers
     std::clock_t m_StartPingTime;
@@ -58,14 +61,14 @@ private:
     // Private member functions
     int  receive(char* data);
     void readFromClients();
-    void send(Packet& packet, UserID user);
     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 checkForTimeOuts();
-    void disconnect(UserID user);
+    void disconnect(PlayerID playerID);
     void parseMessageType(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseOnPlayerDamage(Packet& packet);
@@ -74,7 +77,6 @@ private:
     void parseClientPing();
     void parsePing();
     void identifyPacketLoss();
-    void createPlayer();
     void kick(PlayerID player);
     PlayerID GetPlayerIDFromEndpoint(boost::asio::ip::udp::endpoint endpoint);
     // Debug event
@@ -82,6 +84,11 @@ private:
     bool OnInputCommand(const Events::InputCommand& e);
     EventRelay<Server, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(const Events::PlayerSpawned& e);
+    EventRelay<Server, Events::EntityDeleted> m_EEntityDeleted;
+    bool OnEntityDeleted(const Events::EntityDeleted& e);
+    EventRelay<Server, Events::ComponentDeleted> m_EComponentDeleted;
+    bool OnComponentDeleted(const Events::ComponentDeleted& e);
+    void parsePlayerTransform(Packet& packet);
 };
 
 #endif

include/Engine/Rendering/AnimationSystem.h

@@ -0,0 +1,29 @@
+#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

@@ -0,0 +1,18 @@
+#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/Model.h

@@ -1,7 +1,8 @@
 #ifndef Model_h__
 #define Model_h__
 
-#include "RawModel.h"
+#include "Rendering/RawModelCustom.h"
+//#include "Rendering/RawModelAssimp.h"
 #include "../OpenGL.h"
 
 class Model : public ThreadUnsafeResource
@@ -19,12 +20,11 @@ public:
 
 	GLuint VAO;
 	GLuint ElementBuffer;
+    RawModel* m_RawModel;
 
 private:
-    RawModel* m_RawModel;
+    
 	GLuint VertexBuffer;
-	GLuint DiffuseVertexColorBuffer;
-	GLuint SpecularVertexColorBuffer;
 	GLuint NormalBuffer;
 	GLuint TangentNormalsBuffer;
 	GLuint BiTangentNormalsBuffer;

include/Engine/Rendering/ModelJob.h

@@ -13,10 +13,11 @@
 #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)
+    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialGroup matGroup, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage)
         : RenderJob()
     {
         Model = model;
@@ -24,6 +25,10 @@ struct ModelJob : RenderJob
         DiffuseTexture = matGroup.Texture.get();
         NormalTexture = matGroup.NormalMap.get();
         SpecularTexture = matGroup.SpecularMap.get();
+        IncandescenceTexture = matGroup.IncandescenceMap.get();
+        DiffuseColor = matGroup.DiffuseColor;
+        SpecularColor = matGroup.SpecularColor;
+        IncandescenceColor = matGroup.IncandescenceColor;
         StartIndex = matGroup.StartIndex;
         EndIndex = matGroup.EndIndex;
         Matrix = matrix;
@@ -33,6 +38,17 @@ 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;
@@ -43,13 +59,25 @@ struct ModelJob : RenderJob
     const Texture* DiffuseTexture;
     const Texture* NormalTexture;
     const Texture* SpecularTexture;
+    const Texture* IncandescenceTexture;
     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;
     unsigned int StartIndex = 0;
     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,8 +1,6 @@
 #ifndef PickingPass_h__
 #define PickingPass_h__
 
-
-
 #include "IRenderer.h"
 #include "PickingPassState.h"
 #include "FrameBuffer.h"
@@ -10,8 +8,7 @@
 #include "Util/UnorderedMapiVec2.h"
 #include "../Core/EventBroker.h"
 #include "../Core/World.h"
-
+#include "Rendering/Skeleton.h"
-
 
 class PickingPass
 {

include/Engine/Rendering/RawModelAssimp.h

@@ -1,5 +1,7 @@
-#ifndef RawModel_h__
+#ifndef RawModelAssimp_h__
-#define RawModel_h__
+#define RawModelAssimp_h__
+
+#ifdef USING_ASSIMP_AS_IMPORTER
 
 #include <fstream>
 #include <iostream>
@@ -18,29 +20,27 @@
 #include "Texture.h"
 #include "Skeleton.h"
 
-class RawModel : public Resource
+#define RawModel RawModelAssimp
+
+class RawModelAssimp : public Resource
 {
 	friend class ResourceManager;
 
 protected:
-	RawModel(std::string fileName);
+    RawModelAssimp(std::string fileName);
 
 public:
-	~RawModel();
+	~RawModelAssimp();
 
 	struct Vertex
 	{
 		glm::vec3 Position;
 		glm::vec3 Normal;
 		glm::vec3 Tangent;
-		glm::vec3 BiTangent;
+		glm::vec3 BiNormal;
 		glm::vec2 TextureCoords;
-		glm::vec4 DiffuseVertexColor;
+		glm::vec4 BoneIndices;
-		glm::vec4 SpecularVertexColor;
+		glm::vec4 BoneWeights;
-		glm::vec4 BoneIndices1;
-		glm::vec4 BoneIndices2;
-		glm::vec4 BoneWeights1;
-		glm::vec4 BoneWeights2;
 	};
 
 	struct MaterialGroup
@@ -68,8 +68,6 @@ private:
 	std::vector<glm::ivec2> BoneIndices;
 	std::vector<glm::vec2> BoneWeights;
 	std::vector<glm::vec3> Normals;
-	std::vector<glm::vec4> DiffuseVertexColor;
-	std::vector<glm::vec4> SpecularVertexColor;
 	std::vector<glm::vec3> TangentNormals;
 	std::vector<glm::vec3> BiTangentNormals;
 	std::vector<glm::vec2> TextureCoords;
@@ -78,3 +76,4 @@ private:
 };
 
 #endif
+#endif

include/Engine/Rendering/RawModelCustom.h

@@ -0,0 +1,102 @@
+#ifndef RawModelCustom_h__
+#define RawModelCustom_h__
+
+#ifndef USING_ASSIMP_AS_IMPORTER
+
+#define RawModel RawModelCustom
+
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <cstdlib>
+#include <stack>
+
+#include <boost/filesystem/path.hpp>
+
+#include "../Common.h"
+#include "../GLM.h"
+#include "../Core/ResourceManager.h"
+#include "Texture.h"
+#include "Skeleton.h"
+
+#include "boost\endian\buffers.hpp"
+
+
+
+class RawModelCustom : public Resource
+{
+    friend class ResourceManager;
+
+protected:
+    RawModelCustom(std::string fileName);
+
+public:
+    ~RawModelCustom();
+    
+    struct Vertex
+    {
+        glm::vec3 Position;
+        glm::vec3 Normal;
+        glm::vec3 Tangent;
+        glm::vec3 BiNormal;
+        glm::vec2 TextureCoords;
+        glm::vec4 BoneIndices;
+        glm::vec4 BoneWeights;
+    };
+
+    struct MaterialGroup
+    {
+        float SpecularExponent;
+        float ReflectionFactor;
+        glm::vec4 DiffuseColor{ 1.0f, 1.0f, 1.0f, 1.0f };
+        glm::vec4 SpecularColor{ 1.0f, 1.0f, 1.0f, 1.0f };
+        glm::vec4 IncandescenceColor{ 1.0f, 1.0f, 1.0f, 1.0f };
+        unsigned int StartIndex;
+        unsigned int EndIndex;
+        //float Transparency;
+        std::string TexturePath;
+        std::shared_ptr<::Texture> Texture;
+        std::string NormalMapPath;
+        std::shared_ptr<::Texture> NormalMap;
+        std::string SpecularMapPath;
+        std::shared_ptr<::Texture> SpecularMap;
+        std::string IncandescenceMapPath;
+        std::shared_ptr<::Texture> IncandescenceMap;
+    };
+
+    std::vector<MaterialGroup> MaterialGroups;
+
+    std::vector<Vertex> m_Vertices;
+    std::vector<unsigned int> m_Indices;
+    Skeleton* m_Skeleton = nullptr;
+    glm::mat4 m_Matrix;
+
+private:
+   
+
+    void ReadMeshFile(std::string filePath);
+    void ReadMeshFileHeader(unsigned int& offset, char* fileData, unsigned int& fileByteSize);
+    void ReadMesh(unsigned int& offset, char* fileData, unsigned int& fileByteSize);
+    void ReadVertices(unsigned int& offset, char* fileData, unsigned int& fileByteSize);
+    void ReadIndices(unsigned int& offset, char* fileData, unsigned int& fileByteSize);
+
+    void ReadMaterialFile(std::string filePath);
+    void ReadMaterials(unsigned int &offset, char* fileData, unsigned int& fileByteSize);
+    void ReadMaterialSingle(unsigned int &offset, char* fileData, unsigned int& fileByteSize);
+
+    void ReadAnimationFile(std::string filePath);
+    void ReadAnimationBindPoses(unsigned int &offset, char* fileData, unsigned int& fileByteSize);
+    void ReadAnimationJoint(unsigned int &offset, char* fileData, unsigned int& fileByteSize);
+    void ReadAnimationClips(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int numberOfClips);
+    void ReadAnimationClipSingle(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int clipIndex);
+    void ReadAnimationKeyFrame(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int numberOfJoints, Skeleton::Animation& animation);
+    
+    //void CreateSkeleton(std::vector<std::tuple<std::string, glm::mat4>> &boneInfo, std::map<std::string, int> &boneNameMapping, aiNode* node, int parentID);
+};
+
+#else
+
+#include "RawModelAssimp.h"
+
+#endif
+#endif

include/Engine/Rendering/RenderSystem.h

@@ -29,22 +29,25 @@ 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/Engine/Rendering/Skeleton.h

@@ -4,6 +4,7 @@
 #include <sstream>
 #include "Common.h"
 #include "../GLM.h"
+#include <glm/gtx/matrix_decompose.hpp>
 
 //struct Bone
 //{
@@ -38,9 +39,9 @@ public:
 			, OffsetMatrix(offsetMatrix)
 		{ }
 
-		int ID;
 		std::string Name;
 		glm::mat4 OffsetMatrix;
+        int ID;
 
 		Bone* Parent;
 		std::vector<Bone*> Children;

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(const Events::PlayerDamage& e);
+    bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e);
     EventRelay<HealthSystem, Events::PlayerHealthPickup> m_EPlayerHealthPickup;
     bool HealthSystem::OnPlayerHealthPickup(const Events::PlayerHealthPickup& e);
 

include/Game/Systems/LifetimeSystem.h

@@ -0,0 +1,21 @@
+#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

@@ -0,0 +1,23 @@
+#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

@@ -9,7 +9,10 @@
 #include "Core/System.h"
 #include "Core/EPlayerDamage.h"
 #include "Core/EShoot.h"
+#include "Core/EPlayerSpawned.h"
 #include "Input/EInputCommand.h"
+#include "Core/EntityFile.h"
+#include "Core/EntityFileParser.h"
 
 #include <tuple>
 #include <vector>
@@ -23,16 +26,18 @@ public:
     virtual void Update(double dt) override;
 
 private:
-    //methods which will take care of specific events
-    EventRelay<WeaponSystem, Events::Shoot> m_EShoot;
-    bool WeaponSystem::OnShoot(const Events::Shoot& e);
-
-    EventRelay<WeaponSystem, Events::InputCommand> m_EInputCommand;
-    bool WeaponSystem::OnInputCommand(const Events::InputCommand& e);
-
     IRenderer* m_Renderer;
 
-    std::vector<std::tuple<EntityID, glm::vec2>> m_EShootVector;
+    // State
+    EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
+
+    // Events
+    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);
+    EventRelay<WeaponSystem, Events::InputCommand> m_EInputCommand;
+    bool WeaponSystem::OnInputCommand(const Events::InputCommand& e);
 };
 
 #endif

resources/DefaultInput.ini

@@ -21,4 +21,5 @@ F1=ToggleEditor
 X=EditorToggleTransformSpace
 C=ConnectToServer
 N=SwitchToServer
-M=SwitchToClient
+M=SwitchToClient
+P=SwitchToPlayer

resources/Schema/Components.xsd

@@ -23,4 +23,8 @@
 	<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

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

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

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

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

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

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

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

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

@@ -0,0 +1,273 @@
+<?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:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:Camera/>
+        <c:Listener/>
+        <c:Transform>
+          <Position X="4.52910185" Y="5.50171423" Z="7.69566345"/>
+          <Orientation X="-0.453785568" Y="0.436270237" Z="-1.03594937e-06"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>models/dummyscene.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="-0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>models/animtest.</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-0.0966923237" Y="1.2939688" Z="0.399702221"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>models/animTest.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="1.31816244" Z="1.1888907"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>models/animTest.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0.708824873" Y="1.30000007" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>models/animTest.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="1.36948848" Y="1.20000005" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:DirectionalLight>
+          <Intensity>0.13000047206878662</Intensity>
+        </c:DirectionalLight>
+        <c:Transform>
+          <Position X="0" Y="2.77622533" Z="0"/>
+          <Orientation X="0" Y="1.30900002" Z="1.73600006"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:RaptorCopter>
+          <Speed>0.30000001192092896</Speed>
+          <Axis X="0" Y="5" Z="0"/>
+        </c:RaptorCopter>
+        <c:Transform>
+          <Orientation X="117.03714" Y="3023.50244" Z="3.03297734"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="1" G="1" R="0"/>
+              <Radius>5</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="0" Y="1" Z="1.29999995"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0" G="1" R="0"/>
+              <Radius>5</Radius>
+              <Intensity>0.80000001192092896</Intensity>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="0" Y="1" Z="-1.29999995"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="1" G="0" R="0.478431374"/>
+              <Radius>5</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-1.30000007" Y="1" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0" G="1" R="1"/>
+              <Radius>5</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="1.29999995" Y="1" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:RaptorCopter>
+          <Speed>0.50999981164932251</Speed>
+          <Axis X="0" Y="1" Z="0"/>
+        </c:RaptorCopter>
+        <c:Transform>
+          <Position X="0" Y="-0.100000001" Z="0"/>
+          <Orientation X="0" Y="191.457993" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0.301960796" G="0.0901960805" R="0.247058824"/>
+              <Radius>5</Radius>
+              <Intensity>5</Intensity>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="0" Y="3" Z="5"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0.960784316" G="1" R="0"/>
+              <Radius>5</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="0" Y="3" Z="-7.66608238"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0.00784313772" G="1" R="1"/>
+              <Radius>5</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-3.47176075" Y="3" Z="-8.09415054"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0" G="0" R="1"/>
+              <Radius>5</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-9.50536728" Y="2" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="1" G="0" R="1"/>
+              <Radius>5</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="0" Y="3" Z="4.40877533"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0.431372553" G="0.0745098069" R="1"/>
+              <Radius>5</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="5.83008432" Y="3" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0" G="0.623529434" R="0.929411769"/>
+              <Radius>5</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="3.72500014" Y="3" Z="-4.26100016"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Radius>5</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="0" Y="3" Z="-7.50000048"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0.192156866" G="1" R="0"/>
+              <Radius>5</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-5.90153885" Y="3" Z="-5.40681458"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/CaptureTest.xml

@@ -9,7 +9,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>../assets/Models/DummyScene.obj</Resource>
+          <Resource>../assets/Models/DummyScene.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -41,7 +41,7 @@
           <HomePointForTeam>3</HomePointForTeam>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="0.200000003" R="0"/>
         </c:Model>
         <c:Team>
@@ -61,7 +61,7 @@
           <CapturePointNumber>1</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="1" R="1"/>
         </c:Model>
         <c:Team>
@@ -81,7 +81,7 @@
           <CapturePointNumber>2</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="1" R="0"/>
         </c:Model>
         <c:Team>
@@ -102,7 +102,7 @@
           <CapturePointNumber>3</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="0.200000003" R="1"/>
         </c:Model>
         <c:Team>
@@ -120,7 +120,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0.482352942" G="0.490196079" R="1"/>
         </c:Model>
         <c:Player/>
@@ -138,7 +138,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="0.196078435" R="0.196078435"/>
         </c:Model>
         <c:Player/>

resources/Schema/Entities/CaptureTestState1.xml

@@ -9,7 +9,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>../assets/Models/DummyScene.obj</Resource>
+          <Resource>../assets/Models/DummyScene.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -42,7 +42,7 @@
           <CaptureTimer>6.9158446328696002</CaptureTimer>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="1" R="1"/>
         </c:Model>
         <c:Team>
@@ -63,7 +63,7 @@
           <CapturePointNumber>1</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="1" R="0"/>
         </c:Model>
         <c:Team>
@@ -83,7 +83,7 @@
           <CapturePointNumber>2</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="0.200000003" R="1"/>
         </c:Model>
         <c:Team>
@@ -104,7 +104,7 @@
           <CapturePointNumber>3</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="0.200000003" R="1"/>
         </c:Model>
         <c:Team>
@@ -122,7 +122,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0.482352942" G="0.490196079" R="1"/>
         </c:Model>
         <c:Player/>
@@ -140,7 +140,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="0.196078435" R="0.196078435"/>
         </c:Model>
         <c:Player/>

resources/Schema/Entities/CaptureTestState2.xml

@@ -9,7 +9,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>../assets/Models/DummyScene.obj</Resource>
+          <Resource>../assets/Models/DummyScene.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -41,7 +41,7 @@
           <HomePointForTeam>3</HomePointForTeam>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="0.200000003" R="0"/>
         </c:Model>
         <c:Team>
@@ -61,7 +61,7 @@
           <CapturePointNumber>1</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="1" R="0"/>
         </c:Model>
         <c:Team/>
@@ -79,7 +79,7 @@
           <CapturePointNumber>2</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="1" R="1"/>
         </c:Model>
         <c:Team/>
@@ -98,7 +98,7 @@
           <CapturePointNumber>3</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="0.200000003" R="1"/>
         </c:Model>
         <c:Team>
@@ -116,7 +116,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0.482352942" G="0.490196079" R="1"/>
         </c:Model>
         <c:Player/>
@@ -134,7 +134,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="0.196078435" R="0.196078435"/>
         </c:Model>
         <c:Player/>

resources/Schema/Entities/CaptureTestState3.xml

@@ -9,7 +9,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>../assets/Models/DummyScene.obj</Resource>
+          <Resource>../assets/Models/DummyScene.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -41,7 +41,7 @@
           <HomePointForTeam>3</HomePointForTeam>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="0.200000003" R="0"/>
         </c:Model>
         <c:Team>
@@ -61,7 +61,7 @@
           <CapturePointNumber>1</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="1" R="1"/>
         </c:Model>
         <c:Team>
@@ -81,7 +81,7 @@
           <CapturePointNumber>2</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="1" R="0"/>
         </c:Model>
         <c:Team>
@@ -101,7 +101,7 @@
           <CapturePointNumber>3</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="0.200000003" R="1"/>
         </c:Model>
         <c:Team>
@@ -122,7 +122,7 @@
           <CapturePointNumber>4</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="0.200000003" R="1"/>
         </c:Model>
         <c:Team>
@@ -140,7 +140,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0.482352942" G="0.490196079" R="1"/>
         </c:Model>
         <c:Player/>
@@ -158,7 +158,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0.482352942" G="0.490196079" R="1"/>
         </c:Model>
         <c:Player/>
@@ -176,7 +176,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="0.196078435" R="0.196078435"/>
         </c:Model>
         <c:Player/>
@@ -194,7 +194,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="0.196078435" R="0.196078435"/>
         </c:Model>
         <c:Player/>

resources/Schema/Entities/CaptureTestState4.xml

@@ -9,7 +9,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>../assets/Models/DummyScene.obj</Resource>
+          <Resource>../assets/Models/DummyScene.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -41,7 +41,7 @@
           <HomePointForTeam>3</HomePointForTeam>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="0.200000003" R="0"/>
         </c:Model>
         <c:Team>
@@ -61,7 +61,7 @@
           <CapturePointNumber>1</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="1" R="0"/>
         </c:Model>
         <c:Team/>
@@ -79,7 +79,7 @@
           <CapturePointNumber>2</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
         </c:Model>
         <c:Team/>
         <c:Transform>
@@ -96,7 +96,7 @@
           <CapturePointNumber>3</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="1" R="1"/>
         </c:Model>
         <c:Team/>
@@ -115,7 +115,7 @@
           <CapturePointNumber>4</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="0.200000003" R="1"/>
         </c:Model>
         <c:Team>
@@ -133,7 +133,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0.482352942" G="0.490196079" R="1"/>
         </c:Model>
         <c:Player/>
@@ -151,7 +151,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0.482352942" G="0.490196079" R="1"/>
         </c:Model>
         <c:Player/>
@@ -169,7 +169,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="0.196078435" R="0.196078435"/>
         </c:Model>
         <c:Player/>
@@ -187,7 +187,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="0.196078435" R="0.196078435"/>
         </c:Model>
         <c:Player/>

resources/Schema/Entities/CollidableCube.xml

@@ -5,7 +5,7 @@
     <c:AABB/>
     <c:Collidable/>
     <c:Model>
-      <Resource>Models/Core/UnitCube.obj</Resource>
+      <Resource>Models/Core/UnitCube.mesh</Resource>
     </c:Model>
     <c:Transform/>
   </Components>

resources/Schema/Entities/CollisionTest1.xml

@@ -24,7 +24,7 @@
           <Static>false</Static>
         </c:Collidable>
         <c:Model>
-          <Resource>Models/Core/UnitCube.obj</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0" G="1" R="0"/>
         </c:Model>
         <c:Transform>

resources/Schema/Entities/CollisionTestLevel.xml

@@ -6,7 +6,7 @@
 			<Orientation X="0" Y="0" Z="0"/>
 		</c:Transform>
 		<c:Model>
-			<Resource>Models/DummyScene.obj</Resource>
+			<Resource>Models/DummyScene.mesh</Resource>
 		</c:Model>
 	</Components>
 	<Children>
@@ -17,7 +17,7 @@
 					<Scale X="1" Y="1" Z="1"/>
 				</c:Transform>
 				<c:Model>
-					<Resource>Models/Core/UnitSphere.obj</Resource>
+					<Resource>Models/Core/UnitSphere.mesh</Resource>
 				</c:Model>
 			</Components>
 		</Entity>
@@ -28,7 +28,7 @@
 					<Scale X="2" Y="2" Z="2"/>
 				</c:Transform>
 				<c:Model>
-					<Resource>Models/RotationWidgetX.obj</Resource>
+					<Resource>Models/RotationWidgetX.mesh</Resource>
 				</c:Model>
 				<c:Trigger>
 				</c:Trigger>
@@ -43,7 +43,7 @@
 					<Position X="2.5"/>
 				</c:Transform>
 				<c:Model>
-					<Resource>Models/Core/UnitCube.obj</Resource>
+					<Resource>Models/Core/UnitCube.mesh</Resource>
 				</c:Model>
 				<c:AABB>
 				</c:AABB>
@@ -69,7 +69,7 @@
 							<Orientation X="0.0" Y="0" Z="1.0"/>
 						</c:Transform>
 						<c:Model>
-							<Resource>Models/Core/UnitRaptor.obj</Resource>
+							<Resource>Models/Core/UnitRaptor.mesh</Resource>
 							<Color R="1" G="0.4" B="0.8"/>
 						</c:Model>
 					</Components>
@@ -94,7 +94,7 @@
 											<Orientation X="0" Y="0" Z="0"/>
 										</c:Transform>
 										<c:Model>
-											<Resource>Models/Core/UnitCube.obj</Resource>
+											<Resource>Models/Core/UnitCube.mesh</Resource>
 											<Color R="1" G="0.4" B="0.8"/>
 										</c:Model>
 									</Components>
@@ -107,7 +107,7 @@
 											<Orientation X="0" Y="1.57" Z="0"/>
 										</c:Transform>
 										<c:Model>
-											<Resource>Models/Core/UnitCube.obj</Resource>
+											<Resource>Models/Core/UnitCube.mesh</Resource>
 											<Color R="1" G="0.4" B="0.8"/>
 										</c:Model>
 									</Components>

resources/Schema/Entities/EditorTestWorld.xml

@@ -9,7 +9,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>Models/Core/UnitCube.obj</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Scale X="100" Y="1" Z="100"/>
@@ -58,7 +58,7 @@
       <Components>
         <c:DirectionalLight/>
         <c:Model>
-          <Resource>Models/DirectionalLightWidget.obj</Resource>
+          <Resource>Models/DirectionalLightWidget.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="2.1529963" Y="6.59221172" Z="0.169116676"/>
@@ -70,7 +70,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>Models/Assault.obj</Resource>
+          <Resource>Models/Assault.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="-2.00568962" Y="0.527161121" Z="0"/>
@@ -94,7 +94,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>Models/Core/UnitSphere.obj</Resource>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="0" Y="3.70000029" Z="0"/>

resources/Schema/Entities/EditorWidgetRotate.xml

@@ -18,7 +18,7 @@
           <Axis X="1" Y="0" Z="0"/>
         </c:EditorWidget>
         <c:Model>
-          <Resource>Models/RotationWidgetX.obj</Resource>
+          <Resource>Models/RotationWidgetX.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -33,7 +33,7 @@
           <Axis X="0" Y="1" Z="0"/>
         </c:EditorWidget>
         <c:Model>
-          <Resource>Models/RotationWidgetY.obj</Resource>
+          <Resource>Models/RotationWidgetY.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -48,7 +48,7 @@
           <Axis X="0" Y="0" Z="1"/>
         </c:EditorWidget>
         <c:Model>
-          <Resource>Models/RotationWidgetZ.obj</Resource>
+          <Resource>Models/RotationWidgetZ.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>

resources/Schema/Entities/EditorWidgetScale.xml

@@ -3,7 +3,7 @@
 
   <Components>
     <c:Model>
-      <Resource>Models/ScaleWidgetOrigin.obj</Resource>
+      <Resource>Models/ScaleWidgetOrigin.mesh</Resource>
     </c:Model>
     <c:Transform/>
     <c:UniformScale>
@@ -20,7 +20,7 @@
           </Type>
         </c:EditorWidget>
         <c:Model>
-          <Resource>Models/ScaleWidgetX.obj</Resource>
+          <Resource>Models/ScaleWidgetX.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -34,7 +34,7 @@
           </Type>
         </c:EditorWidget>
         <c:Model>
-          <Resource>Models/ScaleWidgetY.obj</Resource>
+          <Resource>Models/ScaleWidgetY.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -48,7 +48,7 @@
           </Type>
         </c:EditorWidget>
         <c:Model>
-          <Resource>Models/ScaleWidgetZ.obj</Resource>
+          <Resource>Models/ScaleWidgetZ.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>

resources/Schema/Entities/EditorWidgetTranslate.xml

@@ -3,7 +3,7 @@
 
   <Components>
     <c:Model>
-      <Resource>Models/TranslationWidgetOrigin.obj</Resource>
+      <Resource>Models/TranslationWidgetOrigin.mesh</Resource>
     </c:Model>
     <c:Transform/>
     <c:UniformScale>
@@ -18,7 +18,7 @@
           <Axis X="1" Y="0" Z="0"/>
         </c:EditorWidget>
         <c:Model>
-          <Resource>Models/TranslationWidgetX.obj</Resource>
+          <Resource>Models/TranslationWidgetX.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -30,7 +30,7 @@
           <Axis X="0" Y="1" Z="0"/>
         </c:EditorWidget>
         <c:Model>
-          <Resource>Models/TranslationWidgetY.obj</Resource>
+          <Resource>Models/TranslationWidgetY.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -42,7 +42,7 @@
           <Axis X="0" Y="0" Z="1"/>
         </c:EditorWidget>
         <c:Model>
-          <Resource>Models/TranslationWidgetZ.obj</Resource>
+          <Resource>Models/TranslationWidgetZ.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -54,7 +54,7 @@
           <Axis X="0" Y="1" Z="1"/>
         </c:EditorWidget>
         <c:Model>
-          <Resource>Models/WidgetPlaneX.obj</Resource>
+          <Resource>Models/WidgetPlaneX.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -66,7 +66,7 @@
           <Axis X="1" Y="0" Z="1"/>
         </c:EditorWidget>
         <c:Model>
-          <Resource>Models/WidgetPlaneY.obj</Resource>
+          <Resource>Models/WidgetPlaneY.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -78,7 +78,7 @@
           <Axis X="1" Y="1" Z="0"/>
         </c:EditorWidget>
         <c:Model>
-          <Resource>Models/WidgetPlaneZ.obj</Resource>
+          <Resource>Models/WidgetPlaneZ.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>

resources/Schema/Entities/FastWorld.xml

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

@@ -0,0 +1,243 @@
+<?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:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Scenemesh">
+      <Components>
+        <c:Model>
+          <Resource>Models\MapVersion1.mesh</Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="DirectionalLight">
+      <Components>
+        <c:DirectionalLight>
+          <Intensity>2</Intensity>
+        </c:DirectionalLight>
+        <c:Model>
+          <Resource>Models/DirectionalLightWidget.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="61.9050903" Z="0"/>
+          <Scale X="50" Y="50" Z="50"/>
+          <Orientation X="4.42700005" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="PointLight">
+      <Components>
+        <c:PointLight>
+          <Radius>8</Radius>
+          <Intensity>2.7999999523162842</Intensity>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="0.370978802" Y="1.88588905" Z="-0.55370003"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="PointLight">
+      <Components>
+        <c:PointLight>
+          <Radius>8</Radius>
+          <Intensity>2.7999999523162842</Intensity>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="38.0347443" Y="1.88588905" Z="62.7340622"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-0.904668212" Y="0" Z="8.48177528"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-4.61666441" Y="0" Z="-8.51156044"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-7.56803513" Y="-0.0658408776" Z="0.59418112"/>
+          <Scale X="1.20000005" Y="0.900000036" Z="1.30000007"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="10.460474" Y="0" Z="-3.92580295"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="1.09146011" Y="-0.315138876" Z="-0.333906144"/>
+          <Scale X="150" Y="1" Z="180"/>
+        </c:Transform>
+      </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/Model.xml

@@ -0,0 +1,30 @@
+<?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:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:Camera/>
+        <c:Listener/>
+        <c:Transform>
+          <Orientation X="0" Y="-0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>models/animTest.mesh</Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MovementTest.xml

@@ -11,7 +11,7 @@
         <c:AABB/>
         <c:Collidable/>
         <c:Model>
-          <Resource>Models/Core/UnitCube.obj</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0.513725519" G="0" R="1"/>
           <Visible>false</Visible>
         </c:Model>
@@ -42,7 +42,7 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Assault.obj</Resource>
+              <Resource>Models/Assault.mesh</Resource>
               <Color A="1" B="0" G="0" R="1"/>
             </c:Model>
             <c:Transform>
@@ -55,7 +55,7 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Assault.obj</Resource>
+              <Resource>Models/Assault.mesh</Resource>
               <Color A="1" B="0.0117647061" G="0" R="1"/>
             </c:Model>
             <c:Transform>
@@ -70,7 +70,7 @@
       <Components>
         <c:DirectionalLight/>
         <c:Model>
-          <Resource>Models/DirectionalLightWidget.obj</Resource>
+          <Resource>Models/DirectionalLightWidget.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="-6.00145912" Y="1.42697716" Z="3.04144025"/>
@@ -82,7 +82,7 @@
     <Entity name="ObstacleCourse">
       <Components>
         <c:Model>
-          <Resource>Models/Test/ObstacleCourse.obj</Resource>
+          <Resource>Models/Test/ObstacleCourse.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -93,7 +93,7 @@
         <c:AABB/>
         <c:Collidable/>
         <c:Model>
-          <Resource>Models/Core/UnitCube.obj</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
           <Visible>false</Visible>
         </c:Model>
         <c:Transform>
@@ -108,7 +108,7 @@
         <c:AABB/>
         <c:Collidable/>
         <c:Model>
-          <Resource>Models/Core/UnitCube.obj</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
           <Visible>false</Visible>
         </c:Model>
         <c:Transform>
@@ -123,7 +123,7 @@
         <c:AABB/>
         <c:Collidable/>
         <c:Model>
-          <Resource>Models/Core/UnitCube.obj</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
           <Visible>false</Visible>
         </c:Model>
         <c:Transform>
@@ -146,7 +146,6 @@
         </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>
@@ -154,7 +153,7 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Assault.obj</Resource>
+              <Resource>Models/Assault.mesh</Resource>
               <Color A="1" B="1" G="0.254901975" R="0"/>
             </c:Model>
             <c:Transform>
@@ -167,7 +166,7 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Assault.obj</Resource>
+              <Resource>Models/Assault.mesh</Resource>
               <Color A="1" B="1" G="0.254901975" R="0"/>
             </c:Model>
             <c:Transform>
@@ -178,6 +177,123 @@
         </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/OctreeTest.xml

@@ -11,7 +11,7 @@
         <c:AABB/>
         <c:Collidable/>
         <c:Model>
-          <Resource>Models/Core/UnitCube.obj</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="0" R="0"/>
         </c:Model>
         <c:Transform>
@@ -27,7 +27,7 @@
           <Static>false</Static>
         </c:Collidable>
         <c:Model>
-          <Resource>Models/Core/UnitCube.obj</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0" G="0" R="1"/>
         </c:Model>
         <c:Transform>
@@ -42,7 +42,7 @@
           <Static>false</Static>
         </c:Collidable>
         <c:Model>
-          <Resource>Models/Core/UnitCube.obj</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0" G="1" R="0"/>
         </c:Model>
         <c:Transform>

resources/Schema/Entities/Player.xml

@@ -2,14 +2,14 @@
 <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:Model/>
     <c:Physics>
-      <Velocity X="8.33307467e-09" Y="0" Z="9.82836834e-09"/>
+      <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
     </c:Physics>
     <c:Player>
       <MovementSpeed>5</MovementSpeed>
@@ -20,8 +20,7 @@
       </Team>
     </c:Team>
     <c:Transform>
-      <Position X="2.84928203" Y="0.0264999866" Z="7.31610918"/>
+      <Orientation X="0" Y="2.24449515" Z="0"/>
-      <Orientation X="0" Y="2.14675093" Z="0"/>
     </c:Transform>
   </Components>
 
@@ -31,7 +30,6 @@
         <c:Camera/>
         <c:Transform>
           <Position X="0" Y="1.37700009" Z="0"/>
-          <Orientation X="0.921535373" Y="0" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
@@ -40,10 +38,9 @@
             <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"/>
+              <Position X="0.100000001" Y="0.248000011" Z="-0.248000011"/>
               <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
               <Orientation X="0" Y="3.14199996" Z="0"/>
             </c:Transform>
@@ -53,7 +50,8 @@
         <Entity name="CameraModel">
           <Components>
             <c:Model>
-              <Resource>Models/Camera.obj</Resource>
+              <Resource>Models/Camera.mesh</Resource>
+              <Visible>false</Visible>
             </c:Model>
             <c:Transform>
               <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
@@ -62,13 +60,74 @@
           </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">
       <Components>
         <c:Camera/>
         <c:Model>
-          <Resource>Models/Camera.obj</Resource>
+          <Resource>Models/Camera.mesh</Resource>
           <Visible>false</Visible>
         </c:Model>
         <c:Transform>
@@ -80,19 +139,23 @@
     </Entity>
     <Entity name="PlayerModel">
       <Components>
+        <c:Animation>
+          <Name>Hold Pos</Name>
+          <Time>0.9779997896222552</Time>
+          <Speed>1</Speed>
+        </c:Animation>
         <c:Model>
-          <Resource>Models/AssaultHeadless.obj</Resource>
+          <Resource>Models/AssaultAnimated.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>
     <Entity name="AABBStanding">
       <Components>
         <c:Model>
-          <Resource>Models/Core/UnitCube.obj</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="0.427450985" B="1" G="1" R="1"/>
           <Visible>false</Visible>
         </c:Model>
@@ -106,7 +169,7 @@
     <Entity name="AABBCrouching">
       <Components>
         <c:Model>
-          <Resource>Models/Core/UnitCube.obj</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="0.745098054" B="1" G="0" R="1"/>
           <Visible>false</Visible>
         </c:Model>

resources/Schema/Entities/PointLight.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="PointLight" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:PointLight>
+      <Radius>8</Radius>
+      <Intensity>2.7999999523162842</Intensity>
+    </c:PointLight>
+    <c:Transform>
+      <Position X="0.370978802" Y="1.88588905" Z="-0.55370003"/>
+    </c:Transform>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/RaptorCopter.xml

@@ -7,7 +7,7 @@
 			<Orientation X="0.0" Y="0" Z="0.0"/>
 		</c:Transform>
 		<c:Model>
-			<Resource>Models/Core/UnitRaptor.obj</Resource>
+			<Resource>Models/Core/UnitRaptor.mesh</Resource>
 			<Color R="1" G="0.4" B="0.8"/>
 		</c:Model>
 	</Components>
@@ -31,7 +31,7 @@
 							<Scale X="0.1" Y="0.4" Z="0.1"/>
 						</c:Transform>
 						<c:Model>
-							<Resource>Models/Core/UnitCylinder.obj</Resource>
+							<Resource>Models/Core/UnitCylinder.mesh</Resource>
 							<Color R="1" G="0.4" B="0.8"/>
 						</c:Model>
 					</Components>
@@ -44,7 +44,7 @@
 							<Orientation X="0" Y="0" Z="0"/>
 						</c:Transform>
 						<c:Model>
-							<Resource>Models/Core/UnitCube.obj</Resource>
+							<Resource>Models/Core/UnitCube.mesh</Resource>
 							<Color R="1" G="0.4" B="0.8"/>
 						</c:Model>
 					</Components>
@@ -57,7 +57,7 @@
 							<Orientation X="0" Y="1.57" Z="0"/>
 						</c:Transform>
 						<c:Model>
-							<Resource>Models/Core/UnitCube.obj</Resource>
+							<Resource>Models/Core/UnitCube.mesh</Resource>
 							<Color R="1" G="0.4" B="0.8"/>
 						</c:Model>
 					</Components>

resources/Schema/Entities/RayBlue

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

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

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

@@ -0,0 +1,19 @@
+<?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,43 +6,124 @@
   </Components>
 
   <Children>
-    <Entity>
+    <Entity name="Player">
       <Components>
-        <c:Camera>
+        <c:Health>
-          <Name>ActionCamera</Name>
+          <Health>65.990005493164063</Health>
-        </c:Camera>
+        </c:Health>
-        <c:Model>
+        <c:Player/>
-          <Resource>Models/Camera.obj</Resource>
-        </c:Model>
         <c:Transform>
-          <Position X="-0.504807115" Y="6.00582743" Z="9.68687439"/>
+          <Position X="0" Y="0" Z="2.5"/>
-          <Orientation X="-0.733036518" Y="0.000105090476" Z="5.12391125e-07"/>
         </c:Transform>
       </Components>
       <Children>
-        <Entity>
+        <Entity name="Model">
           <Components>
-            <c:Text>
+            <c:Model>
-              <Content>Camera #2</Content>
+              <Resource>Models/Assault.obj</Resource>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="3.92156863" G="3.92156863" R="3.92156863"/>
-              <Alignment>0</Alignment>
+            </c:Model>
-            </c:Text>
             <c:Transform>
-              <Position X="0.700063765" Y="0.310270816" Z="-1"/>
+              <Orientation X="0" Y="3.14159203" Z="0"/>
-              <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>
       <Components>
         <c:Model>
-          <Resource>Models/Core/UnitPlane.obj</Resource>
+          <Resource>Models/Core/UnitPlane.mesh</Resource>
         </c:Model>
         <c:Transform>
-          <Position X="0" Y="-1" Z="0.600000024"/>
+          <Position X="0" Y="-0.689623177" Z="0.600000024"/>
           <Scale X="100" Y="1" Z="100"/>
         </c:Transform>
       </Components>
@@ -51,7 +132,8 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>Models/Assault.obj</Resource>
+          <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"/>
@@ -64,6 +146,7 @@
         <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"/>
@@ -74,32 +157,40 @@
     <Entity>
       <Components>
         <c:RaptorCopter>
-          <Speed>2</Speed>
+          <Speed>3</Speed>
-          <Axis X="0" Y="1" Z="0"/>
+          <Axis X="0.200000003" Y="3.4000001" Z="0.5"/>
         </c:RaptorCopter>
         <c:Transform>
-          <Position X="0" Y="2.37320328" Z="0"/>
+          <Orientation X="758.058899" Y="20632.8691" Z="1320.68018"/>
-          <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>6</Radius>
+              <Radius>70</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>8</Radius>
+                  <Radius>70</Radius>
                 </c:PointLight>
                 <c:Transform>
                   <Position X="-5" Y="0" Z="0"/>
@@ -111,21 +202,30 @@
         </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>6</Radius>
+              <Radius>70</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>8</Radius>
+                  <Radius>70</Radius>
                 </c:PointLight>
                 <c:Transform>
                   <Position X="0" Y="0" Z="-5"/>
@@ -137,21 +237,30 @@
         </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>6</Radius>
+              <Radius>70</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.00784313772" R="0"/>
+                  <Color A="1" B="1" G="0" R="0"/>
-                  <Radius>8</Radius>
+                  <Radius>70</Radius>
                 </c:PointLight>
                 <c:Transform>
                   <Position X="0" Y="0" Z="5"/>
@@ -163,19 +272,28 @@
         </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>6</Radius>
+              <Radius>70</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>8</Radius>
+                  <Radius>70</Radius>
                 </c:PointLight>
                 <c:Transform>
                   <Position X="5" Y="0" Z="0"/>
@@ -190,7 +308,8 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>Models/Assault.obj</Resource>
+          <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"/>
@@ -198,46 +317,15 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity>
+    <Entity name="DirectionalLight">
-      <Components>
-        <c:Camera>
-          <Name>MainCamera</Name>
-        </c:Camera>
-        <c:Listener/>
-        <c:Model>
-          <Resource>Models/Camera.obj</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.80000001192092896</Intensity>
+          <Intensity>0.10000000149011612</Intensity>
         </c:DirectionalLight>
         <c:Model>
-          <Resource>Models/DirectionalLightWidget.obj</Resource>
+          <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"/>
@@ -249,7 +337,8 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>Models/Core/UnitCube.obj</Resource>
+          <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/ShootEventTest.xml

@@ -9,7 +9,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>../assets/Models/DummyScene.obj</Resource>
+          <Resource>../assets/Models/DummyScene.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -41,7 +41,7 @@
           <HomePointForTeam>3</HomePointForTeam>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="0.200000003" R="0"/>
         </c:Model>
         <c:Team>
@@ -61,7 +61,7 @@
           <CapturePointNumber>1</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="1" R="0"/>
         </c:Model>
         <c:Team/>
@@ -79,7 +79,7 @@
           <CapturePointNumber>2</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
         </c:Model>
         <c:Team/>
         <c:Transform>
@@ -96,7 +96,7 @@
           <CapturePointNumber>3</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="1" R="1"/>
         </c:Model>
         <c:Team/>
@@ -115,7 +115,7 @@
           <CapturePointNumber>4</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitSphere.obj</Resource>
+          <Resource>../assets/Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="0.200000003" R="1"/>
         </c:Model>
         <c:Team>
@@ -133,7 +133,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0.482352942" G="0.490196079" R="1"/>
         </c:Model>
         <c:Player/>
@@ -151,7 +151,7 @@
         <c:Health/>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0.482352942" G="0.490196079" R="1"/>
         </c:Model>
         <c:Player/>
@@ -171,7 +171,7 @@
         </c:Health>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0" G="0" R="2.25"/>
         </c:Model>
         <c:Player/>
@@ -191,7 +191,7 @@
         </c:Health>
         <c:AABB/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="0" G="0" R="4.5"/>
         </c:Model>
         <c:Player/>

resources/Schema/Entities/SoundTestLevel.xml

@@ -12,7 +12,7 @@
           <FilePath></FilePath>
         </c:SoundEmitter>
         <c:Model>
-          <Resource>Models/Core/UnitCube.obj</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="0.58431375" R="0.43921569"/>
         </c:Model>
         <c:Transform/>

resources/Schema/Entities/SpawnTest.xml

@@ -24,7 +24,7 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Core/UnitSphere.obj</Resource>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
             </c:Model>
             <c:Transform>
               <Position X="0" Y="0" Z="1.26689196"/>
@@ -37,7 +37,7 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Core/UnitSphere.obj</Resource>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
             </c:Model>
             <c:Transform>
               <Position X="0" Y="0" Z="-1.14786315"/>

resources/Schema/Entities/Spawnpoint

@@ -0,0 +1,32 @@
+<?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/Entities/Test.xml

@@ -6,7 +6,7 @@
 			<Orientation X="0" Y="0" Z="0"/>
 		</c:Transform>
 		<c:Model>
-			<Resource>Models/DummyScene.obj</Resource>
+			<Resource>Models/DummyScene.mesh</Resource>
 		</c:Model>
 	</Components>
 	<Children>
@@ -19,7 +19,7 @@
 				<c:Camera>
 				</c:Camera>
 				<c:Model>
-					<Resource>Models/Camera.obj</Resource>
+					<Resource>Models/Camera.mesh</Resource>
 				</c:Model>
 			</Components>
 		</Entity>

resources/Schema/Types/Entity.xsd

@@ -32,6 +32,7 @@
 							<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/BasicForward.vert.glsl

@@ -9,18 +9,14 @@ 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 DiffuseVertexColor;
+layout(location = 5) in vec4 BoneIndices;
-layout(location = 6) in vec4 SpecularVertexColor;
+layout(location = 6) in vec4 BoneWeights;
-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;
 	vec3 Normal;
 	vec2 TextureCoordinate;
-	vec4 DiffuseColor;
 }Output;
 
 void main()
@@ -30,5 +26,4 @@ void main()
 	Output.Position = Position;
 	Output.TextureCoordinate = TextureCoords;
 	Output.Normal = Normal;
-	Output.DiffuseColor = DiffuseVertexColor;
 }

resources/Shaders/ForwardPlus.frag.glsl

@@ -4,10 +4,14 @@ uniform mat4 M;
 uniform mat4 V;
 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 {
@@ -46,7 +50,6 @@ in VertexData{
 	vec3 Position;
 	vec3 Normal;
 	vec2 TextureCoordinate;
-	vec4 DiffuseColor;
 }Input;
 
 out vec4 sceneColor;
@@ -135,11 +138,22 @@ void main()
 	}
 
 	//sceneColor += Input.DiffuseColor;
-	vec4 color_result = Input.DiffuseColor * (totalLighting.Diffuse + totalLighting.Specular) * diffuseTexel * Color;
+	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) {
@@ -150,8 +164,9 @@ 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/ForwardPlus.vert.glsl

@@ -3,32 +3,37 @@
 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 DiffuseVertexColor;
+layout(location = 5) in vec4 BoneIndices;
-layout(location = 6) in vec4 SpecularVertexColor;
+layout(location = 6) in vec4 BoneWeights;
-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;
 	vec3 Normal;
 	vec2 TextureCoordinate;
-	vec4 DiffuseColor;
 }Output;
 
 void main()
 {
-	gl_Position = P*V*M * vec4(Position, 1.0);
 
-	Output.Position = Position;
+
+	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*boneTransform * vec4(Position, 1.0);
+	
+	Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
 	Output.TextureCoordinate = TextureCoords;
 	Output.Normal = vec3(M * vec4(Normal, 0.0));
-	Output.DiffuseColor = DiffuseVertexColor;
 }

resources/Shaders/Picking.vert.glsl

@@ -3,18 +3,15 @@
 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 DiffuseVertexColor;
+layout(location = 5) in vec4 BoneIndices;
-layout(location = 6) in vec4 SpecularVertexColor;
+layout(location = 6) in vec4 BoneWeights;
-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;
@@ -22,7 +19,14 @@ out VertexData{
 
 void main()
 {
-	gl_Position = P * V* M * vec4(Position, 1.0);
+	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])];
+	}
 
-	Output.Position = Position;
+	gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
+	Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
 }

src/Engine/Core/EntityWrapper.cpp

@@ -3,6 +3,11 @@
 
 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()) {
@@ -22,17 +27,18 @@ EntityWrapper EntityWrapper::Parent()
 
 EntityWrapper EntityWrapper::FirstChildByName(const std::string& name)
 {
-    auto itPair = this->World->GetChildren(this->ID);
+    return firstChildByNameRecursive(name, this->ID);
-    if (itPair.first == itPair.second) {
+}
-        return EntityWrapper::Invalid;
-    }
 
-    for (auto it = itPair.first; it != itPair.second; ++it) {
+EntityWrapper EntityWrapper::FirstParentWithComponent(const std::string& componentType)
-        if (this->World->GetName(it->second) == name) {
+{
-            return EntityWrapper(this->World, it->second);
+    EntityWrapper entity = *this;
+    while (entity.Parent().Valid()) {
+        entity = entity.Parent();
+        if (entity.HasComponent(componentType)) {
+            return entity;
         }
     }
-
     return EntityWrapper::Invalid;
 }
 
@@ -96,3 +102,29 @@ 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,5 +1,17 @@
 #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);
@@ -19,6 +31,19 @@ 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);
@@ -62,6 +87,8 @@ 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/Core/World.cpp

@@ -1,4 +1,6 @@
 #include "Core/World.h"
+#include "Core/EEntityDeleted.h"
+#include "Core/EComponentDeleted.h"
 
 World::~World()
 {
@@ -21,37 +23,7 @@ EntityID World::CreateEntity(EntityID parent /*= 0*/)
 
 void World::DeleteEntity(EntityID entity)
 {
-    // Delete components
+    deleteEntityRecursive(entity, false);
-    for (auto& pair : m_ComponentPools) {
-        auto& pool = pair.second;
-        if (pool->KnowsEntity(entity)) {
-            auto& c = pool->GetByEntity(entity);
-            pool->Delete(c);
-        }
-    }
-
-    // Loop through children
-    std::vector<EntityID> childrenToDelete;
-    auto children = m_EntityChildren.equal_range(entity);
-    for (auto it = children.first; it != children.second; ++it) {
-        childrenToDelete.push_back(it->second);
-    }
-    for (auto& child : childrenToDelete) {
-        DeleteEntity(child);
-    }
-
-    EntityID parent = m_EntityParents.at(entity);
-    m_EntityParents.erase(entity);
-    auto parentChildren = m_EntityChildren.equal_range(parent);
-    for (auto it = parentChildren.first; it != parentChildren.second; ++it) {
-        if (it->second == entity) {
-            m_EntityChildren.erase(it);
-            break;
-        }
-    }
-
-    // Erase potential name
-    m_EntityNames.erase(entity);
 }
 
 bool World::ValidEntity(EntityID entity) const
@@ -96,7 +68,15 @@ void World::DeleteComponent(EntityID entity, const std::string& componentType)
 {
     ComponentPool* pool = m_ComponentPools.at(componentType);
     ComponentWrapper c = pool->GetByEntity(entity);
-    return pool->Delete(c);
+    pool->Delete(c);
+
+    if (m_EventBroker != nullptr) {
+        Events::ComponentDeleted e;
+        e.Entity = entity;
+        e.ComponentType = componentType;
+        e.Cascaded = false;
+        m_EventBroker->Publish(e);
+    }
 }
 
 const ComponentPool* World::GetComponents(const std::string& componentType)
@@ -155,3 +135,57 @@ EntityID World::generateEntityID()
     return m_CurrentEntityID++;
 }
 
+void World::deleteEntityRecursive(EntityID entity, bool cascaded /*= false*/)
+{
+    // Don't attempt to delete entities that don't exist anyway
+    if (!ValidEntity(entity)) {
+        return;
+    }
+
+    if (m_EventBroker != nullptr) {
+        Events::EntityDeleted e;
+        e.DeletedEntity = entity;
+        e.Cascaded = cascaded;
+        m_EventBroker->Publish(e);
+    }
+
+    // Delete components
+    for (auto& pair : m_ComponentPools) {
+        auto& pool = pair.second;
+        if (pool->KnowsEntity(entity)) {
+            auto& c = pool->GetByEntity(entity);
+            pool->Delete(c);
+            if (m_EventBroker != nullptr) {
+                Events::ComponentDeleted e;
+                e.Entity = entity;
+                e.ComponentType = pair.first;
+                e.Cascaded = true;
+                m_EventBroker->Publish(e);
+            }
+        }
+    }
+
+    // Loop through children
+    std::vector<EntityID> childrenToDelete;
+    auto children = m_EntityChildren.equal_range(entity);
+    for (auto it = children.first; it != children.second; ++it) {
+        childrenToDelete.push_back(it->second);
+    }
+    for (auto& child : childrenToDelete) {
+        deleteEntityRecursive(child, true);
+    }
+
+    EntityID parent = m_EntityParents.at(entity);
+    m_EntityParents.erase(entity);
+    auto parentChildren = m_EntityChildren.equal_range(parent);
+    for (auto it = parentChildren.first; it != parentChildren.second; ++it) {
+        if (it->second == entity) {
+            m_EntityChildren.erase(it);
+            break;
+        }
+    }
+
+    // Erase potential name
+    m_EntityNames.erase(entity);
+}
+

src/Engine/Editor/EditorGUI.cpp

@@ -1,4 +1,5 @@
 #include "Editor/EditorGUI.h"
+#include "Rendering/ESetCamera.h"
 
 EditorGUI::EditorGUI(World* world, EventBroker* eventBroker) 
     : m_World(world)
@@ -305,6 +306,14 @@ 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

@@ -39,7 +39,7 @@ void EditorRenderSystem::Update(double dt)
                 continue;
             } catch (const std::exception&) {
                 try {
-                    model = ResourceManager::Load<::Model>("Models/Core/Error.obj");
+                    model = ResourceManager::Load<::Model>("Models/Core/Error.mesh");
                 } catch (const std::exception&) {
                     continue;
                 }
@@ -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);
+                std::shared_ptr<ModelJob> modelJob = std::make_shared<ModelJob>(model, scene.Camera, modelMatrix, matGroup, cModel, entity.World, glm::vec4(0), 0.f);
                 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

@@ -7,13 +7,13 @@ Client::Client(ConfigFile* config) : m_Socket(m_IOService)
 {
     Network::initialize();
 
-    // Asumes root node is EntityID 0
+    // Asumes root node is EntityID_Invalid
-    insertIntoServerClientMaps(0, 0);
+    insertIntoServerClientMaps(EntityID_Invalid, EntityID_Invalid);
     // Init timer
     m_TimeSinceSentInputs = std::clock();
     // Default is local host
     std::string address = config->Get<std::string>("Networking.Address", "127.0.0.1");
-    int port = config->Get<int>("Networking.Port", 13);
+    int port = config->Get<int>("Networking.Port", 27666);
     m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address::from_string(address), port);
     // Set up network stream
     m_PlayerName = config->Get<std::string>("Networking.Name", "Raptorcopter");
@@ -31,7 +31,8 @@ void Client::Start(World* world, EventBroker* eventBroker)
 
     // Subscribe to events
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Client::OnInputCommand);
-    EVENT_SUBSCRIBE_MEMBER(m_EPlayeDamage, &Client::OnPlayerDamage);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Client::OnPlayerDamage);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &Client::OnPlayerSpawned);
 
     m_Socket.connect(m_ReceiverEndpoint);
     LOG_INFO("I am client. BIP BOP");
@@ -48,6 +49,7 @@ void Client::Update()
             sendInputCommands();
             m_TimeSinceSentInputs = std::clock();
         }
+        sendLocalPlayerTransform();
     }
     Network::Update();
 }
@@ -96,6 +98,12 @@ void Client::parseMessageType(Packet& packet)
     case MessageType::OnPlayerSpawned:
         parsePlayersSpawned(packet);
         break;
+    case MessageType::EntityDeleted:
+        parseEntityDeletion(packet);
+        break;
+    case MessageType::ComponentDeleted:
+        parseComponentDeletion(packet);
+        break;
     default:
         break;
     }
@@ -128,20 +136,43 @@ void Client::parsePing()
 }
 
 void Client::parseKick()
-{ 
+{
     LOG_WARNING("You have been kicked from the server.");
     m_IsConnected = false;
 }
 
 void Client::parsePlayersSpawned(Packet& packet)
-{ 
+{
     Events::PlayerSpawned e;
     e.Player = EntityWrapper(m_World, m_ServerIDToClientID[packet.ReadPrimitive<EntityID>()]);
     e.Spawner = EntityWrapper(m_World, m_ServerIDToClientID[packet.ReadPrimitive<EntityID>()]);
     e.PlayerID = -1;
+    e.PlayerName = packet.ReadString();
     m_EventBroker->Publish(e);
 }
 
+void Client::parseEntityDeletion(Packet & packet)
+{
+    EntityID entityToDelete = packet.ReadPrimitive<EntityID>();
+    // TODO: What if an entity that didn't previously exist comes as a delete request and later comes in a delayed snapshot?
+    if (m_ServerIDToClientID.find(entityToDelete) != m_ServerIDToClientID.end()) {
+        EntityID localEntity = m_ServerIDToClientID.at(entityToDelete);
+        if (m_World->ValidEntity(localEntity)) {
+            m_World->DeleteEntity(localEntity);
+            deleteFromServerClientMaps(entityToDelete, localEntity);
+        }
+    }
+}
+
+void Client::parseComponentDeletion(Packet & packet)
+{
+    EntityID entity = packet.ReadPrimitive<EntityID>();
+    std::string componentType = packet.ReadString();
+    if (m_World->HasComponent(entity, componentType)) {
+        m_World->DeleteComponent(m_ServerIDToClientID.at(entity), componentType);
+    }
+}
+
 // Fields with strings will not work right now
 void Client::InterpolateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID, const std::string& componentType)
 {
@@ -176,66 +207,53 @@ void Client::updateFields(Packet& packet, const ComponentInfo& componentInfo, co
 
 void Client::parseSnapshot(Packet& packet)
 {
-    std::string componentType = packet.ReadString();
     while (packet.DataReadSize() < packet.Size()) {
-        // HACK
+        EntityID serverEntityID = packet.ReadPrimitive<EntityID>();
-        std::string entityName = packet.ReadString();
+        EntityID serverParentID = packet.ReadPrimitive<EntityID>();
-        // Components EntityID
+        std::string serverEntityName = packet.ReadString();
-        EntityID receivedEntityID = packet.ReadPrimitive<EntityID>();
+        int ammountOfComponents = packet.ReadPrimitive<int>();
-        // HACK
+        for (int i = 0; i < ammountOfComponents; i++) {
-        m_World->SetName(receivedEntityID, entityName);
+            std::string componentType = packet.ReadString();
-        // Parents EntityID 
+            ComponentInfo componentInfo = m_World->GetComponents(componentType)->ComponentInfo();
-        EntityID receivedParentEntityID = packet.ReadPrimitive<EntityID>();
+            if (serverClientMapsHasEntity(serverEntityID)) {
-        ComponentInfo componentInfo = m_World->GetComponents(componentType)->ComponentInfo();
+                EntityID localEntityID = m_ServerIDToClientID.at(serverEntityID);
-        // Check if the received EntityID is mapped to one of our local EntityIDs
+                // Update entity
-        if (serverClientMapsHasEntity(receivedEntityID)) {
+                if (m_World->HasComponent(localEntityID, componentType)) {
-            // Get the local EntityID
+                    // Update component
-            EntityID entityID = m_ServerIDToClientID.at(receivedEntityID);
+                    if (componentType == "Transform") {
-            // Check if the component exists
+                        // Interpolate only transform components
-            if (m_World->HasComponent(entityID, componentType)) {
+                        InterpolateFields(packet, componentInfo, localEntityID, componentType);
-                // If the entity and the component exists update it
+                    } else if (componentType == "Physics" && m_World->HasComponent(localEntityID, "Player")) {
-                if (componentType == "Transform") {
+                        // HACK: Ignore velocity of physics
-                    InterpolateFields(packet, componentInfo, entityID, componentType);
+                        packet.ReadData(componentInfo.Stride);
+                    } else {
+                        // Set component values
+                        updateFields(packet, componentInfo, localEntityID, componentType);
+                    }
                 } else {
-                    updateFields(packet, componentInfo, entityID, componentType);
+                    // Has entity but no component
+                    m_World->AttachComponent(localEntityID, componentType);
+                    updateFields(packet, componentInfo, localEntityID, componentType);
                 }
-                // if entity exists but not the component
             } else {
-                // Create component
+                // Create Entity and component
-                m_World->AttachComponent(entityID, componentType);
+                EntityID newLocalEntityID;
-                // Copy data to newly created component
+                if (serverParentID == EntityID_Invalid) {
-                updateFields(packet, componentInfo, entityID, componentType);
+                    newLocalEntityID = m_World->CreateEntity(EntityID_Invalid);
+                } else {
+                    newLocalEntityID = m_World->CreateEntity(m_ServerIDToClientID.at(serverParentID));
+                }
+                m_World->SetName(newLocalEntityID, serverEntityName);
+                insertIntoServerClientMaps(serverEntityID, newLocalEntityID);
+                m_World->AttachComponent(newLocalEntityID, componentType);
+                updateFields(packet, componentInfo, newLocalEntityID, componentType);
             }
-            // If the entity dosent exist nor the component
-        } else {
-            // Create Entity
-            // If entity dosen't exist
-            EntityID newEntityID = m_World->CreateEntity();
-            insertIntoServerClientMaps(receivedEntityID, newEntityID);
-            // Check if EntityIDs are out of sync
-            if (newEntityID != receivedEntityID) {
-                LOG_INFO("Client::parseSnapshot(Packet& packet): Newly created EntityID is not the \
-                            same as the one sent by server (EntityIDs are out of sync)");
-            }
-            // Create component
-            m_World->AttachComponent(newEntityID, componentType);
-            // Copy data to newly created component
-            updateFields(packet, componentInfo, newEntityID, componentType);
         }
-
+        // Parent logic
-        // Parent Logic
+        // This should be enough beacause we know that the entities arives in pre-order (there will always be a parent)
-        // Don't need to check if receivedEntityID is mapped. (It should have been set) 
+        if (serverParentID != EntityID_Invalid) {
-        if (receivedParentEntityID != std::numeric_limits<EntityID>::max()) {
+            EntityID localEntityID = m_ServerIDToClientID.at(serverEntityID);
-            if (serverClientMapsHasEntity(receivedParentEntityID)) {
+            m_World->SetParent(localEntityID, m_ServerIDToClientID.at(serverParentID));
-                m_World->SetParent(m_ServerIDToClientID.at(receivedEntityID), m_ServerIDToClientID.at(receivedParentEntityID));
-                // If Parent dosen't exist create one and map receivedParentEntityID to it.
-            } else {
-                // Create the new parent and add it to map
-                EntityID newParentEntityID = m_World->CreateEntity();
-                insertIntoServerClientMaps(receivedParentEntityID, newParentEntityID);
-                // Set the newly created Entity as parent.
-                m_World->SetParent(m_ServerIDToClientID.at(receivedEntityID), newParentEntityID);
-            }
         }
     }
 }
@@ -326,13 +344,40 @@ bool Client::OnInputCommand(const Events::InputCommand & e)
 
 bool Client::OnPlayerDamage(const Events::PlayerDamage & e)
 {
-    Packet packet(MessageType::OnInputCommand, m_SendPacketID);
+    Packet packet(MessageType::OnPlayerDamage, m_SendPacketID);
-    packet.WritePrimitive(e.DamageAmount);
+    packet.WritePrimitive(e.Damage);
-    packet.WritePrimitive(e.PlayerDamagedID);
+    packet.WritePrimitive(m_ClientIDToServerID.at(e.Player.ID));
     send(packet);
     return false;
 }
 
+bool Client::OnPlayerSpawned(const Events::PlayerSpawned& e)
+{
+    if (e.PlayerID == -1) {
+        m_LocalPlayer = e.Player;
+    }
+    return true;
+}
+
+void Client::sendLocalPlayerTransform()
+{
+    if (!m_LocalPlayer.Valid()) {
+        return;
+    }
+
+    ComponentWrapper cTransform = m_LocalPlayer["Transform"];
+    glm::vec3& position = cTransform["Position"];
+    glm::vec3& orientation = cTransform["Orientation"];
+    Packet packet(MessageType::PlayerTransform, m_SendPacketID);
+    packet.WritePrimitive(position.x);
+    packet.WritePrimitive(position.y);
+    packet.WritePrimitive(position.z);
+    packet.WritePrimitive(orientation.x);
+    packet.WritePrimitive(orientation.y);
+    packet.WritePrimitive(orientation.z);
+    send(packet);
+}
+
 void Client::identifyPacketLoss()
 {
     // if no packets lost, difference should be equal to 1
@@ -360,7 +405,7 @@ EntityID Client::createPlayer()
     EntityID entityID = m_World->CreateEntity();
     ComponentWrapper transform = m_World->AttachComponent(entityID, "Transform");
     ComponentWrapper model = m_World->AttachComponent(entityID, "Model");
-    model["Resource"] = "Models/Core/UnitSphere.obj";
+    model["Resource"] = "Models/Core/UnitSphere.mesh";
     ComponentWrapper player = m_World->AttachComponent(entityID, "Player");
     return entityID;
 }
@@ -386,12 +431,26 @@ void Client::becomePlayer()
 
 bool Client::clientServerMapsHasEntity(EntityID clientEntityID)
 {
-    return m_ClientIDToServerID.find(clientEntityID) != m_ClientIDToServerID.end();
+    if (m_ClientIDToServerID.find(clientEntityID) != m_ClientIDToServerID.end()) {
+        if (m_World->ValidEntity(clientEntityID)) {
+            return true;
+        }
+        EntityID serverEntityID = m_ClientIDToServerID.at(clientEntityID);
+        deleteFromServerClientMaps(serverEntityID, clientEntityID);
+    }
+    return false;
 }
 
 bool Client::serverClientMapsHasEntity(EntityID serverEntityID)
 {
-    return m_ServerIDToClientID.find(serverEntityID) != m_ServerIDToClientID.end();
+    if (m_ServerIDToClientID.find(serverEntityID) != m_ServerIDToClientID.end()) {
+        EntityID localEntityID = m_ServerIDToClientID.at(serverEntityID);
+        if (m_World->ValidEntity(localEntityID)) {
+            return true;
+        }
+        deleteFromServerClientMaps(serverEntityID, localEntityID);
+    }
+    return false;
 }
 
 void Client::insertIntoServerClientMaps(EntityID serverEntityID, EntityID clientEntityID)
@@ -400,3 +459,9 @@ void Client::insertIntoServerClientMaps(EntityID serverEntityID, EntityID client
     m_ClientIDToServerID.insert(std::make_pair(clientEntityID, serverEntityID));
 
 }
+
+void Client::deleteFromServerClientMaps(EntityID serverEntityID, EntityID clientEntityID)
+{
+    m_ServerIDToClientID.erase(serverEntityID);
+    m_ClientIDToServerID.erase(clientEntityID);
+}

src/Engine/Network/Server.cpp

@@ -21,9 +21,8 @@ void Server::Start(World* world, EventBroker* eventBroker)
     // Subscribe to events
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Server::OnInputCommand);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &Server::OnPlayerSpawned);
-    for (size_t i = 0; i < m_MaxConnections; i++) {
+    EVENT_SUBSCRIBE_MEMBER(m_EEntityDeleted, &Server::OnEntityDeleted);
-        m_PlayerDefinitions[i].StopTime = std::clock();
+    EVENT_SUBSCRIBE_MEMBER(m_EComponentDeleted, &Server::OnComponentDeleted);
-    }
     LOG_INFO("I am Server. BIP BOP\n");
 }
 
@@ -96,8 +95,8 @@ void Server::parseMessageType(Packet& packet)
     case MessageType::OnPlayerDamage:
         parseOnPlayerDamage(packet);
         break;
-    case MessageType::BecomePlayer:
+    case MessageType::PlayerTransform:
-        createPlayer();
+        parsePlayerTransform(packet);
         break;
     default:
         break;
@@ -119,31 +118,22 @@ int Server::receive(char * data)
     return length;
 }
 
-void Server::send(Packet& packet, UserID user)
-{
-    int bytesSent = m_Socket.send_to(
-        boost::asio::buffer(packet.Data(), packet.Size()),
-        m_ConnectedUsers[user].Endpoint,
-        0);
-    // Network Debug data
-    if (isReadingData) {
-        m_NetworkData.TotalDataSent += packet.Size();
-        m_NetworkData.DataSentThisInterval += packet.Size();
-        m_NetworkData.AmountOfMessagesSent++;
-    }
-}
-
 void Server::send(PlayerID player, Packet& packet)
 {
-    int bytesSent = m_Socket.send_to(
+    try {
-        boost::asio::buffer(packet.Data(), packet.Size()),
+        int bytesSent = m_Socket.send_to(
-        m_PlayerDefinitions[player].Endpoint,
+            boost::asio::buffer(packet.Data(), packet.Size()),
-        0);
+            m_ConnectedPlayers[player].Endpoint,
-    // Network Debug data
+            0);
-    if (isReadingData) {
+        // Network Debug data
-        m_NetworkData.TotalDataSent += packet.Size();
+        if (isReadingData) {
-        m_NetworkData.DataSentThisInterval += packet.Size();
+            m_NetworkData.TotalDataSent += packet.Size();
-        m_NetworkData.AmountOfMessagesSent++;
+            m_NetworkData.DataSentThisInterval += packet.Size();
+            m_NetworkData.AmountOfMessagesSent++;
+        }
+    } 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();
     }
 }
 
@@ -164,58 +154,72 @@ void Server::send(Packet & packet)
 
 void Server::broadcast(Packet& packet)
 {
-    for (int i = 0; i < m_ConnectedUsers.size(); i++) {
+    for (auto& kv : m_ConnectedPlayers) {
-        if (m_ConnectedUsers[i].Endpoint.address() != boost::asio::ip::address()) {
+        packet.ChangePacketID(kv.second.PacketID);
-            packet.ChangePacketID(m_ConnectedUsers[i].PacketID);
+        send(kv.first, packet);
-            send(packet, i);
-        }
     }
 }
 
 // Send snapshot fields
 void Server::sendSnapshot()
 {
-    // Should time this
+    Packet packet(MessageType::Snapshot);
-    std::unordered_map<std::string, ComponentPool*> worldComponentPools = m_World->GetComponentPools();
+    addChildrenToPacket(packet, EntityID_Invalid);
-    for (auto& it : worldComponentPools) {
+    broadcast(packet);
-        Packet packet(MessageType::Snapshot);
+}
-        ComponentPool* componentPool = it.second;
-        ComponentInfo componentInfo = componentPool->ComponentInfo();
 
-        // Component Type
+void Server::addChildrenToPacket(Packet & packet, EntityID entityID)
-        packet.WriteString(componentInfo.Name);
+{
-        for (auto& componentWrapper : *componentPool) {
+    auto itPair = m_World->GetChildren(entityID);
-            // HACK: Send entity name
+    std::unordered_map<std::string, ComponentPool*> worldComponentPools = m_World->GetComponentPools();
-            packet.WriteString(m_World->GetName(componentWrapper.EntityID));
+    // Loop through every child
-            // Components EntityID
+    for (auto it = itPair.first; it != itPair.second; it++) {
-            packet.WritePrimitive(componentWrapper.EntityID);
+        EntityID childEntityID = it->second;
-            // Parents EntityID
+        // Write EntityID and parentsID and Entity name
-            packet.WritePrimitive(m_World->GetParent(componentWrapper.EntityID));
+        packet.WritePrimitive(childEntityID);
-            for (auto& componentField : componentWrapper.Info.FieldsInOrder) {
+        packet.WritePrimitive(entityID);
-                ComponentInfo::Field_t fieldInfo = componentInfo.Fields.at(componentField);
+        packet.WriteString(m_World->GetName(childEntityID));
-                if (fieldInfo.Type == "string") {
+        // Write components to child
-                    std::string& value = componentWrapper[componentField];
+        int numberOfComponents = 0;
-                    packet.WriteString(value);
+        for (auto& i : worldComponentPools) {
-                } else {
+            if (i.second->KnowsEntity(childEntityID)) {
-                    packet.WriteData(componentWrapper.Data + fieldInfo.Offset, fieldInfo.Stride);
+                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);
+                    }
                 }
             }
         }
-        if (packet.Size() > packet.HeaderSize() + componentInfo.Name.size()) {
+        // Go to to your children
-            broadcast(packet);
+        addChildrenToPacket(packet, childEntityID);
-        }
     }
 }
 
 void Server::sendPing()
 {
     // Prints connected players ping
-    for (int i = 0; i < m_ConnectedUsers.size(); i++) {
+    //for (int i = 0; i < m_ConnectedPlayers.size(); i++) {
-        if (m_ConnectedUsers[i].Endpoint.address() != boost::asio::ip::address()) {
+    //    if (m_ConnectedPlayers[i].Endpoint.address() != boost::asio::ip::address()) {
-            int ping = 1000 * (m_ConnectedUsers[i].StopTime - m_StartPingTime) / static_cast<double>(CLOCKS_PER_SEC);
+    //        int ping = 1000 * (m_ConnectedPlayers[i].StopTime - m_StartPingTime) / static_cast<double>(CLOCKS_PER_SEC);
-            LOG_INFO("Last packetID received %i: User %i's ping: %i", m_ConnectedUsers[i].PacketID, i, std::abs(ping));
+    //        LOG_INFO("Last packetID received %i: User %i's ping: %i", m_ConnectedPlayers[i].PacketID, i, std::abs(ping));
-        }
+    //    }
-    }
+    //}
     // Create ping message
     Packet packet(MessageType::Ping);
     packet.WriteString("Ping from server");
@@ -230,9 +234,9 @@ void Server::checkForTimeOuts()
     int startPing = 1000 * m_StartPingTime
         / static_cast<double>(CLOCKS_PER_SEC);
 
-    for (int i = 0; i < m_ConnectedUsers.size(); i++) {
+    for (int i = 0; i < m_ConnectedPlayers.size(); i++) {
-        if (m_ConnectedUsers[i].Endpoint.address() != boost::asio::ip::address()) {
+        if (m_ConnectedPlayers[i].Endpoint.address() != boost::asio::ip::address()) {
-            int stopPing = 1000 * m_ConnectedUsers[i].StopTime /
+            int stopPing = 1000 * m_ConnectedPlayers[i].StopTime /
                 static_cast<double>(CLOCKS_PER_SEC);
             if (startPing > stopPing + m_TimeoutMs) {
                 LOG_INFO("User %i timed out!", i);
@@ -242,40 +246,30 @@ void Server::checkForTimeOuts()
     }
 }
 
-void Server::disconnect(UserID user)
+void Server::disconnect(PlayerID playerID)
 {
     //broadcast("A player disconnected");
-    LOG_INFO("User %s disconnected/timed out", m_PlayerDefinitions[user].Name.c_str());
+    LOG_INFO("User %s disconnected/timed out", m_ConnectedPlayers[playerID].Name.c_str());
     // Remove enteties and stuff (When we can remove entity, remove it and tell clients to remove the copy they have)
     Events::PlayerDisconnected e;
-    e.Entity = m_PlayerDefinitions[user].EntityID;
+    e.Entity = m_ConnectedPlayers[playerID].EntityID;
-    e.PlayerID = user;
+    e.PlayerID = playerID;
     m_EventBroker->Publish(e);
 
-    m_PlayerDefinitions[user].Endpoint = boost::asio::ip::udp::endpoint();
+    m_ConnectedPlayers.erase(playerID);
-    m_PlayerDefinitions[user].EntityID = -1;
-    m_PlayerDefinitions[user].Name = "";
-    m_PlayerDefinitions[user].PacketID = 0;
-    m_ConnectedUsers.erase(m_ConnectedUsers.begin() + user);
 }
 
 void Server::parseOnInputCommand(Packet& packet)
 {
     PlayerID player = -1;
     // Check which player it was who sent the message
-    for (int i = 0; i < m_MaxConnections; i++) {
+    player = GetPlayerIDFromEndpoint(m_ReceiverEndpoint);
-        // if the player is connected set playerID to the correct PlayerID
-        if (m_PlayerDefinitions[i].Endpoint.address() == m_ReceiverEndpoint.address()
-            && m_PlayerDefinitions[i].Endpoint.port() == m_ReceiverEndpoint.port()) {
-            player = i;
-            break;
-        }
-    }
     if (player != -1) {
         while (packet.DataReadSize() < packet.Size()) {
             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,8 +280,8 @@ void Server::parseOnInputCommand(Packet& packet)
 void Server::parseOnPlayerDamage(Packet & packet)
 {
     Events::PlayerDamage e;
-    e.DamageAmount = packet.ReadPrimitive<double>();
+    e.Damage = packet.ReadPrimitive<double>();
-    e.PlayerDamagedID = packet.ReadPrimitive<EntityID>();
+    e.Player = EntityWrapper(m_World, packet.ReadPrimitive<EntityID>());
     m_EventBroker->Publish(e);
     //LOG_DEBUG("Server::parseOnPlayerDamage: Command is %s. Value is %f. PlayerID is %i.", e.DamageAmount, e.PlayerDamagedID, e.TypeOfDamage.c_str());
 }
@@ -299,9 +293,9 @@ void Server::parseConnect(Packet& packet)
     if (GetPlayerIDFromEndpoint(m_ReceiverEndpoint) != -1) {
         return;
     }
-    for (int i = 0; i < m_ConnectedUsers.size(); i++) {
+    for (auto& kv : m_ConnectedPlayers) {
-        if (m_ConnectedUsers[i].Endpoint.address() == m_ReceiverEndpoint.address() &&
+        if (kv.second.Endpoint.address() == m_ReceiverEndpoint.address() &&
-            m_ConnectedUsers[i].Endpoint.port() == m_ReceiverEndpoint.port()) {
+            kv.second.Endpoint.port() == m_ReceiverEndpoint.port()) {
             // Already connected 
             return;
         }
@@ -313,11 +307,11 @@ void Server::parseConnect(Packet& packet)
     pd.Name = packet.ReadString();
     pd.PacketID = 0;
     pd.StopTime = std::clock();
-    m_ConnectedUsers.push_back(pd);
+    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, m_ConnectedUsers[m_ConnectedUsers.size() - 1].PacketID);
+    Packet connnectPacket(MessageType::Connect, pd.PacketID);
     send(connnectPacket);
 
     // Send notification that a player has connected
@@ -329,9 +323,10 @@ void Server::parseDisconnect()
 {
     LOG_INFO("%i: Parsing disconnect", m_PacketID);
 
-    for (int i = 0; i < m_ConnectedUsers.size(); i++) {
+    for (auto& kv : m_ConnectedPlayers) {
-        if (m_ConnectedUsers[i].Endpoint.address() == m_ReceiverEndpoint.address()) {
+        if (kv.second.Endpoint.address() == m_ReceiverEndpoint.address() &&
-            disconnect(i);
+            kv.second.Endpoint.port() == m_ReceiverEndpoint.port()) {
+            disconnect(kv.first);
             break;
         }
     }
@@ -345,16 +340,16 @@ void Server::parseClientPing()
         return;
     }
     // Return ping
-    Packet packet(MessageType::Ping, m_PlayerDefinitions[player].PacketID);
+    Packet packet(MessageType::Ping, m_ConnectedPlayers[player].PacketID);
     packet.WriteString("Ping received");
     send(packet);
 }
 
 void Server::parsePing()
 {
-    for (int i = 0; i < m_ConnectedUsers.size(); i++) {
+    for (int i = 0; i < m_ConnectedPlayers.size(); i++) {
-        if (m_ConnectedUsers[i].Endpoint.address() == m_ReceiverEndpoint.address()) {
+        if (m_ConnectedPlayers[i].Endpoint.address() == m_ReceiverEndpoint.address()) {
-            m_ConnectedUsers[i].StopTime = std::clock();
+            m_ConnectedPlayers[i].StopTime = std::clock();
             break;
         }
     }
@@ -369,43 +364,6 @@ void Server::identifyPacketLoss()
     }
 }
 
-void Server::createPlayer()
-{
-    if (GetPlayerIDFromEndpoint(m_ReceiverEndpoint) != -1) {
-        // Already connected as player
-        LOG_WARNING("Already connected!");
-        return;
-    }
-    UserID userIndex;
-    for (userIndex = 0; userIndex < m_ConnectedUsers.size(); userIndex++) {
-        if (m_ConnectedUsers[userIndex].Endpoint.address() == m_ReceiverEndpoint.address() &&
-            m_ConnectedUsers[userIndex].Endpoint.port() == m_ReceiverEndpoint.port()) {
-            // Found user
-            break;
-        }
-    }
-    if (userIndex == m_ConnectedUsers.size()) {
-        LOG_WARNING("Not a recognized user!");
-        return;
-    }
-    for (PlayerID playerIndex = 0; playerIndex < m_MaxConnections; playerIndex++) {
-        if (m_PlayerDefinitions[playerIndex].Endpoint.address() == boost::asio::ip::address()) {
-            m_PlayerDefinitions[playerIndex] = m_ConnectedUsers[userIndex];
-            EntityID entityID = m_World->CreateEntity();
-            ComponentWrapper transform = m_World->AttachComponent(entityID, "Transform");
-            transform["Position"] = glm::vec3(-1.5f, 0.f, 0.f);
-            ComponentWrapper model = m_World->AttachComponent(entityID, "Model");
-            model["Resource"] = "Models/Core/UnitSphere.obj";
-            model["Color"] = glm::vec4(rand()%255 / 255.f, rand()%255 / 255.f, rand() %255 / 255.f, 1.f);
-            ComponentWrapper player = m_World->AttachComponent(entityID, "Player");
-            m_PlayerDefinitions[playerIndex].EntityID = entityID;
-            return;
-        }
-    }
-    LOG_WARNING("Server is full!");
-
-}
-
 void Server::kick(PlayerID player)
 {
     disconnect(player);
@@ -415,10 +373,10 @@ void Server::kick(PlayerID player)
 
 PlayerID Server::GetPlayerIDFromEndpoint(boost::asio::ip::udp::endpoint endpoint)
 {
-    for (int i = 0; i < m_MaxConnections; i++) {
+    for (auto& kv : m_ConnectedPlayers) {
-        if (m_PlayerDefinitions[i].Endpoint.address() == endpoint.address() &&
+        if (kv.second.Endpoint.address() == endpoint.address() &&
-            m_PlayerDefinitions[i].Endpoint.port() == endpoint.port()) {
+            kv.second.Endpoint.port() == endpoint.port()) {
-            return i;
+            return kv.first;
         }
     }
     return -1;
@@ -443,9 +401,54 @@ bool Server::OnInputCommand(const Events::InputCommand & e)
 
 bool Server::OnPlayerSpawned(const Events::PlayerSpawned & e)
 {
+    m_ConnectedPlayers[e.PlayerID].EntityID = e.Player.ID;
+
     Packet packet = Packet(MessageType::OnPlayerSpawned);
     packet.WritePrimitive<EntityID>(e.Player.ID);
     packet.WritePrimitive<EntityID>(e.Spawner.ID);
+    // We don't send PlayerID here because it will always be set to -1
+    packet.WriteString(m_ConnectedPlayers[e.PlayerID].Name);
     send(e.PlayerID, packet);
     return false;
 }
+
+bool Server::OnEntityDeleted(const Events::EntityDeleted & e)
+{
+    if (!e.Cascaded) {
+        Packet packet = Packet(MessageType::EntityDeleted);
+        packet.WritePrimitive<EntityID>(e.DeletedEntity);
+        broadcast(packet);
+    }
+    return false;
+}
+
+bool Server::OnComponentDeleted(const Events::ComponentDeleted & e)
+{
+    if (!e.Cascaded) {
+        Packet packet = Packet(MessageType::ComponentDeleted);
+        packet.WritePrimitive<EntityID>(e.Entity);
+        packet.WriteString(e.ComponentType);
+        broadcast(packet);
+    }
+    return false;
+}
+
+void Server::parsePlayerTransform(Packet& packet)
+{
+    glm::vec3 position;
+    glm::vec3 orientation;
+    position.x = packet.ReadPrimitive<float>();
+    position.y = packet.ReadPrimitive<float>();
+    position.z = packet.ReadPrimitive<float>();
+    orientation.x = packet.ReadPrimitive<float>();
+    orientation.y = packet.ReadPrimitive<float>();
+    orientation.z = packet.ReadPrimitive<float>();
+
+    PlayerID playerID = GetPlayerIDFromEndpoint(m_ReceiverEndpoint);
+    EntityWrapper player(m_World, m_ConnectedPlayers.at(playerID).EntityID);
+
+    if (player.Valid()) {
+        player["Transform"]["Position"] = position;
+        player["Transform"]["Orientation"] = orientation;
+    }
+}

src/Engine/Rendering/AnimationSystem.cpp

@@ -0,0 +1,47 @@
+#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/DrawBloomPass.cpp

@@ -4,7 +4,7 @@ DrawBloomPass::DrawBloomPass(IRenderer* renderer)
 {
     m_Renderer = renderer;
 
-    m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.obj");
+    m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.mesh");
 
     InitializeTextures();
     InitializeBuffers();

src/Engine/Rendering/DrawColorCorrectionPass.cpp

@@ -4,8 +4,8 @@ DrawColorCorrectionPass::DrawColorCorrectionPass(IRenderer* renderer)
 {
     m_Renderer = renderer;
 
-    m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.obj");
+    m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.mesh");
-    m_Exposure = 1; //TODO: Renderer: Fixa så att denna går att ändra på genom komponent eller setting.
+    m_Exposure = 0.4; //TODO: Renderer: Fixa så att denna går att ändra på genom komponent eller setting.
 
     InitializeShaderPrograms();
 }

src/Engine/Rendering/DrawFinalPass.cpp

@@ -65,6 +65,7 @@ void DrawFinalPass::Draw(RenderScene& scene)
     glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
     glUniform2f(glGetUniformLocation(shaderHandle, "ScreenDimensions"), m_Renderer->Resolution().Width, m_Renderer->Resolution().Height);
 
+
     //TODO: Render: Add code for more jobs than modeljobs.
     for (auto &job : scene.ForwardJobs) {
         auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
@@ -72,6 +73,11 @@ void DrawFinalPass::Draw(RenderScene& scene)
             //TODO: Kolla upp "header/include/common" shader saken så man slipper skicka in asmycket uniforms
             glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
             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) {
@@ -80,22 +86,32 @@ void DrawFinalPass::Draw(RenderScene& scene)
                 glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
             }
             glActiveTexture(GL_TEXTURE1);
-            glBindTexture(GL_TEXTURE_2D, m_BlackTexture->m_Texture);
+            if (modelJob->IncandescenceTexture != nullptr) {
-
+                glBindTexture(GL_TEXTURE_2D, modelJob->IncandescenceTexture->m_Texture);
-            /*if(modelJob->GlowMap != nullptr) {
-                glBindTexture(GL_TEXTURE_2D, modelJob->GlowMap->m_Texture);
             } else {
                 glBindTexture(GL_TEXTURE_2D, m_BlackTexture->m_Texture);
+            }
+
+            /*if(modelJob->GlowMap != nullptr) {
+            glBindTexture(GL_TEXTURE_2D, modelJob->GlowMap->m_Texture);
+            } else {
+            glBindTexture(GL_TEXTURE_2D, m_BlackTexture->m_Texture);
             }*/
 
+            //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);
+                    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                }
+            }
+
             glBindVertexArray(modelJob->Model->VAO);
             glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
-            glDrawElementsBaseVertex(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, 0, modelJob->StartIndex);
+            glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
-
-            continue;
         }
     }
-    m_FinalPassFrameBuffer.Unbind();
     GLERROR("DrawFinalPass::Draw: END");
     delete state;
 }
@@ -133,4 +149,4 @@ void DrawFinalPass::GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm:
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
     GLERROR("MipMap Texture initialization failed");
-}
+}

src/Engine/Rendering/DrawScreenQuadPass.cpp

@@ -4,7 +4,7 @@ DrawScreenQuadPass::DrawScreenQuadPass(IRenderer* renderer)
 {
     m_Renderer = renderer;
 
-    m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.obj");
+    m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.mesh");
 
     InitializeShaderPrograms();
 }

src/Engine/Rendering/Model.cpp

@@ -15,6 +15,9 @@ Model::Model(std::string fileName)
         if (!group.SpecularMapPath.empty()) {
             group.SpecularMap = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(group.SpecularMapPath));
         }
+        if (!group.IncandescenceMapPath.empty()) {
+            group.IncandescenceMap = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(group.IncandescenceMapPath));
+        }
     }
 
     // Generate GL buffers
@@ -32,7 +35,7 @@ Model::Model(std::string fileName)
     GLERROR("GLEW: BufferFail4");
 
     glBindBuffer(GL_ARRAY_BUFFER, buffer);
-    std::vector<int> structSizes = { 3, 3, 3, 3, 2, 4, 4, 4, 4, 4, 4 };
+	std::vector<int> structSizes = { 3, 3, 3, 3, 2, 4, 4 };
     int stride = 0;
     for (int size : structSizes) {
         stride += size;
@@ -48,10 +51,6 @@ Model::Model(std::string fileName)
         glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
         glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
         glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
-        glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
-        glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
-        glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
-        glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
     }
     GLERROR("GLEW: BufferFail5");
 
@@ -62,10 +61,6 @@ Model::Model(std::string fileName)
     glEnableVertexAttribArray(4);
     glEnableVertexAttribArray(5);
     glEnableVertexAttribArray(6);
-    glEnableVertexAttribArray(7);
-    glEnableVertexAttribArray(8);
-    glEnableVertexAttribArray(9);
-    glEnableVertexAttribArray(10);
     GLERROR("GLEW: BufferFail5");
 
     //CreateBuffers();

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,22 +75,30 @@ 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]++;
+                        m_ColorCounter[1] += 5;
                 } else {
-                        m_ColorCounter[0]++;
+                        m_ColorCounter[0] += 50;
                 }
             }
 
             m_PickingColorsToEntity[glm::ivec2(pickColor[0], pickColor[1])] = pickInfo;
 
-            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
+            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, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
-            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+            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])));
+            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]));
+                }
+            }
 
             glBindVertexArray(modelJob->Model->VAO);
             glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
-            glDrawElementsBaseVertex(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, nullptr, modelJob->StartIndex);
+            glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
         }
     }
     

src/Engine/Rendering/RawModelAssimp.cpp

@@ -1,6 +1,8 @@
-#include "Rendering/RawModel.h"
+#include "Rendering/RawModelAssimp.h"
 
-RawModel::RawModel(std::string fileName)
+#ifdef USING_ASSIMP_AS_IMPORTER
+
+RawModelAssimp::RawModelAssimp(std::string fileName)
 {
 	Assimp::Importer importer;
 	const aiScene* scene = importer.ReadFile(fileName, aiProcess_CalcTangentSpace | aiProcess_Triangulate);
@@ -38,7 +40,7 @@ RawModel::RawModel(std::string fileName)
 	//LOG_DEBUG("Index count %i", numIndices);
 
 	//LOG_DEBUG("Model has %i embedded textures", scene->mNumTextures);
-
+    
 	std::vector<std::tuple<std::string, glm::mat4>> boneInfo;
 	std::map<std::string, int> boneNameMapping;
 
@@ -74,21 +76,7 @@ RawModel::RawModel(std::string fileName)
 				auto uv = mesh->mTextureCoords[0][vertexIndex];
 				desc.TextureCoords = glm::vec2(uv.x, uv.y);
 			}
-
-			// Material diffuse color
-			aiColor3D diffuse;
-			material->Get(AI_MATKEY_COLOR_DIFFUSE, diffuse);
-            float opacity;
-            material->Get(AI_MATKEY_OPACITY, opacity);
-			desc.DiffuseVertexColor = glm::vec4(diffuse.r, diffuse.g, diffuse.b, opacity);
-
-			desc.DiffuseVertexColor = glm::vec4(diffuse.r, diffuse.g, diffuse.b, opacity);
             
-			// Material specular color
-			aiColor3D specular;
-			material->Get(AI_MATKEY_COLOR_SPECULAR, specular);
-			desc.SpecularVertexColor = glm::vec4(specular.r, specular.g, specular.b, 1.f);
-
 			m_Vertices.push_back(desc);
 		}
 
@@ -128,7 +116,7 @@ RawModel::RawModel(std::string fileName)
 		}
 		for (auto& vertex : m_Vertices) {
 			vertex.Tangent = glm::normalize(vertex.Tangent);
-			vertex.BiTangent = glm::normalize(glm::cross(vertex.Tangent, glm::normalize(vertex.Normal)));
+			vertex.BiNormal = glm::normalize(glm::cross(vertex.Tangent, glm::normalize(vertex.Normal)));
 		}
 
 		// Material info
@@ -201,10 +189,7 @@ RawModel::RawModel(std::string fileName)
 				LOG_WARNING("Vertex weights (%i) greater than max weights per vertex (%i)", weights.size(), maxWeights);
 			}
 			for (int weightIndex = 0; weightIndex < weights.size() && weightIndex < maxWeights && weightIndex < 4; ++weightIndex) {
-				std::tie(desc.BoneIndices1[weightIndex], desc.BoneWeights1[weightIndex]) = weights[weightIndex];
+				std::tie(desc.BoneIndices[weightIndex], desc.BoneWeights[weightIndex]) = weights[weightIndex];
-			}
-			for (int weightIndex = 4; weightIndex < weights.size() && weightIndex < maxWeights && weightIndex < 8; ++weightIndex) {
-				std::tie(desc.BoneIndices2[weightIndex - 4], desc.BoneWeights2[weightIndex - 4]) = weights[weightIndex];
 			}
 		}
 
@@ -290,14 +275,14 @@ RawModel::RawModel(std::string fileName)
 	}
 }
 
-RawModel::~RawModel()
+RawModelAssimp::~RawModelAssimp()
 {
 	if (m_Skeleton) {
 		delete m_Skeleton;
 	}
 }
 
-void RawModel::CreateSkeleton(std::vector<std::tuple<std::string, glm::mat4>> &boneInfo, std::map<std::string, int> &boneNameMapping, aiNode* node, int parentID)
+void RawModelAssimp::CreateSkeleton(std::vector<std::tuple<std::string, glm::mat4>> &boneInfo, std::map<std::string, int> &boneNameMapping, aiNode* node, int parentID)
 {
 	std::string nodeName = node->mName.C_Str();
 
@@ -317,3 +302,5 @@ void RawModel::CreateSkeleton(std::vector<std::tuple<std::string, glm::mat4>> &b
 		CreateSkeleton(boneInfo, boneNameMapping, child, parentID);
 	}
 }
+
+#endif

src/Engine/Rendering/RawModelCustom.cpp

@@ -0,0 +1,381 @@
+#include "Rendering/RawModelCustom.h"
+
+#ifndef USING_ASSIMP_AS_IMPORTER
+
+RawModelCustom::RawModelCustom(std::string fileName)
+{
+    if(fileName.substr(fileName.find_last_of(".")).compare(".mesh") != 0) {
+        throw Resource::FailedLoadingException("Unknown model file format. Please use \".mesh\" files.");
+    }
+    fileName = fileName.erase(fileName.find_last_of("."), fileName.find_last_of(".") - fileName.size());
+    ReadMeshFile(fileName);
+    ReadMaterialFile(fileName);
+    ReadAnimationFile(fileName);
+}
+
+void RawModelCustom::ReadMeshFile(std::string filePath)
+{ 
+    char* fileData;
+    filePath += ".mesh";
+    std::ifstream in(filePath.c_str(), std::ios_base::binary | std::ios_base::ate);
+
+    if (!in.is_open()) {
+        throw Resource::FailedLoadingException("Open mesh file failed");
+    }
+    unsigned int fileByteSize = in.tellg();
+    in.seekg(0, std::ios_base::beg);
+
+    fileData = new char[fileByteSize];
+    in.read(fileData, fileByteSize);
+    in.close();
+
+    unsigned int offset = 0;
+    if (fileByteSize > 0) {
+        ReadMeshFileHeader(offset, fileData, fileByteSize);
+        ReadMesh(offset, fileData, fileByteSize);
+    }
+    delete fileData;
+}
+
+void RawModelCustom::ReadMeshFileHeader(unsigned int& offset, char* fileData, unsigned int& fileByteSize)
+{
+#ifdef BOOST_LITTLE_ENDIAN
+    m_Vertices.resize(*(unsigned int*)(fileData + offset));
+    offset += sizeof(unsigned int);
+    m_Indices.resize(*(unsigned int*)(fileData + offset));
+    offset += sizeof(unsigned int);
+#else
+#endif
+}
+
+void RawModelCustom::ReadMesh(unsigned int& offset, char* fileData, unsigned int& fileByteSize)
+{
+    ReadVertices(offset, fileData, fileByteSize);
+    ReadIndices(offset, fileData, fileByteSize);
+}
+
+void RawModelCustom::ReadVertices(unsigned int& offset, char* fileData, unsigned int& fileByteSize)
+{
+#ifdef BOOST_LITTLE_ENDIAN
+    if (offset +  m_Vertices.size() * sizeof(Vertex) > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading vertices failed");
+    }
+
+    memcpy(&m_Vertices[0], fileData + offset, m_Vertices.size() * sizeof(Vertex));
+    offset += m_Vertices.size() * sizeof(Vertex);
+#else
+#endif
+}
+
+void RawModelCustom::ReadIndices(unsigned int& offset, char* fileData, unsigned int& fileByteSize)
+{
+#ifdef BOOST_LITTLE_ENDIAN
+    if (offset + m_Indices.size() * sizeof(unsigned int) > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading indices failed");
+    }
+
+    memcpy(&m_Indices[0], fileData + offset, m_Indices.size() * sizeof(unsigned int));
+    offset += m_Indices.size() * sizeof(unsigned int);
+
+#else
+#endif
+}
+
+void RawModelCustom::ReadMaterialFile(std::string filePath)
+{ 
+    char* fileData;
+    filePath += ".mtrl";
+    std::ifstream in(filePath.c_str(), std::ios_base::binary | std::ios_base::ate);
+
+    if (!in.is_open()) {
+        throw Resource::FailedLoadingException("Open material file failed");
+    }
+    unsigned int fileByteSize = in.tellg();
+    in.seekg(0, std::ios_base::beg);
+
+    fileData = new char[fileByteSize];
+    in.read(fileData, fileByteSize);
+    in.close();
+
+    unsigned int offset = 0;
+    if (fileByteSize > 0) {
+        ReadMaterials(offset, fileData, fileByteSize);
+    }
+    delete fileData;
+}
+
+void RawModelCustom::ReadMaterials(unsigned int& offset, char* fileData, unsigned int& fileByteSize)
+{ 
+#ifdef BOOST_LITTLE_ENDIAN
+    unsigned int* numMaterials = (unsigned int*)(fileData);
+    MaterialGroups.reserve(*numMaterials);
+    offset += sizeof(unsigned int);
+
+    for (int i = 0; i < *numMaterials; i++) {
+        ReadMaterialSingle(offset, fileData, fileByteSize);
+    }
+#else
+#endif
+}
+
+void RawModelCustom::ReadMaterialSingle(unsigned int &offset, char* fileData, unsigned int& fileByteSize)
+{ 
+    MaterialGroup newMaterial;
+
+#ifdef BOOST_LITTLE_ENDIAN
+
+    if (offset + sizeof(unsigned int) * 4 > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading Material texture names length failed");
+    }
+
+    unsigned int* nameLengths = (unsigned int*)(fileData + offset); 
+    offset += sizeof(unsigned int) * 4;
+
+    if (offset + sizeof(float) * 11 + sizeof(unsigned int) * 2 > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading Material specular, reflection, color and start and end index  values failed");
+    }
+
+    newMaterial.SpecularExponent = *(float*)(fileData + offset);
+    offset += sizeof(float);
+    newMaterial.ReflectionFactor = *(float*)(fileData + offset);
+    offset += sizeof(float);
+
+    memcpy(&newMaterial.DiffuseColor[0], fileData + offset, sizeof(float) * 3);
+    offset += sizeof(float) * 3;
+    memcpy(&newMaterial.SpecularColor[0], fileData + offset, sizeof(float) * 3);
+    offset += sizeof(float) * 3;
+    memcpy(&newMaterial.IncandescenceColor[0], fileData + offset, sizeof(float) * 3);
+    offset += sizeof(float) * 3;
+
+    newMaterial.StartIndex = *(unsigned int*)(fileData + offset);
+    offset += sizeof(unsigned int);
+    newMaterial.EndIndex = *(unsigned int*)(fileData + offset);
+    offset += sizeof(unsigned int);
+
+    if (nameLengths[0] > 0) {
+        if (offset + nameLengths[0] > fileByteSize) {
+            throw Resource::FailedLoadingException("Reading Material texture path failed");
+        }
+
+        newMaterial.TexturePath = "Textures/";
+        newMaterial.TexturePath += (fileData + offset);
+        newMaterial.TexturePath += ".png";
+        offset += nameLengths[0];
+    }
+
+    if (nameLengths[1] > 0) {
+        if (offset + nameLengths[1] > fileByteSize) {
+            throw Resource::FailedLoadingException("Reading Material NormalMap path failed");
+        }
+        newMaterial.NormalMapPath = "Textures/";
+        newMaterial.NormalMapPath += (fileData + offset);
+        newMaterial.NormalMapPath += ".png";
+        offset += nameLengths[1];
+    }
+
+    if (nameLengths[2] > 0) {
+        if (offset + nameLengths[2] > fileByteSize) {
+            throw Resource::FailedLoadingException("Reading Material SpecularMap path failed");
+        }
+        newMaterial.SpecularMapPath = "Textures/";
+        newMaterial.SpecularMapPath += (fileData + offset);
+        newMaterial.SpecularMapPath += ".png";
+        offset += nameLengths[2];
+    }
+
+    if (nameLengths[3] > 0) {
+        if (offset + nameLengths[3] > fileByteSize) {
+            throw Resource::FailedLoadingException("Reading Material IncandescenceMap path failed");
+        }
+        newMaterial.IncandescenceMapPath = "Textures/";
+        newMaterial.IncandescenceMapPath += (fileData + offset);
+        newMaterial.IncandescenceMapPath += ".png";
+        offset += nameLengths[3];
+    }
+
+#else
+#endif
+
+    MaterialGroups.push_back(newMaterial);
+}
+
+void RawModelCustom::ReadAnimationFile(std::string filePath)
+{ 
+    char* fileData;
+    filePath += ".anim";
+    std::ifstream in(filePath.c_str(), std::ios_base::binary | std::ios_base::ate);
+
+    if (!in.is_open()) {
+        //throw Resource::FailedLoadingException("Open animation file failed");
+        return;
+    }
+
+    unsigned int fileByteSize = in.tellg();
+    in.seekg(0, std::ios_base::beg);
+
+    fileData = new char[fileByteSize];
+    in.read(fileData, fileByteSize);
+    in.close();
+
+    unsigned int offset = 0;
+    if (fileByteSize > 0) {
+        m_Skeleton = new Skeleton();
+
+#ifdef BOOST_LITTLE_ENDIAN
+        unsigned int numBindPoses = *(unsigned int*)(fileData);
+        offset += sizeof(unsigned int);
+        unsigned int numAnimations = *(unsigned int*)(fileData + offset);
+        offset += sizeof(unsigned int);
+#else
+#endif
+
+        ReadAnimationBindPoses(offset, fileData, fileByteSize);
+        ReadAnimationClips(offset, fileData, fileByteSize, numAnimations);
+    }
+    delete fileData;
+}
+
+void RawModelCustom::ReadAnimationBindPoses(unsigned int &offset, char* fileData, unsigned int& fileByteSize)
+{
+#ifdef BOOST_LITTLE_ENDIAN
+    unsigned int* numBones = (unsigned int*)(fileData + offset);
+    offset += sizeof(unsigned int);
+
+    for (unsigned int i = 0; i < *numBones; i++) {
+        ReadAnimationJoint(offset, fileData, fileByteSize);
+    }
+#else
+#endif
+}
+
+void RawModelCustom::ReadAnimationJoint(unsigned int &offset, char* fileData, unsigned int& fileByteSize)
+{
+#ifdef BOOST_LITTLE_ENDIAN
+    if (offset + sizeof(unsigned int) > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading Joint name length failed");
+    }
+    unsigned int jointNameLength = *(unsigned int*)(fileData + offset);
+    offset += sizeof(unsigned int);
+
+    if (offset + jointNameLength > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading Joint name failed");
+    }
+    std::string jointName = (fileData + offset);
+    offset += jointNameLength;
+
+    if (offset + sizeof(float) * 4 * 4 > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading Joint offset matrix failed");
+    }
+    glm::mat4 offsetMatrix;
+    memcpy(&offsetMatrix, fileData + offset, sizeof(float) * 4 * 4);
+    offset += sizeof(float) * 4 * 4;
+    
+    if (offset + sizeof(int) > fileByteSize) { 
+        throw Resource::FailedLoadingException("Reading Joint ID failed");
+    }
+    int jointID = *(int*)(fileData + offset);
+    offset += sizeof(int);
+
+    if (offset + sizeof(int) > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading Joint Parent ID failed");
+    }
+    int jointParentID = *(int*)(fileData + offset);
+    offset += sizeof(int);
+
+    // Adding joint to the Skeleton
+    m_Skeleton->CreateBone(jointID, jointParentID, jointName, offsetMatrix);
+
+
+#else
+#endif
+}
+
+void RawModelCustom::ReadAnimationClips(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int numberOfClips)
+{
+    for (unsigned int i = 0; i < numberOfClips; i++) {
+        ReadAnimationClipSingle(offset, fileData, fileByteSize, i);
+    }
+}
+
+void RawModelCustom::ReadAnimationClipSingle(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int clipIndex)
+{
+#ifdef BOOST_LITTLE_ENDIAN
+    Skeleton::Animation newAnimation;
+
+    if (offset + sizeof(unsigned int) > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading AnimationClip name length failed");
+    }
+    unsigned int clipNameLength = *(unsigned int*)(fileData + offset);
+    offset += sizeof(unsigned int);
+
+    if (offset + clipNameLength > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading AnimationClip name failed");
+    }
+    newAnimation.Name = (fileData + offset);
+    offset += clipNameLength;
+
+    if (offset + sizeof(float) > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading AnimationClip duration failed");
+    }
+
+    newAnimation.Duration = *(float*)(fileData + offset);
+    offset += sizeof(float);
+
+    if (offset + sizeof(unsigned int) > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading AnimationClip NrOfKeyframes failed");
+    }
+    unsigned int nrOfKeyframes = *(unsigned int*)(fileData + offset);
+    offset += sizeof(unsigned int);
+
+    if (offset + sizeof(unsigned int) > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading AnimationClip NrOfJoints failed");
+    }
+    unsigned int nrOfJoints = *(unsigned int*)(fileData + offset);
+    offset += sizeof(unsigned int);
+
+    newAnimation.Keyframes.reserve(nrOfKeyframes);
+    for (unsigned int i = 0; i < nrOfKeyframes; i++) { 
+        ReadAnimationKeyFrame(offset, fileData, fileByteSize, nrOfJoints, newAnimation);
+    }
+    m_Skeleton->Animations[newAnimation.Name] = newAnimation;
+#else
+#endif
+}
+
+void RawModelCustom::ReadAnimationKeyFrame(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int nrOfJoints, Skeleton::Animation& animation)
+{
+    Skeleton::Animation::Keyframe newKeyFrame;
+
+    if (offset + sizeof(int) > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading AnimationKeyFrame index failed");
+    }
+    newKeyFrame.Index = *(int*)(fileData + offset);
+    offset += sizeof(int);
+
+    if (offset + sizeof(float) > fileByteSize) {
+        throw Resource::FailedLoadingException("Reading AnimationKeyFrame time failed");
+    }
+    newKeyFrame.Time = *(float*)(fileData + offset);
+    offset += sizeof(float);
+
+    if (offset + sizeof(Skeleton::Animation::Keyframe::BoneProperty) * nrOfJoints> fileByteSize) {
+        throw Resource::FailedLoadingException("Reading AnimationKeyFrame joints failed");
+    }
+
+    Skeleton::Animation::Keyframe::BoneProperty newBone;
+    for (unsigned int i = 0; i < nrOfJoints; i++) {
+        memcpy(&newBone, (fileData + offset), sizeof(Skeleton::Animation::Keyframe::BoneProperty));
+        offset += sizeof(Skeleton::Animation::Keyframe::BoneProperty);
+        newKeyFrame.BoneProperties[newBone.ID] = newBone;
+    }
+    animation.Keyframes.push_back(newKeyFrame);
+}
+
+RawModelCustom::~RawModelCustom()
+{
+    if (m_Skeleton != nullptr) {
+        delete m_Skeleton;
+    }
+}
+
+#endif

src/Engine/Rendering/RenderSystem.cpp

@@ -4,6 +4,7 @@ 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);
@@ -30,6 +31,16 @@ 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");
@@ -49,8 +60,18 @@ 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;
         }
 
@@ -59,18 +80,30 @@ void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& jobs)
             model = ResourceManager::Load<::Model, true>(resource);
         } catch (const Resource::StillLoadingException&) {
             //continue;
-            model = ResourceManager::Load<::Model>("Models/Core/UnitRaptor.obj");
+            model = ResourceManager::Load<::Model>("Models/Core/UnitRaptor.mesh");
         } catch (const std::exception&) {
             try {
-                model = ResourceManager::Load<::Model>("Models/Core/Error.obj");
+                model = ResourceManager::Load<::Model>("Models/Core/Error.mesh");
             } catch (const std::exception&) {
                 continue;
             }
         }
 
+
+        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));
+            std::shared_ptr<ModelJob> modelJob = std::shared_ptr<ModelJob>(new ModelJob(model, m_Camera, modelMatrix, matGroup, modelComponent, m_World, fillColor, fillPercentage));
             jobs.push_back(modelJob);
         }
     }
@@ -156,8 +189,8 @@ void RenderSystem::fillText(std::list<std::shared_ptr<RenderJob>>& jobs, World*
         }
 
         glm::mat4 modelMatrix = Transform::ModelMatrix(textComponent.EntityID, world);
-        std::shared_ptr<TextJob> modelJob = std::shared_ptr<TextJob>(new TextJob(modelMatrix, font, textComponent));
+        std::shared_ptr<TextJob> textJob = std::shared_ptr<TextJob>(new TextJob(modelMatrix, font, textComponent));
-        jobs.push_back(modelJob);
+        jobs.push_back(textJob);
 
     }
 }
@@ -177,7 +210,6 @@ void RenderSystem::Update(double dt)
         m_Camera->SetOrientation(Transform::AbsoluteOrientation(m_CurrentCamera));
     }
 
-    //Only supports opaque geometry atm
 
     RenderScene scene;
     scene.Camera = m_Camera;

src/Engine/Rendering/Renderer.cpp

@@ -13,9 +13,9 @@ void Renderer::Initialize()
     m_TextPass->Initialize();
 
 
-    m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.obj");
+   /* m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.obj");
     m_UnitQuad = ResourceManager::Load<Model>("Models/Core/UnitQuad.obj");
-    m_UnitSphere = ResourceManager::Load<Model>("Models/Core/UnitSphere.obj");
+    m_UnitSphere = ResourceManager::Load<Model>("Models/Core/UnitSphere.obj");*/
 
     m_ImGuiRenderPass = new ImGuiRenderPass(this, m_EventBroker);
 }

src/Engine/Rendering/Skeleton.cpp

@@ -68,7 +68,7 @@ std::vector<glm::mat4> Skeleton::GetFrameBones(const Animation& animation, doubl
 
 void Skeleton::AccumulateBoneTransforms(bool noRootMotion, const Animation::Keyframe &currentFrame, const Animation::Keyframe &nextFrame, float progress, std::map<int, glm::mat4> &boneMatrices, const Bone* bone, glm::mat4 parentMatrix)
 {
-	glm::mat4 boneMatrix;
+    glm::mat4 boneMatrix;
 
 	if (currentFrame.BoneProperties.find(bone->ID) != currentFrame.BoneProperties.end() || nextFrame.BoneProperties.find(bone->ID) != nextFrame.BoneProperties.end()) {
 		Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties.at(bone->ID);
@@ -84,10 +84,13 @@ void Skeleton::AccumulateBoneTransforms(bool noRootMotion, const Animation::Keyf
 			positionInterp.z = 0;
 		}
 
+
 		boneMatrix = parentMatrix * (glm::translate(positionInterp) * glm::toMat4(rotationInterp) * glm::scale(scaleInterp));
 		boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
 	} else {
-		boneMatrix = parentMatrix * bone->Parent->OffsetMatrix; // * glm::inverse(bone->OffsetMatrix);
+        if (bone->Parent) {
+            boneMatrix = parentMatrix; // * glm::inverse(bone->OffsetMatrix);
+        }
 		boneMatrices[bone->ID] = boneMatrix; // * bone->OffsetMatrix;
 	}
 
@@ -95,6 +98,7 @@ void Skeleton::AccumulateBoneTransforms(bool noRootMotion, const Animation::Keyf
 		std::string name = child->Name;
 		AccumulateBoneTransforms(noRootMotion, currentFrame, nextFrame, progress, boneMatrices, child, boneMatrix);
 	}
+
 }
 
 int Skeleton::GetBoneID(std::string name)

src/Engine/Sound/SoundSystem.cpp

@@ -198,7 +198,7 @@ bool SoundSystem::OnPlaySoundOnPosition(const Events::PlaySoundOnPosition & e)
     (float&)(double)emitter["RollOffFactor"] = e.RollOffFactor;
     (float&)(double)emitter["ReferenceDistance"] = e.ReferenceDistance;
     auto model = m_World->AttachComponent(emitterID, "Model");
-    (std::string&)model["Resource"] = "Models/Core/UnitCube.obj";
+    (std::string&)model["Resource"] = "Models/Core/UnitCube.mesh"; // 360NoScope UnitCube
     source->Type = SoundType::SFX;
     m_Sources[emitterID] = source;
     playSound(source);

src/Game/Game.cpp

@@ -10,6 +10,9 @@
 #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[])
 {
@@ -57,7 +60,7 @@ Game::Game(int argc, char* argv[])
     m_FrameStack->Height = m_Renderer->Resolution().Height;
 
     // Create a world
-    m_World = new World();
+    m_World = new World(m_EventBroker);
     std::string mapToLoad = m_Config->Get<std::string>("Debug.LoadMap", "");
     if (!mapToLoad.empty()) {
         auto file = ResourceManager::Load<EntityFile>(mapToLoad);
@@ -83,9 +86,13 @@ Game::Game(int argc, char* argv[])
     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

@@ -12,7 +12,6 @@ HealthSystem::HealthSystem(World* m_World, EventBroker* eventBroker)
 void HealthSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
 {
     //if entityID of health is 9 then the players ID is also 9 (player,health are connected to the same entity)
-    ComponentWrapper player = m_World->GetComponent(component.EntityID, "Player");
     double maxHealth = (double)component["MaxHealth"];
 
     //process the DeltaHealthVector and change the entitys health accordingly
@@ -46,10 +45,16 @@ void HealthSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& comp
     }
 }
 
-bool HealthSystem::OnPlayerDamaged(const Events::PlayerDamage& e)
+bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
 {
-    //save the changed HP to a vector. it will be taken care of in UpdateComponent
+    ComponentWrapper cHealth = e.Player["Health"];
-    m_DeltaHealthVector.push_back(std::make_tuple(e.PlayerDamagedID, -e.DamageAmount));
+    double& health = cHealth["Health"];
+    health -= e.Damage;
+    
+    if (health <= 0.0) {
+        m_World->DeleteEntity(e.Player.ID);
+    }
+
     return true;
 }