{ .path = "sound/ui_ding.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" }
+};
+
+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 );
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_unlock();
}
-VG_STATIC void audio_free(void)
+static void audio_free(void)
{
/* TODO! */
vg_warn( "UNIMPLEMENTED: audio_free()\n" );
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 );
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.frame_delta;
+ accum += vg.time_delta;
if( accum > 0.1f )
accum -= 0.1f;
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()%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()%6] );
+ }
}
}
}