nonlocal stuff again

[carveJwlIkooP6JGAAIwe30JlM.git] / world_routes.h

diff --git a/world_routes.h b/world_routes.h
index e47ebe2739f6b0dabc6744fbd3864788b600d95a..66a4fa5c022bfd0154fc91a7f0f3086251b7cd18 100644 (file)
--- a/world_routes.h
+++ b/world_routes.h
@@ -84,13 +84,17 @@ VG_STATIC void world_routes_time_lap( world_instance *world, ent_route *route )
    u32 valid_count=0;
 
    for( u32 i=0; i<route->checkpoints_count; i++ ){
-      u32 cpid  = route->checkpoints_start+(i+route->active_checkpoint);
-          cpid  = cpid % route->checkpoints_count;
+      u32 cpid  = (i+route->active_checkpoint) % route->checkpoints_count;
+          cpid += route->checkpoints_start;
 
       ent_checkpoint *cp = mdl_arritm( &world->ent_checkpoint, cpid );
       ent_gate *rg = mdl_arritm( &world->ent_gate, cp->gate_index );
                 rg = mdl_arritm( &world->ent_gate, rg->target );
 
+      if( i == 1 ){
+         route->timing_base = rg->timing_time;
+      }
+
       if( i == 0 )
          start_time = rg->timing_time;
       else{
@@ -99,10 +103,16 @@ VG_STATIC void world_routes_time_lap( world_instance *world, ent_route *route )
       }
 
       last_version = rg->timing_version;
-      vg_info( "%u %f\n", rg->timing_version, rg->timing_time );
+      vg_info( "%u %f\n", rg, rg->timing_version, rg->timing_time );
    }
 
-   if( world_global.current_run_version == last_version+1 ) valid_count ++;
+   if( world_global.current_run_version == last_version+1 ){
+      valid_count ++;
+
+      if( route->checkpoints_count == 1 ){
+         route->timing_base = world_global.time;
+      }
+   }
    else valid_count = 0;
 
    vg_info( "%u %f\n", world_global.current_run_version, world_global.time );
@@ -113,7 +123,6 @@ VG_STATIC void world_routes_time_lap( world_instance *world, ent_route *route )
    }
 
    route->valid_checkpoints = valid_count+1;
-   route->timing_base = start_time;
 
    vg_info( "valid: %u\n", valid_count );
    vg_info( "----------------------------\n" );
@@ -125,10 +134,19 @@ VG_STATIC void world_routes_time_lap( world_instance *world, ent_route *route )
 VG_STATIC void world_routes_activate_entry_gate( world_instance *world, 
                                                  ent_gate *rg )
 {
-   ent_gate *dest = mdl_arritm( &world->ent_gate, rg->target );
-
    world_global.last_use = world_global.time;
 
+   /* disable all routes and leave the world */
+   if( rg->type == k_gate_type_nonlocel ){
+      for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
+         ent_route *route = mdl_arritm( &world->ent_route, i );
+         route->active_checkpoint = 0xffff;
+      }
+      return;
+   }
+
+   ent_gate *dest = mdl_arritm( &world->ent_gate, rg->target );
+
    for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
       ent_route *route = mdl_arritm( &world->ent_route, i );
 
@@ -446,7 +464,7 @@ VG_STATIC void world_routes_create_mesh( world_instance *world, u32 route_id )
 VG_STATIC void world_routes_generate( world_instance *world )
 {
    vg_info( "Generating route meshes\n" );
-   world->scene_lines = scene_init( world_global.generic_heap, 200000, 300000 );
+   world->scene_lines = scene_init( world->heap, 200000, 300000 );
 
    for( u32 i=0; i<mdl_arrcount(&world->ent_gate); i++ ){
       ent_gate *gate = mdl_arritm( &world->ent_gate, i );
@@ -495,7 +513,7 @@ VG_STATIC void world_routes_generate( world_instance *world )
       scene_upload( world->scene_lines, &world->mesh_route_lines );
    }
    vg_release_thread_sync();
-   vg_linear_del( world_global.generic_heap, world->scene_lines );
+   vg_linear_del( world->heap, world->scene_lines );
 
    world_routes_clear( world );
 }
@@ -556,11 +574,6 @@ VG_STATIC void world_routes_ent_init( world_instance *world )
 
    for( u32 i=0; i<mdl_arrcount(&world->ent_gate); i++ ){
       ent_gate *gate = mdl_arritm( &world->ent_gate, i );
-
-      vg_info( "ROUTES :: %hu %hu %hu %hu\n", gate->routes[0],
-                                              gate->routes[1],
-                                              gate->routes[2],
-                                              gate->routes[3] );
    }
 
    world_routes_clear( world );
@@ -575,7 +588,7 @@ VG_STATIC void world_routes_ent_init( world_instance *world )
 VG_STATIC void world_routes_init(void)
 {
    world_global.current_run_version = 200;
-   world_global.time = RESET_MAX_TIME*2.0;
+   world_global.time = 300.0;
    world_global.last_use = 0.0;
 
    shader_scene_route_register();
@@ -846,8 +859,6 @@ VG_STATIC void render_world_routes( world_instance *world, camera *cam,
    shader_scene_route_uPvmPrev( cam->mtx_prev.pv );
    shader_scene_route_uMdl( identity_matrix );
    shader_scene_route_uCamera( cam->transform[3] );
-   shader_scene_route_uBoard0( TEMP_BOARD_0 );
-   shader_scene_route_uBoard1( TEMP_BOARD_1 );
 
    mesh_bind( &world->mesh_route_lines );