Mass refactoring part 2/2: fixing include paths and project files

.gitignore

@@ -9,6 +9,7 @@
 *.so
 *.dll
 *.dylib
+*.pdb
 
 # Qt-es
 
@@ -37,5 +38,6 @@ Makefile*
 bin/*.log
 bin/dump/*
 bin/PrimeWorldEditor.exe
+bin/PrimeWorldEditor-debug.exe
 build/*
 externals/*

src/Common/CColor.h

@@ -3,7 +3,7 @@
 
 #include <FileIO/CInputStream.h>
 #include <FileIO/COutputStream.h>
-#include "CVector4f.h"
+#include "Math/CVector4f.h"
 #include "types.h"
 
 class CColor

src/Common/CUniqueID.cpp

@@ -1,5 +1,5 @@
 #include "CUniqueID.h"
-#include <Common/TString.h>
+#include "TString.h"
 
 #include <iomanip>
 #include <random>

src/Common/Math/CAABox.cpp

@@ -1,8 +1,7 @@
 #include "CAABox.h"
-#include <Common/CTransform4f.h>
-#include <Common/Math.h>
+#include "CTransform4f.h"
+#include "Math.h"
 #include "CRay.h"
-#include "SRayIntersection.h"
 #include <float.h>
 
 CAABox::CAABox()

src/Common/Math/CAABox.h

@@ -1,9 +1,9 @@
 #ifndef CAABOX_H
 #define CAABOX_H
 
+#include "CVector3f.h"
 #include <FileIO/CInputStream.h>
 #include <FileIO/COutputStream.h>
-#include "CVector3f.h"
 #include <utility>
 
 class CRay;

src/Common/Math/CFrustumPlanes.cpp

@@ -1,6 +1,6 @@
 #include "CFrustumPlanes.h"
-#include <Common/Math.h>
-#include <Common/types.h>
+#include "Math.h"
+#include "Common/types.h"
 
 CFrustumPlanes::CFrustumPlanes()
 {

src/Common/Math/CFrustumPlanes.h

@@ -1,9 +1,9 @@
 #ifndef CFRUSTUMPLANES_H
 #define CFRUSTUMPLANES_H
 
-#include <Common/CAABox.h>
-#include <Common/CPlane.h>
-#include <Common/CVector3f.h>
+#include "CAABox.h"
+#include "CPlane.h"
+#include "CVector3f.h"
 
 class CFrustumPlanes
 {

src/Common/Math/CQuaternion.cpp

@@ -1,8 +1,8 @@
 #include "CQuaternion.h"
+#include "CMatrix4f.h"
+#include "Math.h"
 #include <cmath>
 #include <math.h>
-#include "Math.h"
-#include "CMatrix4f.h"
 
 CQuaternion::CQuaternion()
 {

src/Common/Math/CRay.cpp

@@ -1,6 +1,6 @@
 #include "CRay.h"
-#include <Common/CVector4f.h>
-#include <Common/CTransform4f.h>
+#include "CVector4f.h"
+#include "CTransform4f.h"
 #include <iostream>
 
 CRay::CRay()

src/Common/Math/CVector2f.cpp

@@ -1,4 +1,4 @@
-#include "CVector2f.h"
+#include "Common/Math/CVector2f.h"
 
 CVector2f::CVector2f()
 {

src/Common/Math/Math.cpp

@@ -1,5 +1,5 @@
 #include "Math.h"
-#include <Common/CMatrix4f.h>
+#include "CMatrix4f.h"
 #include <gtc/matrix_transform.hpp>
 
 namespace Math

src/Common/Math/Math.h

@@ -1,11 +1,10 @@
-#ifndef MATH
-#define MATH
+#ifndef MATH_H
+#define MATH_H
 
 #include "CAABox.h"
 #include "CRay.h"
 #include "CPlane.h"
 #include "CVector3f.h"
-#include "SRayIntersection.h"
 #include <utility>
 
 namespace Math
@@ -43,5 +42,5 @@ static const float skPi = 3.14159265358979323846f;
 static const float skHalfPi = skPi / 2.f;
 }
 
-#endif // MATH
+#endif // MATH_H
 

src/Core/CAreaAttributes.cpp

@@ -1,6 +1,6 @@
 #include "CAreaAttributes.h"
-#include <Resource/script/CMasterTemplate.h>
-#include <Resource/script/CScriptLayer.h>
+#include "Core/Resource/Script/CMasterTemplate.h"
+#include "Core/Resource/Script/CScriptLayer.h"
 
 CAreaAttributes::CAreaAttributes(CScriptObject *pObj)
 {

src/Core/CAreaAttributes.h

@@ -1,7 +1,7 @@
 #ifndef CAREAATTRIBUTES_H
 #define CAREAATTRIBUTES_H
 
-#include <Resource/script/CScriptObject.h>
+#include "Core/Resource/Script/CScriptObject.h"
 
 class CAreaAttributes
 {

src/Core/CLightParameters.h

@@ -1,8 +1,8 @@
 #ifndef CLIGHTPARAMETERS_H
 #define CLIGHTPARAMETERS_H
 
-#include <Resource/CGameArea.h>
-#include <Resource/script/CProperty.h>
+#include "Core/Resource/CGameArea.h"
+#include "Core/Resource/Script/CProperty.h"
 
 class CLightParameters
 {

src/Core/CRayCollisionTester.cpp

@@ -1,5 +1,5 @@
 #include "CRayCollisionTester.h"
-#include <Scene/CSceneNode.h>
+#include "Core/Scene/CSceneNode.h"
 
 CRayCollisionTester::CRayCollisionTester(const CRay& Ray)
     : mRay(Ray)

src/Core/CRayCollisionTester.h

@@ -1,13 +1,13 @@
 #ifndef CRAYCOLLISIONHELPER_H
 #define CRAYCOLLISIONHELPER_H
 
-#include "CAABox.h"
-#include "CRay.h"
-#include "CVector3f.h"
 #include "SRayIntersection.h"
-#include "types.h"
-#include <Core/SViewInfo.h>
-#include <Resource/model/CBasicModel.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 <list>
 

src/Core/Log.cpp

@@ -1,7 +1,6 @@
+#include <Common/TString.h>
 #include <ctime>
 #include <iostream>
-#include <Common/TString.h>
-#include <QMessageBox>
 
 namespace Log
 {

src/Core/OpenGL/CDynamicVertexBuffer.h

@@ -1,12 +1,13 @@
 #ifndef CDYNAMICVERTEXBUFFER_H
 #define CDYNAMICVERTEXBUFFER_H
 
-#include <GL/glew.h>
+#include "Core/Resource/Model/EVertexDescription.h"
 #include <Common/types.h>
-#include <Common/CVector2f.h>
-#include <Common/CVector3f.h>
-#include <Resource/model/EVertexDescription.h>
+#include <Common/Math/CVector2f.h>
+#include <Common/Math/CVector3f.h>
+
 #include <vector>
+#include <GL/glew.h>
 
 class CDynamicVertexBuffer
 {

src/Core/OpenGL/CFramebuffer.h

@@ -2,8 +2,8 @@
 #define CFRAMEBUFFER_H
 
 #include "CRenderbuffer.h"
-#include <Resource/CTexture.h>
-#include <gl/glew.h>
+#include "Core/Resource/CTexture.h"
+#include <GL/glew.h>
 
 class CFramebuffer
 {

src/Core/OpenGL/CIndexBuffer.h

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

src/Core/OpenGL/CRenderbuffer.h

@@ -1,8 +1,8 @@
 #ifndef CRENDERBUFFER_H
 #define CRENDERBUFFER_H
 
-#include <GL/glew.h>
 #include <Common/types.h>
+#include <GL/glew.h>
 
 class CRenderbuffer
 {

src/Core/OpenGL/CShader.cpp

@@ -1,12 +1,12 @@
 #include "CShader.h"
+#include "Core/Render/CGraphics.h"
+#include <Common/TString.h>
 #include <Common/types.h>
-#include <Core/CGraphics.h>
 #include <FileIO/CTextInStream.h>
 
 #include <fstream>
 #include <iostream>
 #include <sstream>
-#include <string>
 
 bool gDebugDumpShaders = false;
 u64 gFailedCompileCount = 0;

src/Core/OpenGL/CShader.h

@@ -1,8 +1,8 @@
 #ifndef CSHADER_H
 #define CSHADER_H
 
-#include <gl/glew.h>
 #include <Common/TString.h>
+#include <GL/glew.h>
 
 class CShader
 {

src/Core/OpenGL/CShaderGenerator.cpp

@@ -1,8 +1,8 @@
+#include "CShaderGenerator.h"
 #include <iostream>
 #include <fstream>
 #include <sstream>
-#include <gl/glew.h>
-#include "CShaderGenerator.h"
+#include <GL/glew.h>
 
 const TString gkCoordSrc[] = {
     "RawPosition.xyz",

src/Core/OpenGL/CShaderGenerator.h

@@ -1,10 +1,9 @@
 #ifndef SHADERGEN_H
 #define SHADERGEN_H
 
-#include <gl/glew.h>
-
 #include "CShader.h"
-#include <Resource/CMaterial.h>
+#include "Core/Resource/CMaterial.h"
+#include <GL/glew.h>
 
 class CShaderGenerator
 {

src/Core/OpenGL/CUniformBuffer.h

@@ -1,8 +1,8 @@
 #ifndef CUNIFORMBUFFER_H
 #define CUNIFORMBUFFER_H
 
-#include <gl/glew.h>
 #include <Common/types.h>
+#include <GL/glew.h>
 
 class CUniformBuffer
 {

src/Core/OpenGL/CVertexBuffer.cpp

@@ -1,6 +1,5 @@
 #include "CVertexBuffer.h"
 #include "CVertexArrayManager.h"
-#include <Core/CGraphics.h>
 
 CVertexBuffer::CVertexBuffer()
 {

src/Core/OpenGL/CVertexBuffer.h

@@ -1,10 +1,10 @@
 #ifndef CVERTEXBUFFER_H
 #define CVERTEXBUFFER_H
 
-#include <GL/glew.h>
-#include <Resource/model/CVertex.h>
-#include <Resource/model/EVertexDescription.h>
+#include "Core/Resource/Model/CVertex.h"
+#include "Core/Resource/Model/EVertexDescription.h"
 #include <vector>
+#include <GL/glew.h>
 
 class CVertexBuffer
 {

src/Core/OpenGL/GLCommon.h

@@ -1,8 +1,8 @@
 #ifndef GLCOMMON_H
 #define GLCOMMON_H
 
-#include <GL/glew.h>
 #include <Common/types.h>
+#include <GL/glew.h>
 
 enum EBlendFactor
 {

src/Core/Render/CCamera.cpp

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

src/Core/Render/CCamera.h

@@ -1,12 +1,12 @@
 #ifndef CCAMERA_H
 #define CCAMERA_H
 
-#include "CFrustumPlanes.h"
-#include <Common/CAABox.h>
-#include <Common/CMatrix4f.h>
-#include <Common/CRay.h>
-#include <Common/CVector2i.h>
-#include <Common/CVector3f.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>
@@ -22,8 +22,8 @@ enum ECameraMoveMode
  * value via the const get functions. They are not modified in const functions
  * beyond ensuring that all data is valid and synced with everything else (eg
  * mPosition is only modified to ensure it's correct in orbit mode given the
- * target/distance/pitch/yaw; it won't be modified as a camera snap in a const
- * function). */
+ * target/distance/pitch/yaw; it won't be snapped to a different location in a
+ * const function). */
 class CCamera
 {
     ECameraMoveMode mMode;

src/Core/Render/CDrawUtil.cpp

@@ -1,9 +1,9 @@
 #include "CDrawUtil.h"
 #include "CGraphics.h"
-#include "CResCache.h"
-#include <Common/CTransform4f.h>
+#include "Core/Resource/CResCache.h"
+#include "Core/Log.h"
+#include <Common/Math/CTransform4f.h>
 #include <iostream>
-#include "Log.h"
 
 // ************ MEMBER INITIALIZATION ************
 CVertexBuffer CDrawUtil::mGridVertices;

src/Core/Render/CDrawUtil.h

@@ -1,15 +1,15 @@
 #ifndef CDRAWUTIL
 #define CDRAWUTIL
 
-#include <OpenGL/CVertexBuffer.h>
-#include <OpenGL/CDynamicVertexBuffer.h>
-#include <OpenGL/CIndexBuffer.h>
-#include <Resource/model/CModel.h>
-#include <Resource/CLight.h>
+#include "Core/OpenGL/CVertexBuffer.h"
+#include "Core/OpenGL/CDynamicVertexBuffer.h"
+#include "Core/OpenGL/CIndexBuffer.h"
+#include "Core/Resource/model/CModel.h"
+#include "Core/Resource/CLight.h"
 
-// todo: CDrawUtil should work with CRenderer to queue primitives for rendering
-// rather than trying to draw them straight away, so that CDrawUtil functions can
-// be called from anywhere in the codebase and still function correctly
+/* todo: CDrawUtil should work with CRenderer to queue primitives for rendering
+ * rather than trying to draw them straight away, so that CDrawUtil functions can
+ * be called from anywhere in the codebase and still function correctly     */
 class CDrawUtil
 {
     // 7x7 Grid

src/Core/Render/CGraphics.cpp

@@ -1,7 +1,7 @@
 #include "CGraphics.h"
-#include <OpenGL/CShader.h>
-#include <Resource/CMaterial.h>
-#include "Log.h"
+#include "Core/OpenGL/CShader.h"
+#include "Core/Resource/CMaterial.h"
+#include "Core/Log.h"
 
 // ************ MEMBER INITIALIZATION ************
 CUniformBuffer* CGraphics::mpMVPBlockBuffer;

src/Core/Render/CGraphics.h

@@ -1,15 +1,20 @@
 #ifndef CGRAPHICS_H
 #define CGRAPHICS_H
 
+#include "Core/OpenGL/CUniformBuffer.h"
+#include "Core/OpenGL/CVertexArrayManager.h"
+#include "Core/Resource/CLight.h"
 #include <Common/CColor.h>
-#include <Common/CMatrix4f.h>
-#include <Common/CVector3f.h>
-#include <Common/CVector4f.h>
+#include <Common/Math/CMatrix4f.h>
+#include <Common/Math/CVector3f.h>
+#include <Common/Math/CVector4f.h>
 #include <GL/glew.h>
-#include <OpenGL/CUniformBuffer.h>
-#include <OpenGL/CVertexArrayManager.h>
-#include <Resource/CLight.h>
 
+/**
+ * todo: should probably be replaced with a CGraphicsState class which
+ * can be instantiated and is probably more safe/functional than global access.
+ * also,
+ */
 class CGraphics
 {
     static CUniformBuffer *mpMVPBlockBuffer;

src/Core/Render/CRenderBucket.cpp

@@ -1,8 +1,8 @@
 #include "CRenderBucket.h"
-#include <algorithm>
 #include "CDrawUtil.h"
 #include "CGraphics.h"
 #include "CRenderer.h"
+#include <algorithm>
 
 CRenderBucket::CRenderBucket()
 {

src/Core/Render/CRenderer.cpp

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

src/Core/Render/CRenderer.h

@@ -1,8 +1,6 @@
 #ifndef CRENDERER_H
 #define CRENDERER_H
 
-#include <gl/glew.h>
-
 #include "CCamera.h"
 #include "CGraphics.h"
 #include "CRenderBucket.h"
@@ -10,15 +8,17 @@
 #include "ERenderCommand.h"
 #include "SRenderablePtr.h"
 #include "SViewInfo.h"
-#include <Common/CAABox.h>
+#include "Core/OpenGL/CFramebuffer.h"
+#include "Core/Resource/CFont.h"
+#include "Core/Resource/CLight.h"
+#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 <Common/CMatrix4f.h>
-#include <Common/types.h>
-#include <OpenGL/CFramebuffer.h>
-#include <Resource/CFont.h>
-#include <Resource/CLight.h>
-#include <Resource/CTexture.h>
-#include <Scene/CSceneNode.h>
+
+#include <GL/glew.h>
 
 class CRenderer
 {

src/Core/Render/SRenderablePtr.h

@@ -1,11 +1,11 @@
 #ifndef SRENDERABLEPTR_H
 #define SRENDERABLEPTR_H
 
-#include <Common/CAABox.h>
+#include "ERenderCommand.h"
+#include "Core/Resource/CMaterial.h"
+#include "Core/Scene/CSceneNode.h"
+#include <Common/Math/CAABox.h>
 #include <Common/types.h>
-#include <Core/ERenderCommand.h>
-#include <Scene/CSceneNode.h>
-#include <Resource/CMaterial.h>
 
 struct SRenderablePtr
 {

src/Core/Render/SViewInfo.h

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

src/Core/Resource/CAnimSet.cpp

@@ -1,5 +1,4 @@
 #include "CAnimSet.h"
-#include <Core/CResCache.h>
 
 CAnimSet::CAnimSet() : CResource()
 {

src/Core/Resource/CAnimSet.h

@@ -1,11 +1,12 @@
 #ifndef CANIMSET_H
 #define CANIMSET_H
 
-#include <Common/types.h>
-#include <Core/TResPtr.h>
-#include <vector>
-#include "model/CModel.h"
+#include "TResPtr.h"
 #include "CResource.h"
+#include "Core/Resource/Model/CModel.h"
+#include <Common/types.h>
+
+#include <vector>
 
 // will expand later! this is where animation support will come in
 class CAnimSet : public CResource

src/Core/Resource/CAnimationParameters.cpp

@@ -1,7 +1,7 @@
 #include "CAnimationParameters.h"
 #include "CAnimSet.h"
-#include <Core/CResCache.h>
-#include <Core/Log.h>
+#include "CResCache.h"
+#include "Core/Log.h"
 #include <iostream>
 
 CAnimationParameters::CAnimationParameters()

src/Core/Resource/CAnimationParameters.h

@@ -2,9 +2,9 @@
 #define CANIMATIONPARAMETERS_H
 
 #include "CResource.h"
-#include "model/CModel.h"
-#include <Core/TResPtr.h>
+#include "TResPtr.h"
 #include "EFormatVersion.h"
+#include "Core/Resource/Model/CModel.h"
 
 class CAnimationParameters
 {

src/Core/Resource/CCollisionMesh.cpp

@@ -1,5 +1,5 @@
 #include "CCollisionMesh.h"
-#include <Core/CRenderer.h>
+#include "Core/Render/CRenderer.h"
 
 CCollisionMesh::CCollisionMesh()
 {

src/Core/Resource/CCollisionMesh.h

@@ -1,10 +1,10 @@
 #ifndef CCOLLISIONMESH_H
 #define CCOLLISIONMESH_H
 
-#include <Common/CAABox.h>
-#include <OpenGL/CVertexBuffer.h>
-#include <OpenGL/CIndexBuffer.h>
 #include "CResource.h"
+#include "Core/OpenGL/CVertexBuffer.h"
+#include "Core/OpenGL/CIndexBuffer.h"
+#include <Common/Math/CAABox.h>
 
 class CCollisionMesh
 {

src/Core/Resource/CCollisionMeshGroup.h

@@ -3,7 +3,7 @@
 
 #include "CResource.h"
 #include "CCollisionMesh.h"
-#include <Core/TResPtr.h>
+#include "TResPtr.h"
 #include <vector>
 
 class CCollisionMeshGroup : public CResource

src/Core/Resource/CFont.cpp

@@ -1,7 +1,7 @@
 #include "CFont.h"
-#include <Core/CDrawUtil.h>
-#include <Core/CRenderer.h>
-#include <Core/CResCache.h>
+#include "CResCache.h"
+#include "Core/Render/CDrawUtil.h"
+#include "Core/Render/CRenderer.h"
 #include <Common/AnimUtil.h>
 
 CDynamicVertexBuffer CFont::smGlyphVertices;

src/Core/Resource/CFont.h

@@ -3,11 +3,11 @@
 
 #include "CResource.h"
 #include "CTexture.h"
-#include "model/CVertex.h"
+#include "TResPtr.h"
+#include "Core/Resource/Model/CVertex.h"
+#include "Core/OpenGL/CDynamicVertexBuffer.h"
+#include "Core/OpenGL/CIndexBuffer.h"
 #include <Common/types.h>
-#include <Core/TResPtr.h>
-#include <OpenGL/CDynamicVertexBuffer.h>
-#include <OpenGL/CIndexBuffer.h>
 
 #include <string>
 #include <unordered_map>

src/Core/Resource/CGameArea.cpp

@@ -1,6 +1,6 @@
 #include "CGameArea.h"
-#include "script/CScriptLayer.h"
-#include <Core/CRenderer.h>
+#include "Core/Resource/Script/CScriptLayer.h"
+#include "Core/Render/CRenderer.h"
 
 CGameArea::CGameArea() : CResource()
 {

src/Core/Resource/CGameArea.h

@@ -1,14 +1,15 @@
 #ifndef CGAMEAREA_H
 #define CGAMEAREA_H
 
+#include "CResource.h"
 #include "CCollisionMeshGroup.h"
 #include "CLight.h"
 #include "CMaterialSet.h"
-#include "model/CModel.h"
-#include "model/CStaticModel.h"
-#include "CResource.h"
+#include "Core/Resource/Model/CModel.h"
+#include "Core/Resource/Model/CStaticModel.h"
 #include <Common/types.h>
-#include <Common/CTransform4f.h>
+#include <Common/Math/CTransform4f.h>
+
 #include <unordered_map>
 
 class CScriptLayer;

src/Core/Resource/CLight.cpp

@@ -1,7 +1,7 @@
 #include "CLight.h"
+#include "Core/Render/CGraphics.h"
 #include <cmath>
 #include <float.h>
-#include <Core/CGraphics.h>
 
 #define CLIGHT_NO_RADIUS 0x40
 #define CLIGHT_NO_INTENSITY 0x80

src/Core/Resource/CLight.h

@@ -3,8 +3,7 @@
 
 #include <FileIO/CInputStream.h>
 #include <Common/CColor.h>
-#include <Common/CVector3f.h>
-#include <GL/glew.h>
+#include <Common/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/CMaterial.cpp

@@ -1,13 +1,13 @@
 #include "CMaterial.h"
+#include "CResCache.h"
+#include "Core/Render/CDrawUtil.h"
+#include "Core/Render/CRenderer.h"
+#include "Core/OpenGL/GLCommon.h"
+#include "Core/OpenGL/CShaderGenerator.h"
 #include <Common/CHashFNV1A.h>
-#include <Core/CDrawUtil.h>
-#include <Core/CRenderer.h>
-#include <Core/CResCache.h>
-#include <OpenGL/GLCommon.h>
-#include <OpenGL/CShaderGenerator.h>
 
 #include <iostream>
-#include <gl/glew.h>
+#include <GL/glew.h>
 
 u64 CMaterial::sCurrentMaterial = 0;
 CColor CMaterial::sCurrentTint = CColor::skWhite;

src/Core/Resource/CMaterial.h

@@ -4,15 +4,15 @@
 #include "CMaterialPass.h"
 #include "CTexture.h"
 #include "EFormatVersion.h"
-#include "model/EVertexDescription.h"
+#include "TResPtr.h"
+#include "Core/Resource/Model/EVertexDescription.h"
+#include "Core/Render/ERenderOptions.h"
+#include "Core/OpenGL/CShader.h"
+
 #include <Common/CColor.h>
 #include <Common/EnumUtil.h>
 #include <Common/types.h>
-#include <Core/TResPtr.h>
-#include <Core/ERenderOptions.h>
 #include <FileIO/CInputStream.h>
-#include <OpenGL/CShader.h>
-#include <Resource/CTexture.h>
 
 class CMaterialSet;
 

src/Core/Resource/CMaterialPass.cpp

@@ -1,7 +1,7 @@
 #include "CMaterialPass.h"
 #include "CMaterial.h"
+#include "Core/Render/CGraphics.h"
 #include <Common/AnimUtil.h>
-#include <Core/CGraphics.h>
 
 CMaterialPass::CMaterialPass(CMaterial *pParent)
 {

src/Core/Resource/CMaterialPass.h

@@ -1,12 +1,12 @@
 #ifndef CMATERIALPASS_H
 #define CMATERIALPASS_H
 
+#include "TResPtr.h"
+#include "CTexture.h"
+#include "ETevEnums.h"
+#include "Core/Render/ERenderOptions.h"
 #include <Common/CFourCC.h>
 #include <Common/CHashFNV1A.h>
-#include <Core/TResPtr.h>
-#include <Core/ERenderOptions.h>
-#include <Resource/CTexture.h>
-#include "ETevEnums.h"
 
 class CMaterial;
 

src/Core/Resource/CMaterialSet.cpp

@@ -1,5 +1,5 @@
 #include "CMaterialSet.h"
-#include <Core/CResCache.h>
+#include "CResCache.h"
 #include <iostream>
 
 CMaterialSet::CMaterialSet()

src/Core/Resource/CMaterialSet.h

@@ -1,10 +1,10 @@
 #ifndef CMATERIALSET_H
 #define CMATERIALSET_H
 
-#include <FileIO/CInputStream.h>
-#include <Resource/CTexture.h>
-#include <Resource/CMaterial.h>
+#include "CMaterial.h"
+#include "CTexture.h"
 #include "EFormatVersion.h"
+#include <FileIO/CInputStream.h>
 
 class CMaterialSet
 {

src/Core/Resource/CPakFile.cpp

@@ -2,6 +2,7 @@
 #include <Common/types.h>
 #include <FileIO/CMemoryInStream.h>
 #include <FileIO/FileIO.h>
+
 #include <zlib.h>
 #include <lzo/lzo1x.h>
 #include <iostream>

src/Core/Resource/CPakFile.h

@@ -1,10 +1,10 @@
 #ifndef CPAKFILE_H
 #define CPAKFILE_H
 
-#include <Common/types.h>
-#include <FileIO/CFileInStream.h>
 #include "SNamedResource.h"
 #include "SResInfo.h"
+#include <Common/types.h>
+#include <FileIO/CFileInStream.h>
 #include <vector>
 
 class CPakFile

src/Core/Resource/CResCache.cpp

@@ -1,20 +1,18 @@
 #include "CResCache.h"
-#include "Log.h"
+#include "Core/Resource/Factory/CAreaLoader.h"
+#include "Core/Resource/Factory/CAnimSetLoader.h"
+#include "Core/Resource/Factory/CCollisionLoader.h"
+#include "Core/Resource/Factory/CFontLoader.h"
+#include "Core/Resource/Factory/CModelLoader.h"
+#include "Core/Resource/Factory/CScanLoader.h"
+#include "Core/Resource/Factory/CStringLoader.h"
+#include "Core/Resource/Factory/CTextureDecoder.h"
+#include "Core/Resource/Factory/CWorldLoader.h"
+#include "Core/Log.h"
+
 #include <Common/TString.h>
 #include <FileIO/FileIO.h>
 #include <iostream>
-#include <string>
-
-// Loaders
-#include <Resource/factory/CAreaLoader.h>
-#include <Resource/factory/CAnimSetLoader.h>
-#include <Resource/factory/CCollisionLoader.h>
-#include <Resource/factory/CFontLoader.h>
-#include <Resource/factory/CModelLoader.h>
-#include <Resource/factory/CScanLoader.h>
-#include <Resource/factory/CStringLoader.h>
-#include <Resource/factory/CTextureDecoder.h>
-#include <Resource/factory/CWorldLoader.h>
 
 CResCache::CResCache()
 {

src/Core/Resource/CResCache.h

@@ -1,10 +1,10 @@
 #ifndef CRESCACHE_H
 #define CRESCACHE_H
 
+#include "CPakFile.h"
+#include "CResource.h"
 #include <Common/types.h>
 #include <Common/TString.h>
-#include <Resource/CPakFile.h>
-#include <Resource/CResource.h>
 #include <unordered_map>
 
 struct SResSource

src/Core/Resource/CResource.cpp

@@ -1,5 +1,5 @@
 #include "CResource.h"
-#include <Core/CResCache.h>
+#include "CResCache.h"
 #include <iostream>
 
 CResource::CResource()

src/Core/Resource/CScan.h

@@ -4,7 +4,7 @@
 #include "CResource.h"
 #include "CStringTable.h"
 #include "EFormatVersion.h"
-#include <Core/TResPtr.h>
+#include "TResPtr.h"
 
 class CScan : public CResource
 {

src/Core/Resource/CStringTable.h

@@ -2,10 +2,10 @@
 #define CSTRINGTABLE_H
 
 #include "CResource.h"
-#include <Common/types.h>
 #include <Common/CFourCC.h>
+#include <Common/TString.h>
+#include <Common/types.h>
 #include <vector>
-#include <string>
 
 class CStringTable : public CResource
 {

src/Core/Resource/CTexture.h

@@ -1,12 +1,13 @@
 #ifndef CTEXTURE_H
 #define CTEXTURE_H
 
-#include <Common/types.h>
-#include <Common/CVector2f.h>
-#include <FileIO/FileIO.h>
-#include <gl/glew.h>
 #include "CResource.h"
 #include "ETexelFormat.h"
+#include <Common/types.h>
+#include <Common/Math/CVector2f.h>
+#include <FileIO/FileIO.h>
+
+#include <GL/glew.h>
 
 class CTexture : public CResource
 {

src/Core/Resource/CWorld.cpp

@@ -1,6 +1,6 @@
 #include "CWorld.h"
-#include "script/CScriptLayer.h"
-#include <Core/CResCache.h>
+#include "CResCache.h"
+#include "Core/Resource/Script/CScriptLayer.h"
 
 CWorld::CWorld() : CResource()
 {

src/Core/Resource/CWorld.h

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

src/Core/Resource/Cooker/CMaterialCooker.cpp

@@ -1,5 +1,4 @@
 #include "CMaterialCooker.h"
-
 #include <algorithm>
 
 CMaterialCooker::CMaterialCooker()

src/Core/Resource/Cooker/CMaterialCooker.h

@@ -1,9 +1,9 @@
 #ifndef CMATERIALCOOKER_H
 #define CMATERIALCOOKER_H
 
-#include "../CMaterial.h"
-#include "../CMaterialSet.h"
-#include "../EFormatVersion.h"
+#include "Core/Resource/CMaterial.h"
+#include "Core/Resource/CMaterialSet.h"
+#include "Core/Resource/EFormatVersion.h"
 
 class CMaterialCooker
 {

src/Core/Resource/Cooker/CModelCooker.h

@@ -1,8 +1,8 @@
 #ifndef CMODELCOOKER_H
 #define CMODELCOOKER_H
 
-#include "../model/CModel.h"
-#include "../EFormatVersion.h"
+#include "Core/Resource/Model/CModel.h"
+#include "Core/Resource/EFormatVersion.h"
 #include <FileIO/FileIO.h>
 
 class CModelCooker

src/Core/Resource/Cooker/CSectionMgrOut.h

@@ -1,8 +1,8 @@
 #ifndef CBLOCKMGROUT_H
 #define CBLOCKMGROUT_H
 
-#include <FileIO/COutputStream.h>
 #include <Common/types.h>
+#include <FileIO/COutputStream.h>
 #include <vector>
 
 // Small class to manage file sections for CMDL/MREA output

src/Core/Resource/Cooker/CTemplateWriter.cpp

@@ -1,7 +1,8 @@
 #include "CTemplateWriter.h"
-#include "../cooker/CWorldCooker.h"
-#include <tinyxml2.h>
+#include "CWorldCooker.h"
+
 #include <boost/filesystem.hpp>
+#include <tinyxml2.h>
 
 using namespace tinyxml2;
 

src/Core/Resource/Cooker/CTemplateWriter.h

@@ -1,8 +1,9 @@
 #ifndef CTEMPLATEWRITER_H
 #define CTEMPLATEWRITER_H
 
-#include "../script/CMasterTemplate.h"
-#include "../script/CScriptTemplate.h"
+#include "Core/Resource/Script/CMasterTemplate.h"
+#include "Core/Resource/Script/CScriptTemplate.h"
+#include <tinyxml2.h>
 
 class CTemplateWriter
 {

src/Core/Resource/Cooker/CTextureEncoder.h

@@ -1,8 +1,8 @@
 #ifndef CTEXTUREENCODER_H
 #define CTEXTUREENCODER_H
 
-#include "../CTexture.h"
-#include <Core/TResPtr.h>
+#include "Core/Resource/CTexture.h"
+#include "Core/Resource/TResPtr.h"
 
 // Class contains basic functionality right now - only supports directly converting DXT1 to CMPR
 // More advanced functions (including actual encoding!) coming later

src/Core/Resource/Cooker/CWorldCooker.h

@@ -1,8 +1,8 @@
 #ifndef CWORLDCOOKER_H
 #define CWORLDCOOKER_H
 
+#include "Core/Resource/EFormatVersion.h"
 #include <Common/types.h>
-#include "../EFormatVersion.h"
 
 class CWorldCooker
 {

src/Core/Resource/Factory/CAnimSetLoader.cpp

@@ -1,6 +1,6 @@
 #include "CAnimSetLoader.h"
-#include <Core/CResCache.h>
-#include <Core/Log.h>
+#include "Core/Resource/CResCache.h"
+#include "Core/Log.h"
 
 CAnimSetLoader::CAnimSetLoader()
 {

src/Core/Resource/Factory/CAnimSetLoader.h

@@ -1,9 +1,9 @@
 #ifndef CCHARACTERLOADER_H
 #define CCHARACTERLOADER_H
 
-#include "../CAnimSet.h"
-#include "../EFormatVersion.h"
-#include <Core/CResCache.h>
+#include "Core/Resource/CAnimSet.h"
+#include "Core/Resource/EFormatVersion.h"
+#include "Core/Resource/CResCache.h"
 
 class CAnimSetLoader
 {

src/Core/Resource/Factory/CAreaLoader.cpp

@@ -3,10 +3,12 @@
 #include "CModelLoader.h"
 #include "CMaterialLoader.h"
 #include "CScriptLoader.h"
+#include "Core/Log.h"
+
 #include <Common/CFourCC.h>
 #include <Common/CompressionUtil.h>
+
 #include <iostream>
-#include <Core/Log.h>
 
 CAreaLoader::CAreaLoader()
 {

src/Core/Resource/Factory/CAreaLoader.h

@@ -1,12 +1,13 @@
 #ifndef CAREALOADER_H
 #define CAREALOADER_H
 
-#include <FileIO/FileIO.h>
-#include "../CGameArea.h"
-#include "../EFormatVersion.h"
 #include "CBlockMgrIn.h"
-#include <Core/CResCache.h>
-#include <Resource/script/SConnection.h>
+#include "Core/Resource/Script/SConnection.h"
+#include "Core/Resource/CGameArea.h"
+#include "Core/Resource/EFormatVersion.h"
+#include "Core/Resource/CResCache.h"
+
+#include <FileIO/FileIO.h>
 
 class CAreaLoader
 {

src/Core/Resource/Factory/CCollisionLoader.cpp

@@ -1,5 +1,5 @@
 #include "CCollisionLoader.h"
-#include <Core/Log.h>
+#include "Core/Log.h"
 #include <iostream>
 
 CCollisionLoader::CCollisionLoader()

src/Core/Resource/Factory/CCollisionLoader.h

@@ -1,9 +1,9 @@
 #ifndef CCOLLISIONLOADER_H
 #define CCOLLISIONLOADER_H
 
-#include "../CCollisionMesh.h"
-#include "../CCollisionMeshGroup.h"
-#include "../EFormatVersion.h"
+#include "Core/Resource/CCollisionMesh.h"
+#include "Core/Resource/CCollisionMeshGroup.h"
+#include "Core/Resource/EFormatVersion.h"
 
 class CCollisionLoader
 {

src/Core/Resource/Factory/CFontLoader.cpp

@@ -1,5 +1,5 @@
 #include "CFontLoader.h"
-#include <Core/Log.h>
+#include "Core/Log.h"
 #include <iostream>
 
 CFontLoader::CFontLoader()

src/Core/Resource/Factory/CFontLoader.h

@@ -1,9 +1,9 @@
 #ifndef CFONTLOADER_H
 #define CFONTLOADER_H
 
-#include "../CFont.h"
-#include "../EFormatVersion.h"
-#include <Core/CResCache.h>
+#include "Core/Resource/CFont.h"
+#include "Core/Resource/EFormatVersion.h"
+#include "Core/Resource/CResCache.h"
 
 class CFontLoader
 {

src/Core/Resource/Factory/CMaterialLoader.cpp

@@ -1,7 +1,7 @@
 #include "CMaterialLoader.h"
-#include <Core/CResCache.h>
-#include <Core/Log.h>
-#include <OpenGL/GLCommon.h>
+#include "Core/Resource/CResCache.h"
+#include "Core/OpenGL/GLCommon.h"
+#include "Core/Log.h"
 #include <iostream>
 #include <iomanip>
 

src/Core/Resource/Factory/CMaterialLoader.h

@@ -1,9 +1,9 @@
 #ifndef CMATERIALLOADER_H
 #define CMATERIALLOADER_H
 
-#include "../CMaterialSet.h"
-#include "../EFormatVersion.h"
-#include <Core/CResCache.h>
+#include "Core/Resource/CMaterialSet.h"
+#include "Core/Resource/EFormatVersion.h"
+#include "Core/Resource/CResCache.h"
 
 #include <FileIO/FileIO.h>
 #include <assimp/scene.h>

src/Core/Resource/Factory/CModelLoader.cpp

@@ -1,6 +1,6 @@
 #include "CModelLoader.h"
 #include "CMaterialLoader.h"
-#include <Core/Log.h>
+#include "Core/Log.h"
 
 CModelLoader::CModelLoader()
 {

src/Core/Resource/Factory/CModelLoader.h

@@ -1,13 +1,14 @@
 #ifndef CMODELLOADER_H
 #define CMODELLOADER_H
 
-#include "../model/CBasicModel.h"
-#include "../model/CModel.h"
-#include "../EFormatVersion.h"
 #include "CBlockMgrIn.h"
-#include <FileIO/FileIO.h>
-#include <Core/CResCache.h>
+#include "Core/Resource/Model/CBasicModel.h"
+#include "Core/Resource/Model/CModel.h"
+#include "Core/Resource/CResCache.h"
+#include "Core/Resource/EFormatVersion.h"
 #include <Common/EnumUtil.h>
+
+#include <FileIO/FileIO.h>
 #include <assimp/scene.h>
 
 class CModelLoader

src/Core/Resource/Factory/CScanLoader.cpp

@@ -1,6 +1,6 @@
 #include "CScanLoader.h"
-#include <Core/CResCache.h>
-#include <Core/Log.h>
+#include "Core/Resource/CResCache.h"
+#include "Core/Log.h"
 
 CScanLoader::CScanLoader()
 {

src/Core/Resource/Factory/CScanLoader.h

@@ -1,8 +1,8 @@
 #ifndef CSCANLOADER_H
 #define CSCANLOADER_H
 
-#include "../CScan.h"
-#include "../EFormatVersion.h"
+#include "Core/Resource/CScan.h"
+#include "Core/Resource/EFormatVersion.h"
 
 class CScanLoader
 {

src/Core/Resource/Factory/CScriptLoader.cpp

@@ -1,7 +1,7 @@
 #include "CScriptLoader.h"
-#include "../script/CMasterTemplate.h"
-#include <Core/CResCache.h>
-#include <Core/Log.h>
+#include "Core/Resource/Script/CMasterTemplate.h"
+#include "Core/Resource/CResCache.h"
+#include "Core/Log.h"
 #include <iostream>
 #include <sstream>
 

src/Core/Resource/Factory/CScriptLoader.h

@@ -1,11 +1,11 @@
 #ifndef CSCRIPTLOADER_H
 #define CSCRIPTLOADER_H
 
-#include "../script/CScriptObject.h"
-#include "../script/CScriptLayer.h"
-#include "../script/CMasterTemplate.h"
-#include "../CGameArea.h"
-#include <Core/CResCache.h>
+#include "Core/Resource/Script/CScriptObject.h"
+#include "Core/Resource/Script/CScriptLayer.h"
+#include "Core/Resource/Script/CMasterTemplate.h"
+#include "Core/Resource/CGameArea.h"
+#include "Core/Resource/CResCache.h"
 
 class CScriptLoader
 {

src/Core/Resource/Factory/CStringLoader.cpp

@@ -1,5 +1,5 @@
 #include "CStringLoader.h"
-#include <Core/Log.h>
+#include "Core/Log.h"
 
 CStringLoader::CStringLoader()
 {

src/Core/Resource/Factory/CStringLoader.h

@@ -1,10 +1,10 @@
 #ifndef CSTRINGLOADER_H
 #define CSTRINGLOADER_H
 
-#include "../CStringTable.h"
-#include "../EFormatVersion.h"
-#include <Core/CResCache.h>
-#include <Core/TResPtr.h>
+#include "Core/Resource/CStringTable.h"
+#include "Core/Resource/CResCache.h"
+#include "Core/Resource/EFormatVersion.h"
+#include "Core/Resource/TResPtr.h"
 
 class CStringLoader
 {

src/Core/Resource/Factory/CTemplateLoader.cpp

@@ -1,6 +1,6 @@
 #include "CTemplateLoader.h"
 #include "CWorldLoader.h"
-#include <Core/Log.h>
+#include "Core/Log.h"
 
 void CTemplateLoader::LoadBitFlags(tinyxml2::XMLElement *pElem, CBitfieldTemplate *pTemp, const TString& templateName)
 {

src/Core/Resource/Factory/CTemplateLoader.h

@@ -1,8 +1,8 @@
 #ifndef CTEMPLATELOADER_H
 #define CTEMPLATELOADER_H
 
-#include "../script/CMasterTemplate.h"
-#include "../script/CScriptTemplate.h"
+#include "Core/Resource/Script/CMasterTemplate.h"
+#include "Core/Resource/Script/CScriptTemplate.h"
 #include <tinyxml2.h>
 
 class CTemplateLoader

src/Core/Resource/Factory/CTextureDecoder.cpp

@@ -1,6 +1,6 @@
-#include <Common/CColor.h>
-#include <Core/Log.h>
 #include "CTextureDecoder.h"
+#include "Core/Log.h"
+#include <Common/CColor.h>
 
 // A cleanup is warranted at some point. Trying to support both partial + full decode ended up really messy.
 

src/Core/Resource/Factory/CTextureDecoder.h

@@ -1,11 +1,12 @@
 #ifndef CTEXTUREDECODER_H
 #define CTEXTUREDECODER_H
 
-#include <FileIO/FileIO.h>
+#include "Core/Resource/CTexture.h"
+#include "Core/Resource/ETexelFormat.h"
 #include <Common/CColor.h>
 #include <Common/types.h>
-#include "../CTexture.h"
-#include "../ETexelFormat.h"
+
+#include <FileIO/FileIO.h>
 
 class CTextureDecoder
 {