zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-05-25 02:51:43 +00:00
Code Activity

fix: do not dump iwis with format unknown

Browse Source
This commit is contained in:
Jan Laupetin
2026-05-17 11:01:19 +02:00
parent 73e2e3d4d5
commit c49d2bc96f
11 changed files with 148 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjImage/Image/ImageFormat.cpp
+30
View File
@@ -1,7 +1,37 @@
#include "ImageFormat.h"
#include <type_traits>
namespace
{
const char* IMAGE_FORMAT_NAMES[]{
"R8_G8_B8",
"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<decltype(IMAGE_FORMAT_NAMES)> == static_cast<unsigned>(image::ImageFormatId::MAX));
} // namespace
namespace image
{
const char* GetImageFormatName(ImageFormatId id)
{
if (id < ImageFormatId::MAX)
return IMAGE_FORMAT_NAMES[static_cast<unsigned>(id)];
return "unknown";
}
ImageFormat::ImageFormat(const ImageFormatId id, const oat::D3DFORMAT d3dFormat, const oat::DXGI_FORMAT dxgiFormat)
: m_id(id),
m_d3d_format(d3dFormat),
src/ObjImage/Image/ImageFormat.h
+6 -4
View File
@@ -8,9 +8,8 @@
namespace image
{
enum class ImageFormatId
enum class ImageFormatId : std::uint8_t
{
UNKNOWN = -1,
R8_G8_B8,
B8_G8_R8_X8,
R8_G8_B8_A8,
@@ -25,10 +24,13 @@ namespace image
BC4,
BC5,
MAX
MAX,
UNKNOWN
};
enum class ImageFormatType
const char* GetImageFormatName(ImageFormatId id);
enum class ImageFormatType : std::uint8_t
{
UNKNOWN,
UNSIGNED,
src/ObjWriting/Game/IW3/Image/ImageDumperIW3.cpp
+11 -2
View File
@@ -69,10 +69,10 @@ namespace image
{
switch (ObjWriting::Configuration.ImageOutputFormat)
{
case ObjWriting::Configuration_t::ImageOutputFormat_e::DDS:
case ImageOutputFormat_e::DDS:
m_writer = std::make_unique<DdsWriter>();
break;
case ObjWriting::Configuration_t::ImageOutputFormat_e::IWI:
case ImageOutputFormat_e::IWI:
m_writer = std::make_unique<iwi6::IwiWriter>();
break;
default:
@@ -89,6 +89,15 @@ namespace image
if (!texture)
return;
if (!m_writer->SupportsImageFormat(texture->GetFormat()))
{
con::warn("Not dumping image {} as {} does not support the image format {}",
image->name,
GetImageOutputFormatName(ObjWriting::Configuration.ImageOutputFormat),
GetImageFormatName(texture->GetFormat()->GetId()));
return;
}
const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset.m_name, m_writer->GetFileExtension()));
if (!assetFile)
src/ObjWriting/Game/IW4/Image/ImageDumperIW4.cpp
+11 -2
View File
@@ -65,10 +65,10 @@ namespace image
{
switch (ObjWriting::Configuration.ImageOutputFormat)
{
case ObjWriting::Configuration_t::ImageOutputFormat_e::DDS:
case ImageOutputFormat_e::DDS:
m_writer = std::make_unique<DdsWriter>();
break;
case ObjWriting::Configuration_t::ImageOutputFormat_e::IWI:
case ImageOutputFormat_e::IWI:
m_writer = std::make_unique<iwi8::IwiWriter>();
break;
default:
@@ -85,6 +85,15 @@ namespace image
if (!texture)
return;
if (!m_writer->SupportsImageFormat(texture->GetFormat()))
{
con::warn("Not dumping image {} as {} does not support the image format {}",
image->name,
GetImageOutputFormatName(ObjWriting::Configuration.ImageOutputFormat),
GetImageFormatName(texture->GetFormat()->GetId()));
return;
}
const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset.m_name, m_writer->GetFileExtension()));
if (!assetFile)
src/ObjWriting/Game/IW5/Image/ImageDumperIW5.cpp
+11 -2
View File
@@ -66,10 +66,10 @@ namespace image
{
switch (ObjWriting::Configuration.ImageOutputFormat)
{
case ObjWriting::Configuration_t::ImageOutputFormat_e::DDS:
case ImageOutputFormat_e::DDS:
m_writer = std::make_unique<DdsWriter>();
break;
case ObjWriting::Configuration_t::ImageOutputFormat_e::IWI:
case ImageOutputFormat_e::IWI:
m_writer = std::make_unique<iwi8::IwiWriter>();
break;
default:
@@ -86,6 +86,15 @@ namespace image
if (!texture)
return;
if (!m_writer->SupportsImageFormat(texture->GetFormat()))
{
con::warn("Not dumping image {} as {} does not support the image format {}",
image->name,
GetImageOutputFormatName(ObjWriting::Configuration.ImageOutputFormat),
GetImageFormatName(texture->GetFormat()->GetId()));
return;
}
const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset.m_name, m_writer->GetFileExtension()));
if (!assetFile)
src/ObjWriting/Game/T5/Image/ImageDumperT5.cpp
+11 -2
View File
@@ -65,10 +65,10 @@ namespace image
{
switch (ObjWriting::Configuration.ImageOutputFormat)
{
case ObjWriting::Configuration_t::ImageOutputFormat_e::DDS:
case ImageOutputFormat_e::DDS:
m_writer = std::make_unique<DdsWriter>();
break;
case ObjWriting::Configuration_t::ImageOutputFormat_e::IWI:
case ImageOutputFormat_e::IWI:
m_writer = std::make_unique<iwi13::IwiWriter>();
break;
default:
@@ -85,6 +85,15 @@ namespace image
if (!texture)
return;
if (!m_writer->SupportsImageFormat(texture->GetFormat()))
{
con::warn("Not dumping image {} as {} does not support the image format {}",
image->name,
GetImageOutputFormatName(ObjWriting::Configuration.ImageOutputFormat),
GetImageFormatName(texture->GetFormat()->GetId()));
return;
}
const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset.m_name, m_writer->GetFileExtension()));
if (!assetFile)
src/ObjWriting/Game/T6/Image/ImageDumperT6.cpp
+11 -2
View File
@@ -83,10 +83,10 @@ namespace image
{
switch (ObjWriting::Configuration.ImageOutputFormat)
{
case ObjWriting::Configuration_t::ImageOutputFormat_e::DDS:
case ImageOutputFormat_e::DDS:
m_writer = std::make_unique<DdsWriter>();
break;
case ObjWriting::Configuration_t::ImageOutputFormat_e::IWI:
case ImageOutputFormat_e::IWI:
m_writer = std::make_unique<iwi27::IwiWriter>();
break;
default:
@@ -103,6 +103,15 @@ namespace image
if (!texture)
return;
if (!m_writer->SupportsImageFormat(texture->GetFormat()))
{
con::warn("Not dumping image {} as {} does not support the image format {}",
image->name,
GetImageOutputFormatName(ObjWriting::Configuration.ImageOutputFormat),
GetImageFormatName(texture->GetFormat()->GetId()));
return;
}
const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset.m_name, m_writer->GetFileExtension()));
if (!assetFile)
src/ObjWriting/ObjWriting.cpp
+19
View File
@@ -1,7 +1,26 @@
#include "ObjWriting.h"
#include <type_traits>
namespace
{
const char* IMAGE_OUTPUT_FORMAT_NAME[]{
"DDS",
"IWI",
};
static_assert(std::extent_v<decltype(IMAGE_OUTPUT_FORMAT_NAME)> == static_cast<unsigned>(ImageOutputFormat_e::COUNT));
} // namespace
ObjWriting::Configuration_t ObjWriting::Configuration;
const char* GetImageOutputFormatName(ImageOutputFormat_e imageOutputFormat)
{
if (imageOutputFormat < ImageOutputFormat_e::COUNT)
return IMAGE_OUTPUT_FORMAT_NAME[static_cast<unsigned>(imageOutputFormat)];
return "unknown";
}
bool ObjWriting::ShouldHandleAssetType(const asset_type_t assetType)
{
if (assetType < 0)
src/ObjWriting/ObjWriting.h
+11 -7
View File
@@ -5,18 +5,16 @@
#include <vector>
class ObjWriting
{
public:
static class Configuration_t
{
public:
enum class ImageOutputFormat_e
{
DDS,
IWI
IWI,
COUNT
};
const char* GetImageOutputFormatName(ImageOutputFormat_e imageOutputFormat);
enum class ModelOutputFormat_e
{
XMODEL_EXPORT,
@@ -26,6 +24,12 @@ public:
GLB
};
class ObjWriting
{
public:
static class Configuration_t
{
public:
std::vector<bool> AssetTypesToHandleBitfield;
ImageOutputFormat_e ImageOutputFormat = ImageOutputFormat_e::DDS;
src/ObjWriting/XModel/XModelDumper.cpp.template
+12 -12
View File
@@ -553,8 +553,8 @@ namespace
bool CanOmitDefaultArmature()
{
return ObjWriting::Configuration.ModelOutputFormat != ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_EXPORT
&& ObjWriting::Configuration.ModelOutputFormat != ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_BIN;
return ObjWriting::Configuration.ModelOutputFormat != ModelOutputFormat_e::XMODEL_EXPORT
&& ObjWriting::Configuration.ModelOutputFormat != ModelOutputFormat_e::XMODEL_BIN;
}
void PopulateXModelWriter(XModelCommon& out, const AssetDumpingContext& context, const unsigned lod, const XModel& model)
@@ -666,25 +666,25 @@ namespace
switch (ObjWriting::Configuration.ModelOutputFormat)
{
case ObjWriting::Configuration_t::ModelOutputFormat_e::OBJ:
case ModelOutputFormat_e::OBJ:
DumpObjLod(common, context, asset, currentLod);
if (currentLod == 0u)
DumpObjMtl(common, context, asset);
break;
case ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_EXPORT:
case ModelOutputFormat_e::XMODEL_EXPORT:
DumpXModelExportLod(common, context, asset, currentLod);
break;
case ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_BIN:
case ModelOutputFormat_e::XMODEL_BIN:
DumpXModelBinLod(common, context, asset, currentLod);
break;
case ObjWriting::Configuration_t::ModelOutputFormat_e::GLTF:
case ModelOutputFormat_e::GLTF:
DumpGltfLod<gltf::TextOutput>(common, context, asset, currentLod, ".gltf");
break;
case ObjWriting::Configuration_t::ModelOutputFormat_e::GLB:
case ModelOutputFormat_e::GLB:
DumpGltfLod<gltf::BinOutput>(common, context, asset, currentLod, ".glb");
break;
@@ -699,15 +699,15 @@ namespace
{
switch (ObjWriting::Configuration.ModelOutputFormat)
{
case ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_EXPORT:
case ModelOutputFormat_e::XMODEL_EXPORT:
return ".xmodel_export";
case ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_BIN:
case ModelOutputFormat_e::XMODEL_BIN:
return ".xmodel_bin";
case ObjWriting::Configuration_t::ModelOutputFormat_e::OBJ:
case ModelOutputFormat_e::OBJ:
return ".obj";
case ObjWriting::Configuration_t::ModelOutputFormat_e::GLTF:
case ModelOutputFormat_e::GLTF:
return ".gltf";
case ObjWriting::Configuration_t::ModelOutputFormat_e::GLB:
case ModelOutputFormat_e::GLB:
return ".glb";
default:
assert(false);
src/Unlinking/UnlinkerArgs.cpp
+7 -7
View File
@@ -184,13 +184,13 @@ bool UnlinkerArgs::SetImageDumpingMode() const
if (specifiedValue == "dds")
{
ObjWriting::Configuration.ImageOutputFormat = ObjWriting::Configuration_t::ImageOutputFormat_e::DDS;
ObjWriting::Configuration.ImageOutputFormat = ImageOutputFormat_e::DDS;
return true;
}
if (specifiedValue == "iwi")
{
ObjWriting::Configuration.ImageOutputFormat = ObjWriting::Configuration_t::ImageOutputFormat_e::IWI;
ObjWriting::Configuration.ImageOutputFormat = ImageOutputFormat_e::IWI;
return true;
}
@@ -206,31 +206,31 @@ bool UnlinkerArgs::SetModelDumpingMode() const
if (specifiedValue == "xmodel_export")
{
ObjWriting::Configuration.ModelOutputFormat = ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_EXPORT;
ObjWriting::Configuration.ModelOutputFormat = ModelOutputFormat_e::XMODEL_EXPORT;
return true;
}
if (specifiedValue == "xmodel_bin")
{
ObjWriting::Configuration.ModelOutputFormat = ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_BIN;
ObjWriting::Configuration.ModelOutputFormat = ModelOutputFormat_e::XMODEL_BIN;
return true;
}
if (specifiedValue == "obj")
{
ObjWriting::Configuration.ModelOutputFormat = ObjWriting::Configuration_t::ModelOutputFormat_e::OBJ;
ObjWriting::Configuration.ModelOutputFormat = ModelOutputFormat_e::OBJ;
return true;
}
if (specifiedValue == "gltf")
{
ObjWriting::Configuration.ModelOutputFormat = ObjWriting::Configuration_t::ModelOutputFormat_e::GLTF;
ObjWriting::Configuration.ModelOutputFormat = ModelOutputFormat_e::GLTF;
return true;
}
if (specifiedValue == "glb")
{
ObjWriting::Configuration.ModelOutputFormat = ObjWriting::Configuration_t::ModelOutputFormat_e::GLB;
ObjWriting::Configuration.ModelOutputFormat = ModelOutputFormat_e::GLB;
return true;
}