X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gate.c;h=be339cf587603482e124053b3134090aeb99cdd0;hb=c0e4a67ba2f001179df6e2cde97370a946669c22;hp=b236bc9bd1f3934c2a180edc44099f73dc3c79bd;hpb=22f62f001f21d1b91fefd9fc495c122d9ddf205a;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_gate.c b/world_gate.c
index b236bc9..be339cf 100644
--- a/world_gate.c
+++ b/world_gate.c
@@ -16,6 +16,7 @@
 #include "camera.h"
 
 #include "world_water.h"
+#include "player_remote.h"
 
 /*
  * Update the transform matrices for gate
@@ -81,8 +82,7 @@ static void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl ){
  * Render the view through a gate
  */
 static int render_gate( world_instance *world, world_instance *world_inside,
-                           ent_gate *gate, camera *cam, int layer_depth )
-{
+                           ent_gate *gate, camera *cam ){
    v3f viewdir, gatedir;
    m3x3_mulv( cam->transform, (v3f){0.0f,0.0f,-1.0f}, viewdir );
    q_mulv( gate->q[0], (v3f){0.0f,0.0f,-1.0f}, gatedir );
@@ -140,62 +140,42 @@ static int render_gate( world_instance *world, world_instance *world_inside,
    camera_finalize( &world_gates.cam );
 
    vg_line_point( world_gates.cam.transform[3], 0.3f, 0xff00ff00 );
-   {
-      shader_model_gate_use();
-      shader_model_gate_uPv( cam->mtx.pv );
-      shader_model_gate_uCam( cam->pos );
-      shader_model_gate_uColour( (v4f){0.0f,1.0f,0.0f,0.0f} );
-      shader_model_gate_uTime( vg.time*0.25f );
-      shader_model_gate_uInvRes( (v2f){
-            1.0f / (float)vg.window_x,
-            1.0f / (float)vg.window_y });
-
-      glEnable( GL_STENCIL_TEST );
-      glStencilOp( GL_KEEP, GL_KEEP, GL_REPLACE );  
-      glStencilFunc( GL_ALWAYS, 1, 0xFF ); 
-      glStencilMask( 0xFF );
-      glDisable( GL_CULL_FACE );
-
-      m4x3f mmdl;
-      ent_gate_get_mdl_mtx( gate, mmdl );
-      shader_model_gate_uMdl( mmdl );
-      
-      if( gate->flags & k_ent_gate_custom_mesh ){
-         mesh_bind( &world->mesh_no_collide );
-         for( u32 i=0; i<gate->submesh_count; i++ ){
-            mdl_submesh *sm = mdl_arritm( &world->meta.submeshs, 
-                                          gate->submesh_start+i );
-            mdl_draw_submesh( sm );
-         }
-      }
-      else {
-         mesh_bind( &world_gates.mesh );
-         mdl_draw_submesh( &world_gates.sm_surface );
-      }
 
-      glClear( GL_DEPTH_BUFFER_BIT );
-      glStencilFunc( GL_EQUAL, 1, 0xFF );
-      glStencilMask( 0x00 ); 
-      glEnable( GL_CULL_FACE );
+   shader_model_gate_use();
+   shader_model_gate_uPv( cam->mtx.pv );
+   shader_model_gate_uCam( cam->pos );
+   shader_model_gate_uColour( (v4f){0.0f,1.0f,0.0f,0.0f} );
+   shader_model_gate_uTime( vg.time*0.25f );
+   shader_model_gate_uInvRes( (v2f){
+         1.0f / (float)vg.window_x,
+         1.0f / (float)vg.window_y });
+
+   glEnable( GL_STENCIL_TEST );
+   glStencilOp( GL_KEEP, GL_KEEP, GL_REPLACE );  
+   glStencilFunc( GL_ALWAYS, 1, 0xFF ); 
+   glStencilMask( 0xFF );
+   glDisable( GL_CULL_FACE );
+
+   m4x3f mmdl;
+   ent_gate_get_mdl_mtx( gate, mmdl );
+   shader_model_gate_uMdl( mmdl );
+   
+   if( gate->flags & k_ent_gate_custom_mesh ){
+      mesh_bind( &world->mesh_no_collide );
+      for( u32 i=0; i<gate->submesh_count; i++ ){
+         mdl_submesh *sm = mdl_arritm( &world->meta.submeshs, 
+                                       gate->submesh_start+i );
+         mdl_draw_submesh( sm );
+      }
    }
-
-   render_world( world_inside, &world_gates.cam, layer_depth );
-
-   {
-      glDisable( GL_STENCIL_TEST );
-
-      render_water_texture( world_inside, &world_gates.cam, layer_depth );
-      render_fb_bind( gpipeline.fb_main, 1 );
-
-      glEnable( GL_STENCIL_TEST );
-
-      render_water_surface( world_inside, &world_gates.cam );
-
-      glStencilMask( 0xFF );
-      glStencilFunc( GL_ALWAYS, 1, 0xFF );
-      glDisable( GL_STENCIL_TEST );
+   else {
+      mesh_bind( &world_gates.mesh );
+      mdl_draw_submesh( &world_gates.sm_surface );
    }
 
+   render_world( world_inside, &world_gates.cam, 
+                 1, !localplayer.gate_waiting, 1, 1 );
+
    return 1;
 }
 
@@ -247,8 +227,7 @@ static int gate_intersect_plane( ent_gate *gate,
 /*
  * Intersect specific gate
  */
-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,8 +243,7 @@ static int gate_intersect( ent_gate *gate, v3f pos, v3f last )
 /* 
  * Intersect all gates in the world
  */
-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 );
 
@@ -273,19 +251,32 @@ static ent_gate *world_intersect_gates( world_instance *world,
       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( world_static.instances[gate->target].status 
+               != k_world_status_loaded )
             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;
 }
 
+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 );
+
+   if( call->function == 0 ){ /* unlock() */
+      gate->flags &= ~k_ent_gate_locked;
+   }
+   else {
+      vg_print_backtrace();
+      vg_error( "Unhandled function id: %u\n", call->function );
+   }
+}
+
+
 /* 
  * detatches any nonlocal gates 
  */
@@ -368,17 +359,4 @@ static void world_link_nonlocal_async( void *payload, u32 size ){
    }
 }
 
-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 );
-
-   if( call->function == 0 ){ /* unlock() */
-      gate->flags &= ~k_ent_gate_locked;
-   }
-   else {
-      vg_print_backtrace();
-      vg_error( "Unhandled function id: %u\n", call->function );
-   }
-}
-
 #endif /* WORLD_GATE_C */