refactor: Move file loaders into format subdirectory

CMakeLists.txt

@@ -95,44 +95,44 @@ set_target_properties(libcommon PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINA
 ## libresource static library
 
 set(RESOURCE_HEADERS
-    src/resource/2dafile.h
-    src/resource/biffile.h
-    src/resource/binfile.h
-    src/resource/erffile.h
     src/resource/folder.h
-    src/resource/gfffile.h
+    src/resource/format/2dafile.h
+    src/resource/format/biffile.h
+    src/resource/format/binfile.h
+    src/resource/format/erffile.h
+    src/resource/format/gfffile.h
+    src/resource/format/keyfile.h
+    src/resource/format/ltrfile.h
+    src/resource/format/lytfile.h
+    src/resource/format/pefile.h
+    src/resource/format/rimfile.h
+    src/resource/format/tlkfile.h
+    src/resource/format/visfile.h
     src/resource/keybifprovider.h
-    src/resource/keyfile.h
-    src/resource/ltrfile.h
-    src/resource/lytfile.h
-    src/resource/pefile.h
     src/resource/resourceprovider.h
     src/resource/resources.h
-    src/resource/rimfile.h
     src/resource/stringprocessor.h
-    src/resource/tlkfile.h
     src/resource/types.h
-    src/resource/typeutil.h
-    src/resource/visfile.h)
+    src/resource/typeutil.h)
 
 set(RESOURCE_SOURCES
-    src/resource/2dafile.cpp
-    src/resource/biffile.cpp
-    src/resource/binfile.cpp
-    src/resource/erffile.cpp
     src/resource/folder.cpp
-    src/resource/gfffile.cpp
+    src/resource/format/2dafile.cpp
+    src/resource/format/biffile.cpp
+    src/resource/format/binfile.cpp
+    src/resource/format/erffile.cpp
+    src/resource/format/gfffile.cpp
+    src/resource/format/keyfile.cpp
+    src/resource/format/ltrfile.cpp
+    src/resource/format/lytfile.cpp
+    src/resource/format/pefile.cpp
+    src/resource/format/rimfile.cpp
+    src/resource/format/tlkfile.cpp
+    src/resource/format/visfile.cpp
     src/resource/keybifprovider.cpp
-    src/resource/keyfile.cpp
-    src/resource/ltrfile.cpp
-    src/resource/lytfile.cpp
-    src/resource/pefile.cpp
-    src/resource/rimfile.cpp
     src/resource/resources.cpp
     src/resource/stringprocessor.cpp
-    src/resource/tlkfile.cpp
-    src/resource/typeutil.cpp
-    src/resource/visfile.cpp)
+    src/resource/typeutil.cpp)
 
 add_library(libresource STATIC ${RESOURCE_HEADERS} ${RESOURCE_SOURCES})
 set_target_properties(libresource PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

src/audio/format/wavfile.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "../../resource/binfile.h"
+#include "../../resource/format/binfile.h"
 
 #include "../stream.h"
 

src/game/blueprint/creature.h

@@ -21,7 +21,7 @@
 #include <memory>
 #include <vector>
 
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 
 #include "../rp/attributes.h"
 

src/game/blueprint/door.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <memory>
 
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 
 namespace reone {
 

src/game/blueprint/item.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <memory>
 
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 
 namespace reone {
 

src/game/blueprint/placeable.h

@@ -22,7 +22,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 
 namespace reone {
 

src/game/blueprint/sound.cpp

@@ -21,7 +21,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "../../resource/2dafile.h"
+#include "../../resource/format/2dafile.h"
 #include "../../resource/resources.h"
 
 #include "../object/sound.h"

src/game/blueprint/sound.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <memory>
 
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 
 namespace reone {
 

src/game/blueprint/trigger.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <memory>
 
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 
 namespace reone {
 

src/game/dialog.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include "../resource/gfffile.h"
+#include "../resource/format/gfffile.h"
 
 namespace reone {
 

src/game/gui/chargen/nameentry.h

@@ -18,7 +18,7 @@
 #pragma once
 
 #include "../../../gui/textinput.h"
-#include "../../../resource/ltrfile.h"
+#include "../../../resource/format/ltrfile.h"
 
 #include "../gui.h"
 

src/game/map.h

@@ -24,7 +24,7 @@
 #include "glm/vec4.hpp"
 
 #include "../render/texture.h"
-#include "../resource/gfffile.h"
+#include "../resource/format/gfffile.h"
 
 namespace reone {
 

src/game/object/area.cpp

@@ -29,8 +29,8 @@
 #include "../../common/streamutil.h"
 #include "../../render/models.h"
 #include "../../render/walkmeshes.h"
-#include "../../resource/lytfile.h"
-#include "../../resource/visfile.h"
+#include "../../resource/format/lytfile.h"
+#include "../../resource/format/visfile.h"
 #include "../../resource/resources.h"
 #include "../../scene/node/cubenode.h"
 

src/game/object/area.h

@@ -26,7 +26,7 @@
 
 #include "../../common/timer.h"
 #include "../../render/types.h"
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 #include "../../resource/types.h"
 
 #include "../actionexecutor.h"

src/game/object/creature.h

@@ -20,8 +20,8 @@
 #include <atomic>
 #include <functional>
 
-#include "../../resource/2dafile.h"
-#include "../../resource/gfffile.h"
+#include "../../resource/format/2dafile.h"
+#include "../../resource/format/gfffile.h"
 #include "../../script/types.h"
 
 #include "../blueprint/blueprint.h"

src/game/object/door.h

@@ -19,7 +19,7 @@
 
 #include "spatial.h"
 
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 
 #include "../blueprint/door.h"
 

src/game/object/item.h

@@ -21,7 +21,7 @@
 
 #include "../../render/model/model.h"
 #include "../../render/texture.h"
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 
 #include "../blueprint/item.h"
 #include "../types.h"

src/game/object/module.h

@@ -24,7 +24,7 @@
 #include "SDL2/SDL_events.h"
 
 #include "../../render/types.h"
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 #include "../../resource/types.h"
 
 #include "../player.h"

src/game/object/placeable.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 
 #include "../blueprint/placeable.h"
 

src/game/object/placeablecamera.h

@@ -19,7 +19,7 @@
 
 #include "spatial.h"
 
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 
 #include "../camera/camera.h"
 

src/game/object/sound.h

@@ -19,7 +19,7 @@
 
 #include "spatial.h"
 
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 
 namespace reone {
 

src/game/object/trigger.h

@@ -19,7 +19,7 @@
 
 #include <set>
 
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 
 #include "spatial.h"
 

src/game/object/waypoint.h

@@ -19,7 +19,7 @@
 
 #include "spatial.h"
 
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 
 namespace reone {
 

src/game/path.h

@@ -21,7 +21,7 @@
 
 #include <glm/vec2.hpp>
 
-#include "../resource/gfffile.h"
+#include "../resource/format/gfffile.h"
 
 namespace reone {
 

src/game/rp/class.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <unordered_set>
 
-#include "../../resource/2dafile.h"
+#include "../../resource/format/2dafile.h"
 
 #include "attributes.h"
 #include "savingthrows.h"

src/gui/control/control.h

@@ -27,7 +27,7 @@
 #include "../../render/font.h"
 #include "../../render/framebuffer.h"
 #include "../../render/texture.h"
-#include "../../resource/gfffile.h"
+#include "../../resource/format/gfffile.h"
 #include "../../scene/node/modelscenenode.h"
 #include "../../scene/pipeline/control.h"
 #include "../../scene/scenegraph.h"

src/gui/gui.h

@@ -24,7 +24,7 @@
 #include "glm/mat4x4.hpp"
 #include "glm/vec2.hpp"
 
-#include "../resource/gfffile.h"
+#include "../resource/format/gfffile.h"
 #include "../resource/types.h"
 
 #include "control/control.h"

src/render/bwmfile.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "../resource/binfile.h"
+#include "../resource/format/binfile.h"
 
 #include "walkmesh.h"
 

src/render/image/curfile.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "../../resource/binfile.h"
+#include "../../resource/format/binfile.h"
 
 #include "../texture.h"
 

src/render/image/tgafile.h

@@ -19,7 +19,7 @@
 
 #include <memory>
 
-#include "../../resource/binfile.h"
+#include "../../resource/format/binfile.h"
 
 #include "../texture.h"
 

src/render/image/tpcfile.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "../../resource/binfile.h"
+#include "../../resource/format/binfile.h"
 
 #include "../texture.h"
 

src/render/model/mdlfile.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "../../resource/binfile.h"
+#include "../../resource/format/binfile.h"
 #include "../../resource/types.h"
 
 #include "../model/model.h"

src/resource/format/2dafile.cpp

@@ -22,7 +22,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
 
-#include "../common/log.h"
+#include "../../common/log.h"
 
 using namespace std;
 

src/resource/format/binfile.h

@@ -24,8 +24,8 @@
 
 #include <boost/filesystem.hpp>
 
-#include "../common/streamreader.h"
-#include "../common/types.h"
+#include "../../common/streamreader.h"
+#include "../../common/types.h"
 
 namespace reone {
 

src/resource/format/erffile.h

@@ -17,9 +17,10 @@
 
 #pragma once
 
+#include "../resourceprovider.h"
+#include "../types.h"
+
 #include "binfile.h"
-#include "resourceprovider.h"
-#include "types.h"
 
 namespace reone {
 

src/resource/format/keyfile.h

@@ -17,8 +17,9 @@
 
 #pragma once
 
+#include "../types.h"
+
 #include "binfile.h"
-#include "types.h"
 
 namespace reone {
 

src/resource/format/ltrfile.cpp

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

src/resource/format/pefile.cpp

@@ -17,7 +17,7 @@
 
 #include "pefile.h"
 
-#include "../common/log.h"
+#include "../../common/log.h"
 
 using namespace std;
 

src/resource/format/rimfile.h

@@ -17,9 +17,10 @@
 
 #pragma once
 
+#include "../resourceprovider.h"
+#include "../types.h"
+
 #include "binfile.h"
-#include "resourceprovider.h"
-#include "types.h"
 
 namespace reone {
 

src/resource/format/visfile.h

@@ -20,7 +20,7 @@
 #include <istream>
 #include <memory>
 
-#include "types.h"
+#include "../types.h"
 
 namespace reone {
 

src/resource/keybifprovider.h

@@ -19,8 +19,8 @@
 
 #include <unordered_map>
 
-#include "biffile.h"
-#include "keyfile.h"
+#include "format/biffile.h"
+#include "format/keyfile.h"
 #include "resourceprovider.h"
 
 namespace reone {

src/resource/resources.cpp

@@ -23,10 +23,10 @@
 #include "../common/pathutil.h"
 #include "../common/streamutil.h"
 
-#include "biffile.h"
-#include "erffile.h"
+#include "format/biffile.h"
+#include "format/erffile.h"
+#include "format/rimfile.h"
 #include "folder.h"
-#include "rimfile.h"
 #include "typeutil.h"
 
 using namespace std;

src/resource/resources.h

@@ -25,14 +25,14 @@
 
 #include <boost/filesystem/path.hpp>
 
-#include "2dafile.h"
-#include "gfffile.h"
+#include "format/2dafile.h"
+#include "format/gfffile.h"
+#include "format/keyfile.h"
+#include "format/pefile.h"
+#include "format/tlkfile.h"
 #include "keybifprovider.h"
-#include "keyfile.h"
-#include "pefile.h"
 #include "resourceprovider.h"
 #include "stringprocessor.h"
-#include "tlkfile.h"
 
 namespace reone {
 

src/script/ncsfile.h

@@ -20,7 +20,7 @@
 #include <memory>
 #include <string>
 
-#include "../resource/binfile.h"
+#include "../resource/format/binfile.h"
 
 #include "program.h"
 

tools/2datool.cpp

@@ -19,7 +19,7 @@
 
 #include <boost/property_tree/json_parser.hpp>
 
-#include "../src/resource/2dafile.h"
+#include "../src/resource/format/2dafile.h"
 
 using namespace std;
 

tools/biftool.cpp

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

tools/erftool.cpp

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

tools/gfftool.cpp

@@ -22,7 +22,7 @@
 
 #include <boost/property_tree/json_parser.hpp>
 
-#include "../src/resource/gfffile.h"
+#include "../src/resource/format/gfffile.h"
 
 using namespace std;
 

tools/moduleprobe.cpp

@@ -23,7 +23,7 @@
 
 #include "../src/common/pathutil.h"
 #include "../src/common/streamutil.h"
-#include "../src/resource/lytfile.h"
+#include "../src/resource/format/lytfile.h"
 
 namespace fs = boost::filesystem;
 namespace pt = boost::property_tree;

tools/moduleprobe.h

@@ -24,11 +24,11 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
-#include "../src/resource/2dafile.h"
-#include "../src/resource/gfffile.h"
+#include "../src/resource/format/2dafile.h"
+#include "../src/resource/format/gfffile.h"
 #include "../src/resource/keybifprovider.h"
-#include "../src/resource/rimfile.h"
-#include "../src/resource/tlkfile.h"
+#include "../src/resource/format/rimfile.h"
+#include "../src/resource/format/tlkfile.h"
 
 namespace reone {
 

tools/rimtool.cpp

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

tools/tlktool.cpp

@@ -19,7 +19,7 @@
 
 #include <boost/property_tree/json_parser.hpp>
 
-#include "../src/resource/tlkfile.h"
+#include "../src/resource/format/tlkfile.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/keyfile.h"
+#include "../src/resource/format/keyfile.h"
 
 namespace reone {