Add clicksound support to Buttons

Fix StyleBoxWithSound draw bug
Expose SoundSingleton audio stream load functions
Update OpenVicProject/OpenVic-Simulation@34d3227

.vscode/launch.json

@@ -8,12 +8,12 @@
             "type": "cppdbg",
             "request": "launch",
             "name": "Debug",
-            "program": "/bin/godot4", // TODO: Set your Godot binary path
+            "program": "/bin/godot", // TODO: Set your Godot binary path
             "args": [
-                "-e"
+                ""
             ],
             "cwd": "${workspaceFolder}/game",
-            "preLaunchTask": "dev_build",
+            // "preLaunchTask": "dev_build",
             "windows": {
                 "cwd": "${workspaceFolder}\\game",
             }

extension/doc_classes/StyleBoxWithSound.xml

@@ -9,8 +9,12 @@
 	<members>
 		<member name="audio_bus" type="StringName" setter="set_audio_bus" getter="get_audio_bus" default="&amp;&quot;Master&quot;">
 		</member>
+		<member name="audio_disabled" type="bool" setter="set_audio_disabled" getter="is_audio_disabled" default="false">
+		</member>
 		<member name="audio_stream" type="AudioStream" setter="set_audio_stream" getter="get_audio_stream">
 		</member>
+		<member name="audio_volume" type="float" setter="set_audio_volume" getter="get_audio_volume" default="0.0">
+		</member>
 		<member name="style_box" type="StyleBox" setter="set_style_box" getter="get_style_box">
 		</member>
 	</members>

extension/src/openvic-extension/classes/resources/StyleBoxWithSound.cpp

@@ -22,6 +22,10 @@ void StyleBoxWithSound::_bind_methods() {
 	OV_BIND_METHOD(StyleBoxWithSound::set_audio_bus, { "bus" });
 	OV_BIND_METHOD(StyleBoxWithSound::get_audio_stream);
 	OV_BIND_METHOD(StyleBoxWithSound::set_audio_stream, { "stream" });
+	OV_BIND_METHOD(StyleBoxWithSound::get_audio_volume);
+	OV_BIND_METHOD(StyleBoxWithSound::set_audio_volume, { "volume" });
+	OV_BIND_METHOD(StyleBoxWithSound::is_audio_disabled);
+	OV_BIND_METHOD(StyleBoxWithSound::set_audio_disabled, { "disabled" });
 
 	ADD_PROPERTY(
 		PropertyInfo(Variant::OBJECT, "style_box", PROPERTY_HINT_RESOURCE_TYPE, "StyleBox"), "set_style_box", "get_style_box"
@@ -31,6 +35,8 @@ void StyleBoxWithSound::_bind_methods() {
 		PropertyInfo(Variant::OBJECT, "audio_stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"), //
 		"set_audio_stream", "get_audio_stream"
 	);
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "audio_volume"), "set_audio_volume", "get_audio_volume");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "audio_disabled"), "set_audio_disabled", "is_audio_disabled");
 }
 
 StyleBoxWithSound::StyleBoxWithSound() {
@@ -50,7 +56,7 @@ StringName StyleBoxWithSound::get_audio_bus() const {
 	return audio_bus;
 }
 
-void StyleBoxWithSound::set_audio_bus(String const& bus) {
+void StyleBoxWithSound::set_audio_bus(StringName const& bus) {
 	audio_bus = bus;
 	emit_changed();
 }
@@ -64,6 +70,16 @@ void StyleBoxWithSound::set_audio_stream(Ref<AudioStream> const& stream) {
 	emit_changed();
 }
 
+void StyleBoxWithSound::set_audio_volume(float volume) {
+	audio_volume = volume;
+	emit_changed();
+}
+
+void StyleBoxWithSound::set_audio_disabled(bool disable) {
+	audio_disabled = disable;
+	emit_changed();
+}
+
 godot::Rect2 StyleBoxWithSound::_get_draw_rect(Rect2 const& rect) const {
 	if (style_box.is_null()) {
 		return Rect2();
@@ -76,19 +92,22 @@ void StyleBoxWithSound::_on_audio_finished(AudioStreamPlayer* player) {
 }
 
 void StyleBoxWithSound::_draw(RID const& canvas_item, Rect2 const& rect) const {
-	SceneTree* tree = Object::cast_to<SceneTree>(Engine::get_singleton()->get_main_loop());
-	if (tree != nullptr) {
-		if (audio_stream.is_valid()) {
-			AudioStreamPlayer* asp = memnew(AudioStreamPlayer);
-			asp->connect("finished", callable_mp_static(&StyleBoxWithSound::_on_audio_finished).bind(asp));
-			asp->set_bus(audio_bus);
-			asp->set_stream(audio_stream);
-			asp->set_autoplay(true);
-			tree->get_root()->add_child(asp, false, Node::INTERNAL_MODE_BACK);
+	if (!audio_disabled) {
+		SceneTree* tree = Object::cast_to<SceneTree>(Engine::get_singleton()->get_main_loop());
+		if (tree != nullptr) {
+			if (audio_stream.is_valid()) {
+				AudioStreamPlayer* asp = memnew(AudioStreamPlayer);
+				asp->connect("finished", callable_mp_static(&StyleBoxWithSound::_on_audio_finished).bind(asp));
+				asp->set_bus(audio_bus);
+				asp->set_stream(audio_stream);
+				asp->set_volume_db(audio_volume);
+				asp->set_autoplay(true);
+				tree->get_root()->add_child(asp, false, Node::INTERNAL_MODE_BACK);
+			}
 		}
 	}
 	if (style_box.is_valid()) {
-		style_box->_draw(canvas_item, rect);
+		style_box->draw(canvas_item, rect);
 	}
 }
 

extension/src/openvic-extension/classes/resources/StyleBoxWithSound.hpp

@@ -16,6 +16,8 @@ namespace OpenVic {
 		godot::Ref<godot::StyleBox> style_box;
 		godot::StringName audio_bus;
 		godot::Ref<godot::AudioStream> audio_stream;
+		float PROPERTY(audio_volume, 0);
+		bool PROPERTY_CUSTOM_PREFIX(audio_disabled, is, false);
 
 		static void _on_audio_finished(godot::AudioStreamPlayer* player);
 
@@ -30,9 +32,11 @@ namespace OpenVic {
 		godot::Ref<godot::StyleBox> get_style_box() const;
 		void set_style_box(godot::Ref<godot::StyleBox> const& style);
 		godot::StringName get_audio_bus() const;
-		void set_audio_bus(godot::String const& bus);
+		void set_audio_bus(godot::StringName const& bus);
 		godot::Ref<godot::AudioStream> get_audio_stream() const;
 		void set_audio_stream(godot::Ref<godot::AudioStream> const& stream);
+		void set_audio_volume(float volume);
+		void set_audio_disabled(bool disable);
 
 		virtual godot::Rect2 _get_draw_rect(godot::Rect2 const& rect) const override;
 		virtual void _draw(godot::RID const& canvas_item, godot::Rect2 const& rect) const override;