X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=ad01803a6d02ca2d76f2990b1ea5a064aff3b1fa;hb=000297f007a08b25f458656bfb8dfe4345f2ec32;hp=9e162b2c322af6695a7857e08275c1c726910744;hpb=56f320d8ce6e8997370ec8e02fe50ca2d07b67f0;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 9e162b2..ad01803 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -257,13 +257,17 @@ VG_STATIC void vg_load(void)
    world_audio_init();
 
    /* 'systems' are completely loaded now */
-#if 0
-   strcpy( world.world_name, "maps/mp_mtzero.mdl" );
-   strcpy( world.world_name, "maps/mp_gridmap.mdl" );
-#endif
 
    /* load home world */
    world_load( &world_global.worlds[0], "maps/mp_home.mdl" );
+
+#if 0
+   world_load( &world_global.worlds[1], "maps/mp_gridmap.mdl" );
+   world_load( &world_global.worlds[2], "maps/mp_mtzero.mdl" );
+   world_link_nonlocal_gates( 0, 1 );
+   world_link_nonlocal_gates( 0, 2 );
+#endif
+
    vg_console_load_autos();
 }
 
@@ -295,6 +299,8 @@ VG_STATIC void vg_update(void)
 
       player__pre_update( &localplayer );
       world_update( get_active_world(), localplayer.rb.co );
+
+      audio_update();
    }
 }
 
@@ -330,6 +336,88 @@ VG_STATIC void vg_update_post(void)
 
       player__post_update( &localplayer );
 
+      
+      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( localplayer.rb.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;
+
+
+      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 );
+         }
+      }
+
+      si ++;
+      if( si >= 14 )
+         si = 0;
+
+
+      /* FIXME: TEMP */
+      audio_lock();
+      vg_dsp.echo_distances[si] = dist;
+
+      v3f ears = { 1.0f,0.0f,0.0f };
+      m3x3_mulv( main_camera.transform, ears, ears );
+      v3_copy( ears, vg_audio.listener_ears );
+      v3_copy( main_camera.transform[3], vg_audio.listener_pos );
+      audio_unlock();
+
 #if 0
       menu_update();
       vehicle_update_post();
@@ -411,8 +499,8 @@ VG_STATIC void render_scene(void)
    /* Draw world */
    glEnable( GL_DEPTH_TEST );
 
-   world_instance *world = get_active_world();
-   render_world( world, &main_camera );
+   world_instance *view_world = localplayer.viewable_world;
+   render_world( view_world, &main_camera );
 
    int player_transparent = 1,
        player_draw        = 1;
@@ -427,10 +515,10 @@ VG_STATIC void render_scene(void)
       player__render( &main_camera, &localplayer );
 
 
-   render_water_texture( world, &main_camera );
+   render_water_texture( view_world, &main_camera );
    render_fb_bind( gpipeline.fb_main );
-   render_water_surface( world, &main_camera );
-   render_world_gates( world, &main_camera );
+   render_water_surface( view_world, &main_camera );
+   render_world_gates( view_world, &main_camera );
 
    if( player_transparent && player_draw )
       render_player_transparent();
@@ -517,11 +605,13 @@ VG_STATIC void vg_render(void)
    glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
 
    render_main_game();
+
+   m4x4_copy( main_camera.mtx.pv, vg.pv );
    
    /* Other shite */
    glDisable(GL_BLEND);
    glDisable( GL_DEPTH_TEST );
-   vg_lines_drawall( (float *)main_camera.mtx.pv );
+   vg_lines_drawall();
    glViewport( 0,0, vg.window_x, vg.window_y );
 }