X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=world_entity.c;h=67db6afb16641465a64e94831db671aca465c0e5;hb=bd3a7e904be0fc97e70761cc957a28609d366586;hp=7ffa1d643012493f53637131e86446284f935ff5;hpb=2329044d44a5aff035b01926f7901d9e89ad284e;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_entity.c b/world_entity.c index 7ffa1d6..67db6af 100644 --- a/world_entity.c +++ b/world_entity.c @@ -6,6 +6,73 @@ #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" + +VG_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; + world_static.focused_entity = entity_id; + skaterift.activity = k_skaterift_ent_focus; +} + +VG_STATIC void world_entity_unfocus(void){ + localplayer.immobile = 0; + skaterift.activity = k_skaterift_default; + menu.disable_open = 0; + srinput.enabled = 0; +} + +/* logic preupdate */ +VG_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(); + + 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 ); + } +} + +/* additional renderings like text etc.. */ +VG_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 { + vg_fatal_error( "Programming error\n" ); + } +} VG_STATIC void world_gen_entities_init( world_instance *world ){ /* lights */ @@ -95,8 +162,9 @@ VG_STATIC void world_gen_entities_init( world_instance *world ){ } 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; ito_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 */ @@ -323,14 +391,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 ){ @@ -338,6 +406,18 @@ 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 ){ @@ -351,14 +431,18 @@ 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; @@ -388,19 +472,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 ){ @@ -409,6 +493,15 @@ 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" ); } @@ -426,21 +519,24 @@ VG_STATIC void entity_bh_closest( void *user, u32 item_index, v3f point, ent_gate *gate = mdl_arritm( &world->ent_gate, index ); v3_copy( gate->to_world[3], closest ); } - else if( type == k_ent_challenge ){ - ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index ); + 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" ); } } -VG_STATIC void world_entity_start( world_instance *world, - struct savedata *sav ){ +VG_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; @@ -454,10 +550,31 @@ VG_STATIC void world_entity_start( world_instance *world, 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_seekkvu32( sav, alias, k_vg_msg_first ) ){ + ent_call call; + call.data = NULL; + call.function = 0; + call.id = mdl_entity_id( k_ent_challenge, i ); + entity_call( world, &call ); + } + } } -VG_STATIC void async_world_entity_start( void *payload, u32 size ){ +VG_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 */