1berry/MobiusMapEditor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WSA format in mix files is now identified from stream.

Browse Source
This commit is contained in:
Nyerguds 2024-09-18 20:12:38 +02:00
parent d5e8d43dac
commit 17f25cdfca
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
CnCTDRAMapEditor/Utility/MixContentAnalysis.cs
View File

@ -107,6 +107,8 @@ namespace MobiusEditor.Utility
return; return;
if (IdentifyLut(fileStream, mixInfo)) if (IdentifyLut(fileStream, mixInfo))
return; return;
if (IdentifyWsa(fileStream, mixInfo))
return;
// These types analyse the full file from byte array. I'm restricting the buffer for them to 5mb; they shouldn't need more. // These types analyse the full file from byte array. I'm restricting the buffer for them to 5mb; they shouldn't need more.
// Eventually, all of these (except ini I guess) should ideally be switched to stream to speed up the processing. // Eventually, all of these (except ini I guess) should ideally be switched to stream to speed up the processing.
if (mixInfo.Length <= maxProcessed) if (mixInfo.Length <= maxProcessed)
@ -118,8 +120,6 @@ namespace MobiusEditor.Utility
fileStream.Seek(0, SeekOrigin.Begin); fileStream.Seek(0, SeekOrigin.Begin);
if (!missionsAndMixFilesOnly) if (!missionsAndMixFilesOnly)
{ {
if (IdentifyWsa(fileContents, mixInfo))
return;
if (IdentifyCcTmp(fileContents, mixInfo)) if (IdentifyCcTmp(fileContents, mixInfo))
return; return;
if (IdentifyRaTmp(fileContents, mixInfo)) if (IdentifyRaTmp(fileContents, mixInfo))
@ -406,29 +406,33 @@ namespace MobiusEditor.Utility
} }
} }
private static bool IdentifyWsa(byte[] fileContents, MixEntry mixInfo) private static bool IdentifyWsa(Stream fileStream, MixEntry mixInfo)
{ {
const int palLength = 0x300;
try try
{ {
int datalen = fileContents.Length; fileStream.Seek(0, SeekOrigin.Begin);
if (datalen < 14) long fileLength = fileStream.Length;
byte[] buffer = new byte[14];
int headerLen = fileStream.Read(buffer, 0, buffer.Length);
if (headerLen < 14)
{ {
return false; return false;
} }
ushort nrOfFrames = ArrayUtils.ReadUInt16FromByteArrayLe(fileContents, 0); ushort nrOfFrames = ArrayUtils.ReadUInt16FromByteArrayLe(buffer, 0);
if (nrOfFrames == 0) if (nrOfFrames == 0)
{ {
return false; return false;
} }
ushort xPos = ArrayUtils.ReadUInt16FromByteArrayLe(fileContents, 2); ushort xPos = ArrayUtils.ReadUInt16FromByteArrayLe(buffer, 2);
ushort yPos = ArrayUtils.ReadUInt16FromByteArrayLe(fileContents, 4); ushort yPos = ArrayUtils.ReadUInt16FromByteArrayLe(buffer, 4);
ushort xorWidth = ArrayUtils.ReadUInt16FromByteArrayLe(fileContents, 6); ushort xorWidth = ArrayUtils.ReadUInt16FromByteArrayLe(buffer, 6);
ushort xorHeight = ArrayUtils.ReadUInt16FromByteArrayLe(fileContents, 8); ushort xorHeight = ArrayUtils.ReadUInt16FromByteArrayLe(buffer, 8);
int buffSize = 2; int buffSize = 2;
uint deltaBufferSize = (uint)ArrayUtils.ReadIntFromByteArray(fileContents, 0x0A, buffSize, true); uint deltaBufferSize = (uint)ArrayUtils.ReadIntFromByteArray(buffer, 0x0A, buffSize, true);
ushort flags = ArrayUtils.ReadUInt16FromByteArrayLe(fileContents, 0x0A + buffSize); ushort flags = ArrayUtils.ReadUInt16FromByteArrayLe(buffer, 0x0A + buffSize);
int headerSize = 0x0C + buffSize; int headerSize = 0x0C + buffSize;
if (xorWidth == 0 || xorHeight == 0) if (xorWidth == 0 || xorWidth > 320 || xorHeight == 0 || xorHeight > 200)
{ {
return false; return false;
} }
@ -438,15 +442,17 @@ namespace MobiusEditor.Utility
uint[] frameOffsets = new uint[nrOfFrames + 2]; uint[] frameOffsets = new uint[nrOfFrames + 2];
for (int i = 0; i < nrOfFrames + 2; ++i) for (int i = 0; i < nrOfFrames + 2; ++i)
{ {
if (fileContents.Length <= dataIndexOffset + 4) if (fileLength <= dataIndexOffset + 4)
{ {
return false; return false;
} }
uint curOffs = ArrayUtils.ReadUInt32FromByteArrayLe(fileContents, dataIndexOffset); fileStream.Seek(dataIndexOffset, SeekOrigin.Begin);
fileStream.Read(buffer, 0, 4);
uint curOffs = ArrayUtils.ReadUInt32FromByteArrayLe(buffer, 0);
frameOffsets[i] = curOffs; frameOffsets[i] = curOffs;
if (hasPalette) if (hasPalette)
curOffs += 300; curOffs += palLength;
if (curOffs > fileContents.Length) if (curOffs > fileLength)
{ {
return false; return false;
} }
@ -455,22 +461,24 @@ namespace MobiusEditor.Utility
bool hasLoopFrame = frameOffsets[nrOfFrames + 1] != 0; bool hasLoopFrame = frameOffsets[nrOfFrames + 1] != 0;
uint endOffset = frameOffsets[nrOfFrames + (hasLoopFrame ? 1 : 0)]; uint endOffset = frameOffsets[nrOfFrames + (hasLoopFrame ? 1 : 0)];
if (hasPalette) if (hasPalette)
endOffset += 0x300; endOffset += palLength;
if (endOffset != fileContents.Length) if (endOffset != fileLength)
{ {
return false; return false;
} }
if (hasPalette) if (hasPalette)
{ {
if (fileContents.Length < paletteOffset + 0x300) if (fileLength < paletteOffset + palLength)
{ {
return false; return false;
} }
int paletteEnd = paletteOffset + 0x300; fileStream.Seek(paletteOffset, SeekOrigin.Begin);
for (int i = paletteOffset; i < paletteEnd; i++) byte[] palData = new byte[palLength];
fileStream.Read(palData, 0, palLength);
for (int i = 0; i < palLength; ++i)
{ {
// verify 6-bit palette // verify 6-bit palette
if (fileContents[i] > 0x3F) if (palData[i] > 0x3F)
{ {
return false; return false;
} }