Splitting Math into a separate subproject and adding FileIO as a PWE subproject

src/Core/Resource/CCollisionMesh.h

@@ -4,7 +4,7 @@
 #include "CResource.h"
 #include "Core/OpenGL/CVertexBuffer.h"
 #include "Core/OpenGL/CIndexBuffer.h"
-#include <Common/Math/CAABox.h>
+#include <Math/CAABox.h>
 
 class CCollisionMesh
 {

src/Core/Resource/CGameArea.h

@@ -8,7 +8,7 @@
 #include "Core/Resource/Model/CModel.h"
 #include "Core/Resource/Model/CStaticModel.h"
 #include <Common/types.h>
-#include <Common/Math/CTransform4f.h>
+#include <Math/CTransform4f.h>
 
 #include <unordered_map>
 

src/Core/Resource/CLight.h

@@ -3,7 +3,7 @@
 
 #include <FileIO/CInputStream.h>
 #include <Common/CColor.h>
-#include <Common/Math/CVector3f.h>
+#include <Math/CVector3f.h>
 
 /* CLight is currently heavily based on the lights system from Metroid Prime,
  * including code reverse engineered from the game's executable. Not yet sure

src/Core/Resource/CTexture.h

@@ -3,9 +3,9 @@
 
 #include "CResource.h"
 #include "ETexelFormat.h"
-#include <Common/types.h>
-#include <Common/Math/CVector2f.h>
 #include <FileIO/FileIO.h>
+#include <Common/types.h>
+#include <Math/CVector2f.h>
 
 #include <GL/glew.h>
 

src/Core/Resource/CWorld.h

@@ -6,7 +6,7 @@
 #include "CStringTable.h"
 #include "SDependency.h"
 #include "Core/Resource/Model/CModel.h"
-#include <Common/Math/CTransform4f.h>
+#include <Math/CTransform4f.h>
 
 class CWorld : public CResource
 {

src/Core/Resource/Model/CBasicModel.h

@@ -4,7 +4,7 @@
 #include "SSurface.h"
 #include "Core/Resource/CResource.h"
 #include "Core/OpenGL/CVertexBuffer.h"
-#include <Common/Math/CAABox.h>
+#include <Math/CAABox.h>
 
 class CBasicModel : public CResource
 {

src/Core/Resource/Model/CVertex.h

@@ -1,9 +1,9 @@
 #ifndef CVERTEX_H
 #define CVERTEX_H
 
-#include <Common/Math/CVector2f.h>
-#include <Common/Math/CVector3f.h>
 #include <Common/CColor.h>
+#include <Math/CVector2f.h>
+#include <Math/CVector3f.h>
 
 class CVertex
 {

src/Core/Resource/Model/SSurface.cpp

@@ -1,7 +1,7 @@
 #include "SSurface.h"
 #include "Core/Render/CDrawUtil.h"
 #include "Core/CRayCollisionTester.h"
-#include <Common/Math/Math.h>
+#include <Math/MathUtil.h>
 
 std::pair<bool,float> SSurface::IntersectsRay(const CRay& Ray, bool allowBackfaces, float LineThreshold)
 {

src/Core/Resource/Model/SSurface.h

@@ -6,10 +6,10 @@
 #include "Core/OpenGL/GLCommon.h"
 #include "Core/SRayIntersection.h"
 #include <Common/types.h>
-#include <Common/Math/CAABox.h>
-#include <Common/Math/CRay.h>
-#include <Common/Math/CTransform4f.h>
-#include <Common/Math/CVector3f.h>
+#include <Math/CAABox.h>
+#include <Math/CRay.h>
+#include <Math/CTransform4f.h>
+#include <Math/CVector3f.h>
 #include <vector>
 
 struct SSurface

src/Core/Resource/Script/CProperty.h

@@ -9,9 +9,9 @@
 #include "Core/Resource/CResource.h"
 #include "Core/Resource/TResPtr.h"
 #include "Core/Resource/CAnimationParameters.h"
-#include <Common/Math/CVector3f.h>
 #include <Common/CColor.h>
 #include <Common/TString.h>
+#include <Math/CVector3f.h>
 #include <list>
 
 class CScriptTemplate;