X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gen.h;fp=world_gen.h;h=3f574987d3335f24af95443ca459ec414ed1d331;hb=6b9993651343af73bd48e2213910bbaadb41edaf;hp=2371fa52af135755ac9e6ea54139eed6ab751cba;hpb=e70b6d550d63af95cafd9ffdee1918faf02a6892;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_gen.h b/world_gen.h
index 2371fa5..3f57498 100644
--- a/world_gen.h
+++ b/world_gen.h
@@ -597,6 +597,8 @@ VG_STATIC void world_free( world_instance *world )
    glDeleteTextures( world->texture_count, world->textures );
 
    vg_release_thread_sync();
+
+   world->status = k_world_status_unloaded;
 }
 
 VG_STATIC void world_init_blank( world_instance *world )
@@ -641,8 +643,10 @@ VG_STATIC void world_init_blank( world_instance *world )
    v3_copy( (v3f){1.10f, 0.89f, 0.35f}, state->g_sun_colour );
 }
 
-VG_STATIC void world_entities_init( world_instance *world )
+VG_STATIC void world_entities_init( u32 world_id )
 {
+   world_instance *world = &world_global.worlds[world_id];
+
    /* lights */
    for( u32 j=0; j<mdl_arrcount(&world->ent_light); j ++ ){
       ent_light *light = mdl_arritm( &world->ent_light, j );
@@ -659,7 +663,55 @@ VG_STATIC void world_entities_init( world_instance *world )
    /* gates */
    for( u32 j=0; j<mdl_arrcount(&world->ent_gate); j ++ ){
       ent_gate *gate = mdl_arritm( &world->ent_gate, j );
-      gate_transform_update( gate );
+
+      if( gate->type == k_gate_type_teleport ){
+         gate_transform_update( gate );
+      }
+      else if( gate->type == k_gate_type_nonlocal_unlinked ){
+         const char *key = mdl_pstr( &world->meta, gate->target );
+         vg_info( "key: %s\n", key );
+
+         for( u32 i=0; i<vg_list_size(world_global.worlds); i++ ){
+            world_instance *other = &world_global.worlds[i];
+            if( other == world ) continue;
+            if( other->status != k_world_status_loaded ) continue;
+            vg_info( "Checking world %u for key matches\n", i );
+
+            for( u32 j=0; j<mdl_arrcount( &other->ent_gate ); j++ ){
+               ent_gate *gate2 = mdl_arritm( &other->ent_gate, j );
+               if( gate2->type != k_gate_type_nonlocal_unlinked ) continue;
+
+               const char *key2 = mdl_pstr( &other->meta, gate2->target );
+               vg_info( " key2: %s\n", key2 );
+
+               if( strcmp( key, key2 ) ) continue;
+
+               vg_success( "Non-local matching pair '%s' found. (%u:%u)\n",
+                            key, world_id, i );
+                  
+               gate->type = k_gate_type_nonlocel;
+               gate2->type = k_gate_type_nonlocel;
+               gate->target = i;
+               gate2->target = world_id;
+
+               v3_copy( gate->co[0], gate2->co[1] );
+               v3_copy( gate2->co[0], gate->co[1] );
+               v4_copy( gate->q[0], gate2->q[1] );
+               v4_copy( gate2->q[0], gate->q[1] );
+
+               v4f qflip;
+               q_axis_angle( qflip, (v3f){0.0f,1.0f,0.0f}, VG_PIf );
+               q_mul( gate->q[0], qflip, gate->q[0] );
+               q_mul( gate->q[1], qflip, gate->q[1] );
+
+               gate_transform_update( gate );
+               gate_transform_update( gate2 );
+
+               goto matched;
+            }
+         }
+matched:;
+      }
    }
 
    /* water */
@@ -723,6 +775,7 @@ VG_STATIC void world_load( u32 index, const char *path )
 {
    world_instance *world = &world_global.worlds[index];
    world_init_blank( world );
+   world->status = k_world_status_loading;
 
    vg_info( "Loading world: %s\n", path );
 
@@ -765,7 +818,7 @@ VG_STATIC void world_load( u32 index, const char *path )
    world_process_resources( world );
 
    world_routes_ent_init( world );
-   world_entities_init( world );
+   world_entities_init( index );
    world->volume_bh = bh_create( heap, &bh_system_volumes, world,
                                  mdl_arrcount( &world->ent_volume ), 1 );
    
@@ -775,6 +828,8 @@ VG_STATIC void world_load( u32 index, const char *path )
    world_post_process( world );
 
    mdl_close( meta );
+
+   world->status = k_world_status_loaded;
 }
 
 #endif /* WORLD_GEN_H */