[godot] add mode switch to instrument_demo

Author: anokta

platforms/godot/instrument.cpp

@@ -128,21 +128,21 @@ void BarelyInstrument::_bind_methods() {
 
   ClassDB::bind_method(D_METHOD("_on_slice_changed"), &BarelyInstrument::_on_slice_changed);
 
-  BARELY_BIND_GODOT_ENUM_VALUE(ArpMode, None, "ARP_MODE_NONE");
-  BARELY_BIND_GODOT_ENUM_VALUE(ArpMode, Up, "ARP_MODE_UP");
-  BARELY_BIND_GODOT_ENUM_VALUE(ArpMode, Down, "ARP_MODE_DOWN");
-  BARELY_BIND_GODOT_ENUM_VALUE(ArpMode, Random, "ARP_MODE_RANDOM");
-
-  BARELY_BIND_GODOT_ENUM_VALUE(OscMode, Crossfade, "OSC_MODE_CROSSFADE");
-  BARELY_BIND_GODOT_ENUM_VALUE(OscMode, Am, "OSC_MODE_AM");
-  BARELY_BIND_GODOT_ENUM_VALUE(OscMode, Fm, "OSC_MODE_FM");
-  BARELY_BIND_GODOT_ENUM_VALUE(OscMode, Ma, "OSC_MODE_MA");
-  BARELY_BIND_GODOT_ENUM_VALUE(OscMode, Mf, "OSC_MODE_MF");
-  BARELY_BIND_GODOT_ENUM_VALUE(OscMode, Ring, "OSC_MODE_RING");
-
-  BARELY_BIND_GODOT_ENUM_VALUE(SliceMode, Sustain, "SLICE_MODE_SUSTAIN");
-  BARELY_BIND_GODOT_ENUM_VALUE(SliceMode, Once, "SLICE_MODE_ONCE");
-  BARELY_BIND_GODOT_ENUM_VALUE(SliceMode, Loop, "SLICE_MODE_LOOP");
+  BARELY_BIND_GODOT_ENUM_VALUE(ArpMode, None, ARP_MODE_NONE);
+  BARELY_BIND_GODOT_ENUM_VALUE(ArpMode, Up, ARP_MODE_UP);
+  BARELY_BIND_GODOT_ENUM_VALUE(ArpMode, Down, ARP_MODE_DOWN);
+  BARELY_BIND_GODOT_ENUM_VALUE(ArpMode, Random, ARP_MODE_RANDOM);
+
+  BARELY_BIND_GODOT_ENUM_VALUE(OscMode, Crossfade, OSC_MODE_CROSSFADE);
+  BARELY_BIND_GODOT_ENUM_VALUE(OscMode, Am, OSC_MODE_AM);
+  BARELY_BIND_GODOT_ENUM_VALUE(OscMode, Fm, OSC_MODE_FM);
+  BARELY_BIND_GODOT_ENUM_VALUE(OscMode, Ma, OSC_MODE_MA);
+  BARELY_BIND_GODOT_ENUM_VALUE(OscMode, Mf, OSC_MODE_MF);
+  BARELY_BIND_GODOT_ENUM_VALUE(OscMode, Ring, OSC_MODE_RING);
+
+  BARELY_BIND_GODOT_ENUM_VALUE(SliceMode, Sustain, SLICE_MODE_SUSTAIN);
+  BARELY_BIND_GODOT_ENUM_VALUE(SliceMode, Once, SLICE_MODE_ONCE);
+  BARELY_BIND_GODOT_ENUM_VALUE(SliceMode, Loop, SLICE_MODE_LOOP);
 
   BARELY_GODOT_INSTRUMENT_CONTROLS(BARELY_BIND_GODOT_INSTRUMENT_CONTROL);
 

platforms/godot/project/demo/instrument_demo.gd

@@ -40,10 +40,17 @@ func _input(event):
 		elif key_string == 'V':
 			gain = min(gain + 0.25, 1.0)
 			return
+		elif key_string == '1':
+			instrument.osc_mix = 1.0
+			return
+		elif key_string == '2':
+			instrument.osc_mix = 0.0
+			return
+		elif key_string == '3':
+			instrument.osc_mix = 0.5
+			return
 		elif key_string == '0':
-			var current_arp_mode = instrument.get_arp_mode()
-			var new_arp_mode = instrument.ARP_MODE_UP if current_arp_mode == instrument.ARP_MODE_NONE else instrument.ARP_MODE_NONE
-			instrument.set_arp_mode(new_arp_mode)
+			instrument.arp_mode = instrument.ARP_MODE_UP if instrument.arp_mode == instrument.ARP_MODE_NONE else instrument.ARP_MODE_NONE
 			return
 
 		var key_index = OCTAVE_KEYS.find(key_string)

platforms/godot/project/demo/instrument_demo.tscn

@@ -28,6 +28,7 @@ text = "BarelyMusician Instrument Demo
 * Use WETYU keys to play the black notes in an octave
 * Use ZX keys to shift octave up and down
 * Use CV keys to adjust note gain up and down
+* Use 123 keys to switch the mode (osc/sample/mix)
 * Use 0 key to toggle arpeggiator on and off"
 label_settings = SubResource("LabelSettings_8q8q8")
 autowrap_mode = 2