From 0afcc627e05f3844dd27cc21f16a65a4543d385d Mon Sep 17 00:00:00 2001 From: jaburns Date: Tue, 13 Oct 2020 15:36:15 -0600 Subject: [PATCH] Initial setup for moving platforms --- .gitignore | 3 ++- src/libsm64.c | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 47a6a1c..ed31a43 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /build/ /dist/ Makefile -*.z64 \ No newline at end of file +*.z64 +*.so diff --git a/src/libsm64.c b/src/libsm64.c index 81d83dd..e55e550 100644 --- a/src/libsm64.c +++ b/src/libsm64.c @@ -126,6 +126,21 @@ void sm64_mario_reset( int16_t marioX, int16_t marioY, int16_t marioZ ) find_floor( marioX, marioY, marioZ, &gMarioState->floor ); } +static void update_non_terrain_objects( void ) +{ + bhv_mario_update(); +} + +static void update_objects( void ) +{ + //clear_dynamic_surfaces(); + //update_terrain_objects(); + //apply_mario_platform_displacement(); + //detect_object_collisions(); + update_non_terrain_objects(); + //update_mario_platform(); +} + void sm64_mario_tick( const struct SM64MarioInputs *inputs, struct SM64MarioState *outState, struct SM64MarioGeometryBuffers *outBuffers ) { update_button( inputs->buttonA, A_BUTTON ); @@ -138,7 +153,7 @@ void sm64_mario_tick( const struct SM64MarioInputs *inputs, struct SM64MarioStat gController.stickY = 64.0f * inputs->stickY; gController.stickMag = sqrtf( gController.stickX*gController.stickX + gController.stickY*gController.stickY ); - bhv_mario_update(); + update_objects(); gfx_adapter_bind_output_buffers( outBuffers );