X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=eccf2b4f7afed09c36d349b6432e86015d3c63fc;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=d431bedc20f88dfd0cb1043bf16143bbc21841d5;hpb=7eba38b8178c82040618a518634d8ff4813e2ff2;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_entity.c b/world_entity.c index d431bed..eccf2b4 100644 --- a/world_entity.c +++ b/world_entity.c @@ -5,10 +5,104 @@ #include "entity.h" #include "world.h" #include "world_load.h" +#include "save.h" +#include "vg/vg_msg.h" +#include "menu.h" +#include "ent_challenge.h" +#include "ent_skateshop.h" +#include "ent_route.h" + +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 ); + player_walk.move_speed = 0.0f; + world_static.focused_entity = entity_id; + skaterift.activity = k_skaterift_ent_focus; +} + +static void world_entity_unfocus(void){ + localplayer.immobile = 0; + skaterift.activity = k_skaterift_default; + menu.disable_open = 0; + srinput.enabled = 0; +} + +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 ); + m3x3_mulv( localplayer.invbasis, dir, dir ); + player_vector_angles( world_static.focus_cam.angles, dir, 1.0f, 0.0f ); + 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 */ +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 ) + active = 1; + + vg_slewf( &world_static.focus_strength, active, + vg.time_frame_delta * (1.0f/0.5f) ); + + 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(); -VG_STATIC void world_gen_entities_init(void){ - world_instance *world = world_loading_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 ); + } +} +/* additional renderings like text etc.. */ +static void world_entity_focus_render(void){ + if( skaterift.activity != k_skaterift_ent_focus ) + 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(); + + if( type == k_ent_skateshop ){ + ent_skateshop *skateshop = mdl_arritm( &world->ent_skateshop, index ); + skateshop_render( skateshop ); + } + else if( type == k_ent_challenge ){ + } + else if( type == k_ent_route ){ + } + else { + vg_fatal_error( "Programming error\n" ); + } +} + +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 ); @@ -26,7 +120,7 @@ VG_STATIC void world_gen_entities_init(void){ for( u32 j=0; jent_gate); j ++ ){ ent_gate *gate = mdl_arritm( &world->ent_gate, j ); - if( gate->type == k_gate_type_teleport ){ + if( !(gate->flags & k_ent_gate_nonlocal) ) { gate_transform_update( gate ); } } @@ -96,8 +190,9 @@ VG_STATIC void world_gen_entities_init(void){ } indexables[] = { { k_ent_gate, &world->ent_gate }, - { k_ent_challenge, &world->ent_challenge }, - { k_ent_volume, &world->ent_volume } + { k_ent_objective, &world->ent_objective }, + { k_ent_volume, &world->ent_volume }, + { k_ent_challenge, &world->ent_challenge } }; for( u32 i=0; iid ); ent_volume *volume = mdl_arritm( &world->ent_volume, index ); @@ -194,13 +289,13 @@ VG_STATIC void ent_volume_call( world_instance *world, ent_call *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; } - u8 world_id = (world - world_static.worlds) + 1; + u8 world_id = (world - world_static.instances) + 1; u32 index = mdl_entity_id_id( call->id ); ent_audio *audio = mdl_arritm( &world->ent_audio, index ); @@ -287,7 +382,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 ); @@ -300,7 +395,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; @@ -315,8 +410,8 @@ entity_bh_expand_bound( void *user, boxf bound, u32 item_index ){ m4x3_expand_aabb_aabb( gate->to_world, bound, box ); } - else if( type == k_ent_challenge ){ - ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index ); + else if( type == k_ent_objective ){ + ent_objective *objective = mdl_arritm( &world->ent_objective, index ); /* TODO: This might be more work than necessary. could maybe just get * away with representing them as points */ @@ -324,14 +419,14 @@ entity_bh_expand_bound( void *user, boxf bound, u32 item_index ){ boxf box; box_init_inf( box ); - for( u32 i=0; isubmesh_count; i++ ){ + for( u32 i=0; isubmesh_count; i++ ){ mdl_submesh *sm = mdl_arritm( &world->meta.submeshs, - challenge->submesh_start+i ); + objective->submesh_start+i ); box_concat( box, sm->bbx ); } m4x3f transform; - mdl_transform_m4x3( &challenge->transform, transform ); + mdl_transform_m4x3( &objective->transform, transform ); m4x3_expand_aabb_aabb( transform, bound, box ); } else if( type == k_ent_volume ){ @@ -339,9 +434,21 @@ entity_bh_expand_bound( void *user, boxf bound, u32 item_index ){ m4x3_expand_aabb_aabb( volume->to_world, bound, (boxf){{-1.0f,-1.0f,-1.0f},{ 1.0f, 1.0f, 1.0f}} ); } + else if( type == k_ent_challenge ){ + ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index ); + + boxf box = {{-1.2f*0.5f,-0.72f*0.5f,-0.01f*0.5f}, + { 1.2f*0.5f, 0.72f*0.5f, 0.01f*0.5f}}; + m4x3f transform; + mdl_transform_m4x3( &challenge->transform, transform ); + m4x3_expand_aabb_aabb( transform, bound, box ); + } + else{ + vg_fatal_error( "Programming error\n" ); + } } -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 ], @@ -352,21 +459,25 @@ VG_STATIC float entity_bh_centroid( void *user, u32 item_index, int axis ){ ent_gate *gate = mdl_arritm( &world->ent_gate, index ); return gate->to_world[3][axis]; } - 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_objective ){ + ent_objective *objective = mdl_arritm( &world->ent_objective, index ); + return objective->transform.co[axis]; } else if( type == k_ent_volume ){ ent_volume *volume = mdl_arritm( &world->ent_volume, index ); return volume->transform.co[axis]; } + else if( type == k_ent_challenge ){ + ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index ); + return challenge->transform.co[axis]; + } else { vg_fatal_error( "Programming error\n" ); return INFINITY; } } -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 ], @@ -376,7 +487,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 ], @@ -389,19 +500,19 @@ VG_STATIC void entity_bh_debug( void *user, u32 item_index ){ { gate->dimensions[0], gate->dimensions[1], 0.1f }}; vg_line_boxf_transformed( gate->to_world, box, 0xf000ff00 ); } - else if( type == k_ent_challenge ){ - ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index ); + else if( type == k_ent_objective ){ + ent_objective *objective = mdl_arritm( &world->ent_objective, index ); boxf box; box_init_inf( box ); - for( u32 i=0; isubmesh_count; i++ ){ + for( u32 i=0; isubmesh_count; i++ ){ mdl_submesh *sm = mdl_arritm( &world->meta.submeshs, - challenge->submesh_start+i ); + objective->submesh_start+i ); box_concat( box, sm->bbx ); } m4x3f transform; - mdl_transform_m4x3( &challenge->transform, transform ); + mdl_transform_m4x3( &objective->transform, transform ); vg_line_boxf_transformed( transform, box, 0xf000ff00 ); } else if( type == k_ent_volume ){ @@ -410,9 +521,88 @@ VG_STATIC void entity_bh_debug( void *user, u32 item_index ){ (boxf){{-1.0f,-1.0f,-1.0f},{ 1.0f, 1.0f, 1.0f}}, 0xf000ff00 ); } + else if( type == k_ent_challenge ){ + ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index ); + + boxf box = {{-1.2f*0.5f,-0.72f*0.5f,-0.01f*0.5f}, + { 1.2f*0.5f, 0.72f*0.5f, 0.01f*0.5f}}; + m4x3f transform; + mdl_transform_m4x3( &challenge->transform, transform ); + vg_line_boxf_transformed( transform, box, 0xf0ff0000 ); + } + else{ + vg_fatal_error( "Programming error\n" ); + } +} + +static void entity_bh_closest( void *user, u32 item_index, v3f point, + v3f closest ){ + world_instance *world = user; + + u32 id = world->entity_list[ item_index ], + type = mdl_entity_id_type( id ), + index = mdl_entity_id_id( id ); + + if( type == k_ent_gate ){ + ent_gate *gate = mdl_arritm( &world->ent_gate, index ); + v3_copy( gate->to_world[3], closest ); + } + else if( type == k_ent_objective ){ + ent_objective *challenge = mdl_arritm( &world->ent_objective, index ); + v3_copy( challenge->transform.co, closest ); + } + else if( type == k_ent_volume ){ + ent_volume *volume = mdl_arritm( &world->ent_volume, index ); + v3_copy( volume->to_world[3], closest ); + } + else if( type == k_ent_challenge ){ + ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index ); + v3_copy( challenge->transform.co, closest ); + } else{ vg_fatal_error( "Programming error\n" ); } } +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; + for( u32 i=0; ient_audio); i++ ){ + ent_audio *audio = mdl_arritm(&world->ent_audio,i); + if( audio->flags & AUDIO_FLAG_AUTO_START ){ + ent_call call; + call.data = NULL; + call.function = k_ent_function_trigger; + call.id = mdl_entity_id( k_ent_audio, i ); + entity_call( world, &call ); + } + } + + /* read savedata + * ----------------------------------------------------------------------- */ + + 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 ); + + if( vg_msg_getkvu32( sav, alias, 0 ) ){ + ent_call call; + call.data = NULL; + call.function = 0; + call.id = mdl_entity_id( k_ent_challenge, i ); + entity_call( world, &call ); + } + } +} + +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 ); + } +} + #endif /* WORLD_ENTITY_C */