X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=audio.h;h=34ebb3a4ad3a7866468654fcc932a898d4337d76;hb=bdac014448b6ec968fe645f1581f321144f07dba;hp=3eeace9575098e51d1dbbdf4d5b5e29dde965710;hpb=ba5f879f85b9cab1e2b37241399d79709fe4f584;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/audio.h b/audio.h
index 3eeace9..34ebb3a 100644
--- a/audio.h
+++ b/audio.h
@@ -1,3 +1,7 @@
+/*
+ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ */
+
 #include "common.h"
 
 #ifndef AUDIO_H
@@ -12,53 +16,68 @@ static int   k_audio_debug_soundscape = 0;
 
 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 }
+   { .path="sound/skate.ogg" },
+   { .path="sound/wheel.ogg" },
+   { .path="sound/slide.ogg" },
+   { .path="sound/reverb.ogg" }
 };
 
-audio_clip audio_ding =
-{ .path = "sound/ding.ogg", .source_mode=k_audio_source_compressed };
+audio_clip audio_splash =
+{ .path = "sound/splash.ogg" };
 
 audio_clip audio_jumps[] = {
-   { .path = "sound/jump0.ogg", .source_mode=k_audio_source_compressed, },
-   { .path = "sound/jump1.ogg", .source_mode=k_audio_source_compressed, },
-   { .path = "sound/jump2.ogg", .source_mode=k_audio_source_compressed, },
-   { .path = "sound/jump3.ogg", .source_mode=k_audio_source_compressed, }
+   { .path = "sound/jump0.ogg" },
+   { .path = "sound/jump1.ogg" },
 };
 
 audio_clip audio_footsteps[] = {
- {.path = "sound/step_concrete0.ogg", .source_mode=k_audio_source_compressed,},
- {.path = "sound/step_concrete1.ogg", .source_mode=k_audio_source_compressed,},
- {.path = "sound/step_concrete2.ogg", .source_mode=k_audio_source_compressed,},
- {.path = "sound/step_concrete3.ogg", .source_mode=k_audio_source_compressed,}
+ {.path = "sound/step_concrete0.ogg" },
+ {.path = "sound/step_concrete1.ogg" },
+ {.path = "sound/step_concrete2.ogg" },
+ {.path = "sound/step_concrete3.ogg" }
 };
 
 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 }
+   { .path = "sound/land0.ogg" },
+   { .path = "sound/land1.ogg" },
+   { .path = "sound/land2.ogg" },
+   { .path = "sound/landsk0.ogg" },
+   { .path = "sound/landsk1.ogg" },
+   { .path = "sound/onto.ogg" },
+   { .path = "sound/outo.ogg" },
+};
+
+audio_clip audio_water[] = {
+   { .path = "sound/wave0.ogg" },
+   { .path = "sound/wave1.ogg" },
+   { .path = "sound/wave2.ogg" },
+   { .path = "sound/wave3.ogg" },
+   { .path = "sound/wave4.ogg" },
+   { .path = "sound/wave5.ogg" }
+};
+
+audio_clip audio_grass[] = {
+   { .path = "sound/grass0.ogg" },
+   { .path = "sound/grass1.ogg" },
+   { .path = "sound/grass2.ogg" },
+   { .path = "sound/grass3.ogg" },
 };
 
 audio_clip audio_ambience[] =
 {
-   {.path="sound/town_generic.ogg", 
-      .source_mode=k_audio_source_compressed }
+   { .path="sound/town_generic.ogg" }
 };
 
 audio_clip audio_gate_pass = {
-   .path = "sound/gate_pass.ogg", .source_mode=k_audio_source_compressed
+   .path = "sound/gate_pass.ogg"
 };
 
 audio_clip audio_gate_lap = {
-   .path = "sound/gate_lap.ogg", .source_mode=k_audio_source_compressed
+   .path = "sound/gate_lap.ogg"
 };
 
 audio_clip audio_gate_ambient = {
-.path = "sound/gate_ambient.ogg", .source_mode=k_audio_source_compressed
+.path = "sound/gate_ambient.ogg"
 };
 
 audio_player ambient_player =
@@ -66,6 +85,32 @@ audio_player ambient_player =
    .name = "Ambience"
 };
 
+audio_player audio_rewind_player =
+{
+   .name = "Rewind"
+};
+
+audio_clip audio_rewind[] = {
+{ .path = "sound/rewind_start.ogg" },
+{ .path = "sound/rewind_end_1.5.ogg" },
+{ .path = "sound/rewind_end_2.5.ogg" },
+{ .path = "sound/rewind_end_6.5.ogg" },
+{ .path = "sound/rewind_clack.ogg" },
+};
+
+audio_clip audio_ui[] = {
+   { .path = "sound/ui_click.ogg" },
+   { .path = "sound/ui_ding.ogg" },
+};
+
+audio_player ambient_sprites[4] =
+{
+   { .name = "Ambient Sprites 0" },
+   { .name = "Ambient Sprites 1" },
+   { .name = "Ambient Sprites 2" },
+   { .name = "Ambient Sprites 3" },
+};
+
 audio_player audio_player0 =
 {
    .name = "Player0",
@@ -104,17 +149,26 @@ static void audio_init(void)
    audio_player_init( &audio_player3 );
    audio_player_init( &audio_player_gate );
    audio_player_init( &ambient_player );
+   audio_player_init( &ambient_sprites[0] );
+   audio_player_init( &ambient_sprites[1] );
+   audio_player_init( &ambient_sprites[2] );
+   audio_player_init( &ambient_sprites[3] );
    audio_player_init( &audio_player_extra );
+   audio_player_init( &audio_rewind_player );
 
    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_splash, 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_clip_loadn( audio_water, vg_list_size(audio_water) );
+   audio_clip_loadn( audio_grass, vg_list_size(audio_grass) );
    audio_clip_loadn( audio_footsteps, vg_list_size(audio_footsteps) );
+   audio_clip_loadn( audio_rewind, vg_list_size(audio_rewind) );
+   audio_clip_loadn( audio_ui, vg_list_size(audio_ui) );
 
    audio_lock();
    u32 flags = AUDIO_FLAG_LOOP|AUDIO_FLAG_SPACIAL_3D;
@@ -125,9 +179,15 @@ static void audio_init(void)
    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_flags( &ambient_sprites[0], AUDIO_FLAG_SPACIAL_3D );
+   audio_player_set_flags( &ambient_sprites[1], AUDIO_FLAG_SPACIAL_3D );
+   audio_player_set_flags( &ambient_sprites[2], AUDIO_FLAG_SPACIAL_3D );
+   audio_player_set_flags( &ambient_sprites[3], AUDIO_FLAG_SPACIAL_3D );
    audio_player_set_vol( &ambient_player, 1.0f );
-   audio_player_set_vol( &audio_player_gate, 5.0f );
+   audio_player_set_vol( &audio_player_gate, 0.0f );
    audio_player_set_vol( &audio_player_extra, 1.0f );
+   audio_player_set_vol( &audio_rewind_player, 0.2f );
+   audio_player_set_flags( &audio_rewind_player, 0x00 );
 
    audio_player_playclip( &audio_player0, &audio_board[0] );
    audio_player_playclip( &audio_player1, &audio_board[1] );
@@ -155,8 +215,10 @@ static void audio_init(void)
    });
 }
 
-static void audio_free(void)
+static void audio_free(void*_)
 {
+   /* TODO! */
+   vg_warn( "UNIMPLEMENTED: audio_free()\n" );
 }
 
 static void audio_sample_occlusion( v3f origin )
@@ -168,6 +230,7 @@ static void audio_sample_occlusion( v3f origin )
 
    int lv = 0;
    v3f last;
+   v3_zero(last);
 
    for( int i=0; i<sample_count; i++ )
    {
@@ -202,11 +265,55 @@ static void audio_sample_occlusion( v3f origin )
    }
 
    float occlusion = 1.0f - (d * (1.0f/(sample_dist*(float)sample_count))),
-         rate = ktimestep * k_audio_occlusion_rate,
+         rate = VG_TIMESTEP_FIXED * k_audio_occlusion_rate,
          target = powf( occlusion, 6.0f );
    audio_occlusion_current = vg_lerpf( audio_occlusion_current, target, rate );
 }
 
+enum audio_sprite_type 
+{
+   k_audio_sprite_type_none,
+   k_audio_sprite_type_grass,
+   k_audio_sprite_type_water
+};
+
+/*
+ * Trace out a random point, near the player to try and determine water areas
+ */
+static enum audio_sprite_type 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] );
+
+   
+   if( ray_world( pos, (v3f){0.0f,-1.0f,0.0f}, &contact ) )
+   {
+      if( ray_hit_is_ramp( &contact ) )
+      {
+         vg_line( pos, contact.pos, 0xff0000ff );
+         vg_line_pt3( contact.pos, 0.3f, 0xff0000ff );
+         return k_audio_sprite_type_none;
+      }
+
+      v3_copy( contact.pos, output );
+      return k_audio_sprite_type_grass;
+   }
+
+   output[0] = pos[0];
+   output[1] = 0.0f;
+   output[2] = pos[2];
+
+   return k_audio_sprite_type_water;
+}
+
 static void audio_debug_soundscapes(void)
 {
    if( !k_audio_debug_soundscape ) return;
@@ -214,13 +321,13 @@ static void audio_debug_soundscapes(void)
    char buf[64];
    snprintf( buf, 31, "occlusion: %.5f", audio_occlusion_current );
 
-   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;
+   vg_uictx.cursor[0] = 450;
+   vg_uictx.cursor[1] = 10;
+   vg_uictx.cursor[2] = audio_occlusion_current * 200.0f;
+   vg_uictx.cursor[3] = 20;
 
-   gui_fill_rect( ui_global_ctx.cursor, 0x55cccccc );
-   gui_text( ui_global_ctx.cursor, buf, 1, 0 );
+   ui_fill_rect( vg_uictx.cursor, 0x55cccccc );
+   ui_text( vg_uictx.cursor, buf, 1, 0 );
 }
 
 #endif /* AUDIO_H */