kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Match most functions in hsfload.c

Browse source
This commit is contained in:
gamemasterplc 2023-12-04 17:39:07 -06:00
parent 8c14475c86
commit b57ad97bf6
2 changed files with 101 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
include/game/hsfformat.h
View file

@ -67,9 +67,9 @@ typedef struct hsf_bitmap {
s32 maxLod; s32 maxLod;
u8 dataFmt; u8 dataFmt;
u8 pixSize; u8 pixSize;
u16 w; s16 sizeX;
u16 h; s16 sizeY;
u16 palSize; s16 palSize;
GXColor tint; GXColor tint;
void *palData; void *palData;
u32 unk; u32 unk;
@ -79,13 +79,17 @@ typedef struct hsf_bitmap {
typedef struct hsf_palette { typedef struct hsf_palette {
char *name; char *name;
s32 unk; s32 unk;
s32 palSize; u32 palSize;
void *data; u16 *data;
} HsfPalette; } HsfPalette;
typedef struct hsf_attribute { typedef struct hsf_attribute {
char *name; char *name;
u8 unk[124]; u8 unk4[96];
u32 wrap_s;
u32 wrap_t;
u8 unk6C[16];
u32 flag;
HsfBitmap *bitmap; HsfBitmap *bitmap;
} HsfAttribute; } HsfAttribute;
@ -288,10 +292,10 @@ typedef struct hsf_motion {
} HsfMotion; } HsfMotion;
typedef struct hsf_map_attr { typedef struct hsf_map_attr {
float min_x; float minX;
float min_z; float minZ;
float max_x; float maxX;
float max_z; float maxZ;
s16 *data; s16 *data;
u32 dataLen; u32 dataLen;
} HsfMapAttr; } HsfMapAttr;

87
src/game/hsfload.c
View file

@ -877,6 +877,93 @@ static void ShapeLoad(void)
} }
} }
static void BitmapLoad(void)
{
HsfBitmap *bitmap_file;
HsfBitmap *bitmap_temp;
HsfBitmap *bitmap_new;
HsfPalette *palette;
void *data;
s32 i;
if(head.bitmap.count) {
bitmap_temp = bitmap_file = (HsfBitmap *)((u32)fileptr+head.bitmap.ofs);
data = &bitmap_file[head.bitmap.count];
for(i=0; i<head.bitmap.count; i++, bitmap_file++);
bitmap_new = bitmap_temp;
Model.bitmap = bitmap_file;
Model.bitmapCnt = head.bitmap.count;
bitmap_file = (HsfBitmap *)((u32)fileptr+head.bitmap.ofs);
data = &bitmap_file[head.bitmap.count];
for(i=0; i<head.bitmap.count; i++, bitmap_file++, bitmap_new++) {
bitmap_new->name = SetName((u32 *)&bitmap_file->name);
bitmap_new->dataFmt = bitmap_file->dataFmt;
bitmap_new->pixSize = bitmap_file->pixSize;
bitmap_new->sizeX = bitmap_file->sizeX;
bitmap_new->sizeY = bitmap_file->sizeY;
bitmap_new->palSize = bitmap_file->palSize;
palette = SearchPalettePtr((u32)bitmap_file->palData);
if(palette) {
bitmap_new->palData = palette->data;
}
bitmap_new->data = (void *)((u32)data+(u32)bitmap_file->data);
}
}
}
static void PaletteLoad(void)
{
s32 i;
s32 j;
HsfPalette *palette_file;
HsfPalette *palette_temp;
HsfPalette *palette_new;
void *data_base;
u16 *temp_data;
u16 *data;
if(head.palette.count) {
palette_temp = palette_file = (HsfPalette *)((u32)fileptr+head.palette.ofs);
data_base = (u16 *)&palette_file[head.palette.count];
for(i=0; i<head.palette.count; i++, palette_file++) {
temp_data = (u16 *)((u32)data_base+(u32)palette_file->data);
}
Model.palette = palette_temp;
Model.paletteCnt = head.palette.count;
palette_new = palette_temp;
palette_file = (HsfPalette *)((u32)fileptr+head.palette.ofs);
data_base = (u16 *)&palette_file[head.palette.count];
for(i=0; i<head.palette.count; i++, palette_file++, palette_new++) {
temp_data = (u16 *)((u32)data_base+(u32)palette_file->data);
data = temp_data;
palette_new->name = SetName((u32 *)&palette_file->name);
palette_new->data = data;
palette_new->palSize = palette_file->palSize;
for(j=0; j<palette_file->palSize; j++) {
data[j] = data[j];
}
}
}
}
static void MotionLoad(void)
{
}
static void MatrixLoad(void)
{
HsfMatrix *matrix_file;
if(head.matrix.count) {
matrix_file = (HsfMatrix *)((u32)fileptr+head.matrix.ofs);
matrix_file->data = (Mtx *)((u32)fileptr+head.matrix.ofs+sizeof(HsfMatrix));
Model.matrix = matrix_file;
Model.matrixCnt = head.matrix.count;
}
}
static void MapAttrLoad(void) static void MapAttrLoad(void)
{ {
s32 i; s32 i;