X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=02bbeb2b342d26141ef52c4a674688106cc50732;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=a12e071ade86fdf4a749ea840e1f61edcc434ed7;hpb=874c9d7e6ee2d826f9eb34518e8163283439c38e;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_entity.c b/world_entity.c
index a12e071..02bbeb2 100644
--- a/world_entity.c
+++ b/world_entity.c
@@ -81,21 +81,22 @@ static void world_entity_focus_preupdate(void){
 
 /* additional renderings like text etc.. */
 static void world_entity_focus_render(void){
-   if( skaterift.activity != k_skaterift_ent_focus )
+   world_instance *world = world_current_instance();
+   if( skaterift.activity != k_skaterift_ent_focus ){
+      skateshop_render_nonfocused( world, &skaterift.cam );
       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 if( type == k_ent_challenge ){}
+   else if( type == k_ent_route ){}
+   else if( type == k_ent_miniworld ){}
    else {
       vg_fatal_error( "Programming error\n" );
    }
@@ -119,10 +120,12 @@ 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_DELETED) ) {
+      if( !(gate->flags & k_ent_gate_nonlocal) ) {
          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++ ){
@@ -211,6 +214,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
@@ -317,7 +333,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;
@@ -544,6 +560,29 @@ static void entity_bh_debug( void *user, u32 item_index ){
    }
 }
 
+static void update_ach_models(void){
+   world_instance *hub = &world_static.instances[k_world_purpose_hub];
+   if( hub->status != k_world_status_loaded ) return;
+
+   for( u32 i=0; i<mdl_arrcount( &hub->ent_prop ); i ++ ){
+      ent_prop *prop = mdl_arritm( &hub->ent_prop, i );
+      if( prop->flags & 0x2 ){
+         if( MDL_CONST_PSTREQ( &hub->meta, prop->pstr_alias, "MARC" ) )
+            if( skaterift.achievements & 0x1 )
+               prop->flags &= ~0x1;
+         if( MDL_CONST_PSTREQ( &hub->meta, prop->pstr_alias, "ALBERT" ) )
+            if( skaterift.achievements & 0x2 )
+               prop->flags &= ~0x1;
+         if( MDL_CONST_PSTREQ( &hub->meta, prop->pstr_alias, "JANET" ) )
+            if( skaterift.achievements & 0x4 )
+               prop->flags &= ~0x1;
+         if( MDL_CONST_PSTREQ( &hub->meta, prop->pstr_alias, "BERNADETTA" ) )
+            if( skaterift.achievements & 0x8 )
+               prop->flags &= ~0x1;
+      }
+   }
+}
+
 static void entity_bh_closest( void *user, u32 item_index, v3f point,
                                   v3f closest ){
    world_instance *world = user;
@@ -603,36 +642,61 @@ static void world_entity_start( world_instance *world, vg_msg *sav ){
          entity_call( world, &call );
       }
    }
-}
 
-/* 
- * 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;
+   vg_msg routes_block = *sav;
+   if( vg_msg_seekframe( &routes_block, "routes" ) ){
+      for( u32 i=0; i<mdl_arrcount(&world->ent_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 );
+
+            f32 sections[ route->checkpoints_count ];
+            vg_msg_cmd cmd;
+            if( vg_msg_getkvcmd( &route_info, "sections", &cmd ) ){
+               vg_msg_cast( cmd.value, cmd.code, sections,
+                            k_vg_msg_f32 |
+                            vg_msg_count_bits(route->checkpoints_count) );
+            }
+            else{
+               for( u32 j=0; j<route->checkpoints_count; j ++ )
+                  sections[j] = 0.0f;
+            }
+
+            for( u32 j=0; j<route->checkpoints_count; j ++ ){
+               ent_checkpoint *cp = mdl_arritm( &world->ent_checkpoint,
+                     route->checkpoints_start + j );
+
+               cp->best_time = sections[j];
+            }
+
+            /* LEGACY: check if steam achievements can give us a medal */
+            if( steam_ready && steam_stats_ready ){
+               for( u32 j=0; j<vg_list_size(track_infos); j ++ ){
+                  struct track_info *inf = &track_infos[j];
+                  if( !strcmp(inf->name,
+                              mdl_pstr(&world->meta,route->pstr_name))){
+                     
+                     steamapi_bool set = 0;
+                     if( SteamAPI_ISteamUserStats_GetAchievement( 
+                              hSteamUserStats, inf->achievement_id, &set ) )
+                     {
+                        if( set ){
+                           route->flags |= k_ent_route_flag_achieve_silver;
+                        }
+                     }
+                  }
+               }
             }
          }
       }
    }
+
+   ent_region_re_eval( world );
 }
 
 static void world_entity_serialize( world_instance *world, vg_msg *sav ){
@@ -642,6 +706,33 @@ static void world_entity_serialize( world_instance *world, vg_msg *sav ){
       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; i<mdl_arrcount(&world->ent_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 );
+
+            f32 sections[ route->checkpoints_count ];
+
+            for( u32 j=0; j<route->checkpoints_count; j ++ ){
+               ent_checkpoint *cp = mdl_arritm( &world->ent_checkpoint,
+                     route->checkpoints_start + j );
+
+               sections[j] = cp->best_time;
+            }
+
+            vg_msg_wkvnum( sav, "sections", k_vg_msg_f32, 
+                           route->checkpoints_count, sections );
+         }
+         vg_msg_end_frame( sav );
+      }
+      vg_msg_end_frame( sav );
+   }
 }
 
 #endif /* WORLD_ENTITY_C */