refactor: Rename resource/archive to resource/collection

CMakeLists.txt

@@ -135,11 +135,6 @@ set(HEADERS
     src/render/walkmesh.h
     src/render/window.h
     src/resource/2dafile.h
-    src/resource/archive/biffile.h
-    src/resource/archive/erffile.h
-    src/resource/archive/keyfile.h
-    src/resource/archive/pefile.h
-    src/resource/archive/rimfile.h
     src/resource/audio/mp3file.h
     src/resource/audio/wavfile.h
     src/resource/binfile.h
@@ -150,8 +145,13 @@ set(HEADERS
     src/resource/blueprint/trigger.h
     src/resource/blueprint/waypoint.h
     src/resource/bwmfile.h
+    src/resource/collection/biffile.h
+    src/resource/collection/erffile.h
+    src/resource/collection/folder.h
+    src/resource/collection/keyfile.h
+    src/resource/collection/pefile.h
+    src/resource/collection/rimfile.h
     src/resource/dlgfile.h
-    src/resource/folder.h
     src/resource/gfffile.h
     src/resource/image/curfile.h
     src/resource/image/tgafile.h
@@ -268,11 +268,6 @@ set(SOURCES
     src/render/walkmesh.cpp
     src/render/window.cpp
     src/resource/2dafile.cpp
-    src/resource/archive/biffile.cpp
-    src/resource/archive/erffile.cpp
-    src/resource/archive/keyfile.cpp
-    src/resource/archive/pefile.cpp
-    src/resource/archive/rimfile.cpp
     src/resource/audio/mp3file.cpp
     src/resource/audio/wavfile.cpp
     src/resource/binfile.cpp
@@ -283,8 +278,13 @@ set(SOURCES
     src/resource/blueprint/trigger.cpp
     src/resource/blueprint/waypoint.cpp
     src/resource/bwmfile.cpp
+    src/resource/collection/biffile.cpp
+    src/resource/collection/erffile.cpp
+    src/resource/collection/folder.cpp
+    src/resource/collection/keyfile.cpp
+    src/resource/collection/pefile.cpp
+    src/resource/collection/rimfile.cpp
     src/resource/dlgfile.cpp
-    src/resource/folder.cpp
     src/resource/gfffile.cpp
     src/resource/image/curfile.cpp
     src/resource/image/tgafile.cpp
@@ -327,11 +327,11 @@ if(BUILD_TOOLS)
         src/core/pathutil.h
         src/core/types.h
         src/resource/2dafile.h
-        src/resource/archive/biffile.h
-        src/resource/archive/erffile.h
-        src/resource/archive/keyfile.h
-        src/resource/archive/rimfile.h
         src/resource/binfile.h
+        src/resource/collection/biffile.h
+        src/resource/collection/erffile.h
+        src/resource/collection/keyfile.h
+        src/resource/collection/rimfile.h
         src/resource/gfffile.h
         src/resource/tlkfile.h
         src/resource/util.h
@@ -343,11 +343,11 @@ if(BUILD_TOOLS)
         src/core/log.cpp
         src/core/pathutil.cpp
         src/resource/2dafile.cpp
-        src/resource/archive/biffile.cpp
-        src/resource/archive/erffile.cpp
-        src/resource/archive/keyfile.cpp
-        src/resource/archive/rimfile.cpp
         src/resource/binfile.cpp
+        src/resource/collection/biffile.cpp
+        src/resource/collection/erffile.cpp
+        src/resource/collection/keyfile.cpp
+        src/resource/collection/rimfile.cpp
         src/resource/gfffile.cpp
         src/resource/tlkfile.cpp
         src/resource/util.cpp

src/resource/collection/folder.cpp

@@ -19,7 +19,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "util.h"
+#include "../util.h"
 
 using namespace std;
 

src/resource/collection/folder.h

@@ -21,9 +21,9 @@
 
 #include <boost/filesystem.hpp>
 
-#include "../core/types.h"
+#include "../../core/types.h"
 
-#include "types.h"
+#include "../types.h"
 
 namespace reone {
 

src/resource/resources.cpp

@@ -25,13 +25,13 @@
 #include "../core/pathutil.h"
 #include "../core/streamutil.h"
 
-#include "archive/biffile.h"
-#include "archive/erffile.h"
-#include "archive/rimfile.h"
 #include "audio/mp3file.h"
 #include "audio/wavfile.h"
 #include "bwmfile.h"
-#include "folder.h"
+#include "collection/biffile.h"
+#include "collection/erffile.h"
+#include "collection/folder.h"
+#include "collection/rimfile.h"
 #include "image/curfile.h"
 #include "image/tgafile.h"
 #include "image/tpcfile.h"
@@ -108,7 +108,7 @@ void ResourceManager::init(GameVersion version, const boost::filesystem::path &g
     _version = version;
     _gamePath = gamePath;
 
-    loadKeyFile();
+    indexKeyFile();
 
     if (version == GameVersion::KotOR) {
         fs::path patchPath(getPathIgnoreCase(gamePath, kPatchFileName));
@@ -149,7 +149,7 @@ void ResourceManager::init(GameVersion version, const boost::filesystem::path &g
     loadModuleNames();
 }
 
-void ResourceManager::loadKeyFile() {
+void ResourceManager::indexKeyFile() {
     fs::path path(getPathIgnoreCase(_gamePath, kKeyFileName));
 
     if (path.empty()) {

src/resource/resources.h

@@ -31,14 +31,14 @@
 #include "../script/program.h"
 
 #include "2dafile.h"
-#include "archive/keyfile.h"
-#include "archive/pefile.h"
 #include "blueprint/creature.h"
 #include "blueprint/door.h"
 #include "blueprint/item.h"
 #include "blueprint/placeable.h"
 #include "blueprint/trigger.h"
 #include "blueprint/waypoint.h"
+#include "collection/keyfile.h"
+#include "collection/pefile.h"
 #include "gfffile.h"
 #include "tlkfile.h"
 
@@ -92,7 +92,7 @@ private:
 
     ResourceManager &operator=(const ResourceManager &) = delete;
 
-    void loadKeyFile();
+    void indexKeyFile();
     void indexErfFile(const boost::filesystem::path &path);
     void indexFolder(const boost::filesystem::path &path);
     void indexExeFile();

tools/biftool.cpp

@@ -21,7 +21,7 @@
 #include <boost/format.hpp>
 
 #include "src/core/log.h"
-#include "src/resource/archive/biffile.h"
+#include "src/resource/collection/biffile.h"
 #include "src/resource/util.h"
 
 using namespace std;

tools/erftool.cpp

@@ -20,7 +20,7 @@
 #include <boost/format.hpp>
 
 #include "src/core/log.h"
-#include "src/resource/archive/erffile.h"
+#include "src/resource/collection/erffile.h"
 #include "src/resource/util.h"
 
 using namespace std;

tools/rimtool.cpp

@@ -20,7 +20,7 @@
 #include <boost/format.hpp>
 
 #include "src/core/log.h"
-#include "src/resource/archive/rimfile.h"
+#include "src/resource/collection/rimfile.h"
 #include "src/resource/util.h"
 
 using namespace std;

tools/tools.h

@@ -24,7 +24,7 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/property_tree/ptree.hpp>
 
-#include "src/resource/archive/keyfile.h"
+#include "src/resource/collection/keyfile.h"
 
 namespace reone {