From 7f4c71033c06954f3094c9d51219628438b80ac8 Mon Sep 17 00:00:00 2001 From: hgn Date: Sun, 19 Nov 2023 08:14:09 +0000 Subject: [PATCH] process triggers on leave world --- ent_miniworld.c | 10 ++++++++++ maps_src/dev_hub/main.mdl | Bin 227944 -> 226408 bytes player.c | 1 - skaterift.c | 1 + world.c | 19 +++++++++++++++++-- world.h | 1 + 6 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ent_miniworld.c b/ent_miniworld.c index 54ce8ae..cd79b45 100644 --- a/ent_miniworld.c +++ b/ent_miniworld.c @@ -1,6 +1,7 @@ #include "entity.h" #include "ent_miniworld.h" #include "world_render.h" +#include "input.h" static void ent_miniworld_call( world_instance *world, ent_call *call ){ ent_miniworld *miniworld = mdl_arritm( &world->ent_miniworld, @@ -63,3 +64,12 @@ static void ent_miniworld_render( world_instance *host_world ){ //render_world_routes( , &skaterift.cam, 1 ); } + +static void ent_miniworld_preupdate(void){ + if( !global_miniworld.active_id ) + return; + + if( button_down( k_srbind_use ) ){ + + } +} diff --git a/maps_src/dev_hub/main.mdl b/maps_src/dev_hub/main.mdl index deae0e2fd6a1888498422b2e5643d600e58ae432..44881ec7bc8479d5396fa4b862340299f7b9df14 100644 GIT binary patch delta 17940 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 delta 13083 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 N8+-FNNB#2t{{fhC#$Esb diff --git a/player.c b/player.c index 348bb74..fce9c48 100644 --- a/player.c +++ b/player.c @@ -251,7 +251,6 @@ static void player__reset(void){ world_static.focused_entity = 0; world_static.active_trigger_volume_count = 0; world_static.last_use = 0.0; - global_miniworld.active_id = 0; world_entity_unfocus(); localplayer.boundary_hash ^= NETMSG_BOUNDARY_BIT; diff --git a/skaterift.c b/skaterift.c index 8ed749c..a2b8347 100644 --- a/skaterift.c +++ b/skaterift.c @@ -337,6 +337,7 @@ static void vg_pre_update(void){ world_entity_focus_preupdate(); skaterift_replay_pre_update(); remote_sfx_pre_update(); + ent_miniworld_preupdate(); world_update( world_current_instance(), localplayer.rb.co ); audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co ); diff --git a/world.c b/world.c index def59a3..ad03723 100644 --- a/world.c +++ b/world.c @@ -41,18 +41,33 @@ static void world_switch_instance( u32 index ){ return; } + world_instance *current = + &world_static.instances[ world_static.active_instance ]; + if( index != world_static.active_instance ){ - world_instance *current = - &world_static.instances[ world_static.active_instance ]; v3_copy( localplayer.rb.co, current->player_co ); v3_copy( localplayer.angles, current->player_angles ); + v3_copy( localplayer.cam.pos, current->cam_co ); current->player_angles[3] = player_get_heading_yaw(); } v3_copy( new->player_co, localplayer.rb.co ); v3_copy( new->player_angles, localplayer.angles ); + v3_copy( new->cam_co, localplayer.cam.pos ); q_axis_angle( localplayer.rb.q, (v3f){0,1,0}, new->player_angles[3] ); + /* run exit events on triggers */ + for( u32 i=0; ient_volume, idx ); + + ent_call basecall; + basecall.function = k_ent_function_trigger_leave; + basecall.id = mdl_entity_id( k_ent_volume, idx ); + basecall.data = NULL; + entity_call( current, &basecall ); + } + world_static.active_instance = index; player__reset(); diff --git a/world.h b/world.h index dde9aea..0efe185 100644 --- a/world.h +++ b/world.h @@ -64,6 +64,7 @@ struct world_instance { */ v4f player_co, player_angles; + v3f cam_co; void *heap; enum world_status{ -- 2.25.1