start rippin

Author: briaguya-ai

src/CMakeLists.txt

@@ -318,7 +318,6 @@ target_sources(libultraship PRIVATE ${Source_Files__Port})
 set(Source_Files__Resource
     ${CMAKE_CURRENT_SOURCE_DIR}/resource/File.h
     ${CMAKE_CURRENT_SOURCE_DIR}/resource/Resource.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/ResourceType.h
     ${CMAKE_CURRENT_SOURCE_DIR}/resource/Resource.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/resource/ResourceManager.h
     ${CMAKE_CURRENT_SOURCE_DIR}/resource/ResourceManager.cpp
@@ -329,38 +328,6 @@ set(Source_Files__Resource
 )
 source_group("resource" FILES ${Source_Files__Resource})
 
-set(Source_Files__Resource__Types
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/type/Array.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/type/Array.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/type/Blob.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/type/Blob.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/type/DisplayList.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/type/DisplayList.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/type/Matrix.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/type/Matrix.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/type/Texture.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/type/Texture.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/type/Vertex.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/type/Vertex.h
-)
-source_group("resource/type" FILES ${Source_Files__Resource__Types})
-
-set(Source_Files__Resource__Factories
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/factory/ArrayFactory.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/factory/ArrayFactory.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/factory/BlobFactory.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/factory/BlobFactory.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/factory/DisplayListFactory.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/factory/DisplayListFactory.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/factory/MatrixFactory.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/factory/MatrixFactory.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/factory/TextureFactory.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/factory/TextureFactory.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/factory/VertexFactory.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/resource/factory/VertexFactory.h
-)
-source_group("resource/factory" FILES ${Source_Files__Resource__Factories})
-
 set(Source_Files__Resource__Archive
     ${CMAKE_CURRENT_SOURCE_DIR}/resource/archive/Archive.h
     ${CMAKE_CURRENT_SOURCE_DIR}/resource/archive/Archive.cpp
@@ -373,7 +340,7 @@ set(Source_Files__Resource__Archive
 )
 source_group("resource/archive" FILES ${Source_Files__Resource__Archive})
 
-target_sources(libultraship PRIVATE ${Source_Files__Resource} ${Source_Files__Resource__Types} ${Source_Files__Resource__Factories} ${Source_Files__Resource__Archive})
+target_sources(libultraship PRIVATE ${Source_Files__Resource} ${Source_Files__Resource__Archive})
 
 #=================== Graphic ===================
 

src/graphic/Fast3D/gfx_pc.cpp

@@ -32,10 +32,10 @@
 
 #include "log/luslog.h"
 #include "window/gui/Gui.h"
-#include "resource/GameVersions.h"
+// #include "resource/GameVersions.h"
 #include "resource/Resource.h"
 #include "resource/ResourceManager.h"
-#include "resource/type/Texture.h"
+// #include "resource/type/Texture.h"
 #include "utils/Utils.h"
 #include "libultraship/libultraship.h"
 

src/public/bridge/resourcebridge.h

@@ -6,7 +6,6 @@
 #include "stdint.h"
 
 #ifdef __cplusplus
-#include "resource/type/Texture.h"
 #include "resource/Resource.h"
 
 std::shared_ptr<LUS::IResource> ResourceLoad(const char* name);
@@ -29,12 +28,6 @@ uint8_t ResourceGetIsCustomByName(const char* name);
 uint8_t ResourceGetIsCustomByCrc(uint64_t crc);
 void* ResourceGetDataByName(const char* name);
 void* ResourceGetDataByCrc(uint64_t crc);
-uint16_t ResourceGetTexWidthByName(const char* name);
-uint16_t ResourceGetTexWidthByCrc(uint64_t crc);
-uint16_t ResourceGetTexHeightByName(const char* name);
-uint16_t ResourceGetTexHeightByCrc(uint64_t crc);
-size_t ResourceGetTexSizeByName(const char* name);
-size_t ResourceGetTexSizeByCrc(uint64_t crc);
 void ResourceLoadDirectory(const char* name);
 void ResourceLoadDirectoryAsync(const char* name);
 void ResourceDirtyDirectory(const char* name);

src/resource/File.h

@@ -5,7 +5,6 @@
 #include <memory>
 #include <stdint.h>
 #include <tinyxml2.h>
-#include "resource/ResourceType.h"
 #include "utils/binarytools/BinaryReader.h"
 
 namespace LUS {

src/resource/GameVersions.h

@@ -23,12 +23,7 @@ ResourceLoader::~ResourceLoader() {
 }
 
 void ResourceLoader::RegisterGlobalResourceFactories() {
-    RegisterResourceFactory(static_cast<uint32_t>(ResourceType::Texture), std::make_shared<TextureFactory>());
-    RegisterResourceFactory(static_cast<uint32_t>(ResourceType::Vertex), std::make_shared<VertexFactory>());
-    RegisterResourceFactory(static_cast<uint32_t>(ResourceType::DisplayList), std::make_shared<DisplayListFactory>());
-    RegisterResourceFactory(static_cast<uint32_t>(ResourceType::Matrix), std::make_shared<MatrixFactory>());
-    RegisterResourceFactory(static_cast<uint32_t>(ResourceType::Array), std::make_shared<ArrayFactory>());
-    RegisterResourceFactory(static_cast<uint32_t>(ResourceType::Blob), std::make_shared<BlobFactory>());
+
 }
 
 bool ResourceLoader::RegisterResourceFactory(uint32_t resourceType, std::shared_ptr<ResourceFactory> factory) {

src/resource/ResourceLoader.cpp

@@ -2,7 +2,6 @@
 
 #include <memory>
 #include <unordered_map>
-#include "ResourceType.h"
 #include "ResourceFactory.h"
 #include "Resource.h"
 
@@ -18,9 +17,6 @@ class ResourceLoader {
     bool RegisterResourceFactory(uint32_t resourceType, std::shared_ptr<ResourceFactory> factory);
     uint32_t GetVersionFromString(const std::string& version);
 
-  protected:
-    void RegisterGlobalResourceFactories();
-
   private:
     std::unordered_map<uint32_t, std::shared_ptr<ResourceFactory>> mFactories;
 };