latest

[carveJwlIkooP6JGAAIwe30JlM.git] / audio.h

diff --git a/audio.h b/audio.h
index 60ad27ef431bccbdbe113dbe5ed0cc099d2bc341..a9815861680d4c247b83f8dd8d23a7c4908855fb 100644 (file)
--- a/audio.h
+++ b/audio.h
@@ -10,13 +10,53 @@ static float audio_occlusion_current = 0.0f,
 
 static int   k_audio_debug_soundscape = 0;
 
-
 audio_clip audio_board[] =
 {
-   {.path="sound/skate.ogg", .source_mode=k_audio_source_mono_compressed },
-   {.path="sound/wheel.ogg", .source_mode=k_audio_source_mono_compressed },
-   {.path="sound/slide.ogg", .source_mode=k_audio_source_mono_compressed },
-   {.path="sound/reverb.ogg",.source_mode=k_audio_source_mono_compressed }
+   {.path="sound/skate.ogg", .source_mode=k_audio_source_compressed },
+   {.path="sound/wheel.ogg", .source_mode=k_audio_source_compressed },
+   {.path="sound/slide.ogg", .source_mode=k_audio_source_compressed },
+   {.path="sound/reverb.ogg",.source_mode=k_audio_source_compressed }
+};
+
+audio_clip audio_ding =
+{ .path = "sound/ding.ogg", .source_mode=k_audio_source_compressed };
+
+audio_clip audio_jumps[] = {
+   { .path = "sound/snap0.ogg", .source_mode=k_audio_source_compressed, },
+   { .path = "sound/snap1.ogg", .source_mode=k_audio_source_compressed, },
+   { .path = "sound/snap2.ogg", .source_mode=k_audio_source_compressed, },
+   { .path = "sound/snap3.ogg", .source_mode=k_audio_source_compressed, }
+};
+
+audio_clip audio_lands[] = {
+   { .path = "sound/revert0.ogg", .source_mode=k_audio_source_compressed },
+   { .path = "sound/revert1.ogg", .source_mode=k_audio_source_compressed },
+   { .path = "sound/revert2.ogg", .source_mode=k_audio_source_compressed },
+   { .path = "sound/revert3.ogg", .source_mode=k_audio_source_compressed },
+   { .path = "sound/revert4.ogg", .source_mode=k_audio_source_compressed }
+};
+
+audio_clip audio_ambience[] =
+{
+   {.path="sound/town_generic.ogg", 
+      .source_mode=k_audio_source_compressed }
+};
+
+audio_clip audio_gate_pass = {
+   .path = "sound/gate_pass.ogg", .source_mode=k_audio_source_compressed
+};
+
+audio_clip audio_gate_lap = {
+   .path = "sound/gate_lap.ogg", .source_mode=k_audio_source_compressed
+};
+
+audio_clip audio_gate_ambient = {
+.path = "sound/gate_ambient.ogg", .source_mode=k_audio_source_compressed
+};
+
+audio_player ambient_player =
+{
+   .name = "Ambience"
 };
 
 audio_player audio_player0 =
@@ -39,9 +79,34 @@ audio_player audio_player3 =
    .name = "Player3",
 };
 
+audio_player audio_player_extra =
+{
+   .name = "PlayerInst"
+};
+
+audio_player audio_player_gate =
+{
+   .name = "Gate"
+};
+
 static void audio_init(void)
 {
+   audio_player_init( &audio_player0 );
+   audio_player_init( &audio_player1 );
+   audio_player_init( &audio_player2 );
+   audio_player_init( &audio_player3 );
+   audio_player_init( &audio_player_gate );
+   audio_player_init( &ambient_player );
+   audio_player_init( &audio_player_extra );
+
    audio_clip_loadn( audio_board, vg_list_size(audio_board) );
+   audio_clip_loadn( audio_ambience, vg_list_size(audio_ambience) );
+   audio_clip_loadn( &audio_ding, 1 );
+   audio_clip_loadn( &audio_gate_pass, 1 );
+   audio_clip_loadn( &audio_gate_lap, 1 );
+   audio_clip_loadn( &audio_gate_ambient, 1 );
+   audio_clip_loadn( audio_jumps, vg_list_size(audio_jumps) );
+   audio_clip_loadn( audio_lands, vg_list_size(audio_lands) );
 
    audio_lock();
    u32 flags = AUDIO_FLAG_LOOP|AUDIO_FLAG_SPACIAL_3D;
@@ -49,12 +114,19 @@ 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_player_gate, flags );
    audio_player_set_flags( &audio_player3, AUDIO_FLAG_LOOP );
+   audio_player_set_flags( &ambient_player, AUDIO_FLAG_LOOP );
+   audio_player_set_vol( &ambient_player, 1.0f );
+   audio_player_set_vol( &audio_player_gate, 5.0f );
+   audio_player_set_vol( &audio_player_extra, 1.0f );
 
    audio_player_playclip( &audio_player0, &audio_board[0] );
    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( &ambient_player, &audio_ambience[0] );
+   audio_player_playclip( &audio_player_gate, &audio_gate_ambient );
 
    audio_unlock();
 
@@ -86,6 +158,9 @@ static void audio_sample_occlusion( v3f origin )
 
    int sample_count = 8;
 
+   int lv = 0;
+   v3f last;
+
    for( int i=0; i<sample_count; i++ )
    {
       v3f dir;
@@ -100,6 +175,11 @@ static void audio_sample_occlusion( v3f origin )
 
          vg_line( origin, contact.pos, 0xff0000ff );
          vg_line_pt3( contact.pos, 0.1f, 0xff0000ff );
+
+         if( lv )
+            vg_line( contact.pos, last, 0xffffffff );
+         v3_copy( contact.pos, last );
+         lv = 1;
       }
       else
       {
@@ -108,7 +188,9 @@ static void audio_sample_occlusion( v3f origin )
          vg_line( origin, p1, 0xffcccccc );
 
          d += sample_dist;
+         lv = 0;
       }
+
    }
 
    float occlusion = 1.0f - (d * (1.0f/(sample_dist*(float)sample_count))),