From 66ff4bd5854e991960eb7752395ee5fdca7152b0 Mon Sep 17 00:00:00 2001 From: Adam Jensen Date: Fri, 28 Oct 2022 14:33:06 +0100 Subject: [PATCH] rename filesystem -> cdcFile --- CMakeLists.txt | 2 +- {filesystem => cdcFile}/ArchiveFileSystem.cpp | 0 {filesystem => cdcFile}/ArchiveFileSystem.h | 0 {filesystem => cdcFile}/CMakeLists.txt | 0 {filesystem => cdcFile}/FileHelpers.cpp | 0 {filesystem => cdcFile}/FileHelpers.h | 0 {filesystem => cdcFile}/FileReceiver.h | 0 {filesystem => cdcFile}/FileSystem.h | 0 {filesystem => cdcFile}/FileSystemLayer.cpp | 0 {filesystem => cdcFile}/FileSystemLayer.h | 0 {filesystem => cdcFile}/FileUserBufferReceiver.cpp | 0 {filesystem => cdcFile}/FileUserBufferReceiver.h | 0 {filesystem => cdcFile}/HackFileSystem.cpp | 0 {filesystem => cdcFile}/HackFileSystem.h | 0 cdcLocale/localstr.cpp | 2 +- drm/ResolveObject.cpp | 4 ++-- drm/ResolveReceiver.cpp | 4 ++-- drm/ResolveReceiver.h | 2 +- drm/sections/ObjectSection.cpp | 4 ++-- game/Main.cpp | 4 ++-- gameshell/linux/MainVM.cpp | 2 +- gameshell/win32/MainVM.cpp | 4 ++-- object/ObjectManager.cpp | 4 ++-- spinnycube.cpp | 8 ++++---- world/stream.cpp | 4 ++-- 25 files changed, 22 insertions(+), 22 deletions(-) rename {filesystem => cdcFile}/ArchiveFileSystem.cpp (100%) rename {filesystem => cdcFile}/ArchiveFileSystem.h (100%) rename {filesystem => cdcFile}/CMakeLists.txt (100%) rename {filesystem => cdcFile}/FileHelpers.cpp (100%) rename {filesystem => cdcFile}/FileHelpers.h (100%) rename {filesystem => cdcFile}/FileReceiver.h (100%) rename {filesystem => cdcFile}/FileSystem.h (100%) rename {filesystem => cdcFile}/FileSystemLayer.cpp (100%) rename {filesystem => cdcFile}/FileSystemLayer.h (100%) rename {filesystem => cdcFile}/FileUserBufferReceiver.cpp (100%) rename {filesystem => cdcFile}/FileUserBufferReceiver.h (100%) rename {filesystem => cdcFile}/HackFileSystem.cpp (100%) rename {filesystem => cdcFile}/HackFileSystem.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c269823..3f7d6bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,7 +150,7 @@ add_subdirectory(allocator) add_subdirectory(animation) add_subdirectory(camera) add_subdirectory(drm) -add_subdirectory(filesystem) +add_subdirectory(cdcFile) add_subdirectory(game) add_subdirectory(gameshell) add_subdirectory(input) diff --git a/filesystem/ArchiveFileSystem.cpp b/cdcFile/ArchiveFileSystem.cpp similarity index 100% rename from filesystem/ArchiveFileSystem.cpp rename to cdcFile/ArchiveFileSystem.cpp diff --git a/filesystem/ArchiveFileSystem.h b/cdcFile/ArchiveFileSystem.h similarity index 100% rename from filesystem/ArchiveFileSystem.h rename to cdcFile/ArchiveFileSystem.h diff --git a/filesystem/CMakeLists.txt b/cdcFile/CMakeLists.txt similarity index 100% rename from filesystem/CMakeLists.txt rename to cdcFile/CMakeLists.txt diff --git a/filesystem/FileHelpers.cpp b/cdcFile/FileHelpers.cpp similarity index 100% rename from filesystem/FileHelpers.cpp rename to cdcFile/FileHelpers.cpp diff --git a/filesystem/FileHelpers.h b/cdcFile/FileHelpers.h similarity index 100% rename from filesystem/FileHelpers.h rename to cdcFile/FileHelpers.h diff --git a/filesystem/FileReceiver.h b/cdcFile/FileReceiver.h similarity index 100% rename from filesystem/FileReceiver.h rename to cdcFile/FileReceiver.h diff --git a/filesystem/FileSystem.h b/cdcFile/FileSystem.h similarity index 100% rename from filesystem/FileSystem.h rename to cdcFile/FileSystem.h diff --git a/filesystem/FileSystemLayer.cpp b/cdcFile/FileSystemLayer.cpp similarity index 100% rename from filesystem/FileSystemLayer.cpp rename to cdcFile/FileSystemLayer.cpp diff --git a/filesystem/FileSystemLayer.h b/cdcFile/FileSystemLayer.h similarity index 100% rename from filesystem/FileSystemLayer.h rename to cdcFile/FileSystemLayer.h diff --git a/filesystem/FileUserBufferReceiver.cpp b/cdcFile/FileUserBufferReceiver.cpp similarity index 100% rename from filesystem/FileUserBufferReceiver.cpp rename to cdcFile/FileUserBufferReceiver.cpp diff --git a/filesystem/FileUserBufferReceiver.h b/cdcFile/FileUserBufferReceiver.h similarity index 100% rename from filesystem/FileUserBufferReceiver.h rename to cdcFile/FileUserBufferReceiver.h diff --git a/filesystem/HackFileSystem.cpp b/cdcFile/HackFileSystem.cpp similarity index 100% rename from filesystem/HackFileSystem.cpp rename to cdcFile/HackFileSystem.cpp diff --git a/filesystem/HackFileSystem.h b/cdcFile/HackFileSystem.h similarity index 100% rename from filesystem/HackFileSystem.h rename to cdcFile/HackFileSystem.h diff --git a/cdcLocale/localstr.cpp b/cdcLocale/localstr.cpp index c71097f..d93e30a 100644 --- a/cdcLocale/localstr.cpp +++ b/cdcLocale/localstr.cpp @@ -1,6 +1,6 @@ #include #include "localstr.h" -#include "../filesystem/FileHelpers.h" +#include "cdcFile/FileHelpers.h" struct LocalizationTable { uint32_t languageCode; diff --git a/drm/ResolveObject.cpp b/drm/ResolveObject.cpp index aa82e82..62233bd 100644 --- a/drm/ResolveObject.cpp +++ b/drm/ResolveObject.cpp @@ -3,8 +3,8 @@ #include "ResolveObject.h" #include "ResolveReceiver.h" #include "ResolveSection.h" // for g_resolveSections -#include "../filesystem/ArchiveFileSystem.h" -#include "../filesystem/FileHelpers.h" +#include "cdcFile/ArchiveFileSystem.h" +#include "cdcFile/FileHelpers.h" // borrowed from ArchiveFileSystem.cpp uint32_t pathCrc32(const char *path); diff --git a/drm/ResolveReceiver.cpp b/drm/ResolveReceiver.cpp index c50987f..9986fb2 100644 --- a/drm/ResolveReceiver.cpp +++ b/drm/ResolveReceiver.cpp @@ -8,8 +8,8 @@ #include "ResolveObject.h" #include "ResolveReceiver.h" #include "ResolveSection.h" -#include "../filesystem/FileSystem.h" -#include "../filesystem/FileUserBufferReceiver.h" +#include "cdcFile/FileSystem.h" +#include "cdcFile/FileUserBufferReceiver.h" extern "C" { #include "../miniz/miniz.h" diff --git a/drm/ResolveReceiver.h b/drm/ResolveReceiver.h index 8337d22..ac103e8 100644 --- a/drm/ResolveReceiver.h +++ b/drm/ResolveReceiver.h @@ -1,7 +1,7 @@ #pragma once #include #include "DRMIndex.h" -#include "../filesystem/FileReceiver.h" +#include "cdcFile/FileReceiver.h" namespace cdc { diff --git a/drm/sections/ObjectSection.cpp b/drm/sections/ObjectSection.cpp index 868552b..0e79a0e 100644 --- a/drm/sections/ObjectSection.cpp +++ b/drm/sections/ObjectSection.cpp @@ -2,8 +2,8 @@ #include #include "ObjectSection.h" #include "../ResolveObject.h" -#include "../../filesystem/FileHelpers.h" -#include "../../filesystem/FileSystem.h" +#include "cdcFile/FileHelpers.h" +#include "cdcFile/FileSystem.h" #include "../../object/Object.h" #include "../../object/ObjectManager.h" #include "config.h" diff --git a/game/Main.cpp b/game/Main.cpp index cc50728..652bee6 100644 --- a/game/Main.cpp +++ b/game/Main.cpp @@ -3,8 +3,8 @@ #include "../drm/Resolve.h" #include "../drm/ResolveObject.h" #include "../drm/ResolveSection.h" -#include "../filesystem/ArchiveFileSystem.h" -#include "../filesystem/FileHelpers.h" +#include "cdcFile/ArchiveFileSystem.h" +#include "cdcFile/FileHelpers.h" #include "../game/Gameloop.h" #include "../game/objects/objects.h" #include "../gameshell/cdcGameShell.h" diff --git a/gameshell/linux/MainVM.cpp b/gameshell/linux/MainVM.cpp index 05b8ff6..003b293 100644 --- a/gameshell/linux/MainVM.cpp +++ b/gameshell/linux/MainVM.cpp @@ -6,7 +6,7 @@ #include "../../rendering/IPCDeviceManager.h" #include "../../rendering/PCDX11DeviceManager.h" #include "../../rendering/PCDX11RenderDevice.h" -#include "../../filesystem/FileHelpers.h" +#include "cdcFile/FileHelpers.h" using namespace cdc; diff --git a/gameshell/win32/MainVM.cpp b/gameshell/win32/MainVM.cpp index 628f319..519404a 100644 --- a/gameshell/win32/MainVM.cpp +++ b/gameshell/win32/MainVM.cpp @@ -1,8 +1,8 @@ #include #include #include "config.h" -#include "../../filesystem/ArchiveFileSystem.h" -#include "../../filesystem/FileHelpers.h" +#include "cdcFile/ArchiveFileSystem.h" +#include "cdcFile/FileHelpers.h" #include "../../game/Main.h" #include "../../imgui/imgui.h" #include "cdcLocale/localstr.h" diff --git a/object/ObjectManager.cpp b/object/ObjectManager.cpp index 583bf29..b8ac5ef 100644 --- a/object/ObjectManager.cpp +++ b/object/ObjectManager.cpp @@ -3,8 +3,8 @@ #include "config.h" #include "ObjectManager.h" #include "../drm/ResolveObject.h" -#include "../filesystem/FileHelpers.h" -#include "../filesystem/FileSystem.h" +#include "cdcFile/FileHelpers.h" +#include "cdcFile/FileSystem.h" #include "../gameshell/cdcGameShell.h" #if ENABLE_IMGUI diff --git a/spinnycube.cpp b/spinnycube.cpp index 4ef81d9..5dfecc9 100644 --- a/spinnycube.cpp +++ b/spinnycube.cpp @@ -18,10 +18,10 @@ #include "drm/ResolveReceiver.h" #include "drm/ResolveSection.h" #include "drm/sections/WaveSection.h" -#include "filesystem/ArchiveFileSystem.h" -#include "filesystem/FileHelpers.h" // for archiveFileSystem_default -#include "filesystem/FileSystem.h" // for enum cdc::FileRequest::Priority -#include "filesystem/FileUserBufferReceiver.h" +#include "cdcFile/ArchiveFileSystem.h" +#include "cdcFile/FileHelpers.h" // for archiveFileSystem_default +#include "cdcFile/FileSystem.h" // for enum cdc::FileRequest::Priority +#include "cdcFile/FileUserBufferReceiver.h" #include "game/dtp/objecttypes/globaldatabase.h" #include "game/Gameloop.h" #include "game/script/game/NsMainMenuMovieController.h" diff --git a/world/stream.cpp b/world/stream.cpp index 3925854..d998a32 100644 --- a/world/stream.cpp +++ b/world/stream.cpp @@ -4,8 +4,8 @@ #include "stream.h" #include "StreamUnit.h" #include "../drm/ResolveObject.h" -#include "../filesystem/FileHelpers.h" -#include "../filesystem/FileSystem.h" +#include "cdcFile/FileHelpers.h" +#include "cdcFile/FileSystem.h" #include "../gameshell/cdcGameShell.h" // for LOAD_UnitFileName #include "../object/ObjectManager.h" // for readAndParseObjectList