adjust walkout anim length & masked anim blending

[carveJwlIkooP6JGAAIwe30JlM.git] / world_load.c

diff --git a/world_load.c b/world_load.c
index 18f405e03735e2cd3ac5caf7fe010c0a26488c08..b1363b7a9a056c9d55a29685e80bfb4b0c024350 100644 (file)
--- a/world_load.c
+++ b/world_load.c
@@ -15,8 +15,6 @@
  * load the .mdl file located in path as a world instance
  */
 static void world_instance_load_mdl( u32 instance_id, const char *path ){
-   vg_rand_seed( 9001 );
-
    world_instance *world = &world_static.instances[ instance_id ];
    world_init_blank( world );
    world->status = k_world_status_loading;
@@ -45,6 +43,8 @@ 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 );
 
+   vg_info( "%u\n", sizeof(ent_cubemap) );
+
    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 );
@@ -68,6 +68,7 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
    MDL_LOAD_ARRAY( meta, &world->ent_cubemap,   ent_cubemap,    heap );
    MDL_LOAD_ARRAY( meta, &world->ent_miniworld, ent_miniworld,  heap );
    MDL_LOAD_ARRAY( meta, &world->ent_prop,      ent_prop,       heap );
+   MDL_LOAD_ARRAY( meta, &world->ent_region,    ent_region,     heap );
 
    mdl_array_ptr infos;
    MDL_LOAD_ARRAY( meta, &infos, ent_worldinfo, vg_mem.scratch );
@@ -87,6 +88,7 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
       world->info.pstr_desc = 0;
       world->info.pstr_name = 0;
       world->info.timezone = 0.0f;
+      world->info.flags = 0;
    }
 
    time_t seconds = time(NULL) % ((u32)vg_maxf(1.0f,k_day_length)*60);
@@ -94,16 +96,39 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
    world->time += (world->info.timezone/24.0);
 
    /* process resources from pack */
+   u64 t4 = SDL_GetPerformanceCounter();
    world_gen_load_surfaces( world );
+   u64 t5 = SDL_GetPerformanceCounter();
    world_gen_routes_ent_init( world );
    world_gen_entities_init( world );
+   u64 t6 = SDL_GetPerformanceCounter();
    
    /* main bulk */
+   u64 t0 = SDL_GetPerformanceCounter();
    world_gen_generate_meshes( world );
+   u64 t1 = SDL_GetPerformanceCounter();
    world_gen_routes_generate( instance_id );
+   u64 t2 = SDL_GetPerformanceCounter();
    world_gen_compute_light_indices( world );
+   u64 t3 = SDL_GetPerformanceCounter();
    mdl_close( meta );
 
+   u64 utime_mesh = t1-t0,
+       utime_route = t2-t1,
+       utime_indices = t3-t2,
+       utime_tex = t5-t4,
+       utime_ent = t6-t5,
+       ufreq = SDL_GetPerformanceFrequency();
+
+   f64 ftime_mesh = ((f64)utime_mesh / (f64)ufreq)*1000.0,
+       ftime_route = ((f64)utime_route / (f64)ufreq)*1000.0,
+       ftime_ind = ((f64)utime_route / (f64)ufreq)*1000.0,
+       ftime_tex = ((f64)utime_tex / (f64)ufreq)*1000.0,
+       ftime_ent = ((f64)utime_ent / (f64)ufreq)*1000.0;
+
+   vg_info( "wtime:mesh %.2fms route %.2fms ind %.2fms tex %.2fms ent %.2fms\n",
+               ftime_mesh, ftime_route, ftime_ind, ftime_tex, ftime_ent );
+
    /* init player position.
     *   - this is overriden by the save state when(if) it loads */
    ent_spawn *rp = world_find_spawn_by_name( world, "start" );
@@ -128,6 +153,9 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
       board->data_len = 0;
    }
 
+   world->routes_ui = vg_linear_alloc( heap, 
+         sizeof(struct route_ui)*mdl_arrcount(&world->ent_route) );
+
    vg_async_call( async_world_postprocess, world, 0 );
    vg_async_stall();
 }
@@ -405,7 +433,7 @@ static void world_free( world_instance *world ){
    glDeleteTextures( 1, &world->tex_light_cubes );
 
    /* delete textures and meshes */
-   glDeleteTextures( world->texture_count, world->textures );
+   glDeleteTextures( world->texture_count-1, world->textures+1 );
 
    u32 world_index = world - world_static.instances;
    if( world_index ){