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

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
 {