X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=cbe7432a54aacc1e70b3cc31462d795af348e9c8;hb=15c0b8cb57ed5d10814103eaa0b5c06e8ae117e4;hp=bf7916e33369a94ea7017d59ce8e664ca1c5b12d;hpb=4eb81766e4e7c54599b057ebf57b7fab01cd0726;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_entity.c b/world_entity.c
index bf7916e..cbe7432 100644
--- a/world_entity.c
+++ b/world_entity.c
@@ -27,7 +27,7 @@ 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 ){
@@ -37,8 +37,7 @@ static void world_entity_focus_camera( world_instance *world, u32 uid ){
 
       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_angles( dir, world_static.focus_cam.angles );
       v3_copy( cam->transform.co, world_static.focus_cam.pos );
       world_static.focus_cam.fov = cam->fov;
    }
@@ -93,10 +92,9 @@ 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_route ){
-   }
+   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" );
    }
@@ -124,6 +122,7 @@ static void world_gen_entities_init( world_instance *world ){
          gate_transform_update( gate );
       }
    }
+      
    vg_async_call( world_link_nonlocal_async, world, 0 );
 
    /* water */
@@ -213,6 +212,19 @@ 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; i<mdl_arrcount(&world->ent_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];
+   }
 }
 
 static
@@ -287,6 +299,17 @@ 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 );
+      }
+   }
 }
 
 static void ent_audio_call( world_instance *world, ent_call *call ){
@@ -308,7 +331,7 @@ 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;
@@ -586,7 +609,7 @@ 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;