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

Fix channel components previewing for gx2

Browse Source
This commit is contained in:
KillzXGaming 2019-06-14 20:18:34 -04:00
parent 6ef05a82c8
commit 34f724a6e1
6 changed files with 23 additions and 9 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.

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

@ -389,10 +389,10 @@ namespace Bfres.Structs
ArrayCount = tex.ArrayLength;
MipCount = tex.MipCount;
RedChannel = SetChannel(texture.CompSelR);
GreenChannel = SetChannel(texture.CompSelG);
BlueChannel = SetChannel(texture.CompSelB);
AlphaChannel = SetChannel(texture.CompSelA);
RedChannel = GX2ChanneToGeneric(texture.CompSelR);
GreenChannel = GX2ChanneToGeneric(texture.CompSelG);
BlueChannel = GX2ChanneToGeneric(texture.CompSelB);
AlphaChannel = GX2ChanneToGeneric(texture.CompSelA);
if (tex.ArrayLength == 0)
ArrayCount = tex.Depth; //Some older bfres don't use array length????
@ -401,7 +401,7 @@ namespace Bfres.Structs
MipCount = 1;
}
private STChannelType SetChannel(GX2CompSel comp)
private STChannelType GX2ChanneToGeneric(GX2CompSel comp)
{
if (comp == GX2CompSel.ChannelR) return STChannelType.Red;
else if (comp == GX2CompSel.ChannelG) return STChannelType.Green;
@ -566,6 +566,11 @@ namespace Bfres.Structs
int pitch = (int)texture.Pitch;
uint bpp = GX2.surfaceGetBitsPerPixel((uint)format) >> 3;
RedChannel = GX2ChanneToGeneric(texture.CompSelR);
GreenChannel = GX2ChanneToGeneric(texture.CompSelG);
BlueChannel = GX2ChanneToGeneric(texture.CompSelB);
AlphaChannel = GX2ChanneToGeneric(texture.CompSelA);
UpdateMipMaps();
GX2.GX2Surface surf = new GX2.GX2Surface();
@ -587,6 +592,8 @@ namespace Bfres.Structs
surf.swizzle = texture.Swizzle;
surf.numArray = texture.ArrayLength;
if (Tex2Swizzle != 0)
surf.mip_swizzle = Tex2Swizzle;
@ -672,6 +679,7 @@ namespace Bfres.Structs
throw new Exception($"Cannot convert format {GX2Format}");
}
}
public static void SetChannelsByFormat(GX2SurfaceFormat Format, Texture tex)
{
switch (Format)
@ -774,10 +782,10 @@ namespace Bfres.Structs
{
Text = texture.Name;
RedChannel = SetChannel(texture.CompSelR);
GreenChannel = SetChannel(texture.CompSelG);
BlueChannel = SetChannel(texture.CompSelB);
AlphaChannel = SetChannel(texture.CompSelA);
RedChannel = GX2ChanneToGeneric(texture.CompSelR);
GreenChannel = GX2ChanneToGeneric(texture.CompSelG);
BlueChannel = GX2ChanneToGeneric(texture.CompSelB);
AlphaChannel = GX2ChanneToGeneric(texture.CompSelA);
ImageEditorBase editor = (ImageEditorBase)LibraryGUI.Instance.GetActiveContent(typeof(ImageEditorBase));
if (editor != null)

6
Switch_FileFormatsMain/FileFormats/Texture/GTXFile.cs
View File

@ -599,6 +599,12 @@ namespace FirstPlugin
public override byte[] GetImageData(int ArrayLevel = 0, int MipLevel = 0)
{
RedChannel = SetChannel(surface.compSel[0]);
GreenChannel = SetChannel(surface.compSel[1]);
BlueChannel = SetChannel(surface.compSel[2]);
AlphaChannel = SetChannel(surface.compSel[3]);
Console.WriteLine("");
Console.WriteLine("// ----- GX2Surface Info ----- ");
Console.WriteLine(" dim = " + surface.dim);

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

Binary file not shown.