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

Fix tex2 files from loading mips in image editor

Browse Source
This commit is contained in:
KillzXGaming 2019-04-06 11:53:39 -04:00
parent ea099ee2dd
commit 2f4b03a454
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.

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

@ -392,7 +392,7 @@ namespace Bfres.Structs
if (!IsEdited && Tex1 != null && Tex1.Contains(".Tex1"))
{
string Tex2 = Tex1.Replace(".Tex1", ".Tex2");
Console.WriteLine(Tex2);
Console.WriteLine(Tex2 + " " + System.IO.File.Exists(Tex2));
if (System.IO.File.Exists(Tex2))
{
@ -407,8 +407,12 @@ namespace Bfres.Structs
{
resFile2 = new ResFile(Tex2);
}
Console.WriteLine((resFile2.Textures.ContainsKey(texture.Name)));
if (resFile2.Textures.ContainsKey(texture.Name))
{
MipCount = texture.MipCount;
texture.MipData = resFile2.Textures[texture.Name].MipData;
texture.MipOffsets = resFile2.Textures[texture.Name].MipOffsets;
surf.mipData = resFile2.Textures[texture.Name].MipData;

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.

3
Switch_Toolbox_Library/Swizzling/GTX.cs
View File

@ -432,6 +432,9 @@ namespace Switch_Toolbox.Library
public static List<List<byte[]>> Decode(GX2Surface tex, string DebugTextureName = "")
{
if (tex.data.Length <= 0)
throw new Exception("Invalid GX2 surface data. Make sure to not open Tex2 files if this is one. Those will load automatically next to Tex1!");
Console.WriteLine("DECODING TEX " + DebugTextureName);
var surfdEBUG = getSurfaceInfo((GX2SurfaceFormat)tex.format, tex.width, tex.height, tex.depth, (uint)tex.dim, (uint)tex.tileMode, (uint)tex.aa, 0);