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

src/Core/CRayCollisionTester.h

@@ -4,10 +4,10 @@
 #include "SRayIntersection.h"
 #include "Core/Render/SViewInfo.h"
 #include "Core/Resource/Model/CBasicModel.h"
-#include <Common/Math/CAABox.h>
-#include <Common/Math/CRay.h>
-#include <Common/Math/CVector3f.h>
 #include <Common/types.h>
+#include <Math/CAABox.h>
+#include <Math/CRay.h>
+#include <Math/CVector3f.h>
 
 #include <list>
 

src/Core/Core.pro

@@ -6,6 +6,7 @@
 
 QT -= core gui
 QMAKE_CXXFLAGS += /WX
+DEFINES += PWE_CORE
 
 CONFIG += staticlib
 TEMPLATE = lib
@@ -23,14 +24,18 @@ CONFIG (debug, debug|release) {
     TARGET = Cored
 
     # Debug Libs
-    LIBS += -L$$PWD/../../build/Common/ -lCommond \
+    LIBS += -L$$PWD/../../build/FileIO/ -lFileIOd \
+            -L$$PWD/../../build/Common/ -lCommond \
+            -L$$PWD/../../build/Math/ -lMathd \
             -L$$PWD/../../externals/assimp/lib/ -lassimp-vc120-mtd \
             -L$$PWD/../../externals/boost_1_56_0/lib32-msvc-12.0 -llibboost_filesystem-vc120-mt-gd-1_56 \
-            -L$$PWD/../../externals/FileIO/lib/ -lFileIOd \
             -L$$PWD/../../externals/tinyxml2/lib/ -ltinyxml2d
 
+    # Debug Target Dependencies
     win32 {
-        PRE_TARGETDEPS += $$PWD/../../build/Common/Commond.lib
+        PRE_TARGETDEPS += $$PWD/../../build/FileIO/FileIOd.lib \
+                          $$PWD/../../build/Common/Commond.lib \
+                          $$PWD/../../build/Math/Mathd.lib
     }
 }
 
@@ -40,14 +45,18 @@ CONFIG (release, debug|release) {
     TARGET = Core
 
     # Release Libs
-    LIBS += -L$$PWD/../../build/Common/ -lCommon \
+    LIBS += -L$$PWD/../../build/FileIO/ -lFileIO \
+            -L$$PWD/../../build/Common/ -lCommon \
+            -L$$PWD/../../build/Math/ -lMath \
             -L$$PWD/../../externals/assimp/lib/ -lassimp-vc120-mt \
             -L$$PWD/../../externals/boost_1_56_0/lib32-msvc-12.0 -llibboost_filesystem-vc120-mt-1_56 \
-            -L$$PWD/../../externals/FileIO/lib/ -lFileIO \
             -L$$PWD/../../externals/tinyxml2/lib/ -ltinyxml2
 
+    # Release Target Dependencies
     win32 {
-        PRE_TARGETDEPS += -L$$PWD/../../build/Common/Common.lib
+        PRE_TARGETDEPS += $$PWD/../../build/FileIO/FileIO.lib \
+                          $$PWD/../../build/Common/Common.lib \
+                          $$PWD/../../build/Math/Math.lib
     }
 }
 
@@ -60,14 +69,13 @@ LIBS += -L$$PWD/../../externals/glew-1.9.0/lib/ -lglew32s \
 INCLUDEPATH += $$PWD/../ \
                $$PWD/../../externals/assimp/include \
                $$PWD/../../externals/boost_1_56_0 \
-               $$PWD/../../externals/FileIO/include \
                $$PWD/../../externals/glew-1.9.0/include \
                $$PWD/../../externals/glm/glm \
                $$PWD/../../externals/lzo-2.08/include \
                $$PWD/../../externals/tinyxml2/include \
                $$PWD/../../externals/zlib/include
 
-# Source Files
+# Header Files
 HEADERS += \
     Render/CCamera.h \
     Render/CDrawUtil.h \
@@ -171,6 +179,7 @@ HEADERS += \
     OpenGL/CVertexBuffer.h \
     OpenGL/GLCommon.h
 
+# Source Files
 SOURCES += \
     Render/CCamera.cpp \
     Render/CDrawUtil.cpp \

src/Core/OpenGL/CDynamicVertexBuffer.h

@@ -3,8 +3,8 @@
 
 #include "Core/Resource/Model/EVertexDescription.h"
 #include <Common/types.h>
-#include <Common/Math/CVector2f.h>
-#include <Common/Math/CVector3f.h>
+#include <Math/CVector2f.h>
+#include <Math/CVector3f.h>
 
 #include <vector>
 #include <GL/glew.h>

src/Core/OpenGL/CIndexBuffer.h

@@ -2,7 +2,7 @@
 #define CINDEXBUFFER_H
 
 #include <Common/types.h>
-#include <Common/Math/CVector3f.h>
+#include <Math/CVector3f.h>
 #include <GL/glew.h>
 
 class CIndexBuffer

src/Core/Render/CCamera.cpp

@@ -1,7 +1,7 @@
 #include "CCamera.h"
 #include "CGraphics.h"
-#include <Common/Math/CQuaternion.h>
-#include <Common/Math/Math.h>
+#include <Math/CQuaternion.h>
+#include <Math/MathUtil.h>
 #include <gtc/matrix_transform.hpp>
 
 CCamera::CCamera()

src/Core/Render/CCamera.h

@@ -1,15 +1,15 @@
 #ifndef CCAMERA_H
 #define CCAMERA_H
 
-#include <Common/Math/CAABox.h>
-#include <Common/Math/CFrustumPlanes.h>
-#include <Common/Math/CMatrix4f.h>
-#include <Common/Math/CRay.h>
-#include <Common/Math/CVector2i.h>
-#include <Common/Math/CVector3f.h>
 #include <Common/types.h>
 #include <Common/EKeyInputs.h>
 #include <Common/EMouseInputs.h>
+#include <Math/CAABox.h>
+#include <Math/CFrustumPlanes.h>
+#include <Math/CMatrix4f.h>
+#include <Math/CRay.h>
+#include <Math/CVector2i.h>
+#include <Math/CVector3f.h>
 
 enum ECameraMoveMode
 {

src/Core/Render/CDrawUtil.cpp

@@ -2,7 +2,7 @@
 #include "CGraphics.h"
 #include "Core/Resource/CResCache.h"
 #include "Core/Log.h"
-#include <Common/Math/CTransform4f.h>
+#include <Math/CTransform4f.h>
 #include <iostream>
 
 // ************ MEMBER INITIALIZATION ************

src/Core/Render/CGraphics.h

@@ -5,9 +5,9 @@
 #include "Core/OpenGL/CVertexArrayManager.h"
 #include "Core/Resource/CLight.h"
 #include <Common/CColor.h>
-#include <Common/Math/CMatrix4f.h>
-#include <Common/Math/CVector3f.h>
-#include <Common/Math/CVector4f.h>
+#include <Math/CMatrix4f.h>
+#include <Math/CVector3f.h>
+#include <Math/CVector4f.h>
 #include <GL/glew.h>
 
 /**

src/Core/Render/CRenderer.cpp

@@ -4,8 +4,8 @@
 #include "CGraphics.h"
 #include "Core/Resource/CResCache.h"
 #include "Core/Resource/Factory/CTextureDecoder.h"
+#include <Math/CTransform4f.h>
 #include <Common/AnimUtil.h>
-#include <Common/Math/CTransform4f.h>
 
 #include <algorithm>
 #include <iostream>

src/Core/Render/CRenderer.h

@@ -14,9 +14,9 @@
 #include "Core/Resource/CTexture.h"
 #include "Core/Scene/CSceneNode.h"
 
-#include <Common/Math/CAABox.h>
-#include <Common/Math/CMatrix4f.h>
 #include <Common/CColor.h>
+#include <Math/CAABox.h>
+#include <Math/CMatrix4f.h>
 
 #include <GL/glew.h>
 

src/Core/Render/SRenderablePtr.h

@@ -4,8 +4,8 @@
 #include "ERenderCommand.h"
 #include "Core/Resource/CMaterial.h"
 #include "Core/Scene/CSceneNode.h"
-#include <Common/Math/CAABox.h>
 #include <Common/types.h>
+#include <Math/CAABox.h>
 
 struct SRenderablePtr
 {

src/Core/Render/SViewInfo.h

@@ -1,9 +1,9 @@
 #ifndef SVIEWINFO
 #define SVIEWINFO
 
-#include <Common/Math/CFrustumPlanes.h>
-#include <Common/Math/CMatrix4f.h>
-#include <Common/Math/CRay.h>
+#include <Math/CFrustumPlanes.h>
+#include <Math/CMatrix4f.h>
+#include <Math/CRay.h>
 
 struct SViewInfo
 {

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;

src/Core/Scene/CLightNode.cpp

@@ -2,7 +2,7 @@
 #include "Core/Render/CDrawUtil.h"
 #include "Core/Render/CGraphics.h"
 #include "Core/Render/CRenderer.h"
-#include <Common/Math/Math.h>
+#include <Math/MathUtil.h>
 
 CLightNode::CLightNode(CSceneManager *pScene, CSceneNode *pParent, CLight *Light)
     : CSceneNode(pScene, pParent)

src/Core/Scene/CModelNode.cpp

@@ -2,7 +2,7 @@
 #include "Core/Render/CDrawUtil.h"
 #include "Core/Render/CRenderer.h"
 #include "Core/Render/CGraphics.h"
-#include <Common/Math/Math.h>
+#include <Math/MathUtil.h>
 
 CModelNode::CModelNode(CSceneManager *pScene, CSceneNode *pParent, CModel *pModel) : CSceneNode(pScene, pParent)
 {

src/Core/Scene/CSceneManager.cpp

@@ -4,9 +4,9 @@
 #include "Core/Resource/Script/CScriptLayer.h"
 #include "Core/CRayCollisionTester.h"
 
-#include <Common/Math/CRay.h>
-#include <Common/TString.h>
 #include <FileIO/CFileInStream.h>
+#include <Common/TString.h>
+#include <Math/CRay.h>
 
 #include <list>
 #include <string>

src/Core/Scene/CSceneNode.cpp

@@ -4,7 +4,7 @@
 #include "Core/Render/CDrawUtil.h"
 #include "Core/Resource/CGameArea.h"
 #include <Common/AnimUtil.h>
-#include <Common/Math/CTransform4f.h>
+#include <Math/CTransform4f.h>
 
 #include <algorithm>
 #include <gtc/quaternion.hpp>

src/Core/Scene/CSceneNode.h

@@ -7,13 +7,13 @@
 #include "Core/Resource/CLight.h"
 #include "Core/Resource/CGameArea.h"
 #include "Core/CRayCollisionTester.h"
-#include <Common/Math/CAABox.h>
-#include <Common/Math/CQuaternion.h>
-#include <Common/Math/CRay.h>
-#include <Common/Math/CTransform4f.h>
-#include <Common/Math/CVector3f.h>
-#include <Common/Math/ETransformSpace.h>
 #include <Common/types.h>
+#include <Math/CAABox.h>
+#include <Math/CQuaternion.h>
+#include <Math/CRay.h>
+#include <Math/CTransform4f.h>
+#include <Math/CVector3f.h>
+#include <Math/ETransformSpace.h>
 
 class CRenderer;
 class CSceneManager;

src/Core/Scene/CScriptNode.cpp

@@ -8,7 +8,7 @@
 #include "Core/Resource/Script/CScriptLayer.h"
 #include "Core/ScriptExtra/CScriptExtra.h"
 #include <Common/AnimUtil.h>
-#include <Common/Math/Math.h>
+#include <Math/MathUtil.h>
 
 CScriptNode::CScriptNode(CSceneManager *pScene, CSceneNode *pParent, CScriptObject *pObject)
     : CSceneNode(pScene, pParent)

src/Core/Scene/CStaticNode.cpp

@@ -3,7 +3,7 @@
 #include "Core/Render/CDrawUtil.h"
 #include "Core/Render/CRenderer.h"
 #include <Common/AnimUtil.h>
-#include <Common/Math/Math.h>
+#include <Math/MathUtil.h>
 
 CStaticNode::CStaticNode(CSceneManager *pScene, CSceneNode *pParent, CStaticModel *pModel)
     : CSceneNode(pScene, pParent)