diff --git a/addons/fmod/.gitignore b/addons/fmod/.gitignore index 950bdd9..785ef83 100644 --- a/addons/fmod/.gitignore +++ b/addons/fmod/.gitignore @@ -3,3 +3,4 @@ *.dylib *.so !libs/** +~*.dll \ No newline at end of file diff --git a/addons/fmod/Desktop/Master.bank b/addons/fmod/Desktop/Master.bank index 5f78a09..c09bf75 100644 Binary files a/addons/fmod/Desktop/Master.bank and b/addons/fmod/Desktop/Master.bank differ diff --git a/addons/fmod/Desktop/Master.strings.bank b/addons/fmod/Desktop/Master.strings.bank index 40751d6..40da091 100644 Binary files a/addons/fmod/Desktop/Master.strings.bank and b/addons/fmod/Desktop/Master.strings.bank differ diff --git a/addons/fmod/libs/windows/fmod.dll b/addons/fmod/libs/windows/fmod.dll index 63bb030..0410388 100644 Binary files a/addons/fmod/libs/windows/fmod.dll and b/addons/fmod/libs/windows/fmod.dll differ diff --git a/addons/fmod/libs/windows/fmodL.dll b/addons/fmod/libs/windows/fmodL.dll index 4dcfd5f..ec47a2a 100644 Binary files a/addons/fmod/libs/windows/fmodL.dll and b/addons/fmod/libs/windows/fmodL.dll differ diff --git a/addons/fmod/libs/windows/fmodL_vc.lib b/addons/fmod/libs/windows/fmodL_vc.lib index 8be8b6b..8236f2f 100644 Binary files a/addons/fmod/libs/windows/fmodL_vc.lib and b/addons/fmod/libs/windows/fmodL_vc.lib differ diff --git a/addons/fmod/libs/windows/fmod_vc.lib b/addons/fmod/libs/windows/fmod_vc.lib index ad3b755..83f2316 100644 Binary files a/addons/fmod/libs/windows/fmod_vc.lib and b/addons/fmod/libs/windows/fmod_vc.lib differ diff --git a/addons/fmod/libs/windows/fmodstudio.dll b/addons/fmod/libs/windows/fmodstudio.dll index 5be216f..fad96e7 100644 Binary files a/addons/fmod/libs/windows/fmodstudio.dll and b/addons/fmod/libs/windows/fmodstudio.dll differ diff --git a/addons/fmod/libs/windows/fmodstudioL.dll b/addons/fmod/libs/windows/fmodstudioL.dll index 0bf17d7..8685191 100644 Binary files a/addons/fmod/libs/windows/fmodstudioL.dll and b/addons/fmod/libs/windows/fmodstudioL.dll differ diff --git a/addons/fmod/libs/windows/fmodstudioL_vc.lib b/addons/fmod/libs/windows/fmodstudioL_vc.lib index 54037e9..81bfc97 100644 Binary files a/addons/fmod/libs/windows/fmodstudioL_vc.lib and b/addons/fmod/libs/windows/fmodstudioL_vc.lib differ diff --git a/addons/fmod/libs/windows/fmodstudio_vc.lib b/addons/fmod/libs/windows/fmodstudio_vc.lib index 7460118..23575b4 100644 Binary files a/addons/fmod/libs/windows/fmodstudio_vc.lib and b/addons/fmod/libs/windows/fmodstudio_vc.lib differ diff --git a/game/Game.gd b/game/Game.gd index 85ddcaa..1601f76 100644 --- a/game/Game.gd +++ b/game/Game.gd @@ -3,6 +3,7 @@ extends Node @onready var main_menu: Control = $UI/MainMenu @onready var transition_screen: TransitionScreen = $UI/TransitionScreen +@onready var music: = $Music var debug: RefCounted @@ -25,6 +26,7 @@ func _process(delta: float) -> void: func on_start_game() -> void: main_menu.hide() + music.set_parameter("SCENE", 1) scene = load("res://scene/prototype/PrototypeRoom.tscn").instantiate() add_child(scene) scene.prop_finished.connect(prop_finished) @@ -35,6 +37,7 @@ func back_to_menu() -> void: Input.mouse_mode = Input.MOUSE_MODE_VISIBLE remove_child(scene) scene.queue_free() + music.set_parameter("SCENE", 0) main_menu.show() func prop_finished() -> void: diff --git a/game/Game.tscn b/game/Game.tscn index 21b45dd..2f06632 100644 --- a/game/Game.tscn +++ b/game/Game.tscn @@ -28,4 +28,19 @@ visible = false layout_mode = 1 [node name="FmodBankLoader" type="FmodBankLoader" parent="."] -bank_paths = ["res://addons/fmod/Desktop/Master.bank", "res://addons/fmod/Desktop/Master.strings.bank"] +bank_paths = ["res://addons/fmod/Desktop/Master.strings.bank", "res://addons/fmod/Desktop/Master.bank"] + +[node name="Music" type="FmodEventEmitter2D" parent="."] +event_name = "event:/MUSIC" +event_guid = "{9972c1b8-1950-4148-8270-43d96a5542f6}" +autoplay = true +event_parameter/DETECTION/id = 3904272917760853846 +event_parameter/DETECTION/value = 0.0 +event_parameter/DETECTION/min_value = 0.0 +event_parameter/DETECTION/max_value = 2.0 +event_parameter/DETECTION/default_value = 0.0 +event_parameter/SCENE/id = 4253876191321042138 +event_parameter/SCENE/value = 0.0 +event_parameter/SCENE/min_value = 0.0 +event_parameter/SCENE/max_value = 1.0 +event_parameter/SCENE/default_value = 0.0 diff --git a/game/menu/MainMenu.tscn b/game/menu/MainMenu.tscn index cdef420..fe91a2b 100644 --- a/game/menu/MainMenu.tscn +++ b/game/menu/MainMenu.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=6 format=3 uid="uid://dmfdkwcu73843"] +[gd_scene load_steps=5 format=3 uid="uid://dmfdkwcu73843"] [ext_resource type="Theme" uid="uid://cgpmko4d01n84" path="res://game/ui-theme/theme.tres" id="1_7yq1p"] [ext_resource type="Script" path="res://game/menu/CreditsPopup.gd" id="2"] [ext_resource type="Script" path="res://game/menu/VersionLabel.gd" id="3_426jp"] [ext_resource type="Script" path="res://game/menu/MainMenu.gd" id="4"] -[ext_resource type="Script" path="res://game/menu/Music.gd" id="5_xcr5h"] [node name="MainMenu" type="Control"] layout_mode = 3 @@ -148,9 +147,3 @@ offset_bottom = -16.0 grow_horizontal = 0 grow_vertical = 0 text = "Close" - -[node name="Music" type="FmodEventEmitter2D" parent="."] -event_guid = "{00000000-0000-0000-fc1d-017ae8030080}" -script = ExtResource("5_xcr5h") - -[connection signal="pressed" from="VBoxContainer/PlayButton" to="Music" method="_on_play_button_pressed"] diff --git a/game/menu/Music.gd b/game/menu/Music.gd deleted file mode 100644 index 982bed3..0000000 --- a/game/menu/Music.gd +++ /dev/null @@ -1,5 +0,0 @@ -extends FmodEventEmitter2D - -func _on_play_button_pressed(): - if Input.is_action_pressed("PlayButton"): - self["event_parameter/SCENE/value"] = self["event_parameter/SCENE/value"] + 1 diff --git a/project.godot b/project.godot index f91bf70..f4d2b1e 100644 --- a/project.godot +++ b/project.godot @@ -19,7 +19,7 @@ General/is_memory_tracking_enabled=false "Software Format/raw_speaker_count"=0 General/default_listener_count=1 General/banks_path="res://addons/fmod/Desktop" -General/should_load_by_name=false +General/should_load_by_name=true DSP/dsp_buffer_size=512 DSP/dsp_buffer_count=4 "3D Settings/doppler_scale"=1.0