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

Try to fix tex2 swizzle issues

Browse Source
This commit is contained in:
KillzXGaming 2019-04-18 21:41:10 -04:00
parent f28b979b33
commit 74bdba4536
11 changed files with 14 additions and 14 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.

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

@ -134,9 +134,10 @@ namespace Bfres.Structs
GTXImporterSettings setting = SetImporterSettings(image, FileName);
setting.MipSwizzle = Tex2Swizzle;
GTXTextureImporter importer = new GTXTextureImporter();
if (Tex2Swizzle != 0)
setting.Swizzle = Tex2SwizzleValue;
setting.MipSwizzle = Tex2Swizzle;
GTXTextureImporter importer = new GTXTextureImporter();
importer.LoadSetting(setting);
if (importer.ShowDialog() == DialogResult.OK)
@ -200,6 +201,9 @@ namespace Bfres.Structs
importer.ReadOnlySwizzle = IsSwizzleReadOnly;
importer.ReadOnlyTileMode = IsSwizzleReadOnly;
if (Tex2Swizzle != 0)
setting.Swizzle = Tex2Swizzle;
if (MipMapCount != 0)
{
setting.MipCount = MipMapCount;

2
Switch_FileFormatsMain/FileFormats/Texture/BFLIM.cs
View File

@ -150,7 +150,7 @@ namespace FirstPlugin
if (ofd.ShowDialog() == DialogResult.OK)
{
FTEX ftex = new FTEX();
ftex.ReplaceTexture(ofd.FileName, 1, SupportedFormats, true, true);
ftex.ReplaceTexture(ofd.FileName, 1, SupportedFormats);
if (ftex.texture != null)
{
image.Swizzle = (byte)ftex.texture.Swizzle;

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

@ -20,8 +20,7 @@ namespace FirstPlugin
setting.TexHeight,
setting.Depth,
(uint)setting.Format,
setting.SwizzlePattern,
setting.MipSwizzle,
setting.Swizzle,
(uint)setting.SurfaceDim,
setting.MipCount);
}

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

@ -27,6 +27,7 @@ namespace FirstPlugin
public uint tileMode = 4;
public uint SwizzlePattern = 0;
public uint Swizzle = 0;
public uint MipSwizzle = 0;
public GX2CompSel[] compSel = new GX2CompSel[4];

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

@ -205,12 +205,13 @@ namespace FirstPlugin
MipmapNum.Value = SelectedTexSettings.MipCount;
SwizzleNum.Value = SelectedTexSettings.SwizzlePattern;
SwizzleNum.Value = (SelectedTexSettings.Swizzle >> 8) & 7;
}
}
private void SwizzleNum_ValueChanged(object sender, EventArgs e) {
SelectedTexSettings.SwizzlePattern = (uint)SwizzleNum.Value;
SelectedTexSettings.Swizzle &= GX2.SwizzleMask;
SelectedTexSettings.Swizzle |= (uint)SwizzleNum.Value << 8;
}
/// <summary>

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.

9
Switch_Toolbox_Library/Swizzling/GX2.cs
View File

@ -432,7 +432,7 @@ namespace Switch_Toolbox.Library
static bool DebugSurface = false;
public static GX2Surface CreateGx2Texture(byte[] imageData, string Name, uint TileMode, uint AAMode,
uint Width, uint Height, uint Depth, uint Format, uint swizzle, uint mipSwizzle, uint SurfaceDim, uint MipCount)
uint Width, uint Height, uint Depth, uint Format, uint swizzle, uint SurfaceDim, uint MipCount)
{
var surfOut = getSurfaceInfo((GX2SurfaceFormat)Format, Width, Height, 1, 1, TileMode, 0, 0);
uint imageSize = (uint)surfOut.surfSize;
@ -474,8 +474,6 @@ namespace Switch_Toolbox.Library
for (int mipLevel = 0; mipLevel < MipCount; mipLevel++)
{
uint swizzleValue = s;
var result = TextureHelper.GetCurrentMipSize(Width, Height, blkWidth, blkHeight, bpp, mipLevel);
uint offset = result.Item1;
@ -489,9 +487,6 @@ namespace Switch_Toolbox.Library
if (mipLevel != 0)
{
if (mipSwizzle != 0)
swizzleValue = mipSwizzle;
surfOut = GX2.getSurfaceInfo((GX2SurfaceFormat)Format, Width, Height, 1, 1, TileMode, 0, mipLevel);
if (mipLevel == 1)
@ -506,7 +501,7 @@ namespace Switch_Toolbox.Library
if (mipLevel != 0)
mipSize += (uint)(surfOut.surfSize + dataAlignBytes.Length);
byte[] SwizzledData = GX2.swizzle(width_, height_, surfOut.depth, surfOut.height, (uint)Format, surfOut.tileMode, swizzleValue,
byte[] SwizzledData = GX2.swizzle(width_, height_, surfOut.depth, surfOut.height, (uint)Format, surfOut.tileMode, s,
surfOut.pitch, surfOut.bpp, data_, DepthLevel);
Swizzled.Add(dataAlignBytes.Concat(SwizzledData).ToArray());