Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2024-12-03 19:47:29 +01:00
Code Releases Wiki Activity

Fix gtx file saving if there are no mip maps for a texture

Browse Source
This commit is contained in:
KillzXGaming 2019-06-15 21:39:23 -04:00
parent 8bbe51bb9c
commit 88f95dc8b3
4 changed files with 16 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.

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

@ -151,9 +151,9 @@ namespace FirstPlugin
public byte[] Save() public byte[] Save()
{ {
//Get each block type for saving except alignment //Get each block type for saving except alignment
var TextureInfoBlocks = blocks.Where(i => i.BlockType == BlockType.ImageInfo); // var TextureInfoBlocks = blocks.Where(i => i.BlockType == BlockType.ImageInfo);
var TextureDataBlocks = blocks.Where(i => i.BlockType == BlockType.ImageData); // var TextureDataBlocks = blocks.Where(i => i.BlockType == BlockType.ImageData);
var TextureMipDataBlocks = blocks.Where(i => i.BlockType == BlockType.MipData); // var TextureMipDataBlocks = blocks.Where(i => i.BlockType == BlockType.MipData);
System.IO.MemoryStream mem = new System.IO.MemoryStream(); System.IO.MemoryStream mem = new System.IO.MemoryStream();
using (FileWriter writer = new FileWriter(mem)) using (FileWriter writer = new FileWriter(mem))
@ -180,21 +180,26 @@ namespace FirstPlugin
else else
throw new Exception($"Unsupported GTX version {header.MajorVersion}"); throw new Exception($"Unsupported GTX version {header.MajorVersion}");
int imageInfoIndex = 0; int imageInfoIndex = -1;
int imageBlockIndex = 0; int imageBlockIndex = -1;
int imageMipBlockIndex = 0; int imageMipBlockIndex = -1;
writer.Seek(header.HeaderSize, System.IO.SeekOrigin.Begin); writer.Seek(header.HeaderSize, System.IO.SeekOrigin.Begin);
foreach (var block in blocks) foreach (var block in blocks)
{ {
if ((uint)block.BlockType == surfBlockType) if ((uint)block.BlockType == surfBlockType)
{ {
block.data = textures[imageInfoIndex++].surface.Write(); imageInfoIndex++;
imageBlockIndex++;
imageMipBlockIndex++;
block.data = textures[imageInfoIndex].surface.Write();
block.Write(writer); block.Write(writer);
} }
else if ((uint)block.BlockType == dataBlockType) else if ((uint)block.BlockType == dataBlockType)
{ {
var tex = textures[imageBlockIndex++]; var tex = textures[imageBlockIndex];
var pos = writer.Position; var pos = writer.Position;
uint Alignment = tex.surface.alignment; uint Alignment = tex.surface.alignment;
@ -208,7 +213,7 @@ namespace FirstPlugin
} }
else if ((uint)block.BlockType == mipBlockType) else if ((uint)block.BlockType == mipBlockType)
{ {
var tex = textures[imageMipBlockIndex++]; var tex = textures[imageMipBlockIndex];
var pos = writer.Position; var pos = writer.Position;
uint Alignment = tex.surface.alignment; uint Alignment = tex.surface.alignment;
@ -217,6 +222,8 @@ namespace FirstPlugin
GTXDataBlock dataAlignBlock = new GTXDataBlock(BlockType.AlignData, dataAlignment, 0, 0); GTXDataBlock dataAlignBlock = new GTXDataBlock(BlockType.AlignData, dataAlignment, 0, 0);
dataAlignBlock.Write(writer); dataAlignBlock.Write(writer);
if (tex.surface.mipData == null || tex.surface.mipData.Length <= 0)
throw new Exception("Invalid mip data!");
block.data = tex.surface.mipData; block.data = tex.surface.mipData;
block.Write(writer); block.Write(writer);