aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author ClarkeCode <clarke.john.robert@gmail.com>2023-04-18 03:08:25 +0200
committer ClarkeCode <clarke.john.robert@gmail.com>2023-04-18 20:10:54 +0200
commit18151dc9829701a20d0bc12e83958ddfe9beb039 (patch)
treeb095bd7c318256b2703e6ecbedd31f5852f8e5ba
parentc945680d960ccd0fb4a0ef5058ddfdd48e150f2d (diff)
Added music player control to GameSession
-rw-r--r--game/src/GameSession/GameSession.tscn12
-rw-r--r--game/src/MusicConductor/MusicPlayer.gd2
2 files changed, 13 insertions, 1 deletions
diff --git a/game/src/GameSession/GameSession.tscn b/game/src/GameSession/GameSession.tscn
index 864c657..8a8b18c 100644
--- a/game/src/GameSession/GameSession.tscn
+++ b/game/src/GameSession/GameSession.tscn
@@ -1,6 +1,7 @@
-[gd_scene load_steps=8 format=3 uid="uid://bgnupcshe1m7r"]
+[gd_scene load_steps=9 format=3 uid="uid://bgnupcshe1m7r"]
[ext_resource type="Script" path="res://src/GameSession/GameSession.gd" id="1_eklvp"]
+[ext_resource type="PackedScene" uid="uid://cvl76duuym1wq" path="res://src/MusicConductor/MusicPlayer.tscn" id="2_kt6aa"]
[ext_resource type="PackedScene" uid="uid://g524p8lr574w" path="res://src/GameSession/MapControlPanel.tscn" id="3_afh6d"]
[ext_resource type="PackedScene" uid="uid://dvdynl6eir40o" path="res://src/GameSession/GameSessionMenu.tscn" id="3_bvmqh"]
[ext_resource type="PackedScene" uid="uid://dkehmdnuxih2r" path="res://src/GameSession/MapView.tscn" id="4_xkg5j"]
@@ -20,6 +21,15 @@ mouse_filter = 2
script = ExtResource("1_eklvp")
_game_session_menu = NodePath("GameSessionMenu")
+[node name="MusicPlayer" parent="." instance=ExtResource("2_kt6aa")]
+layout_mode = 1
+anchors_preset = 1
+anchor_left = 1.0
+anchor_right = 1.0
+offset_left = -150.0
+offset_bottom = 110.0
+grow_horizontal = 0
+
[node name="MapView" parent="." instance=ExtResource("4_xkg5j")]
[node name="GameSessionMenu" parent="." instance=ExtResource("3_bvmqh")]
diff --git a/game/src/MusicConductor/MusicPlayer.gd b/game/src/MusicConductor/MusicPlayer.gd
index baf8a43..b775b84 100644
--- a/game/src/MusicConductor/MusicPlayer.gd
+++ b/game/src/MusicConductor/MusicPlayer.gd
@@ -44,6 +44,8 @@ func _on_previous_song_button_pressed():
func _on_option_button_item_selected(index):
# UIFUN-92
MusicConductor.start_song_by_index(index)
+ _update_song_name_visual()
+ _update_play_pause_button()
func _on_progress_slider_drag_started():