X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=audio.h;h=a9815861680d4c247b83f8dd8d23a7c4908855fb;hb=4625f91b85d2badbb719a7f5bcaa2426af25911b;hp=0572d6dcf52b623fc7a3f313c370e0d70e0f4d7c;hpb=d4746875c05dd3e077e1b266e50ffe4856b45502;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/audio.h b/audio.h
index 0572d6d..a981586 100644
--- a/audio.h
+++ b/audio.h
@@ -1,7 +1,8 @@
+#include "common.h"
+
 #ifndef AUDIO_H
 #define AUDIO_H
 
-#include "common.h"
 #include "world.h"
 
 static float audio_occlusion_current = 0.0f,
@@ -9,59 +10,125 @@ static float audio_occlusion_current = 0.0f,
 
 static int   k_audio_debug_soundscape = 0;
 
-sfx_vol_control audio_vol_all = { .val = 1.0f, .name = "All" };
+audio_clip audio_board[] =
+{
+   {.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
+};
 
-sfx_set audio_board =
+audio_player ambient_player =
 {
-   .sources = "sound/skate.ogg\0"
-              "sound/wheel.ogg\0"
-              "sound/slide.ogg\0"
-              "sound/reverb.ogg\0"
+   .name = "Ambience"
 };
 
-sfx_system audio_player0 =
+audio_player audio_player0 =
 {
-   .vol = 0.0f,
-   .ch = 1,
-   .vol_src = &audio_vol_all,
    .name = "Player0",
-   .flags = SFX_FLAG_REPEAT | SFX_FLAG_PERSISTENT 
 };
 
-sfx_system audio_player1 =
+audio_player audio_player1 =
 {
-   .vol = 0.0f,
-   .ch = 1,
-   .vol_src = &audio_vol_all,
    .name = "Player1",
-   .flags = SFX_FLAG_REPEAT | SFX_FLAG_PERSISTENT
 };
 
-sfx_system audio_player2 =
+audio_player audio_player2 =
 {
-   .vol = 0.0f,
-   .ch = 1,
-   .vol_src = &audio_vol_all,
    .name = "Player2",
-   .flags = SFX_FLAG_REPEAT | SFX_FLAG_PERSISTENT
 };
 
-sfx_system audio_player3 =
+audio_player audio_player3 =
 {
-   .vol = 0.0f,
-   .ch = 1,
-   .vol_src = &audio_vol_all,
    .name = "Player3",
-   .flags = SFX_FLAG_REPEAT | SFX_FLAG_PERSISTENT
+};
+
+audio_player audio_player_extra =
+{
+   .name = "PlayerInst"
+};
+
+audio_player audio_player_gate =
+{
+   .name = "Gate"
 };
 
 static void audio_init(void)
 {
-   sfx_set_init( &audio_board, NULL );
-   sfx_set_play( &audio_board, &audio_player0, 0 );
-   sfx_set_play( &audio_board, &audio_player1, 1 );
-   sfx_set_play( &audio_board, &audio_player2, 2 );
-   sfx_set_play( &audio_board, &audio_player3, 3 );
+   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;
+
+   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();
 
    vg_convar_push( (struct vg_convar){
       .name = "aud_debug_soundscape",
@@ -82,7 +149,6 @@ static void audio_init(void)
 
 static void audio_free(void)
 {
-   sfx_set_free( &audio_board );
 }
 
 static void audio_sample_occlusion( v3f origin )
@@ -92,17 +158,13 @@ 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;
-      dir[0] = vg_randf();
-      dir[1] = vg_randf();
-      dir[2] = vg_randf();
-
-      v3_muls( dir, 2.0f, dir );
-      v3_sub( dir, (v3f){1.0f,1.0f,1.0f}, dir );
-
-      v3_normalize( dir );
+      vg_rand_dir( dir );
 
       ray_hit contact;
       contact.dist = 15.0f;
@@ -113,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
       {
@@ -121,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))),
@@ -137,7 +206,7 @@ static void audio_debug_soundscapes(void)
    char buf[64];
    snprintf( buf, 31, "occlusion: %.5f", audio_occlusion_current );
 
-   ui_global_ctx.cursor[0] = 10;
+   ui_global_ctx.cursor[0] = 450;
    ui_global_ctx.cursor[1] = 10;
    ui_global_ctx.cursor[2] = audio_occlusion_current * 200.0f;
    ui_global_ctx.cursor[3] = 20;