diff --git a/src/ModMan/Asset/Image/DynamicAssetsImage.cpp b/src/ModMan/Asset/Image/DynamicAssetsImage.cpp index 0c531ad1..1a65ef89 100644 --- a/src/ModMan/Asset/Image/DynamicAssetsImage.cpp +++ b/src/ModMan/Asset/Image/DynamicAssetsImage.cpp @@ -51,7 +51,6 @@ namespace {ImageFormatId::BC4, ImageFormatId::B8_G8_R8 }, {ImageFormatId::BC5, ImageFormatId::B8_G8_R8 }, {ImageFormatId::B8_G8_R8_X8, ImageFormatId::B8_G8_R8 }, - {ImageFormatId::R8_G8_B8, ImageFormatId::B8_G8_R8 }, {ImageFormatId::R8_G8_B8_A8, ImageFormatId::B8_G8_R8_A8}, {ImageFormatId::A8, ImageFormatId::B8_G8_R8 }, {ImageFormatId::R8, ImageFormatId::B8_G8_R8 }, diff --git a/src/ObjImage/Image/DdsWriter.cpp b/src/ObjImage/Image/DdsWriter.cpp index ee99855a..5b2c6f2e 100644 --- a/src/ObjImage/Image/DdsWriter.cpp +++ b/src/ObjImage/Image/DdsWriter.cpp @@ -200,7 +200,7 @@ namespace image std::unique_ptr ConvertTextureForDdsFileOutputIfNecessary(const Texture* texture) { static const std::unordered_map ddsConversionTable{ - {ImageFormatId::R8_G8_B8, ImageFormatId::B8_G8_R8_X8}, + {ImageFormatId::B8_G8_R8, ImageFormatId::B8_G8_R8_X8}, }; const auto entry = ddsConversionTable.find(texture->GetFormat()->GetId()); diff --git a/src/ObjImage/Image/ImageFormat.cpp b/src/ObjImage/Image/ImageFormat.cpp index e029121e..050414f7 100644 --- a/src/ObjImage/Image/ImageFormat.cpp +++ b/src/ObjImage/Image/ImageFormat.cpp @@ -2,27 +2,6 @@ #include -namespace -{ - const char* IMAGE_FORMAT_NAMES[]{ - "R8_G8_B8", - "B8_G8_R8", - "B8_G8_R8_X8", - "R8_G8_B8_A8", - "B8_G8_R8_A8", - "A8", - "R16_G16_B16_A16_FLOAT", - "R8", - "R8_A8", - "BC1", - "BC2", - "BC3", - "BC4", - "BC5", - }; - static_assert(std::extent_v == static_cast(image::ImageFormatId::MAX)); -} // namespace - namespace image { ImageFormat::ImageFormat(const ImageFormatId id, std::string name, const oat::D3DFORMAT d3dFormat, const oat::DXGI_FORMAT dxgiFormat) @@ -211,8 +190,7 @@ namespace image namespace format { - const ImageFormatUnsigned R8_G8_B8(ImageFormatId::R8_G8_B8, "R8_G8_B8", oat::D3DFMT_R8G8B8, oat::DXGI_FORMAT_UNKNOWN, 24, 0, 8, 8, 8, 16, 8, 0, 0); - const ImageFormatUnsigned B8_G8_R8(ImageFormatId::B8_G8_R8, "B8_G8_R8", oat::D3DFMT_UNKNOWN, oat::DXGI_FORMAT_UNKNOWN, 24, 16, 8, 8, 8, 0, 8, 0, 0); + const ImageFormatUnsigned B8_G8_R8(ImageFormatId::B8_G8_R8, "B8_G8_R8", oat::D3DFMT_R8G8B8, oat::DXGI_FORMAT_UNKNOWN, 24, 16, 8, 8, 8, 0, 8, 0, 0); const ImageFormatUnsigned B8_G8_R8_X8(ImageFormatId::B8_G8_R8_X8, "B8_G8_R8_X8", oat::D3DFMT_X8R8G8B8, oat::DXGI_FORMAT_B8G8R8X8_UNORM, 32, 16, 8, 8, 8, 0, 8, 0, 0); const ImageFormatUnsigned @@ -242,7 +220,6 @@ namespace image const ImageFormatBlockCompressed BC5(ImageFormatId::BC5, "BC5", oat::D3DFMT_UNKNOWN, oat::DXGI_FORMAT_BC5_UNORM, 4, 128, true, true, false, false); const ImageFormat* const ALL[static_cast(ImageFormatId::MAX)]{ - &R8_G8_B8, &B8_G8_R8, &B8_G8_R8_X8, &R8_G8_B8_A8, diff --git a/src/ObjImage/Image/ImageFormat.h b/src/ObjImage/Image/ImageFormat.h index 9cf9844b..6d1c89e6 100644 --- a/src/ObjImage/Image/ImageFormat.h +++ b/src/ObjImage/Image/ImageFormat.h @@ -11,7 +11,6 @@ namespace image { enum class ImageFormatId : std::uint8_t { - R8_G8_B8, B8_G8_R8, B8_G8_R8_X8, R8_G8_B8_A8, @@ -139,7 +138,6 @@ namespace image namespace format { - extern const ImageFormatUnsigned R8_G8_B8; extern const ImageFormatUnsigned B8_G8_R8; extern const ImageFormatUnsigned B8_G8_R8_X8; extern const ImageFormatUnsigned R8_G8_B8_A8; diff --git a/src/ObjImage/Image/IwiLoader.cpp b/src/ObjImage/Image/IwiLoader.cpp index ef4bc610..059e8ef7 100644 --- a/src/ObjImage/Image/IwiLoader.cpp +++ b/src/ObjImage/Image/IwiLoader.cpp @@ -16,9 +16,9 @@ namespace switch (static_cast(format)) { case iwi6::IwiFormat::IMG_FORMAT_BITMAP_RGBA: - return &format::R8_G8_B8_A8; + return &format::B8_G8_R8_A8; case iwi6::IwiFormat::IMG_FORMAT_BITMAP_RGB: - return &format::R8_G8_B8; + return &format::B8_G8_R8; case iwi6::IwiFormat::IMG_FORMAT_BITMAP_ALPHA: return &format::A8; case iwi6::IwiFormat::IMG_FORMAT_DXT1: @@ -121,9 +121,9 @@ namespace switch (static_cast(format)) { case iwi8::IwiFormat::IMG_FORMAT_BITMAP_RGBA: - return &format::R8_G8_B8_A8; + return &format::B8_G8_R8_A8; case iwi8::IwiFormat::IMG_FORMAT_BITMAP_RGB: - return &format::R8_G8_B8; + return &format::B8_G8_R8; case iwi8::IwiFormat::IMG_FORMAT_BITMAP_ALPHA: return &format::A8; case iwi8::IwiFormat::IMG_FORMAT_DXT1: @@ -250,9 +250,9 @@ namespace switch (static_cast(format)) { case iwi13::IwiFormat::IMG_FORMAT_BITMAP_RGBA: - return &format::R8_G8_B8_A8; + return &format::B8_G8_R8_A8; case iwi13::IwiFormat::IMG_FORMAT_BITMAP_RGB: - return &format::R8_G8_B8; + return &format::B8_G8_R8; case iwi13::IwiFormat::IMG_FORMAT_BITMAP_ALPHA: return &format::A8; case iwi13::IwiFormat::IMG_FORMAT_DXT1: @@ -376,7 +376,7 @@ namespace assert(false); // Unsupported yet return &format::R16_G16_B16_A16_FLOAT; case iwi27::IwiFormat::IMG_FORMAT_BITMAP_RGB: - return &format::R8_G8_B8; + return &format::B8_G8_R8; // This is a guess, idk the byte order as PC does not support this case iwi27::IwiFormat::IMG_FORMAT_BITMAP_LUMINANCE_ALPHA: return &format::R8_A8; case iwi27::IwiFormat::IMG_FORMAT_BITMAP_LUMINANCE: diff --git a/src/ObjImage/Image/IwiWriter13.cpp b/src/ObjImage/Image/IwiWriter13.cpp index 39d3a0e4..e87367e2 100644 --- a/src/ObjImage/Image/IwiWriter13.cpp +++ b/src/ObjImage/Image/IwiWriter13.cpp @@ -13,10 +13,10 @@ IwiFormat IwiWriter::GetIwiFormatForImageFormat(const ImageFormat* imageFormat) { switch (imageFormat->GetId()) { - case ImageFormatId::R8_G8_B8: + case ImageFormatId::B8_G8_R8: return IwiFormat::IMG_FORMAT_BITMAP_RGB; - case ImageFormatId::R8_G8_B8_A8: + case ImageFormatId::B8_G8_R8_A8: return IwiFormat::IMG_FORMAT_BITMAP_RGBA; case ImageFormatId::A8: diff --git a/src/ObjImage/Image/IwiWriter27.cpp b/src/ObjImage/Image/IwiWriter27.cpp index c64f65b7..ac659693 100644 --- a/src/ObjImage/Image/IwiWriter27.cpp +++ b/src/ObjImage/Image/IwiWriter27.cpp @@ -13,7 +13,7 @@ IwiFormat IwiWriter::GetIwiFormatForImageFormat(const ImageFormat* imageFormat) { switch (imageFormat->GetId()) { - case ImageFormatId::R8_G8_B8: + case ImageFormatId::B8_G8_R8: // This is a guess, idk the byte order as PC does not support this return IwiFormat::IMG_FORMAT_BITMAP_RGB; case ImageFormatId::R8_G8_B8_A8: diff --git a/src/ObjImage/Image/IwiWriter6.cpp b/src/ObjImage/Image/IwiWriter6.cpp index e96042c5..6c41628c 100644 --- a/src/ObjImage/Image/IwiWriter6.cpp +++ b/src/ObjImage/Image/IwiWriter6.cpp @@ -12,10 +12,10 @@ IwiFormat IwiWriter::GetIwiFormatForImageFormat(const ImageFormat* imageFormat) { switch (imageFormat->GetId()) { - case ImageFormatId::R8_G8_B8: + case ImageFormatId::B8_G8_R8: return IwiFormat::IMG_FORMAT_BITMAP_RGB; - case ImageFormatId::R8_G8_B8_A8: + case ImageFormatId::B8_G8_R8_A8: return IwiFormat::IMG_FORMAT_BITMAP_RGBA; case ImageFormatId::A8: diff --git a/src/ObjImage/Image/IwiWriter8.cpp b/src/ObjImage/Image/IwiWriter8.cpp index 9c8c95e3..93472332 100644 --- a/src/ObjImage/Image/IwiWriter8.cpp +++ b/src/ObjImage/Image/IwiWriter8.cpp @@ -12,10 +12,10 @@ IwiFormat IwiWriter::GetIwiFormatForImageFormat(const ImageFormat* imageFormat) { switch (imageFormat->GetId()) { - case ImageFormatId::R8_G8_B8: + case ImageFormatId::B8_G8_R8: return IwiFormat::IMG_FORMAT_BITMAP_RGB; - case ImageFormatId::R8_G8_B8_A8: + case ImageFormatId::B8_G8_R8_A8: return IwiFormat::IMG_FORMAT_BITMAP_RGBA; case ImageFormatId::A8: