ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-12 18:27:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change mipmap handling again.

Browse source
This commit is contained in:
Ottermandias 2022-09-23 20:48:59 +02:00
parent cadaafb887
commit 3158d3da8c
2 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Penumbra/Import/Textures/TexFileParser.cs
View file

@ -24,7 +24,7 @@ public static class TexFileParser
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 class TexFileParser
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 )
{
lastOffset = offset;
++levels;
return i;
}
else
var requiredSize = width * height * bits / 8;
if( offset + requiredSize > data.Length )
{
return levels;
return i;
}
var diff = offset - lastOffset;
if( diff != lastSize )
{
return i;
}
width = Math.Max( width / 2, 4 );
height = Math.Max( height / 2, 4 );
lastOffset = offset;
lastSize = requiredSize;
}
return 13;

12
Penumbra/UI/Classes/ModEditWindow.Textures.cs
View file

@ -64,7 +64,11 @@ public partial class ModEditWindow
}
ImGui.NewLine();
tex.Draw( imageSize );
using var child2 = ImRaii.Child( "image" );
if( child2 )
{
tex.Draw( imageSize );
}
}
private void SaveAsCombo()
@ -157,7 +161,11 @@ public partial class ModEditWindow
ImGuiUtil.TextWrapped( _center.SaveException.ToString() );
}
_center.Draw( imageSize );
using var child2 = ImRaii.Child( "image" );
if( child2 )
{
_center.Draw( imageSize );
}
}
private Vector2 GetChildWidth()