X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=d34ed6e0932f88d0d70a70bddf6f6ce8afd21dc0;hb=d171c9ad5de05c9ac8563fcf9f23760b93fb50f8;hp=82c9723f90c6459565bd7d0b2b80ed0eb14660b1;hpb=6190deb68aa1c9e92ede62ea05c2a755bf5516de;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_entity.c b/world_entity.c
index 82c9723..d34ed6e 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 )
@@ -39,27 +60,27 @@ VG_STATIC void world_entity_focus_preupdate(void){
    vg_slewf( &world_static.focus_strength, active, 
              vg.time_frame_delta * (1.0f/0.5f) );
 
-   if( !active ) 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 );
+      ent_skateshop_preupdate( skateshop, active );
    }
    else if( type == k_ent_challenge ){
       ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index );
-      ent_challenge_preupdate( challenge );
+      ent_challenge_preupdate( challenge, active );
    }
-   else {
-      vg_fatal_error( "Programming error\n" );
+   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;
 
@@ -72,14 +93,15 @@ VG_STATIC void world_entity_focus_render(void){
       skateshop_render( skateshop );
    }
    else if( type == k_ent_challenge ){
-      
+   }
+   else if( type == k_ent_route ){
    }
    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; j<mdl_arrcount(&world->ent_light); j ++ ){
       ent_light *light = mdl_arritm( &world->ent_light, j );
@@ -97,11 +119,10 @@ VG_STATIC void world_gen_entities_init( world_instance *world ){
    for( u32 j=0; j<mdl_arrcount(&world->ent_gate); j ++ ){
       ent_gate *gate = mdl_arritm( &world->ent_gate, j );
 
-      if( !(gate->flags & k_ent_gate_nonlocal) ) {
+      if( !(gate->flags & k_ent_gate_nonlocal_DELETED) ) {
          gate_transform_update( gate );
       }
    }
-   vg_async_call( world_link_nonlocal_async, world, 0 );
 
    /* water */
    for( u32 j=0; j<mdl_arrcount(&world->ent_water); j++ ){
@@ -192,7 +213,7 @@ VG_STATIC void world_gen_entities_init( world_instance *world ){
                                  indexed_count, 2 );
 }
 
-VG_STATIC
+static
 ent_spawn *world_find_closest_spawn( world_instance *world, v3f position )
 {
    ent_spawn *rp = NULL, *r;
@@ -221,7 +242,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;
@@ -239,7 +260,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 );
@@ -264,9 +285,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;
@@ -359,7 +391,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 );
@@ -372,7 +404,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;
 
@@ -425,7 +457,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 ],
@@ -454,7 +486,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 ],
@@ -464,7 +496,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 ],
@@ -512,7 +544,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;
 
@@ -541,7 +573,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;
@@ -563,7 +595,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;
@@ -573,7 +605,39 @@ VG_STATIC void world_entity_start( world_instance *world, vg_msg *sav ){
    }
 }
 
-VG_STATIC void world_entity_serialize( world_instance *world, vg_msg *sav ){
+#if 0
+/* 
+ * used for relinking multi-world data. ran anytime the world setup changes
+ */
+static void world_entity_relink( world_instance *world ){
+   vg_info( "entity_relink(%d)\n", world - world_static.instances );
+   for( u32 i=0; i<mdl_arrcount(&world->ent_miniworld); i++ ){
+      ent_miniworld *miniworld = mdl_arritm( &world->ent_miniworld, i );
+      miniworld->purpose = k_world_purpose_invalid;
+
+      const char *uid = mdl_pstr( &world->meta, miniworld->pstr_world );
+      addon_alias q;
+      addon_uid_to_alias( uid, &q );
+
+      u32 addon_id = addon_match( &q );
+      if( addon_id != 0xffffffff ){
+         addon_reg *reg = get_addon_from_index( k_addon_type_world, addon_id );
+         
+         for( int j=0; j<k_world_max; j ++ ){
+            world_instance *other = &world_static.instances[j];
+            if( other == world ) continue;
+            if( (other->status == k_world_status_loaded) && 
+                (world_static.instance_addons[j] == reg) ){
+               miniworld->purpose = j;
+               break;
+            }
+         }
+      }
+   }
+}
+#endif
+
+static void world_entity_serialize( world_instance *world, vg_msg *sav ){
    for( u32 i=0; i<mdl_arrcount(&world->ent_challenge); i++ ){
       ent_challenge *challenge = mdl_arritm(&world->ent_challenge,i);