re-add non-local gates

[carveJwlIkooP6JGAAIwe30JlM.git] / world_gate.c

diff --git a/world_gate.c b/world_gate.c
index accdc06ed9195382798fa52b184ef69ed93a005a..be339cf587603482e124053b3134090aeb99cdd0 100644 (file)
--- a/world_gate.c
+++ b/world_gate.c
@@ -250,8 +250,11 @@ static u32 world_intersect_gates( world_instance *world, v3f pos, v3f last ){
       if( !(gate->flags & k_ent_gate_linked) ) continue;
       if( gate->flags & k_ent_gate_locked ) continue;
 
-      if( gate->flags & k_ent_gate_nonlocal_DELETED )
-         continue;
+      if( gate->flags & k_ent_gate_nonlocal ){
+         if( world_static.instances[gate->target].status 
+               != k_world_status_loaded )
+            continue;
+      }
 
       if( gate_intersect( gate, pos, last ) )
          return mdl_entity_id( k_ent_gate, i );
@@ -273,4 +276,87 @@ static void ent_gate_call( world_instance *world, ent_call *call ){
    }
 }
 
+
+/* 
+ * detatches any nonlocal gates 
+ */
+static void world_unlink_nonlocal( 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 ){
+         gate->flags &= ~k_ent_gate_linked;
+      }
+   }
+}
+
+/* 
+ * attatches nonlocal gates, to be called from main thread ONLY! 
+ */
+static void world_link_nonlocal_async( void *payload, u32 size ){
+   world_instance *world = payload;
+   u32 world_id = world - world_static.instances;
+
+   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) ) continue;
+      if( gate->flags & k_ent_gate_linked ) continue;
+
+      const char *key = mdl_pstr( &world->meta, gate->key );
+      vg_info( "key: %s\n", key );
+
+      for( u32 i=0; i<vg_list_size(world_static.instances); i++ ){
+         world_instance *other = &world_static.instances[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 k=0; k<mdl_arrcount( &other->ent_gate ); k++ ){
+            ent_gate *gate2 = mdl_arritm( &other->ent_gate, k );
+
+            if( !(gate2->flags & k_ent_gate_nonlocal) ) continue;
+            if( gate2->flags & k_ent_gate_linked ) continue;
+
+            const char *key2 = mdl_pstr( &other->meta, gate2->key );
+            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->flags |= k_ent_gate_linked;
+            gate2->flags |= k_ent_gate_linked;
+            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] );
+
+            if( world->meta.info.version < 102 ){
+               /* LEGACY BEHAVIOUR: v101
+                *   this would flip both the client worlds portal's entrance and
+                *   exit. effectively the clients portal would be the opposite 
+                *   to the hub worlds one. new behaviour is to just flip the 
+                *   destinations so the rules are consistent in each world.
+                */
+               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] );
+               q_mul( gate2->q[1], qflip, gate2->q[1] );
+            }
+
+            gate_transform_update( gate );
+            gate_transform_update( gate2 );
+
+            goto matched;
+         }
+      } matched:;
+   }
+}
+
 #endif /* WORLD_GATE_C */