Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-22 12:33:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

More gx2 reg fixes

Browse source
This commit is contained in:
KillzXGaming 2019-07-14 18:13:00 -04:00
parent f84753aa11
commit ddcf80a6d7
10 changed files with 33 additions and 28 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.

45
Switch_FileFormatsMain/FileFormats/Texture/GTXFile.cs
View file

@ -593,7 +593,7 @@ namespace FirstPlugin
surface.tileMode = NewSurface.tileMode;
surface.use = NewSurface.use;
surface.width = NewSurface.width;
surface.texRegs = GX2.CreateRegisters(NewSurface);
surface.texRegs = NewSurface.texRegs;
SetChannelComponents();
}
@ -637,33 +637,26 @@ namespace FirstPlugin
surface.numMips = MipCount;
surface.mipOffset = new uint[MipCount];
try
{
//Create image block from bitmap first
var data = GenerateMipsAndCompress(bitmap, MipCount, Format);
//Create image block from bitmap first
var data = GenerateMipsAndCompress(bitmap, MipCount, Format);
//Swizzle and create surface
var NewSurface = GX2.CreateGx2Texture(data, Text,
(uint)surface.tileMode,
(uint)surface.aa,
(uint)surface.width,
(uint)surface.height,
(uint)surface.depth,
(uint)surface.format,
(uint)surface.swizzle,
(uint)surface.dim,
(uint)surface.numMips
);
//Swizzle and create surface
var NewSurface = GX2.CreateGx2Texture(data, Text,
(uint)surface.tileMode,
(uint)surface.aa,
(uint)surface.width,
(uint)surface.height,
(uint)surface.depth,
(uint)surface.format,
(uint)surface.swizzle,
(uint)surface.dim,
(uint)surface.numMips
);
ApplySurface(NewSurface);
IsEdited = true;
LoadOpenGLTexture();
LibraryGUI.UpdateViewport();
}
catch (Exception ex)
{
STErrorDialog.Show("Failed to swizzle and compress image " + Text, "Error", ex.ToString());
}
ApplySurface(NewSurface);
IsEdited = true;
LoadOpenGLTexture();
LibraryGUI.UpdateViewport();
}
public override byte[] GetImageData(int ArrayLevel = 0, int MipLevel = 0)

BIN
Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
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/Forms/Editors/ImageEditor/ImageEditorBase.cs
View file

@ -710,6 +710,8 @@ namespace Switch_Toolbox.Library.Forms
private void UpdateEdit(Image image)
{
if (ActiveTexture.ArrayCount == 0) ActiveTexture.ArrayCount = 1;
ActiveTexture.EditedImages = new EditedBitmap[ActiveTexture.ArrayCount];
ActiveTexture.EditedImages[CurArrayDisplayLevel] = new EditedBitmap()
{
@ -751,7 +753,8 @@ namespace Switch_Toolbox.Library.Forms
if (ActiveTexture.EditedImages != null && ActiveTexture.EditedImages[CurArrayDisplayLevel] != null)
{
ActiveTexture.EditedImages[CurArrayDisplayLevel].bitmap.Dispose();
if (ActiveTexture.EditedImages[CurArrayDisplayLevel].bitmap != null)
ActiveTexture.EditedImages[CurArrayDisplayLevel].bitmap.Dispose();
ActiveTexture.EditedImages[CurArrayDisplayLevel] = null;
}
@ -1031,6 +1034,9 @@ namespace Switch_Toolbox.Library.Forms
public void SaveAndApplyImage(Bitmap image, bool DecodeBack)
{
if (image == null)
return;
if (saveBtn.InvokeRequired)
{
saveBtn.Invoke(new MethodInvoker(

2
Switch_Toolbox_Library/Swizzling/GX2.cs
View file

@ -612,6 +612,8 @@ namespace Switch_Toolbox.Library.Old
surf.alignment = alignment;
surf.imageSize = imageSize;
surf.data = Swizzled[0];
surf.compSel = new byte[4] { 0, 1, 2, 3 };
surf.texRegs = CreateRegisters(surf);
List<byte[]> mips = new List<byte[]>();
for (int mipLevel = 1; mipLevel < Swizzled.Count; mipLevel++)

5
Switch_Toolbox_Library/Swizzling/GX2TexRegisters.cs
View file

@ -70,6 +70,9 @@ namespace Switch_Toolbox.Library
public static uint[] CreateTexRegs(uint width, uint height, uint numMips, uint format_, uint tileMode, uint pitch, byte[] compSel)
{
if (compSel == null || compSel.Length != 4)
compSel = new byte[4] { 0, 1, 2, 3 };
pitch = Math.Max(pitch, 8);
var register0 = _register0((int)width - 1, (int)(pitch / 8) - 1, 0, (int)tileMode, 1);
@ -106,7 +109,7 @@ namespace Switch_Toolbox.Library
byte[] reg3 = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(register3));
byte[] reg4 = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(register4));*/
return new uint[] { (uint)register0, (uint)register1, (uint)register2, (uint)register3, (uint)register4 };
return new uint[5] { (uint)register0, (uint)register1, (uint)register2, (uint)register3, (uint)register4 };
}
}

1
Switch_Toolbox_Library/Swizzling/NewSwizzleCodeBackup.cs
View file

@ -557,6 +557,7 @@ namespace Switch_Toolbox.Library
surf.alignment = alignment;
surf.imageSize = imageSize;
surf.data = Swizzled[0];
surf.texRegs = CreateRegisters(surf);
List<byte[]> mips = new List<byte[]>();
for (int mipLevel = 1; mipLevel < Swizzled.Count; mipLevel++)