X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=cdc76f1ae23d96d5bde4957843f86ea791e7ba7a;hb=95f6ef1a859423a0d9554ac6a9f4c6cbd8bb540c;hp=3602530ff99a70d8eac814e32a616afde6fd6363;hpb=5f6a4f9df6c8accc89f1920bfe9ace3cbac4c4b6;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_entity.c b/world_entity.c index 3602530..cdc76f1 100644 --- a/world_entity.c +++ b/world_entity.c @@ -13,6 +13,7 @@ #include "ent_traffic.h" #include "ent_glider.h" #include "ent_region.h" +#include "ent_npc.h" #include "input.h" #include "player_walk.h" @@ -26,24 +27,60 @@ bh_system bh_system_entity_list = .cast_ray = NULL }; -void world_entity_focus( u32 entity_id ) +void world_entity_set_focus( u32 entity_id ) +{ + if( world_static.focused_entity ) + { + vg_warn( "Entity %u#%u tried to take focus from %u#%u\n", + mdl_entity_id_type( entity_id ), + mdl_entity_id_id( entity_id ), + mdl_entity_id_type( world_static.focused_entity ), + mdl_entity_id_id( world_static.focused_entity ) ); + return; + } + + world_static.focused_entity = entity_id; +} + +void world_entity_focus_modal(void) { localplayer.immobile = 1; menu.disable_open = 1; + srinput.state = k_input_state_resume; v3_zero( localplayer.rb.v ); v3_zero( localplayer.rb.w ); player_walk.move_speed = 0.0f; - world_static.focused_entity = entity_id; skaterift.activity = k_skaterift_ent_focus; } -void world_entity_unfocus(void) +void world_entity_exit_modal(void) { + if( skaterift.activity != k_skaterift_ent_focus ) + { + vg_warn( "Entity %u#%u tried to exit modal when we weren't in one\n", + mdl_entity_id_type( world_static.focused_entity ), + mdl_entity_id_id( world_static.focused_entity ) ); + return; + } + localplayer.immobile = 0; - skaterift.activity = k_skaterift_default; menu.disable_open = 0; srinput.state = k_input_state_resume; + skaterift.activity = k_skaterift_default; +} + +void world_entity_clear_focus(void) +{ + if( skaterift.activity == k_skaterift_ent_focus ) + { + vg_warn( "Entity %u#%u tried to clear focus before exiting modal\n", + mdl_entity_id_type( world_static.focused_entity ), + mdl_entity_id_id( world_static.focused_entity ) ); + return; + } + + world_static.focused_entity = 0; } void world_entity_focus_camera( world_instance *world, u32 uid ) @@ -78,23 +115,32 @@ void world_entity_focus_preupdate(void) vg_slewf( &world_static.focus_strength, active, vg.time_frame_delta * (1.0f/0.5f) ); + if( world_static.focused_entity == 0 ) + return; + u32 type = mdl_entity_id_type( world_static.focused_entity ), index = mdl_entity_id_id( world_static.focused_entity ); + world_instance *world = world_current_instance(); - /* TODO: Table. */ - if( type == k_ent_skateshop ){ - ent_skateshop *skateshop = mdl_arritm( &world->ent_skateshop, index ); - ent_skateshop_preupdate( skateshop, active ); - } - else if( type == k_ent_challenge ){ - ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index ); - ent_challenge_preupdate( challenge, active ); - } - else if( type == k_ent_route ){ - ent_route *route = mdl_arritm( &world->ent_route, index ); - ent_route_preupdate( route, active ); + static void (*table[])( ent_focus_context *ctx ) = + { + [ k_ent_skateshop ] = ent_skateshop_preupdate, + [ k_ent_challenge ] = ent_challenge_preupdate, + [ k_ent_route ] = ent_route_preupdate, + [ k_ent_npc ] = ent_npc_preupdate, + }; + + if( (type > vg_list_size(table)) || (table[type] == NULL) ) + { + vg_fatal_error( "No pre-update method set for entity (%u#%u)\n", + type, index ); } + + table[type]( &(ent_focus_context){ + .world = world, + .index = index, + .active = active } ); } /* additional renderings like text etc.. */ @@ -116,6 +162,7 @@ void world_entity_focus_render(void) else if( type == k_ent_challenge ){} else if( type == k_ent_route ){} else if( type == k_ent_miniworld ){} + else if( type == k_ent_npc ){} else { vg_fatal_error( "Programming error\n" ); } @@ -136,16 +183,8 @@ void world_gen_entities_init( world_instance *world ) light->angle_sin_cos[1] = cosf( light->angle * 0.5f ); } - /* gates */ - for( u32 j=0; jent_gate); j ++ ){ - ent_gate *gate = mdl_arritm( &world->ent_gate, j ); - - if( !(gate->flags & k_ent_gate_nonlocal) ) { - gate_transform_update( gate ); - } - } - - vg_async_call( world_link_nonlocal_async, world, 0 ); + vg_async_call( world_link_gates_async, world, 0 ); + vg_async_stall(); /* water */ for( u32 j=0; jent_water); j++ ){ @@ -214,7 +253,8 @@ void world_gen_entities_init( world_instance *world ) { k_ent_objective, &world->ent_objective }, { k_ent_volume, &world->ent_volume }, { k_ent_challenge, &world->ent_challenge }, - { k_ent_glider, &world->ent_glider } + { k_ent_glider, &world->ent_glider }, + { k_ent_npc, &world->ent_npc } }; for( u32 i=0; iid ); ent_volume *volume = mdl_arritm( &world->ent_volume, index ); - if( !volume->target ) return; - if( call->function == k_ent_function_trigger ){ + if( !volume->target ) + return k_entity_call_result_OK; + + if( call->function == k_ent_function_trigger ) + { call->id = volume->target; - if( volume->flags & k_ent_volume_flag_particles ){ + if( volume->flags & k_ent_volume_flag_particles ) + { float *co = alloca( sizeof(float)*3 ); co[0] = vg_randf64(&vg.rand)*2.0f-1.0f; co[1] = vg_randf64(&vg.rand)*2.0f-1.0f; @@ -328,29 +372,40 @@ void ent_volume_call( world_instance *world, ent_call *call ) call->data = co; entity_call( world, call ); } - else{ + else + { call->function = volume->trigger.event; entity_call( world, call ); } + + return k_entity_call_result_OK; } - else if( call->function == k_ent_function_trigger_leave ){ + else if( call->function == k_ent_function_trigger_leave ) + { call->id = volume->target; - if( volume->flags & k_ent_volume_flag_particles ){ + if( volume->flags & k_ent_volume_flag_particles ) + { vg_warn( "Invalid condition; calling leave on particle volume.\n" ); } - else{ + else + { call->function = volume->trigger.event_leave; entity_call( world, call ); } + + return k_entity_call_result_OK; } + + return k_entity_call_result_unhandled; } -void ent_audio_call( world_instance *world, ent_call *call ) +entity_call_result ent_audio_call( world_instance *world, ent_call *call ) { - if( world->status == k_world_status_unloading ){ + if( world->status == k_world_status_unloading ) + { vg_warn( "cannot modify audio while unloading world\n" ); - return; + return k_entity_call_result_invalid; } u8 world_id = (world - world_static.instances) + 1; @@ -359,14 +414,16 @@ void ent_audio_call( world_instance *world, ent_call *call ) v3f sound_co; - if( call->function == k_ent_function_particle_spawn ){ + if( call->function == k_ent_function_particle_spawn ) + { v3_copy( call->data, sound_co ); } - else if( call->function == k_ent_function_trigger ){ + else if( call->function == k_ent_function_trigger ) + { v3_copy( audio->transform.co, sound_co ); } else - return; + return k_entity_call_result_unhandled; float chance = vg_randf64(&vg.rand)*100.0f, bar = 0.0f; @@ -379,20 +436,24 @@ void ent_audio_call( world_instance *world, ent_call *call ) p = clip->probability * mod; bar += p; - if( chance < bar ){ + if( chance < bar ) + { audio_lock(); - if( audio->behaviour == k_channel_behaviour_unlimited ){ + if( audio->behaviour == k_channel_behaviour_unlimited ) + { audio_oneshot_3d( &clip->_.clip, sound_co, audio->transform.s[0], audio->volume ); } - else if( audio->behaviour == k_channel_behaviour_discard_if_full ){ + else if( audio->behaviour == k_channel_behaviour_discard_if_full ) + { audio_channel *ch = audio_get_group_idle_channel( audio->group, audio->max_channels ); - if( ch ){ + if( ch ) + { audio_channel_init( ch, &clip->_.clip, audio->flags ); audio_channel_group( ch, audio->group ); audio_channel_world( ch, world_id ); @@ -401,7 +462,8 @@ void ent_audio_call( world_instance *world, ent_call *call ) ch = audio_relinquish_channel( ch ); } } - else if( audio->behaviour == k_channel_behaviour_crossfade_if_full){ + else if( audio->behaviour == k_channel_behaviour_crossfade_if_full) + { audio_channel *ch = audio_get_group_idle_channel( audio->group, audio->max_channels ); @@ -414,7 +476,7 @@ void ent_audio_call( world_instance *world, ent_call *call ) if( existing ){ if( existing->source == &clip->_.clip ){ audio_unlock(); - return; + return k_entity_call_result_OK; } existing->group = 0; @@ -424,7 +486,8 @@ void ent_audio_call( world_instance *world, ent_call *call ) ch = audio_get_first_idle_channel(); } - if( ch ){ + if( ch ) + { audio_channel_init( ch, &clip->_.clip, audio->flags ); audio_channel_group( ch, audio->group ); audio_channel_world( ch, world_id ); @@ -434,20 +497,24 @@ void ent_audio_call( world_instance *world, ent_call *call ) } audio_unlock(); - return; + return k_entity_call_result_OK; } } + return k_entity_call_result_OK; } -void ent_ccmd_call( world_instance *world, ent_call *call ) +entity_call_result ent_ccmd_call( world_instance *world, ent_call *call ) { - if( call->function == k_ent_function_trigger ){ + if( call->function == k_ent_function_trigger ) + { u32 index = mdl_entity_id_id( call->id ); ent_ccmd *ccmd = mdl_arritm( &world->ent_ccmd, index ); - vg_execute_console_input( mdl_pstr(&world->meta, ccmd->pstr_command), - 0 ); + vg_execute_console_input( mdl_pstr(&world->meta, ccmd->pstr_command), 0 ); + return k_entity_call_result_OK; } + else + return k_entity_call_result_unhandled; } /* @@ -510,6 +577,11 @@ void entity_bh_expand_bound( void *user, boxf bound, u32 item_index ) m4x3_expand_aabb_aabb( transform, bound, (boxf){{-1.0f,-1.0f,-1.0f},{ 1.0f, 1.0f, 1.0f}} ); } + else if( type == k_ent_npc ) + { + ent_npc *npc = mdl_arritm( &world->ent_npc, index ); + box_addpt( bound, npc->transform.co ); + } else{ vg_fatal_error( "Programming error\n" ); } @@ -535,15 +607,23 @@ float entity_bh_centroid( void *user, u32 item_index, int axis ) ent_volume *volume = mdl_arritm( &world->ent_volume, index ); return volume->transform.co[axis]; } - else if( type == k_ent_challenge ){ + else if( type == k_ent_challenge ) + { ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index ); return challenge->transform.co[axis]; } - else if( type == k_ent_glider ){ + else if( type == k_ent_glider ) + { ent_glider *glider = mdl_arritm( &world->ent_glider, index ); return glider->transform.co[axis]; } - else { + else if( type == k_ent_npc ) + { + ent_npc *npc = mdl_arritm( &world->ent_npc, index ); + return npc->transform.co[axis]; + } + else + { vg_fatal_error( "Programming error\n" ); return INFINITY; } @@ -666,9 +746,11 @@ void world_entity_start( world_instance *world, vg_msg *sav ) vg_info( "Start instance %p\n", world ); world->probabilities[ k_probability_curve_constant ] = 1.0f; - for( u32 i=0; ient_audio); i++ ){ + for( u32 i=0; ient_audio); i++ ) + { ent_audio *audio = mdl_arritm(&world->ent_audio,i); - if( audio->flags & AUDIO_FLAG_AUTO_START ){ + if( audio->flags & AUDIO_FLAG_AUTO_START ) + { ent_call call; call.data = NULL; call.function = k_ent_function_trigger; @@ -685,7 +767,7 @@ void world_entity_start( world_instance *world, vg_msg *sav ) const char *alias = mdl_pstr( &world->meta, challenge->pstr_alias ); u32 result; - vg_msg_getkvintg( sav, alias, k_vg_msg_u32, &result ); + vg_msg_getkvintg( sav, alias, k_vg_msg_u32, &result, NULL ); if( result ){ ent_call call; @@ -706,11 +788,12 @@ void world_entity_start( world_instance *world, vg_msg *sav ) mdl_pstr(&world->meta,route->pstr_name) ) ){ u32 flags; - vg_msg_getkvintg( &route_info, "flags", k_vg_msg_u32, &flags ); + vg_msg_getkvintg( &route_info, "flags", k_vg_msg_u32, + &flags, NULL ); route->flags |= flags; vg_msg_getkvintg( &route_info, "best_laptime", k_vg_msg_f64, - &route->best_laptime ); + &route->best_laptime, NULL ); f32 sections[ route->checkpoints_count ]; vg_msg_cmd cmd;