Final pass

Fixed warnings associated with Network

include/Engine/Network/Client.h

@@ -36,7 +36,7 @@ private:
     boost::asio::ip::udp::socket m_Socket;
 
     // Sending message to server logic
-    int bytesRead = -1;
+    size_t bytesRead = 0;
     char readBuf[INPUTSIZE] = { 0 };
 
     // Packet loss logic
@@ -69,7 +69,7 @@ private:
 
     // Private member functions
     void readFromServer();
-    int  receive(char* data);
+    size_t  receive(char* data);
     void send(Packet& packet);
     void connect();
     void disconnect();

include/Engine/Network/Network.h

@@ -29,7 +29,7 @@ protected:
     unsigned int m_SaveDataIntervalMs = 1000;
     std::clock_t m_SaveDataTimer;
     unsigned int m_MaxConnections;
-    unsigned int m_TimeoutMs;
+    double m_TimeoutMs;
     void saveToFile();
     void updateNetworkData();
     void initialize();

include/Engine/Network/NetworkData.h

@@ -3,16 +3,16 @@
 #include <vector>
 
 struct NetworkData {
-    unsigned int TotalTime = 0;
-    unsigned int TotalDataReceived = 0;
-    unsigned int TotalDataSent = 0;
-    unsigned int AmountOfMessagesReceived = 0;
+    double TotalTime = 0;
+    size_t TotalDataReceived = 0;
+    size_t TotalDataSent = 0;
+    size_t AmountOfMessagesReceived = 0;
     unsigned int AmountOfMessagesSent = 0;
     // Interval based
-    unsigned int DataReceivedThisInterval = 0;
-    unsigned int DataSentThisInterval = 0;
+    size_t DataReceivedThisInterval = 0;
+    size_t DataSentThisInterval = 0;
     // pair: first=reveived, second=send 
-    std::vector<std::pair<unsigned int, unsigned int>> BandwidthBytes;
+    std::vector<std::pair<size_t, size_t>> BandwidthBytes;
 };
 
-#endif
+#endif

include/Engine/Network/Packet.h

@@ -13,7 +13,7 @@ public:
     // arg2: PacketID for identifying packet loss.
     Packet(MessageType type, unsigned int& packetID);
     // Used to create packet from already existing data buffer.
-    Packet(char* data, const int sizeOfPacket);
+    Packet(char* data, const size_t sizeOfPacket);
     Packet(MessageType type);
     ~Packet();
     void Init(MessageType type, unsigned int& packetID);
@@ -51,18 +51,18 @@ public:
     std::string ReadString();
     char* ReadData(int SizeOfData);
     void ChangePacketID(unsigned int& packetID);
-    int Size() { return m_Offset; };
+    size_t Size() { return m_Offset; };
     char* Data() { return m_Data; };
-    unsigned int DataReadSize() { return m_ReturnDataOffset; }
-    unsigned int MaxSize() { return m_MaxPacketSize; }
-    unsigned int HeaderSize() { return m_HeaderSize; }
+    size_t DataReadSize() { return m_ReturnDataOffset; }
+    size_t MaxSize() { return m_MaxPacketSize; }
+    size_t HeaderSize() { return m_HeaderSize; }
 
 private:
     char* m_Data;
-    unsigned int m_ReturnDataOffset = 0;
-    int m_Offset = 0;
-    unsigned int m_MaxPacketSize = 512;
-    unsigned int m_HeaderSize = 0;
+    size_t m_ReturnDataOffset = 0;
+    size_t m_Offset = 0;
+    size_t m_MaxPacketSize = 512;
+    size_t m_HeaderSize = 0;
     void resizeData();
 };
 

include/Engine/Network/Server.h

@@ -36,14 +36,14 @@ private:
     std::map<PlayerID, PlayerDefinition> m_ConnectedPlayers;
     // HACK: Fix INPUTSIZE
     char readBuffer[INPUTSIZE] = { 0 };
-    int bytesRead = 0;
+    size_t bytesRead = 0;
     // time for previouse message
     std::clock_t previousePingMessage = std::clock();
     std::clock_t previousSnapshotMessage = std::clock();
     std::clock_t timOutTimer = std::clock();
     // How often we send messages (milliseconds)
-    int pingIntervalMs;
-    int snapshotInterval;
+    float pingIntervalMs;
+    float snapshotInterval;
     int checkTimeOutInterval = 100;
     int m_NextPlayerID = 0;
 
@@ -59,7 +59,7 @@ private:
     PacketID m_PreviousPacketID = 0;
 
     // Private member functions
-    int  receive(char* data);
+    size_t receive(char* data);
     void readFromClients();
     void send(PlayerID player, Packet& packet);
     void send(Packet& packet);

include/Game/Systems/InterpolationSystem.h

@@ -23,7 +23,7 @@ class InterpolationSystem : public PureSystem
         glm::vec3 Position;
         glm::vec3 Scale;
         glm::quat Orientation;
-        double interpolationTime;
+        float interpolationTime;
     };
 public:
     InterpolationSystem(World* world, EventBroker* eventBroker);

resources/Schema/Entities/AnimatedArmy.xml

@@ -20,7 +20,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>models/dummyscene.mesh</Resource>
+          <Resource>Models/Test/DummyScene.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="0" Y="-0" Z="0"/>
@@ -31,7 +31,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>models/animtest.</Resource>
+          <Resource>Models/Test/AnimTest.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="-0.0966923237" Y="1.2939688" Z="0.399702221"/>
@@ -42,7 +42,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>models/animTest.mesh</Resource>
+          <Resource>Models/Test/AnimTest.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="0" Y="1.31816244" Z="1.1888907"/>
@@ -53,7 +53,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>models/animTest.mesh</Resource>
+          <Resource>Models/Test/AnimTest.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="0.708824873" Y="1.30000007" Z="0"/>
@@ -64,7 +64,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>models/animTest.mesh</Resource>
+          <Resource>Models/Test/AnimTest.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="1.36948848" Y="1.20000005" Z="0"/>

resources/Schema/Entities/AssetPedistal.xml

@@ -35,7 +35,7 @@
         <Entity name="Asset">
           <Components>
             <c:Model>
-              <Resource>Models/AssaultWeaponBlue.mesh</Resource>
+              <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
             </c:Model>
             <c:Transform>
               <Position X="0" Y="1" Z="0"/>

resources/Schema/Entities/CapturePoint.xml

@@ -5,7 +5,7 @@
     <c:AABB/>
     <c:CapturePoint/>
     <c:Model>
-      <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitSphere.mesh</Resource>
+      <Resource>Models/Core/UnitSphere.mesh</Resource>
     </c:Model>
     <c:Team/>
     <c:Transform/>

resources/Schema/Entities/CaptureTest.xml

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

resources/Schema/Entities/CaptureTestState1.xml

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

resources/Schema/Entities/CaptureTestState2.xml

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

resources/Schema/Entities/CaptureTestState3.xml

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

resources/Schema/Entities/CaptureTestState4.xml

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

resources/Schema/Entities/CaptureTestState5.xml

@@ -17,7 +17,7 @@
           </HomePointForTeam>
         </c:CapturePoint>
         <c:Model>
-          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitSphere.mesh</Resource>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="0" G="0.200000003" R="1"/>
         </c:Model>
         <c:Team>
@@ -39,7 +39,7 @@
           <CapturePointNumber>1</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitSphere.mesh</Resource>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="1" R="0"/>
         </c:Model>
         <c:Team/>
@@ -57,7 +57,7 @@
           <CapturePointNumber>2</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitSphere.mesh</Resource>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="0.200000003" R="0"/>
         </c:Model>
         <c:Team>
@@ -79,7 +79,7 @@
           <CapturePointNumber>3</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitSphere.mesh</Resource>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="0.200000003" R="0"/>
         </c:Model>
         <c:Team>
@@ -104,7 +104,7 @@
           <CapturePointNumber>4</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
-          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitSphere.mesh</Resource>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
           <Color A="1" B="1" G="0.200000003" R="0"/>
         </c:Model>
         <c:Team>
@@ -124,7 +124,7 @@
         <c:AABB/>
         <c:Health/>
         <c:Model>
-          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitCube.mesh</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
         </c:Model>
         <c:Player/>
         <c:Team>
@@ -143,7 +143,7 @@
         <c:AABB/>
         <c:Health/>
         <c:Model>
-          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitCube.mesh</Resource>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
         </c:Model>
         <c:Player/>
         <c:Team>
@@ -160,7 +160,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\DummyScene.mesh</Resource>
+          <Resource>Models/Test/DummyScene.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="-0.600000024" Y="0" Z="0"/>

resources/Schema/Entities/CollisionTestLevel.xml

@@ -6,7 +6,7 @@
 			<Orientation X="0" Y="0" Z="0"/>
 		</c:Transform>
 		<c:Model>
-			<Resource>Models/DummyScene.mesh</Resource>
+			<Resource>Models/Test/DummyScene.mesh</Resource>
 		</c:Model>
 	</Components>
 	<Children>
@@ -28,7 +28,7 @@
 					<Scale X="2" Y="2" Z="2"/>
 				</c:Transform>
 				<c:Model>
-					<Resource>Models/RotationWidgetX.mesh</Resource>
+					<Resource>Models/Widgets/Rotate/RotationWidgetX.mesh</Resource>
 				</c:Model>
 				<c:Trigger>
 				</c:Trigger>

resources/Schema/Entities/EditorTestWorld.xml

@@ -37,7 +37,7 @@
           <Intensity>0.80000001192092896</Intensity>
         </c:DirectionalLight>
         <c:Model>
-          <Resource>Models/DirectionalLightWidget.mesh</Resource>
+          <Resource>Models/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
         </c:Model>
         <c:RaptorCopter>
           <Speed>1</Speed>
@@ -62,7 +62,7 @@
           <RandomnessScalar>3</RandomnessScalar>
         </c:ExplosionEffect>
         <c:Model>
-          <Resource>Models/Assault.mesh</Resource>
+          <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="-1.68900967" Y="0.527161121" Z="-1.59648728"/>
@@ -73,7 +73,7 @@
         <Entity name="SecondaryWeapon">
           <Components>
             <c:Model>
-              <Resource>Models/AssaultWeaponRed.mesh</Resource>
+              <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
               <Transparent>true</Transparent>
             </c:Model>
             <c:Transform>
@@ -86,7 +86,7 @@
         <Entity name="SecondaryWeaponRed">
           <Components>
             <c:Model>
-              <Resource>Models/DefenderGunRed.mesh</Resource>
+              <Resource>Models/Weapons/Red/DefenderGunRed.mesh</Resource>
               <Transparent>true</Transparent>
               <NormalMap>false</NormalMap>
             </c:Model>
@@ -115,7 +115,7 @@
               <Speed>1</Speed>
             </c:Animation>
             <c:Model>
-              <Resource>models/AssaultAnimated.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
             </c:Model>
             <c:Transform>
               <Position X="0.786919653" Y="0" Z="0"/>
@@ -131,7 +131,7 @@
               <Speed>1</Speed>
             </c:Animation>
             <c:Model>
-              <Resource>models/AssaultAnimated.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
             </c:Model>
             <c:Transform/>
           </Components>
@@ -157,7 +157,7 @@
     <Entity name="Log">
       <Components>
         <c:Model>
-          <Resource>Models/Log.mesh</Resource>
+          <Resource>Models/Props/TreeLog.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="-4" Y="0.698000014" Z="-1"/>
@@ -176,7 +176,7 @@
         <Entity name="CombinedSpheres">
           <Components>
             <c:Model>
-              <Resource>models/NormSpecIncdMapSphere.mesh</Resource>
+              <Resource>Models/Test/NormSpecIncdMapSphere.mesh</Resource>
             </c:Model>
             <c:Transform/>
           </Components>
@@ -260,7 +260,7 @@
             <Entity name="NormalSphere">
               <Components>
                 <c:Model>
-                  <Resource>Models/NormalMapSphere.mesh</Resource>
+                  <Resource>Models/Test/NormalMapSphere.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="1.82700014" Y="0" Z="-0.166000009"/>
@@ -271,7 +271,7 @@
             <Entity name="SpecularSphere">
               <Components>
                 <c:Model>
-                  <Resource>Models/SpecularMapSphere.mesh</Resource>
+                  <Resource>Models/Test/SpecularMapSphere.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="-1.06487739" Y="0" Z="1.52336037"/>
@@ -313,7 +313,7 @@
             <Entity name="GlowMap">
               <Components>
                 <c:Model>
-                  <Resource>Models/IncandescenceMapSphere.mesh</Resource>
+                  <Resource>Models/Test/IncandescenceMapSphere.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="-1.10000002" Y="0" Z="-1.80000007"/>

resources/Schema/Entities/EditorWidgetRotate.xml

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

resources/Schema/Entities/EditorWidgetScale.xml

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

resources/Schema/Entities/EditorWidgetTranslate.xml

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

resources/Schema/Entities/GameMap.xml

@@ -9,7 +9,7 @@
     <Entity name="Scenemesh">
       <Components>
         <c:Model>
-          <Resource>Models\MapVersion1.mesh</Resource>
+          <Resource>Models/LevelBase/MapVersion1.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -21,7 +21,7 @@
           <Intensity>2</Intensity>
         </c:DirectionalLight>
         <c:Model>
-          <Resource>Models/DirectionalLightWidget.mesh</Resource>
+          <Resource>Models/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
           <Visible>false</Visible>
         </c:Model>
         <c:Transform>

resources/Schema/Entities/Model.xml

@@ -19,7 +19,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>models/animTest.mesh</Resource>
+          <Resource>Models/Test/AnimTest.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>

resources/Schema/Entities/MovementTest.xml

@@ -42,7 +42,7 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Assault.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
               <Color A="1" B="0" G="0" R="1"/>
             </c:Model>
             <c:Transform>
@@ -55,7 +55,7 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Assault.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
               <Color A="1" B="0.0117647061" G="0" R="1"/>
             </c:Model>
             <c:Transform>
@@ -70,7 +70,7 @@
       <Components>
         <c:DirectionalLight/>
         <c:Model>
-          <Resource>Models/DirectionalLightWidget.mesh</Resource>
+          <Resource>sModels/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="-6.00145912" Y="1.42697716" Z="3.04144025"/>
@@ -153,7 +153,7 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Assault.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
               <Color A="1" B="1" G="0.254901975" R="0"/>
             </c:Model>
             <c:Transform>
@@ -166,7 +166,7 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Assault.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
               <Color A="1" B="1" G="0.254901975" R="0"/>
             </c:Model>
             <c:Transform>
@@ -228,7 +228,7 @@
             <Entity name="CameraModel">
               <Components>
                 <c:Model>
-                  <Resource>Models/Camera.mesh</Resource>
+                  <Resource>Models/Widgets/Camera.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
@@ -243,7 +243,7 @@
           <Components>
             <c:Camera/>
             <c:Model>
-              <Resource>Models/Camera.mesh</Resource>
+              <Resource>Models/Widgets/Camera.mesh</Resource>
               <Visible>false</Visible>
             </c:Model>
             <c:Transform>
@@ -256,7 +256,7 @@
         <Entity name="PlayerModel">
           <Components>
             <c:Model>
-              <Resource>Models/AssaultHeadless.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultHeadless.mesh</Resource>
               <Color A="1" B="0" G="0" R="1"/>
             </c:Model>
             <c:Transform>

resources/Schema/Entities/Player.xml

@@ -50,7 +50,7 @@
         <Entity name="CameraModel">
           <Components>
             <c:Model>
-              <Resource>Models/Camera.mesh</Resource>
+              <Resource>Models/Widgets/Camera.mesh</Resource>
               <Visible>false</Visible>
             </c:Model>
             <c:Transform>
@@ -89,7 +89,7 @@
             <Entity name="Crosshair">
               <Components>
                 <c:Model>
-                  <Resource>Models/CrosshairQuad.mesh</Resource>
+                  <Resource>Models/Weapons/CrosshairQuad.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.200000003"/>
@@ -109,7 +109,7 @@
                   <Randomness>true</Randomness>
                 </c:ExplosionEffect>
                 <c:Model>
-                  <Resource>Models/AssaultWeaponRed.mesh</Resource>
+                  <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="0.180000007" Y="-0.183000013" Z="0"/>
@@ -134,7 +134,7 @@
       <Components>
         <c:Camera/>
         <c:Model>
-          <Resource>Models/Camera.mesh</Resource>
+          <Resource>Models/Widgets/Camera.mesh</Resource>
           <Visible>false</Visible>
         </c:Model>
         <c:Transform>
@@ -153,7 +153,7 @@
         </c:Animation>
         <c:HiddenForLocalPlayer/>
         <c:Model>
-          <Resource>Models/AssaultAnimated.mesh</Resource>
+          <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
           <Color A="1" B="0" G="0" R="1"/>
         </c:Model>
         <c:Transform/>

resources/Schema/Entities/QualityAssurance.xml

@@ -97,7 +97,7 @@
           <Intensity>0.80000001192092896</Intensity>
         </c:DirectionalLight>
         <c:Model>
-          <Resource>Models/DirectionalLightWidget.mesh</Resource>
+          <Resource>Models/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
         </c:Model>
         <c:RaptorCopter>
           <Speed>1</Speed>
@@ -126,7 +126,7 @@
               <Speed>1</Speed>
             </c:Animation>
             <c:Model>
-              <Resource>models/AssaultAnimated.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
             </c:Model>
             <c:Transform>
               <Position X="0.786919653" Y="0" Z="0"/>
@@ -142,7 +142,7 @@
               <Speed>1</Speed>
             </c:Animation>
             <c:Model>
-              <Resource>models/AssaultAnimated.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
             </c:Model>
             <c:Transform/>
           </Components>
@@ -200,7 +200,7 @@
                       <Speed>1</Speed>
                     </c:Animation>
                     <c:Model>
-                      <Resource>Models/AssaultAnimated.mesh</Resource>
+                      <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
                     </c:Model>
                     <c:Transform>
                       <Position X="0" Y="0.5" Z="0"/>
@@ -224,7 +224,7 @@
         <Entity name="CombinedSpheres">
           <Components>
             <c:Model>
-              <Resource>models/NormSpecIncdMapSphere.mesh</Resource>
+              <Resource>Models/Test/NormSpecIncdMapSphere.mesh</Resource>
             </c:Model>
             <c:Transform/>
           </Components>
@@ -308,7 +308,7 @@
             <Entity name="NormalSphere">
               <Components>
                 <c:Model>
-                  <Resource>Models/NormalMapSphere.mesh</Resource>
+                  <Resource>Models/Test/NormalMapSphere.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="1.82700014" Y="0" Z="-0.166000009"/>
@@ -319,7 +319,7 @@
             <Entity name="SpecularSphere">
               <Components>
                 <c:Model>
-                  <Resource>Models/SpecularMapSphere.mesh</Resource>
+                  <Resource>Models/Test/SpecularMapSphere.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="-1.06487739" Y="0" Z="1.52336037"/>
@@ -361,7 +361,7 @@
             <Entity name="GlowMap">
               <Components>
                 <c:Model>
-                  <Resource>Models/IncandescenceMapSphere.mesh</Resource>
+                  <Resource>Models/Test/IncandescenceMapSphere.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="-1.10000002" Y="0" Z="-1.80000007"/>
@@ -422,7 +422,7 @@
               <Components>
                 <c:SpawnPoint/>
                 <c:Model>
-                  <Resource>Models/Assault.mesh</Resource>
+                  <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
                   <Color A="1" B="0" G="0" R="1"/>
                 </c:Model>
                 <c:Transform>
@@ -435,7 +435,7 @@
               <Components>
                 <c:SpawnPoint/>
                 <c:Model>
-                  <Resource>Models/Assault.mesh</Resource>
+                  <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
                   <Color A="1" B="0" G="0" R="1"/>
                 </c:Model>
                 <c:Transform>
@@ -448,7 +448,7 @@
               <Components>
                 <c:SpawnPoint/>
                 <c:Model>
-                  <Resource>Models/Assault.mesh</Resource>
+                  <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
                   <Color A="1" B="0" G="0" R="1"/>
                 </c:Model>
                 <c:Transform>
@@ -461,7 +461,7 @@
               <Components>
                 <c:SpawnPoint/>
                 <c:Model>
-                  <Resource>Models/Assault.mesh</Resource>
+                  <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
                   <Color A="1" B="0" G="0" R="1"/>
                 </c:Model>
                 <c:Transform>
@@ -493,7 +493,7 @@
               <Components>
                 <c:SpawnPoint/>
                 <c:Model>
-                  <Resource>Models/Assault.mesh</Resource>
+                  <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
                   <Color A="1" B="1" G="0" R="0"/>
                 </c:Model>
                 <c:Transform>
@@ -506,7 +506,7 @@
               <Components>
                 <c:SpawnPoint/>
                 <c:Model>
-                  <Resource>Models/Assault.mesh</Resource>
+                  <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
                   <Color A="1" B="1" G="0" R="0"/>
                 </c:Model>
                 <c:Transform>
@@ -519,7 +519,7 @@
               <Components>
                 <c:SpawnPoint/>
                 <c:Model>
-                  <Resource>Models/Assault.mesh</Resource>
+                  <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
                   <Color A="1" B="1" G="0" R="0"/>
                 </c:Model>
                 <c:Transform>
@@ -532,7 +532,7 @@
               <Components>
                 <c:SpawnPoint/>
                 <c:Model>
-                  <Resource>Models/Assault.mesh</Resource>
+                  <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
                   <Color A="1" B="1" G="0" R="0"/>
                 </c:Model>
                 <c:Transform>
@@ -608,7 +608,7 @@
         <Entity name="Assault">
           <Components>
             <c:Model>
-              <Resource>Models/Assault.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
               <Color A="0.572549045" B="1" G="1" R="0"/>
               <Transparent>true</Transparent>
             </c:Model>
@@ -690,7 +690,7 @@
                 <Entity name="Asset">
                   <Components>
                     <c:Model>
-                      <Resource>Models/AssaultWeaponBlue.mesh</Resource>
+                      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
                     </c:Model>
                     <c:Transform>
                       <Position X="0" Y="1" Z="0"/>
@@ -737,7 +737,7 @@
                 <Entity name="Asset">
                   <Components>
                     <c:Model>
-                      <Resource>Models/AssaultWeaponRed.mesh</Resource>
+                      <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
                     </c:Model>
                     <c:Transform>
                       <Position X="0" Y="1" Z="0"/>
@@ -797,7 +797,7 @@
                 <Entity name="Asset">
                   <Components>
                     <c:Model>
-                      <Resource>Models/SecondaryWeapon.mesh</Resource>
+                      <Resource>Models/Weapons/SecondaryWeapon.mesh</Resource>
                     </c:Model>
                     <c:Transform>
                       <Position X="0" Y="1" Z="0"/>
@@ -844,7 +844,7 @@
                 <Entity name="Asset">
                   <Components>
                     <c:Model>
-                      <Resource>Models/AssualtSoft.mesh</Resource>
+                      <Resource>Models/Test/AssaultTPoseSoftEdge.mesh</Resource>
                     </c:Model>
                     <c:Transform>
                       <Position X="0" Y="0.5" Z="0"/>
@@ -890,7 +890,7 @@
                 <Entity name="Asset">
                   <Components>
                     <c:Model>
-                      <Resource>Models/DefenderGunBlue.mesh</Resource>
+                      <Resource>Models/Weapons/Blue/DefenderGunBlue.mesh</Resource>
                     </c:Model>
                     <c:Transform>
                       <Position X="0" Y="1" Z="0"/>
@@ -937,7 +937,7 @@
                 <Entity name="Asset">
                   <Components>
                     <c:Model>
-                      <Resource>Models/DefenderGunRed.mesh</Resource>
+                      <Resource>Models/Weapons/Red/DefenderGunRed.mesh</Resource>
                     </c:Model>
                     <c:Transform>
                       <Position X="0" Y="1" Z="0"/>
@@ -984,7 +984,7 @@
                 <Entity name="Asset">
                   <Components>
                     <c:Model>
-                      <Resource>Models/Assualt.mesh</Resource>
+                      <Resource>Models/Test/AssaultTPoseHardEdge.mesh</Resource>
                     </c:Model>
                     <c:Transform>
                       <Position X="0" Y="0.5" Z="0"/>
@@ -1021,7 +1021,7 @@
         <Entity name="RedTeamHomeCapturePoint">
           <Components>
             <c:Model>
-              <Resource>Models/CapturePoint.mesh</Resource>
+              <Resource>Models/Props/CapturePoint.mesh</Resource>
             </c:Model>
             <c:Transform>
               <Position X="0" Y="0" Z="-30"/>
@@ -1073,7 +1073,7 @@
         <Entity name="RedMiddleCapturePoint">
           <Components>
             <c:Model>
-              <Resource>Models/CapturePoint.mesh</Resource>
+              <Resource>Models/Props/CapturePoint.mesh</Resource>
             </c:Model>
             <c:Transform>
               <Position X="0" Y="0" Z="-15"/>
@@ -1118,7 +1118,7 @@
         <Entity name="MiddleCapturePoint">
           <Components>
             <c:Model>
-              <Resource>Models/CapturePoint.mesh</Resource>
+              <Resource>Models/Props/CapturePoint.mesh</Resource>
             </c:Model>
             <c:Transform/>
           </Components>
@@ -1161,7 +1161,7 @@
         <Entity name="BlueMiddleCaapturePoint">
           <Components>
             <c:Model>
-              <Resource>Models/CapturePoint.mesh</Resource>
+              <Resource>Models/Props/CapturePoint.mesh</Resource>
             </c:Model>
             <c:Transform>
               <Position X="0" Y="0" Z="15"/>
@@ -1207,7 +1207,7 @@
         <Entity name="BlueTeamHomeCapturePoint">
           <Components>
             <c:Model>
-              <Resource>Models/CapturePoint.mesh</Resource>
+              <Resource>Models/Props/CapturePoint.mesh</Resource>
             </c:Model>
             <c:Transform>
               <Position X="0" Y="0" Z="30"/>
@@ -1389,7 +1389,7 @@
                       <Randomness>true</Randomness>
                     </c:ExplosionEffect>
                     <c:Model>
-                      <Resource>Models/AssaultWeaponBlue.mesh</Resource>
+                      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
                       <Transparent>true</Transparent>
                     </c:Model>
                     <c:Transform>
@@ -1442,7 +1442,7 @@
                       <TimeSinceDeath>1.1999860997035228</TimeSinceDeath>
                     </c:ExplosionEffect>
                     <c:Model>
-                      <Resource>Models/Assault.mesh</Resource>
+                      <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
                       <Transparent>true</Transparent>
                     </c:Model>
                     <c:Transform>
@@ -1502,7 +1502,7 @@
                       <Randomness>true</Randomness>
                     </c:ExplosionEffect>
                     <c:Model>
-                      <Resource>Models/AssaultAnimated.mesh</Resource>
+                      <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
                       <Transparent>true</Transparent>
                     </c:Model>
                     <c:Transform>

resources/Schema/Entities/RayBlue.xml

@@ -6,7 +6,7 @@
       <Lifetime>0.25</Lifetime>
     </c:Lifetime>
     <c:Model>
-      <Resource>Models/CylinderBullet.mesh</Resource>
+      <Resource>Models/Weapons/CylinderBullet.mesh</Resource>
       <Color A="0.156862751" B="39.2156868" G="7.84313726" R="0"/>
       <Transparent>true</Transparent>
     </c:Model>

resources/Schema/Entities/RayRed.xml

@@ -6,7 +6,7 @@
       <Lifetime>0.25</Lifetime>
     </c:Lifetime>
     <c:Model>
-      <Resource>Models/CylinderBullet.mesh</Resource>
+      <Resource>Models/Weapons/CylinderBullet.mesh</Resource>
       <Color A="0.156862751" B="0" G="0.525490224" R="39.2156868"/>
       <Transparent>true</Transparent>
     </c:Model>

resources/Schema/Entities/RenderingWorld.xml

@@ -20,7 +20,7 @@
         <Entity name="Model">
           <Components>
             <c:Model>
-              <Resource>Models/Assault.obj</Resource>
+              <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
               <Color A="1" B="3.92156863" G="3.92156863" R="3.92156863"/>
             </c:Model>
             <c:Transform>
@@ -35,7 +35,7 @@
               <FOV>80</FOV>
             </c:Camera>
             <c:Model>
-              <Resource>Models/Camera.mesh</Resource>
+              <Resource>Models/Widgets/Camera.mesh</Resource>
             </c:Model>
             <c:Transform>
               <Position X="0" Y="1.39121652" Z="-0.043014247"/>
@@ -132,7 +132,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>Models/Assault.mesh</Resource>
+          <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
           <Color A="1" B="3.92156863" G="1" R="1"/>
         </c:Model>
         <c:Transform>
@@ -308,7 +308,7 @@
     <Entity>
       <Components>
         <c:Model>
-          <Resource>Models/Assault.mesh</Resource>
+          <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
           <Color A="1" B="1" G="1" R="3.92156863"/>
         </c:Model>
         <c:Transform>
@@ -324,7 +324,7 @@
           <Intensity>0.10000000149011612</Intensity>
         </c:DirectionalLight>
         <c:Model>
-          <Resource>Models/DirectionalLightWidget.mesh</Resource>
+          <Resource>Models/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
           <Color A="1" B="0" G="3.92156863" R="3.92156863"/>
         </c:Model>
         <c:Transform>

resources/Schema/Entities/ShootEventTest.xml

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

resources/Schema/Entities/SpawnPointClusterWithModels.xml

@@ -19,7 +19,7 @@
       <Components>
         <c:SpawnPoint/>
         <c:Model>
-          <Resource>Models/Assault.mesh</Resource>
+          <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="1" Y="0" Z="0"/>
@@ -31,7 +31,7 @@
       <Components>
         <c:SpawnPoint/>
         <c:Model>
-          <Resource>Models/Assault.mesh</Resource>
+          <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="-1" Y="0" Z="0"/>
@@ -43,7 +43,7 @@
       <Components>
         <c:SpawnPoint/>
         <c:Model>
-          <Resource>Models/Assault.mesh</Resource>
+          <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="0" Y="0" Z="1"/>
@@ -55,7 +55,7 @@
       <Components>
         <c:SpawnPoint/>
         <c:Model>
-          <Resource>Models/Assault.mesh</Resource>
+          <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="0" Y="0" Z="-1"/>

resources/Schema/Entities/SpawnerWithPlayerModel.xml

@@ -4,7 +4,7 @@
   <Components>
     <c:SpawnPoint/>
     <c:Model>
-      <Resource>Models/Assault.mesh</Resource>
+      <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
     </c:Model>
     <c:Transform>
       <Position X="1.31625879" Y="0" Z="0"/>

resources/Schema/Entities/Test.xml

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

src/Engine/Network/Client.cpp

@@ -258,11 +258,11 @@ void Client::parseSnapshot(Packet& packet)
     }
 }
 
-int Client::receive(char* data)
+size_t Client::receive(char* data)
 {
     boost::system::error_code error;
 
-    int bytesReceived = m_Socket.receive_from(boost
+    size_t bytesReceived = m_Socket.receive_from(boost
         ::asio::buffer((void*)data, INPUTSIZE),
         m_ReceiverEndpoint,
         0, error);
@@ -390,7 +390,7 @@ void Client::identifyPacketLoss()
 bool Client::hasServerTimedOut()
 {
     // Time in ms
-    float timeSincePing = 1000 * (std::clock() - m_StartPingTime) / static_cast<double>(CLOCKS_PER_SEC);
+    double timeSincePing = 1000 * (std::clock() - m_StartPingTime) / static_cast<double>(CLOCKS_PER_SEC);
     if (timeSincePing > m_TimeoutMs) {
         // Clear everything and go to menu.
         LOG_INFO("Server has timed out, returning to menu, Beep Boop.");

src/Engine/Network/Network.cpp

@@ -26,10 +26,10 @@ void Network::saveToFile()
     outfile << "Total messages received," + std::to_string(m_NetworkData.AmountOfMessagesReceived) + "\n";
     outfile << "Total messages sent," + std::to_string(m_NetworkData.AmountOfMessagesSent) + "\n";
 
-    float messagesReceivedPerSec = (float)m_NetworkData.AmountOfMessagesReceived / (m_NetworkData.TotalTime / 1000);
-    float messagesSentPerSec = (float)m_NetworkData.AmountOfMessagesSent / (m_NetworkData.TotalTime / 1000);
-    float dataReceivedPerSec = (float)m_NetworkData.TotalDataReceived / (m_NetworkData.TotalTime / 1000);
-    float dataSentPerSec = (float)m_NetworkData.TotalDataSent / (m_NetworkData.TotalTime / 1000);
+    double messagesReceivedPerSec = m_NetworkData.AmountOfMessagesReceived / (m_NetworkData.TotalTime / 1000);
+    double messagesSentPerSec = m_NetworkData.AmountOfMessagesSent / (m_NetworkData.TotalTime / 1000);
+    double dataReceivedPerSec = m_NetworkData.TotalDataReceived / (m_NetworkData.TotalTime / 1000);
+    double dataSentPerSec = m_NetworkData.TotalDataSent / (m_NetworkData.TotalTime / 1000);
     outfile << "Avarage messages received / s: " + std::to_string(messagesReceivedPerSec) + "\n";
     outfile << "Avarage messages sents / s: " + std::to_string(messagesSentPerSec) + "\n";
     outfile << "Avarage data received B/s: " + std::to_string(dataReceivedPerSec) + "\n";
@@ -52,7 +52,7 @@ void Network::updateNetworkData()
     if (m_SaveDataIntervalMs < (1000 * (currentTime - m_SaveDataTimer) / (double)CLOCKS_PER_SEC)) {
         // Set values
         m_NetworkData.TotalTime += (1000 * (currentTime - m_SaveDataTimer) / (double)CLOCKS_PER_SEC);
-        m_NetworkData.BandwidthBytes.push_back(std::pair<unsigned int, unsigned int>(m_NetworkData.DataReceivedThisInterval, m_NetworkData.DataSentThisInterval));
+        m_NetworkData.BandwidthBytes.push_back(std::pair<size_t, size_t>(m_NetworkData.DataReceivedThisInterval, m_NetworkData.DataSentThisInterval));
         // Reset interval stuff
         m_SaveDataTimer = std::clock();
         m_NetworkData.DataSentThisInterval = 0;

src/Engine/Network/Packet.cpp

@@ -7,7 +7,7 @@ Packet::Packet(MessageType type, unsigned int& packetID)
 }
 
 // Create message
-Packet::Packet(char* data, const int sizeOfPacket)
+Packet::Packet(char* data, const size_t sizeOfPacket)
 {
     // Resize message
     m_MaxPacketSize = sizeOfPacket;
@@ -45,7 +45,7 @@ void Packet::Init(MessageType type, unsigned int & packetID)
 void Packet::WriteString(const std::string& str)
 {
     // Message, add one extra byte for null terminator
-    int sizeOfString = str.size() + 1;
+    size_t sizeOfString = str.size() + 1;
     if (m_Offset + sizeOfString > m_MaxPacketSize) {
         //LOG_WARNING("Package::WriteString(): Data size in packet exceeded maximum package size. New size is %i bytes\n", m_MaxPacketSize*2);
         resizeData();
@@ -82,7 +82,7 @@ char * Packet::ReadData(int SizeOfData)
         //LOG_WARNING("packet ReadData(): Oh no! You are trying to remove things outside my memory kingdom");
         return nullptr;
     }
-    unsigned int oldReturnDataOffset = m_ReturnDataOffset;
+    size_t oldReturnDataOffset = m_ReturnDataOffset;
     m_ReturnDataOffset += SizeOfData;
     return (m_Data + oldReturnDataOffset);
 }

src/Engine/Network/Server.cpp

@@ -4,7 +4,7 @@ Server::Server() : m_Socket(m_IOService, boost::asio::ip::udp::endpoint(boost::a
 {
     Network::initialize();
     ConfigFile* config = ResourceManager::Load<ConfigFile>("Config.ini");
-    snapshotInterval = 1000 * config->Get<float>("Networking.SnapshotInterval", 0.05);
+    snapshotInterval = 1000 * config->Get<float>("Networking.SnapshotInterval", 0.05f);
     pingIntervalMs = config->Get<float>("Networking.PingIntervalMs", 1000);
 
 }
@@ -43,7 +43,7 @@ void Server::readFromClients()
             bytesRead = receive(readBuffer);
             Packet packet(readBuffer, bytesRead);
             parseMessageType(packet);
-        } catch (const std::exception& err) {
+        } catch (const std::exception&) {
             //LOG_ERROR("%i: Read from client crashed %s", m_PacketID, err.what());
         }
     }
@@ -103,9 +103,9 @@ void Server::parseMessageType(Packet& packet)
     }
 }
 
-int Server::receive(char * data)
+size_t Server::receive(char * data)
 {
-    unsigned int length = m_Socket.receive_from(
+    size_t length = m_Socket.receive_from(
         boost::asio::buffer((void*)data
             , INPUTSIZE)
         , m_ReceiverEndpoint, 0);
@@ -121,7 +121,7 @@ int Server::receive(char * data)
 void Server::send(PlayerID player, Packet& packet)
 {
     try {
-        int bytesSent = m_Socket.send_to(
+        size_t bytesSent = m_Socket.send_to(
             boost::asio::buffer(packet.Data(), packet.Size()),
             m_ConnectedPlayers[player].Endpoint,
             0);
@@ -131,7 +131,7 @@ void Server::send(PlayerID player, Packet& packet)
             m_NetworkData.DataSentThisInterval += packet.Size();
             m_NetworkData.AmountOfMessagesSent++;
         }
-    } catch (const boost::system::system_error& e) {
+    } catch (const boost::system::system_error&) {
         // TODO: Clean up invalid endpoints out of m_ConnectedPlayers later
         m_ConnectedPlayers[player].Endpoint = boost::asio::ip::udp::endpoint();
     }
@@ -231,12 +231,12 @@ void Server::sendPing()
 
 void Server::checkForTimeOuts()
 {
-    int startPing = 1000 * m_StartPingTime
+    double startPing = 1000 * m_StartPingTime
         / static_cast<double>(CLOCKS_PER_SEC);
 
     for (int i = 0; i < m_ConnectedPlayers.size(); i++) {
         if (m_ConnectedPlayers[i].Endpoint.address() != boost::asio::ip::address()) {
-            int stopPing = 1000 * m_ConnectedPlayers[i].StopTime /
+            double stopPing = 1000 * m_ConnectedPlayers[i].StopTime /
                 static_cast<double>(CLOCKS_PER_SEC);
             if (startPing > stopPing + m_TimeoutMs) {
                 LOG_INFO("User %i timed out!", i);

src/Engine/Rendering/DrawColorCorrectionPass.cpp

@@ -27,7 +27,7 @@ void DrawColorCorrectionPass::Draw(GLuint sceneTexture, GLuint bloomTexture, GLf
 
     DrawScreenQuadPassState state = DrawScreenQuadPassState();
     m_ColorCorrectionProgram->Bind();
-    //glClear(GL_COLOR_BUFFER_BIT);
+    glClear(GL_COLOR_BUFFER_BIT);
     glUniform1f(glGetUniformLocation(m_ColorCorrectionProgram->GetHandle(), "Exposure"), exposure);
     glUniform1f(glGetUniformLocation(m_ColorCorrectionProgram->GetHandle(), "Gamma"), gamma);
 

src/Game/Systems/InterpolationSystem.cpp

@@ -5,7 +5,7 @@ InterpolationSystem::InterpolationSystem(World* world, EventBroker* eventBroker)
     , PureSystem("Transform")
 {
     ConfigFile* config = ResourceManager::Load<ConfigFile>("Config.ini");
-    m_SnapshotInterval = config->Get<float>("Networking.SnapshotInterval", 0.05);
+    m_SnapshotInterval = config->Get<float>("Networking.SnapshotInterval", 0.05f);
     EVENT_SUBSCRIBE_MEMBER(m_EInterpolate, &InterpolationSystem::OnInterpolate);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &InterpolationSystem::OnPlayerSpawned);
 }
@@ -18,9 +18,9 @@ void InterpolationSystem::UpdateComponent(EntityWrapper& entity, ComponentWrappe
     }
 
     if (m_NextTransform.find(transform.EntityID) != m_NextTransform.end()) { // Exists in map
-        m_NextTransform[transform.EntityID].interpolationTime += dt;
+        m_NextTransform[transform.EntityID].interpolationTime += static_cast<float>(dt);
         Transform sTransform = m_NextTransform[transform.EntityID];
-        double time = sTransform.interpolationTime;
+        float time = sTransform.interpolationTime;
         if (time > m_SnapshotInterval) {
             if (m_LastReceivedTransform.find(transform.EntityID) != m_LastReceivedTransform.end()) {
                 m_NextTransform[transform.EntityID] = m_LastReceivedTransform[transform.EntityID];