mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bootstrap MxSmack (#343)

Browse Source 
* Bootstrap MxSmack

* Add comment about incorrect structure

* Fix naming

* Fix name

* Add a comment about SDK

* Add names from Smacker SDK

* Use SMACK.LIB and interface

* Use RAD.H defined types

* Use different commets

* Fix member offset

* Update mxsmack.cpp
This commit is contained in:
Christian Semmler
2023-12-20 20:07:48 -05:00
committed by GitHub
parent 994d17a85e
commit db60467ba3
9 changed files with 914 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
LEGO1/mxsmack.cpp Normal file
View File

@@ -0,0 +1,141 @@
#include "mxsmack.h"
#include <string.h>
DECOMP_SIZE_ASSERT(SmackTag, 0x390);
DECOMP_SIZE_ASSERT(MxSmack, 0x6b8);
// FUNCTION: LEGO1 0x100c5a90
MxResult MxSmack::LoadHeaderAndTrees(MxU8* p_data, MxSmack* p_mxSmack)
{
// Macros for readability
#define FRAME_COUNT(mxSmack) (p_mxSmack->m_smackTag.Frames + (p_mxSmack->m_smackTag.SmackerType & 1))
MxResult result = SUCCESS;
MxU8* frameTypes = NULL;
MxU8* huffmanTrees = NULL;
if (!p_data || !p_mxSmack) {
result = FAILURE;
}
else {
p_mxSmack->m_frameTypes = NULL;
p_mxSmack->m_frameSizes = NULL;
p_mxSmack->m_huffmanTrees = NULL;
p_mxSmack->m_huffmanTables = NULL;
memcpy(&p_mxSmack->m_smackTag, p_data, SmackHeaderSize(&p_mxSmack->m_smackTag));
p_data += SmackHeaderSize(&p_mxSmack->m_smackTag);
MxU32* frameSizes = new MxU32[FRAME_COUNT(p_mxSmack)];
if (!frameSizes) {
result = FAILURE;
}
else {
memcpy(frameSizes, p_data, FRAME_COUNT(p_mxSmack) * sizeof(MxU32));
p_data += FRAME_COUNT(p_mxSmack) * sizeof(MxU32);
p_mxSmack->m_maxFrameSize = 0;
// TODO
for (MxU32 i = 0; i < FRAME_COUNT(p_mxSmack); i++) {
if (p_mxSmack->m_maxFrameSize < frameSizes[i])
p_mxSmack->m_maxFrameSize = frameSizes[i];
}
frameTypes = new MxU8[FRAME_COUNT(p_mxSmack)];
if (!frameTypes) {
result = FAILURE;
}
else {
memcpy(frameTypes, p_data, FRAME_COUNT(p_mxSmack));
p_data += FRAME_COUNT(p_mxSmack);
MxU32 treeSize = p_mxSmack->m_smackTag.tablesize + 0x1000;
if (treeSize <= 0x2000)
treeSize = 0x2000;
huffmanTrees = new MxU8[treeSize];
if (!huffmanTrees) {
result = FAILURE;
}
else {
memcpy(huffmanTrees + 0x1000, p_data, p_mxSmack->m_smackTag.tablesize);
p_mxSmack->m_huffmanTables = new MxU8
[p_mxSmack->m_smackTag.codesize + p_mxSmack->m_smackTag.absize +
p_mxSmack->m_smackTag.detailsize + p_mxSmack->m_smackTag.typesize + SmackGetSizeTables()];
if (!p_mxSmack->m_huffmanTables) {
result = FAILURE;
}
else {
SmackDoTables(
huffmanTrees,
p_mxSmack->m_huffmanTables,
p_mxSmack->m_smackTag.codesize,
p_mxSmack->m_smackTag.absize,
p_mxSmack->m_smackTag.detailsize,
p_mxSmack->m_smackTag.typesize
);
MxU32 size =
::SmackGetSizeDeltas(p_mxSmack->m_smackTag.Width, p_mxSmack->m_smackTag.Height) + 32;
p_mxSmack->m_unk0x6b4 = new MxU8[size];
memset(p_mxSmack->m_unk0x6b4, 0, size);
MxS32 width = p_mxSmack->m_smackTag.Width;
MxU32* data = (MxU32*) p_mxSmack->m_unk0x6b4;
*data = 1;
data++;
*data = 0;
data++;
*data = p_mxSmack->m_smackTag.Width / 4;
data++;
*data = p_mxSmack->m_smackTag.Height / 4;
data++;
*data = width - 4;
data++;
*data = width * 3;
data++;
*data = width;
data++;
*data = width * 4 - p_mxSmack->m_smackTag.Width;
data++;
data++;
*data = p_mxSmack->m_smackTag.Width;
data++;
*data = p_mxSmack->m_smackTag.Height;
}
}
}
}
p_mxSmack->m_frameTypes = frameTypes;
p_mxSmack->m_frameSizes = frameSizes;
p_mxSmack->m_huffmanTrees = huffmanTrees;
}
return result;
#undef FRAME_COUNT
}
// FUNCTION: LEGO1 0x100c5d40
void MxSmack::Destroy(MxSmack* p_mxSmack)
{
if (p_mxSmack->m_frameSizes)
delete[] p_mxSmack->m_frameSizes;
if (p_mxSmack->m_frameTypes)
delete[] p_mxSmack->m_frameTypes;
if (p_mxSmack->m_huffmanTrees)
delete[] p_mxSmack->m_huffmanTrees;
if (p_mxSmack->m_huffmanTables)
delete[] p_mxSmack->m_huffmanTables;
if (p_mxSmack->m_unk0x6b4)
delete[] p_mxSmack->m_unk0x6b4;
}

45
LEGO1/mxsmack.h Normal file
View File

@@ -0,0 +1,45 @@
#ifndef MXSMACK_H
#define MXSMACK_H
#include "decomp.h"
#include "mxtypes.h"
#include <smack.h>
// These functions are not part of the public interface,
// but present in SMACK.LIB and used directly by Mindscape.
extern "C"
{
// (SMACK.LIB) FUNCTION: LEGO1 0x100cd782
u32 SmackGetSizeTables();
// (SMACK.LIB) FUNCTION: LEGO1 0x100cd7e8
void SmackDoTables(
u8* p_huffmanTrees,
u8* p_huffmanTables,
u32 p_codeSize,
u32 p_abSize,
u32 p_detailSize,
u32 p_typeSize
);
// (SMACK.LIB) FUNCTION: LEGO1 0x100d052c
u32 SmackGetSizeDeltas(u32 p_width, u32 p_height);
}
// SIZE 0x6b8
struct MxSmack {
SmackTag m_smackTag; // 0x00
undefined m_unk0x390[784]; // 0x390
MxU32* m_frameSizes; // 0x6a0
MxU8* m_frameTypes; // 0x6a4
MxU8* m_huffmanTrees; // 0x6a8
MxU8* m_huffmanTables; // 0x6ac
MxU32 m_maxFrameSize; // 0x6b0
MxU8* m_unk0x6b4; // 0x6b4
static MxResult LoadHeaderAndTrees(MxU8* p_data, MxSmack* p_mxSmack);
static void Destroy(MxSmack* p_mxSmack);
};
#endif // MXSMACK_H

41
LEGO1/mxsmkpresenter.cpp
View File

@@ -31,7 +31,7 @@ void MxSmkPresenter::Destroy(MxBool p_fromDestructor)
{
m_criticalSection.Enter();
FUN_100c5d40(&m_mxSmack);
MxSmack::Destroy(&m_mxSmack);
Init();
m_criticalSection.Leave();
@@ -41,10 +41,10 @@ void MxSmkPresenter::Destroy(MxBool p_fromDestructor)
}
}
// STUB: LEGO1 0x100b3940
// FUNCTION: LEGO1 0x100b3940
void MxSmkPresenter::LoadHeader(MxStreamChunk* p_chunk)
{
// TODO
MxSmack::LoadHeaderAndTrees(p_chunk->GetData(), &m_mxSmack);
}
// FUNCTION: LEGO1 0x100b3960
@@ -54,7 +54,7 @@ void MxSmkPresenter::CreateBitmap()
delete m_bitmap;
m_bitmap = new MxBitmap;
m_bitmap->SetSize(m_mxSmack.m_smack.m_width, m_mxSmack.m_smack.m_height, NULL, FALSE);
m_bitmap->SetSize(m_mxSmack.m_smackTag.Width, m_mxSmack.m_smackTag.Height, NULL, FALSE);
}
// STUB: LEGO1 0x100b3a00
@@ -64,23 +64,19 @@ void MxSmkPresenter::LoadFrame(MxStreamChunk* p_chunk)
}
// FUNCTION: LEGO1 0x100b4260
MxU32 MxSmkPresenter::VTable0x88()
void MxSmkPresenter::VTable0x88()
{
MxU32 result = m_unk0x71c;
if ((m_mxSmack.m_smack.m_smkType & 1) != 0) {
result = m_unk0x71c / m_mxSmack.m_smack.m_frames;
if (1 < m_unk0x71c && (m_unk0x71c % m_mxSmack.m_smack.m_frames) == 1) {
if ((m_mxSmack.m_smackTag.SmackerType & 1) != 0) {
MxU32 und = (m_unk0x71c % m_mxSmack.m_smackTag.Frames);
if (1 < m_unk0x71c && und == 1)
m_unk0x71c = 1;
}
return result;
}
else {
if (m_mxSmack.m_smack.m_frames == result) {
if (m_mxSmack.m_smackTag.Frames == m_unk0x71c) {
m_unk0x71c = 0;
result = 0;
memset(m_mxSmack.m_smack.m_palette, 0, sizeof(m_mxSmack.m_smack.m_palette));
// TODO: struct incorrect, Palette at wrong offset?
memset(m_mxSmack.m_smackTag.Palette, 0, sizeof(m_mxSmack.m_smackTag.Palette));
}
return result;
}
}
@@ -97,18 +93,3 @@ void MxSmkPresenter::Destroy()
{
Destroy(FALSE);
}
// FUNCTION: LEGO1 0x100c5d40
void MxSmkPresenter::FUN_100c5d40(MxSmack* p_mxSmack)
{
if (p_mxSmack->m_unk0x6a0)
delete p_mxSmack->m_unk0x6a0;
if (p_mxSmack->m_unk0x6a4)
delete p_mxSmack->m_unk0x6a4;
if (p_mxSmack->m_unk0x6a8)
delete p_mxSmack->m_unk0x6a8;
if (p_mxSmack->m_unk0x6ac)
delete p_mxSmack->m_unk0x6ac;
if (p_mxSmack->m_unk0x6b4)
delete p_mxSmack->m_unk0x6b4;
}

27
LEGO1/mxsmkpresenter.h
View File

@@ -2,10 +2,9 @@
#define MXSMKPRESENTER_H
#include "decomp.h"
#include "mxsmack.h"
#include "mxvideopresenter.h"
#include <smk.h>
// VTABLE: LEGO1 0x100dc348
// SIZE 0x720
class MxSmkPresenter : public MxVideoPresenter {
@@ -31,32 +30,14 @@ public:
virtual void CreateBitmap() override; // vtable+0x60
virtual void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
virtual void RealizePalette() override; // vtable+0x70
virtual MxU32 VTable0x88(); // vtable+0x88
struct MxSmack {
Smack m_smack;
// Unknown for the time being. Not an immediately
// recognizable part of the SMK standard...
undefined m_unk0x3f4[784];
undefined4* m_unk0x6a0;
undefined4* m_unk0x6a4;
undefined4* m_unk0x6a8;
undefined4* m_unk0x6ac;
undefined4* m_unk0x6b0;
undefined4* m_unk0x6b4;
};
MxSmack m_mxSmack;
undefined4 m_unk0x71c;
virtual void VTable0x88(); // vtable+0x88
private:
void Init();
void Destroy(MxBool p_fromDestructor);
// This should most likely be in a separate translation unit
static void FUN_100c5d40(MxSmack* p_mxSmack);
MxSmack m_mxSmack; // 0x64
undefined4 m_unk0x71c; // 0x71c
};
#endif // MXSMKPRESENTER_H