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

src/Core/Scene/CCollisionNode.cpp

@@ -1,7 +1,7 @@
 #include "CCollisionNode.h"
-#include <Core/CDrawUtil.h>
-#include <Core/CGraphics.h>
-#include <Core/CRenderer.h>
+#include "Core/Render/CDrawUtil.h"
+#include "Core/Render/CGraphics.h"
+#include "Core/Render/CRenderer.h"
 
 CCollisionNode::CCollisionNode(CSceneManager *pScene, CSceneNode *pParent, CCollisionMeshGroup *pCollision)
     : CSceneNode(pScene, pParent)

src/Core/Scene/CCollisionNode.h

@@ -2,7 +2,7 @@
 #define CCOLLISIONNODE_H
 
 #include "CSceneNode.h"
-#include <Resource/CCollisionMeshGroup.h>
+#include "Core/Resource/CCollisionMeshGroup.h"
 
 class CCollisionNode : public CSceneNode
 {

src/Core/Scene/CLightNode.cpp

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

src/Core/Scene/CLightNode.h

@@ -2,7 +2,7 @@
 #define CLIGHTNODE_H
 
 #include "CSceneNode.h"
-#include <Resource/CLight.h>
+#include "Core/Resource/CLight.h"
 
 class CLightNode : public CSceneNode
 {

src/Core/Scene/CModelNode.cpp

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

src/Core/Scene/CModelNode.h

@@ -2,7 +2,7 @@
 #define CMODELNODE_H
 
 #include "CSceneNode.h"
-#include <Resource/model/CModel.h>
+#include "Core/Resource/Model/CModel.h"
 
 class CModelNode : public CSceneNode
 {

src/Core/Scene/CSceneManager.cpp

@@ -1,16 +1,16 @@
 #include "CSceneManager.h"
+#include "Core/Render/CGraphics.h"
+#include "Core/Resource/CResCache.h"
+#include "Core/Resource/Script/CScriptLayer.h"
+#include "Core/CRayCollisionTester.h"
+
+#include <Common/Math/CRay.h>
+#include <Common/TString.h>
+#include <FileIO/CFileInStream.h>
 
 #include <list>
 #include <string>
 
-#include <Common/CRay.h>
-#include <Common/CRayCollisionTester.h>
-#include <Common/TString.h>
-#include <Core/CGraphics.h>
-#include <Core/CResCache.h>
-#include <FileIO/CFileInStream.h>
-#include <Resource/script/CScriptLayer.h>
-
 /**
  * This class direly needs a rewrite
  * Future plan is to integrate a "scene layer" system, where nodes are grouped into layers

src/Core/Scene/CSceneManager.h

@@ -1,24 +1,23 @@
 #ifndef CSCENEMANAGER_h
 #define CSCENEMANAGER_h
 
-#include <string>
-#include <vector>
-#include <GL/glew.h>
-
-#include "CAreaAttributes.h"
-#include "CRenderer.h"
-#include "SViewInfo.h"
-#include <Common/SRayIntersection.h>
+#include "CSceneNode.h"
+#include "CRootNode.h"
+#include "CLightNode.h"
+#include "CModelNode.h"
+#include "CScriptNode.h"
+#include "CStaticNode.h"
+#include "CCollisionNode.h"
+#include "Core/Render/CRenderer.h"
+#include "Core/Render/SViewInfo.h"
+#include "Core/Resource/CGameArea.h"
+#include "Core/Resource/CWorld.h"
+#include "Core/CAreaAttributes.h"
+#include "Core/SRayIntersection.h"
 #include <Common/types.h>
-#include <Scene/CSceneNode.h>
-#include <Scene/CRootNode.h>
-#include <Scene/CLightNode.h>
-#include <Scene/CModelNode.h>
-#include <Scene/CScriptNode.h>
-#include <Scene/CStaticNode.h>
-#include <Scene/CCollisionNode.h>
-#include <Resource/CGameArea.h>
-#include <Resource/CWorld.h>
+
+#include <unordered_map>
+#include <vector>
 
 class CSceneManager
 {

src/Core/Scene/CSceneNode.cpp

@@ -1,13 +1,14 @@
 #include "CSceneNode.h"
-#include <Core/CRenderer.h>
+#include "Core/Render/CRenderer.h"
+#include "Core/Render/CGraphics.h"
+#include "Core/Render/CDrawUtil.h"
+#include "Core/Resource/CGameArea.h"
+#include <Common/AnimUtil.h>
+#include <Common/Math/CTransform4f.h>
+
+#include <algorithm>
 #include <gtc/quaternion.hpp>
 #include <gtx/transform.hpp>
-#include <Common/AnimUtil.h>
-#include <Common/CTransform4f.h>
-#include <Resource/CGameArea.h>
-#include <Core/CGraphics.h>
-#include <Core/CDrawUtil.h>
-#include <algorithm>
 
 u32 CSceneNode::smNumNodes = 0;
 CColor CSceneNode::skSelectionTint((u8) 39, 154, 167, 255);

src/Core/Scene/CSceneNode.h

@@ -1,19 +1,19 @@
 #ifndef CSCENENODE_H
 #define CSCENENODE_H
 
-#include <Core/IRenderable.h>
 #include "ENodeType.h"
-#include <Common/CAABox.h>
-#include <Common/CQuaternion.h>
-#include <Common/CRay.h>
-#include <Common/CRayCollisionTester.h>
-#include <Common/CTransform4f.h>
-#include <Common/CVector3f.h>
-#include <Common/ETransformSpace.h>
+#include "Core/Render/ERenderOptions.h"
+#include "Core/Render/IRenderable.h"
+#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 <Core/ERenderOptions.h>
-#include <Resource/CLight.h>
-#include <Resource/CGameArea.h>
 
 class CRenderer;
 class CSceneManager;

src/Core/Scene/CScriptNode.cpp

@@ -1,15 +1,14 @@
 #include "CScriptNode.h"
-#include "script/CScriptExtra.h"
-
+#include "CSceneManager.h"
+#include "Core/Render/CDrawUtil.h"
+#include "Core/Render/CGraphics.h"
+#include "Core/Render/CRenderer.h"
+#include "Core/Resource/CResCache.h"
+#include "Core/Resource/Script/CMasterTemplate.h"
+#include "Core/Resource/Script/CScriptLayer.h"
+#include "Core/ScriptExtra/CScriptExtra.h"
 #include <Common/AnimUtil.h>
-#include <Common/Math.h>
-#include <Core/CDrawUtil.h>
-#include <Core/CGraphics.h>
-#include <Core/CRenderer.h>
-#include <Core/CResCache.h>
-#include <Core/CSceneManager.h>
-#include <Resource/script/CMasterTemplate.h>
-#include <Resource/script/CScriptLayer.h>
+#include <Common/Math/Math.h>
 
 CScriptNode::CScriptNode(CSceneManager *pScene, CSceneNode *pParent, CScriptObject *pObject)
     : CSceneNode(pScene, pParent)

src/Core/Scene/CScriptNode.h

@@ -4,8 +4,8 @@
 #include "CSceneNode.h"
 #include "CModelNode.h"
 #include "CCollisionNode.h"
-#include <Core/CLightParameters.h>
-#include <Resource/script/CScriptObject.h>
+#include "Core/Resource/Script/CScriptObject.h"
+#include "Core/CLightParameters.h"
 
 class CScriptNode : public CSceneNode
 {

src/Core/Scene/CStaticNode.cpp

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

src/Core/Scene/CStaticNode.h

@@ -2,7 +2,7 @@
 #define CSTATICNODE_H
 
 #include "CSceneNode.h"
-#include <Resource/model/CStaticModel.h>
+#include "Core/Resource/Model/CStaticModel.h"
 
 class CStaticNode : public CSceneNode
 {