rename around

Kenix3 · Jan 8, 2025 · 030ab72 · 030ab72
1 parent ae30d57
commit 030ab72
Show file tree

Hide file tree

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

diff --git a/src/resource/ResourceFactoryPng.cpp b/src/resource/ResourceFactoryPng.cpp
@@ -4,7 +4,7 @@
 
 namespace Ship {
 bool ResourceFactoryPng::FileHasValidFormatAndReader(std::shared_ptr<File> file) {
-    if (file->InitData->Format != RESOURCE_FORMAT_PNG) {
+    if (file->InitData->Format != RESOURCE_FORMAT_IMG) {
         SPDLOG_ERROR("resource file format does not match factory format.");
         return false;
     }

diff --git a/src/resource/archive/Archive.cpp b/src/resource/archive/Archive.cpp
@@ -272,7 +272,7 @@ std::shared_ptr<ResourceInitData> Archive::ReadResourceInitDataBinary(const std:
     resourceInitData->Path = filePath;
 
     if (headerReader == nullptr) {
-        SPDLOG_ERROR("Error reading OTR header from PNG: No header buffer document for file {}", filePath);
+        SPDLOG_ERROR("Error reading OTR header from Binary: No header buffer document for file {}", filePath);
         return resourceInitData;
     }
 

diff --git a/src/resource/factory/PngFactory.cpp b/src/resource/factory/PngFactory.cpp
@@ -17,7 +17,7 @@ void user_warning_fn(png_structp png_ptr, png_const_charp warning_msg) {
 }
 }
 
-std::shared_ptr<Ship::IResource> ResourceFactoryPngTexture::ReadResource(std::shared_ptr<Ship::File> file) {
+std::shared_ptr<Ship::IResource> ResourceFactoryImageTexture::ReadResource(std::shared_ptr<Ship::File> file) {
     if (!FileHasValidFormatAndReader(file)) {
         return nullptr;
     }

diff --git a/src/resource/factory/PngFactory.h b/src/resource/factory/PngFactory.h
@@ -4,7 +4,7 @@
 #include "resource/ResourceFactoryPng.h"
 
 namespace Fast {
-class ResourceFactoryPngTexture : public Ship::ResourceFactoryPng {
+class ResourceFactoryImageTexture : public Ship::ResourceFactoryPng {
   public:
     std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
 };