Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2024-11-12 02:00:50 +01:00
Code Releases Wiki Activity

Add mip swizzle value from tex2 to deswizzle

Browse Source
This commit is contained in:
KillzXGaming 2019-04-06 11:58:21 -04:00
parent 2f4b03a454
commit 04eee5913c
9 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View File

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View File

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

1
Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FTEX.cs
View File

@ -418,6 +418,7 @@ namespace Bfres.Structs
surf.mipData = resFile2.Textures[texture.Name].MipData;
surf.mipOffset = resFile2.Textures[texture.Name].MipOffsets;
Tex2Swizzle = resFile2.Textures[texture.Name].Swizzle;
surf.mip_swizzle = Tex2Swizzle;
}
}
}

BIN
Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll
View File

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb
View File

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
View File

Binary file not shown.

8
Switch_Toolbox_Library/Swizzling/GTX.cs
View File

@ -27,6 +27,7 @@ namespace Switch_Toolbox.Library
public uint mipPtr;
public uint tileMode;
public uint swizzle;
public uint mip_swizzle; //Used for botw Tex2
public uint alignment;
public uint pitch;
public uint bpp;
@ -513,6 +514,8 @@ namespace Switch_Toolbox.Library
List<byte[]> mips = new List<byte[]>();
for (int mipLevel = 0; mipLevel < mipCount; mipLevel++)
{
uint swizzle = tex.swizzle;
uint width_ = (uint)Math.Max(1, tex.width >> mipLevel);
uint height_ = (uint)Math.Max(1, tex.height >> mipLevel);
@ -521,6 +524,9 @@ namespace Switch_Toolbox.Library
uint mipOffset;
if (mipLevel != 0)
{
if (tex.mip_swizzle != 0)
swizzle = tex.mip_swizzle;
mipOffset = (tex.mipOffset[mipLevel - 1]);
if (mipLevel == 1)
mipOffset -= (uint)surfInfo.surfSize;
@ -534,7 +540,7 @@ namespace Switch_Toolbox.Library
Array.Copy(tex.data, (uint)dataOffset, data, 0, size);
byte[] deswizzled = deswizzle(width_, height_, surfInfo.depth, surfInfo.height, (uint)tex.format,
surfInfo.tileMode, (uint)tex.swizzle, surfInfo.pitch, surfInfo.bpp, data, arrayLevel);
surfInfo.tileMode, (uint)swizzle, surfInfo.pitch, surfInfo.bpp, data, arrayLevel);
//Create a copy and use that to remove uneeded data
byte[] result_ = new byte[size];
Array.Copy(deswizzled, 0, result_, 0, size);