nonlocal stuff again
[carveJwlIkooP6JGAAIwe30JlM.git] / world.h
diff --git a/world.h b/world.h
index 106b8247334270807d2e8112095ae3fde022580b..809397151e854c64b4508ceaf139a8e0e1c40c88 100644 (file)
--- a/world.h
+++ b/world.h
@@ -18,6 +18,8 @@ typedef struct world_instance world_instance;
 #include "rigidbody.h"
 #include "bvh.h"
 #include "model.h"
+#include "entity.h"
+#include "font.h"
 
 #include "shaders/scene_standard.h"
 #include "shaders/scene_standard_alphatest.h"
@@ -28,8 +30,6 @@ typedef struct world_instance world_instance;
 
 #include "shaders/model_sky.h"
 
-typedef struct teleport_gate teleport_gate;
-
 enum { k_max_ui_segments = 8 };
 
 enum { k_max_ui_elements = k_max_ui_segments };
@@ -55,20 +55,21 @@ enum geo_type
 
 static const float k_light_cube_size = 8.0f;
 
-struct world_instance 
-{
-   /* This is a small flag we use to changelevel.
-    * It will not be cleared until all sounds stop playing 
-    */
-
+struct world_instance {
    /* Fixed items
     * -------------------------------------------------------
     */
 
+   void *heap;
    char  world_name[ 64 ];
+   enum world_status{
+      k_world_status_unloaded = 0,
+      k_world_status_loading = 1,
+      k_world_status_loaded = 2
+   }
+   status;
 
-   struct
-   {
+   struct{
       boxf depthbounds;
       int depth_computed;
 
@@ -79,8 +80,7 @@ struct world_instance
    water;
 
    /* STD140 */
-   struct ub_world_lighting
-   {
+   struct ub_world_lighting{
       v4f g_cube_min,
           g_cube_inv_range;
 
@@ -94,9 +94,12 @@ struct world_instance
       v4f g_sunset_ambient;
       v4f g_sun_colour;
       v4f g_sun_dir;
+      v4f g_board_0;
+      v4f g_board_1;
 
       float g_water_fog;
       float g_time;
+      float g_realtime;
       float g_shadow_length;
       float g_shadow_spread;
 
@@ -118,6 +121,8 @@ struct world_instance
           tex_light_entities,
           tex_light_cubes;
 
+   float probabilities[3];
+
    v3i light_cubes;
 
    struct framebuffer heightmap;
@@ -131,219 +136,37 @@ struct world_instance
     * (world_gen.h)
     * --------------------------------------------------------------------------
     */
-   /*
-    * Main world .mdl 
-    */
-   mdl_context *meta;
 
    /*
-    * Materials / textures 
+    * Main world .mdl 
     */
+   mdl_context meta;
 
    GLuint *textures;
    u32 texture_count;
 
-   struct world_material
-   {
+   struct world_surface{
       mdl_material info;
       mdl_submesh sm_geo,
                   sm_no_collide;
    }
-   * materials;
-   u32 material_count;
-
-   /*
-    * Named safe places to respawn
-    */
-   struct respawn_point
-   {
-      v3f co;
-      v4f q;
-      const char *name;
-   }
-   * spawns;
-   u32 spawn_count;
-
-   /*
-    * Audio player entities
-    */
-   struct world_audio_thing
-   {
-      v3f pos;
-      float volume, range;
-      u32 flags;
-
-#if 0
-      audio_player player;
-#endif
-
-      audio_clip temp_embedded_clip;
-   }
-   * audio_things;
-   u32 audio_things_count;
+   * surfaces;
+   u32 surface_count;
 
-#if 0
-   /*
-    * Relays  [ DEPRECATED ]
-    */
-   struct logic_relay
-   {
-      v3f pos;
+   mdl_array_ptr ent_spawn,
+                 ent_gate,
+                 ent_light,
+                 ent_route_node,
+                 ent_path_index,
+                 ent_checkpoint,
+                 ent_route,
+                 ent_water,
 
-      struct relay_target
-      {
-         u32 sub_id;
-         enum classtype classtype;
-      }
-      targets[4];
-      u32 target_count;
-   }
-   * logic_relays;
-   u32 relay_count;
-#endif
-
-   struct soundscape
-   {
-      /* locking */
-      audio_channel *channels[4];
-      
-      /* accessable without locking */
-      v3f spawn_position;
-
-      u32 usage_count;
-      u32 max_instances;
-      u32 allow_transitions;
-      float transition_duration;
-      const char *label;
-   }
-   * soundscapes;
-   u32 soundscape_count;
-
-   struct logic_brick_ref
-   {
-      mdl_node *node;
-      float usage;
-      u32 internal_id;  /* used for things like soundscapes where another
-                           allocation is made on top */
-   }
-   * logic_bricks;
-   u32 logic_brick_count;
-
-   /*
-    * Box trigger entities
-    */
-   struct trigger_zone
-   {
-      m4x3f transform, inv_transform;
-      
-      u32 target_logic_brick;
-      enum classtype classtype;
-   }
-   * triggers;
-   u32 trigger_count;
-
-   /*
-    * Achievements
-    */
-   struct logic_achievement
-   {
-      v3f pos;
-      const char *achievement_id;
-      u32 achieved;
-   }
-   * logic_achievements;
-   u32 achievement_count;
-
-   /* 
-    * Lights
-    */
-   struct world_light
-   {
-      mdl_node *node;
-      struct classtype_world_light *inf;
-      m4x3f inverse_world;
-      v2f angle_sin_cos;
-
-      /* enabled.. etc? 
-       * TODO: we should order entities in the binary by their type */
-   }
-   * lights;
-   u32 light_count;
-
-   /*
-    * Routes (world_routes.h)
-    * --------------------------------------------------------------------------
-    */
-   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;
-
-   struct route
-   {
-      u32 track_id;
-      v4f colour;
-
-      u32 start;
-      mdl_submesh sm;
-      
-      int active;
-      float factive;
-
-      double best_lap, latest_pass; /* Session */
-
-      m4x3f scoreboard_transform;
-   }
-   *routes;
-   u32 route_count;
-
-   struct route_gate
-   {
-      struct teleport_gate
-      { 
-         v3f co[2];
-         v4f q[2];
-         v2f dims;
-
-         m4x3f to_world, transport;
-      }
-      gate;
-
-      u32 node_id;
-
-      struct route_timing
-      {
-         u32 version; /* Incremented on every teleport */
-         double time;
-      } 
-      timing;
-   }
-   *gates;
-   u32 gate_count;
-
-   struct nonlocal_gate
-   {
-      struct teleport_gate gate;
-      mdl_node *node;
-
-      u32 target_map_index, working;
-   }
-   *nonlocal_gates;
-   u32 nonlocalgate_count;
-
-   struct route_collector
-   {
-      struct route_timing timing;
-   }
-   *collectors;
-   u32 collector_count;
+                 ent_audio_clip,
+                 ent_audio,
+                 ent_volume;
 
+   ent_gate *rendering_gate;
 
    /* logic 
     * ----------------------------------------------------
@@ -356,7 +179,7 @@ struct world_instance
 
    /* spacial mappings */
    bh_tree *audio_bh,
-           *trigger_bh,
+           *volume_bh,
            *geo_bh;
 
    /* graphics */
@@ -365,81 +188,77 @@ struct world_instance
           mesh_no_collide,
           mesh_water;
 
-   rigidbody rb_geo; /* todo.. ... */
+   rb_object rb_geo;
 };
 
-VG_STATIC struct world_global
-{
+struct world_global{
    /*
     * Allocated as system memory
     * --------------------------------------------------------------------------
     */
-   void *generic_heap;
+   void *heap;
 
    /* rendering */
    glmesh skydome;
-   mdl_submesh dome_upper, dome_lower;
-
-   glmesh mesh_gate_surface;
+   glmesh mesh_gate;
+   mdl_submesh sm_gate_surface,
+               sm_gate_marker[4];
 
    double sky_time, sky_rate, sky_target_rate;
 
-   /* gates, TODO: active_gate should also know which instance */
-   u32 active_gate,
-       current_run_version;
+   u32 current_run_version;
    double time, rewind_from, rewind_to, last_use;
 
    /* water rendering */
-   struct
-   {
+   struct{
       struct framebuffer fbreflect, fbdepth;
    }
    water;
 
    /* split flap display */
-   struct
-   {
-      mdl_submesh *sm_module, *sm_card;
+   struct{
       glmesh mesh_base, mesh_display;
+      mdl_submesh sm_base;
+      u32 active_route_board;
 
       u32 w, h;
       float *buffer;
    }
    sfd;
 
-   /* timing bars, fixed maximum amount */
-   struct route_ui_bar
-   {
-      GLuint vao, vbo, ebo;
-
-      u32  indices_head;
-      u32  vertex_head;
-
-      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_bars[16];
-
    v3f render_gate_pos;
-   int active_route_board;
-   int in_trigger;
+   int in_volume;
 
    int switching_to_new_world;
 
    world_instance worlds[4];
    u32            world_count;
    u32            active_world;
+
+   /* text particles */
+   font3d font;
+
+   struct timer_text{
+      char text[8];
+      m4x3f transform;
+      ent_gate *gate;
+      ent_route *route;
+   }
+   timer_texts[4];
+   u32 timer_text_count;
+
+   struct text_particle{
+      rb_object obj;
+      m4x3f mlocal;
+      ent_glyph *glyph;
+      v4f colour;
+
+      m4x3f mdl;
+   }
+   text_particles[6*4];
+   u32 text_particle_count;
 }
-world_global;
+static world_global;
 
 VG_STATIC world_instance *get_active_world( void )
 {
@@ -454,7 +273,7 @@ VG_STATIC
 int ray_hit_is_ramp( world_instance *world, ray_hit *hit );
 
 VG_STATIC 
-struct world_material *ray_hit_material( world_instance *world, ray_hit *hit );
+struct world_surface *ray_hit_surface( world_instance *world, ray_hit *hit );
 
 VG_STATIC 
 void ray_world_get_tri( world_instance *world, ray_hit *hit, v3f tri[3] );
@@ -462,15 +281,69 @@ void ray_world_get_tri( world_instance *world, ray_hit *hit, v3f tri[3] );
 VG_STATIC 
 int ray_world( world_instance *world, v3f pos, v3f dir, ray_hit *hit );
 
+VG_STATIC
+ent_spawn *world_find_closest_spawn( world_instance *world, v3f position )
+{
+   ent_spawn *rp = NULL, *r;
+   float min_dist = INFINITY;
+
+   for( u32 i=0; i<mdl_arrcount(&world->ent_spawn); i++ ){
+      r = mdl_arritm( &world->ent_spawn, i );
+      float d = v3_dist2( r->transform.co, position );
+      
+      if( d < min_dist ){
+         min_dist = d;
+         rp = r;
+      }
+   }
+
+   if( !rp ){
+      if( mdl_arrcount(&world->ent_spawn) ){
+         vg_warn( "Invalid distances to spawns.. defaulting to first one.\n" );
+         return mdl_arritm( &world->ent_spawn, 0 );
+      }
+      else{
+         vg_error( "There are no spawns in the level!\n" );
+      }
+   }
+
+   return rp;
+}
+
+VG_STATIC
+ent_spawn *world_find_spawn_by_name( world_instance *world, const char *name )
+{
+   ent_spawn *rp = NULL, *r;
+   for( u32 i=0; i<mdl_arrcount(&world->ent_spawn); i++ ){
+      r = mdl_arritm( &world->ent_spawn, i );
+      if( !strcmp( mdl_pstr(&world->meta, r->pstr_name), name ) ){
+         rp = r;
+         break;
+      }
+   }
+
+   if( !rp )
+      vg_warn( "No spawn named '%s'\n", name );
+
+   return rp;
+}
+
 /*
  * Submodules
  */
 
+VG_STATIC float
+   k_day_length            = 30.0f; /* minutes */
+
+VG_STATIC int   k_debug_light_indices = 0,
+                k_debug_light_complexity = 0,
+                k_light_preview = 0;
+
 #include "world_routes.h"
 #include "world_sfd.h"
 #include "world_render.h"
 #include "world_water.h"
-#include "world_logic_bricks.h"
+#include "world_volumes.h"
 #include "world_gen.h"
 #include "world_gate.h"
 
@@ -483,75 +356,15 @@ int ray_world( world_instance *world, v3f pos, v3f dir, ray_hit *hit );
 VG_STATIC int world_stop_sound( int argc, const char *argv[] )
 {
    world_instance *world = get_active_world();
-
-   /* 
-    * None of our world audio runs as one shots, they always have a player.
-    * Therefore it is safe to delete clip data after the players are
-    * disconnected
-    */
-#if 0
-   audio_lock();
-   for( int i=0; i<world->audio_things_count; i++ )
-   {
-      struct world_audio_thing *at = &world->audio_things[i];
-
-      if( audio_player_is_playing( &at->player ) )
-      {
-         u32 cflags = audio_player_get_flags( &at->player );
-         audio_player_set_flags( &at->player, cflags | AUDIO_FLAG_KILL );
-      }
-   }
-   audio_unlock();
-#endif
-
-   return 0;
-}
-
-VG_STATIC int world_change_world( int argc, const char *argv[] )
-{
-#if 0
-   world_instance *world = get_active_world();
-
-   if( argc == 0 )
-   {
-      vg_info( "%s\n", world.world_name );
-      return 0;
-   }
-   else
-   {
-      vg_info( "Switching world...\n" );
-      strcpy( world.world_name, argv[0] );
-      world.switching_to_new_world = 1;
-      world_stop_sound( 0, NULL );
-   }
-#endif
-
    return 0;
 }
 
 VG_STATIC void world_init(void)
 {
-#if 0
-   vg_var_push( (struct vg_var){
-      .name = "water_enable",
-      .data = &world.water.enabled,
-      .data_type = k_var_dtype_i32,
-      .opt_i32 = { .min=0, .max=1, .clamp=1 },
-      .persistent = 0
-   });
-#endif
-
-       vg_function_push( (struct vg_cmd)
-   {
-               .name = "world_stop_sound",
-               .function = world_stop_sound
-       });
-
-       vg_function_push( (struct vg_cmd)
-   {
-               .name = "world",
-               .function = world_change_world
-       });
+   VG_VAR_F32( k_day_length );
+   VG_VAR_I32( k_debug_light_indices );
+   VG_VAR_I32( k_debug_light_complexity );
+   VG_VAR_I32( k_light_preview );
 
    world_global.sky_rate = 1.0;
    world_global.sky_target_rate = 1.0;
@@ -568,14 +381,16 @@ VG_STATIC void world_init(void)
    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 *nupper = mdl_node_from_name( msky, "dome_complete" );
-   world_global.dome_upper = *mdl_node_submesh( msky, nupper, 0 );
+   mdl_context msky;
+   mdl_open( &msky, "models/rs_skydome.mdl", vg_mem.scratch );
+   mdl_load_metadata_block( &msky, vg_mem.scratch );
+   mdl_load_mesh_block( &msky, vg_mem.scratch );
+   mdl_close( &msky );
 
    vg_acquire_thread_sync();
    {
-      mdl_unpack_glmesh( msky, &world_global.skydome );
+      mdl_unpack_glmesh( &msky, &world_global.skydome );
    }
    vg_release_thread_sync();
 
@@ -590,296 +405,259 @@ VG_STATIC void world_init(void)
 
    /* Allocate dynamic world memory arena */
    u32 max_size = 76*1024*1024;
-   world_global.generic_heap = vg_create_linear_allocator( vg_mem.rtmemory, 
-                                                           max_size,
-                                                           VG_MEMORY_SYSTEM );
-}
-
-VG_STATIC void world_audio_init(void)
-{
-#if 0
-   u32 size = vg_linear_remaining( vg_audio.audio_pool ) 
-               - sizeof(vg_linear_allocator);
-
-   world_global.audio_heap = vg_create_linear_allocator( vg_audio.audio_pool, 
-                                                         size, 
-                                                         VG_MEMORY_SYSTEM );
-#endif
+   world_global.heap = vg_create_linear_allocator( vg_mem.rtmemory, max_size,
+                                                   VG_MEMORY_SYSTEM );
 }
 
-#if 0
-VG_STATIC void world_trigger_achievement( world_instance *world, u32 uid )
-{
-   struct logic_achievement *ach = &world->logic_achievements[ uid ];
-
-   if( ach->achieved )
-      return;
-
-   steam_set_achievement( ach->achievement_id );
-   steam_store_achievements();
-
-   ach->achieved = 1;
-}
-#endif
+typedef struct ent_call ent_call;
+struct ent_call{
+   ent_index ent;
+   u32 function;
+   void *data;
+};
 
-#if 0
-VG_STATIC void world_run_relay( world_instance *world, 
-                                struct relay_target *rt );
+VG_STATIC void entity_call( world_instance *world, ent_call *call );
 
-VG_STATIC void world_trigger_relay( world_instance *world, u32 uid )
+VG_STATIC void ent_volume_call( world_instance *world, ent_call *call )
 {
-   struct logic_relay *relay = &world->logic_relays[ uid ];
-
-   for( int i=0; i<relay->target_count; i++ )
-   {
-      world_run_relay( world, &relay->targets[i] );
+   ent_volume *volume = mdl_arritm( &world->ent_volume, call->ent.index );
+   if( !volume->target.type ) return;
+
+   if( call->function == k_ent_function_trigger ){
+      call->ent = volume->target;
+
+      if( volume->type == k_volume_subtype_particle ){
+         float *co = alloca( sizeof(float)*3 );
+         co[0] = vg_randf()*2.0f-1.0f;
+         co[1] = vg_randf()*2.0f-1.0f;
+         co[2] = vg_randf()*2.0f-1.0f;
+         m4x3_mulv( volume->to_world, co, co );
+
+         call->function = k_ent_function_particle_spawn;
+         call->data = co;
+         entity_call( world, call );
+      }
+      else
+         entity_call( world, call );
    }
 }
-#endif
 
-#if 0
-VG_STATIC void world_trigger_audio( world_instance *world, u32 uid )
+VG_STATIC void ent_audio_call( world_instance *world, ent_call *call )
 {
-   struct world_audio_thing *wat = &world->audio_things[ uid ];
+   ent_audio *audio = mdl_arritm( &world->ent_audio, call->ent.index );
 
-   audio_lock();
-   audio_player_playclip( &wat->player, 
-                          &wat->temp_embedded_clip );
-   audio_unlock();
-}
-#endif
+   v3f sound_co;
 
-#if 0
-VG_STATIC void world_run_relay( world_instance *world,
-                                struct relay_target *rt )
-{
-   struct entity_instruction
-   {
-      enum classtype classtype;
-      void (*p_trigger)( world_instance *world, u32 uid );
+   if( call->function == k_ent_function_particle_spawn ){
+      v3_copy( call->data, sound_co );
    }
-   entity_instructions[] =
-   {
-      { k_classtype_logic_achievement, world_trigger_achievement },
-      { k_classtype_logic_relay, world_trigger_relay },
-      { k_classtype_audio, world_trigger_audio },
-      { k_classtype_logic_wire, logic_bricks_trigger_brick }
-   };
-
-   for( int i=0; i<vg_list_size(entity_instructions); i++ )
-   {
-      struct entity_instruction *instr = &entity_instructions[i];
-
-      if( instr->classtype == rt->classtype )
-      {
-         instr->p_trigger( world, rt->sub_id );
-         return;
-      }
+   else if( call->function == k_ent_function_trigger ){
+      v3_copy( audio->transform.co, sound_co );
    }
+   else
+      vg_fatal_exit_loop( "ent_audio_call (invalid function id)" );
 
-   vg_error( "Don't know how to trigger classtype %d\n", rt->classtype );
-}
-#endif
-
-VG_STATIC void world_update( world_instance *world, v3f pos )
-{
-   /* TEMP!!!!!! */
-   static double g_time = 0.0;
-   g_time += vg.time_delta * (1.0/(k_day_length*60.0));
-
-
-   struct ub_world_lighting *state = &world->ub_lighting;
-
-   state->g_time = g_time;
-   state->g_debug_indices = k_debug_light_indices;
-   state->g_light_preview = k_light_preview;
-   state->g_debug_complexity = k_debug_light_complexity;
-
-   state->g_time_of_day = vg_fractf( g_time );
-   state->g_day_phase   = cosf( state->g_time_of_day * VG_PIf * 2.0f );
-   state->g_sunset_phase= cosf( state->g_time_of_day * VG_PIf * 4.0f + VG_PIf );
-
-   state->g_day_phase    =       state->g_day_phase    * 0.5f + 0.5f;
-   state->g_sunset_phase = powf( state->g_sunset_phase * 0.5f + 0.5f, 6.0f );
+   float chance = vg_randf()*100.0f,
+         bar = 0.0f;
 
-   float a = state->g_time_of_day * VG_PIf * 2.0f;
-   state->g_sun_dir[0] = sinf( a );
-   state->g_sun_dir[1] = cosf( a );
-   state->g_sun_dir[2] = 0.2f;
-   v3_normalize( state->g_sun_dir );
+   for( u32 i=0; i<audio->clip_count; i++ ){
+      ent_audio_clip *clip = mdl_arritm( &world->ent_audio_clip, 
+                                          audio->clip_start+i );
 
+      float mod = world->probabilities[ audio->probability_curve ],
+            p   = clip->probability * mod;
 
+      bar += p;
 
-   glBindBuffer( GL_UNIFORM_BUFFER, world->ubo_lighting );
-   glBufferSubData( GL_UNIFORM_BUFFER, 0, 
-                    sizeof(struct ub_world_lighting), &world->ub_lighting );
-   /* TEMP!!!!!! */
+      if( chance < bar ){
 
+         audio_lock();
 
-#if 0
-   if( world.switching_to_new_world )
-   {
-      int all_stopped = 1;
-
-      audio_lock();
-      for( int i=0; i<world.audio_things_count; i++ )
-      {
-         struct world_audio_thing *at = &world.audio_things[i];
+         if( audio->behaviour == k_channel_behaviour_unlimited ){
+            audio_oneshot_3d( &clip->clip, sound_co,
+                              audio->transform.s[0],
+                              audio->volume );
+         }
+         else if( audio->behaviour == k_channel_behaviour_discard_if_full ){
+            audio_channel *ch = 
+               audio_get_group_idle_channel( audio->group, 
+                                             audio->max_channels );
+
+            if( ch ){
+               audio_channel_init( ch, &clip->clip, audio->flags );
+               audio_channel_group( ch, audio->group );
+               audio_channel_set_spacial( ch, sound_co, audio->transform.s[0] );
+               audio_channel_edit_volume( ch, audio->volume, 1 );
+               ch = audio_relinquish_channel( ch );
+            }
+         }
+         else if( audio->behaviour == k_channel_behaviour_crossfade_if_full){
+            audio_channel *ch =
+               audio_get_group_idle_channel( audio->group,
+                                             audio->max_channels );
+
+            /* group is full */
+            if( !ch ){
+               audio_channel *existing = 
+                  audio_get_group_first_active_channel( audio->group );
+
+               if( existing ){
+                  if( existing->source == &clip->clip ){
+                     audio_unlock();
+                     return;
+                  }
+                 
+                  existing->group = 0;
+                  existing = audio_channel_fadeout(existing, audio->crossfade);
+               }
+
+               ch = audio_get_first_idle_channel();
+            }
 
-         if( audio_player_is_playing( &at->player ) )
-         {
-            all_stopped = 0;
-            break;
+            if( ch ){
+               audio_channel_init( ch, &clip->clip, audio->flags );
+               audio_channel_group( ch, audio->group );
+               audio_channel_fadein( ch, audio->crossfade );
+               ch = audio_relinquish_channel( ch );
+            }
          }
-      }
-      audio_unlock();
 
-      if( all_stopped )
-      {
-         world.switching_to_new_world = 0;
-         world_unload();
-         vg_loader_start( world_load );
+         audio_unlock();
          return;
       }
    }
+}
 
-#endif
+VG_STATIC void entity_call( world_instance *world, ent_call *call )
+{
+   if( call->ent.type == k_ent_volume ){
+      ent_volume_call( world, call );
+   } else if( call->ent.type == k_ent_audio ){
+      ent_audio_call( world, call );
+   }
+}
+
+VG_STATIC void world_update( world_instance *world, v3f pos )
+{
    world_global.sky_time += world_global.sky_rate * vg.time_delta;
    world_global.sky_rate = vg_lerp( world_global.sky_rate, 
                                     world_global.sky_target_rate, 
                                     vg.time_delta * 5.0 );
 
+   world_routes_update_timer_texts( world );
    world_routes_update( world );
-#if 0
-   world_routes_debug();
-#endif
+   //world_routes_debug( world );
+
+   /* ---- SFD ------------ */
    
-   if( world->route_count > 0 )
-   {
-      int closest = 0;
+   if( mdl_arrcount( &world->ent_route ) ){
+      u32 closest = 0;
       float min_dist = INFINITY;
 
-      for( int i=0; i<world->route_count; i++ )
-      {
-         float d = v3_dist2( world->routes[i].scoreboard_transform[3], pos );
+      for( u32 i=0; i<mdl_arrcount( &world->ent_route ); i++ ){
+         ent_route *route = mdl_arritm( &world->ent_route, i );
+         float dist = v3_dist2( route->board_transform[3], pos );
 
-         if( d < min_dist )
-         {
-            min_dist = d;
+         if( dist < min_dist ){
+            min_dist = dist;
             closest = i;
          }
       }
 
-      if( (world_global.active_route_board != closest) 
+      if( (world_global.sfd.active_route_board != closest) 
           || network_scores_updated )
       {
          network_scores_updated = 0;
-         world_global.active_route_board = closest;
-
-         struct route *route = &world->routes[closest];
+         world_global.sfd.active_route_board = closest;
 
-         u32 id = route->track_id;
+         ent_route *route = mdl_arritm( &world->ent_route, closest );
+         u32 id = route->official_track_id;
 
-         if( id != 0xffffffff )
-         {
+         if( id != 0xffffffff ){
             struct netmsg_board *local_board = 
                &scoreboard_client_data.boards[id];
 
-            for( int i=0; i<13; i++ )
-            {
+            for( int i=0; i<13; i++ ){
                sfd_encode( i, &local_board->data[27*i] );
             }
+         }else{
+            sfd_encode( 0, mdl_pstr( &world->meta, route->pstr_name ) );
+            sfd_encode( 1, "No data" );
          }
       }
    }
-   
-   /* TODO: Bvh */
+   sfd_update();
 
    static float random_accum = 0.0f;
    random_accum += vg.time_delta;
 
    u32 random_ticks = 0;
 
-   while( random_accum > 0.1f )
-   {
+   while( random_accum > 0.1f ){
       random_accum -= 0.1f;
       random_ticks ++;
    }
 
    float radius = 25.0f;
-   boxf trigger_proximity;
-   v3_add( pos, (v3f){ radius, radius, radius }, trigger_proximity[1] );
-   v3_sub( pos, (v3f){ radius, radius, radius }, trigger_proximity[0] );
+   boxf volume_proximity;
+   v3_add( pos, (v3f){ radius, radius, radius }, volume_proximity[1] );
+   v3_sub( pos, (v3f){ radius, radius, radius }, volume_proximity[0] );
 
    bh_iter it;
    bh_iter_init( 0, &it );
    int idx;
 
-   int in_trigger = 0;
+   int in_volume = 0;
 
-   while( bh_next( world->trigger_bh, &it, trigger_proximity, &idx ) )
-   {
-      struct trigger_zone *zone = &world->triggers[idx];
+   while( bh_next( world->volume_bh, &it, volume_proximity, &idx ) ){
+      ent_volume *volume = mdl_arritm( &world->ent_volume, idx );
 
-      if( zone->classtype == k_classtype_particle_box )
-      {
-         vg_line_boxf_transformed( zone->transform, (boxf){{-1.0f,-1.0f,-1.0f},
-                                                           { 1.0f, 1.0f, 1.0f}}, 
-                                                           0xff00c0ff );
-         for( int j=0; j<random_ticks; j++ )
+      boxf cube = {{-1.0f,-1.0f,-1.0f},{1.0f,1.0f,1.0f}};
+      
+      if( volume->type == k_volume_subtype_trigger ){
+         v3f local;
+         m4x3_mulv( volume->to_local, pos, local );
+
+         if( (fabsf(local[0]) <= 1.0f) &&
+             (fabsf(local[1]) <= 1.0f) &&
+             (fabsf(local[2]) <= 1.0f) )
          {
-            logic_packet packet;
-            packet.location = zone->target_logic_brick;
-            packet.function = 0;
+            in_volume = 1;
+            vg_line_boxf_transformed( volume->to_world, cube, 0xff00ff00 );
 
-            packet.type = k_mdl_128bit_datatype_vec3;
-            packet.data._v4f[0] = vg_randf()*2.0f-1.0f;
-            packet.data._v4f[1] = vg_randf()*2.0f-1.0f;
-            packet.data._v4f[2] = vg_randf()*2.0f-1.0f;
-            m4x3_mulv( zone->transform, packet.data._v4f, packet.data._v4f );
+            if( !world_global.in_volume ){
+               ent_call basecall;
+               basecall.ent.index = idx;
+               basecall.ent.type = k_ent_volume;
+               basecall.function = k_ent_function_trigger;
+               basecall.data = NULL;
 
-            logic_bricks_send_packet( world, &packet );
+               entity_call( world, &basecall );
+            }
          }
-         continue;
+         else
+            vg_line_boxf_transformed( volume->to_world, cube, 0xff0000ff );
       }
+      else if( volume->type == k_volume_subtype_particle ){
+         vg_line_boxf_transformed( volume->to_world, cube, 0xff00c0ff );
 
-      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_trigger = 1;
-
-         if( !world_global.in_trigger )
-         {
-            logic_packet packet;
-            packet.location = zone->target_logic_brick;
-            packet.function = 0;
+         for( int j=0; j<random_ticks; j++ ){
+            ent_call basecall;
+            basecall.ent.index = idx;
+            basecall.ent.type = k_ent_volume;
+            basecall.function = k_ent_function_trigger;
+            basecall.data = NULL;
 
-            packet.type = k_mdl_128bit_datatype_vec3;
-            v3_copy( pos, packet.data._v4f );
-
-            logic_bricks_send_packet( world, &packet );
+            entity_call( world, &basecall );
          }
-         
-         vg_line_boxf_transformed( zone->transform, (boxf){{-1.0f,-1.0f,-1.0f},
-                                                           { 1.0f, 1.0f, 1.0f}}, 
-                                                           0xff00ff00 );
-      }
-      else
-      {
-         vg_line_boxf_transformed( zone->transform, (boxf){{-1.0f,-1.0f,-1.0f},
-                                                           { 1.0f, 1.0f, 1.0f}}, 
-                                                           0xff0000ff );
       }
    }
+   world_global.in_volume = in_volume;
 
+#if 0
    if( k_debug_light_indices )
    {
-      for( int i=0; i<world->light_count; i++ )
-      {
+      for( int i=0; i<world->light_count; i++ ){
          struct world_light *light = &world->lights[i];
          struct classtype_world_light *inf = light->inf;
 
@@ -896,31 +674,7 @@ VG_STATIC void world_update( world_instance *world, v3f pos )
       }
    }
 
-   world_global.in_trigger = in_trigger;
-   sfd_update();
-
-   if( debug_logic_bricks )
-      logic_bricks_debug( world );
-
-   /* process soundscape transactions */
-   audio_lock();
-   for( int i=0; i<world->soundscape_count; i++ )
-   {
-      struct soundscape *s = &world->soundscapes[i];
-      s->usage_count = 0;
-
-      for( int j=0; j<s->max_instances; j++ )
-      {
-         if( s->channels[j] )
-         {
-            if( audio_channel_finished(s->channels[j]) )
-               s->channels[j] = audio_relinquish_channel( s->channels[j] );
-            else
-               s->usage_count ++;
-         }
-      }
-   }
-   audio_unlock();
+#endif
 }
 
 /* 
@@ -971,16 +725,14 @@ VG_STATIC int spherecast_world( world_instance *world,
    float min_t = 1.0f;
 
    int idx;
-   while( bh_next( world->geo_bh, &it, region, &idx ) )
-   {
+   while( bh_next( world->geo_bh, &it, region, &idx ) ){
       u32 *ptri = &world->scene_geo->arrindices[ idx*3 ];
       v3f tri[3];
 
       boxf box;
       box_init_inf( box );
 
-      for( int j=0; j<3; j++ )
-      {
+      for( int j=0; j<3; j++ ){
          v3_copy( world->scene_geo->arrvertices[ptri[j]].co, tri[j] );
          box_addpt( box, tri[j] );
       }
@@ -993,10 +745,8 @@ VG_STATIC int spherecast_world( world_instance *world,
       
       float t;
       v3f n1;
-      if( spherecast_triangle( tri, pa, dir, r, &t, n1 ) )
-      {
-         if( t < min_t )
-         {
+      if( spherecast_triangle( tri, pa, dir, r, &t, n1 ) ){
+         if( t < min_t ){
             min_t = t;
             hit = idx;
             v3_copy( n1, n );
@@ -1009,34 +759,158 @@ VG_STATIC int spherecast_world( world_instance *world,
 }
 
 VG_STATIC 
-struct world_material *world_tri_index_material( world_instance *world, 
+struct world_surface *world_tri_index_surface( world_instance *world, 
                                                  u32 index )
 {
-   for( int i=1; i<world->material_count; i++ )
-   {
-      struct world_material *mat = &world->materials[i];
+   for( int i=1; i<world->surface_count; i++ ){
+      struct world_surface *surf = &world->surfaces[i];
 
-      if( (index >= mat->sm_geo.vertex_start) &&
-          (index  < mat->sm_geo.vertex_start+mat->sm_geo.vertex_count ) )
+      if( (index >= surf->sm_geo.vertex_start) &&
+          (index  < surf->sm_geo.vertex_start+surf->sm_geo.vertex_count ) )
       {
-         return mat;
+         return surf;
       }
    }
 
-   /* error material */
-   return &world->materials[0];
+   return &world->surfaces[0];
 }
 
-VG_STATIC struct world_material *world_contact_material( world_instance *world,
+VG_STATIC struct world_surface *world_contact_surface( world_instance *world,
                                                          rb_ct *ct )
 {
-   return world_tri_index_material( world, ct->element_id );
+   return world_tri_index_surface( world, ct->element_id );
+}
+
+VG_STATIC struct world_surface *ray_hit_surface( world_instance *world,
+                                                 ray_hit *hit )
+{
+   return world_tri_index_surface( world, hit->tri[0] );
+}
+
+/* 
+ * -----------------------------------------------------------------------------
+ *                              Audio sampling
+ * -----------------------------------------------------------------------------
+ */
+
+VG_STATIC 
+enum audio_sprite_type world_audio_sample_sprite_random(v3f origin, v3f output);
+VG_STATIC void world_audio_sample_distances( v3f co, int *index, float *value );
+
+#include "audio.h"
+
+/*
+ * Trace out a random point, near the player to try and determine water areas
+ */
+VG_STATIC 
+enum audio_sprite_type world_audio_sample_sprite_random(v3f origin, v3f output)
+{
+   v3f chance = { (vg_randf()-0.5f) * 30.0f, 
+                  8.0f,
+                  (vg_randf()-0.5f) * 30.0f };
+   
+   v3f pos;
+   v3_add( chance, origin, pos );
+
+   ray_hit contact;
+   contact.dist = vg_minf( 16.0f, pos[1] );
+
+   world_instance *world = get_active_world();
+   
+   if( ray_world( world, pos, (v3f){0.0f,-1.0f,0.0f}, &contact ) ){
+      struct world_surface *mat = ray_hit_surface( world, &contact );
+
+      if( mat->info.surface_prop == k_surface_prop_grass){
+         v3_copy( contact.pos, output );
+         return k_audio_sprite_type_grass;
+      }
+      else{
+         return k_audio_sprite_type_none;
+      }
+   }
+
+   output[0] = pos[0];
+   output[1] = 0.0f;
+   output[2] = pos[2];
+
+   float dist = fabsf(output[1] - origin[1]);
+   
+   if( world->water.enabled && dist<=40.0f )
+      return k_audio_sprite_type_water;
+   else
+      return k_audio_sprite_type_none;
 }
 
-VG_STATIC struct world_material *ray_hit_material( world_instance *world,
-                                                   ray_hit *hit )
+VG_STATIC void world_audio_sample_distances( v3f co, int *index, float *value )
 {
-   return world_tri_index_material( world, hit->tri[0] );
+   float inr3 = 0.57735027,
+         inr2 = 0.70710678118;
+
+   v3f sample_directions[] = {
+      { -1.0f,  0.0f,  0.0f },
+      {  1.0f,  0.0f,  0.0f },
+      {  0.0f,  0.0f,  1.0f },
+      {  0.0f,  0.0f, -1.0f },
+      {  0.0f,  1.0f,  0.0f },
+      {  0.0f, -1.0f,  0.0f },
+      { -inr3,  inr3,  inr3 },
+      {  inr3,  inr3,  inr3 },
+      { -inr3,  inr3, -inr3 },
+      {  inr3,  inr3, -inr3 },
+      { -inr2,  0.0f,  inr2 },
+      {  inr2,  0.0f,  inr2 },
+      { -inr2,  0.0f, -inr2 },
+      {  inr2,  0.0f, -inr2 },
+   };
+
+   static int si = 0;
+   static float distances[16];
+
+   ray_hit ray;
+   ray.dist = 5.0f;
+
+   v3f rc, rd, ro;
+   v3_copy( sample_directions[ si ], rd );
+   v3_add( co, (v3f){0.0f,1.5f,0.0f}, ro );
+   v3_copy( ro, rc );
+
+   float dist = 200.0f;
+
+   for( int i=0; i<10; i++ ){
+      if( ray_world( get_active_world(), rc, rd, &ray ) ){
+         dist = (float)i*5.0f + ray.dist;
+         break;
+      }
+      else{
+         v3_muladds( rc, rd, ray.dist, rc );
+      }
+   }
+
+   distances[si] = dist;
+
+   if( vg_lines.draw ){
+      for( int i=0; i<14; i++ ){
+         if( distances[i] != 200.0f ){
+            u32 colours[] = { VG__RED, VG__BLUE, VG__GREEN,
+                              VG__CYAN, VG__YELOW, VG__PINK,
+                              VG__WHITE };
+
+            u32 colour = colours[i%7];
+
+            v3f p1;
+            v3_muladds( ro, sample_directions[i], distances[i], p1 );
+            vg_line( ro, p1, colour );
+            vg_line_pt3( p1, 0.1f, colour );
+         }
+      }
+   }
+
+   *index = si;
+   *value = dist;
+
+   si ++;
+   if( si >= 14 )
+      si = 0;
 }
 
 #endif /* WORLD_H */