X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=gate.h;h=fec28266caa1aaf176898565bfb52d488825a686;hb=86dbcd5796ed674ca9433cce1ace8bef322cd121;hp=7088c7dc5c236dc03223e5b3948904a6011278d0;hpb=dfee9022b3513fddec36f7ea70867ee5961a44da;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/gate.h b/gate.h
index 7088c7d..fec2826 100644
--- a/gate.h
+++ b/gate.h
@@ -1,13 +1,12 @@
 #ifndef GATE_H
 #define GATE_H
 
-#define VG_3D
-#include "vg/vg.h"
+#include "common.h"
 #include "model.h"
 #include "render.h"
 #include "shaders/gate.h"
 #include "shaders/gatelq.h"
-#include "water.h"
+#include "world_water.h"
 
 typedef struct teleport_gate teleport_gate;
 
@@ -62,8 +61,8 @@ static void gate_init(void)
 {
    fb_init( &grender.fb );
 
-   model *mgate = vg_asset_read( "models/rs_gate.mdl" );
-   model_unpack( mgate, &grender.mdl );
+   mdl_header *mgate = mdl_load( "models/rs_gate.mdl" );
+   mdl_unpack_glmesh( mgate, &grender.mdl );
    free( mgate );
 }
 
@@ -72,20 +71,19 @@ static void gate_fb_resize(void)
    fb_resize( &grender.fb );
 }
 
-static void render_gate( teleport_gate *gate, m4x3f camera )
+static int render_gate( teleport_gate *gate, v3f viewpos, m4x3f camera )
 {
-   v3f viewpos, viewdir, gatedir;
-   v3_copy( camera[3], viewpos );
+   v3f viewdir, gatedir;
    m3x3_mulv( camera, (v3f){0.0f,0.0f,-1.0f}, viewdir );
    m3x3_mulv( gate->to_world, (v3f){0.0f,0.0f,-1.0f}, gatedir );
 
    v3f v0;
    v3_sub( viewpos, gate->co[0], v0 );
    if( v3_dot(v0, gatedir) >= 0.0f )
-      return;
+      return 0;
 
    if( v3_dist( viewpos, gate->co[0] ) > 100.0f )
-      return;
+      return 0;
 
    v3f a,b,c,d;
 
@@ -162,7 +160,7 @@ static void render_gate( teleport_gate *gate, m4x3f camera )
    }
 
    render_world( projection, cam_new );
-   
+
    if( grender.high_qual )
    {
       /*
@@ -202,10 +200,20 @@ static void render_gate( teleport_gate *gate, m4x3f camera )
    }
    else
    {
+      glDisable( GL_STENCIL_TEST );
+
+      render_water_texture( cam_new );
+      fb_use( NULL );
+      glEnable( GL_STENCIL_TEST );
+
+      render_water_surface( projection, cam_new );
+
       glStencilMask( 0xFF );
       glStencilFunc( GL_ALWAYS, 1, 0xFF );
       glDisable( GL_STENCIL_TEST );
    }
+
+   return 1;
 }
 
 static int gate_intersect( teleport_gate *gate, v3f pos, v3f last )
@@ -224,7 +232,7 @@ static int gate_intersect( teleport_gate *gate, v3f pos, v3f last )
 
    float d = v3_dot(surface, v0);
 
-   if( fabsf(d) > 0.00001f )
+   if( d > 0.00001f )
    {
       float t = v3_dot(delta, surface) / d;
       if( t >= 0.0f && t <= l )