X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gate.c;h=259260c0f006a3110409ec27d0fd7b5fc7c5e5ea;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=be339cf587603482e124053b3134090aeb99cdd0;hpb=6e96ba64e805ea8a39ca46171e28426c6bc86ab6;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_gate.c b/world_gate.c
index be339cf..259260c 100644
--- a/world_gate.c
+++ b/world_gate.c
@@ -17,6 +17,7 @@
 
 #include "world_water.h"
 #include "player_remote.h"
+#include "shaders/model_gate_unlinked.h"
 
 /*
  * Update the transform matrices for gate
@@ -45,6 +46,7 @@ static void world_gates_init(void)
    vg_info( "world_gates_init\n" );
 
    shader_model_gate_register();
+   shader_model_gate_unlinked_register();
 
    vg_linear_clear( vg_mem.scratch );
 
@@ -65,7 +67,7 @@ static void world_gates_init(void)
       world_gates.sm_marker[i] = *sm;
    }
 
-   mdl_async_load_glmesh( &mgate, &world_gates.mesh );
+   mdl_async_load_glmesh( &mgate, &world_gates.mesh, NULL );
    mdl_close( &mgate );
 }
 
@@ -78,6 +80,21 @@ static void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl ){
    }
 }
 
+static void render_gate_mesh( world_instance *world, ent_gate *gate ){
+   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 );
+   }
+}
+
 /*
  * Render the view through a gate
  */
@@ -154,24 +171,12 @@ static int render_gate( world_instance *world, world_instance *world_inside,
    glStencilOp( GL_KEEP, GL_KEEP, GL_REPLACE );  
    glStencilFunc( GL_ALWAYS, 1, 0xFF ); 
    glStencilMask( 0xFF );
-   glDisable( GL_CULL_FACE );
+   glEnable( 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 );
-   }
+   render_gate_mesh( world, gate );
 
    render_world( world_inside, &world_gates.cam, 
                  1, !localplayer.gate_waiting, 1, 1 );
@@ -179,6 +184,26 @@ static int render_gate( world_instance *world, world_instance *world_inside,
    return 1;
 }
 
+static void render_gate_unlinked( world_instance *world,
+                                  ent_gate *gate, camera *cam ){
+   m4x3f mmdl; m4x4f m4mdl;
+   ent_gate_get_mdl_mtx( gate, mmdl );
+   m4x3_expand( mmdl, m4mdl );
+   m4x4_mul( cam->mtx_prev.pv, m4mdl, m4mdl );
+
+   shader_model_gate_unlinked_use();
+   shader_model_gate_unlinked_uPv( cam->mtx.pv );
+   shader_model_gate_unlinked_uPvmPrev( m4mdl );
+   shader_model_gate_unlinked_uCam( cam->pos );
+   shader_model_gate_unlinked_uColour( (v4f){0.0f,1.0f,0.0f,0.0f} );
+   shader_model_gate_unlinked_uTime( vg.time*0.25f );
+   shader_model_gate_unlinked_uMdl( mmdl );
+
+   vg_line_point( gate->co[0], 0.1f, 0xffffff00 );
+
+   render_gate_mesh( world, gate );
+}
+
 /*
  * Intersect the plane of a gate with a line segment, plane coordinate result 
  * stored in 'where'
@@ -299,6 +324,7 @@ static void world_link_nonlocal_async( void *payload, u32 size ){
 
    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->flags & k_ent_gate_nonlocal) ) continue;
       if( gate->flags & k_ent_gate_linked ) continue;