clean up

Author: briaguya-ai

src/CMakeLists.txt

@@ -372,14 +372,7 @@ set(Source_Files__Resource__Archive
 )
 source_group("resource/archive" FILES ${Source_Files__Resource__Archive})
 
-set(Source_Files__Resource__ReaderBox
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/readerbox/ReaderBox.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/readerbox/BinaryReaderBox.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/readerbox/XMLReaderBox.h
-)
-source_group("resource/readerbox" FILES ${Source_Files__Resource__ReaderBox})
-
-target_sources(libultraship PRIVATE ${Source_Files__Resource} ${Source_Files__Resource__Types} ${Source_Files__Resource__Factories} ${Source_Files__Resource__Archive} ${Source_Files__Resource__ReaderBox})
+target_sources(libultraship PRIVATE ${Source_Files__Resource} ${Source_Files__Resource__Types} ${Source_Files__Resource__Factories} ${Source_Files__Resource__Archive})
 
 #=================== Graphic ===================
 

src/resource/factory/BlobFactory.cpp

@@ -1,6 +1,5 @@
 #include "resource/factory/BlobFactory.h"
 #include "resource/type/Blob.h"
-#include "resource/readerbox/BinaryReaderBox.h"
 #include "spdlog/spdlog.h"
 
 namespace LUS {

src/resource/factory/DisplayListFactory.cpp

@@ -1,7 +1,5 @@
 #include "resource/factory/DisplayListFactory.h"
 #include "resource/type/DisplayList.h"
-#include "resource/readerbox/BinaryReaderBox.h"
-#include "resource/readerbox/XMLReaderBox.h"
 #include "spdlog/spdlog.h"
 
 #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
@@ -183,7 +181,7 @@ std::shared_ptr<IResource> ResourceFactoryXMLDisplayListV0::ReadResource(std::sh
     if (file->XmlDocument == nullptr) {
         SPDLOG_ERROR("Failed to load resource: File has no XML document ({} - {})", file->InitData->Type,
                         file->InitData->Path);
-        return result;
+        return nullptr;
     }
 
 

src/resource/factory/MatrixFactory.cpp

@@ -1,6 +1,5 @@
 #include "resource/factory/MatrixFactory.h"
 #include "resource/type/Matrix.h"
-#include "resource/readerbox/BinaryReaderBox.h"
 #include "spdlog/spdlog.h"
 
 namespace LUS {

src/resource/factory/TextureFactory.cpp

@@ -1,6 +1,5 @@
 #include "resource/factory/TextureFactory.h"
 #include "resource/type/Texture.h"
-#include "resource/readerbox/BinaryReaderBox.h"
 #include "spdlog/spdlog.h"
 
 namespace LUS {

src/resource/factory/VertexFactory.cpp

@@ -1,7 +1,5 @@
 #include "resource/factory/VertexFactory.h"
 #include "resource/type/Vertex.h"
-#include "resource/readerbox/BinaryReaderBox.h"
-#include "resource/readerbox/XMLReaderBox.h"
 #include "spdlog/spdlog.h"
 
 namespace LUS {
@@ -17,23 +15,23 @@ std::shared_ptr<IResource> ResourceFactoryBinaryVertexV0::ReadResource(std::shar
         return nullptr;
     }
 
-    auto vertex = std::make_shared<Vertex>(initData);
+    auto vertex = std::make_shared<Vertex>(file->InitData);
 
-    uint32_t count = reader->ReadUInt32();
+    uint32_t count = file->Reader->ReadUInt32();
     vertex->VertexList.reserve(count);
 
     for (uint32_t i = 0; i < count; i++) {
         Vtx data;
-        data.v.ob[0] = reader->ReadInt16();
-        data.v.ob[1] = reader->ReadInt16();
-        data.v.ob[2] = reader->ReadInt16();
-        data.v.flag = reader->ReadUInt16();
-        data.v.tc[0] = reader->ReadInt16();
-        data.v.tc[1] = reader->ReadInt16();
-        data.v.cn[0] = reader->ReadUByte();
-        data.v.cn[1] = reader->ReadUByte();
-        data.v.cn[2] = reader->ReadUByte();
-        data.v.cn[3] = reader->ReadUByte();
+        data.v.ob[0] = file->Reader->ReadInt16();
+        data.v.ob[1] = file->Reader->ReadInt16();
+        data.v.ob[2] = file->Reader->ReadInt16();
+        data.v.flag = file->Reader->ReadUInt16();
+        data.v.tc[0] = file->Reader->ReadInt16();
+        data.v.tc[1] = file->Reader->ReadInt16();
+        data.v.cn[0] = file->Reader->ReadUByte();
+        data.v.cn[1] = file->Reader->ReadUByte();
+        data.v.cn[2] = file->Reader->ReadUByte();
+        data.v.cn[3] = file->Reader->ReadUByte();
         vertex->VertexList.push_back(data);
     }
 
@@ -49,10 +47,10 @@ std::shared_ptr<IResource> ResourceFactoryXMLVertexV0::ReadResource(std::shared_
     if (file->XmlDocument == nullptr) {
         SPDLOG_ERROR("Failed to load resource: File has no XML document ({} - {})", file->InitData->Type,
                         file->InitData->Path);
-        return result;
+        return nullptr;
     }
 
-    auto vertex = std::make_shared<Vertex>(initData);
+    auto vertex = std::make_shared<Vertex>(file->InitData);
 
     auto child = file->XmlDocument->FirstChildElement()->FirstChildElement();