ragdoll quality improvements

[carveJwlIkooP6JGAAIwe30JlM.git] / audio.h

diff --git a/audio.h b/audio.h
index 51445b665b6edfc70e49a8d247e326bf90be157a..448906be07e9af05c101b3c07766578dc7612f4d 100644 (file)
--- a/audio.h
+++ b/audio.h
@@ -30,6 +30,14 @@ audio_clip audio_taps[] =
    { .path="sound/tap3.ogg" }
 };
 
+audio_clip audio_flips[] =
+{
+   { .path="sound/lf0.ogg" },
+   { .path="sound/lf1.ogg" },
+   { .path="sound/lf2.ogg" },
+   { .path="sound/lf3.ogg" },
+};
+
 audio_clip audio_hits[] =
 {
    { .path="sound/hit0.ogg" },
@@ -126,12 +134,69 @@ audio_clip audio_rewind[] = {
 audio_clip audio_ui[] = {
    { .path = "sound/ui_click.ogg" },
    { .path = "sound/ui_ding.ogg" },
+   { .path = "sound/teleport.ogg" }
 };
 
-VG_STATIC void audio_init(void)
+audio_clip audio_challenge[] = {
+   { .path = "sound/objective0.ogg" },
+   { .path = "sound/objective1.ogg" },
+   { .path = "sound/objective_win.ogg" },
+   { .path = "sound/ui_good.ogg" },
+   { .path = "sound/ui_inf.ogg" },
+   { .path = "sound/ui_ok.ogg" },
+   { .path = "sound/objective_fail.ogg" }
+};
+
+struct air_synth_data {
+   f32 speed;
+
+   /* internal */
+   f32 t;
+   struct dsp_biquad lpf;
+   SDL_SpinLock sl;
+}
+static air_data;
+
+static void audio_air_synth_get_samples( void *_data, f32 *buf, u32 count ){
+   struct air_synth_data *data = _data;
+
+   SDL_AtomicLock( &data->sl );
+   f32 spd = data->speed;
+   SDL_AtomicUnlock( &data->sl );
+
+   f32 s0  = sinf(data->t*2.0f),
+       s1  = sinf(data->t*0.43f),
+       s2  = sinf(data->t*1.333f),
+       sm  = vg_clampf( data->speed / 45.0f, 0, 1 ),
+       ft  = (s0*s1*s2)*0.5f+0.5f,
+       f   = vg_lerpf( 200.0f, 1200.0f, sm*0.7f + ft*0.3f ),
+       vol = 0.25f * sm;
+
+   dsp_init_biquad_butterworth_lpf( &data->lpf, f );
+
+   for( u32 i=0; i<count; i ++ ){
+      f32 v = (vg_randf64(&vg_dsp.rand) * 2.0f - 1.0f) * vol;
+      v = dsp_biquad_process( &data->lpf, v );
+
+      buf[i*2+0] = v;
+      buf[i*2+1] = v;
+   }
+
+   data->t += (f32)(count)/44100.0f;
+};
+
+static audio_clip air_synth = {
+   .flags = k_audio_format_gen,
+   .size = 0,
+   .func = audio_air_synth_get_samples,
+   .data = &air_data
+};
+
+static void audio_init(void)
 {
    audio_clip_loadn( audio_board, vg_list_size(audio_board), NULL );
    audio_clip_loadn( audio_taps, vg_list_size(audio_taps), NULL );
+   audio_clip_loadn( audio_flips, vg_list_size(audio_flips), NULL );
    audio_clip_loadn( audio_hits, vg_list_size(audio_hits), NULL );
    audio_clip_loadn( audio_ambience, vg_list_size(audio_ambience), NULL );
    audio_clip_loadn( &audio_splash, 1, NULL );
@@ -150,14 +215,20 @@ VG_STATIC void audio_init(void)
                      vg_list_size(audio_footsteps_wood), NULL );
    audio_clip_loadn( audio_rewind, vg_list_size(audio_rewind), NULL );
    audio_clip_loadn( audio_ui, vg_list_size(audio_ui), NULL );
+   audio_clip_loadn( audio_challenge, vg_list_size(audio_challenge), NULL );
 
    audio_lock();
    audio_set_lfo_wave( 0, k_lfo_polynomial_bipolar, 80.0f );
    audio_set_lfo_frequency( 0, 20.0f );
+
+   skaterift.aud_air = audio_get_first_idle_channel();
+   if( skaterift.aud_air ) 
+      audio_channel_init( skaterift.aud_air, &air_synth, 0 );
+
    audio_unlock();
 }
 
-VG_STATIC void audio_free(void)
+static void audio_free(void)
 {
    /* TODO! */
    vg_warn( "UNIMPLEMENTED: audio_free()\n" );
@@ -170,15 +241,15 @@ enum audio_sprite_type
    k_audio_sprite_type_water
 };
 
-VG_STATIC void audio_ambient_sprite_play( v3f co, audio_clip *clip )
+static void audio_ambient_sprite_play( v3f co, audio_clip *clip )
 {
    audio_lock();
-   u32 channel_id = 31342352;
-   audio_channel *ch = audio_get_group_idle_channel( channel_id, 4 );
+   u16 group_id = 0xfff0;
+   audio_channel *ch = audio_get_group_idle_channel( group_id, 4 );
 
    if( ch ){
       audio_channel_init( ch, clip, AUDIO_FLAG_SPACIAL_3D );
-      audio_channel_group( ch, channel_id );
+      audio_channel_group( ch, group_id );
       audio_channel_set_spacial( ch, co, 80.0f );
       audio_channel_edit_volume( ch, 1.0f, 1 );
       ch = audio_relinquish_channel( ch );
@@ -186,7 +257,9 @@ VG_STATIC void audio_ambient_sprite_play( v3f co, audio_clip *clip )
    audio_unlock();
 }
 
-VG_STATIC void audio_ambient_sprites_update( world_instance *world, v3f co )
+static
+enum audio_sprite_type world_audio_sample_sprite_random(v3f origin, v3f output);
+static void audio_ambient_sprites_update( world_instance *world, v3f co )
 {
    static float accum = 0.0f;
    accum += vg.time_delta;
@@ -201,11 +274,14 @@ VG_STATIC void audio_ambient_sprites_update( world_instance *world, v3f co )
    
    if( sprite_type != k_audio_sprite_type_none ){
       if( sprite_type == k_audio_sprite_type_grass ){
-         audio_ambient_sprite_play( sprite_pos, &audio_grass[rand()%4] );
+         audio_ambient_sprite_play( sprite_pos, 
+                                    &audio_grass[vg_randu32(&vg.rand)%4] );
       }
       else if( sprite_type == k_audio_sprite_type_water ){
-         if( world->water.enabled )
-            audio_ambient_sprite_play( sprite_pos, &audio_water[rand()%6] );
+         if( world->water.enabled ){
+            audio_ambient_sprite_play( sprite_pos, 
+                                       &audio_water[vg_randu32(&vg.rand)%6] );
+         }
       }
    }
 }