X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=audio.h;h=2d0417fd3293a9b8902f282ab4e1fd6ec69b5ca8;hb=76042e561d89b232f04cac8a431b5cd7b30a6b9d;hp=9622c50a81eee572bb52a082339f45668d4e15b0;hpb=23a1be081ab9e378cba49a23b8ed4d4082b580c1;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/audio.h b/audio.h
index 9622c50..2d0417f 100644
--- a/audio.h
+++ b/audio.h
@@ -19,7 +19,10 @@ audio_clip audio_board[] =
    { .path="sound/skate.ogg" },
    { .path="sound/wheel.ogg" },
    { .path="sound/slide.ogg" },
-   { .path="sound/reverb.ogg" }
+   { .path="sound/reverb.ogg" },
+   { .path="sound/grind_loop.ogg" },
+   { .path="sound/grind_enter.ogg" },
+   { .path="sound/grind_exit.ogg" }
 };
 
 audio_clip audio_splash =
@@ -149,6 +152,11 @@ audio_player audio_player3 =
    .name = "Player3",
 };
 
+audio_player audio_player4 =
+{
+   .name = "Player4",
+};
+
 audio_player audio_player_extra =
 {
    .name = "PlayerInst"
@@ -165,6 +173,7 @@ VG_STATIC void audio_init(void)
    audio_player_init( &audio_player1 );
    audio_player_init( &audio_player2 );
    audio_player_init( &audio_player3 );
+   audio_player_init( &audio_player4 );
    audio_player_init( &audio_player_gate );
    audio_player_init( &ambient_player );
    audio_player_init( &ambient_sprites[0] );
@@ -198,6 +207,7 @@ VG_STATIC void audio_init(void)
    audio_player_set_flags( &audio_player0, flags );
    audio_player_set_flags( &audio_player1, flags );
    audio_player_set_flags( &audio_player2, flags );
+   audio_player_set_flags( &audio_player4, flags );
    audio_player_set_flags( &audio_player_gate, flags );
    audio_player_set_flags( &audio_player3, AUDIO_FLAG_LOOP );
    audio_player_set_flags( &ambient_player, AUDIO_FLAG_LOOP );
@@ -215,29 +225,30 @@ VG_STATIC void audio_init(void)
    audio_player_playclip( &audio_player1, &audio_board[1] );
    audio_player_playclip( &audio_player2, &audio_board[2] );
    audio_player_playclip( &audio_player3, &audio_board[3] );
+   audio_player_playclip( &audio_player4, &audio_board[4] );
    audio_player_playclip( &ambient_player, &audio_ambience[0] );
    audio_player_playclip( &audio_player_gate, &audio_gate_ambient );
 
    audio_unlock();
 
-   vg_convar_push( (struct vg_convar){
+   vg_var_push( (struct vg_var){
       .name = "aud_debug_soundscape",
       .data = &k_audio_debug_soundscape,
-      .data_type = k_convar_dtype_i32,
+      .data_type = k_var_dtype_i32,
       .opt_i32 = { .min=0, .max=1, .clamp=0 },
       .persistent = 1
    });
 
-   vg_convar_push( (struct vg_convar){
+   vg_var_push( (struct vg_var){
       .name = "aud_occlusion_rate",
       .data = &k_audio_occlusion_rate,
-      .data_type = k_convar_dtype_f32,
+      .data_type = k_var_dtype_f32,
       .opt_f32 = { .clamp = 0 },
       .persistent = 1
    });
 }
 
-VG_STATIC void audio_free(void*_)
+VG_STATIC void audio_free(void)
 {
    /* TODO! */
    vg_warn( "UNIMPLEMENTED: audio_free()\n" );
@@ -266,11 +277,14 @@ VG_STATIC void audio_sample_occlusion( v3f origin )
       {
          d += contact.dist;
 
+#if 0
          vg_line( origin, contact.pos, 0xff0000ff );
          vg_line_pt3( contact.pos, 0.1f, 0xff0000ff );
 
          if( lv )
             vg_line( contact.pos, last, 0xffffffff );
+#endif
+
          v3_copy( contact.pos, last );
          lv = 1;
       }
@@ -278,7 +292,10 @@ VG_STATIC void audio_sample_occlusion( v3f origin )
       {
          v3f p1;
          v3_muladds( origin, dir, sample_dist, p1 );
+
+#if 0
          vg_line( origin, p1, 0xffcccccc );
+#endif
 
          d += sample_dist;
          lv = 0;
@@ -288,7 +305,7 @@ VG_STATIC void audio_sample_occlusion( v3f origin )
 
    float occlusion = 1.0f - (d * (1.0f/(sample_dist*(float)sample_count))),
          rate = VG_TIMESTEP_FIXED * k_audio_occlusion_rate,
-         target = powf( occlusion, 6.0f );
+         target = powf( vg_maxf(occlusion,0.0f), 6.0f );
    audio_occlusion_current = vg_lerpf( audio_occlusion_current, target, rate );
 }
 
@@ -327,8 +344,10 @@ VG_STATIC enum audio_sprite_type audio_sample_sprite_random( v3f origin,
       }
       else
       {
+#if 0
          vg_line( pos, contact.pos, 0xff0000ff );
          vg_line_pt3( contact.pos, 0.3f, 0xff0000ff );
+#endif
          return k_audio_sprite_type_none;
       }
    }