remove image part

Kenix3 · Jan 10, 2025 · 53db223 · 53db223
1 parent adda2c4
commit 53db223
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 114 deletions.
diff --git a/src/resource/File.h b/src/resource/File.h
@@ -14,7 +14,6 @@ class Archive;
 
 #define RESOURCE_FORMAT_BINARY 0
 #define RESOURCE_FORMAT_XML 1
-#define RESOURCE_FORMAT_IMG 2
 
 struct ResourceInitData {
     std::shared_ptr<Archive> Parent;

diff --git a/src/resource/ResourceFactoryImg.cpp b/src/resource/ResourceFactoryImg.cpp
diff --git a/src/resource/ResourceFactoryImg.h b/src/resource/ResourceFactoryImg.h
diff --git a/src/resource/ResourceLoader.cpp b/src/resource/ResourceLoader.cpp
@@ -78,13 +78,7 @@ std::shared_ptr<ResourceFactory> ResourceLoader::GetFactory(uint32_t format, std
 
 std::shared_ptr<ResourceInitData> ResourceLoader::ReadResourceInitDataLegacy(const std::string& filePath,
                                                                              std::shared_ptr<File> fileToLoad) {
-    if (stbi_info_from_memory((const uint8_t*)fileToLoad->Buffer->data(), fileToLoad->Buffer->size(), nullptr, nullptr,
-                              nullptr) != 0) {
-        auto stream = std::make_shared<MemoryStream>(fileToLoad->Buffer);
-        auto binaryReader = std::make_shared<BinaryReader>(stream);
-
-        return ReadResourceInitDataPng(filePath, binaryReader);
-    } else if (fileToLoad->Buffer->at(0) == '<') { // Determine if file is binary or XML...
+    if (fileToLoad->Buffer->at(0) == '<') { // Determine if file is binary or XML...
         // File is XML
         // Read the xml document
         auto stream = std::make_shared<MemoryStream>(fileToLoad->Buffer);
@@ -211,7 +205,6 @@ std::shared_ptr<IResource> ResourceLoader::LoadResource(std::string filePath, st
 
     switch (initData->Format) {
         case RESOURCE_FORMAT_BINARY:
-        case RESOURCE_FORMAT_IMG:
             fileToLoad->Reader = CreateBinaryReader(fileToLoad, initData);
             break;
         case RESOURCE_FORMAT_XML:
@@ -295,24 +288,4 @@ ResourceLoader::ReadResourceInitDataXml(const std::string& filePath, std::shared
 
     return resourceInitData;
 }
-
-std::shared_ptr<ResourceInitData> ResourceLoader::ReadResourceInitDataPng(const std::string& filePath,
-                                                                          std::shared_ptr<BinaryReader> headerReader) {
-    auto resourceInitData = CreateDefaultResourceInitData();
-    resourceInitData->Path = filePath;
-
-    if (headerReader == nullptr) {
-        SPDLOG_ERROR("Error reading OTR header from XML: No header buffer document for file {}", filePath);
-        return resourceInitData;
-    }
-
-    resourceInitData->IsCustom = true;
-    resourceInitData->Format = RESOURCE_FORMAT_IMG;
-    resourceInitData->Type =
-        Context::GetInstance()->GetResourceManager()->GetResourceLoader()->GetResourceType("Texture");
-    resourceInitData->ResourceVersion = 0;
-
-    headerReader->Seek(0, SeekOffsetType::Start);
-    return resourceInitData;
-}
 } // namespace Ship
diff --git a/src/resource/factory/PngFactory.cpp b/src/resource/factory/PngFactory.cpp
diff --git a/src/resource/factory/PngFactory.h b/src/resource/factory/PngFactory.h