Final pass

.gitignore

@@ -12,6 +12,3 @@ tools/MayaExporter/x64/Debug/
 
 tools/MayaExporter/MayaExporter/Debug/
 tools/MayaExporter/MayaExporter/GeneratedFiles/
-
-tools/MayaExporter/MayaExporter/x64/*
-tools/MayaExporter/x64/*

include/Engine/Collision/CollidableOctreeSystem.h

@@ -1,17 +1,17 @@
-#ifndef FillFrustumOctreeSystem_h__
-#define FillFrustumOctreeSystem_h__
+#ifndef CollidableOctreeSystem_h__
+#define CollidableOctreeSystem_h__
 
 #include "../Core/System.h"
 #include "../Core/Octree.h"
 #include "Collision.h"
 #include "EntityAABB.h"
 
-class FillFrustumOctreeSystem : public ImpureSystem, public PureSystem
+class CollidableOctreeSystem : public ImpureSystem, public PureSystem
 {
 public:
-    FillFrustumOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree)
+    CollidableOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree, const std::string& componentType)
         : System(world, eventBroker)
-        , PureSystem("Model")
+        , PureSystem(componentType)
         , m_Octree(octree)
     { }
 

include/Engine/Collision/Collision.h

@@ -28,21 +28,6 @@ bool RayVsAABB(const Ray& ray, const AABB& box);
 //Return true if the ray hits the box, also outputs distance from ray origin to intersection point in [outDistance].
 bool RayVsAABB(const Ray& ray, const AABB& box, float& outDistance);
 
-//Return true if the ray hits the triangle.
-bool RayVsTriangle(const Ray& ray,
-    const glm::vec3& v0,
-    const glm::vec3& v1,
-    const glm::vec3& v2,
-    bool trueOnNegativeDistance = false);
-//Return true if the ray hits the triangle, and the distance is less than outDistance.
-bool RayVsTriangle(const Ray& ray,
-    const glm::vec3& v0,
-    const glm::vec3& v1,
-    const glm::vec3& v2,
-    float& outDistance,
-    float& outUCoord,
-    float& outVCoord,
-    bool trueOnNegativeDistance = false);
 //Return true if the ray hits any of the triangles in the model. Stops checking when a hit is detected.
 bool RayVsModel(const Ray& ray, 
     const std::vector<RawModel::Vertex>& modelVertices,
@@ -64,12 +49,9 @@ bool RayVsModel(const Ray& ray,
     float& outVCoord);
 
 bool AABBvsTriangles(const AABB& box,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<RawModel::Vertex>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix,
-    glm::vec3& boxVelocity,
-    float verticalStepHeight,
-    bool& isOnGround,
     glm::vec3& outResolutionVector);
 
 //Return true if the boxes are intersecting.
@@ -79,8 +61,7 @@ bool AABBVsAABB(const AABB& a, const AABB& b);
 bool AABBVsAABB(const AABB& a, const AABB& b, glm::vec3& minimumTranslation);
 
 // Calculates an absolute AABB from an entity AABB component
-boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity, bool takeModelBox = false);
-boost::optional<EntityAABB> AbsoluteAABBExplosionEffect(EntityWrapper& entity);
+boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity);
 
 }
 

include/Engine/Collision/FillOctreeSystem.h

@@ -1,25 +0,0 @@
-#ifndef FillOctreeSystem_h__
-#define FillOctreeSystem_h__
-
-#include "../Core/System.h"
-#include "../Core/Octree.h"
-#include "Collision.h"
-#include "EntityAABB.h"
-
-class FillOctreeSystem : public ImpureSystem, public PureSystem
-{
-public:
-    FillOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree, const std::string& fillComponentType)
-        : System(world, eventBroker)
-        , PureSystem(fillComponentType)
-        , m_Octree(octree)
-    { }
-
-    virtual void Update(double dt) override;
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
-
-private:
-    Octree<EntityAABB>* m_Octree;
-};
-
-#endif

include/Engine/Core/ComponentWrapper.h

@@ -43,11 +43,6 @@ struct ComponentWrapper
     // Specialization for string literals
     template <std::size_t N>
     void SetField(std::string name, const char(&value)[N]) { Field<std::string>(name) = std::string(value); }
-
-    void Copy(ComponentWrapper& destination)
-    {
-        memcpy(destination.Data, this->Data, Info.Stride);
-    }
     
     struct SubscriptProxy
     {

include/Engine/Core/EPickupSpawned.h

@@ -1,17 +0,0 @@
-#ifndef EPickupSpawned_h__
-#define EPickupSpawned_h__
-
-#include "Core/Event.h"
-#include "Core/EntityWrapper.h"
-
-namespace Events
-{
-
-struct PickupSpawned : Event
-{
-    EntityWrapper Pickup;
-};
-
-}
-
-#endif

include/Engine/Core/EPlayerDamage.h

@@ -9,7 +9,6 @@ namespace Events
 
 struct PlayerDamage : Event
 {
-    //NOTE: this struct is missing information on what the damageSource is
     EntityWrapper Player;
     double Damage;
 };

include/Engine/Core/EPlayerDeath.h

@@ -2,7 +2,7 @@
 #define EPlayerDeath_h__
 
 #include "EventBroker.h"
-#include "../Core/EntityWrapper.h"
+#include "../Core/Entity.h"
 
 namespace Events
 {
@@ -10,7 +10,8 @@ namespace Events
 struct PlayerDeath : Event
 {
     //KilledBy,KilledByWhat is optional for now. It might be used later in the playerlog-system
-    EntityWrapper Player;
+    EntityID KilledBy;
+    EntityID PlayerID;
     std::string KilledByWhat;
 };
 

include/Engine/Core/EPlayerHealthPickup.h

@@ -2,16 +2,16 @@
 #define EPlayerHealthPickup_h__
 
 #include "EventBroker.h"
-#include "../Core/EntityWrapper.h"
+#include "../Core/Entity.h"
 
 namespace Events
 {
 
-    struct PlayerHealthPickup : Event
-    {
-        EntityWrapper Player;
-        double HealthAmount;
-    };
+struct PlayerHealthPickup : Event
+{
+    double HealthAmount;
+    EntityID PlayerHealedID;
+};
 
 }
 

include/Engine/Core/EntityWrapper.h

@@ -25,7 +25,6 @@ struct EntityWrapper
 
     const std::string Name();
     bool HasComponent(const std::string& componentType);
-    void AttachComponent(const char* componentName);
     EntityWrapper Parent();
     EntityWrapper FirstChildByName(const std::string& name);
     EntityWrapper FirstParentWithComponent(const std::string& componentType);

include/Engine/Core/Frustum.h

@@ -1,77 +0,0 @@
-#ifndef Frustum_h__
-#define Frustum_h__
-
-#include "../GLM.h"
-#include "AABB.h"
-#include <bitset>
-
-//A frustum defined by 6 planes.
-struct Frustum
-{
-    //Contains points P in: dot(normal, P) + d = 0
-    struct Plane
-    {
-        glm::vec3 Normal;
-        float Distance;
-    };
-
-    enum class Output
-    {
-        Inside,
-        Outside,
-        Intersects
-    };
-    Plane Planes[6];
-
-    Frustum() = default;
-    Frustum(glm::mat4x4 viewProjMatrix)
-    {
-        //Order: Right, left, top, bottom, far, near.
-        int sign = 1;
-        for (int i = 0; i < 6; ++i) {
-            sign = -sign;
-            int index = i / 2;
-            Plane& plane = Planes[i];
-            plane.Normal.x = viewProjMatrix[0].w + sign * viewProjMatrix[0][index];
-            plane.Normal.y = viewProjMatrix[1].w + sign * viewProjMatrix[1][index];
-            plane.Normal.z = viewProjMatrix[2].w + sign * viewProjMatrix[2][index];
-            plane.Distance = viewProjMatrix[3].w + sign * viewProjMatrix[3][index];
-            float divByNormalLength = 1.0f / glm::length(plane.Normal);
-            plane.Normal *= divByNormalLength;
-            plane.Distance *= divByNormalLength;
-        }
-    }
-
-    Output VsAABB(const AABB& box) const
-    {
-        const glm::vec3& maxCorner = box.MaxCorner();
-        const glm::vec3& minCorner = box.MinCorner();
-        bool completelyInside = true;
-        for (const Plane& p : Planes) {
-            bool anyWasInside = false;
-            bool anyWasOutside = false;
-            //If points are on both sides of the plane, we can stop.
-            for (int i = 0; i < 8 && (!anyWasInside || !anyWasOutside); ++i) {
-                std::bitset<3> bits(i);
-                glm::vec3 corner;
-                corner.x = bits.test(0) ? maxCorner.x : minCorner.x;
-                corner.y = bits.test(1) ? maxCorner.y : minCorner.y;
-                corner.z = bits.test(2) ? maxCorner.z : minCorner.z;
-                if (glm::dot(p.Normal, corner) > -p.Distance) {
-                    anyWasInside = true;
-                } else {
-                    anyWasOutside = true;
-                }
-            }
-            if (!anyWasInside) {
-                return Output::Outside;
-            }
-            if (anyWasOutside) {
-                completelyInside = false;
-            }
-        }
-        return completelyInside ? Output::Inside : Output::Intersects;
-    }
-};
-
-#endif

include/Engine/Core/MemoryPool.h

@@ -102,7 +102,7 @@ public:
 			m_ExtraMemory.push_back((char*)malloc(m_Stride));
 			//We should preferably not enter here to avoid performance issues. Set more numMaxElements in constructor instead.
             if (!DisableMemoryPool::Value) {
-			    LOG_DEBUG("Allocated slots exceed Pool size, extra memory allocated dynamically. Pool size: %u, dynamic size: %u.", m_NumSlots, m_ExtraMemory.size());
+			    LOG_WARNING("Allocated slots exceed Pool size, extra memory allocated dynamically. Pool size: %u, dynamic size: %u.", m_NumSlots, m_ExtraMemory.size());
             }
 			return m_ExtraMemory.back();
 		}

include/Engine/Core/Octree.h

@@ -5,7 +5,6 @@
 
 #include "../Common.h"
 #include "AABB.h"
-#include "Frustum.h"
 
 //Fwd declarations.
 class Ray;
@@ -41,8 +40,6 @@ public:
     //The type Box must be AABB, or inherit from AABB.
     template<typename Box>
     void ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects);
-    //Get the objects that are inside the frustum, the objects are put in outObjects.
-    void ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects);
     //Empty the tree of all objects, static and dynamic.
     void ClearObjects();
     //Empty the tree of all dynamic objects. Static objects remain in the tree.
@@ -100,8 +97,6 @@ struct Child
     void AddStaticObject(const AABB& box);
     template<typename T, typename Box>
     void ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects) const;
-    template<typename T>
-    void ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects, bool takeAllDontTest) const;
     void ClearObjects();
     void ClearDynamicObjects();
     bool RayCollides(const Ray& ray, Output& data) const;
@@ -116,7 +111,7 @@ struct Child
     std::vector<ContainedObject>& m_StaticObjectsRef;
     std::vector<ContainedObject>& m_DynamicObjectsRef;
 
-    inline bool hasChildren() const { return m_Children[0] != nullptr; }
+    bool hasChildren() const;
     int childIndexContainingPoint(const glm::vec3& point) const;
     std::vector<int> childIndicesContainingBox(const AABB& box) const;
 };
@@ -159,13 +154,6 @@ void Octree<T>::ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects)
     m_Root->ObjectsInSameRegion(box, outObjects);
 }
 
-template<typename T>
-void Octree<T>::ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects)
-{
-    falsifyObjectChecks();
-    m_Root->ObjectsInFrustum(frustum, outObjects, false);
-}
-
 template<typename T>
 void Octree<T>::ClearObjects()
 {
@@ -242,46 +230,4 @@ void OctSpace::Child::ObjectsInSameRegion(const Box& box, std::vector<T>& outObj
     }
 }
 
-template<typename T>
-void OctSpace::Child::ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects, bool takeAllDontTest) const
-{
-    if (hasChildren()) {
-        for (const Child* c : m_Children) {
-            Frustum::Output out = Frustum::Output::Inside;
-            if (!takeAllDontTest) {
-                out = frustum.VsAABB(c->m_Box);
-                if (out == Frustum::Output::Outside) {
-                    continue;
-                }
-            }
-            c->ObjectsInFrustum(frustum, outObjects, out == Frustum::Output::Inside);
-        }
-    } else {
-        size_t startIndex = outObjects.size();
-        int numDuplicates = 0;
-        outObjects.resize(outObjects.size() + m_StaticObjIndices.size() + m_DynamicObjIndices.size());
-        for (size_t i = 0; i < m_StaticObjIndices.size(); ++i) {
-            ContainedObject& obj = m_StaticObjectsRef[m_StaticObjIndices[i]];
-            if (obj.Checked || frustum.VsAABB(*obj.Box) == Frustum::Output::Outside) {
-                ++numDuplicates;
-            } else {
-                obj.Checked = true;
-                outObjects[startIndex + i - numDuplicates] = *static_cast<T*>(obj.Box.get());
-            }
-        }
-        for (size_t i = 0; i < m_DynamicObjIndices.size(); ++i) {
-            ContainedObject& obj = m_DynamicObjectsRef[m_DynamicObjIndices[i]];
-            if (obj.Checked || frustum.VsAABB(*obj.Box) == Frustum::Output::Outside) {
-                ++numDuplicates;
-            } else {
-                obj.Checked = true;
-                outObjects[startIndex + i - numDuplicates] = *static_cast<T*>(obj.Box.get());
-            }
-        }
-        for (size_t i = 0; i < numDuplicates; ++i) {
-            outObjects.pop_back();
-        }
-    }
-}
-
 #endif

include/Engine/Core/Ray.h

@@ -7,10 +7,6 @@
 class Ray
 {
 public:
-    Ray()
-        : m_Origin(glm::vec3(0.f))
-        , m_Direction(glm::vec3(0, 0, 1))
-    {}
     Ray(const glm::vec3& origin, const glm::vec3& dir)
         : m_Origin(origin)
         , m_Direction(glm::normalize(dir))

include/Engine/Core/ResourceManager.h

@@ -200,16 +200,13 @@ static T* ResourceManager::Load(const std::string& resourceName, Resource* paren
     }
 
     //If resource has already been cached and completely loaded.
-    {
-        boost::lock_guard<decltype(m_Mutex)> guard(m_Mutex);
-        it = m_ResourceCache.find(cacheKey);
-        if (it != m_ResourceCache.end()) {
-            if (it->second != nullptr) {
-                return static_cast<T*>(it->second);
-            } else {
-                //Don't return null on failure, exception instead.
-                throw Resource::FailedLoadingException();
-            }
+    it = m_ResourceCache.find(cacheKey);
+    if (it != m_ResourceCache.end()) {
+        if (it->second != nullptr) {
+            return static_cast<T*>(it->second);
+        } else {
+            //Don't return null on failure, exception instead.
+            throw Resource::FailedLoadingException();
         }
     }
 

include/Engine/Core/Transform.h

@@ -18,7 +18,6 @@ glm::vec3 AbsoluteScale(EntityWrapper entity);
 glm::vec3 AbsoluteScale(World* world, EntityID entity);
 glm::mat4 ModelMatrix(EntityWrapper entity);
 glm::mat4 ModelMatrix(EntityID entity, World* world);
-glm::vec3 TransformPoint(const glm::vec3& point, const glm::mat4& matrix);
 
 }
 

include/Engine/Core/Util/IfDebug.h

@@ -4,7 +4,7 @@
 // }
 // NOTE: condition statement is not executed at all in release mode.
 #ifndef DEBUG_IF
-#ifdef DEBUG
+#ifndef DEBUG
 #define DEBUG_IF(c) if(c)
 #else
 #define DEBUG_IF(c) if(false)

include/Engine/Input/FirstPersonInputController.h

@@ -4,8 +4,6 @@
 #include "../GLM.h"
 #include "../Core/InputController.h"
 #include "../Core/ELockMouse.h"
-#include "../Game/Events/EDashAbility.h"
-#include "InputHandler.h"
 
 template <typename EventContext>
 class FirstPersonInputController : public InputController<EventContext>
@@ -27,10 +25,6 @@ public:
     virtual bool OnCommand(const Events::InputCommand& e) override;
     virtual void Reset();
 
-    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer);
-    virtual bool AssaultDashDoubleTapped() const { return m_AssaultDashDoubleTapped; }
-    virtual bool PlayerIsDashing() const { return m_PlayerIsDashing; }
-
 protected:
     const int m_PlayerID;
     bool m_MouseLocked = false;
@@ -39,22 +33,6 @@ protected:
     bool m_Jumping = false;
     bool m_DoubleJumping = false;
     bool m_Crouching = false;
-    //assault dash membervariables - needed to calculate the doubletap- and dashlogic
-    double m_AssaultDashDoubleTapDeltaTime = 0.0;
-    double m_AssaultDashCoolDownTimer = 0.0;
-    //i will let m_AssaultDashDoubleTapSensitivityTimer stay hardcoded, its not really a gamevariable (more an inputvariable), 
-    //and its very unlikely that someone wants to change that value
-    const float m_AssaultDashDoubleTapSensitivityTimer = 0.25f;
-    std::string m_AssaultDashTapDirection = "";
-    std::string m_CurrentDirectionVector = "";
-    bool m_AssaultDashDoubleTapped = false;
-    bool m_PlayerIsDashing = false;
-    bool m_ShiftDashing = false;
-    bool m_ValidDoubleTap = false;
-
-    //specialabilitys
-    bool m_MovementKeyDown = false;
-    bool m_SpecialAbilityKeyDown = false;
 
     EventRelay<EventContext, Events::LockMouse> m_ELockMouse;
     bool OnLockMouse(const Events::LockMouse& e);
@@ -126,26 +104,6 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
         }
     }
 
-    if (e.Command == "Forward" || e.Command == "Right") {
-        if (e.Value != 0) {
-            m_CurrentDirectionVector = e.Command == "Right" ? (e.Value > 0 ? "Right" : "Left") : (e.Value > 0 ? "Forward" : "Backward");
-        }
-        //if value = 0 then you have just released this key
-        if (e.Value != 0) {
-            m_MovementKeyDown = true;
-            //if you pressed the same key within m_AssaultDashDoubleTapSensitivityTimer then you have doubletapped it
-            if (m_AssaultDashDoubleTapDeltaTime < m_AssaultDashDoubleTapSensitivityTimer && m_AssaultDashTapDirection == m_CurrentDirectionVector) {
-                m_ValidDoubleTap = true;
-            }
-        } else {
-            //== 0
-            m_MovementKeyDown = false;
-            //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
-            m_AssaultDashTapDirection = m_CurrentDirectionVector;
-            m_AssaultDashDoubleTapDeltaTime = 0.f;
-        }
-    }
-
     if (e.Command == "Jump") {
         m_Jumping = e.Value > 0;
     }
@@ -154,19 +112,6 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
         m_Crouching = e.Value > 0;
     }
 
-    if (e.Command == "SpecialAbility") {
-        if (e.Value > 0) {
-            m_SpecialAbilityKeyDown = true;
-        } else {
-            m_SpecialAbilityKeyDown = false;
-        }
-    }
-    if (m_SpecialAbilityKeyDown && m_MovementKeyDown) {
-        m_ShiftDashing = true;
-    } else {
-        m_ShiftDashing = false;
-    }
-
     return true;
 }
 
@@ -184,56 +129,4 @@ bool FirstPersonInputController<EventContext>::OnLockMouse(const Events::LockMou
     return true;
 }
 
-template <typename EventContext>
-void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer) {
-    m_AssaultDashDoubleTapDeltaTime += dt;
-    m_AssaultDashCoolDownTimer -= dt;
-    //cooldown = assaultDashCoolDownMaxTimer sec, pretend the dash lasts 0.25 sec (for friction to do its work)
-    if (m_AssaultDashCoolDownTimer > (assaultDashCoolDownMaxTimer - 0.25f)) {
-        m_PlayerIsDashing = true;
-    } else {
-        m_PlayerIsDashing = false;
-    }
-
-    //dashing with shift
-    if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f && !isJumping) {
-        //player is dashing with shift
-        //the wanted-direction is set in playermovement already so we dont need to check what direction we want to dash in!
-        m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
-        m_AssaultDashDoubleTapped = true;
-        m_AssaultDashDoubleTapDeltaTime = 0.f;
-        //moving to the side has priority
-        return;
-    }
-
-    //dashing with doubletap - check if doubletap to dash enabled
-    if (ResourceManager::Load<ConfigFile>("Input.ini")->Get<bool>("Keyboard.DoubleTapToDash", false)) {
-        return;
-    }
-
-    //reset the DoubleTapped state in case we recently doubleTapped (doubletap will only happen during 1 frame)
-    if (m_AssaultDashDoubleTapped) {
-        m_AssaultDashDoubleTapped = false;
-    }
-
-    //check if we have received a valid doubletap
-    if (!m_ValidDoubleTap) {
-        return;
-    }
-    m_ValidDoubleTap = false;
-
-    if (!(m_AssaultDashCoolDownTimer <= 0.0f && !isJumping)) {
-        //if we cant dash at the moment, then just reset the tap-sensitivity-timer
-        m_AssaultDashDoubleTapDeltaTime = 0.f;
-        return;
-    }
-    //ok, we have a valid tap, lets do it
-    m_AssaultDashDoubleTapped = true;
-    m_AssaultDashDoubleTapDeltaTime = 0.f;
-    m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
-
-    Events::DashAbility e;
-    m_EventBroker->Publish(e);
-}
-
 #endif

include/Engine/Rendering/AnimationSystem.h

@@ -9,7 +9,6 @@
 #include "Rendering/Model.h"
 #include "Rendering/EAnimationComplete.h"
 #include "Rendering/Skeleton.h"
-#include <imgui/imgui.h>
 
 class AnimationSystem : public PureSystem
 {
@@ -23,9 +22,8 @@ public:
     ~AnimationSystem() { }
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& animationComponent, double dt) override;
 private:
-    float angle = 0.f;
-    bool b_forward = false;
-    char bone[100];
+
+
 };
 
 #endif

include/Engine/Rendering/BoneAttachmentSystem.h

@@ -1,29 +0,0 @@
-#ifndef BoneAttachmentSystem_h__
-#define BoneAttachmentSystem_h__
-
-#include "GLM.h"
-
-#include "Common.h"
-#include "Core/System.h"
-#include "Core/ResourceManager.h"
-#include "Rendering/Model.h"
-#include "Rendering/Skeleton.h"
-
-//Needs to be a higher orderlevel than AnimationSystem
-class BoneAttachmentSystem : public PureSystem
-{
-public:
-    BoneAttachmentSystem(World* world, EventBroker* eventBroker)
-        : System(world, eventBroker)
-        , PureSystem("BoneAttachment")
-    {
-
-    }
-    ~BoneAttachmentSystem() { }
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& BoneAttachmentComponent, double dt) override;
-private:
-
-
-};
-
-#endif

include/Engine/Rendering/DrawColorCorrectionPass.h

@@ -17,7 +17,7 @@ public:
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
 
-    void Draw(GLuint sceneTexture, GLuint bloomTexture, GLuint sceneTextureLowRes, GLuint bloomTextureLowRes, GLfloat gamma, GLfloat exposure);
+    void Draw(GLuint sceneTexture, GLuint bloomTexture, GLfloat gamma, GLfloat exposure);
 private:
     const IRenderer* m_Renderer;
 

include/Engine/Rendering/DrawFinalPass.h

@@ -22,29 +22,21 @@ public:
 
     //Return the texture that is used in later stages to apply the bloom effect
     GLuint BloomTexture() const { return m_BloomTexture; }
-    GLuint BloomTextureLowRes() const { return m_BloomTextureLowRes; }
     //Return the texture with diffuse and lighting of the scene.
     GLuint SceneTexture() const { return m_SceneTexture; }
-    GLuint SceneTextureLowRes() const { return m_SceneTextureLowRes; }
-    //Return the framebuffer used in the scene rendering stage.
     FrameBuffer* FinalPassFrameBuffer() { return &m_FinalPassFrameBuffer; }
-    FrameBuffer* FinalPassFrameBufferLowRes() { return &m_FinalPassFrameBufferLowRes; }
 
 
 private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
     void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps) const;
-
-    void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
-    void DrawShieldToStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
-    void DrawShieldedModelRenderQueue(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
-    void DrawToDepthBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
+    void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& job, RenderScene& scene);
 
     void BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job, RenderScene& scene);
     void BindModelUniforms(GLuint shaderHandle, std::shared_ptr<ModelJob>& job, RenderScene& scene);
 
-    void BindExplosionTextures(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job);
-    void BindModelTextures(GLuint shaderHandle, std::shared_ptr<ModelJob>& job);
+    void BindExplosionTextures(std::shared_ptr<ExplosionEffectJob>& job);
+    void BindModelTextures(std::shared_ptr<ModelJob>& job);
 
     Texture* m_WhiteTexture;
     Texture* m_BlackTexture;
@@ -52,34 +44,15 @@ private:
     Texture* m_GreyTexture;
 
     FrameBuffer m_FinalPassFrameBuffer;
-    FrameBuffer m_FinalPassFrameBufferLowRes;
     GLuint m_BloomTexture;
     GLuint m_SceneTexture;
-    GLuint m_BloomTextureLowRes;
-    GLuint m_SceneTextureLowRes;
     GLuint m_DepthBuffer;
-    GLuint m_DepthBufferLowRes;
-
-    //maqke this component based i guess?
-    GLuint m_ShieldPixelRate = 16;
 
     const IRenderer* m_Renderer;
     const LightCullingPass* m_LightCullingPass;
 
     ShaderProgram* m_ForwardPlusProgram;
     ShaderProgram* m_ExplosionEffectProgram;
-	ShaderProgram* m_ExplosionEffectSplatMapProgram;
-	ShaderProgram* m_ForwardPlusSplatMapProgram;
-    ShaderProgram* m_ShieldToStencilProgram;
-    ShaderProgram* m_FillDepthBufferProgram;
-
-
-	ShaderProgram* m_ForwardPlusSkinnedProgram;
-	ShaderProgram* m_ExplosionEffectSkinnedProgram;
-	ShaderProgram* m_ExplosionEffectSplatMapSkinnedProgram;
-	ShaderProgram* m_ForwardPlusSplatMapSkinnedProgram;
-    ShaderProgram* m_ShieldToStencilSkinnedProgram;
-    ShaderProgram* m_FillDepthBufferSkinnedProgram;
 };
 
 #endif 

include/Engine/Rendering/DrawFinalPassState.h

@@ -12,11 +12,4 @@ private:
 
 };
 
-class DrawStencilState : public RenderState
-{
-public:
-    DrawStencilState(GLuint frameBuffer);
-    ~DrawStencilState();
-};
-
 #endif

include/Engine/Rendering/ExplosionEffectJob.h

@@ -15,7 +15,7 @@
 
 struct ExplosionEffectJob : ModelJob
 {
-    ExplosionEffectJob(ComponentWrapper explosionEffectComponent, ::Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matGroup, ComponentWrapper modelComponent, ::World* world, glm::vec4 fillColor, float fillPercentage)
+    ExplosionEffectJob(ComponentWrapper explosionEffectComponent, ::Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialGroup matGroup, ComponentWrapper modelComponent, ::World* world, glm::vec4 fillColor, float fillPercentage)
         : ModelJob(model, camera, matrix, matGroup, modelComponent, world, fillColor, fillPercentage)
     {
         ExplosionOrigin = (glm::vec3)explosionEffectComponent["ExplosionOrigin"];

include/Engine/Rendering/Model.h

@@ -4,7 +4,6 @@
 #include "Rendering/RawModelCustom.h"
 //#include "Rendering/RawModelAssimp.h"
 #include "../OpenGL.h"
-#include "Core/AABB.h"
 
 class Model : public ThreadUnsafeResource
 {
@@ -15,19 +14,16 @@ private:
 
 public:
 	~Model();
-    const std::vector<RawModel::MaterialProperties>& MaterialGroups() const { return m_RawModel->m_Materials; }
+    const std::vector<RawModel::MaterialGroup>& MaterialGroups() const { return m_RawModel->MaterialGroups; }
     const glm::mat4& Matrix() const { return m_RawModel->m_Matrix; }
-    const RawModel::Vertex* Vertices() const { return m_RawModel->Vertices(); }
-	unsigned int NumberOfVertices() const { return m_RawModel->NumVertices(); }
-    const AABB& Box() const { return m_Box; }
-	bool IsSkinned() const { return m_RawModel->IsSkinned(); }
+    const std::vector<RawModel::Vertex>& Vertices() const { return m_RawModel->m_Vertices; }
+
 	GLuint VAO;
 	GLuint ElementBuffer;
     RawModel* m_RawModel;
 
 private:
-    AABB m_Box;
-
+    
 	GLuint VertexBuffer;
 	GLuint NormalBuffer;
 	GLuint TangentNormalsBuffer;

include/Engine/Rendering/ModelJob.h

@@ -14,98 +14,39 @@
 #include "../Core/World.h"
 #include "../Core/Transform.h"
 #include "Skeleton.h"
-#include "ShaderProgram.h"
 
 struct ModelJob : RenderJob
 {
-    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matProp, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage)
+    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialGroup matGroup, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage)
         : RenderJob()
     {
         Model = model;
-		ModelID = model->ResourceID;
-		Type = matProp.type;
-		::RawModel::MaterialBasic* matGroup = matProp.material;
-		switch(matProp.type){
-		case ::RawModel::MaterialType::Basic:
-			if (Model->IsSkinned()) {
-				ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSkinnedProgram")->ResourceID;
-			}
-			else {
-				ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusProgram")->ResourceID;
-			}
-			TextureID = 0;
-			break;
-		case ::RawModel::MaterialType::SingleTextures:
-			{
-				if (Model->IsSkinned()) {
-					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSkinnedProgram")->ResourceID;
-				}
-				else {
-					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusProgram")->ResourceID;
-				}
-				::RawModel::MaterialSingleTextures* singleTextures = static_cast<::RawModel::MaterialSingleTextures*>(matProp.material);
-				TextureID = (singleTextures->ColorMap.Texture) ? singleTextures->ColorMap.Texture->ResourceID : 0;
-				if (modelComponent["DiffuseTexture"]) {
-					DiffuseTexture.push_back(&singleTextures->ColorMap);
-				}
-
-				if (modelComponent["NormalMap"]) {
-					NormalTexture.push_back(&singleTextures->NormalMap);
-				}
-
-				if (modelComponent["SpecularMap"]) {
-					SpecularTexture.push_back(&singleTextures->SpecularMap);
-				}
-
-				if (modelComponent["GlowMap"]) {
-					IncandescenceTexture.push_back(&singleTextures->IncandescenceMap);
-				}
-			}
-			break;
-		case ::RawModel::MaterialType::SplatMapping:
-			{
-				if (Model->IsSkinned()) {
-					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSplatMapSkinnedProgram")->ResourceID;
-				}
-				else {
-					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSplatMapProgram")->ResourceID;
-				}
-				::RawModel::MaterialSplatMapping* SplatTextures = static_cast<::RawModel::MaterialSplatMapping*>(matProp.material);
-
-				SplatMap = &SplatTextures->SplatMap;
-
-				TextureID = (SplatTextures->ColorMaps[0].Texture) ? SplatTextures->ColorMaps[0].Texture->ResourceID : 0;
-				if (modelComponent["DiffuseTexture"]) {
-					for (auto& texture : SplatTextures->ColorMaps) {
-						DiffuseTexture.push_back(&texture);
-					}
-				}
-
-				if (modelComponent["NormalMap"]) {
-					for (auto& texture : SplatTextures->NormalMaps) {
-						NormalTexture.push_back(&texture);
-					}
-				}
-
-				if (modelComponent["SpecularMap"]) {
-					for (auto& texture : SplatTextures->SpecularMaps) {
-						SpecularTexture.push_back(&texture);
-					}
-				}
-
-				if (modelComponent["GlowMap"]) {
-					for (auto& texture : SplatTextures->IncandescenceMaps) {
-						IncandescenceTexture.push_back(&texture);
-					}
-				}
-			}
-			break;
-		}
-        DiffuseColor = matGroup->DiffuseColor;
-        SpecularColor = matGroup->SpecularColor;
-        IncandescenceColor = matGroup->IncandescenceColor;
-        StartIndex = matGroup->StartIndex;
-        EndIndex = matGroup->EndIndex;
+        TextureID = (matGroup.Texture) ? matGroup.Texture->ResourceID : 0;
+        if (modelComponent["DiffuseTexture"]) {
+            DiffuseTexture = matGroup.Texture.get();
+        } else {
+            DiffuseTexture = nullptr;
+        }
+        if (modelComponent["NormalMap"]) {
+            NormalTexture = matGroup.NormalMap.get();
+        } else {
+            NormalTexture = nullptr;
+        }
+        if (modelComponent["SpecularMap"]) {
+            SpecularTexture = matGroup.SpecularMap.get();
+        } else {
+            SpecularTexture = nullptr;
+        }
+        if (modelComponent["GlowMap"]) {
+            IncandescenceTexture = matGroup.IncandescenceMap.get();
+        } else {
+            IncandescenceTexture = nullptr;
+        }
+        DiffuseColor = matGroup.DiffuseColor;
+        SpecularColor = matGroup.SpecularColor;
+        IncandescenceColor = matGroup.IncandescenceColor;
+        StartIndex = matGroup.StartIndex;
+        EndIndex = matGroup.EndIndex;
         Matrix = matrix;
         Color = modelComponent["Color"];
         Entity = modelComponent.EntityID;
@@ -116,56 +57,29 @@ struct ModelJob : RenderJob
 
         FillColor = fillColor;
         FillPercentage = fillPercentage;
-
         Skeleton = Model->m_RawModel->m_Skeleton;
 
-        if (Skeleton != nullptr) {
-            if (world->HasComponent(Entity, "Animation")) {
-                auto animationComponent = world->GetComponent(Entity, "Animation");
-
-                for (int i = 1; i <= 3; i++) {
-                    ::Skeleton::AnimationData animationData;
-                    animationData.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationComponent["AnimationName" + std::to_string(i)]);
-                    if (animationData.animation == nullptr) {
-                        continue;
-                    }
-                    animationData.time = (double)animationComponent["Time" + std::to_string(i)];
-                    animationData.weight = (double)animationComponent["Weight" + std::to_string(i)];
-
-                    Animations.push_back(animationData);
-                }
-            }
-
-            if (world->HasComponent(Entity, "AnimationOffset")) {
-                auto animationOffsetComponent = world->GetComponent(Entity, "AnimationOffset");
-                AnimationOffset.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationOffsetComponent["AnimationName"]);
-                AnimationOffset.time = (double)animationOffsetComponent["Time"];
-            } else {
-                AnimationOffset.animation = nullptr;
-            }
+        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;
     unsigned int ShaderID;
-	unsigned int ModelID;
 
-	::RawModel::MaterialType Type;
     EntityID Entity;
     glm::mat4 Matrix;
-	const ::RawModel::TextureProperties* SplatMap;
-    std::vector<const ::RawModel::TextureProperties*> DiffuseTexture;
-	std::vector<const ::RawModel::TextureProperties*> NormalTexture;
-	std::vector<const ::RawModel::TextureProperties*> SpecularTexture;
-	std::vector<const ::RawModel::TextureProperties*> IncandescenceTexture;
+    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;
-
-    std::vector<::Skeleton::AnimationData> Animations;
-    ::Skeleton::AnimationOffset AnimationOffset;
+    const ::Skeleton::Animation* Animation = nullptr;
 
     float AnimationTime = 0.f;
 
@@ -181,7 +95,7 @@ struct ModelJob : RenderJob
 
     void CalculateHash() override
     {
-        Hash = TextureID + ModelID << 10 + ShaderID << 20;
+        Hash = TextureID;
     }
 };
 

include/Engine/Rendering/PickingPass.h

@@ -40,7 +40,6 @@ private:
     const IRenderer* m_Renderer;
 
     ShaderProgram* m_PickingProgram;
-	ShaderProgram* m_PickingSkinnedProgram;
     Camera* m_Camera;
 
     struct PickingInfo

include/Engine/Rendering/RawModelCustom.h

@@ -33,27 +33,18 @@ protected:
 public:
     ~RawModelCustom();
     
-	struct Vertex
-	{
-		glm::vec3 Position;
-		glm::vec3 Normal;
-		glm::vec3 Tangent;
-		glm::vec3 BiNormal;
-		glm::vec2 TextureCoords;
-	};
-
-    struct SkinedVertex : public Vertex {
+    struct Vertex
+    {
+        glm::vec3 Position;
+        glm::vec3 Normal;
+        glm::vec3 Tangent;
+        glm::vec3 BiNormal;
+        glm::vec2 TextureCoords;
         glm::vec4 BoneIndices;
         glm::vec4 BoneWeights;
     };
 
-	struct TextureProperties {
-		std::string TexturePath;
-		glm::vec2 UVRepeat;
-		std::shared_ptr<::Texture> Texture;	
-	};
-	
-    struct MaterialBasic
+    struct MaterialGroup
     {
         float SpecularExponent;
         float ReflectionFactor;
@@ -63,69 +54,25 @@ public:
         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;
     };
 
-	struct MaterialSplatMapping : public MaterialBasic
-	{
-		TextureProperties SplatMap;
-		std::vector<TextureProperties> ColorMaps;
-		std::vector<TextureProperties> NormalMaps;
-		std::vector<TextureProperties> SpecularMaps;
-		std::vector<TextureProperties> IncandescenceMaps;
-	};
-
-	struct MaterialSingleTextures : public MaterialBasic
-	{
-		TextureProperties ColorMap;
-		TextureProperties NormalMap;
-		TextureProperties SpecularMap;
-		TextureProperties IncandescenceMap;
-	};
-
-	enum class MaterialType { Basic = 1, SplatMapping, SingleTextures };
-
-	struct MaterialProperties {
-		MaterialType type;
-		MaterialBasic* material;
-	};
-
-	const Vertex*	Vertices() const {
-		if (hasSkin) { 
-			return m_SkinedVertices.data(); 
-		} else {
-			return m_Vertices.data();
-		}
-	};
-
-	unsigned int	VertexSize() const {
-		if (hasSkin) {
-			return sizeof(SkinedVertex);
-		}
-		else {
-			return sizeof(Vertex);
-		}
-	};
-
-	unsigned int	NumVertices() const {
-		if (hasSkin) {
-			return m_SkinedVertices.size();
-		} else {
-			return m_Vertices.size();
-		}
-	};
-
-	bool IsSkinned() const { return hasSkin; };
-
-	std::vector<MaterialProperties> m_Materials;
+    std::vector<MaterialGroup> MaterialGroups;
 
+    std::vector<Vertex> m_Vertices;
     std::vector<unsigned int> m_Indices;
     Skeleton* m_Skeleton = nullptr;
     glm::mat4 m_Matrix;
 
 private:
-   	bool hasSkin;
-	std::vector<Vertex> m_Vertices;
-	std::vector<SkinedVertex> m_SkinedVertices;
+   
 
     void ReadMeshFile(std::string filePath);
     void ReadMeshFileHeader(std::size_t& offset, char* fileData);
@@ -136,17 +83,13 @@ private:
     void ReadMaterialFile(std::string filePath);
     void ReadMaterials(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
     void ReadMaterialSingle(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
-	void ReadMaterialBasic(MaterialBasic* Material, std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
-	void ReadMaterialSingleTexture(MaterialSingleTextures* Material, std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
-	void ReadMaterialSplatMapping(MaterialSplatMapping* Material, std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
-	void ReadMaterialTextureProperties(TextureProperties& texture, std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
 
     void ReadAnimationFile(std::string filePath);
     void ReadAnimationBindPoses(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
     void ReadAnimationJoint(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
     void ReadAnimationClips(std::size_t& offset, char* fileData, const unsigned int& fileByteSize, unsigned int numberOfClips);
     void ReadAnimationClipSingle(std::size_t& offset, char* fileData, const unsigned int& fileByteSize, unsigned int clipIndex);
-    void ReadAnimationKeyFrame(std::size_t& offset, char* fileData, const unsigned int& fileByteSize, std::vector<Skeleton::Animation::Keyframe>& animation);
+    void ReadAnimationKeyFrame(std::size_t& offset, char* fileData, const 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);
 };

include/Engine/Rendering/RenderQueue.h

@@ -19,30 +19,22 @@
 struct RenderScene
 {
     ::Camera* Camera = nullptr;
-    struct Queues {
-        std::list<std::shared_ptr<RenderJob>> OpaqueObjects;
-        std::list<std::shared_ptr<RenderJob>> TransparentObjects;
-        std::list<std::shared_ptr<RenderJob>> OpaqueShieldedObjects;
-        std::list<std::shared_ptr<RenderJob>> TransparentShieldedObjects;
-        std::list<std::shared_ptr<RenderJob>> ShieldObjects;
-        std::list<std::shared_ptr<RenderJob>> PointLight;
-        std::list<std::shared_ptr<RenderJob>> Text;
-        std::list<std::shared_ptr<RenderJob>> DirectionalLight;
-    } Jobs;
-
+    std::list<std::shared_ptr<RenderJob>> OpaqueObjects;
+    std::list<std::shared_ptr<RenderJob>> TransparentObjects;
+    std::list<std::shared_ptr<RenderJob>> PointLightJobs;
+    std::list<std::shared_ptr<RenderJob>> TextJobs;
+    std::list<std::shared_ptr<RenderJob>> DirectionalLightJobs;
     Rectangle Viewport;
     bool ClearDepth = false;
     glm::vec4 AmbientColor;
 
 	void Clear()
 	{
-        Jobs.OpaqueObjects.clear();
-        Jobs.TransparentObjects.clear();
-        Jobs.OpaqueShieldedObjects.clear();
-        Jobs.TransparentShieldedObjects.clear();
-        Jobs.ShieldObjects.clear();
-        Jobs.Text.clear();
-        Jobs.DirectionalLight.clear();
+        OpaqueObjects.clear();
+        TransparentObjects.clear();
+        PointLightJobs.clear();
+        TextJobs.clear();
+        DirectionalLightJobs.clear();
 	}
 };
 

include/Engine/Rendering/RenderState.h

@@ -2,7 +2,6 @@
 #define RenderState_h__
 
 #include <functional>
-#include <boost/range/adaptor/reversed.hpp>
 #include "../Common.h"
 #include "../OpenGL.h"
 #include "../GLM.h"
@@ -20,9 +19,6 @@ public:
     bool BindFramebuffer(GLint framebuffer);
     bool BlendEquation(GLenum mode);
     bool BlendFunc(GLenum sfactor, GLenum dfactor);
-    bool StencilOp(GLenum sfail, GLenum dpfail, GLenum dppass);
-    bool StencilFunc(GLenum func, GLint ref, GLuint mask);
-    bool StencilMask(GLuint mask);
     bool DepthMask(GLboolean flag);
 
 private:

include/Engine/Rendering/RenderSystem.h

@@ -16,13 +16,11 @@
 #include "PointLightJob.h"
 #include "../Core/Transform.h"
 #include "../Core/EPlayerSpawned.h"
-#include "../Core/Octree.h"
-#include "../Collision/EntityAABB.h"
 
 class RenderSystem : public ImpureSystem
 {
 public:
-    RenderSystem(World* world, EventBroker* eventBrokerer, const IRenderer* renderer, RenderFrame* renderFrame, Octree<EntityAABB>* frustumCullOctree);
+    RenderSystem(World* world, EventBroker* eventBrokerer, const IRenderer* renderer, RenderFrame* renderFrame);
     ~RenderSystem();
 
     virtual void Update(double dt) override;
@@ -34,7 +32,6 @@ private:
     World* m_World;
     EntityWrapper m_CurrentCamera = EntityWrapper::Invalid;
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
-    Octree<EntityAABB>* m_Octree;
 
     EventRelay<RenderSystem, Events::SetCamera> m_ESetCamera;
     bool OnSetCamera(Events::SetCamera &event);
@@ -43,13 +40,14 @@ private:
     EventRelay<RenderSystem, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
 
-    void fillModels(RenderScene::Queues &jobs);
+    void fillModels(std::list<std::shared_ptr<RenderJob>>& opaqueJobs, std::list<std::shared_ptr<RenderJob>>& transparentJobs);
     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);
     void fillLight(std::list<std::shared_ptr<RenderJob>>& jobs);
     bool isChildOfACamera(EntityWrapper entity);
     bool isChildOfCurrentCamera(EntityWrapper entity);
+
 };
 
 #endif

include/Engine/Rendering/Skeleton.h

@@ -5,7 +5,6 @@
 #include "Common.h"
 #include "../GLM.h"
 #include <glm/gtx/matrix_decompose.hpp>
-#include <imgui/imgui.h>
 
 //struct Bone
 //{
@@ -54,39 +53,22 @@ public:
 		{
 			struct BoneProperty
 			{
-                glm::vec3 Position;
-                glm::quat Rotation;
+				int ID;
+				glm::vec3 Position;
+				glm::quat Rotation;
 				glm::vec3 Scale = glm::vec3(1);
 			};
 
-            int Index = 0;
-            double Time = 0.0;
-            BoneProperty BoneProperties;
+			int Index = 0;
+			double Time = 0.0;
+			std::map<int, Keyframe::BoneProperty> BoneProperties;
 		};
-        std::string Name;
-        double Duration;
-        std::map<int, std::vector<Keyframe>> JointAnimations;
+
+		std::string Name;
+		double Duration;
+		std::vector<Keyframe> Keyframes;
 	};
 
-    struct AnimationData
-    {
-        const Animation* animation;
-        float time;
-        float weight;
-    };
-
-    struct JointFrameTransform {
-        glm::vec3 PositionInterp = glm::vec3(0);
-        glm::quat RotationInterp = glm::quat();
-        glm::vec3 ScaleInterp = glm::vec3(0);
-        float Weight;
-    };
-
-    struct AnimationOffset {
-        const Animation* animation;
-        float time;
-    };
-
 	Skeleton() { }
 	~Skeleton();
 
@@ -100,27 +82,17 @@ public:
 
 	int GetBoneID(std::string name);
 
-    const Animation* GetAnimation(std::string name);
-    std::vector<glm::mat4> GetFrameBones(std::vector<AnimationData> animations, bool noRootMotion = false);
-    std::vector<glm::mat4> GetFrameBones(std::vector<AnimationData> animations, AnimationOffset animationOffset, bool noRootMotion = false);
-
-    //void  AccumulateBoneTransforms(bool noRootMotion, const Animation* animation, float time, std::map<int, glm::mat4>& boneMatrices, const Bone* bone, glm::mat4 parentMatrix);
-    void  AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, std::map<int, glm::mat4>& boneMatrices, const Bone* bone, glm::mat4 parentMatrix);
-    void  AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, AnimationOffset animationOffset, std::map<int, glm::mat4>& boneMatrices, const Bone* bone, glm::mat4 parentMatrix);
-
-    void PrintSkeleton();
+	const Animation* GetAnimation(std::string name);
+	std::vector<glm::mat4> GetFrameBones(const Animation& animation, double time, bool noRootMotion = false);
+	void 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);
+	void PrintSkeleton();
 	void PrintSkeleton(const Bone* parent, int depthCount);
 	std::map<std::string, Animation> Animations;
 
-    glm::mat4 GetBoneTransform(const Bone* bone, const Animation* animation, float time, glm::mat4 childMatrix);
-    int GetKeyframe(const Animation& animation, double time);
-
 private:
-
-    glm::mat4 GetOffsetTransform(const Bone* bone, AnimationOffset animationOffset);
-
 	std::map<std::string, Bone*> m_BonesByName;
-    float aim = 0.f;
+
+	int GetKeyframe(const Animation& animation, double time);
 };
 
 #endif

include/Engine/Sound/EPlayQueueOnEntity.h

@@ -1,18 +0,0 @@
-#ifndef Events_PlayQueueOnEntity_h__
-#define Events_PlayQueueOnEntity_h__
-
-#include "../Core/Event.h"
-#include "../Core/EntityWrapper.h"
-
-namespace Events
-{
-
-struct PlayQueueOnEntity : public Event
-{
-    EntityWrapper Emitter;
-    std::vector<std::string> FilePaths;
-};
-
-}
-
-#endif

include/Engine/Sound/Sound.h

@@ -1,9 +1,6 @@
 #ifndef Sound_h__
 #define Sound_h__
 
-#include <OpenAL/al.h>
-#include <OpenAL/alc.h>
-
 #include "Core/ResourceManager.h"
 
 class Sound : public Resource

include/Engine/Sound/SoundSystem.h

@@ -1,23 +1,17 @@
-#ifndef SoundManager_h__
-#define SoundManager_h__
+#ifndef SoundSystem_h__
+#define SoundSystem_h__
 
 #include <unordered_map>
-#include <random>
 
 #include "glm/common.hpp"
 #include "glm/gtx/rotate_vector.hpp" // Calculate Up vector
 #include "OpenAL/al.h"
 #include "OpenAL/alc.h"
 
-#include "imgui/imgui.h"
-
 #include "Core/World.h"
 #include "Core/EventBroker.h"
-#include "../Engine/Core/ResourceManager.h"
-#include "../Engine/Core/ConfigFile.h"
 #include "Core/Transform.h" // Absolute transform
 #include "Sound/Sound.h"
-#include "../Engine/Sound/EPlayQueueOnEntity.h"
 #include "Sound/EPlaySoundOnEntity.h"
 #include "Sound/EPlaySoundOnPosition.h"
 #include "Sound/EPlayBackgroundMusic.h"
@@ -26,11 +20,6 @@
 #include "Sound/EStopSound.h"
 #include "Sound/ESetBGMGain.h"
 #include "Sound/ESetSFXGain.h"
-#include "Core/EPause.h"
-#include "Core/EComponentAttached.h"
-#include "../Core/EPlayerSpawned.h"
-
-typedef std::pair<ALuint, std::vector<ALuint>> QueuedBuffers;
 
 enum class SoundType {
     SFX,
@@ -45,15 +34,14 @@ struct Source
     SoundType Type;
 };
 
-class SoundManager
+class SoundSystem
 {
 public:
-    SoundManager() { }
-    SoundManager(World* world, EventBroker* eventBroker);
-    ~SoundManager();
+    SoundSystem() { }
+    SoundSystem(World* world, EventBroker* eventBroker, bool editorMode);
+    ~SoundSystem();
     // Update emitters / listener
     void Update(double dt); 
-
 private:
     // Help functions for working with OpenaAL
     void setListenerPos(glm::vec3 pos) { alListener3f(AL_POSITION, pos.x, pos.y, pos.z); };
@@ -68,62 +56,46 @@ private:
     // Logic 
     void initOpenAL();
     void updateEmitters(double dt);
-    void deleteInactiveEmitters();
-    void stopEmitters();
     void updateListener(double dt);
+    void deleteInactiveEmitters();
+    void addNewEmitters(double dt);
+    Source* createSource(std::string filePath);
+    void playSound(Source* source);
+    void stopSound(Source* source);
+    void stopEmitters();
     ALenum getSourceState(ALuint source);
     void setGain(Source* source, float gain);
-    void setSoundProperties(Source* source, ComponentWrapper* soundComponent);
-
-    // Specific logic
-    void playSound(Source* source);
-    // Need to be the same format (sample rate etc)
-    void playQueue(QueuedBuffers qb);
-    void stopSound(Source* source);
-    Source* createSource(std::string filePath);
-    std::unordered_map<EntityID, Source*> m_Sources;
-
-    // Logic
-    World* m_World = nullptr;
-    EventBroker* m_EventBroker = nullptr;
+    void setSoundProperties(ALuint source, ComponentWrapper* soundComponent);
 
     // OpenAL system variables
     ALCdevice* m_ALCdevice = nullptr;
     ALCcontext* m_ALCcontext = nullptr;
 
+    // Logic
+    World* m_World = nullptr;
+    EventBroker* m_EventBroker = nullptr;
+    std::unordered_map<EntityID, Source*> m_Sources;
     float m_BGMVolumeChannel = 1.0f;
-    float m_SFXVolumeChannel = 1.0f;
-    EntityWrapper m_LocalPlayer = EntityWrapper();
-    
+    float m_SFXVolumeChannel = 1.f;
+    bool m_EditorEnabled = false;
+
     // Events
-    EventRelay<SoundManager, Events::PlaySoundOnEntity> m_EPlaySoundOnEntity;
+    EventRelay<SoundSystem, Events::PlaySoundOnEntity> m_EPlaySoundOnEntity;
     bool OnPlaySoundOnEntity(const Events::PlaySoundOnEntity &e);
-    EventRelay<SoundManager, Events::PlaySoundOnPosition> m_EPlaySoundOnPosition;
+    EventRelay<SoundSystem, Events::PlaySoundOnPosition> m_EPlaySoundOnPosition;
     bool OnPlaySoundOnPosition(const Events::PlaySoundOnPosition &e);
-    EventRelay<SoundManager, Events::PlayBackgroundMusic> m_EPlayBackgroundMusic;
+    EventRelay<SoundSystem, Events::PlayBackgroundMusic> m_EPlayBackgroundMusic;
     bool OnPlayBackgroundMusic(const Events::PlayBackgroundMusic &e);
-    EventRelay<SoundManager, Events::PauseSound> m_EPauseSound;
+    EventRelay<SoundSystem, Events::PauseSound> m_EPauseSound;
     bool OnPauseSound(const Events::PauseSound &e);
-    EventRelay<SoundManager, Events::StopSound> m_EStopSound;
+    EventRelay<SoundSystem, Events::StopSound> m_EStopSound;
     bool OnStopSound(const Events::StopSound &e);
-    EventRelay<SoundManager, Events::ContinueSound> m_EContinueSound;
+    EventRelay<SoundSystem, Events::ContinueSound> m_EContinueSound;
     bool OnContinueSound(const Events::ContinueSound &e);
-    EventRelay<SoundManager, Events::SetBGMGain> m_ESetBGMGain; 
-    bool OnSetBGMGain(const Events::SetBGMGain &e);
-    EventRelay<SoundManager, Events::SetSFXGain> m_ESetSFXGain; 
-    bool OnSetSFXGain(const Events::SetSFXGain &e);
-    EventRelay<SoundManager, Events::ComponentAttached> m_EComponentAttached;
-    bool OnComponentAttached(const Events::ComponentAttached &e);
-    EventRelay<SoundManager, Events::Pause> m_EPause;
-    bool OnPause(const Events::Pause &e);
-    EventRelay<SoundManager, Events::Resume> m_EResume;
-    bool OnResume(const Events::Resume &e);
-    EventRelay<SoundManager, Events::PlayerSpawned> m_EPlayerSpawned;
-    bool OnPlayerSpawned(const Events::PlayerSpawned &e);
-    EventRelay<SoundManager, Events::PlayQueueOnEntity> m_EPlayQueueOnEntity;
-    bool OnPlayQueueOnEntity(const Events::PlayQueueOnEntity &e);
-
-
+    EventRelay<SoundSystem, Events::SetBGMGain> m_ESetBGMGain; 
+    bool OnSetBGMGain(const Events::SetBGMGain &e); // Not tested
+    EventRelay<SoundSystem, Events::SetSFXGain> m_ESetSFXGain; 
+    bool OnSetSFXGain(const Events::SetSFXGain &e); // Not tested
 };
 
 #endif

include/Game/Events/EDashAbility.h

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

include/Game/Events/EDoubleJump.h

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

include/Game/Game.h

@@ -30,8 +30,7 @@
 #include "Network/Client.h"
 
 // Sound
-#include "Sound/SoundManager.h"
-#include "Systems/SoundSystem.h"
+#include "Sound/SoundSystem.h"
 
 class Game
 {
@@ -65,7 +64,7 @@ private:
     bool m_IsClientOrServer = false;
 
     // Sound
-    SoundManager* m_SoundManager;
+    SoundSystem* m_SoundSystem;
 
     //EventRelay<Game, Events::InputCommand> m_EInputCommand;
     //bool debugOnInputCommand(const Events::InputCommand& e);

include/Game/Systems/HealthSystem.h

@@ -12,7 +12,6 @@
 
 #include <tuple>
 #include <vector>
-#include <algorithm>
 
 class HealthSystem : public PureSystem
 {
@@ -27,7 +26,7 @@ private:
     EventRelay<HealthSystem, Events::PlayerDamage> m_EPlayerDamage;
     bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e);
     EventRelay<HealthSystem, Events::PlayerHealthPickup> m_EPlayerHealthPickup;
-    bool HealthSystem::OnPlayerHealthPickup(Events::PlayerHealthPickup& e);
+    bool HealthSystem::OnPlayerHealthPickup(const Events::PlayerHealthPickup& e);
 
     //vector which will keep track of health changes
     std::vector<std::tuple<EntityID, double>> m_DeltaHealthVector;

include/Game/Systems/LifetimeSystem.h

@@ -9,9 +9,7 @@ public:
     LifetimeSystem(World* world, EventBroker* eventBroker)
         : System(world, eventBroker)
         , PureSystem("Lifetime")
-    {
-        LOG_INFO("ASDASDASSA");
-    }
+    { }
 
     virtual void Update(double dt) override;
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cLifetime, double dt) override;

include/Game/Systems/PickupSpawnSystem.h

@@ -1,33 +0,0 @@
-#ifndef PickupSpawnSystem_h__
-#define PickupSpawnSystem_h__
-
-#include "Core/System.h"
-#include "Core/Transform.h"
-#include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
-#include "Core/EPickupSpawned.h"
-#include "Core/EPlayerHealthPickup.h"
-#include "Engine/Collision/ETrigger.h"
-#include "Common.h"
-#include <tuple>
-
-class PickupSpawnSystem : public ImpureSystem
-{
-public:
-    PickupSpawnSystem(World* world, EventBroker* eventBroker);
-
-    virtual void Update(double dt) override;
-
-private:
-    EventRelay<PickupSpawnSystem, Events::TriggerTouch> m_ETriggerTouch;
-    bool OnTriggerTouch(Events::TriggerTouch& e);
-
-    struct NewHealthPickup {
-        glm::vec3 Pos;
-        double HealthGain;
-        double RespawnTimer;
-        double DecreaseThisRespawnTimer;
-    };
-    std::vector<NewHealthPickup> m_ETriggerTouchVector;
-};
-#endif

include/Game/Systems/PlayerDeathSystem.h

@@ -1,29 +0,0 @@
-#ifndef PlayerDeathSystem_h__
-#define PlayerDeathSystem_h__
-
-#include "Core/System.h"
-#include "Input/EInputCommand.h"
-#include "GLM.h"
-#include "Rendering/ESetCamera.h"
-#include "Core/ConfigFile.h"
-
-#include "Core/EntityFile.h"
-#include "Core/EntityFileParser.h"
-
-#include "Core/EPlayerDeath.h"
-
-class PlayerDeathSystem : public ImpureSystem
-{
-public:
-    PlayerDeathSystem(World* world, EventBroker* eventBroker);
-
-    virtual void Update(double dt) override;
-
-private:
-    EventRelay<PlayerDeathSystem, Events::PlayerDeath> m_OnPlayerDeath;
-    bool OnPlayerDeath(Events::PlayerDeath& e);
-
-    void createDeathEffect(EntityWrapper player);
-
-};
-#endif

include/Game/Systems/PlayerMovementSystem.h

@@ -4,8 +4,6 @@
 #include "Core/EPlayerSpawned.h"
 #include "Input/FirstPersonInputController.h"
 #include <imgui/imgui.h>
-#include "Events/EDoubleJump.h"
-#include "../Engine/Sound/EPlaySoundOnEntity.h"
 
 class PlayerMovementSystem : public ImpureSystem, PureSystem
 {
@@ -20,20 +18,6 @@ private:
     // State
     std::unordered_map<EntityWrapper, FirstPersonInputController<PlayerMovementSystem>*> m_PlayerInputControllers;
 
-    EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
-    // Walking logic
-    // Keeps track of how far the player has walked within this "key press session".
-    float m_DistanceMoved = 0.0f;
-    // How far a step is (How often the step sound will be played).
-    const float m_PlayerStepLength = 1.75f;
-    // Determine what sound file to play.
-    bool m_LeftFoot = false;
-    // To get a difference when calculating the walking state.
-    glm::vec3 m_LastPosition = glm::vec3();
-    // The logic for making the sound play when player is moving
-    void playerStep(double dt);
-
     EventRelay<PlayerMovementSystem, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
-
 };

include/Game/Systems/PlayerSpawnSystem.h

@@ -3,7 +3,6 @@
 #include "Systems/SpawnerSystem.h"
 #include "Events/ESpawnerSpawn.h"
 #include "Core/EPlayerSpawned.h"
-#include "Core/EPlayerDeath.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
 

include/Game/Systems/SoundSystem.h

@@ -1,71 +0,0 @@
-#ifndef Systems_SoundSystem_h__
-#define Systems_SoundSystem_h__
-
-#include <random>
-
-#include "../Engine/Core/System.h"
-#include "../Engine/Core/ResourceManager.h"
-#include "../Engine/Core/ConfigFile.h"
-#include "../Engine/Sound/Sound.h"
-#include "../Engine/Sound/EPlayQueueOnEntity.h"
-#include "../Engine/Core/EPlayerSpawned.h"
-#include "../Engine/Input/EInputCommand.h"
-#include "../Engine/Core/EShoot.h"
-#include "../Engine/Core/EPlayerSpawned.h"
-#include "../Engine/Input/EInputCommand.h"
-#include "../Engine/Core/ECaptured.h"
-#include "../Engine/Core/EPlayerDamage.h"
-#include "../Engine/Core/EPlayerDeath.h"
-#include "../Engine/Core/EPlayerHealthPickup.h"
-#include "../Engine/Collision/ETrigger.h"
-#include "../Engine/Sound/EPlaySoundOnEntity.h"
-#include "../Engine/Sound/EPlayBackgroundMusic.h"
-#include "../Game/Events/EDoubleJump.h"
-#include "../Game/Events/EDashAbility.h"
-
-
-class SoundSystem : public PureSystem, ImpureSystem
-{
-public:
-    SoundSystem(World* world, EventBroker* eventbroker);
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cComponent, double dt) override;
-    virtual void Update(double dt) override;
-private:
-    EntityWrapper m_LocalPlayer = EntityWrapper();
-
-    World* m_World = nullptr;
-    EventBroker* m_EventBroker = nullptr;
-    std::string m_Announcer = "";
-    // Logic for playing a sound when a player jumps
-    void playerJumps();
-    
-    // Temporary solution for play test.
-    bool m_DrumsIsPlaying = false;
-    double m_DrumTimer = 0.0;
-    bool drumTimer(double dt);
-
-    std::default_random_engine generator;
-
-    EventRelay<SoundSystem, Events::PlayerSpawned> m_EPlayerSpawned;
-    bool OnPlayerSpawned(const Events::PlayerSpawned &e);
-    EventRelay<SoundSystem, Events::InputCommand> m_InputCommand;
-    bool OnInputCommand(const Events::InputCommand &e);
-    EventRelay<SoundSystem, Events::DoubleJump> m_EDoubleJump;
-    bool OnDoubleJump(const Events::DoubleJump &e);
-    EventRelay<SoundSystem, Events::DashAbility> m_EDashAbility;
-    bool OnDashAbility(const Events::DashAbility &e);
-    EventRelay<SoundSystem, Events::TriggerTouch> m_ETriggerTouch;
-    bool OnTriggerTouch(const Events::TriggerTouch &e);
-    EventRelay<SoundSystem, Events::Shoot> m_EShoot;
-    bool OnShoot(const Events::Shoot &e);
-    EventRelay<SoundSystem, Events::Captured> m_ECaptured;
-    bool OnCaptured(const Events::Captured &e);
-    EventRelay<SoundSystem, Events::PlayerDamage> m_EPlayerDamage;
-    bool OnPlayerDamage(const Events::PlayerDamage &e);
-    EventRelay<SoundSystem, Events::PlayerDeath> m_EPlayerDeath;
-    bool OnPlayerDeath(const Events::PlayerDeath &e);
-    EventRelay<SoundSystem, Events::PlayerHealthPickup> m_EPlayerHealthPickup;
-    bool OnPlayerHealthPickup(const Events::PlayerHealthPickup &e);
-};
-
-#endif

resources/DefaultConfig.ini

@@ -29,8 +29,3 @@ TimeoutMs=15000
 
 [Multithreading]
 ResourceLoading=true
-
-[Sound]
-BGMVolume=1.0
-SFXVolume=1.0
-Announcer=female

resources/DefaultInput.ini

@@ -13,8 +13,7 @@ A=Right,-1
 R=Reload
 Space=Jump
 LeftControl=Crouch
-RightShift=Sprint
-LeftShift=SpecialAbility
+LeftShift=Sprint
 F1=ToggleEditor
 C=ConnectToServer
 N=SwitchToServer

resources/Schema/Components.xsd

@@ -28,12 +28,6 @@
 	<xs:include schemaLocation="Components/HealthHUD.xsd"/>
 	<xs:include schemaLocation="Components/Animation.xsd"/>
 	<xs:include schemaLocation="Components/Fill.xsd"/>
-	<xs:include schemaLocation="Components/BoneAttachment.xsd"/>
 	<xs:include schemaLocation="Components/Lifetime.xsd"/>
 	<xs:include schemaLocation="Components/HiddenForLocalPlayer.xsd"/>
-	<xs:include schemaLocation="Components/HealthPickup.xsd"/>
-	<xs:include schemaLocation="Components/AnimationOffset.xsd"/>
-	<xs:include schemaLocation="Components/DashAbility.xsd"/>
-	<xs:include schemaLocation="Components/Shield.xsd"/>
-	<xs:include schemaLocation="Components/Shielded.xsd"/>
 </xs:schema>

resources/Schema/Components/AABB.xsd

@@ -7,10 +7,10 @@
 		<xs:complexType>
 			<xs:all>
 				<xs:element name="Origin" type="t:Vector" minOccurs="0">
-					<xs:annotation><xs:documentation>Middle point of the bounding box, in model space</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>Middle point of the bounding box</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="Size" type="t:Vector" minOccurs="0">
-					<xs:annotation><xs:documentation>Size of the bounding box, in model space</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>Size of the bounding box</xs:documentation></xs:annotation>
 				</xs:element>
 			</xs:all>
 		</xs:complexType>

resources/Schema/Components/Animation.xml

@@ -1,18 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Animation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Animation.xsd">
-	<AnimationName1></AnimationName1>
-	<Weight1>1.0</Weight1>
-	<Time1>0</Time1>
-	<Speed1>0</Speed1>
-	<Loop1>true</Loop1>
-	<AnimationName2></AnimationName2>
-	<Weight2>1.0</Weight2>
-	<Time2>0</Time2>
-	<Speed2>0</Speed2>
-	<Loop2>true</Loop2>
-	<AnimationName3></AnimationName3>
-	<Weight3>1.0</Weight3>
-	<Time3>0</Time3>
-	<Speed3>0</Speed3>
-	<Loop3>true</Loop3>
+	<Name></Name>
+	<Time>0</Time>
+	<Speed>0</Speed>
+	<Loop>true</Loop>
 </Animation>

resources/Schema/Components/Animation.xsd

@@ -6,21 +6,10 @@
 	<xs:element name="Animation">
 		<xs:complexType>
 			<xs:all>
-				<xs:element name="AnimationName1" type="t:string" minOccurs="0"/>
-				<xs:element name="Weight1" type="t:double" minOccurs="0"/>
-				<xs:element name="Time1" type="t:double" minOccurs="0"/>
-				<xs:element name="Speed1" type="t:double" minOccurs="0"/>
-				<xs:element name="Loop1" type="t:bool" minOccurs="0"/>
-				<xs:element name="AnimationName2" type="t:string" minOccurs="0"/>
-				<xs:element name="Weight2" type="t:double" minOccurs="0"/>
-				<xs:element name="Time2" type="t:double" minOccurs="0"/>
-				<xs:element name="Speed2" type="t:double" minOccurs="0"/>
-				<xs:element name="Loop2" type="t:bool" minOccurs="0"/>
-				<xs:element name="AnimationName3" type="t:string" minOccurs="0"/>
-				<xs:element name="Weight3" type="t:double" minOccurs="0"/>
-				<xs:element name="Time3" type="t:double" minOccurs="0"/>
-				<xs:element name="Speed3" type="t:double" minOccurs="0"/>
-				<xs:element name="Loop3" type="t:bool" minOccurs="0"/>
+				<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>

resources/Schema/Components/AnimationOffset.xml

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

resources/Schema/Components/AnimationOffset.xsd

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="AnimationOffset">
-	<xs:annotation>
-		<xs:documentation>Aim animation offset for the skeleton</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="AnimationName" type="t:string" minOccurs="0"/>
-				<xs:element name="Time" type="t:double" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/BoneAttachment.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<BoneAttachment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BoneAttachment.xsd">
-	<BoneName></BoneName>
-	<PositionOffset X="0" Y="0" Z="0"/>
-	<OrientationOffset X="0" Y="0" Z="0"/>
-	<ScaleOffset X="1" Y="1" Z="1"/>
-	<InheritPosition>true</InheritPosition>
-	<InheritOrientation>true</InheritOrientation>
-	<InheritScale>false</InheritScale>
-</BoneAttachment>

resources/Schema/Components/BoneAttachment.xsd

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="BoneAttachment">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="BoneName" type="t:string" minOccurs="0"/>
-				<xs:element name="PositionOffset" type="t:Vector" minOccurs="0"/>
-				<xs:element name="InheritPosition" type="t:bool" minOccurs="0"/>
-				<xs:element name="OrientationOffset" type="t:Vector" minOccurs="0"/>
-				<xs:element name="InheritOrientation" type="t:bool" minOccurs="0"/>
-				<xs:element name="ScaleOffset" type="t:Vector" minOccurs="0"/>
-				<xs:element name="InheritScale" type="t:bool" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Collidable.xsd

@@ -4,8 +4,5 @@
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
 
 	<xs:element name="Collidable">
-		<xs:annotation>
-			<xs:documentation>Needs a Model or AABB component to work, uses AABB if both are attached.</xs:documentation>
-		</xs:annotation>
 	</xs:element>
 </xs:schema>

resources/Schema/Components/DashAbility.xml

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

resources/Schema/Components/DashAbility.xsd

@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="DashAbility">
-		<xs:annotation>
-			<xs:documentation>A dash component for one of the classes</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="CoolDownMaxTimer" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>This is the cooldown on dash</xs:documentation></xs:annotation>
-				</xs:element>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/HealthPickup.xml

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

resources/Schema/Components/HealthPickup.xsd

@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="HealthPickup">
-		<xs:annotation>
-			<xs:documentation>A Health Pickup</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="RespawnTimer" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>The respawn timer for a health pickup</xs:documentation></xs:annotation>
-				</xs:element>			
-				<xs:element name="HealthGain" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>How much percent max-health the player will get when he picks the healthPickup up</xs:documentation></xs:annotation>
-				</xs:element>			
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Physics.xml

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

resources/Schema/Components/Physics.xsd

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

resources/Schema/Components/Shield.xml

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

resources/Schema/Components/Shield.xsd

@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="Shield">
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Shielded.xml

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

resources/Schema/Components/Shielded.xsd

@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="Shielded">
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Trigger.xsd

@@ -4,8 +4,5 @@
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
 
 	<xs:element name="Trigger">
-		<xs:annotation>
-			<xs:documentation>Needs a Model or AABB component to work, uses AABB if both are attached.</xs:documentation>
-		</xs:annotation>
 	</xs:element>
 </xs:schema>

resources/Schema/Entities/AnimatedArmy.xml

@@ -91,7 +91,7 @@
           <Axis X="0" Y="5" Z="0"/>
         </c:RaptorCopter>
         <c:Transform>
-          <Orientation X="117.03714" Y="3077.6958" Z="3.03297734"/>
+          <Orientation X="117.03714" Y="3023.50244" Z="3.03297734"/>
         </c:Transform>
       </Components>
       <Children>
@@ -154,7 +154,7 @@
         </c:RaptorCopter>
         <c:Transform>
           <Position X="0" Y="-0.100000001" Z="0"/>
-          <Orientation X="0" Y="209.88414" Z="0"/>
+          <Orientation X="0" Y="191.457993" Z="0"/>
         </c:Transform>
       </Components>
       <Children>

resources/Schema/Entities/AnimationTests.xml

@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="AnimationTests" 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:Model>
-          <Resource>Models/Core/UnitPlane.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="-1.245" Z="0"/>
-          <Scale X="10" Y="10" Z="10"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:DirectionalLight/>
-        <c:Model>
-          <Resource>Models/DirectionalLightWidget.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="2.42800021" Z="-2.80000019"/>
-          <Orientation X="5.51900005" Y="3.65100026" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Animation>
-          <AnimationName>Crouch</AnimationName>
-          <Time>1.2451274133223826</Time>
-          <Speed>1</Speed>
-        </c:Animation>
-        <c:Model>
-          <Resource>Models/Asstest.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="-1.245" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="R_Leg_Top">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Leg_Top</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.0718467757" Y="0.479806602" Z="0.0548748523"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="-0.431370437" Y="0.850169301" Z="-2.42601299"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="R_Leg_Bottom">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Leg_Bottom</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.39332974" Y="0.324809998" Z="-0.0288445484"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="1.18491673" Y="1.0242362" Z="-2.26206946"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="R_Foot">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Foot</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.305837631" Y="0.0361253619" Z="0.179315761"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="3.10044129e-07" Y="1.09664524" Z="-3.13675666"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="L_Foot">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>L_Foot</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="-0.186916605" Y="0.0361250937" Z="-0.136036098"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="3.14159131" Y="-7.15255737e-07" Z="3.14159274"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="L_Leg_Bottom">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>L_Leg_Bottom</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="-0.124794818" Y="0.343560517" Z="-0.32563746"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="-2.66533947" Y="-0.187336028" Z="2.93550467"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="L_Leg_Top">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>L_Leg_Top</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="-0.0666294992" Y="0.471828938" Z="0.0128124626"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="1.98675263" Y="0.0233680122" Z="2.87409353"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Hip">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>Hip</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.00469498895" Y="0.512485623" Z="0.0200203825"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="-3.03470659" Y="0.36588186" Z="-3.0760417"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Spine_1">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>Spine_1</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.00108358753" Y="0.645309925" Z="0.00671719108"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="-2.23578" Y="1.12130237" Z="-2.36199307"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Spine_2">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>Spine_2</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.0091821691" Y="0.768297315" Z="-0.0377721936"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="-1.92300212" Y="1.0594666" Z="-2.269871"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Spine_3">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>Spine_3</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.0091821691" Y="0.768297315" Z="-0.0377721936"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="-1.92300212" Y="1.0594666" Z="-2.269871"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="R_Leg_Top">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>Neck</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.0257265922" Y="0.835334301" Z="-0.0725377947"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="-2.67842054" Y="0.0451255701" Z="2.97098374"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="R_Shoulder">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Shoulder</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.0091821691" Y="0.768297315" Z="-0.0377721936"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="-1.92300212" Y="1.0594666" Z="-2.269871"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="R_Arm">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.080665715" Y="0.757790864" Z="0.0217154976"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="-0.990312934" Y="0.329345405" Z="-0.0508526377"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="R_Elbow">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Elbow</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="-0.160035357" Y="0.843445063" Z="0.00654693879"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="-1.90130699" Y="-0.773362398" Z="1.06810308"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="R_Hand">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Hand</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="-0.238011926" Y="0.711740375" Z="-0.115170464"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="-0.845395327" Y="0.765393734" Z="-0.237622365"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Chin">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>Chin</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.0430049673" Y="0.916874766" Z="-0.143034652"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="-2.96715546" Y="0.0551578514" Z="2.99139857"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="L_Hand">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>L_Hand</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.0662894994" Y="0.739402592" Z="-0.459511727"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="-3.1153264" Y="-0.248137668" Z="-0.829112232"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="L_Elbow">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>L_Elbow</BoneName>
-              <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-            </c:BoneAttachment>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="1" B="1" G="19.6078434" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="-0.0279197786" Y="0.648010612" Z="-0.314551264"/>
-              <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-              <Orientation X="0.325028092" Y="1.40154743" Z="1.88795435"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/AnimationTests2.xml

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="AnimationTests" 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:Transform>
-          <Position X="-0.100000001" Y="-1.11500001" Z="-3.10500026"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:DirectionalLight/>
-            <c:Model>
-              <Resource>Models/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="2.42800021" Z="-2.80000019"/>
-              <Orientation X="5.40800047" Y="3.65100026" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Wave">
-          <Components>
-            <c:Animation>
-              <AnimationName1>Run</AnimationName1>
-              <Weight1>0.5</Weight1>
-              <Time1>0.23980116887997371</Time1>
-              <Speed1>1</Speed1>
-              <Speed2>1</Speed2>
-              <AnimationName2>StrafeRight</AnimationName2>
-              <Weight2>0.5</Weight2>
-              <Time2>0.42593105566437428</Time2>
-              <AnimationName3>ReloadSwitch</AnimationName3>
-              <Time3>0.68855715986371058</Time3>
-              <Speed3>1</Speed3>
-            </c:Animation>
-            <c:AnimationOffset>
-              <AnimationName>AimRifle</AnimationName>
-            </c:AnimationOffset>
-            <c:Model>
-              <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
-              <Color A="1" B="0.984313726" G="1" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="-0.690088332" Y="0" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:PointLight>
-              <Radius>10</Radius>
-            </c:PointLight>
-            <c:Transform>
-              <Position X="0" Y="1.0823108" Z="0.738871336"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitPlane.mesh</Resource>
-            </c:Model>
-            <c:Transform>
-              <Scale X="10" Y="1" Z="10"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/BoneMarker

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="R_Leg_Top" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:BoneAttachment>
-      <BoneName>R_Leg_Top</BoneName>
-      <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-    </c:BoneAttachment>
-    <c:Model>
-      <Resource>Models/Core/UnitCube.mesh</Resource>
-      <Color A="1" B="1" G="19.6078434" R="1"/>
-    </c:Model>
-    <c:Transform>
-      <Position X="0.0664939061" Y="0.714353919" Z="0.0475388765"/>
-      <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-      <Orientation X="-0.783109188" Y="-0.0050998251" Z="3.14151597"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/CollisionSpawnTest.xml

@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>../assets/Models/Test/ObstacleCourse.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0" Z="0.00638055196"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:DirectionalLight>
-          <Intensity>0.46000027656555176</Intensity>
-        </c:DirectionalLight>
-        <c:Transform>
-          <Orientation X="0" Y="2.59000015" Z="0.799000025"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="-1.52309108" Y="5.72108126" Z="0"/>
-          <Scale X="5" Y="5" Z="5"/>
-        </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="1" Y="1.60000002" Z="1"/>
-        </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="-1.20000005" Y="1.60000002" Z="-8.40000057"/>
-        </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/CollisionTestLevel.xml

@@ -1,67 +1,122 @@
-<?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">
+<?xml version="1.0" encoding="UTF-8"?>
 
-  <Components>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>../assets/Models/Test/ObstacleCourse.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0" Z="0.00638055196"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:DirectionalLight>
-          <Intensity>0.46000027656555176</Intensity>
-        </c:DirectionalLight>
-        <c:Transform>
-          <Orientation X="0" Y="2.59000015" Z="0.799000025"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
-        </c:Model>
-        <c:Physics>
-          <Gravity>false</Gravity>
-        </c:Physics>
-        <c:Player/>
-        <c:Transform>
-          <Position X="-8.80904388" Y="1.82786822" Z="7.97052002"/>
-          <Scale X="0.100000001" Y="1" Z="0.100000001"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>../assets/Models/Core/colorbox.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="-1.52309108" Y="5.72108126" Z="0"/>
-          <Scale X="5" Y="5" Z="5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>
+<Entity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd" xmlns:c="components">
+	<Components>
+		<c:Transform>
+			<Orientation X="0" Y="0" Z="0"/>
+		</c:Transform>
+		<c:Model>
+			<Resource>Models/Test/DummyScene.mesh</Resource>
+		</c:Model>
+	</Components>
+	<Children>
+		<Entity>
+			<Components>
+				<c:Transform>
+					<Position X="-1.5"/>
+					<Scale X="1" Y="1" Z="1"/>
+				</c:Transform>
+				<c:Model>
+					<Resource>Models/Core/UnitSphere.mesh</Resource>
+				</c:Model>
+			</Components>
+		</Entity>
+		<Entity>
+			<Components>
+				<c:Transform>
+					<Position X="1.5"/>
+					<Scale X="2" Y="2" Z="2"/>
+				</c:Transform>
+				<c:Model>
+					<Resource>Models/Widgets/Rotate/RotationWidgetX.mesh</Resource>
+				</c:Model>
+				<c:Trigger>
+				</c:Trigger>
+			</Components>
+		</Entity>
+		<Entity>
+			<Components>
+				<c:Player>
+					<Velocity X="0" Y="0" Z="0"/>
+				</c:Player>
+				<c:Transform>
+					<Position X="2.5"/>
+				</c:Transform>
+				<c:Model>
+					<Resource>Models/Core/UnitCube.mesh</Resource>
+				</c:Model>
+				<c:AABB>
+				</c:AABB>
+			</Components>
+		</Entity>
+		<Entity>
+			<Components>
+				<c:Transform>
+					<Position X="0" Y="-0"/>
+					<Scale X="1" Y="1" Z="1"/>
+				</c:Transform>
+				<!--<c:Move>
+					<Speed>1</Speed>
+					<Direction X="-1"/>
+					<Rotation Y="3.14"/>
+				</c:Move>-->
+			</Components>
+			<Children>
+				<Entity>
+					<Components>
+						<c:Transform>
+							<Position X="0" Y="0"/>
+							<Orientation X="0.0" Y="0" Z="1.0"/>
+						</c:Transform>
+						<c:Model>
+							<Resource>Models/Core/UnitRaptor.mesh</Resource>
+							<Color R="1" G="0.4" B="0.8"/>
+						</c:Model>
+					</Components>
+					<Children>
+						<Entity>
+							<Components>
+								<c:Transform>
+									<Position X="-0.01" Y="0.55"/>
+									<Orientation X="0" Y="0" Z="-1"/>
+								</c:Transform>
+								<c:RaptorCopter>
+									<Speed>20</Speed>
+									<Axis Y="1"/>
+								</c:RaptorCopter>
+							</Components>
+							<Children>
+								<Entity>
+									<Components>
+										<c:Transform>
+											<Position X="0" Y="0"/>
+											<Scale X="1.7" Y="0.03" Z="0.1"/>
+											<Orientation X="0" Y="0" Z="0"/>
+										</c:Transform>
+										<c:Model>
+											<Resource>Models/Core/UnitCube.mesh</Resource>
+											<Color R="1" G="0.4" B="0.8"/>
+										</c:Model>
+									</Components>
+								</Entity>
+								<Entity>
+									<Components>
+										<c:Transform>
+											<Position X="0" Y="0"/>
+											<Scale X="1.7" Y="0.03" Z="0.1"/>
+											<Orientation X="0" Y="1.57" Z="0"/>
+										</c:Transform>
+										<c:Model>
+											<Resource>Models/Core/UnitCube.mesh</Resource>
+											<Color R="1" G="0.4" B="0.8"/>
+										</c:Model>
+									</Components>
+								</Entity>
+							</Children>
+						</Entity>
+					</Children>
+				</Entity>
+			</Children>
+		</Entity>
+	</Children>
+</Entity>

resources/Schema/Entities/FastWorld.xml

@@ -3,7 +3,7 @@
 
   <Components>
     <c:Transform>
-      <Position X="2.5629313" Y="-1.99438679" Z="0"/>
+      <Position X="0" Y="-0.00432979874" Z="0"/>
     </c:Transform>
   </Components>
 
@@ -18,17 +18,23 @@
           <Axis X="1.50000012" Y="-2.20000005" Z="2.10000014"/>
         </c:RaptorCopter>
         <c:Transform>
-          <Position X="0.00367118185" Y="0" Z="0.200000003"/>
+          <Position X="0" Y="2.87819886" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
         <Entity>
           <Components>
             <c:Animation>
-              <AnimationName>Crouch Walk</AnimationName>
-              <Time>0.64462505387501778</Time>
-              <Speed>8</Speed>
+              <Name>Run</Name>
+              <Time>0.56277947897317659</Time>
+              <Speed>1</Speed>
             </c:Animation>
+            <c:ExplosionEffect>
+              <Velocity X="0" Y="1.10000002" Z="3.30000019"/>
+              <ExplosionOrigin X="-0.600000024" Y="1" Z="0"/>
+              <TimeSinceDeath>0.95625903442123672</TimeSinceDeath>
+              <EndColor A="0" B="0.815686285" G="1" R="0"/>
+            </c:ExplosionEffect>
             <c:Model>
               <Resource>Models/AssaultAnimated.mesh</Resource>
               <Color A="1" B="392156.875" G="1" R="1"/>

resources/Schema/Entities/GameMap.xml

@@ -8,11 +8,6 @@
   <Children>
     <Entity name="Scenemesh">
       <Components>
-        <c:AABB>
-          <Origin X="0.195705414" Y="26.0382366" Z="-0.010017395"/>
-          <Size X="135.414337" Y="68.3848572" Z="180.020035"/>
-        </c:AABB>
-        <c:Collidable/>
         <c:Model>
           <Resource>Models/LevelBase/MapVersion1.mesh</Resource>
         </c:Model>
@@ -144,7 +139,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="57.7363472" Y="2.38900018" Z="79.5"/>
+          <Position X="57.7363472" Y="1.18853188" Z="79.5"/>
         </c:Transform>
       </Components>
       <Children>
@@ -206,7 +201,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="-60.2567062" Y="3.4000001" Z="-78.1000061"/>
+          <Position X="-60.2567062" Y="1.60000002" Z="-78.1000061"/>
         </c:Transform>
       </Components>
       <Children>

resources/Schema/Entities/HealthPickup.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:AABB/>
-    <c:HealthPickup/>
-    <c:Model>
-      <Resource>Models/Core/UnitSphere.mesh</Resource>
-    </c:Model>
-    <c:Transform>
-      <Position X="0" Y="1" Z="0"/>
-    </c:Transform>
-    <c:Trigger/>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/HealthPickupTest.xml

@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c: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>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:HealthPickup>
-          <RespawnTimer>1</RespawnTimer>
-          <HealthGain>22</HealthGain>
-        </c:HealthPickup>
-        <c:Model>
-          <Resource>Models/Core/UnitSphere.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="60" Y="1" Z="80"/>
-        </c:Transform>
-        <c:Trigger/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:HealthPickup>
-          <RespawnTimer>1</RespawnTimer>
-          <HealthGain>22</HealthGain>
-        </c:HealthPickup>
-        <c:Model>
-          <Resource>Models/Core/UnitSphere.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="60" Y="1" Z="80"/>
-        </c:Transform>
-        <c:Trigger/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:HealthPickup>
-          <RespawnTimer>4</RespawnTimer>
-          <HealthGain>44</HealthGain>
-        </c:HealthPickup>
-        <c:Model>
-          <Resource>Models/Core/UnitSphere.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="60" Y="1" Z="80"/>
-        </c:Transform>
-        <c:Trigger/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/LevelCollisionTest.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Collidable/>
-    <c:Model>
-      <Resource>../assets/Models/MapVersion1.mesh</Resource>
-    </c:Model>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.mesh</Resource>
-        </c:Model>
-        <c:Physics>
-          <Gravity>false</Gravity>
-        </c:Physics>
-        <c:Player/>
-        <c:Transform>
-          <Position X="-1.48400009" Y="3.68200016" Z="24.7580013"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:DirectionalLight/>
-        <c:Transform>
-          <Orientation X="3.80300021" Y="1.37800002" Z="4.10000038"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/ModelCollisionTest.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform>
-      <Position X="0" Y="0" Z="-0.313012958"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:Camera/>
-        <c:Listener/>
-        <c:Transform>
-          <Position X="2.56531811" Y="0.637967348" Z="0.202344239"/>
-          <Orientation X="2.68780756" Y="1.36143553" Z="3.14159179"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>../assets/Models/Core/Tri.obj</Resource>
-          <Color A="1" B="1" G="0.392156869" R="0"/>
-        </c:Model>
-        <c:Transform>
-          <Scale X="2" Y="2" Z="0.200000003"/>
-          <Orientation X="2.70100021" Y="2.37000012" Z="0.266000003"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:Model>
-              <Resource>../assets/Models/Core/Tri.obj</Resource>
-              <Color A="1" B="0" G="0" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Orientation X="0" Y="3.14159274" Z="4.71238899"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
-        </c:Model>
-        <c:Physics/>
-        <c:Transform>
-          <Position X="-1.95333278" Y="0.296304941" Z="2.56487775"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/MovementTest.xml

@@ -6,6 +6,22 @@
   </Components>
 
   <Children>
+    <Entity name="Ground">
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Color A="1" B="0.513725519" G="0" R="1"/>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Transform>
+          <Position X="7" Y="-0.727000058" Z="-1.22800004"/>
+          <Scale X="50" Y="1.45100009" Z="50"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
     <Entity name="RedSpawn">
       <Components>
         <c:PlayerSpawn/>
@@ -65,10 +81,6 @@
     </Entity>
     <Entity name="ObstacleCourse">
       <Components>
-        <c:AABB>
-          <Size X="50" Y="50" Z="50"/>
-        </c:AABB>
-        <c:Collidable/>
         <c:Model>
           <Resource>Models/Test/ObstacleCourse.mesh</Resource>
         </c:Model>
@@ -76,6 +88,51 @@
       </Components>
       <Children/>
     </Entity>
+    <Entity name="ObstacleCoursePlayerBox">
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Transform>
+          <Position X="6.32800007" Y="0.807000041" Z="-2.2750001"/>
+          <Scale X="1" Y="1.60000002" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ObstacleCourse1uHigh">
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Transform>
+          <Position X="9.11900043" Y="0.5" Z="-2.10900021"/>
+          <Scale X="1" Y="1" Z="8.1960001"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ObstacleCourseWhoTheFuckKnows">
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Transform>
+          <Position X="13.2370005" Y="1.28600001" Z="-1.71700013"/>
+          <Scale X="2.58000016" Y="2.58300018" Z="21.1860008"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
     <Entity name="BlueSpawn">
       <Components>
         <c:PlayerSpawn/>
@@ -140,7 +197,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="-1.68112314" Y="0.0288829971" Z="3.06287026"/>
+          <Position X="-1.68112314" Y="0.0264999866" Z="3.06287026"/>
           <Orientation X="0" Y="2.14675093" Z="0"/>
         </c:Transform>
       </Components>

resources/Schema/Entities/Player.xml

@@ -101,6 +101,13 @@
             </Entity>
             <Entity name="Weapon">
               <Components>
+                <c:ExplosionEffect>
+                  <ColorByDistance>true</ColorByDistance>
+                  <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
+                  <ExplosionDuration>3.7999999523162842</ExplosionDuration>
+                  <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
+                  <Randomness>true</Randomness>
+                </c:ExplosionEffect>
                 <c:Model>
                   <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
                 </c:Model>

resources/Schema/Entities/PlayerDeathExplosionWithCamera.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Explosion" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Animation>
-      <Name>Hold Pos</Name>
-    </c:Animation>
-    <c:Lifetime>
-      <Lifetime>2.5</Lifetime>
-    </c:Lifetime>
-    <c:ExplosionEffect>
-      <ColorByDistance>true</ColorByDistance>
-      <Velocity X="0" Y="7.76300049" Z="0"/>
-      <ExplosionOrigin X="0" Y="0.67900002" Z="0"/>
-      <ExponentialAccelaration>true</ExponentialAccelaration>
-      <ExplosionDuration>3</ExplosionDuration>
-      <EndColor A="0" B="0" G="0" R="1"/>
-      <Randomness>true</Randomness>
-    </c:ExplosionEffect>
-    <c:Model>
-      <Resource>Models/AssaultAnimated.mesh</Resource>
-      <Color A="1" B="0" G="0" R="1"/>
-      <Transparent>true</Transparent>
-    </c:Model>
-    <c:Transform>
-      <Position X="0" Y="0" Z="3.46966481"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="Camera">
-      <Components>
-        <c:Camera/>
-        <c:Transform>
-          <Position X="0" Y="2.49700022" Z="4.31700039"/>
-          <Orientation X="5.95600033" Y="0" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/QualityAssurance.xml

@@ -40,7 +40,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="9161.41992" Z="0"/>
+              <Orientation X="0" Y="7364.7876" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -105,7 +105,7 @@
         </c:RaptorCopter>
         <c:Transform>
           <Position X="2.1529963" Y="6.59221172" Z="0.169116676"/>
-          <Orientation X="4.16300011" Y="17199.7988" Z="0"/>
+          <Orientation X="4.16300011" Y="15381.7266" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -122,7 +122,7 @@
           <Components>
             <c:Animation>
               <Name>Run</Name>
-              <Time>0.79292191744688711</Time>
+              <Time>0.28223692849998105</Time>
               <Speed>1</Speed>
             </c:Animation>
             <c:Model>
@@ -138,7 +138,7 @@
           <Components>
             <c:Animation>
               <Name>Walk</Name>
-              <Time>0.96020137154739604</Time>
+              <Time>0.44951638260048998</Time>
               <Speed>1</Speed>
             </c:Animation>
             <c:Model>
@@ -188,7 +188,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="2918.14136" Z="0"/>
+                  <Orientation X="0" Y="2019.28503" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -196,7 +196,7 @@
                   <Components>
                     <c:Animation>
                       <Name>Run</Name>
-                      <Time>0.53173203453812956</Time>
+                      <Time>0.021047045591223501</Time>
                       <Speed>1</Speed>
                     </c:Animation>
                     <c:Model>
@@ -237,7 +237,7 @@
               <Axis X="1" Y="1" Z="1"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="15792.2051" Y="15792.2051" Z="15792.2051"/>
+              <Orientation X="13996.3721" Y="13996.3721" Z="13996.3721"/>
             </c:Transform>
           </Components>
           <Children>
@@ -301,7 +301,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="15589.2383" Z="0"/>
+              <Orientation X="0" Y="13793.4053" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -333,7 +333,7 @@
                       <Axis X="0.699999988" Y="1" Z="0.300000012"/>
                     </c:RaptorCopter>
                     <c:Transform>
-                      <Orientation X="11456.2695" Y="16313.6973" Z="4881.66504"/>
+                      <Orientation X="10188.9443" Y="14517.8643" Z="4350.31738"/>
                     </c:Transform>
                   </Components>
                   <Children>
@@ -586,7 +586,7 @@
               <Transparent>true</Transparent>
             </c:Model>
             <c:Transform>
-              <Position X="-0.236842498" Y="0.5" Z="-1.83845747"/>
+              <Position X="-0.258742422" Y="0.5" Z="-1.8603574"/>
               <Orientation X="2.03600001" Y="0" Z="0"/>
             </c:Transform>
           </Components>
@@ -683,7 +683,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1217.61243" Z="0"/>
+                  <Orientation X="0" Y="316.504456" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -730,7 +730,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1217.61243" Z="0"/>
+                  <Orientation X="0" Y="316.504456" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -790,7 +790,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1217.61243" Z="0"/>
+                  <Orientation X="0" Y="316.504456" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -837,7 +837,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1217.61243" Z="0"/>
+                  <Orientation X="0" Y="316.504456" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -883,7 +883,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1217.61243" Z="0"/>
+                  <Orientation X="0" Y="316.504456" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -930,7 +930,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1217.61243" Z="0"/>
+                  <Orientation X="0" Y="316.504456" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -977,7 +977,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1217.61243" Z="0"/>
+                  <Orientation X="0" Y="316.504456" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1038,7 +1038,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="0.300000012" B="0" G="0.200000003" R="1"/>
+                  <Color A="1" B="0" G="0.200000003" R="1"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team>
@@ -1088,8 +1088,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="0.300000012" B="0" G="1" R="1"/>
-                  <Transparent>true</Transparent>
+                  <Color A="1" B="0" G="1" R="1"/>
                 </c:Model>
                 <c:Team/>
                 <c:Transform>
@@ -1132,7 +1131,6 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="0.300000012" B="1" G="1" R="1"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team/>
@@ -1179,8 +1177,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="0.300000012" B="1" G="1" R="0"/>
-                  <Transparent>true</Transparent>
+                  <Color A="1" B="1" G="1" R="0"/>
                 </c:Model>
                 <c:Team/>
                 <c:Transform>
@@ -1228,7 +1225,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="0.300000012" B="1" G="0.200000003" R="0"/>
+                  <Color A="1" B="1" G="0.200000003" R="0"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team>
@@ -1350,19 +1347,6 @@
         </c:Transform>
       </Components>
       <Children>
-        <Entity name="Text">
-          <Components>
-            <c:Text>
-              <Content>ExplosionEffect Test</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-            </c:Text>
-            <c:Transform>
-              <Position X="0" Y="3.80000019" Z="0"/>
-              <Orientation X="0" Y="1.5710001" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
         <Entity name="AssetBase">
           <Components>
             <c:Model>
@@ -1390,7 +1374,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1750.85376" Z="0"/>
+                  <Orientation X="0" Y="850.206848" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1399,7 +1383,7 @@
                     <c:ExplosionEffect>
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                      <TimeSinceDeath>1.3671759474185377</TimeSinceDeath>
+                      <TimeSinceDeath>0.75008034908941568</TimeSinceDeath>
                       <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                       <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                       <Randomness>true</Randomness>
@@ -1446,7 +1430,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1750.85376" Z="0"/>
+                  <Orientation X="0" Y="850.206848" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1455,7 +1439,7 @@
                     <c:ExplosionEffect>
                       <Velocity X="0.5" Y="1" Z="0"/>
                       <ExplosionOrigin X="0" Y="0.900000036" Z="0"/>
-                      <TimeSinceDeath>0.31711568080172703</TimeSinceDeath>
+                      <TimeSinceDeath>1.1999860997035228</TimeSinceDeath>
                     </c:ExplosionEffect>
                     <c:Model>
                       <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
@@ -1498,7 +1482,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1750.85376" Z="0"/>
+                  <Orientation X="0" Y="850.206848" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1506,14 +1490,14 @@
                   <Components>
                     <c:Animation>
                       <Name>Walk</Name>
-                      <Time>0.74121802989810703</Time>
+                      <Time>0.23053304095120097</Time>
                       <Speed>1</Speed>
                     </c:Animation>
                     <c:ExplosionEffect>
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.300000012" Y="2" Z="0"/>
                       <ExplosionOrigin X="0" Y="1.30000007" Z="-0.200000003"/>
-                      <TimeSinceDeath>0.31711568080172703</TimeSinceDeath>
+                      <TimeSinceDeath>0.68343188336345406</TimeSinceDeath>
                       <EndColor A="0" B="0.333333343" G="0.933333337" R="3.92156863"/>
                       <Randomness>true</Randomness>
                     </c:ExplosionEffect>
@@ -1531,120 +1515,18 @@
             </Entity>
           </Children>
         </Entity>
-        <Entity name="AssetBase">
+        <Entity name="Text">
           <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitCylinder.mesh</Resource>
-              <Color A="1" B="1.56862748" G="1.56862748" R="1.56862748"/>
-            </c:Model>
+            <c:Text>
+              <Content>ExplosionEffect Test</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+            </c:Text>
             <c:Transform>
-              <Position X="0" Y="-0.231354833" Z="-2.92637157"/>
+              <Position X="0" Y="3.80000019" Z="0"/>
+              <Orientation X="0" Y="1.5710001" Z="0"/>
             </c:Transform>
           </Components>
-          <Children>
-            <Entity name="Light">
-              <Components>
-                <c:PointLight/>
-                <c:Transform>
-                  <Position X="0" Y="0.663784981" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="RotationOrigin">
-              <Components>
-                <c:RaptorCopter>
-                  <Speed>0.5</Speed>
-                  <Axis X="0" Y="1" Z="0"/>
-                </c:RaptorCopter>
-                <c:Transform>
-                  <Orientation X="0" Y="857.983765" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="Asset">
-                  <Components>
-                    <c:ExplosionEffect>
-                      <ColorByDistance>true</ColorByDistance>
-                      <Velocity X="0" Y="0.699999988" Z="0"/>
-                      <ExplosionOrigin X="0" Y="-1.10000002" Z="0"/>
-                      <TimeSinceDeath>0.95047462600732735</TimeSinceDeath>
-                      <ExplosionDuration>10</ExplosionDuration>
-                      <EndColor A="1" B="0" G="0" R="1"/>
-                      <RandomnessScalar>3</RandomnessScalar>
-                      <Randomness>true</Randomness>
-                    </c:ExplosionEffect>
-                    <c:Model>
-                      <Resource>Models/Core/UnitSphere.mesh</Resource>
-                      <Color A="0" B="1" G="0" R="0"/>
-                      <Transparent>true</Transparent>
-                    </c:Model>
-                    <c:Transform>
-                      <Position X="0" Y="0.5" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="AssetBase">
-          <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitCylinder.mesh</Resource>
-              <Color A="1" B="1.56862748" G="1.56862748" R="1.56862748"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="-0.231354833" Z="-4.48872519"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="Light">
-              <Components>
-                <c:PointLight/>
-                <c:Transform>
-                  <Position X="0" Y="0.663784981" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="RotationOrigin">
-              <Components>
-                <c:RaptorCopter>
-                  <Speed>0.5</Speed>
-                  <Axis X="0" Y="1" Z="0"/>
-                </c:RaptorCopter>
-                <c:Transform>
-                  <Orientation X="0" Y="456.13559" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="Asset">
-                  <Components>
-                    <c:ExplosionEffect>
-                      <ColorByDistance>true</ColorByDistance>
-                      <Velocity X="6" Y="0.100000001" Z="0"/>
-                      <ExplosionOrigin X="0" Y="-10" Z="0"/>
-                      <TimeSinceDeath>1.350502887383392</TimeSinceDeath>
-                      <ExponentialAccelaration>true</ExponentialAccelaration>
-                      <ExplosionDuration>5</ExplosionDuration>
-                      <Randomness>true</Randomness>
-                    </c:ExplosionEffect>
-                    <c:Model>
-                      <Resource>Models/Assault.mesh</Resource>
-                      <Color A="1" B="1" G="0.392156869" R="0"/>
-                      <Transparent>true</Transparent>
-                    </c:Model>
-                    <c:Transform>
-                      <Position X="0" Y="0.5" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
+          <Children/>
         </Entity>
       </Children>
     </Entity>
@@ -1671,278 +1553,6 @@
         </Entity>
       </Children>
     </Entity>
-    <Entity name="DefenderShieldTestOrigin">
-      <Components>
-        <c:Transform>
-          <Position X="-11.0375881" Y="0" Z="20.9209175"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="Shield">
-          <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitHexagon.mesh</Resource>
-            </c:Model>
-            <c:Shield/>
-            <c:Transform>
-              <Position X="0" Y="1.47765553" Z="0"/>
-              <Orientation X="0" Y="2.15300012" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="ShieldedCube">
-          <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-            </c:Model>
-            <c:Shielded/>
-            <c:Transform>
-              <Position X="-3.34650159" Y="1.19966424" Z="3.09996605"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="ShieldedPlayer">
-          <Components>
-            <c:AABB>
-              <Origin X="0" Y="0.772000015" Z="0"/>
-              <Size X="1" Y="1.60000002" Z="1"/>
-            </c:AABB>
-            <c:Collidable/>
-            <c:Health/>
-            <c:Physics>
-              <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
-              <Gravity>false</Gravity>
-            </c:Physics>
-            <c:Player>
-              <MovementSpeed>5</MovementSpeed>
-            </c:Player>
-            <c:Team>
-              <Team>
-                <Red/>
-              </Team>
-            </c:Team>
-            <c:Transform>
-              <Position X="-1.56735241" Y="0.527999997" Z="0.929739475"/>
-            </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"/>
-                    </c:Text>
-                    <c:Transform>
-                      <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>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="CameraModel">
-                  <Components>
-                    <c:Model>
-                      <Resource>Models/Camera.mesh</Resource>
-                      <Visible>false</Visible>
-                    </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>
-                <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:ExplosionEffect>
-                          <ColorByDistance>true</ColorByDistance>
-                          <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                          <TimeSinceDeath>1.3671759474185377</TimeSinceDeath>
-                          <ExplosionDuration>3.7999999523162842</ExplosionDuration>
-                          <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
-                          <Randomness>true</Randomness>
-                        </c:ExplosionEffect>
-                        <c:Model>
-                          <Resource>Models/AssaultWeaponRed.mesh</Resource>
-                        </c:Model>
-                        <c:Transform>
-                          <Position X="0.180000007" Y="-0.183000013" Z="0"/>
-                          <Orientation X="0" Y="3.08300018" 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.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:Animation>
-                  <Name>Hold Pos</Name>
-                  <Time>0.39573681725672838</Time>
-                  <Speed>1</Speed>
-                </c:Animation>
-                <c:HiddenForLocalPlayer/>
-                <c:Model>
-                  <Resource>Models/AssaultAnimated.mesh</Resource>
-                  <Color A="1" B="0" G="0" R="1"/>
-                </c:Model>
-                <c:Shielded/>
-                <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>
-        <Entity name="BackgroundItemsOrigin">
-          <Components>
-            <c:Transform>
-              <Position X="-7.17760038" Y="0" Z="5.57545042"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="Log">
-              <Components>
-                <c:Model>
-                  <Resource>Models/Log.mesh</Resource>
-                </c:Model>
-                <c:Transform>
-                  <Position X="-0.09513513" Y="0.53153497" Z="-0.127776429"/>
-                  <Orientation X="5.9920001" Y="0.640000045" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="Bush">
-              <Components>
-                <c:Model>
-                  <Resource>Models/BushAlive.mesh</Resource>
-                </c:Model>
-                <c:Transform>
-                  <Position X="-4.95900011" Y="0" Z="1.29897511"/>
-                  <Scale X="5" Y="5" Z="5"/>
-                  <Orientation X="0.407000005" Y="1.68700004" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Text">
-          <Components>
-            <c:Text>
-              <Content>Defender Shield Test</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-            </c:Text>
-            <c:Transform>
-              <Position X="0" Y="4.20000029" Z="0"/>
-              <Orientation X="0" Y="2.15300012" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/RenderingWorld.xml

@@ -52,15 +52,14 @@
               <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:HealthHUD/>
                     <c:Model>
                       <Resource>Models/Core/UnitHexagon.mesh</Resource>
                       <Color A="0.313725501" B="0.70588237" G="0.70588237" R="0.70588237"/>
-                      <Transparent>true</Transparent>
                     </c:Model>
                     <c:Transform>
                       <Position X="-0.285538822" Y="-0.282350302" Z="-1.52214652e-05"/>
@@ -162,7 +161,7 @@
           <Axis X="0.200000003" Y="3.4000001" Z="0.5"/>
         </c:RaptorCopter>
         <c:Transform>
-          <Orientation X="948.868286" Y="23876.6914" Z="1797.71118"/>
+          <Orientation X="758.058899" Y="20632.8691" Z="1320.68018"/>
         </c:Transform>
       </Components>
       <Children>
@@ -347,20 +346,6 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity>
-      <Components>
-        <c:Animation>
-          <AnimationName>Run</AnimationName>
-          <Time>0.021910293579680166</Time>
-          <Speed>0.004999999888241291</Speed>
-        </c:Animation>
-        <c:Model>
-          <Resource>Models/SuperTest.mesh</Resource>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/Skeleton.xml

@@ -1,497 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Skeleton" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity name="R_Arm_Weapon_Joint">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Arm_Weapon_Joint</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="0.996078432" B="1" G="1" R="19.6078434"/>
-          <Transparent>true</Transparent>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.47420007" Y="0.928898275" Z="0.0299553983"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.100000001"/>
-          <Orientation X="1.60548508" Y="-1.10789871" Z="-1.51772225"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="R_Hand">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Hand</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.448672563" Y="0.992614031" Z="0.0575723015"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="1.60548508" Y="-1.10789871" Z="-1.51772225"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="R_Arm">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Arm</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.12972948" Y="1.28044498" Z="-0.0855199769"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.178462029" Y="-0.240202308" Z="-0.227051333"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="R_Shoulder">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Shoulder</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.0566707924" Y="1.22090316" Z="-0.110467494"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Neck">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>Neck</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="19.6078434" G="19.6078434" R="19.6078434"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="6.88049477e-05" Y="1.29971886" Z="-0.151777163"/>
-          <Scale X="0.0500000007" Y="0.100000001" Z="0.0500000007"/>
-          <Orientation X="-1.03466523" Y="-0.0017389874" Z="0.00627749134"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Spine_3">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>Spine_3</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.000299328996" Y="1.2487011" Z="-0.0936965123"/>
-          <Scale X="0.0500000007" Y="0.100000001" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Spine_2">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>Spine_2</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.000528411241" Y="1.1669693" Z="0.000368326902"/>
-          <Scale X="0.0500000007" Y="0.100000001" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Spine_1">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>Spine_1</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.000317580998" Y="1.03476369" Z="7.06899816e-17"/>
-          <Scale X="0.0500000007" Y="0.100000001" Z="0.0500000007"/>
-          <Orientation X="-0.168994248" Y="-0.000270629855" Z="-6.74916964e-06"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Hip">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>Hip</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0.901226044" Z="0"/>
-          <Scale X="0.100000001" Y="0.0500000007" Z="0.0500000007"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="L_Leg_Top">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>L_Leg_Top</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.0735318959" Y="0.86343354" Z="0.00186898722"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="0.431212306" Y="-0.0456388369" Z="-0.00236316444"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="L_Leg_Bottom">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>L_Leg_Bottom</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.0971027464" Y="0.534537971" Z="-0.158307418"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.435873091" Y="0.0584642813" Z="-0.0526505522"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="L_Foot">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>L_Foot</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.136750847" Y="0.215778053" Z="0.0181705151"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-7.45058151e-06" Y="-4.34406102e-05" Z="-2.32085604e-05"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="L_Toe">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>L_Toe</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.142155826" Y="0.180158257" Z="-0.171162993"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-7.45058151e-06" Y="-4.34406102e-05" Z="-2.32085604e-05"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="L_Shoulder">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>L_Shoulder</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.0569540039" Y="1.22099173" Z="-0.110411651"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="L_Arm">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>L_Arm</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.129911453" Y="1.28064728" Z="-0.0853923708"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="0.558630228" Y="-0.558619261" Z="-0.988305748"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="L_Hand">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>L_Hand</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.454215586" Y="1.41859245" Z="-0.370613039"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.931911349" Y="4.81306633e-05" Z="0.000111658264"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="L_Shoulder_Armor_Joint">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>L_Shoulder_Armor_Joint</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.138541639" Y="1.30872273" Z="-0.144261822"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Chin">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>Chin</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="19.6078434" G="19.6078434" R="19.6078434"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.00033863826" Y="1.2016536" Z="-0.251047492"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.931916714" Y="-9.67644155e-07" Z="2.18351502e-07"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Head">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>Head</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="19.6078434" G="19.6078434" R="19.6078434"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.000338668207" Y="1.33565879" Z="-0.254856527"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.931916714" Y="-9.67644155e-07" Z="2.18351502e-07"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Perietal">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>Perietal</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="19.6078434" G="19.6078434" R="19.6078434"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.000338537793" Y="1.43159795" Z="-0.410463303"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.931916714" Y="-9.67644155e-07" Z="2.18351502e-07"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="L_Elbow">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>L_Elbow</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.312942117" Y="1.35850036" Z="-0.246365055"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="0.353978485" Y="-0.15571253" Z="-0.903516531"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="R_Leg_Bottom">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Leg_Bottom</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.105701312" Y="0.499459773" Z="0.030466903"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-1.02907228" Y="-0.0580535792" Z="0.116703011"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="R_Elbow">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Elbow</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.309118003" Y="1.12181115" Z="0.00506293867"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.391992599" Y="-0.509281039" Z="-0.0413108058"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="R_Leg_Top">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Leg_Top</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.074000001" Y="0.863433301" Z="0.00200000009"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.0984009728" Y="0.0146064674" Z="0.00352247525"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="R_Foot">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Foot</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.139749736" Y="0.334264338" Z="0.356020123"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.000313894066" Y="0.00262229913" Z="0.00155029749"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="R_Toe">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Toe</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.144308567" Y="0.298593462" Z="0.166685253"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.000313894066" Y="0.00262229913" Z="0.00155029749"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="R_Shoulder_Armor_Joint">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Shoulder_Armor_Joint</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.13872239" Y="1.30850673" Z="-0.144398093"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/SplatMapTesWorld.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:SceneLight/>
-        <c:Model>
-          <Resource>Models/Test/SplatMapTest.mesh</Resource>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/Testingu

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

resources/Schema/Entities/aaaatestremoveme.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/Unithexagon.mesh</Resource>
-        </c:Model>
-        <c:Shield/>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="dl">
-      <Components>
-        <c:DirectionalLight/>
-        <c:Transform>
-          <Orientation X="0" Y="2.61800003" Z="0.756000042"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="sl">
-      <Components>
-        <c:SceneLight>
-          <Gamma>2.2000000476837158</Gamma>
-        </c:SceneLight>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/aim_rays.xml

@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-          <Color A="1" B="0.980392158" G="1" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.100000001" Y="0" Z="0"/>
-          <Scale X="50" Y="1" Z="51.1000023"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-          <Color A="1" B="0" G="0" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-14.500001" Y="1.50000012" Z="16.9222012"/>
-          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:DirectionalLight/>
-        <c:Transform>
-          <Orientation X="4.38500023" Y="0" Z="0.458000034"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-          <Color A="1" B="1" G="0" R="0"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-14.500001" Y="1.50000012" Z="-17.6888409"/>
-          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-          <Color A="1" B="0" G="0" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="12.1000004" Y="1.50000012" Z="16.9222012"/>
-          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-          <Color A="1" B="1" G="0" R="0"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="12.1228638" Y="1.50000012" Z="-17.9642811"/>
-          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:PlayerSpawn/>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/Player.xml</EntityFile>
-        </c:Spawner>
-        <c:Team>
-          <Team>
-            <Red/>
-          </Team>
-        </c:Team>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="-20.6000004" Y="1" Z="21.7150002"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:PlayerSpawn/>
-            <c:Transform>
-              <Position X="-12.2000008" Y="1" Z="21.5000019"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:Transform>
-              <Position X="15.4000006" Y="1" Z="21.6000004"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="10.500001" Y="0" Z="21.9000015"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:PlayerSpawn/>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/Player.xml</EntityFile>
-        </c:Spawner>
-        <c:Team>
-          <Team>
-            <Blue/>
-          </Team>
-        </c:Team>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="-9.70000076" Y="1" Z="-23.4000015"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="-18.8000011" Y="1" Z="-22.3000011"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="8.10000038" Y="1" Z="-23.2000008"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="16.2000008" Y="1" Z="-23.2000008"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-          <Color A="1" B="39.2156868" G="0" R="3.13725495"/>
-        </c:Model>
-        <c:Transform>
-          <Scale X="-70" Y="-70" Z="-70"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:CapturePoint>
-          <HomePointForTeam>
-            <Blue/>
-          </HomePointForTeam>
-        </c:CapturePoint>
-        <c:Model>
-          <Resource>Models\Core\UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="0.200000003" R="0"/>
-        </c:Model>
-        <c:Team>
-          <Team>
-            <Blue/>
-          </Team>
-        </c:Team>
-        <c:Transform>
-          <Position X="0" Y="0.773066521" Z="-18.975975"/>
-          <Scale X="4.9000001" Y="0.600000024" Z="3.50000024"/>
-        </c:Transform>
-        <c:Trigger/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:CapturePoint>
-          <HomePointForTeam>
-            <Red/>
-          </HomePointForTeam>
-          <CapturePointNumber>1</CapturePointNumber>
-        </c:CapturePoint>
-        <c:Model>
-          <Resource>Models\Core\UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="1" R="0"/>
-        </c:Model>
-        <c:Team>
-          <Team>
-            <Red/>
-          </Team>
-        </c:Team>
-        <c:Transform>
-          <Position X="0" Y="0.452868998" Z="18.5607414"/>
-          <Scale X="4.60000038" Y="0.900000036" Z="4.10000038"/>
-        </c:Transform>
-        <c:Trigger/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/awdawd

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Test" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:BoneAttachment>
-      <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-      <Name>L_Foot</Name>
-      <InheritScale>true</InheritScale>
-    </c:BoneAttachment>
-    <c:Model>
-      <Resource>Models/Core/UnitCube.mesh</Resource>
-      <Color A="1" B="1" G="19.6078434" R="1"/>
-    </c:Model>
-    <c:Transform>
-      <Position X="-0.0863945931" Y="0.221357167" Z="-0.0781617165"/>
-      <Scale X="0.199999973" Y="0.199999973" Z="0.199999973"/>
-      <Orientation X="-2.80262542" Y="0.0150706368" Z="-3.13294244"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/joint.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Join" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:BoneAttachment>
-      <BoneName>L_Elbow</BoneName>
-      <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-    </c:BoneAttachment>
-    <c:Model>
-      <Resource>Models/Core/UnitCube.mesh</Resource>
-      <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
-    </c:Model>
-    <c:Transform>
-      <Position X="-0.359419018" Y="1.38182318" Z="-0.0848901421"/>
-      <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-      <Orientation X="0.281418264" Y="-0.0785565302" Z="-0.902501941"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Types/Entity.xsd

@@ -38,9 +38,6 @@
 							<xs:element ref="c:HiddenForLocalPlayer" minOccurs="0"/>
 							<xs:element ref="c:Fill" minOccurs="0"/>
 							<xs:element ref="c:Animation" minOccurs="0"/>
-							<xs:element ref="c:BoneAttachment" minOccurs="0"/>
-							<xs:element ref="c:Shield" minOccurs="0"/>
-							<xs:element ref="c:Shielded" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/DrawColorCorrection.frag.glsl

@@ -2,8 +2,6 @@
 
 layout (binding = 0) uniform sampler2D SceneTexture;
 layout (binding = 1) uniform sampler2D BloomTexture;
-layout (binding = 2) uniform sampler2D SceneTextureLowRes;
-layout (binding = 3) uniform sampler2D BloomTextureLowRes;
 uniform float Exposure;
 uniform float Gamma;
 
@@ -17,19 +15,10 @@ void main()
 {
 	vec4 hdrColor = texture(SceneTexture, Input.TextureCoordinate);
 	vec4 bloomColor = texture(BloomTexture, Input.TextureCoordinate);
-	vec4 hdrColorLowRes = texture(SceneTextureLowRes, Input.TextureCoordinate);
-	vec4 bloomColorLowRes = texture(BloomTextureLowRes, Input.TextureCoordinate);
 	hdrColor += bloomColor;
-	hdrColorLowRes;
 
-	float hdrColorsum = hdrColorLowRes.r + hdrColorLowRes.g + hdrColorLowRes.b;
 	//Toon mapping thingy
-	vec3 result;
-	if(hdrColorsum > 0.0) {
-		result = vec3(1.0) - exp(-hdrColorLowRes.rgb * Exposure);
-	} else {
-		result = vec3(1.0) - exp(-hdrColor.rgb * Exposure);
-	}
+	vec3 result = vec3(1.0) - exp(-hdrColor.rgb * Exposure);
 
 	//gamme correction
 	result = pow(result, vec3(1.0 / Gamma));

resources/Shaders/FillDepthBuffer.frag.glsl

@@ -1,11 +0,0 @@
-#version 430
-
-in VertexData{
-	vec3 Position;
-}Input;
-
-void main()
-{
-}
-
-

resources/Shaders/FillDepthBuffer.vert.glsl

@@ -1,21 +0,0 @@
-#version 430
-
-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
-
-layout(location = 0) in vec3 Position;
-layout(location = 5) in vec4 BoneIndices;
-layout(location = 6) in vec4 BoneWeights;
-
-
-out VertexData{
-	vec3 Position;
-}Output;
-
-void main()
-{
-	gl_Position = P * V * M * vec4(Position, 1.0);
-
-	Output.Position = Position;
-}

resources/Shaders/FillDepthBufferSkinned.vert.glsl

@@ -1,33 +0,0 @@
-#version 430
-
-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
-uniform mat4 Bones[100];
-
-
-layout(location = 0) in vec3 Position;
-layout(location = 5) in vec4 BoneIndices;
-layout(location = 6) in vec4 BoneWeights;
-
-
-
-out VertexData{
-	vec3 Position;
-}Output;
-
-void main()
-{
-	mat4 boneTransform = mat4(1);
-
-	if(BoneWeights[0] > 0.0f){ 
-	boneTransform = BoneWeights[0] * Bones[int(BoneIndices[0])]
-				  + BoneWeights[1] * Bones[int(BoneIndices[1])]
-				  + BoneWeights[2] * Bones[int(BoneIndices[2])]
-				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
-	}
-
-	gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
-
-	Output.Position = vec3(0.0);
-}

resources/Shaders/ForwardPlus.frag.glsl

@@ -9,11 +9,6 @@ uniform vec2 ScreenDimensions;
 uniform vec4 FillColor;
 uniform vec4 AmbientColor;
 uniform float FillPercentage;
-
-uniform vec2 DiffuseUVRepeat;
-uniform vec2 NormalUVRepeat;
-uniform vec2 SpecularUVRepeat;
-uniform vec2 GlowUVRepeat;
 layout (binding = 0) uniform sampler2D DiffuseTexture;
 layout (binding = 1) uniform sampler2D NormalMapTexture;
 layout (binding = 2) uniform sampler2D SpecularMapTexture;
@@ -119,11 +114,11 @@ vec4 CalcNormalMappedValue(vec3 normal, vec3 tangent, vec3 bitangent, vec2 textu
 
 void main()
 {
-	vec4 diffuseTexel = texture2D(DiffuseTexture, Input.TextureCoordinate * DiffuseUVRepeat);
-	vec4 glowTexel = texture2D(GlowMapTexture, Input.TextureCoordinate * GlowUVRepeat);
-	vec4 specularTexel = texture2D(SpecularMapTexture, Input.TextureCoordinate * SpecularUVRepeat);
+	vec4 diffuseTexel = texture2D(DiffuseTexture, Input.TextureCoordinate);
+	vec4 glowTexel = texture2D(GlowMapTexture, Input.TextureCoordinate);
+	vec4 specularTexel = texture2D(SpecularMapTexture, Input.TextureCoordinate);
 	vec4 position = V * M * vec4(Input.Position, 1.0); 
-	vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate * NormalUVRepeat, NormalMapTexture);
+	vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate, NormalMapTexture);
 	normal = normalize(normal);
 	//vec4 normal = normalize(V  * vec4(Input.Normal, 0.0));
 	vec4 viewVec = normalize(-position); 

resources/Shaders/ForwardPlus.vert.glsl

@@ -3,12 +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 BoneIndices;
+layout(location = 6) in vec4 BoneWeights;
 
 out VertexData{
 	vec3 Position;
@@ -22,9 +25,19 @@ 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])];
+	}
+
+	gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
 	
-	Output.Position = Position;
+	Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
 	Output.TextureCoordinate = TextureCoords;
 	Output.Normal = vec3(M * vec4(Normal, 0.0));
 	Output.Tangent = vec3(M * vec4(Tangent, 0.0));

resources/Shaders/ForwardPlusSkinned.vert.glsl

@@ -1,46 +0,0 @@
-#version 430
-
-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
-uniform mat4 Bones[100];
-
-layout(location = 0) in vec3 Position;
-layout(location = 1) in vec3 Normal;
-layout(location = 2) in vec3 Tangent;
-layout(location = 3) in vec3 BiTangent;
-layout(location = 4) in vec2 TextureCoords;
-layout(location = 5) in vec4 BoneIndices;
-layout(location = 6) in vec4 BoneWeights;
-
-out VertexData{
-	vec3 Position;
-	vec3 Normal;
-	vec3 Tangent;
-	vec3 BiTangent;
-	vec2 TextureCoordinate;
-	vec4 ExplosionColor;
-	float ExplosionPercentageElapsed;
-}Output;
-
-void main()
-{
-	mat4 boneTransform = mat4(1);
-
-	if(BoneWeights[0] > 0.0f){ 
-	boneTransform = BoneWeights[0] * Bones[int(BoneIndices[0])]
-				  + BoneWeights[1] * Bones[int(BoneIndices[1])]
-				  + BoneWeights[2] * Bones[int(BoneIndices[2])]
-				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
-	}
-
-	gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
-	
-	Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
-	Output.TextureCoordinate = TextureCoords;
-	Output.Normal = vec3(M * boneTransform * vec4(Normal, 0.0));
-	Output.Tangent = vec3(M * vec4(Tangent, 0.0));
- 	Output.BiTangent = vec3(M * vec4(BiTangent, 0.0));
-	Output.ExplosionColor = vec4(1.0);
-	Output.ExplosionPercentageElapsed = 0.0;
-}