X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=8b1b1dc079ff159e06e6197837f0637e4a6a1e46;hb=47941822dae18a018c985847b052e70214a3ccc6;hp=cf721e8402c097d95bcc5a5ba274acb9c43f0a5a;hpb=cedb92d590f4578a246a09a96c0fa0eda109d3c7;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index cf721e8..8b1b1dc 100644
--- a/world.h
+++ b/world.h
@@ -1,27 +1,24 @@
+/*
+ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ */
+
 #include "common.h"
 
-static int ray_world( v3f pos, v3f dir, ray_hit *hit );
+VG_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" /*TODO: -> world_traffic.h */
-#include "world_routes.h"
-#include "world_sfd.h"
-#include "world_audio.h"
-#include "network.h"
-#include "network_msg.h"
-
 #include "shaders/terrain.h"
 #include "shaders/sky.h"
 #include "shaders/planeinf.h"
@@ -31,535 +28,383 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit );
 #include "shaders/fscolour.h"
 #include "shaders/alphatest.h"
 
-static struct gworld
-{
-   /* gameplay */
-   struct respawn_point
-   {
-      v3f co;
-      v4f q;
-      char name[32];
-   }
-   spawns[32];
-   u32 spawn_count;
-
-   struct subworld_routes routes;
-   struct subworld_sfd sfd;
-
-   /* Paths */
-   traffic_node traffic[128];
-   u32 traffic_count;
-
-#if 0
-   traffic_driver van_man[6];
-#endif
-   
-   /* Physics */
-   
-   /* Rendering & geometry */
-   scene geo, foliage;
-   rigidbody rb_geo;
-
-   /* 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;
-
-   glmesh cars;
-   mdl_submesh car_holden;
+typedef struct teleport_gate teleport_gate;
 
-   rigidbody mr_ball;
+enum { k_max_ui_segments = 8 };
 
-   /* Load time */
+enum { k_max_ui_elements = k_max_ui_segments };
+enum { k_max_element_verts = 10 };
+enum { k_max_element_indices = 20 };
 
-   struct instance_cache
-   {
-      mdl_header *mdl;
-      u32 pstr_file;
-   }
-   * instance_cache;
-   u32 instance_cache_count,
-       instance_cache_cap;
+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 };
 
-   v3f render_gate_pos;
-   int active_route_board;
-}
-world;
-
-static struct subworld_routes *subworld_routes(void) { return &world.routes; }
-static struct subworld_sfd *subworld_sfd(void) { return &world.sfd; }
-
-
-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 };
-
-vg_tex2d tex_alphatest = { .path = "textures/alphatest.qoi",
-                                 .flags = VG_TEXTURE_NEAREST };
-
-vg_tex2d tex_graffiti = { .path = "textures/graffitibox.qoi",
-                                 .flags = VG_TEXTURE_NEAREST };
-
-static void ray_world_get_tri( ray_hit *hit, v3f tri[3] )
+enum logic_type
 {
-   for( int i=0; i<3; i++ )
-      v3_copy( world.geo.verts[ hit->tri[i] ].co, tri[i] );
-}
+   k_logic_type_relay         = 1,
+   k_logic_type_chance        = 2,
+   k_logic_type_achievement   = 3
+};
 
-static int ray_world( v3f pos, v3f dir, ray_hit *hit )
+VG_STATIC struct gworld
 {
-   return scene_raycast( &world.geo, pos, dir, hit );
-}
-
-static int ray_hit_is_terrain( ray_hit *hit )
-{
-   u32 valid_start = 0,
-       valid_end   = world.sm_terrain.vertex_count;
+   /*
+    * Allocated as system memory
+    * --------------------------------------------------------------------------
+    */
 
-   return (hit->tri[0] >= valid_start) &&
-          (hit->tri[0]  < valid_end);
-}
+   /* rendering */
+   glmesh skydome;
+   mdl_submesh dome_upper, dome_lower;
 
-static int ray_hit_is_ramp( ray_hit *hit )
-{
-   u32 valid_start = world.sm_geo_std.vertex_start,
-       valid_end   = world.sm_geo_vb.vertex_start;
+   glmesh mesh_gate_surface;
 
-   return (hit->tri[0] >= valid_start) &&
-          (hit->tri[0]  < valid_end);
-}
+   double sky_time, sky_rate, sky_target_rate;
 
-static void world_register(void)
-{
-   shader_terrain_register();
-   shader_sky_register();
-   shader_planeinf_register();
-   shader_gpos_register();
-   shader_fscolour_register();
-   shader_alphatest_register();
+   /* water rendering */
+   struct
+   {
+      struct framebuffer fbreflect, fbdepth;
 
-   world_routes_register();
-   world_sfd_register();
-}
+      boxf depthbounds;
+      int depth_computed;
 
-static void world_free(void)
-{
-   /* TODO.. */
+      float height;
+      int enabled;
+      v4f plane;
+   }
+   water;
 
-   world_sfd_free();
-}
+   /* split flap display */
+   struct
+   {
+      mdl_submesh *sm_module, *sm_card;
+      glmesh mesh_base, mesh_display;
 
-static void render_world_depth( m4x4f projection, m4x3f camera );
+      u32 w, h;
+      float *buffer;
+   }
+   sfd;
 
-static void add_all_if_material( m4x3f transform, scene *pscene, 
-                                 mdl_header *mdl, u32 id )
-{
-   for( int i=0; i<mdl->node_count; i++ )
+   /* timing bars, fixed maximum amount */
+   struct route_ui_bar
    {
-      mdl_node *pnode = mdl_node_from_id( mdl, i );
+      GLuint vao, vbo, ebo;
 
-      for( int j=0; j<pnode->submesh_count; j++ )
-      {
-         mdl_submesh *sm = mdl_node_submesh( mdl, pnode, j );
+      u32  indices_head;
+      u32  vertex_head;
 
-         if( sm->material_id == id )
-         {
-            m4x3f transform2;
-            mdl_node_transform( pnode, transform2 );
-            m4x3_mul( transform, transform2, transform2 );
+      float last_notch;
 
-            scene_add_submesh( pscene, mdl, sm, transform2 );
-         }
-      }
-
-      if( pnode->classtype == k_classtype_instance )
+      struct route_ui_segment
       {
-         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;
-
-            m4x3f transform2;
-            mdl_node_transform( pnode, transform2 );
-            m4x3_mul( transform, transform2, transform2 );
-
-            add_all_if_material( transform2, pscene, mdl2, id );
-         }
+         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_bars[16];
 
-static void world_apply_procedural_foliage(void)
-{
-   mdl_header *mfoliage = mdl_load("models/rs_foliage.mdl");
+   v3f render_gate_pos;
+   int active_route_board;
 
-   v3f volume;
-   v3_sub( world.geo.bbx[1], world.geo.bbx[0], volume );
-   volume[1] = 1.0f;
+   /*
+    * Dynamically allocated when world_load is called.
+    *
+    *                  the following arrays index somewhere into this linear 
+    *                  allocator
+    *
+    * (world_gen.h)
+    * --------------------------------------------------------------------------
+    */
+   void *dynamic_vgl;
 
-   m4x3f transform;
-   mdl_node *mblob = mdl_node_from_name( mfoliage, "blob" );
-   mdl_submesh *sm_blob = mdl_node_submesh( mfoliage, mblob, 0 );
+   /*
+    * Main world .mdl 
+    */
+   mdl_context *meta;
 
-   for( int i=0;i<100000;i++ )
+   /*
+    * Named safe places to respawn
+    */
+   struct respawn_point
    {
-      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_terrain(&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);
-         }
-      }
+      v3f co;
+      v4f q;
+      const char *name;
    }
-   free( mfoliage );
-}
-
-static void world_load(void)
-{
-   mdl_header *mworld = mdl_load( "models/mp_dev.mdl" );
+   * spawns;
+   u32 spawn_count;
 
-   world.spawn_count = 0;
-   world.traffic_count = 0;
-   world.instance_cache = NULL;
-   
    /*
-    * Process entities
+    * Audio player entities
     */
-   for( int i=0; i<mworld->node_count; i++ )
+   struct world_audio_thing
    {
-      mdl_node *pnode = mdl_node_from_id( mworld, i );
-      
-      if( pnode->classtype == k_classtype_none )
-      {}
-      else if( pnode->classtype == k_classtype_spawn )
-      {
-         struct respawn_point *rp = &world.spawns[ world.spawn_count ++ ];
+      v3f pos;
+      float volume;
+      u32 flags;
 
-         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;
-         }
+      audio_player player;
+      audio_clip temp_embedded_clip;
+   }
+   * audio_things;
+   u32 audio_things_count;
 
-         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 );
-
-         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 );
-
-         pnode->sub_uid = world.traffic_count ++;
-      }
-      else if( pnode->classtype == k_classtype_instance )
-      {
-         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;
-            }
-         }
+   /*
+    * Relays, random, etc
+    */
+   struct logic_entity
+   {
+      v3f pos;
+      enum logic_type logic_type;
+      int enabled;
 
-         if( !cached )
-         {
-            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 );
-            }
-         }
-      }
+      /* indexes the action array */
+      u32 action_start, action_count;
    }
+   * logic_entities;
+   u32 logic_entity_count;
 
-   world.instance_cache = buffer_fix( world.instance_cache, 
-                                      world.instance_cache_count,
-                                     &world.instance_cache_cap,
-                                     sizeof( struct instance_cache ) );
+   /*
+    * Action array
+    */
+   struct logic_action
+   {
+      u32 event,     /* on trigger, on enable, etc (TODO: Enum) */
+          target_id; /* thing to target, 0: self */
 
-#if 0
-   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)];
-#endif
+   }
+   * logic_actions;
+   u32 logic_action_count;
 
-   /* 
-    * Compile meshes into the world scenes
+   /*
+    * Box trigger entities
     */
-   scene_init( &world.geo );
+   struct trigger_zone
+   {
+      m4x3f transform, inv_transform;
+      u32   trigger_entity;
+   }
+   * triggers;
+   u32 trigger_count;
 
-   u32 mat_surf = 0,
-       mat_surf_oob = 0,
-       mat_vertex_blend = 0,
-       mat_alphatest = 0,
-       mat_graffiti = 0,
-       mat_subworld = 0,
-       mat_terrain = 0;
 
-   for( int i=1; i<mworld->material_count; i++ )
+   /*
+    * Routes (world_routes.h)
+    * --------------------------------------------------------------------------
+    */
+   struct route_node
    {
-      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;
-      else if( !strcmp( "alphatest", mat_name ))
-         mat_alphatest = i;
-      else if( !strcmp( "graffitibox", mat_name ))
-         mat_graffiti = i;
-      else if( !strcmp( "terrain", mat_name ) )
-         mat_terrain = i;
+      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;
 
-   m4x3f midentity;
-   m4x3_identity( midentity );
+   struct route
+   {
+      u32 track_id;
+      v4f colour;
 
-   if( mat_terrain )
-      add_all_if_material( midentity, &world.geo, mworld, mat_terrain );
-   scene_copy_slice( &world.geo, &world.sm_terrain );
+      u32 start;
+      mdl_submesh sm;
+      
+      int active;
+      float factive;
 
-   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 );
+      double best_lap, latest_pass; /* Session */
 
-   if( mat_surf )
-      add_all_if_material( midentity, &world.geo, mworld, mat_surf );
-   scene_copy_slice( &world.geo, &world.sm_geo_std );
+      m4x3f scoreboard_transform;
+   }
+   *routes;
+   u32 route_count;
 
-   if( mat_vertex_blend )
-      add_all_if_material( midentity, &world.geo, mworld, mat_vertex_blend );
-   scene_copy_slice( &world.geo, &world.sm_geo_vb );
+   struct route_gate
+   {
+      struct teleport_gate
+      { 
+         v3f co[2];
+         v4f q[2];
+         v2f dims;
 
-   scene_upload( &world.geo );
-   scene_bh_create( &world.geo );
+         m4x3f to_world, recv_to_world, transport;
+      }
+      gate;
 
+      u32 node_id;
 
-   /* Foliage /nocollide layer.
-    * TODO: Probably should have material traits for this
-    */
-   scene_init( &world.foliage );
+      struct route_timing
+      {
+         u32 version; /* Incremented on every teleport */
+         double time;
+      } 
+      timing;
+   }
+   *gates;
+   u32 gate_count;
 
-   world_apply_procedural_foliage();
-   scene_copy_slice( &world.foliage, &world.sm_foliage_main );
+   struct route_collector
+   {
+      struct route_timing timing;
+   }
+   *collectors;
+   u32 collector_count;
 
-   add_all_if_material( midentity, &world.foliage, mworld, mat_alphatest );
-   scene_copy_slice( &world.foliage, &world.sm_foliage_alphatest );
 
-   add_all_if_material( midentity, &world.foliage, mworld, mat_graffiti );
-   scene_copy_slice( &world.foliage, &world.sm_graffiti );
+   /* logic 
+    * ----------------------------------------------------
+    */
 
-   scene_upload( &world.foliage );
-   world_routes_loadfrom( mworld );
+   u32 active_gate,
+       current_run_version;
+   double time, rewind_from, rewind_to, last_use;
 
-   for( int i=0; i<world.instance_cache_count; i++ )
-      free( world.instance_cache[i].mdl );
+   /* world geometry */
+   scene *scene_geo, 
+         *scene_no_collide,
+         *scene_lines;
 
-   free( world.instance_cache );
-   free( mworld );
+   /* spacial mappings */
+   bh_tree *audio_bh,
+           *trigger_bh,
+           *geo_bh;
 
-   /* 
-    * 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();
-   
+   /* graphics */
+   glmesh mesh_geo, 
+          mesh_no_collide,
+          mesh_route_lines,
+          mesh_water;
 
-   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 );
+   rigidbody rb_geo;
 
-   q_identity(world.mr_ball.q);
-   rb_init( &world.mr_ball );
+   /* 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;
 
    /*
-    * Setup scene collider 
+    * Allocated AFTER all previous buffers are done
+    * --------------------------------------------------------------------------
     */
-   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 );
+   struct instance_cache
+   {
+      mdl_context *mdl;
+      u32 pstr_file;
+   }
+   instance_cache[32];
+   u32 instance_cache_count;
 }
+world;
+
 
-static void world_init(void)
+/*
+ * API
+ */
+
+VG_STATIC int ray_hit_is_ramp( ray_hit *hit );
+VG_STATIC int ray_hit_is_terrain( ray_hit *hit );
+VG_STATIC void ray_world_get_tri( ray_hit *hit, v3f tri[3] );
+VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit );
+
+/*
+ * 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
+ * -----------------------------------------------------------------------------
+ */
+
+VG_STATIC void world_init(void)
 {
-   vg_tex2d_init( (vg_tex2d *[]){ &tex_terrain_colours, 
-                                  &tex_terrain_noise,
-                                  &tex_alphatest,
-                                  &tex_graffiti }, 4 );
+   vg_convar_push( (struct vg_convar){
+      .name = "water_enable",
+      .data = &world.water.enabled,
+      .data_type = k_convar_dtype_i32,
+      .opt_i32 = { .min=0, .max=1, .clamp=1 },
+      .persistent = 0
+   });
 
-   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);
+   world.sky_rate = 1.0;
+   world.sky_target_rate = 1.0;
 
+   shader_terrain_register();
+   shader_sky_register();
+   shader_planeinf_register();
+   shader_gpos_register();
+   shader_fscolour_register();
+   shader_alphatest_register();
 
-   mdl_header *msky = mdl_load("models/rs_skydome.mdl");
-   mdl_unpack_glmesh( msky, &world.skydome );
+   vg_info( "Loading world resources\n" );
+   
+   vg_linear_clear( vg_mem.scratch );
+   mdl_context *msky = mdl_load_full( vg_mem.scratch, "models/rs_skydome.mdl" );
 
    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);
 
+   vg_acquire_thread_sync();
+   {
+      mdl_unpack_glmesh( msky, &world.skydome );
+   }
+   vg_release_thread_sync();
 
    /* Other systems */
-   world_sfd_init();
-   world_audio_init();
+   vg_info( "Loading other world systems\n" );
+
+   vg_loader_highwater( world_render_init, NULL, NULL );
+   vg_loader_highwater( world_sfd_init, NULL, NULL );
+   vg_loader_highwater( world_water_init, NULL, NULL );
+   vg_loader_highwater( world_gates_init, NULL, NULL );
+   vg_loader_highwater( world_routes_init, NULL, NULL );
+
+   /* Allocate dynamic world memory arena */
+   u32 max_size = 72*1024*1024;
+   world.dynamic_vgl = vg_create_linear_allocator( vg_mem.rtmemory, max_size );
 }
 
-static void world_update(void)
+VG_STATIC void world_update( v3f pos )
 {
+   world.sky_time += world.sky_rate * vg.time_delta;
+   world.sky_rate = vg_lerp( world.sky_rate, world.sky_target_rate, 
+                                 vg.time_delta * 5.0 );
+
    world_routes_update();
+#if 0
    world_routes_debug();
+#endif
    
    int closest = 0;
    float min_dist = INFINITY;
 
-   for( int i=0; i<world.routes.route_count; i++ )
+   for( int i=0; i<world.route_count; i++ )
    {
-      float dist = v3_dist2( world.routes.routes[i].scoreboard_transform[3],
-                              player_get_pos() );
+      float d = v3_dist2( world.routes[i].scoreboard_transform[3], pos );
 
-      if( dist < min_dist )
+      if( d < min_dist )
       {
-         min_dist = dist;
+         min_dist = d;
          closest = i;
       }
    }
@@ -568,9 +413,8 @@ static void world_update(void)
    {
       network_scores_updated = 0;
       world.active_route_board = closest;
-      struct subworld_sfd *sfd = subworld_sfd();
 
-      struct route *route = &world.routes.routes[closest];
+      struct route *route = &world.routes[closest];
 
       u32 id = route->track_id;
 
@@ -580,251 +424,90 @@ static void world_update(void)
 
          for( int i=0; i<13; i++ )
          {
-            sfd_encode( &sfd->tester, i, &local_board->data[27*i] );
+            sfd_encode( i, &local_board->data[27*i] );
          }
       }
    }
-   
-   sfd_update( &world.sfd.tester );
 
 #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 );
+   VG_STATIC int in_zone = 0;
 
-   rb_iter( &world.mr_ball );
-   rb_update_transform( &world.mr_ball );
-   rb_debug( &world.mr_ball, 0 );
+   int in_zone_this_time = 0;
 
-   for( int i=0; i<vg_list_size(world.van_man); i++ )
+   for( int i=0; i<world.achievement_zones_count; i++ )
    {
-      traffic_drive( &world.van_man[i] );
-      traffic_visualize_car( &world.van_man[i] );
-   }
-#endif
-}
-
-/*
- * Rendering
- */
+      struct achievement_zone *zone = &world.achievement_zones[i];
 
-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();
+      v3f local;
+      m4x3_mulv( zone->inv_transform, pos, local );
+      
+      if( (fabsf(local[0]) <= 1.0f) &&
+          (fabsf(local[1]) <= 1.0f) &&
+          (fabsf(local[2]) <= 1.0f) )
+      {
+         in_zone_this_time = 1;
 
-   shader_vblend_uPv( projection );
-   shader_vblend_uMdl( identity_matrix );
-   shader_vblend_uCamera( camera );
+         if( !in_zone && zone->ptarget )
+         {
+            audio_lock();
+            audio_player_playclip( &zone->ptarget->player, 
+                                   &zone->ptarget->temp_embedded_clip );
+            audio_unlock();
+         }
 
-   scene_bind( &world.geo );
-   mdl_draw_submesh( &world.sm_geo_vb );
+         if( !zone->triggered )
+         {
+            steam_set_achievement( zone->name );
+            steam_store_achievements();
+         }
 
-   mesh_bind( &world.cars );
+         zone->triggered = 1;
+      }
 
-#if 0
-   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 );
+      vg_line_boxf_transformed( zone->transform, (boxf){{-1.0f,-1.0f,-1.0f},
+                                                        { 1.0f, 1.0f, 1.0f}}, 
+                                                        0xff00ff00 );
    }
-#endif
-}
-
-static void render_world_alphatest( m4x4f projection, v3f camera )
-{
-   m4x3f identity_matrix;
-   m4x3_identity( identity_matrix );
-
-   shader_alphatest_use();
-   shader_alphatest_uTexGarbage(0);
-   shader_alphatest_uTexMain(1);
-   shader_link_standard_ub( _shader_alphatest.id, 2 );
-
-   vg_tex2d_bind( &tex_terrain_noise, 0 );
-   vg_tex2d_bind( &tex_alphatest, 1 );
 
-   shader_alphatest_uPv( projection );
-   shader_alphatest_uMdl( identity_matrix );
-   shader_alphatest_uCamera( camera );
-
-   glDisable(GL_CULL_FACE);
-   scene_bind( &world.foliage );
-   mdl_draw_submesh( &world.sm_foliage_alphatest );
-
-   vg_tex2d_bind( &tex_graffiti, 1 );
-   mdl_draw_submesh( &world.sm_graffiti );
-
-   glEnable(GL_CULL_FACE);
-}
-
-static void render_terrain( m4x4f projection, v3f camera )
-{
-   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_terrain );
-   mdl_draw_submesh( &world.sm_geo_std_oob );
-   mdl_draw_submesh( &world.sm_geo_std );
-   mdl_draw_submesh( &world.sm_subworld );
-
-   /* TODO: Dont draw in reflection */
-   glDisable(GL_CULL_FACE);
-   scene_bind( &world.foliage );
-   mdl_draw_submesh( &world.sm_foliage_main );
-   glEnable(GL_CULL_FACE);
-}
-
-static void render_lowerdome( m4x3f camera )
-{
-   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()} );
+   in_zone = in_zone_this_time;
+#endif
    
-   mdl_draw_submesh( &world.dome_lower );
+   sfd_update();
 }
 
-static void render_sky(m4x3f camera)
-{
-   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_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 );
+/* 
+ * -----------------------------------------------------------------------------
+ *                              API implementation
+ * -----------------------------------------------------------------------------
+ */
 
-   mesh_bind( &world.skydome );
-   mdl_draw_submesh( &world.dome_upper );
-   
-   glEnable( GL_DEPTH_TEST );
-   glDepthMask( GL_TRUE );
+VG_STATIC void ray_world_get_tri( ray_hit *hit, v3f tri[3] )
+{
+   for( int i=0; i<3; i++ )
+      v3_copy( world.scene_geo->arrvertices[ hit->tri[i] ].co, tri[i] );
 }
 
-static void render_world_gates( m4x4f projection, v3f playerco, m4x3f camera )
+VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit )
 {
-   float closest = INFINITY;
-   int   id = 0;
-
-   for( int i=0; i<world.routes.gate_count; i++ )
-   {
-      struct route_gate *rg = &world.routes.gates[i];
-      float dist = v3_dist2( rg->gate.co[0], camera[3] );
-
-      if( dist < closest )
-      {
-         closest = dist;
-         id = i;
-      }
-   }
-
-   render_gate( &world.routes.gates[id].gate, playerco, camera );
-   v3_lerp( world.render_gate_pos, 
-            world.routes.gates[id].gate.co[0],
-            1.0f,
-            world.render_gate_pos );
+   return scene_raycast( world.scene_geo, world.geo_bh, pos, dir, hit );
 }
 
-static void render_world( m4x4f projection, m4x3f camera )
+VG_STATIC int ray_hit_is_terrain( ray_hit *hit )
 {
-   render_sky( camera );
-   render_world_routes( projection, camera[3] );
-   render_world_vb( projection, camera[3] );
-   render_world_alphatest( projection, camera[3] );
-   render_terrain( projection, camera[3] );
-
-   int closest = 0;
-   float min_dist = INFINITY;
-
-   for( int i=0; i<world.routes.route_count; i++ )
-   {
-      float dist = v3_dist2( world.routes.routes[i].scoreboard_transform[3],
-                              camera[3] );
-
-      if( dist < min_dist )
-      {
-         min_dist = dist;
-         closest = i;
-      }
-   }
+   u32 valid_start = 0,
+       valid_end   = world.sm_terrain.vertex_count;
 
-   sfd_render( &world.sfd.tester, projection, camera[3], 
-         world.routes.routes[closest].scoreboard_transform );
+   return (hit->tri[0] >= valid_start) &&
+          (hit->tri[0]  < valid_end);
 }
 
-static void render_world_depth( m4x4f projection, m4x3f camera )
+VG_STATIC int ray_hit_is_ramp( ray_hit *hit )
 {
-   m4x3f identity_matrix;
-   m4x3_identity( identity_matrix );
-
-   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 );
+   u32 valid_start = world.sm_geo_std.vertex_start,
+       valid_end   = world.sm_geo_vb.vertex_start;
 
-#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 */