well yeah i guess

[carveJwlIkooP6JGAAIwe30JlM.git] / audio.h

diff --git a/audio.h b/audio.h
index a984dd021c0cec676fb9a30f37a116888c54db27..34ebb3a4ad3a7866468654fcc932a898d4337d76 100644 (file)
--- a/audio.h
+++ b/audio.h
@@ -16,69 +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_splash =
-{ .path = "sound/splash.ogg", .source_mode=k_audio_source_compressed };
+{ .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", .source_mode=k_audio_source_compressed },
-   { .path = "sound/wave1.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/wave2.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/wave3.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/wave4.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/wave5.ogg", .source_mode=k_audio_source_compressed }
+   { .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", .source_mode=k_audio_source_compressed },
-   { .path = "sound/grass1.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/grass2.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/grass3.ogg", .source_mode=k_audio_source_compressed },
+   { .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 =
@@ -86,6 +85,24 @@ 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" },
@@ -137,6 +154,7 @@ static void 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) );
@@ -149,6 +167,8 @@ static void 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;
@@ -166,6 +186,8 @@ static void 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] );
@@ -243,7 +265,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 );
 }
@@ -299,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 */