Change mipmap handling again.

xivdev · Sep 23, 2022 · 3158d3d · 3158d3d
1 parent cadaafb
commit 3158d3d
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 13 deletions.
diff --git a/Penumbra/Import/Textures/TexFileParser.cs b/Penumbra/Import/Textures/TexFileParser.cs
@@ -24,7 +24,7 @@ public static ScratchImage Parse( Stream data )
             throw new Exception( $"Could not obtain dimensionality from {header.Type}." );
         }
 
-        meta.MipLevels = CountMipLevels( data, in header );
+        meta.MipLevels = CountMipLevels( data, in meta, in header );
 
         var scratch = ScratchImage.Initialize( meta );
 
@@ -33,23 +33,38 @@ public static ScratchImage Parse( Stream data )
         return scratch;
     }
 
-    private static unsafe int CountMipLevels( Stream data, in TexFile.TexHeader header )
+    private static unsafe int CountMipLevels( Stream data, in TexMeta meta, in TexFile.TexHeader header )
     {
-        var lastOffset = 80u;
-        var levels     = 1;
-        for( var i = 1; i < 13; ++i )
+        var width  = meta.Width;
+        var height = meta.Height;
+        var bits   = meta.Format.BitsPerPixel();
+
+        var lastOffset = 0L;
+        var lastSize   = 80L;
+        for( var i = 0; i < 13; ++i )
         {
             var offset = header.OffsetToSurface[ i ];
-            var diff   = offset - lastOffset;
-            if( offset > 0 && offset < data.Length && diff > 0 )
+            if( offset == 0 )
+            {
+                return i;
+            }
+
+            var requiredSize = width * height * bits / 8;
+            if( offset + requiredSize > data.Length )
             {
-                lastOffset = offset;
-                ++levels;
+                return i;
             }
-            else
+
+            var diff = offset - lastOffset;
+            if( diff != lastSize )
             {
-                return levels;
+                return i;
             }
+
+            width      = Math.Max( width  / 2, 4 );
+            height     = Math.Max( height / 2, 4 );
+            lastOffset = offset;
+            lastSize   = requiredSize;
         }
 
         return 13;

diff --git a/Penumbra/UI/Classes/ModEditWindow.Textures.cs b/Penumbra/UI/Classes/ModEditWindow.Textures.cs
@@ -64,7 +64,11 @@ private void DrawInputChild( string label, Texture tex, Vector2 size, Vector2 im
         }
 
         ImGui.NewLine();
-        tex.Draw( imageSize );
+        using var child2 = ImRaii.Child( "image" );
+        if( child2 )
+        {
+            tex.Draw( imageSize );
+        }
     }
 
     private void SaveAsCombo()
@@ -157,7 +161,11 @@ private void DrawOutputChild( Vector2 size, Vector2 imageSize )
             ImGuiUtil.TextWrapped( _center.SaveException.ToString() );
         }
 
-        _center.Draw( imageSize );
+        using var child2 = ImRaii.Child( "image" );
+        if( child2 )
+        {
+            _center.Draw( imageSize );
+        }
     }
 
     private Vector2 GetChildWidth()