🐛 TEX0: Automate LOD range calculation

riidefi · Jan 21, 2021 · d10f6a6 · d10f6a6
1 parent 1d7ade0
commit d10f6a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/source/plugins/g3d/io/TEX0.cpp b/source/plugins/g3d/io/TEX0.cpp
@@ -19,8 +19,9 @@ void writeTexture(const Texture& data, oishii::Writer& writer,
   writer.write<u16>(data.height);
   writer.write<u32>(static_cast<u32>(data.format));
   writer.write<u32>(data.mipLevel);
-  writer.write<f32>(data.minLod);
-  writer.write<f32>(data.maxLod);
+  writer.write<f32>(data.custom_lod ? data.minLod : 0.0f);
+  writer.write<f32>(data.custom_lod ? data.maxLod
+                                    : static_cast<float>(data.mipLevel - 1));
   writer.write<u32>(0); // src path
   writer.write<u32>(0); // user data
   writer.alignTo(32);   // Assumes already 32b aligned
@@ -48,6 +49,8 @@ void readTexture(Texture& data, oishii::BinaryReader& reader) {
   data.mipLevel = reader.read<u32>();
   data.minLod = reader.read<f32>();
   data.maxLod = reader.read<f32>();
+  data.custom_lod = data.minLod != 0.0f ||
+                    data.maxLod != static_cast<float>(data.mipLevel - 1);
   data.sourcePath = readName(reader, start);
   // Skip user data
   reader.seekSet(start + ofsTex);

diff --git a/source/plugins/g3d/texture.hpp b/source/plugins/g3d/texture.hpp
@@ -16,6 +16,7 @@ struct TextureData {
   u32 height = 32;
 
   u32 mipLevel{1}; // 1 - no mipmaps
+  bool custom_lod = false;
   f32 minLod{0.0f};
   f32 maxLod{1.0f};