X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=9ae654e27937333728d5db924b404edb88723176;hb=d13f2700b1773551307685cc7c34c804ccd6d664;hp=e8c47d22085b8edad828aeccdaac3082739d97a0;hpb=1c97cb161f885ad24d3356d92c8f4fd0e252bc61;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index e8c47d2..9ae654e 100644
--- a/world.h
+++ b/world.h
@@ -5,16 +5,19 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit );
 #ifndef WORLD_H
 #define WORLD_H
 
+#include "vg/vg_loader.h"
+
+#include "network.h"
+#include "network_msg.h"
 #include "scene.h"
 #include "terrain.h"
 #include "render.h"
-#include "water.h"
 #include "rigidbody.h"
-#include "gate.h"
 #include "bvh.h"
 #include "lighting.h"
 #include "model.h"
-#include "traffic.h"
+
+#include "traffic.h" /*TODO: -> world_traffic.h */
 
 #include "shaders/terrain.h"
 #include "shaders/sky.h"
@@ -23,9 +26,26 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit );
 #include "shaders/vblend.h"
 #include "shaders/gpos.h"
 #include "shaders/fscolour.h"
+#include "shaders/alphatest.h"
+
+enum { k_max_ui_segments = 8 };
+enum { k_max_ui_splits_per_segment = 16 };
+
+enum { k_max_ui_elements = k_max_ui_segments*k_max_ui_splits_per_segment };
+enum { k_max_element_verts = 10 };
+enum { k_max_element_indices = 20 };
+
+enum { k_route_ui_max_verts = k_max_ui_elements*k_max_element_verts };
+enum { k_route_ui_max_indices = k_max_ui_elements*k_max_element_indices };
 
 static struct gworld
 {
+   struct subworld_gen
+   {
+      
+   }
+   subworld_gen;
+
    /* gameplay */
    struct respawn_point
    {
@@ -36,24 +56,141 @@ static struct gworld
    spawns[32];
    u32 spawn_count;
 
-   teleport_gate gates[64];
-   u32 gate_count;
+   struct subworld_routes
+   {
+      struct route_node
+      {
+         v3f co, right, up, h;
+         u32 next[2];
+
+         u32 special_type, special_id, current_refs, ref_count;
+         u32 route_ids[4];    /* Gates can be linked into up to four routes */
+      }
+      *nodes;
+
+      u32 node_count,
+          node_cap;
+
+      struct route
+      {
+         u32 track_id;
+         v4f colour;
+
+         u32 start;
+         mdl_submesh sm;
+         
+         int active;
+         float factive;
+
+         double best_lap, latest_pass; /* Session */
+
+         struct 
+         {
+            GLuint vao, vbo, ebo;
+
+            u32  indices_head;
+            u32  vertex_head;
+
+            float last_notch;
+
+            struct route_ui_segment
+            {
+               float length;
+               u32 vertex_start, vertex_count,
+                   index_start, index_count, notches;
+            }
+            segments[k_max_ui_segments];
+
+            u32 segment_start, segment_count, fade_start, fade_count;
+            double fade_timer_start;
+            float xpos;
+         }
+         ui;
+
+         m4x3f scoreboard_transform;
+      }
+      *routes;
+
+      double last_interaction;
+
+      u32 route_count,
+          route_cap;
+
+      struct route_gate
+      {
+         struct teleport_gate
+         { 
+            v3f co[2];
+            v4f q[2];
+            v2f dims;
+
+            m4x3f to_world, recv_to_world, transport;
+         } 
+         gate;
+         
+         u32 node_id;
+
+         struct route_timing
+         {
+            u32 version; /* Incremented on every teleport */
+            double time;
+         } 
+         timing;
+      }
+      *gates;
+
+      struct route_collector
+      {
+         struct route_timing timing;
+      }
+      *collectors;
+
+      u32 gate_count,
+          gate_cap,
+          collector_count,
+          collector_cap;
+
+      u32 active_gate,
+          current_run_version;
+
+      scene scene_lines;
+   }
+   routes;
+
+   struct subworld_sfd
+   {
+      scene mesh;
+      mdl_submesh *sm_module, *sm_card;
+      glmesh temp;
+
+      struct sfd_instance
+      {
+         float *buffer;
+
+         u32 w,h;
+      } 
+      tester;
+   }
+   sfd;
 
    /* Paths */
    traffic_node traffic[128];
    u32 traffic_count;
 
+#if 0
    traffic_driver van_man[6];
+#endif
    
    /* Physics */
-   rigidbody temp_rbs[128];
-   u32 rb_count;
    
    /* Rendering & geometry */
    scene geo, foliage;
    rigidbody rb_geo;
 
-   mdl_submesh sm_geo_std_oob, sm_geo_std, sm_geo_vb;
+   /* TODO Maybe make this less hardcoded */
+   mdl_submesh sm_geo_std_oob, sm_geo_std, sm_geo_vb,
+               sm_foliage_main, sm_foliage_alphatest,
+               sm_graffiti, sm_subworld, sm_terrain;
 
    glmesh skybox, skydome;
    mdl_submesh dome_upper, dome_lower;
@@ -61,8 +198,6 @@ static struct gworld
    glmesh cars;
    mdl_submesh car_holden;
 
-   rigidbody mr_ball;
-
    /* Load time */
 
    struct instance_cache
@@ -73,598 +208,162 @@ static struct gworld
    * instance_cache;
    u32 instance_cache_count,
        instance_cache_cap;
+
+   v3f render_gate_pos;
+   int active_route_board;
 }
 world;
 
-vg_tex2d tex_terrain_colours = { .path = "textures/gradients.qoi",
-                                 .flags = VG_TEXTURE_CLAMP|VG_TEXTURE_NEAREST };
-
-vg_tex2d tex_terrain_noise = { .path = "textures/garbage.qoi",
-                                 .flags = VG_TEXTURE_NEAREST };
-
-static void ray_world_get_tri( ray_hit *hit, v3f tri[3] )
-{
-   for( int i=0; i<3; i++ )
-      v3_copy( world.geo.verts[ hit->tri[i] ].co, tri[i] );
-}
+/*
+ * API
+ */
 
-static int ray_world( v3f pos, v3f dir, ray_hit *hit )
-{
-   return scene_raycast( &world.geo, pos, dir, hit );
-}
+static int ray_hit_is_ramp( ray_hit *hit );
+static int ray_hit_is_terrain( ray_hit *hit );
+static void ray_world_get_tri( ray_hit *hit, v3f tri[3] );
+static int ray_world( v3f pos, v3f dir, ray_hit *hit );
 
-static int ray_hit_is_ramp( ray_hit *hit )
-{
-   return hit->tri[0] > world.sm_geo_std_oob.vertex_count;
-}
+/*
+ * Submodules
+ */
+#include "world_routes.h"
+#include "world_sfd.h"
+#include "world_render.h"
+#include "world_water.h"
+#include "world_gen.h"
+#include "world_gate.h"
+
+/* 
+ * -----------------------------------------------------------------------------
+ *                                    Events
+ * -----------------------------------------------------------------------------
+ */
 
-static void world_register(void)
+static void world_init(void)
 {
    shader_terrain_register();
    shader_sky_register();
    shader_planeinf_register();
    shader_gpos_register();
    shader_fscolour_register();
-}
+   shader_alphatest_register();
 
-static void world_free(void)
-{
-   /* TODO.. */
-}
+   vg_info( "Loading world resources\n" );
 
-static void render_world_depth( m4x4f projection, m4x3f camera );
+   VG_REQUIRED_ASSET( mdl_header*, mcars, mdl_load, "models/rs_cars.mdl" );
+   VG_REQUIRED_ASSET( mdl_header*, msky,  mdl_load, "models/rs_skydome.mdl" );
 
-static void add_all_if_material( m4x3f transform, scene *pscene, 
-                                 mdl_header *mdl, u32 id )
-{
-   for( int i=0; i<mdl->node_count; i++ )
-   {
-      mdl_node *pnode = mdl_node_from_id( mdl, i );
-
-      for( int j=0; j<pnode->submesh_count; j++ )
-      {
-         mdl_submesh *sm = mdl_node_submesh( mdl, pnode, j );
+   mdl_node *nholden = mdl_node_from_name( mcars, "holden" );
+   world.car_holden = *mdl_node_submesh( mcars, nholden, 0 );
 
-         if( sm->material_id == id )
-         {
-            m4x3f transform2;
-            mdl_node_transform( pnode, transform2 );
-            m4x3_mul( transform, transform2, transform2 );
+   mdl_node *nlower = mdl_node_from_name( msky, "dome_lower" ),
+            *nupper = mdl_node_from_name( msky, "dome_upper" );
+   
+   world.dome_lower = *mdl_node_submesh( msky, nlower, 0 );
+   world.dome_upper = *mdl_node_submesh( msky, nupper, 0 );
 
-            scene_add_submesh( pscene, mdl, sm, transform2 );
-         }
-      }
+   vg_acquire_thread_sync();
+   {
+      mdl_unpack_glmesh( mcars, &world.cars );
+      mdl_unpack_glmesh( msky, &world.skydome );
+   }
+   vg_release_thread_sync();
 
-      if( pnode->classtype == k_classtype_instance )
-      {
-         if( pnode->sub_uid )
-         {
-            u32 instance_id = pnode->sub_uid -1;
-            struct instance_cache *cache = &world.instance_cache[instance_id];
-            mdl_header *mdl2 = cache->mdl;
+   vg_free(mcars);
+   vg_free(msky);
 
-            m4x3f transform2;
-            mdl_node_transform( pnode, transform2 );
-            m4x3_mul( transform, transform2, transform2 );
+   /* Other systems */
+   vg_info( "Loading other world systems\n" );
 
-            add_all_if_material( transform2, pscene, mdl2, id );
-         }
-      }
-   }
+   vg_loader_highwater( world_render_init, world_render_free, NULL );
+   vg_loader_highwater( world_sfd_init, world_sfd_free, NULL );
+   vg_loader_highwater( world_water_init, world_water_free, NULL );
+   vg_loader_highwater( world_gates_init, world_gates_free, NULL );
+   vg_loader_highwater( world_routes_init, world_routes_free, NULL );
 }
 
-static void world_apply_foliage(void)
+static void world_free( void *_ )
 {
-   scene_init( &world.foliage );
-   mdl_header *mfoliage = mdl_load("models/rs_foliage.mdl");
-
-   v3f volume;
-   v3_sub( world.geo.bbx[1], world.geo.bbx[0], volume );
-   volume[1] = 1.0f;
-
-   m4x3f transform;
-   mdl_node *mblob = mdl_node_from_name( mfoliage, "blob" );
-   mdl_submesh *sm_blob = mdl_node_submesh( mfoliage, mblob, 0 );
-
-   for( int i=0;i<100000;i++ )
-   {
-      v3f pos;
-      v3_mul( volume, (v3f){ vg_randf(), 1000.0f, vg_randf() }, pos );
-      pos[1] = 1000.0f;
-      v3_add( pos, world.geo.bbx[0], pos );
-      
-      ray_hit hit;
-      hit.dist = INFINITY;
-
-      if( ray_world( pos, (v3f){0.0f,-1.0f,0.0f}, &hit ))
-      {
-         if( hit.normal[1] > 0.8f && !ray_hit_is_ramp(&hit) &&
-             hit.pos[1] > water_height()+10.0f )
-         {
-            v4f qsurface, qrandom;
-            v3f axis;
-
-            v3_cross( (v3f){0.0f,1.0f,0.0f}, hit.normal, axis );
-
-            float angle = v3_dot(hit.normal,(v3f){0.0f,1.0f,0.0f});
-            q_axis_angle( qsurface, axis, angle );
-            q_axis_angle( qrandom, (v3f){0.0f,1.0f,0.0f}, vg_randf()*VG_TAUf );
-            q_mul( qsurface, qrandom, qsurface );
-            q_m3x3( qsurface, transform );
-
-            v3_copy( hit.pos, transform[3] );
-            scene_add_submesh( &world.foliage, mfoliage, sm_blob, transform);
-         }
-      }
-   }
-
-   scene_upload( &world.foliage );
-   free( mfoliage );
+   mesh_free( &world.cars );
+   mesh_free( &world.skydome );
 }
 
-static void world_load(void)
+static void world_update( v3f pos )
 {
-   mdl_header *mworld = mdl_load( "models/mp_dev.mdl" );
-
-   world.spawn_count = 0;
-   world.gate_count = 0;
-   world.rb_count = 0;
-   world.traffic_count = 0;
-   world.instance_cache = NULL;
+   world_routes_update();
+   world_routes_debug();
    
-   /*
-    * Process entities
-    */
-   for( int i=0; i<mworld->node_count; i++ )
+   int closest = 0;
+   float min_dist = INFINITY;
+
+   for( int i=0; i<world.routes.route_count; i++ )
    {
-      mdl_node *pnode = mdl_node_from_id( mworld, i );
-      
-      if( pnode->classtype == k_classtype_none )
-      {}
-      else if( pnode->classtype == k_classtype_gate )
-      {
-         struct classtype_gate *entgate = mdl_get_entdata( mworld, pnode );
+      float d = v3_dist2( world.routes.routes[i].scoreboard_transform[3], pos );
 
-         if( entgate->target )
-         {
-            mdl_node *pother = mdl_node_from_id( mworld, entgate->target );
-            
-            teleport_gate *gate = &world.gates[ world.gate_count ++ ];
-            
-            v3_copy( pnode->co,  gate->co[0] );
-            v3_copy( pother->co, gate->co[1] );
-            v4_copy( pnode->q,   gate->q[0] );
-            v4_copy( pother->q,  gate->q[1] );
-            v2_copy( pnode->s,   gate->dims );
-
-            gate_transform_update( gate );
-         }
-      }
-      else if( pnode->classtype == k_classtype_block )
+      if( d < min_dist )
       {
-         struct classtype_block *block = mdl_get_entdata( mworld, pnode );
-
-         m4x3f transform;
-         mdl_node_transform( pnode, transform );
-
-         rigidbody *rb = &world.temp_rbs[ world.rb_count ++ ];
-
-         box_copy( block->bbx, rb->bbx ); /* TODO: apply scale */
-         v3_copy( pnode->co, rb->co );
-         rb_init( rb );
-         v4_copy( pnode->q, rb->q );
-         rb_update_transform( rb );
+         min_dist = d;
+         closest = i;
       }
-      else if( pnode->classtype == k_classtype_spawn )
-      {
-         struct respawn_point *rp = &world.spawns[ world.spawn_count ++ ];
+   }
 
-         v3_copy( pnode->co, rp->co );
-         v4_copy( pnode->q, rp->q );
-         strcpy( rp->name, mdl_pstr( mworld, pnode->pstr_name ) );
-      }
-      else if( pnode->classtype == k_classtype_water )
-      {
-         if( wrender.enabled )
-         {
-            vg_warn( "Multiple water surfaces in level! ('%s')\n", 
-                  mdl_pstr( mworld, pnode->pstr_name ));
-            continue;
-         }
+   if( (world.active_route_board != closest) || network_scores_updated )
+   {
+      network_scores_updated = 0;
+      world.active_route_board = closest;
+      struct subworld_sfd *sfd = &world.sfd;
 
-         mdl_submesh *sm = mdl_node_submesh( mworld, pnode, 0 );
-         
-         if( sm )
-         {
-            glmesh surf;
-            mdl_unpack_submesh( mworld, &surf, sm );
-            water_init();
-            water_set_surface( &surf, pnode->co[1] );
-         }
-      }
-      else if( pnode->classtype == k_classtype_car_path )
-      {
-         struct classtype_car_path *p = mdl_get_entdata( mworld, pnode );
-         traffic_node *tn = &world.traffic[ world.traffic_count ];
-         tn->mn_next = NULL;
-         tn->mn_next1 = NULL;
-         
-         if( p->target ) tn->mn_next = mdl_node_from_id( mworld, p->target );
-         if( p->target1 ) tn->mn_next1 = mdl_node_from_id( mworld, p->target1 );
+      struct route *route = &world.routes.routes[closest];
 
-         m4x3f transform;
-         mdl_node_transform( pnode, transform );
-         m3x3_mulv( transform, (v3f){1.0f,0.0f,0.0f}, tn->h );
-         v3_copy( transform[3], tn->co );
+      u32 id = route->track_id;
 
-         pnode->sub_uid = world.traffic_count ++;
-      }
-      else if( pnode->classtype == k_classtype_instance )
+      if( id != 0xffffffff )
       {
-         struct classtype_instance *inst = mdl_get_entdata( mworld, pnode );
-         pnode->sub_uid = 0;
-         
-         int cached = 0;
-         for( int i=0; i<world.instance_cache_count; i++ )
-         {
-            struct instance_cache *cache = &world.instance_cache[i];
-            if( inst->pstr_file == cache->pstr_file )
-            {
-               cached = 1;
-               pnode->sub_uid = i+1;
-               break;
-            }
-         }
+         struct netmsg_board *local_board = &scoreboard_client_data.boards[id];
 
-         if( !cached )
+         for( int i=0; i<13; i++ )
          {
-            world.instance_cache = buffer_reserve( 
-                            world.instance_cache, world.instance_cache_count,
-                            &world.instance_cache_cap, 1, 
-                            sizeof(struct instance_cache) );
-
-            struct instance_cache *cache = 
-               &world.instance_cache[world.instance_cache_count];
-
-            const char *filename = mdl_pstr(mworld, inst->pstr_file);
-
-            cache->pstr_file = inst->pstr_file;
-            cache->mdl = mdl_load( filename );
-
-            if( cache->mdl )
-            {
-               world.instance_cache_count ++;
-               pnode->sub_uid = world.instance_cache_count;
-               mdl_link_materials( mworld, cache->mdl );
-               vg_success( "Cached %s\n", filename );
-            }
-            else
-            {
-               vg_warn( "Failed to cache %s\n", filename );
-            }
+            sfd_encode( &sfd->tester, i, &local_board->data[27*i] );
          }
       }
    }
    
-   world.instance_cache = buffer_fix( world.instance_cache, 
-                                      world.instance_cache_count,
-                                     &world.instance_cache_cap,
-                                     sizeof( struct instance_cache ) );
-
-   traffic_finalize( world.traffic, world.traffic_count );
-   for( int i=0; i<vg_list_size(world.van_man); i++ )
-      world.van_man[i].current =&world.traffic[vg_randint(world.traffic_count)];
-
-   /* 
-    * Compile meshes into the world scenes
-    */
-   scene_init( &world.geo );
-
-   u32 mat_surf = 0,
-       mat_surf_oob = 0,
-       mat_vertex_blend = 0;
-
-   for( int i=1; i<mworld->material_count; i++ )
-   {
-      mdl_material *mat = mdl_material_from_id( mworld, i );
-      const char *mat_name = mdl_pstr( mworld, mat->pstr_name );
-
-      if( !strcmp( "surf", mat_name ))
-         mat_surf = i;
-      else if( !strcmp( "surf_oob", mat_name ))
-         mat_surf_oob = i;
-      else if( !strcmp( "vertex_blend", mat_name ))
-         mat_vertex_blend = i;
-   }
-
-   vg_info( "surf %d\noob %d\nvert_blend %d\n", mat_surf, mat_surf_oob,
-                                                mat_vertex_blend );
-
-   m4x3f midentity;
-   m4x3_identity( midentity );
-
-   if( mat_surf_oob )
-      add_all_if_material( midentity, &world.geo, mworld, mat_surf_oob );
-   else
-      vg_warn( "No OOB surface\n" );
-   scene_copy_slice( &world.geo, &world.sm_geo_std_oob );
-
-   if( mat_surf )
-      add_all_if_material( midentity, &world.geo, mworld, mat_surf );
-   scene_copy_slice( &world.geo, &world.sm_geo_std );
-
-   if( mat_vertex_blend )
-      add_all_if_material( midentity, &world.geo, mworld, mat_vertex_blend );
-   scene_copy_slice( &world.geo, &world.sm_geo_vb );
-
-   scene_upload( &world.geo );
-   scene_bh_create( &world.geo );
-
-   world_apply_foliage();
-   free( world.instance_cache );
-   free( mworld );
-
-   /* 
-    * Rendering the depth map
-    */
-   m4x4f ortho;
-   m4x3f camera;
-
-   v3f extent;
-   v3_sub( world.geo.bbx[1], world.geo.bbx[0], extent );
-
-   float fl = world.geo.bbx[0][0],
-         fr = world.geo.bbx[1][0],
-         fb = world.geo.bbx[0][2],
-         ft = world.geo.bbx[1][2],
-         rl = 1.0f / (fr-fl),
-         tb = 1.0f / (ft-fb);
-
-   m4x4_zero( ortho );
-	ortho[0][0] = 2.0f * rl;
-	ortho[2][1] = 2.0f * tb;
-   ortho[3][0] = (fr + fl) * -rl;
-   ortho[3][1] = (ft + fb) * -tb;
-   ortho[3][3] = 1.0f;
-   m4x3_identity( camera );
-
-   glViewport( 0, 0, 1024, 1024 );
-   glDisable(GL_DEPTH_TEST);
-   glBindFramebuffer( GL_FRAMEBUFFER, gpipeline.fb_depthmap );
-   shader_fscolour_use();
-   shader_fscolour_uColour( (v4f){-9999.0f,-9999.0f,-9999.0f,-9999.0f} );
-   render_fsquad();
-
-   glEnable(GL_BLEND);
-   glBlendFunc(GL_ONE, GL_ONE);
-   glBlendEquation(GL_MAX);
-   render_world_depth( ortho, camera );
-   glDisable(GL_BLEND);
-   glEnable(GL_DEPTH_TEST);
-
-   /* 
-    * TODO: World settings entity
-    */
-   struct ub_world_lighting *winfo = &gpipeline.ub_world_lighting;
-   v4_copy( wrender.plane, winfo->g_water_plane );
-
-   v4f bounds;
-   bounds[0] = world.geo.bbx[0][0];
-   bounds[1] = world.geo.bbx[0][2];
-   bounds[2] = 1.0f/ (world.geo.bbx[1][0]-world.geo.bbx[0][0]);
-   bounds[3] = 1.0f/ (world.geo.bbx[1][2]-world.geo.bbx[0][2]);
-   v4_copy( bounds, winfo->g_depth_bounds );
-
-   winfo->g_water_fog = 0.04f;
-   render_update_lighting_ub();
-   
-
-   world.mr_ball.type = k_rb_shape_sphere;
-   world.mr_ball.inf.sphere.radius = 2.0f;
-   v3_copy( (v3f){ 0.0f, 110.0f, 0.0f }, world.mr_ball.co );
-
-   q_identity(world.mr_ball.q);
-   rb_init( &world.mr_ball );
-}
-
-static void world_init(void)
-{
-   vg_tex2d_init( (vg_tex2d *[]){ &tex_terrain_colours, 
-                                  &tex_terrain_noise }, 2 );
-
-   mdl_header *mcars = mdl_load( "models/rs_cars.mdl" );
-   mdl_unpack_glmesh( mcars, &world.cars );
-   mdl_node *nholden = mdl_node_from_name( mcars, "holden" );
-   world.car_holden = *mdl_node_submesh( mcars, nholden, 0 );
-   free(mcars);
-
-
-   mdl_header *msky = mdl_load("models/rs_skydome.mdl");
-   mdl_unpack_glmesh( msky, &world.skydome );
-
-   mdl_node *nlower = mdl_node_from_name( msky, "dome_lower" ),
-            *nupper = mdl_node_from_name( msky, "dome_upper" );
-   
-   world.dome_lower = *mdl_node_submesh( msky, nlower, 0 );
-   world.dome_upper = *mdl_node_submesh( msky, nupper, 0 );
-   free(msky);
-
-   /*
-    * Setup scene collider 
-    */
-   v3_zero( world.rb_geo.co );
-   q_identity( world.rb_geo.q );
-
-   world.rb_geo.type = k_rb_shape_scene;
-   world.rb_geo.inf.scene.pscene = &world.geo;
-   world.rb_geo.is_world = 1;
-   rb_init( &world.rb_geo );
-}
-
-static void world_update(void)
-{
-#if 0
-   rb_solver_reset();
-   rb_build_manifold_terrain_sphere( &world.mr_ball );
-   
-   for( int i=0; i<5; i++ )
-      rb_solve_contacts( rb_contact_buffer, rb_contact_count );
-
-   rb_iter( &world.mr_ball );
-   rb_update_transform( &world.mr_ball );
-   rb_debug( &world.mr_ball, 0 );
-#endif
-
-   for( int i=0; i<vg_list_size(world.van_man); i++ )
-   {
-      traffic_drive( &world.van_man[i] );
-      traffic_visualize_car( &world.van_man[i] );
-   }
+   sfd_update( &world.sfd.tester );
 }
 
-/*
- * Rendering
+/* 
+ * -----------------------------------------------------------------------------
+ *                              API implementation
+ * -----------------------------------------------------------------------------
  */
 
-static void bind_terrain_textures(void)
-{
-   vg_tex2d_bind( &tex_terrain_noise, 0 );
-   vg_tex2d_bind( &tex_terrain_colours, 1 );
-}
-
-static void render_world_vb( m4x4f projection, v3f camera )
-{
-   m4x3f identity_matrix;
-   m4x3_identity( identity_matrix );
-
-   shader_vblend_use();
-   shader_vblend_uTexGarbage(0);
-   shader_vblend_uTexGradients(1);
-   shader_link_standard_ub( _shader_vblend.id, 2 );
-   bind_terrain_textures();
-
-   shader_vblend_uPv( projection );
-   shader_vblend_uMdl( identity_matrix );
-   shader_vblend_uCamera( camera );
-
-   scene_bind( &world.geo );
-   mdl_draw_submesh( &world.sm_geo_vb );
-
-   mesh_bind( &world.cars );
-
-   for( int i=0; i<vg_list_size(world.van_man); i++ )
-   {
-      shader_vblend_uMdl( world.van_man[i].transform );
-      mdl_draw_submesh( &world.car_holden );
-   }
-}
-
-static void render_terrain( m4x4f projection, v3f camera )
+static void ray_world_get_tri( ray_hit *hit, v3f tri[3] )
 {
-   m4x3f identity_matrix;
-   m4x3_identity( identity_matrix );
-
-   shader_terrain_use();
-   shader_terrain_uTexGarbage(0);
-   shader_terrain_uTexGradients(1);
-   shader_link_standard_ub( _shader_terrain.id, 2 );
-   bind_terrain_textures();
-
-   shader_terrain_uPv( projection );
-   shader_terrain_uMdl( identity_matrix );
-   shader_terrain_uCamera( camera );
-
-   scene_bind( &world.geo );
-   mdl_draw_submesh( &world.sm_geo_std_oob );
-   mdl_draw_submesh( &world.sm_geo_std );
-
-   glDisable(GL_CULL_FACE);
-   scene_bind( &world.foliage );
-   scene_draw( &world.foliage );
-   glEnable(GL_CULL_FACE);
+   for( int i=0; i<3; i++ )
+      v3_copy( world.geo.verts[ hit->tri[i] ].co, tri[i] );
 }
 
-static void render_lowerdome( m4x3f camera )
+static int ray_world( v3f pos, v3f dir, ray_hit *hit )
 {
-   m4x4f projection, full;
-   pipeline_projection( projection, 0.4f, 1000.0f );
-
-   m4x3f inverse;
-   m3x3_transpose( camera, inverse );
-   v3_copy((v3f){0.0f,0.0f,0.0f}, inverse[3]);
-   m4x3_expand( inverse, full );
-   m4x4_mul( projection, full, full );
-
-   m4x3f identity_matrix;
-   m4x3_identity( identity_matrix );
-   
-   shader_planeinf_use();
-   shader_planeinf_uMdl(identity_matrix);
-   shader_planeinf_uPv(full);
-   shader_planeinf_uCamera(camera[3]);
-   shader_planeinf_uPlane( (v4f){0.0f,1.0f,0.0f, water_height()} );
-   
-   mdl_draw_submesh( &world.dome_lower );
+   return scene_raycast( &world.geo, pos, dir, hit );
 }
 
-static void render_sky(m4x3f camera)
+static int ray_hit_is_terrain( ray_hit *hit )
 {
-   m4x4f projection, full;
-   pipeline_projection( projection, 0.4f, 1000.0f );
+   u32 valid_start = 0,
+       valid_end   = world.sm_terrain.vertex_count;
 
-   m4x3f inverse;
-   m3x3_transpose( camera, inverse );
-   v3_copy((v3f){0.0f,0.0f,0.0f}, inverse[3]);
-   m4x3_expand( inverse, full );
-   m4x4_mul( projection, full, full );
-
-   m4x3f identity_matrix;
-   m4x3_identity( identity_matrix );
-   
-   shader_sky_use();
-   shader_sky_uMdl(identity_matrix);
-   shader_sky_uPv(full);
-   shader_sky_uTexGarbage(0);
-   shader_sky_uTime( vg_time );
-
-   vg_tex2d_bind( &tex_terrain_noise, 0 );
-
-   glDepthMask( GL_FALSE );
-   glDisable( GL_DEPTH_TEST );
-
-   mesh_bind( &world.skydome );
-   mdl_draw_submesh( &world.dome_upper );
-   
-   glEnable( GL_DEPTH_TEST );
-   glDepthMask( GL_TRUE );
-}
-
-static void render_world( m4x4f projection, m4x3f camera )
-{
-   render_sky( camera );
-   render_world_vb( projection, camera[3] );
-   render_terrain( projection, camera[3] );
+   return (hit->tri[0] >= valid_start) &&
+          (hit->tri[0]  < valid_end);
 }
 
-static void render_world_depth( m4x4f projection, m4x3f camera )
+static int ray_hit_is_ramp( ray_hit *hit )
 {
-   m4x3f identity_matrix;
-   m4x3_identity( identity_matrix );
+   u32 valid_start = world.sm_geo_std.vertex_start,
+       valid_end   = world.sm_geo_vb.vertex_start;
 
-   shader_gpos_use();
-   shader_gpos_uCamera( camera[3] );
-   shader_gpos_uPv( projection );
-   shader_gpos_uMdl( identity_matrix );
-   
-   scene_bind( &world.geo );
-   scene_draw( &world.geo );
-
-#if 0
-   glDisable(GL_CULL_FACE);
-   scene_bind( &world.foliage );
-   scene_draw( &world.foliage );
-   glEnable(GL_CULL_FACE);
-#endif
+   return (hit->tri[0] >= valid_start) &&
+          (hit->tri[0]  < valid_end);
 }
 
 #endif /* WORLD_H */