X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gate.c;h=4c76b07abda774d515ac8f47c74a7bb1b325e91d;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=b4760b46389d6cbd1299fbe288f85db1874a20be;hpb=56af37b4982b027cac13133eadadfc71ce8947bb;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_gate.c b/world_gate.c
index b4760b4..4c76b07 100644
--- a/world_gate.c
+++ b/world_gate.c
@@ -16,11 +16,12 @@
 #include "camera.h"
 
 #include "world_water.h"
+#include "player_remote.h"
 
 /*
  * Update the transform matrices for gate
  */
-VG_STATIC void gate_transform_update( ent_gate *gate ){
+static void gate_transform_update( ent_gate *gate ){
    if( gate->flags & k_ent_gate_flip ){
       v4f qflip;
       q_axis_angle( qflip, (v3f){0.0f,1.0f,0.0f}, VG_PIf );
@@ -39,7 +40,7 @@ VG_STATIC void gate_transform_update( ent_gate *gate ){
    m4x3_mul( recv_to_world, to_local, gate->transport );
 }
 
-VG_STATIC void world_gates_init(void)
+static void world_gates_init(void)
 {
    vg_info( "world_gates_init\n" );
 
@@ -68,7 +69,7 @@ VG_STATIC void world_gates_init(void)
    mdl_close( &mgate );
 }
 
-VG_STATIC void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl ){
+static void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl ){
    m4x3_copy( gate->to_world, mmdl );
    
    if( !(gate->flags & k_ent_gate_custom_mesh) ){
@@ -80,7 +81,7 @@ VG_STATIC void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl ){
 /*
  * Render the view through a gate
  */
-VG_STATIC int render_gate( world_instance *world, world_instance *world_inside,
+static int render_gate( world_instance *world, world_instance *world_inside,
                            ent_gate *gate, camera *cam, int layer_depth )
 {
    v3f viewdir, gatedir;
@@ -180,6 +181,7 @@ VG_STATIC int render_gate( world_instance *world, world_instance *world_inside,
    }
 
    render_world( world_inside, &world_gates.cam, layer_depth );
+   render_remote_players( world_inside, &world_gates.cam );
 
    {
       glDisable( GL_STENCIL_TEST );
@@ -203,7 +205,7 @@ VG_STATIC int render_gate( world_instance *world, world_instance *world_inside,
  * Intersect the plane of a gate with a line segment, plane coordinate result 
  * stored in 'where'
  */
-VG_STATIC int gate_intersect_plane( ent_gate *gate, 
+static int gate_intersect_plane( ent_gate *gate, 
                                     v3f pos, v3f last, v2f where )
 {
    v4f surface;
@@ -247,8 +249,7 @@ VG_STATIC int gate_intersect_plane( ent_gate *gate,
 /*
  * Intersect specific gate
  */
-VG_STATIC int gate_intersect( ent_gate *gate, v3f pos, v3f last )
-{
+static int gate_intersect( ent_gate *gate, v3f pos, v3f last ){
    v2f xy;
 
    if( gate_intersect_plane( gate, pos, last, xy ) ){
@@ -264,32 +265,28 @@ VG_STATIC int gate_intersect( ent_gate *gate, v3f pos, v3f last )
 /* 
  * Intersect all gates in the world
  */
-VG_STATIC ent_gate *world_intersect_gates( world_instance *world,
-                                           v3f pos, v3f last ){
+static u32 world_intersect_gates( world_instance *world, v3f pos, v3f last ){
    for( u32 i=0; i<mdl_arrcount(&world->ent_gate); i++ ){
       ent_gate *gate = mdl_arritm( &world->ent_gate, i );
 
       if( !(gate->flags & k_ent_gate_linked) ) continue;
       if( gate->flags & k_ent_gate_locked ) continue;
 
-      if( gate->flags & k_ent_gate_nonlocal ){
-         if( world_static.load_state != k_world_loader_none ){
+      if( gate->flags & k_ent_gate_nonlocal )
+         if( world_static.load_state != k_world_loader_none )
             continue;
-         }
-      }
 
-      if( gate_intersect( gate, pos, last ) ){
-         return gate;
-      }
+      if( gate_intersect( gate, pos, last ) )
+         return mdl_entity_id( k_ent_gate, i );
    }
 
-   return NULL;
+   return 0;
 }
 
 /* 
  * detatches any nonlocal gates 
  */
-VG_STATIC void world_unlink_nonlocal( world_instance *world ){
+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 );
 
@@ -302,7 +299,7 @@ VG_STATIC void world_unlink_nonlocal( world_instance *world ){
 /* 
  * attatches nonlocal gates, to be called from main thread ONLY! 
  */
-VG_STATIC void world_link_nonlocal_async( void *payload, u32 size ){
+static void world_link_nonlocal_async( void *payload, u32 size ){
    world_instance *world = payload;
    u32 world_id = world - world_static.instances;
 
@@ -368,7 +365,7 @@ VG_STATIC void world_link_nonlocal_async( void *payload, u32 size ){
    }
 }
 
-VG_STATIC void ent_gate_call( world_instance *world, ent_call *call ){
+static void ent_gate_call( world_instance *world, ent_call *call ){
    u32 index = mdl_entity_id_id( call->id );
    ent_gate *gate = mdl_arritm( &world->ent_gate, index );