sm64-mirrors/libsm64
1
0
Fork 0
mirror of https://github.com/libsm64/libsm64.git synced 2025-01-22 15:43:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up moving platform allocation

Browse source
This commit is contained in:
jaburns 2020-10-29 17:47:47 -06:00
parent 5dfa2678c4
commit 144df0df98
4 changed files with 85 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/decomp/global_state.h
View file

@ -26,9 +26,6 @@ struct GlobalState
// rendering_graph_node.c
u16 mgAreaUpdateCounter;
// platform_displacement.c
void *mgMarioPlatform;
// misc
u32 mgGlobalTimer;
u8 mgSpecialTripleJump;

13
src/libsm64.c
View file

@ -116,7 +116,7 @@ SM64_LIB_FN void sm64_global_terminate( void )
SM64_LIB_FN void sm64_static_surfaces_load( const struct SM64Surface *surfaceArray, uint32_t numSurfaces )
{
surfaces_load_static_libsm64( surfaceArray, numSurfaces );
surfaces_load_static( surfaceArray, numSurfaces );
}
SM64_LIB_FN uint32_t sm64_mario_create( int16_t x, int16_t y, int16_t z )
@ -219,18 +219,23 @@ SM64_LIB_FN void sm64_mario_delete( uint32_t marioId )
SM64_LIB_FN uint32_t sm64_surface_object_create( const struct SM64SurfaceObject *surfaceObject )
{
uint32_t id = surfaces_load_object( surfaceObject );
update_dynamic_surface_list();
return id;
}
SM64_LIB_FN void sm64_surface_object_move( uint32_t objectId, const struct SM64ObjectTransform *transform )
{
surface_object_update_transform( objectId, transform );
update_dynamic_surface_list();
}
SM64_LIB_FN void sm64_surface_object_delete( uint32_t objectId )
{
// A mario standing on the platform that is being destroyed will have a pointer to freed memory if we don't clear it.
for( int i = 0; i < s_mario_instance_pool.size; ++i )
{
struct GlobalState *state = ((struct MarioInstance *)s_mario_instance_pool.objects[ i ])->globalState;
if( state->mgMarioObject->platform == surfaces_object_get_transform_ptr( objectId ))
state->mgMarioObject->platform = NULL;
}
surfaces_unload_object( objectId );
update_dynamic_surface_list();
}

111
src/load_surfaces.c
View file

@ -12,7 +12,7 @@
struct LoadedSurfaceObject
{
struct SurfaceObjectTransform transform;
struct SurfaceObjectTransform *transform;
uint32_t surfaceCount;
struct SM64Surface *libSurfaces;
struct Surface *engineSurfaces;
@ -24,9 +24,6 @@ static struct Surface *s_static_surface_list = NULL;
static uint32_t s_surface_object_count = 0;
static struct LoadedSurfaceObject *s_surface_object_list = NULL;
static uint32_t s_dynamic_surface_count = 0;
static struct Surface *s_dynamic_surface_list = NULL;
#define CONVERT_ANGLE( x ) ((s16)( -(x) / 180.0f * 32768.0f ))
static void init_transform( struct SurfaceObjectTransform *out, const struct SM64ObjectTransform *in )
@ -204,39 +201,26 @@ static void engine_surface_from_lib_surface( struct Surface *surface, const stru
uint32_t loaded_surface_iter_group_count( void )
{
return 2;
return 1 + s_surface_object_count;
}
uint32_t loaded_surface_iter_group_size( uint32_t groupIndex )
{
return groupIndex == 0 ? s_static_surface_count : s_dynamic_surface_count;
if( groupIndex == 0 )
return s_static_surface_count;
return s_surface_object_list[ groupIndex - 1 ].surfaceCount;
}
struct Surface *loaded_surface_iter_get_at_index( uint32_t groupIndex, uint32_t surfaceIndex )
{
return groupIndex == 0 ? &s_static_surface_list[ surfaceIndex ] : &s_dynamic_surface_list[ surfaceIndex ];
if( groupIndex == 0 )
return &s_static_surface_list[ surfaceIndex ];
return &s_surface_object_list[ groupIndex - 1 ].engineSurfaces[ surfaceIndex ];
}
void update_dynamic_surface_list( void )
{
// TODO, this is way more expensive than it needs to be.
free( s_dynamic_surface_list );
s_dynamic_surface_count = 0;
s_dynamic_surface_list = NULL;
for( int i = 0; i < s_surface_object_count; ++i )
{
for( int j = 0; j < s_surface_object_list[i].surfaceCount; ++j )
{
s_dynamic_surface_count++;
s_dynamic_surface_list = realloc( s_dynamic_surface_list, s_dynamic_surface_count * sizeof( struct Surface ));
engine_surface_from_lib_surface( &s_dynamic_surface_list[s_dynamic_surface_count - 1], &s_surface_object_list[i].libSurfaces[j], &s_surface_object_list[i].transform );
}
}
}
void surfaces_load_static_libsm64( const struct SM64Surface *surfaceArray, uint32_t numSurfaces )
void surfaces_load_static( const struct SM64Surface *surfaceArray, uint32_t numSurfaces )
{
s_static_surface_count = numSurfaces;
s_static_surface_list = malloc( sizeof( struct Surface ) * numSurfaces );
@ -247,27 +231,83 @@ void surfaces_load_static_libsm64( const struct SM64Surface *surfaceArray, uint3
uint32_t surfaces_load_object( const struct SM64SurfaceObject *surfaceObject )
{
bool pickedOldIndex = false;
uint32_t idx = s_surface_object_count;
s_surface_object_count++;
s_surface_object_list = realloc( s_surface_object_list, s_surface_object_count * sizeof( struct LoadedSurfaceObject ));
for( int i = 0; i < s_surface_object_count; ++i )
{
if( s_surface_object_list[i].surfaceCount == 0 )
{
pickedOldIndex = true;
idx = i;
break;
}
}
if( !pickedOldIndex )
{
idx = s_surface_object_count;
s_surface_object_count++;
s_surface_object_list = realloc( s_surface_object_list, s_surface_object_count * sizeof( struct LoadedSurfaceObject ));
}
struct LoadedSurfaceObject *obj = &s_surface_object_list[idx];
init_transform( &obj->transform, &surfaceObject->transform );
obj->surfaceCount = surfaceObject->surfaceCount;
obj->transform = malloc( sizeof( struct SurfaceObjectTransform ));
init_transform( obj->transform, &surfaceObject->transform );
obj->libSurfaces = malloc( obj->surfaceCount * sizeof( struct SM64Surface ));
memcpy( obj->libSurfaces, surfaceObject->surfaces, obj->surfaceCount * sizeof( struct SM64Surface ));
obj->engineSurfaces = malloc( obj->surfaceCount * sizeof( struct Surface ));
for( int i = 0; i < obj->surfaceCount; ++i )
engine_surface_from_lib_surface( &obj->engineSurfaces[i], &obj->libSurfaces[i], obj->transform );
return idx;
}
void surfaces_unload_object( uint32_t objId )
{
// TODO implement
if( objId >= s_surface_object_count || s_surface_object_list[objId].surfaceCount == 0 )
{
DEBUG_PRINT("Tried to unload non-existant surface object with ID: %u", objId);
return;
}
free( s_surface_object_list[objId].transform );
free( s_surface_object_list[objId].libSurfaces );
free( s_surface_object_list[objId].engineSurfaces );
s_surface_object_list[objId].surfaceCount = 0;
s_surface_object_list[objId].transform = NULL;
s_surface_object_list[objId].libSurfaces = NULL;
s_surface_object_list[objId].engineSurfaces = NULL;
}
void surface_object_update_transform( uint32_t objId, const struct SM64ObjectTransform *newTransform )
{
update_transform( &s_surface_object_list[objId].transform, newTransform );
if( objId >= s_surface_object_count || s_surface_object_list[objId].surfaceCount == 0 )
{
DEBUG_PRINT("Tried to update non-existant surface object with ID: %u", objId);
return;
}
update_transform( s_surface_object_list[objId].transform, newTransform );
for( int i = 0; i < s_surface_object_list[objId].surfaceCount; ++i )
{
struct LoadedSurfaceObject *obj = &s_surface_object_list[objId];
engine_surface_from_lib_surface( &obj->engineSurfaces[i], &obj->libSurfaces[i], obj->transform );
}
}
struct SurfaceObjectTransform *surfaces_object_get_transform_ptr( uint32_t objId )
{
if( objId >= s_surface_object_count || s_surface_object_list[objId].surfaceCount == 0 )
return NULL;
return s_surface_object_list[objId].transform;
}
void surfaces_unload_all( void )
@ -277,12 +317,9 @@ void surfaces_unload_all( void )
s_static_surface_list = NULL;
for( int i = 0; i < s_surface_object_count; ++i )
free( s_surface_object_list[i].libSurfaces );
surfaces_unload_object( i );
free( s_surface_object_list );
s_surface_object_count = 0;
s_surface_object_list = NULL;
free( s_dynamic_surface_list );
s_dynamic_surface_count = 0;
s_dynamic_surface_list = NULL;
}

4
src/load_surfaces.h
View file

@ -7,9 +7,9 @@ extern uint32_t loaded_surface_iter_group_count( void );
extern uint32_t loaded_surface_iter_group_size( uint32_t groupIndex );
extern struct Surface *loaded_surface_iter_get_at_index( uint32_t groupIndex, uint32_t surfaceIndex );
extern void update_dynamic_surface_list( void );
extern void surfaces_load_static_libsm64( const struct SM64Surface *surfaceArray, uint32_t numSurfaces );
extern void surfaces_load_static( const struct SM64Surface *surfaceArray, uint32_t numSurfaces );
extern uint32_t surfaces_load_object( const struct SM64SurfaceObject *surfaceObject );
extern void surface_object_update_transform( uint32_t objId, const struct SM64ObjectTransform *newTransform );
extern struct SurfaceObjectTransform *surfaces_object_get_transform_ptr( uint32_t objId );
extern void surfaces_unload_object( uint32_t objId );
extern void surfaces_unload_all( void );