raw

Author: briaguya-ai

include/libultraship/classes.h

@@ -4,7 +4,10 @@
 #ifndef _LIBULTRASHIP_CLASSES_H
 #define _LIBULTRASHIP_CLASSES_H
 
+#include "resource/archive/ArchiveManager.h"
 #include "resource/archive/Archive.h"
+#include "resource/archive/OtrArchive.h"
+#include "resource/archive/O2rArchive.h"
 #include "resource/ResourceManager.h"
 #include "Context.h"
 #include "window/Window.h"

src/resource/archive/Archive.h

@@ -34,17 +34,18 @@ class Archive {
     const std::string& GetPath();
     bool IsLoaded();
 
+    virtual bool LoadRaw() = 0;
+    virtual bool UnloadRaw() = 0;
+    virtual std::shared_ptr<File> LoadFileRaw(const std::string& filePath) = 0;
+    virtual std::shared_ptr<File> LoadFileRaw(uint64_t hash) = 0;
+
   protected:
     static std::shared_ptr<ResourceInitData> ReadResourceInitDataBinary(const std::string& filePath,
                                                                         std::shared_ptr<BinaryReader> headerReader);
     static std::shared_ptr<ResourceInitData> ReadResourceInitDataXml(const std::string& filePath,
                                                                      std::shared_ptr<tinyxml2::XMLDocument> document);
-    virtual std::shared_ptr<File> LoadFileRaw(const std::string& filePath) = 0;
-    virtual std::shared_ptr<File> LoadFileRaw(uint64_t hash) = 0;
     virtual std::shared_ptr<ResourceInitData> LoadFileMeta(const std::string& filePath) = 0;
     virtual std::shared_ptr<ResourceInitData> LoadFileMeta(uint64_t hash) = 0;
-    virtual bool LoadRaw() = 0;
-    virtual bool UnloadRaw() = 0;
 
     void SetLoaded(bool isLoaded);
     void SetGameVersion(uint32_t gameVersion);

src/resource/archive/O2rArchive.h

@@ -18,15 +18,15 @@ class O2rArchive : virtual public Archive {
     O2rArchive(const std::string& archivePath);
     ~O2rArchive();
 
-  protected:
+    bool LoadRaw();
+    bool UnloadRaw();
     std::shared_ptr<File> LoadFileRaw(const std::string& filePath);
     std::shared_ptr<File> LoadFileRaw(uint64_t hash);
+
+  protected:
     std::shared_ptr<ResourceInitData> LoadFileMeta(const std::string& filePath);
     std::shared_ptr<ResourceInitData> LoadFileMeta(uint64_t hash);
 
-    bool LoadRaw();
-    bool UnloadRaw();
-
   private:
 };
 } // namespace LUS

src/resource/archive/OtrArchive.h

@@ -24,15 +24,15 @@ class OtrArchive : virtual public Archive {
     OtrArchive(const std::string& archivePath);
     ~OtrArchive();
 
-  protected:
+    bool LoadRaw();
+    bool UnloadRaw();
     std::shared_ptr<File> LoadFileRaw(const std::string& filePath);
     std::shared_ptr<File> LoadFileRaw(uint64_t hash);
+
+  protected:
     std::shared_ptr<ResourceInitData> LoadFileMeta(const std::string& filePath);
     std::shared_ptr<ResourceInitData> LoadFileMeta(uint64_t hash);
 
-    bool LoadRaw();
-    bool UnloadRaw();
-
   private:
     HANDLE mHandle;
 };