oh yeah mr crabs

[carveJwlIkooP6JGAAIwe30JlM.git] / audio.h

diff --git a/audio.h b/audio.h
index f6baa201a409e29d8f79d88f3f2ad2b0dc259132..fd212868153367ca2c19c7aad147ffb1adc684e5 100644 (file)
--- 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
@@ -24,8 +28,6 @@ audio_clip audio_splash =
 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, }
 };
 
 audio_clip audio_footsteps[] = {
@@ -36,11 +38,13 @@ audio_clip audio_footsteps[] = {
 };
 
 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", .source_mode=k_audio_source_compressed },
+   { .path = "sound/land1.ogg", .source_mode=k_audio_source_compressed },
+   { .path = "sound/land2.ogg", .source_mode=k_audio_source_compressed },
+   { .path = "sound/landsk0.ogg", .source_mode=k_audio_source_compressed },
+   { .path = "sound/landsk1.ogg", .source_mode=k_audio_source_compressed },
+   { .path = "sound/onto.ogg", .source_mode=k_audio_source_compressed },
+   { .path = "sound/outo.ogg", .source_mode=k_audio_source_compressed },
 };
 
 audio_clip audio_water[] = {
@@ -82,6 +86,24 @@ audio_player ambient_player =
    .name = "Ambience"
 };
 
+audio_player audio_rewind_player =
+{
+   .name = "Rewind"
+};
+
+audio_clip audio_rewind[] = {
+{ .path = "sound/rewind_start.ogg", .source_mode=k_audio_source_compressed },
+{ .path = "sound/rewind_end_1.5.ogg", .source_mode=k_audio_source_compressed},
+{ .path = "sound/rewind_end_2.5.ogg", .source_mode=k_audio_source_compressed },
+{ .path = "sound/rewind_end_6.5.ogg", .source_mode=k_audio_source_compressed },
+{ .path = "sound/rewind_clack.ogg", .source_mode=k_audio_source_compressed },
+};
+
+audio_clip audio_ui[] = {
+   { .path = "sound/ui_click.ogg", .source_mode=k_audio_source_compressed },
+   { .path = "sound/ui_ding.ogg", .source_mode=k_audio_source_compressed },
+};
+
 audio_player ambient_sprites[4] =
 {
    { .name = "Ambient Sprites 0" },
@@ -120,7 +142,7 @@ audio_player audio_player_gate =
    .name = "Gate"
 };
 
-static int audio_init(void)
+static void audio_init(void)
 {
    audio_player_init( &audio_player0 );
    audio_player_init( &audio_player1 );
@@ -133,6 +155,7 @@ static int audio_init(void)
    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) );
@@ -145,6 +168,8 @@ static int audio_init(void)
    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;
@@ -162,6 +187,8 @@ static int audio_init(void)
    audio_player_set_vol( &ambient_player, 1.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] );
@@ -187,8 +214,6 @@ static int audio_init(void)
       .opt_f32 = { .clamp = 0 },
       .persistent = 1
    });
-
-   return 1;
 }
 
 static void audio_free(void*_)
@@ -241,7 +266,7 @@ 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 );
 }