From 4fd8de770ea7addbb5ba00b048101c38bd85e3b8 Mon Sep 17 00:00:00 2001 From: realtradam Date: Fri, 12 May 2023 14:25:12 -0400 Subject: rodeo bump --- external/RodeoKit | 2 +- src/main.c | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/external/RodeoKit b/external/RodeoKit index dedc1d9..e81eb23 160000 --- a/external/RodeoKit +++ b/external/RodeoKit @@ -1 +1 @@ -Subproject commit dedc1d9ec3b3e4cdc5c477d4f00625926fa23f1b +Subproject commit e81eb2369cbf21ca66fc49d2d09aab270131ea87 diff --git a/src/main.c b/src/main.c index 00ece59..e8e6b19 100644 --- a/src/main.c +++ b/src/main.c @@ -7,6 +7,7 @@ cstr renderer; float time_var; rodeo_audio_sound_t *scratch = NULL; +rodeo_audio_music_t *music = NULL; typedef struct @@ -121,22 +122,17 @@ main_loop(void) if(*(bool*)play_sound_input(NULL, NULL)) { - rodeo_audio_sound_play(scratch, 0); + rodeo_audio_sound_play(scratch); } if(*(bool*)play_sound_input2(NULL, NULL)) { - rodeo_audio_sound_play(scratch, 1); + rodeo_audio_music_play_fadeIn(music, 1000); } if(*(bool*)play_sound_input3(NULL, NULL)) { - rodeo_audio_sound_play(scratch, 2); + rodeo_audio_music_stop_fadeOut(1000); } - rodeo_audio_channelPool_volume_set(1, 0.75); - rodeo_audio_channelPool_volume_set(2, 0.25); - - //play_sound_input(NULL, NULL); - if(*(bool*)summon_units_input(NULL, NULL)) { summon_units(); @@ -289,9 +285,7 @@ main(void) texture = rodeo_texture_2d_create_from_path(cstr_lit("assets/orc.png")); scratch = rodeo_audio_sound_create_from_path(cstr_lit("assets/sample.wav")); - - rodeo_audio_channelPool_volume_set(1, 0.75); - rodeo_audio_channelPool_volume_set(2, 0.25); + music = rodeo_audio_music_create_from_path(cstr_lit("assets/music.ogg")); rodeo_mainLoop_run( main_loop -- cgit v1.2.3