Integrated FileIO as part of Common instead of a separate subproject

2025-12-21 10:49:23 +00:00 · 2017-05-04 12:18:52 -06:00
parent 336744ed49
commit bdf0d188c3
77 changed files with 650 additions and 697 deletions
--- a/src/Core/CompressionUtil.h
+++ b/src/Core/CompressionUtil.h
@@ -1,7 +1,7 @@
 #ifndef COMPRESSIONUTIL_H
 #define COMPRESSIONUTIL_H

-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>
 #include <Common/TString.h>
 #include <Common/types.h>

--- a/src/Core/Core.pro
+++ b/src/Core/Core.pro
@@ -24,8 +24,7 @@ CONFIG (debug, debug|release) {
    TARGET = Cored

    # Debug Libs
-    LIBS += -L$$BUILD_DIR/FileIO/ -lFileIOd \
-            -L$$BUILD_DIR/Common/ -lCommond \
+    LIBS += -L$$BUILD_DIR/Common/ -lCommond \
            -L$$BUILD_DIR/Math/ -lMathd \
            -L$$EXTERNALS_DIR/assimp/lib/ -lassimp-vc140-mtd \
            -L$$EXTERNALS_DIR/lzo-2.09/lib/ -llzo2d \
@@ -36,8 +35,7 @@ CONFIG (debug, debug|release) {

    # Debug Target Dependencies
    win32 {
-        PRE_TARGETDEPS += $$BUILD_DIR/FileIO/FileIOd.lib \
-                          $$BUILD_DIR/Common/Commond.lib \
+        PRE_TARGETDEPS += $$BUILD_DIR/Common/Commond.lib \
                          $$BUILD_DIR/Math/Mathd.lib
    }
 }
@@ -48,8 +46,7 @@ CONFIG (release, debug|release) {
    TARGET = Core

    # Release Libs
-    LIBS += -L$$BUILD_DIR/FileIO/ -lFileIO \
-            -L$$BUILD_DIR/Common/ -lCommon \
+    LIBS += -L$$BUILD_DIR/Common/ -lCommon \
            -L$$BUILD_DIR/Math/ -lMath \
            -L$$EXTERNALS_DIR/assimp/lib/ -lassimp-vc140-mt \
            -L$$EXTERNALS_DIR/lzo-2.09/lib/ -llzo2 \
@@ -60,8 +57,7 @@ CONFIG (release, debug|release) {

    # Release Target Dependencies
    win32 {
-        PRE_TARGETDEPS += $$BUILD_DIR/FileIO/FileIO.lib \
-                          $$BUILD_DIR/Common/Common.lib \
+        PRE_TARGETDEPS += $$BUILD_DIR/Common/Common.lib \
                          $$BUILD_DIR/Math/Math.lib
    }
 }
--- a/src/Core/GameProject/CDependencyTree.h
+++ b/src/Core/GameProject/CDependencyTree.h
@@ -2,9 +2,9 @@
 #define CDEPENDENCYTREE

 #include "CResourceEntry.h"
-#include <FileIO/FileIO.h>
 #include <Common/AssertMacro.h>
 #include <Common/CAssetID.h>
+#include <Common/FileIO.h>

 class CScriptLayer;
 class CScriptObject;
--- a/src/Core/GameProject/CGameExporter.cpp
+++ b/src/Core/GameProject/CGameExporter.cpp
@@ -5,9 +5,9 @@
 #include "Core/CompressionUtil.h"
 #include "Core/Resource/CWorld.h"
 #include "Core/Resource/Script/CMasterTemplate.h"
-#include <FileIO/FileIO.h>
 #include <Common/AssertMacro.h>
 #include <Common/CScopedTimer.h>
+#include <Common/FileIO.h>
 #include <Common/FileUtil.h>
 #include <Common/Serialization/CXMLWriter.h>
 #include <tinyxml2.h>
--- a/src/Core/GameProject/CGameProject.cpp
+++ b/src/Core/GameProject/CGameProject.cpp
@@ -198,7 +198,7 @@ CGameProject* CGameProject::LoadProject(const TWideString& rkProjPath)
    }

    CTemplateLoader::LoadGameTemplates(pProj->mGame);
-    pProj->mProjFileLock.Lock(*ProjPath);
+    pProj->mProjFileLock.Lock(ProjPath);
    pProj->mpGameInfo->LoadGameInfo(pProj->mGame);
    pProj->mpAudioManager->LoadAssets();
    return pProj;
--- a/src/Core/GameProject/CGameProject.h
+++ b/src/Core/GameProject/CGameProject.h
@@ -6,12 +6,12 @@
 #include "CResourceStore.h"
 #include "Core/CAudioManager.h"
 #include "Core/Resource/Script/CMasterTemplate.h"
-#include <FileIO/CFileLock.h>
 #include <Common/CAssetID.h>
 #include <Common/EGame.h>
 #include <Common/FileUtil.h>
 #include <Common/TString.h>
 #include <Common/types.h>
+#include <Common/FileIO/CFileLock.h>

 class CGameProject
 {
--- a/src/Core/GameProject/CPackage.cpp
+++ b/src/Core/GameProject/CPackage.cpp
@@ -3,8 +3,8 @@
 #include "CGameProject.h"
 #include "Core/CompressionUtil.h"
 #include "Core/Resource/Cooker/CWorldCooker.h"
-#include <FileIO/FileIO.h>
 #include <Common/AssertMacro.h>
+#include <Common/FileIO.h>
 #include <Common/FileUtil.h>
 #include <Common/Serialization/XML.h>

--- a/src/Core/GameProject/CResourceEntry.cpp
+++ b/src/Core/GameProject/CResourceEntry.cpp
@@ -4,7 +4,7 @@
 #include "Core/Resource/CResource.h"
 #include "Core/Resource/Cooker/CResourceCooker.h"
 #include "Core/Resource/Factory/CResourceFactory.h"
-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>
 #include <Common/FileUtil.h>
 #include <Common/TString.h>
 #include <Common/Serialization/CXMLReader.h>
--- a/src/Core/OpenGL/CShader.cpp
+++ b/src/Core/OpenGL/CShader.cpp
@@ -3,7 +3,7 @@
 #include <Common/Log.h>
 #include <Common/TString.h>
 #include <Common/types.h>
-#include <FileIO/CTextInStream.h>
+#include <Common/FileIO/CTextInStream.h>

 #include <fstream>
 #include <sstream>
--- a/src/Core/Resource/CLight.h
+++ b/src/Core/Resource/CLight.h
@@ -1,8 +1,8 @@
 #ifndef CLIGHT_H
 #define CLIGHT_H

-#include <FileIO/IInputStream.h>
 #include <Common/CColor.h>
+#include <Common/FileIO/IInputStream.h>
 #include <Math/CVector3f.h>

 /* CLight is currently heavily based on the lights system from Metroid Prime,
--- a/src/Core/Resource/CMaterial.h
+++ b/src/Core/Resource/CMaterial.h
@@ -12,7 +12,7 @@
 #include <Common/EGame.h>
 #include <Common/Flags.h>
 #include <Common/types.h>
-#include <FileIO/IInputStream.h>
+#include <Common/FileIO/IInputStream.h>

 class CMaterialSet;

--- a/src/Core/Resource/CMaterialSet.h
+++ b/src/Core/Resource/CMaterialSet.h
@@ -3,8 +3,8 @@

 #include "CMaterial.h"
 #include "CTexture.h"
-#include <FileIO/IInputStream.h>
 #include <Common/EGame.h>
+#include <Common/FileIO/IInputStream.h>

 class CMaterialSet
 {
--- a/src/Core/Resource/CTexture.h
+++ b/src/Core/Resource/CTexture.h
@@ -3,7 +3,7 @@

 #include "CResource.h"
 #include "ETexelFormat.h"
-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>
 #include <Common/types.h>
 #include <Math/CVector2f.h>

--- a/src/Core/Resource/Cooker/CAreaCooker.h
+++ b/src/Core/Resource/Cooker/CAreaCooker.h
@@ -3,8 +3,8 @@

 #include "CSectionMgrOut.h"
 #include "Core/Resource/Area/CGameArea.h"
-#include <FileIO/FileIO.h>
 #include <Common/EGame.h>
+#include <Common/FileIO.h>

 class CAreaCooker
 {
--- a/src/Core/Resource/Cooker/CModelCooker.h
+++ b/src/Core/Resource/Cooker/CModelCooker.h
@@ -2,8 +2,8 @@
 #define CMODELCOOKER_H

 #include "Core/Resource/Model/CModel.h"
-#include <FileIO/FileIO.h>
 #include <Common/EGame.h>
+#include <Common/FileIO.h>

 class CModelCooker
 {
--- a/src/Core/Resource/Cooker/CPoiToWorldCooker.h
+++ b/src/Core/Resource/Cooker/CPoiToWorldCooker.h
@@ -2,7 +2,7 @@
 #define CPOITOWORLDCOOKER_H

 #include "Core/Resource/CPoiToWorld.h"
-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>

 class CPoiToWorldCooker
 {
--- a/src/Core/Resource/Cooker/CScriptCooker.h
+++ b/src/Core/Resource/Cooker/CScriptCooker.h
@@ -3,8 +3,8 @@

 #include "Core/Resource/Script/CScriptLayer.h"
 #include "Core/Resource/Script/CScriptObject.h"
-#include <FileIO/FileIO.h>
 #include <Common/EGame.h>
+#include <Common/FileIO.h>

 class CScriptCooker
 {
--- a/src/Core/Resource/Cooker/CSectionMgrOut.h
+++ b/src/Core/Resource/Cooker/CSectionMgrOut.h
@@ -2,7 +2,7 @@
 #define CBLOCKMGROUT_H

 #include <Common/types.h>
-#include <FileIO/IOutputStream.h>
+#include <Common/FileIO/IOutputStream.h>
 #include <vector>

 // Small class to manage file sections for CMDL/MREA output
--- a/src/Core/Resource/Factory/CAreaLoader.h
+++ b/src/Core/Resource/Factory/CAreaLoader.h
@@ -6,8 +6,7 @@
 #include "Core/Resource/Area/CGameArea.h"
 #include "Core/Resource/Script/CLink.h"
 #include <Common/EGame.h>
-
-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>

 class CAreaLoader
 {
--- a/src/Core/Resource/Factory/CMaterialLoader.h
+++ b/src/Core/Resource/Factory/CMaterialLoader.h
@@ -5,7 +5,7 @@
 #include "Core/Resource/CMaterialSet.h"
 #include <Common/EGame.h>

-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>
 #include <assimp/scene.h>

 class CMaterialLoader
--- a/src/Core/Resource/Factory/CModelLoader.h
+++ b/src/Core/Resource/Factory/CModelLoader.h
@@ -6,9 +6,9 @@
 #include "Core/Resource/Model/CBasicModel.h"
 #include "Core/Resource/Model/CModel.h"
 #include <Common/EGame.h>
+#include <Common/FileIO.h>
 #include <Common/Flags.h>

-#include <FileIO/FileIO.h>
 #include <assimp/scene.h>

 class CModelLoader
--- a/src/Core/Resource/Factory/CSectionMgrIn.h
+++ b/src/Core/Resource/Factory/CSectionMgrIn.h
@@ -1,8 +1,8 @@
 #ifndef CSECTIONMGRIN_H
 #define CSECTIONMGRIN_H

-#include <FileIO/IInputStream.h>
 #include <Common/types.h>
+#include <Common/FileIO/IInputStream.h>
 #include <vector>

 // The purpose of this class is to keep track of data block navigation - required to read CMDL and MREA files correctly
--- a/src/Core/Resource/Factory/CTextureDecoder.h
+++ b/src/Core/Resource/Factory/CTextureDecoder.h
@@ -6,7 +6,7 @@
 #include <Common/CColor.h>
 #include <Common/types.h>

-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>

 class CTextureDecoder
 {
--- a/src/Core/Resource/Factory/CWorldLoader.h
+++ b/src/Core/Resource/Factory/CWorldLoader.h
@@ -4,8 +4,7 @@
 #include "Core/GameProject/CResourceStore.h"
 #include "Core/Resource/CWorld.h"
 #include <Common/EGame.h>
-
-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>

 class CWorldLoader
 {
--- a/src/Core/Scene/CScene.cpp
+++ b/src/Core/Scene/CScene.cpp
@@ -5,7 +5,7 @@
 #include "Core/Resource/Script/CScriptLayer.h"
 #include "Core/CRayCollisionTester.h"

-#include <FileIO/CFileInStream.h>
+#include <Common/FileIO/CFileInStream.h>
 #include <Common/TString.h>
 #include <Math/CRay.h>