Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2025-02-07 15:11:20 +01:00
Code Releases Wiki Activity

More fixes and try to load depth data

Browse Source
This commit is contained in:
KillzXGaming 2019-04-06 11:37:50 -04:00
parent 5837fbe5d6
commit ea099ee2dd
12 changed files with 60 additions and 48 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.

3
Switch_FileFormatsMain/FileFormats/Archives/SARC.cs
View File

@ -360,6 +360,9 @@ namespace FirstPlugin
public override void OnDoubleMouseClick(TreeView treeView) public override void OnDoubleMouseClick(TreeView treeView)
{ {
if (Data.Length <= 0)
return;
IFileFormat file = STFileLoader.OpenFileFormat(FullName, Data,false, true, this); IFileFormat file = STFileLoader.OpenFileFormat(FullName, Data,false, true, this);
if (Utils.HasInterface(file.GetType(), typeof(IEditor<>)) && !SuppressFormDialog) if (Utils.HasInterface(file.GetType(), typeof(IEditor<>)) && !SuppressFormDialog)

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

@ -424,6 +424,9 @@ namespace Bfres.Structs
var surfaces = GTX.Decode(surf); var surfaces = GTX.Decode(surf);
if (ArrayLevel >= surfaces.Count)
throw new Exception("Invalid amount of surfaces decoded!");
return surfaces[ArrayLevel][MipLevel]; return surfaces[ArrayLevel][MipLevel];
} }
@ -485,6 +488,7 @@ namespace Bfres.Structs
case GX2SurfaceFormat.T_R4_G4_UNorm: return TEX_FORMAT.B4G4R4A4_UNORM; case GX2SurfaceFormat.T_R4_G4_UNorm: return TEX_FORMAT.B4G4R4A4_UNORM;
case GX2SurfaceFormat.TC_R8_G8_UNorm: return TEX_FORMAT.R8G8_UNORM; case GX2SurfaceFormat.TC_R8_G8_UNorm: return TEX_FORMAT.R8G8_UNORM;
case GX2SurfaceFormat.TC_R8_UNorm: return TEX_FORMAT.R8_UNORM; case GX2SurfaceFormat.TC_R8_UNorm: return TEX_FORMAT.R8_UNORM;
case GX2SurfaceFormat.TC_R16_G16_B16_A16_Float: return TEX_FORMAT.R16G16B16A16_FLOAT;
case GX2SurfaceFormat.Invalid: throw new Exception("Invalid Format"); case GX2SurfaceFormat.Invalid: throw new Exception("Invalid Format");
default: default:
throw new Exception($"Cannot convert format {GX2Format}"); throw new Exception($"Cannot convert format {GX2Format}");

5
Switch_FileFormatsMain/GUI/TextureUI/Importers/CreateGx2Texture.cs
View File

@ -23,6 +23,7 @@ namespace FirstPlugin
uint mipSize = 0; uint mipSize = 0;
uint dataSize = (uint)imageData.Length; uint dataSize = (uint)imageData.Length;
uint bpp = GTX.surfaceGetBitsPerPixel((uint)setting.Format) >> 3; uint bpp = GTX.surfaceGetBitsPerPixel((uint)setting.Format) >> 3;
int DepthLevel = 1;
if (dataSize <= 0) if (dataSize <= 0)
throw new Exception($"Image is empty!!"); throw new Exception($"Image is empty!!");
@ -95,8 +96,8 @@ namespace FirstPlugin
if (mipLevel != 0) if (mipLevel != 0)
mipSize += (uint)(surfOut.surfSize + dataAlignBytes.Length); mipSize += (uint)(surfOut.surfSize + dataAlignBytes.Length);
byte[] SwizzledData = GTX.swizzle(width_, height_, surfOut.height, (uint)Format, surfOut.tileMode, s, byte[] SwizzledData = GTX.swizzle(width_, height_, surfOut.depth, surfOut.height, (uint)Format, surfOut.tileMode, s,
surfOut.pitch, surfOut.bpp, data_); surfOut.pitch, surfOut.bpp, data_, DepthLevel);
Swizzled.Add(dataAlignBytes.Concat(SwizzledData).ToArray()); Swizzled.Add(dataAlignBytes.Concat(SwizzledData).ToArray());
} }

4
Switch_FileFormatsMain/GUI/TextureUI/Importers/GTXImporterSettings.cs
View File

@ -245,8 +245,8 @@ namespace FirstPlugin
if (mipLevel != 0) if (mipLevel != 0)
mipSize += (uint)(surfOut.surfSize + dataAlignBytes.Length); mipSize += (uint)(surfOut.surfSize + dataAlignBytes.Length);
byte[] SwizzledData = GTX.swizzle(width_, height_, surfOut.height, (uint)Format, surfOut.tileMode, s, byte[] SwizzledData = GTX.swizzle(width_, height_, surfOut.depth, surfOut.height, (uint)Format, surfOut.tileMode, s,
surfOut.pitch, surfOut.bpp, data_); surfOut.pitch, surfOut.bpp, data_, 1);
Swizzled.Add(dataAlignBytes.Concat(SwizzledData).ToArray()); Swizzled.Add(dataAlignBytes.Concat(SwizzledData).ToArray());
} }

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.

92
Switch_Toolbox_Library/Swizzling/GTX.cs
View File

@ -113,16 +113,16 @@ namespace Switch_Toolbox.Library
public enum GX2SurfaceDimension public enum GX2SurfaceDimension
{ {
DIM_1D = 0x0, DIM_1D = 0x0,
DIM_2D = 0x1, DIM_2D = 0x1,
DIM_3D = 0x2, DIM_3D = 0x2,
DIM_CUBE = 0x3, DIM_CUBE = 0x3,
DIM_1D_ARRAY = 0x4, DIM_1D_ARRAY = 0x4,
DIM_2D_ARRAY = 0x5, DIM_2D_ARRAY = 0x5,
DIM_2D_MSAA = 0x6, DIM_2D_MSAA = 0x6,
DIM_2D_MSAA_ARRAY = 0x7, DIM_2D_MSAA_ARRAY = 0x7,
DIM_FIRST = 0x0, DIM_FIRST = 0x0,
DIM_LAST = 0x7, DIM_LAST = 0x7,
}; };
public enum GX2SurfaceFormat public enum GX2SurfaceFormat
{ {
@ -209,17 +209,17 @@ namespace Switch_Toolbox.Library
}; };
public enum GX2SurfaceUse : uint public enum GX2SurfaceUse : uint
{ {
USE_TEXTURE = 0x1, USE_TEXTURE = 0x1,
USE_COLOR_BUFFER = 0x2, USE_COLOR_BUFFER = 0x2,
USE_DEPTH_BUFFER = 0x4, USE_DEPTH_BUFFER = 0x4,
USE_SCAN_BUFFER = 0x8, USE_SCAN_BUFFER = 0x8,
USE_FTV = 0x80000000, USE_FTV = 0x80000000,
USE_COLOR_BUFFER_TEXTURE = 0x3, USE_COLOR_BUFFER_TEXTURE = 0x3,
USE_DEPTH_BUFFER_TEXTURE = 0x5, USE_DEPTH_BUFFER_TEXTURE = 0x5,
USE_COLOR_BUFFER_FTV = 0x80000002, USE_COLOR_BUFFER_FTV = 0x80000002,
USE_COLOR_BUFFER_TEXTURE_FTV = 0x80000003, USE_COLOR_BUFFER_TEXTURE_FTV = 0x80000003,
USE_FIRST = 0x1, USE_FIRST = 0x1,
USE_LAST = 0x8, USE_LAST = 0x8,
}; };
public enum GX2RResourceFlags public enum GX2RResourceFlags
{ {
@ -487,11 +487,11 @@ namespace Switch_Toolbox.Library
if (tex.mipData == null || tex.mipData.Length <= 0) if (tex.mipData == null || tex.mipData.Length <= 0)
mipCount = 1; mipCount = 1;
int ArrayImageize = data.Length / (int)tex.numArray; int ArrayImageize = data.Length / (int)tex.depth;
int ArrayMipImageize = 0; int ArrayMipImageize = 0;
if (tex.mipData != null) if (tex.mipData != null)
ArrayMipImageize = tex.mipData.Length / (int)tex.numArray; ArrayMipImageize = tex.mipData.Length / (int)tex.depth;
int dataOffset = 0; int dataOffset = 0;
int mipDataOffset = 0; int mipDataOffset = 0;
@ -505,7 +505,7 @@ namespace Switch_Toolbox.Library
bool tiling1dLevelSet = false; bool tiling1dLevelSet = false;
List<List<byte[]>> result = new List<List<byte[]>>(); List<List<byte[]>> result = new List<List<byte[]>>();
for (int arrayLevel = 0; arrayLevel < tex.numArray; arrayLevel++) for (int arrayLevel = 0; arrayLevel < tex.depth; arrayLevel++)
{ {
List<byte[]> mips = new List<byte[]>(); List<byte[]> mips = new List<byte[]>();
for (int mipLevel = 0; mipLevel < mipCount; mipLevel++) for (int mipLevel = 0; mipLevel < mipCount; mipLevel++)
@ -525,13 +525,13 @@ namespace Switch_Toolbox.Library
surfInfo = getSurfaceInfo((GX2SurfaceFormat)tex.format, tex.width, tex.height, tex.depth, (uint)tex.dim, (uint)tex.tileMode, (uint)tex.aa, mipLevel); surfInfo = getSurfaceInfo((GX2SurfaceFormat)tex.format, tex.width, tex.height, tex.depth, (uint)tex.dim, (uint)tex.tileMode, (uint)tex.aa, mipLevel);
data = new byte[surfInfo.surfSize]; data = new byte[surfInfo.surfSize];
Array.Copy(tex.mipData, (uint)mipDataOffset + mipOffset, data, 0, surfInfo.surfSize); Array.Copy(tex.mipData, (uint)mipOffset, data, 0, surfInfo.surfSize);
} }
else else
Array.Copy(tex.data, (uint)dataOffset, data, 0, size); Array.Copy(tex.data, (uint)dataOffset, data, 0, size);
byte[] deswizzled = deswizzle(width_, height_, surfInfo.height, (uint)tex.format, byte[] deswizzled = deswizzle(width_, height_, surfInfo.depth, surfInfo.height, (uint)tex.format,
surfInfo.tileMode, (uint)tex.swizzle, surfInfo.pitch, surfInfo.bpp, data); surfInfo.tileMode, (uint)tex.swizzle, surfInfo.pitch, surfInfo.bpp, data, arrayLevel);
//Create a copy and use that to remove uneeded data //Create a copy and use that to remove uneeded data
byte[] result_ = new byte[size]; byte[] result_ = new byte[size];
Array.Copy(deswizzled, 0, result_, 0, size); Array.Copy(deswizzled, 0, result_, 0, size);
@ -553,8 +553,6 @@ namespace Switch_Toolbox.Library
dataOffset += ArrayImageize; dataOffset += ArrayImageize;
mipDataOffset += ArrayMipImageize; mipDataOffset += ArrayMipImageize;
break;
} }
if (tiling1dLevelSet) if (tiling1dLevelSet)
@ -573,7 +571,8 @@ namespace Switch_Toolbox.Library
return (n + d - 1) / d; return (n + d - 1) / d;
} }
private static uint powTwoAlign_0(uint x, uint align) { private static uint powTwoAlign_0(uint x, uint align)
{
return (x + align - 1) & ~(align - 1); return (x + align - 1) & ~(align - 1);
} }
@ -604,19 +603,19 @@ namespace Switch_Toolbox.Library
} }
} }
public static byte[] deswizzle(uint width, uint height, uint height_, uint format_, uint tileMode, uint swizzle_, public static byte[] deswizzle(uint width, uint height, uint depth, uint height_, uint format_, uint tileMode, uint swizzle_,
uint pitch, uint bpp, byte[] data) uint pitch, uint bpp, byte[] data, int depthLevel)
{ {
return swizzleSurf(width, height, height_, format_, tileMode, swizzle_, pitch, bpp, data, 0); return swizzleSurf(width, height, depth, height_, format_, tileMode, swizzle_, pitch, bpp, data, depthLevel, 0);
} }
public static byte[] swizzle(uint width, uint height, uint height_, uint format_, uint tileMode, uint swizzle_, public static byte[] swizzle(uint width, uint height, uint depth, uint height_, uint format_, uint tileMode, uint swizzle_,
uint pitch, uint bpp, byte[] data) uint pitch, uint bpp, byte[] data, int depthLevel)
{ {
return swizzleSurf(width, height, height_, format_, tileMode, swizzle_, pitch, bpp, data, 1); return swizzleSurf(width, height, depth, height_, format_, tileMode, swizzle_, pitch, bpp, data, depthLevel, 1);
} }
private static byte[] swizzleSurf(uint width, uint height, uint height_, uint format, uint tileMode, uint swizzle_, private static byte[] swizzleSurf(uint width, uint height,uint depth, uint height_, uint format, uint tileMode, uint swizzle_,
uint pitch, uint bitsPerPixel, byte[] data, int swizzle) uint pitch, uint bitsPerPixel, byte[] data, int depthLevel, int swizzle)
{ {
uint bytesPerPixel = bitsPerPixel / 8; uint bytesPerPixel = bitsPerPixel / 8;
byte[] result = new byte[data.Length]; byte[] result = new byte[data.Length];
@ -634,6 +633,11 @@ namespace Switch_Toolbox.Library
tileMode = GX2TileModeToAddrTileMode(tileMode); tileMode = GX2TileModeToAddrTileMode(tileMode);
if (depth > 1)
{
bankSwizzle = (uint)(depthLevel % 4);
}
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {
for (int x = 0; x < width; x++) for (int x = 0; x < width; x++)
@ -642,7 +646,7 @@ namespace Switch_Toolbox.Library
pos = (uint)(y * pitch + x) * bytesPerPixel; pos = (uint)(y * pitch + x) * bytesPerPixel;
else if (tileMode == 2 || tileMode == 3) else if (tileMode == 2 || tileMode == 3)
{ {
pos = computeSurfaceAddrFromCoordMicroTiled((uint)x, (uint)y, 0,0, bitsPerPixel, pitch, (AddrTileMode)tileMode); pos = computeSurfaceAddrFromCoordMicroTiled((uint)x, (uint)y, 0, 0, bitsPerPixel, pitch, (AddrTileMode)tileMode);
} }
else else
{ {
@ -741,7 +745,7 @@ namespace Switch_Toolbox.Library
tileMode = 7; tileMode = 7;
var surfOut = getSurfaceInfo((GX2SurfaceFormat)format_, width, height, depth, dim, tileMode, aa, 0); var surfOut = getSurfaceInfo((GX2SurfaceFormat)format_, width, height, depth, dim, tileMode, aa, 0);
if (width < surfOut.pitchAlign && height<surfOut.heightAlign) if (width < surfOut.pitchAlign && height < surfOut.heightAlign)
{ {
if (tileMode == 7) if (tileMode == 7)
tileMode = 3; tileMode = 3;
@ -910,7 +914,7 @@ namespace Switch_Toolbox.Library
} }
private static ulong computeSurfaceAddrFromCoordMicroTiled(uint x, uint y,uint slice,uint sample, uint bpp, uint pitch, AddrTileMode tileMode) private static ulong computeSurfaceAddrFromCoordMicroTiled(uint x, uint y, uint slice, uint sample, uint bpp, uint pitch, AddrTileMode tileMode)
{ {
int microTileThickness = 1; int microTileThickness = 1;
@ -1394,7 +1398,7 @@ namespace Switch_Toolbox.Library
Console.WriteLine(pOut.heightAlign); Console.WriteLine(pOut.heightAlign);
Console.WriteLine(pOut.depthAlign); Console.WriteLine(pOut.depthAlign);
} }
if (valid == 0) if (valid == 0)
return 3; return 3;
@ -2056,7 +2060,7 @@ namespace Switch_Toolbox.Library
{ {
widtha = width / expandX; widtha = width / expandX;
heighta = height / expandY; heighta = height / expandY;
} }
else else
{ {
widtha = (width + expandX - 1) / expandX; widtha = (width + expandX - 1) / expandX;
@ -2427,4 +2431,4 @@ namespace Switch_Toolbox.Library
return pSurfOut; return pSurfOut;
} }
} }
} }