rodeo bump

4 files changed, 79 insertions, 1 deletions

diff --git a/external/RodeoKit b/external/RodeoKit
-Subproject 0edab992ab6ee804c223e30ae9347b3072a750b
+Subproject dedc1d9ec3b3e4cdc5c477d4f00625926fa23f1
diff --git a/src/input.c b/src/input.c
index c9d05e1..420648c 100644
--- a/src/input.c
+++ b/src/input.c
@@ -199,6 +199,44 @@ play_sound_input(rodeo_input_any_state_t *input_state, void *data)
 	return &down;
 }
 
+void*
+play_sound_input2(rodeo_input_any_state_t *input_state, void *data)
+{
+	static bool down = false;
+
+	if(NULL != input_state)
+	{
+		down = input_state->data.binary_state;
+	}
+	/*
+	else if(down)
+	{
+		rodeo_audio_playSample();
+	}
+	*/
+
+	return &down;
+}
+
+void*
+play_sound_input3(rodeo_input_any_state_t *input_state, void *data)
+{
+	static bool down = false;
+
+	if(NULL != input_state)
+	{
+		down = input_state->data.binary_state;
+	}
+	/*
+	else if(down)
+	{
+		rodeo_audio_playSample();
+	}
+	*/
+
+	return &down;
+}
+
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
@@ -231,6 +269,12 @@ register_inputs(void)
 	inputs.play_sound = rodeo_input_command_create(
 		rodeo_input_type_Binary
 	);
+	inputs.play_sound2 = rodeo_input_command_create(
+		rodeo_input_type_Binary
+	);
+	inputs.play_sound3 = rodeo_input_command_create(
+		rodeo_input_type_Binary
+	);
 	// --
 
 	// - register inputs -
@@ -252,6 +296,8 @@ register_inputs(void)
 	rodeo_input_command_register_boundedRange_controllerAxis(inputs.right, rodeo_input_boundedRange_controllerAxisLeft_X);
 
 	rodeo_input_command_register_binary_scancode(inputs.play_sound, rodeo_input_binary_scancode_M);
+	rodeo_input_command_register_binary_scancode(inputs.play_sound2, rodeo_input_binary_scancode_N);
+	rodeo_input_command_register_binary_scancode(inputs.play_sound3, rodeo_input_binary_scancode_B);
 	// --
 
 	// - register callbacks -
@@ -262,6 +308,8 @@ register_inputs(void)
 	rodeo_input_command_register_callback(inputs.right, *units_move_right_input);
 
 	rodeo_input_command_register_callback(inputs.play_sound, *play_sound_input);
+	rodeo_input_command_register_callback(inputs.play_sound2, *play_sound_input2);
+	rodeo_input_command_register_callback(inputs.play_sound3, *play_sound_input3);
 	// --
 
 	// - register commands -
@@ -272,6 +320,8 @@ register_inputs(void)
 	rodeo_input_scene_register_command(inputs.scene, inputs.right);
 
 	rodeo_input_scene_register_command(inputs.scene, inputs.play_sound);
+	rodeo_input_scene_register_command(inputs.scene, inputs.play_sound2);
+	rodeo_input_scene_register_command(inputs.scene, inputs.play_sound3);
 	// --
 
 	// activate scene
diff --git a/src/input.h b/src/input.h
index cef1519..c03c454 100644
--- a/src/input.h
+++ b/src/input.h
@@ -11,6 +11,8 @@ struct
 	rodeo_input_command_t *up;
 	rodeo_input_command_t *down;
 	rodeo_input_command_t *play_sound;
+	rodeo_input_command_t *play_sound2;
+	rodeo_input_command_t *play_sound3;
 }
 scenes_and_commands_t;
 
@@ -58,6 +60,18 @@ play_sound_input(
 	void *data
 );
 
+void*
+play_sound_input2(
+	rodeo_input_any_state_t *input_state,
+	void *data
+);
+
+void*
+play_sound_input3(
+	rodeo_input_any_state_t *input_state,
+	void *data
+);
+
 void
 register_inputs(void);
 
diff --git a/src/main.c b/src/main.c
index fe37345..00ece59 100644
--- a/src/main.c
+++ b/src/main.c
@@ -121,8 +121,19 @@ main_loop(void)
 
 		if(*(bool*)play_sound_input(NULL, NULL))
 		{
-			rodeo_audio_sound_play(scratch, -1);
+			rodeo_audio_sound_play(scratch, 0);
 		}
+		if(*(bool*)play_sound_input2(NULL, NULL))
+		{
+			rodeo_audio_sound_play(scratch, 1);
+		}
+		if(*(bool*)play_sound_input3(NULL, NULL))
+		{
+			rodeo_audio_sound_play(scratch, 2);
+		}
+
+		rodeo_audio_channelPool_volume_set(1, 0.75);
+		rodeo_audio_channelPool_volume_set(2, 0.25);
 		
 		//play_sound_input(NULL, NULL);
 
@@ -279,6 +290,9 @@ 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);
+
 		rodeo_mainLoop_run(
 			main_loop
 		);