From d2c6aef9c5e26848238c2454b9432186c1818689 Mon Sep 17 00:00:00 2001 From: VAILLANT Jeremy Date: Sun, 23 May 2021 15:10:20 +0200 Subject: [PATCH] Add methods for sound ambiant & click object --- scenes/levels/levels.gd | 30 ++++++++++++++++------------ scenes/levels/warcraft/WarCraft.gd | 4 ---- scenes/levels/warcraft/WarCraft.tscn | 2 ++ 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/scenes/levels/levels.gd b/scenes/levels/levels.gd index 4cec9c1..f1ebe1a 100644 --- a/scenes/levels/levels.gd +++ b/scenes/levels/levels.gd @@ -15,6 +15,7 @@ onready var mscene = load("res://db/MScene.gd") func _ready(): _load_translations() + _play_ambiant_sound() _load_meshes() func _process(_delta): @@ -106,6 +107,8 @@ func _gyroscope_changed_up(gyroscope): func _start_dissolve(key): if meshes[key].lock() == false: meshes[key].set_lock(true) + $ObjectFind.stream = meshes[key].audio_sound() + $ObjectFind.play() ## PRIVATE func _load_translations(): @@ -119,15 +122,10 @@ func _load_meshes(): if scene_detail.key() != null: meshes[scene_detail.key()] = scene_detail - # _display_label(scene_detail) for key in meshes: meshes[key].search_keys() -""" -func _display_label(scene): - print("[meshes#key] : "+scene.label()) - $ListObjects/ListContainer/TextureButton.set_text(scene.label()) -""" + func _input(event): if event is InputEventMouseButton or event is InputEventScreenTouch: var camera = $"Main Camera" @@ -137,10 +135,16 @@ func _input(event): func _physics_process(_delta): var space_state = get_world().direct_space_state if from != null and to != null: - var result = space_state.intersect_ray(from, to, [], 1, false, true) - from = null - to = null - if result.has("collider"): - var node = result["collider"].get_parent() - if node != null: - _start_dissolve(node.name) + _check_collider(space_state) + +func _check_collider(space_state): + var result = space_state.intersect_ray(from, to, [], 1, false, true) + from = null + to = null + if result.has("collider"): + var node = result["collider"].get_parent() + if node != null: + _start_dissolve(node.name) + +func _play_ambiant_sound(): + $AmbiantSound.play() diff --git a/scenes/levels/warcraft/WarCraft.gd b/scenes/levels/warcraft/WarCraft.gd index eed3fe8..d24944e 100644 --- a/scenes/levels/warcraft/WarCraft.gd +++ b/scenes/levels/warcraft/WarCraft.gd @@ -8,7 +8,6 @@ onready var last_btn = null func _ready(): _display_hud_menu() - _play_ambiant_sound() func _display_hud_menu(): var counter = 0 @@ -21,9 +20,6 @@ func _display_hud_menu(): label_id = scene.label_id() counter = +1 -func _play_ambiant_sound(): - $AmbiantSound.play() - # Back to main scene func _on_TextureButton_pressed(): print("[levels#_on_TextureButton_pressed] quit to menu") diff --git a/scenes/levels/warcraft/WarCraft.tscn b/scenes/levels/warcraft/WarCraft.tscn index 082509b..c1f53fd 100644 --- a/scenes/levels/warcraft/WarCraft.tscn +++ b/scenes/levels/warcraft/WarCraft.tscn @@ -733,6 +733,8 @@ shape = SubResource( 17 ) [node name="Quit" parent="." instance=ExtResource( 45 )] +[node name="ObjectFind" type="AudioStreamPlayer" parent="."] + [node name="AmbiantSound" type="AudioStreamPlayer" parent="."] stream = ExtResource( 46 ) volume_db = -15.0