X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=audio.h;h=95894f1cedbdb380637da05fbe888ae583a1e82f;hb=HEAD;hp=448906be07e9af05c101b3c07766578dc7612f4d;hpb=38514b4ba03412ad51df02dc2ba345e1be41005d;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/audio.h b/audio.h index 448906b..95894f1 100644 --- a/audio.h +++ b/audio.h @@ -2,151 +2,13 @@ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved */ -#include "common.h" - -#ifndef AUDIO_H -#define AUDIO_H +#pragma once +#include "vg/vg_engine.h" +#include "vg/vg_audio.h" +#include "vg/vg_audio_dsp.h" #include "world.h" -audio_clip audio_board[] = -{ - { .path="sound/skate_hpf.ogg" }, - { .path="sound/wheel.ogg" }, - { .path="sound/slide.ogg" }, - { .path="sound/grind_enter.ogg" }, - { .path="sound/grind_exit.ogg" }, - { .path="sound/grind_loop.ogg" }, - { .path="sound/woodslide.ogg" }, - { .path="sound/metalscrape.ogg" }, - { .path="sound/slidetap.ogg" } -}; - -audio_clip audio_taps[] = -{ - { .path="sound/tap0.ogg" }, - { .path="sound/tap1.ogg" }, - { .path="sound/tap2.ogg" }, - { .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" }, - { .path="sound/hit1.ogg" }, - { .path="sound/hit2.ogg" }, - { .path="sound/hit3.ogg" }, - { .path="sound/hit4.ogg" } -}; - -audio_clip audio_splash = -{ .path = "sound/splash.ogg" }; - -audio_clip audio_jumps[] = { - { .path = "sound/jump0.ogg" }, - { .path = "sound/jump1.ogg" }, -}; - -audio_clip audio_footsteps[] = { - {.path = "sound/step_concrete0.ogg" }, - {.path = "sound/step_concrete1.ogg" }, - {.path = "sound/step_concrete2.ogg" }, - {.path = "sound/step_concrete3.ogg" } -}; - -audio_clip audio_footsteps_grass[] = { - {.path = "sound/step_bush0.ogg" }, - {.path = "sound/step_bush1.ogg" }, - {.path = "sound/step_bush2.ogg" }, - {.path = "sound/step_bush3.ogg" }, - {.path = "sound/step_bush4.ogg" }, - {.path = "sound/step_bush5.ogg" } -}; - -audio_clip audio_footsteps_wood[] = { - {.path = "sound/step_wood0.ogg" }, - {.path = "sound/step_wood1.ogg" }, - {.path = "sound/step_wood2.ogg" }, - {.path = "sound/step_wood3.ogg" }, - {.path = "sound/step_wood4.ogg" }, - {.path = "sound/step_wood5.ogg" } -}; - -audio_clip audio_lands[] = { - { .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" } -}; - -audio_clip audio_gate_pass = { - .path = "sound/gate_pass.ogg" -}; - -audio_clip audio_gate_lap = { - .path = "sound/gate_lap.ogg" -}; - -audio_clip audio_gate_ambient = { -.path = "sound/gate_ambient.ogg" -}; - -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" }, - { .path = "sound/teleport.ogg" } -}; - -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; @@ -154,85 +16,38 @@ struct air_synth_data { 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; ilpf, 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 ); - audio_clip_loadn( &audio_gate_pass, 1, NULL ); - audio_clip_loadn( &audio_gate_lap, 1, NULL ); - audio_clip_loadn( &audio_gate_ambient, 1, NULL ); - - audio_clip_loadn( audio_jumps, vg_list_size(audio_jumps), NULL ); - audio_clip_loadn( audio_lands, vg_list_size(audio_lands), NULL ); - audio_clip_loadn( audio_water, vg_list_size(audio_water), NULL ); - audio_clip_loadn( audio_grass, vg_list_size(audio_grass), NULL ); - audio_clip_loadn( audio_footsteps, vg_list_size(audio_footsteps), NULL ); - audio_clip_loadn( audio_footsteps_grass, - vg_list_size(audio_footsteps_grass), NULL ); - audio_clip_loadn( audio_footsteps_wood, - 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(); + /* not used in locking */ + audio_channel *channel; } +extern air_audio_data; -static void audio_free(void) -{ - /* TODO! */ - vg_warn( "UNIMPLEMENTED: audio_free()\n" ); -} +void audio_init(void); +void audio_ambient_sprite_play( v3f co, audio_clip *clip ); +void audio_ambient_sprites_update( world_instance *world, v3f co ); + +/* TODO(ASSETS): + * Have these as asignable ID's and not a bunch of different arrays. + */ +extern audio_clip audio_board[]; +extern audio_clip audio_taps[]; +extern audio_clip audio_flips[]; +extern audio_clip audio_hits[]; +extern audio_clip audio_splash; +extern audio_clip audio_jumps[]; +extern audio_clip audio_footsteps[]; +extern audio_clip audio_footsteps_grass[]; +extern audio_clip audio_footsteps_wood[]; +extern audio_clip audio_lands[]; +extern audio_clip audio_water[]; +extern audio_clip audio_grass[]; +extern audio_clip audio_ambience[]; +extern audio_clip audio_gate_pass; +extern audio_clip audio_gate_lap; +extern audio_clip audio_gate_ambient; +extern audio_clip audio_rewind[]; +extern audio_clip audio_ui[]; +extern audio_clip audio_challenge[]; enum audio_sprite_type { @@ -240,50 +55,3 @@ enum audio_sprite_type k_audio_sprite_type_grass, k_audio_sprite_type_water }; - -static void audio_ambient_sprite_play( v3f co, audio_clip *clip ) -{ - audio_lock(); - 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, group_id ); - audio_channel_set_spacial( ch, co, 80.0f ); - audio_channel_edit_volume( ch, 1.0f, 1 ); - ch = audio_relinquish_channel( ch ); - } - audio_unlock(); -} - -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; - - if( accum > 0.1f ) - accum -= 0.1f; - else return; - - v3f sprite_pos; - enum audio_sprite_type sprite_type = - world_audio_sample_sprite_random( co, sprite_pos ); - - if( sprite_type != k_audio_sprite_type_none ){ - if( sprite_type == k_audio_sprite_type_grass ){ - 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[vg_randu32(&vg.rand)%6] ); - } - } - } -} - -#endif /* AUDIO_H */