Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2025-02-26 22:59:24 +01:00
Code Releases Wiki Activity

Check for array types properly

Browse Source
This commit is contained in:
KillzXGaming 2019-06-29 17:32:49 -04:00
parent 5a9d480a97
commit 00dbd8d7df
4 changed files with 50 additions and 11 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.

61
Switch_FileFormatsMain/FileFormats/Texture/BNTX.cs
View File

@ -207,7 +207,8 @@ namespace FirstPlugin
if (!IsLoadingArray) if (!IsLoadingArray)
LoadBNTXArray(ContainerArray, stream, this); LoadBNTXArray(ContainerArray, stream, this);
else
if (ContainerArray.Count == 0)
LoadFile(stream, Name); LoadFile(stream, Name);
PluginRuntime.bntxContainers.Add(this); PluginRuntime.bntxContainers.Add(this);
@ -223,9 +224,12 @@ namespace FirstPlugin
int Alignment = 4096; int Alignment = 4096;
using (var reader = new FileReader(stream, true)) using (var reader = new FileReader(stream, true))
{ {
reader.Position = 0; if (HasArray(reader, Alignment))
SearchForBinaryContainerFile(reader, Alignment, Containers); {
reader.Position = 0; reader.Position = 0;
SearchForBinaryContainerFile(reader, Alignment, Containers);
reader.Position = 0;
}
} }
foreach (var container in Containers) foreach (var container in Containers)
@ -255,21 +259,47 @@ namespace FirstPlugin
IsSavingArray = false; IsSavingArray = false;
} }
private static bool HasArray(FileReader reader, int Alignment)
{
long StartPos = reader.Position;
uint TotalSize = (uint)reader.BaseStream.Length;
//Get file size in header
reader.SeekBegin(StartPos + 28);
uint FileSize = reader.ReadUInt32();
reader.SeekBegin(StartPos + FileSize);
if (TotalSize > FileSize)
{
//Align the reader and check for another bntx
reader.Align(Alignment);
if (reader.Position < TotalSize - 4)
{
string Magic = reader.ReadString(4);
reader.Position = StartPos;
return (Magic == "BNTX");
}
}
return false;
}
private static void SearchForBinaryContainerFile(FileReader reader, int Alignment, List<BNTX> Containers) private static void SearchForBinaryContainerFile(FileReader reader, int Alignment, List<BNTX> Containers)
{ {
long StartPos = reader.Position; long StartPos = reader.Position;
uint TotalSize = (uint)reader.BaseStream.Length; uint TotalSize = (uint)reader.BaseStream.Length;
//Get file size in header
reader.SeekBegin(StartPos + 28);
uint FileSize = reader.ReadUInt32();
//Create bntx for array //Create bntx for array
BNTX bntx = new BNTX(); BNTX bntx = new BNTX();
bntx.IFileInfo = new IFileInfo(); bntx.IFileInfo = new IFileInfo();
bntx.Text = "Sheet " + Containers.Count; bntx.Text = "Sheet " + Containers.Count;
//Get file size in header
reader.SeekBegin(StartPos + 28);
uint FileSize = reader.ReadUInt32();
//Get total bntx in bytes //Get total bntx in bytes
reader.SeekBegin(StartPos); reader.SeekBegin(StartPos);
byte[] Data = reader.ReadBytes((int)FileSize); byte[] Data = reader.ReadBytes((int)FileSize);
@ -315,6 +345,15 @@ namespace FirstPlugin
public void Unload() public void Unload()
{ {
if (ContainerArray.Count > 1)
{
}
else
{
}
foreach (var tex in Textures.Values) foreach (var tex in Textures.Values)
{ {
tex.Texture.TextureData.Clear(); tex.Texture.TextureData.Clear();
@ -812,15 +851,15 @@ namespace FirstPlugin
{ {
MemoryStream mem = new MemoryStream(); MemoryStream mem = new MemoryStream();
BinaryTexFile.Textures.Clear();
BinaryTexFile.TextureDict.Clear();
if (ContainerArray.Count > 0 && !IsSavingArray) if (ContainerArray.Count > 0 && !IsSavingArray)
{ {
SaveBNTXArray(mem, ContainerArray); SaveBNTXArray(mem, ContainerArray);
} }
else else
{ {
BinaryTexFile.Textures.Clear();
BinaryTexFile.TextureDict.Clear();
foreach (TextureData tex in Textures.Values) foreach (TextureData tex in Textures.Values)
{ {
if (tex.IsEdited) if (tex.IsEdited)