Music room music playing

This commit is contained in:
Maddo 2025-02-27 10:37:10 +01:00
commit 766b04b2ff
9 changed files with 129 additions and 86 deletions

View file

@ -9,10 +9,13 @@ public partial class MainMenu : Control
[Export]
public string MainMenuScene { get; set; }
[Export]
public Control SubMenuHolder { get; set; } = new Control();
[Export]
public AudioStreamPlayer2D MusicPlayer { get; private set; }
[ExportCategory("Music Room")]
[Export]
public PackedScene MusicRoomTemplate { get; set; }
@ -21,7 +24,7 @@ public partial class MainMenu : Control
[Export]
public PackedScene DebugMenuTemplate { get; set; }
// Called when the node enters the scene tree for the first time.
public override void _Ready()
{
@ -34,7 +37,8 @@ public partial class MainMenu : Control
private void _on_start_button_pressed()
{
if (GameScene != null) {
if (GameScene != null)
{
GlobalState.Instance.GotoScene(GameScene);
//GetTree().ChangeSceneToFile(GameScene);
}
@ -46,15 +50,15 @@ public partial class MainMenu : Control
// if (DebugMenuTemplate is null || DebugMenuHolder is null) return;
// DebugMenuHolder.Visible = true;
// var children = DebugMenuHolder.GetChildren();
// foreach (var child in children)
// {
// child.QueueFree();
// }
// var menu = DebugMenuTemplate.Instantiate<DebugMenu>();
// DebugMenuHolder.CallDeferred("add_child", menu);
// menu.DebugMenuClosed += () =>
@ -66,32 +70,38 @@ public partial class MainMenu : Control
private void _on_music_room_button_pressed()
{
SpawnMenu<MusicRoom>(MusicRoomTemplate, SubMenuHolder);
MusicPlayer?.Stop();
}
private void SpawnMenu<T>(PackedScene template, Control holder) where T : MenuBase
{
if (template is null || holder is null) return;
holder.Visible = true;
var children = holder.GetChildren();
foreach (var child in children)
{
child.QueueFree();
}
var menu = template.Instantiate<T>();
holder.CallDeferred("add_child", menu);
menu.MenuClosed += () =>
{
holder.Visible = false;
if (!MusicPlayer.Playing)
{
MusicPlayer.Play();
}
};
}
private void _on_mainmenu_button_pressed()
{
if (MainMenuScene != null) {
if (MainMenuScene != null)
{
GlobalState.Instance.GotoScene(MainMenuScene);
//GetTree().ChangeSceneToFile(MainMenuScene);
}

View file

@ -7,13 +7,13 @@ using DebugMapSelectData = Cirno.Scripts.Resources.DebugMenu.DebugMapSelectData;
public partial class DebugMenu : MenuBase
{
[Export]
public Theme ButtonTheme { get; private set; }
[Export]
public DebugMapSelectData Levels { get; set; }
[Export]
public Container ButtonsContainer { get; private set; }
@ -29,9 +29,9 @@ public partial class DebugMenu : MenuBase
button.Icon = level.Icon;
//button.Text = level;
button.Theme = ButtonTheme;
ButtonsContainer.CallDeferred("add_child", button);
button.Pressed += () => ButtonOnPressed(level);
}
}
@ -45,13 +45,6 @@ public partial class DebugMenu : MenuBase
GlobalState.Instance.GoToScene(scene.Path, scene.StartData);
}
private void _on_back_button_pressed()
{
this.QueueFree();
EmitSignal(SignalName.MenuClosed);
}
private void _on_check_box_toggled(bool state)
{
GlobalState.Instance.SessionSettings.SkipDialogues = state;

View file

@ -8,5 +8,12 @@ using Godot.Collections;
public partial class MenuBase : Control
{
[Signal]
public delegate void MenuClosedEventHandler();
public delegate void MenuClosedEventHandler();
protected void _on_back_button_pressed()
{
this.QueueFree();
EmitSignal(SignalName.MenuClosed);
}
}

View file

@ -5,52 +5,56 @@ using Godot.Collections;
public partial class MusicRoom : MenuBase
{
[Export]
public Array<MusicResource> Tracks { get; private set; } = new();
[Export]
public Array<MusicResource> Tracks { get; private set; } = new();
[Export]
public ItemList TracksContainer { get; private set; }
[Export]
public ItemList TracksContainer { get; private set; }
[Export]
public Texture2D Icon { get; private set; }
[Export]
public Texture2D Icon { get; private set; }
private Dictionary<long, AudioNameVisualizer> _tracks = new();
[Export]
public Label DescriptionLabel { get; private set; }
public override void _Ready()
{
TracksContainer.Clear();
foreach (var track in Tracks)
{
var index = TracksContainer.AddItem($"{track.TrackName} ({track.AuthorName})", Icon);
private Dictionary<long, AudioNameVisualizer> _tracks = new();
var visualizer = new AudioNameVisualizer();
visualizer.MusicData = track;
TracksContainer.CallDeferred("add_child", visualizer);
public override void _Ready()
{
DescriptionLabel.Text = string.Empty;
TracksContainer.Clear();
foreach (var track in Tracks)
{
var index = TracksContainer.AddItem($"{track.TrackName} ({track.AuthorName})", Icon);
_tracks.Add((long)index, visualizer);
var visualizer = new AudioNameVisualizer();
visualizer.MusicData = track;
TracksContainer.CallDeferred("add_child", visualizer);
}
_tracks.Add((long)index, visualizer);
TracksContainer.ItemSelected += (long selectedItem) =>
{
var vis = _tracks[selectedItem];
if (vis.MusicData is null) { return; }
StopAllTracks();
vis.PlayWithName();
UpdateDescription(vis.MusicData.Description);
};
}
}
private void StopAllTracks()
{
foreach (var track in _tracks)
{
track.Value.Stop();
}
}
TracksContainer.ItemSelected += (long selectedItem) =>
{
var vis = _tracks[selectedItem];
if (vis.MusicData is null) { return; }
StopAllTracks();
vis.PlayWithName();
UpdateDescription(vis.MusicData.Description);
};
}
private void UpdateDescription(string name)
{
private void StopAllTracks()
{
foreach (var track in _tracks)
{
track.Value.Stop();
}
}
}
private void UpdateDescription(string name)
{
DescriptionLabel.Text = name;
}
}