X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=3fd7ac63473459781b85ed7a348038247eb545a7;hb=23ba25574349652d86979fc787ec4b0214001333;hp=67db6afb16641465a64e94831db671aca465c0e5;hpb=bd3a7e904be0fc97e70761cc957a28609d366586;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_entity.c b/world_entity.c index 67db6af..3fd7ac6 100644 --- a/world_entity.c +++ b/world_entity.c @@ -10,27 +10,48 @@ #include "menu.h" #include "ent_challenge.h" #include "ent_skateshop.h" +#include "ent_route.h" -VG_STATIC void world_entity_focus( u32 entity_id ){ +static void world_entity_focus( u32 entity_id ){ localplayer.immobile = 1; menu.disable_open = 1; v3_zero( localplayer.rb.v ); v3_zero( localplayer.rb.w ); - localplayer._walk.move_speed = 0.0f; + player_walk.move_speed = 0.0f; world_static.focused_entity = entity_id; skaterift.activity = k_skaterift_ent_focus; } -VG_STATIC void world_entity_unfocus(void){ +static void world_entity_unfocus(void){ localplayer.immobile = 0; skaterift.activity = k_skaterift_default; menu.disable_open = 0; - srinput.enabled = 0; + srinput.state = k_input_state_resume; +} + +static void world_entity_focus_camera( world_instance *world, u32 uid ){ + if( mdl_entity_id_type( uid ) == k_ent_camera ){ + u32 index = mdl_entity_id_id( uid ); + ent_camera *cam = mdl_arritm( &world->ent_camera, index ); + + v3f dir = {0.0f,-1.0f,0.0f}; + mdl_transform_vector( &cam->transform, dir, dir ); + v3_angles( dir, world_static.focus_cam.angles ); + v3_copy( cam->transform.co, world_static.focus_cam.pos ); + world_static.focus_cam.fov = cam->fov; + } + else { + camera_copy( &localplayer.cam, &world_static.focus_cam ); + + /* TODO ? */ + world_static.focus_cam.nearz = localplayer.cam.nearz; + world_static.focus_cam.farz = localplayer.cam.farz; + } } /* logic preupdate */ -VG_STATIC void world_entity_focus_preupdate(void){ +static void world_entity_focus_preupdate(void){ f32 rate = vg_minf( 1.0f, vg.time_frame_delta * 2.0f ); int active = 0; if( skaterift.activity == k_skaterift_ent_focus ) @@ -43,6 +64,7 @@ VG_STATIC void world_entity_focus_preupdate(void){ 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 ); @@ -51,10 +73,14 @@ VG_STATIC void world_entity_focus_preupdate(void){ 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 ); + } } /* additional renderings like text etc.. */ -VG_STATIC void world_entity_focus_render(void){ +static void world_entity_focus_render(void){ if( skaterift.activity != k_skaterift_ent_focus ) return; @@ -66,15 +92,15 @@ VG_STATIC void world_entity_focus_render(void){ ent_skateshop *skateshop = mdl_arritm( &world->ent_skateshop, index ); skateshop_render( skateshop ); } - else if( type == k_ent_challenge ){ - - } + else if( type == k_ent_challenge ){} + else if( type == k_ent_route ){} + else if( type == k_ent_miniworld ){} else { vg_fatal_error( "Programming error\n" ); } } -VG_STATIC void world_gen_entities_init( world_instance *world ){ +static void world_gen_entities_init( world_instance *world ){ /* lights */ for( u32 j=0; jent_light); j ++ ){ ent_light *light = mdl_arritm( &world->ent_light, j ); @@ -96,6 +122,7 @@ VG_STATIC void world_gen_entities_init( world_instance *world ){ gate_transform_update( gate ); } } + vg_async_call( world_link_nonlocal_async, world, 0 ); /* water */ @@ -185,9 +212,22 @@ VG_STATIC void world_gen_entities_init( world_instance *world ){ world->entity_bh = bh_create( world->heap, &bh_system_entity_list, world, indexed_count, 2 ); + + world->tar_min = world->entity_bh->nodes[0].bbx[0][1]; + world->tar_max = world->entity_bh->nodes[0].bbx[1][1] + 20.0f; + + for( u32 i=0; ient_marker); i++ ){ + ent_marker *marker = mdl_arritm( &world->ent_marker, i ); + + if( MDL_CONST_PSTREQ( &world->meta, marker->pstr_alias, "tar_min" ) ) + world->tar_min = marker->transform.co[1]; + + if( MDL_CONST_PSTREQ( &world->meta, marker->pstr_alias, "tar_max" ) ) + world->tar_max = marker->transform.co[1]; + } } -VG_STATIC +static ent_spawn *world_find_closest_spawn( world_instance *world, v3f position ) { ent_spawn *rp = NULL, *r; @@ -216,7 +256,7 @@ ent_spawn *world_find_closest_spawn( world_instance *world, v3f position ) return rp; } -VG_STATIC +static ent_spawn *world_find_spawn_by_name( world_instance *world, const char *name ) { ent_spawn *rp = NULL, *r; @@ -234,7 +274,7 @@ ent_spawn *world_find_spawn_by_name( world_instance *world, const char *name ) return rp; } -VG_STATIC void ent_volume_call( world_instance *world, ent_call *call ) +static void ent_volume_call( world_instance *world, ent_call *call ) { u32 index = mdl_entity_id_id( call->id ); ent_volume *volume = mdl_arritm( &world->ent_volume, index ); @@ -259,9 +299,20 @@ VG_STATIC void ent_volume_call( world_instance *world, ent_call *call ) entity_call( world, call ); } } + else if( call->function == k_ent_function_trigger_leave ){ + call->id = volume->target; + + if( volume->flags & k_ent_volume_flag_particles ){ + assert(0); + } + else{ + call->function = volume->trigger.event_leave; + entity_call( world, call ); + } + } } -VG_STATIC void ent_audio_call( world_instance *world, ent_call *call ){ +static void ent_audio_call( world_instance *world, ent_call *call ){ if( world->status == k_world_status_unloading ){ vg_warn( "cannot modify audio while unloading world\n" ); return; @@ -280,7 +331,7 @@ VG_STATIC void ent_audio_call( world_instance *world, ent_call *call ){ v3_copy( audio->transform.co, sound_co ); } else - vg_fatal_error( "ent_audio_call (invalid function id)" ); + return; float chance = vg_randf64()*100.0f, bar = 0.0f; @@ -354,7 +405,7 @@ VG_STATIC void ent_audio_call( world_instance *world, ent_call *call ){ } -VG_STATIC void ent_ccmd_call( world_instance *world, ent_call *call ){ +static void ent_ccmd_call( world_instance *world, ent_call *call ){ if( call->function == k_ent_function_trigger ){ u32 index = mdl_entity_id_id( call->id ); ent_ccmd *ccmd = mdl_arritm( &world->ent_ccmd, index ); @@ -367,7 +418,7 @@ VG_STATIC void ent_ccmd_call( world_instance *world, ent_call *call ){ * ---------------------------------------------------------------------------- */ -VG_STATIC void +static void entity_bh_expand_bound( void *user, boxf bound, u32 item_index ){ world_instance *world = user; @@ -420,7 +471,7 @@ entity_bh_expand_bound( void *user, boxf bound, u32 item_index ){ } } -VG_STATIC float entity_bh_centroid( void *user, u32 item_index, int axis ){ +static float entity_bh_centroid( void *user, u32 item_index, int axis ){ world_instance *world = user; u32 id = world->entity_list[ item_index ], @@ -449,7 +500,7 @@ VG_STATIC float entity_bh_centroid( void *user, u32 item_index, int axis ){ } } -VG_STATIC void entity_bh_swap( void *user, u32 ia, u32 ib ){ +static void entity_bh_swap( void *user, u32 ia, u32 ib ){ world_instance *world = user; u32 a = world->entity_list[ ia ], @@ -459,7 +510,7 @@ VG_STATIC void entity_bh_swap( void *user, u32 ia, u32 ib ){ world->entity_list[ ib ] = a; } -VG_STATIC void entity_bh_debug( void *user, u32 item_index ){ +static void entity_bh_debug( void *user, u32 item_index ){ world_instance *world = user; u32 id = world->entity_list[ item_index ], @@ -507,7 +558,7 @@ VG_STATIC void entity_bh_debug( void *user, u32 item_index ){ } } -VG_STATIC void entity_bh_closest( void *user, u32 item_index, v3f point, +static void entity_bh_closest( void *user, u32 item_index, v3f point, v3f closest ){ world_instance *world = user; @@ -536,7 +587,7 @@ VG_STATIC void entity_bh_closest( void *user, u32 item_index, v3f point, } } -VG_STATIC void world_entity_start( world_instance *world, vg_msg *sav ){ +static 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; @@ -558,7 +609,7 @@ VG_STATIC void world_entity_start( world_instance *world, vg_msg *sav ){ ent_challenge *challenge = mdl_arritm( &world->ent_challenge, i ); const char *alias = mdl_pstr( &world->meta, challenge->pstr_alias ); - if( vg_msg_seekkvu32( sav, alias, k_vg_msg_first ) ){ + if( vg_msg_getkvu32( sav, alias, 0 ) ){ ent_call call; call.data = NULL; call.function = 0; @@ -566,15 +617,47 @@ VG_STATIC void world_entity_start( world_instance *world, vg_msg *sav ){ entity_call( world, &call ); } } + + vg_msg routes_block = *sav; + if( vg_msg_seekframe( &routes_block, "routes" ) ){ + for( u32 i=0; ient_route); i++ ){ + ent_route *route = mdl_arritm( &world->ent_route, i ); + + vg_msg route_info = routes_block; + if( vg_msg_seekframe( &route_info, + mdl_pstr(&world->meta,route->pstr_name) ) ){ + route->flags |= vg_msg_getkvu32( &route_info, "flags", 0 ); + route->best_laptime = + vg_msg_getkvf64( &route_info, "best_laptime", 0.0 ); + } + } + } + + ent_region_re_eval( world ); } -VG_STATIC void world_entity_serialize( world_instance *world, vg_msg *sav ){ +static void world_entity_serialize( world_instance *world, vg_msg *sav ){ for( u32 i=0; ient_challenge); i++ ){ ent_challenge *challenge = mdl_arritm(&world->ent_challenge,i); const char *alias = mdl_pstr(&world->meta,challenge->pstr_alias); vg_msg_wkvu32( sav, alias, challenge->status ); } + + if( mdl_arrcount(&world->ent_route) ){ + vg_msg_frame( sav, "routes" ); + for( u32 i=0; ient_route); i++ ){ + ent_route *route = mdl_arritm( &world->ent_route, i ); + + vg_msg_frame( sav, mdl_pstr( &world->meta, route->pstr_name ) ); + { + vg_msg_wkvu32( sav, "flags", route->flags ); + vg_msg_wkvf64( sav, "best_laptime", route->best_laptime ); + } + vg_msg_end_frame( sav ); + } + vg_msg_end_frame( sav ); + } } #endif /* WORLD_ENTITY_C */