X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=e8f545c56dff8af10b154dcb9e925d77402b87d2;hb=2c91a71533b4ce86b9e7fd708420ae05c74d8f52;hp=7fb6e478694a76afb7be635211df3aaf5c621c21;hpb=88f8273a9ab7b0644813625c43c70c5af34cd4f5;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_load.c b/world_load.c
index 7fb6e47..e8f545c 100644
--- a/world_load.c
+++ b/world_load.c
@@ -45,6 +45,7 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
    mdl_load_animation_block( meta, world->heap );
    mdl_load_mesh_block( meta, world->heap );
 
+   /* TODO: Make this a table? */
    mdl_load_array( meta, &world->ent_gate,      "ent_gate",       heap );
    mdl_load_array( meta, &world->ent_camera,    "ent_camera",     heap );
    mdl_load_array( meta, &world->ent_spawn,     "ent_spawn",      heap );
@@ -66,6 +67,7 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
    mdl_load_array( meta, &world->ent_challenge, "ent_challenge",  heap );
    mdl_load_array( meta, &world->ent_relay,     "ent_relay",      heap );
    mdl_load_array( meta, &world->ent_cubemap,   "ent_cubemap",    heap );
+   mdl_load_array( meta, &world->ent_miniworld, "ent_miniworld",  heap );
 
    mdl_array_ptr infos;
    mdl_load_array( meta, &infos, "ent_worldinfo", vg_mem.scratch );
@@ -80,11 +82,9 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
       world->info.timezone = 0.0f;
    }
 
-   time_t t;
-   struct tm *tm;
-   time( &t );
-   tm = gmtime( &t );
-   world->time = (float)tm->tm_min/20.0f + (world->info.timezone/24.0f);
+   time_t seconds = time(NULL) % ((u32)k_day_length*60);
+   world->time  = ((f64)(seconds)/(k_day_length*60.0));
+   world->time += (world->info.timezone/24.0);
 
    /* process resources from pack */
    world_gen_load_surfaces( world );
@@ -97,29 +97,55 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
    world_gen_compute_light_indices( world );
    mdl_close( meta );
 
+   /* init player position.
+    *   - this is overriden by the save state when(if) it loads */
+   v3_zero( world->player_angles );
+   ent_spawn *rp = world_find_spawn_by_name( world, "start" );
+   if( !rp ) rp = world_find_closest_spawn( world, (v3f){0.0f,0.0f,0.0f} );
+
+   /* TODO: fallback to searching for a safe location using raycasts */
+   assert(rp);
+   v3_copy( rp->transform.co, world->player_co );
+
+   /* allocate leaderboard buffers */
+   u32 bs = mdl_arrcount(&world->ent_route)*sizeof(struct leaderboard_cache);
+   world->leaderboard_cache = vg_linear_alloc( heap, bs );
+
+   for( u32 i=0; i<mdl_arrcount( &world->ent_route ); i ++ ){
+      struct leaderboard_cache *board = &world->leaderboard_cache[i];
+      board->data = vg_linear_alloc( heap, NETWORK_REQUEST_MAX );
+      board->status = k_request_status_client_error;
+      board->cache_time = 0.0;
+      board->data_len = 0;
+   }
+
    vg_async_call( async_world_postprocess, world, 0 );
    vg_async_stall();
 }
 
 struct world_load_complete_data{
    savedata_file save;
-   u32 instance_start, instance_count;
+   enum world_purpose purpose;
 };
 
 static void skaterift_world_load_done( void *payload, u32 size ){
    struct world_load_complete_data *data = payload;
 
-   vg_msg sav = {0};
-   sav.buf = data->save.buf;
-   sav.len = data->save.len;
-   sav.max = data->save.len;
-
-   for( u32 i=0; i<data->instance_count; i++ ){
-      world_instance *world = &world_static.instances[ data->instance_start+i ];
-      world_entity_start( world, &sav );
-   }
+   /* TODO(W2): Load player position from this save file */
+   vg_msg sav;
+   vg_msg_init( &sav, data->save.buf, data->save.len );
 
+   world_instance *world = &world_static.instances[ data->purpose ];
+   world_entity_start( world, &sav );
+   world->status = k_world_status_loaded;
    world_static.load_state = k_world_loader_none;
+
+   for( int i=0; i<k_world_max; i ++ ){
+      world_instance *wi = &world_static.instances[i];
+
+      if( wi->status == k_world_status_loaded )
+         world_entity_relink( wi );
+   }
 }
 
 struct world_load_args {
@@ -131,12 +157,15 @@ struct world_load_args {
  * Does a complete world switch using the remaining free slots
  */
 static void skaterift_world_load_thread( void *_args ){
-   struct world_load_args *args = _args;
-   enum world_purpose purpose = args->purpose;
-   addon_reg *reg = args->reg;
+   /* FIXME: we need to check all threads that take args. args can dissapear! */
+   struct world_load_args args = *((struct world_load_args *)_args);
+
+   addon_reg *reg = args.reg;
+   world_static.instance_addons[ args.purpose ] = reg;
 
-   if( purpose == k_world_purpose_hub ) world_static.addon_hub = reg;
-   else world_static.addon_client = reg;
+   char uid[ADDON_UID_MAX];
+   addon_alias_uid( &reg->alias, uid );
+   vg_info( "LOAD WORLD %s @%d\n", uid, args.purpose );
 
    char path_buf[4096];
    vg_str path;
@@ -151,7 +180,7 @@ static void skaterift_world_load_thread( void *_args ){
       return;
    }
 
-   char worlds[3][4096];
+   char worlds[k_world_max-1][4096];
    u32 i=0;
 
    vg_dir dir;
@@ -174,7 +203,7 @@ static void skaterift_world_load_thread( void *_args ){
          if( !ext ) continue;
          if( strcmp(ext,".mdl") ) continue;
 
-         if( i == 3 ){
+         if( i == k_world_max-1 ){
             vg_warn( "There are too many .mdl files in the map folder!(3)\n" );
             break;
          }
@@ -200,30 +229,15 @@ static void skaterift_world_load_thread( void *_args ){
       }
    }
 
-   u32 instance_start = 0, instance_count = 1;
-   if( purpose == k_world_purpose_client ) instance_start = 1;
-
-   world_instance_load_mdl( instance_start, worlds[first_index] );
-
-   /* TODO: Support multiply packed worlds */
-#if 0
-   world_loader.generate_point_cloud = 0;
-   for( u32 j=0; j<i; j++ ){
-      if( j != first_index ){
-         world_loader.world_index = j+1;
-         world_load_mdl( worlds[j] );
-      }
-   }
-#endif
+   world_instance_load_mdl( args.purpose, worlds[first_index] );
 
    vg_async_item *final_call = 
       vg_async_alloc( sizeof(struct world_load_complete_data) );
 
    struct world_load_complete_data *data = final_call->payload;
-   data->instance_start = instance_start;
-   data->instance_count = instance_count;
+   data->purpose = args.purpose;
 
-   skaterift_world_get_save_path( purpose, data->save.path );
+   skaterift_world_get_save_path( args.purpose, data->save.path );
    savedata_file_read( &data->save );
 
    vg_async_dispatch( final_call, skaterift_world_load_done );
@@ -233,7 +247,7 @@ static void skaterift_world_load_thread( void *_args ){
 /* holding pattern before we can start loading the new world, since we might be
  * waiting for audio to stop */
 static void skaterift_change_client_world_preupdate(void){
-   for( u32 i=1; i<vg_list_size(world_static.instances); i++ ){
+   for( u32 i=1; i<k_world_max; i++ ){
       world_instance *inst = &world_static.instances[i];
       
       if( inst->status == k_world_status_unloading ){
@@ -252,7 +266,7 @@ static void skaterift_change_client_world_preupdate(void){
       struct world_load_args *args = 
          vg_linear_alloc( vg_async.buffer, sizeof(struct world_load_args) );
       args->purpose = k_world_purpose_client;
-      args->reg = world_static.addon_client; 
+      args->reg = world_static.instance_addons[ k_world_purpose_client ];
 
       /* this is replaces the already correct reg but we have to set it again
        * TOO BAD */
@@ -267,7 +281,7 @@ static void skaterift_change_world_start( addon_reg *reg ){
    if( world_static.active_instance != 0 )
       vg_error( "Cannot change worlds while in non-root world\n" );
    else{
-      if( world_static.addon_client == reg ){
+      if( world_static.instance_addons[ k_world_purpose_client ] == reg ){
          vg_warn( "World is already loaded\n" );
          return;
       }
@@ -281,7 +295,6 @@ static void skaterift_change_world_start( addon_reg *reg ){
 
       vg_linear_clear( vg_mem.scratch ); /* ?? */
       vg_info( "unloading old worlds\n" );
-      world_unlink_nonlocal( &world_static.instances[0] );
       
       for( u32 i=1; i<vg_list_size(world_static.instances); i++ ){
          world_instance *inst = &world_static.instances[i];
@@ -292,21 +305,21 @@ static void skaterift_change_world_start( addon_reg *reg ){
          }
       }
 
-      world_static.addon_client = reg;
+      world_entity_relink( &world_static.instances[k_world_purpose_hub] );
+
+      world_static.instance_addons[ k_world_purpose_client ] = reg;
       network_send_item( k_netmsg_playeritem_world1 );
       relink_all_remote_player_worlds();
    }
 }
 
 /* console command for the above function */
-static int skaterift_change_world_command( int argc, const char *argv[] ){
-   if( !vg_loader_availible() ) return 0;
+static int skaterift_load_world_command( int argc, const char *argv[] ){
+   if( !vg_loader_availible() ) return 0; /* FIXME */
 
    if( argc == 1 ){
       addon_alias q;
-      q.type = k_addon_type_world;
-      q.workshop_id = 0;
-      vg_strncpy( argv[0], q.foldername, 64, k_strncpy_always_add_null );
+      addon_uid_to_alias( argv[0], &q );
 
       u32 reg_id = addon_match( &q );
       if( reg_id != 0xffffffff ){
@@ -314,9 +327,18 @@ static int skaterift_change_world_command( int argc, const char *argv[] ){
          skaterift_change_world_start( reg );
       }
       else {
-         char buf[76];
-         addon_alias_uid( &q, buf );
-         vg_error( "Addon '%s' is not installed or not found.\n", buf );
+         vg_error( "Addon '%s' is not installed or not found.\n", argv[0] );
+      }
+   }
+   else {
+      vg_info( "worlds availible to load:\n" );
+         
+      for( int i=0; i<addon_count(k_addon_type_world); i ++ ){
+         addon_reg *w = get_addon_from_index( k_addon_type_world, i );
+
+         char buf[ADDON_UID_MAX];
+         addon_alias_uid( &w->alias, buf );
+         vg_info( "  %s\n", buf );
       }
    }
 
@@ -357,8 +379,7 @@ static int world_freeable( world_instance *world ){
 /*
  * Free all resources for world instance
  */
-static void world_free( world_instance *world )
-{
+static void world_free( world_instance *world ){
    vg_info( "Free world @%p\n", world );
 
    /* free meshes */
@@ -397,8 +418,7 @@ static void world_free( world_instance *world )
  * reset the world structure without deallocating persistent buffers 
  * TODO: Make this a memset(0), and have persistent items live in a static loc
  */
-static void world_init_blank( world_instance *world )
-{
+static void world_init_blank( world_instance *world ){
    memset( &world->meta, 0, sizeof(mdl_context) );
 
    world->textures = NULL;