add audio bus for music
This commit is contained in:
parent
52ced9c530
commit
71b6d2617c
@ -1,10 +1,15 @@
|
|||||||
[gd_resource type="AudioBusLayout" format=3 uid="uid://dcxpomrfumov"]
|
[gd_resource type="AudioBusLayout" format=3 uid="uid://dcxpomrfumov"]
|
||||||
|
|
||||||
[resource]
|
[resource]
|
||||||
bus/0/volume_db = -4.003
|
bus/1/name = &"Music"
|
||||||
bus/1/name = &"SoundEffects"
|
|
||||||
bus/1/solo = false
|
bus/1/solo = false
|
||||||
bus/1/mute = false
|
bus/1/mute = false
|
||||||
bus/1/bypass_fx = false
|
bus/1/bypass_fx = false
|
||||||
bus/1/volume_db = -10.0692
|
bus/1/volume_db = 0.0
|
||||||
bus/1/send = &"Master"
|
bus/1/send = &"Master"
|
||||||
|
bus/2/name = &"SoundEffects"
|
||||||
|
bus/2/solo = false
|
||||||
|
bus/2/mute = false
|
||||||
|
bus/2/bypass_fx = false
|
||||||
|
bus/2/volume_db = -4.00569
|
||||||
|
bus/2/send = &"Master"
|
||||||
|
@ -2,6 +2,7 @@ extends Node3D
|
|||||||
|
|
||||||
@export var _player_scene: PackedScene
|
@export var _player_scene: PackedScene
|
||||||
|
|
||||||
|
@export var _soundtrack: AudioStreamPlayer
|
||||||
@export var _players: Node3D
|
@export var _players: Node3D
|
||||||
@export var _chat_panel: Panel
|
@export var _chat_panel: Panel
|
||||||
@export var _chat_input: LineEdit
|
@export var _chat_input: LineEdit
|
||||||
@ -49,7 +50,7 @@ func _ready() -> void:
|
|||||||
_add_player.call_deferred(1)
|
_add_player.call_deferred(1)
|
||||||
|
|
||||||
if not "--join" in OS.get_cmdline_args():
|
if not "--join" in OS.get_cmdline_args():
|
||||||
$Soundtrack.finished.connect(_play_new_track)
|
_soundtrack.finished.connect(_play_new_track)
|
||||||
_play_new_track()
|
_play_new_track()
|
||||||
|
|
||||||
# TODO: sync what's played for peers, server controlled
|
# TODO: sync what's played for peers, server controlled
|
||||||
@ -58,8 +59,8 @@ func _play_new_track():
|
|||||||
_playlist_remaining = PLAYLIST.duplicate()
|
_playlist_remaining = PLAYLIST.duplicate()
|
||||||
var selection = _playlist_remaining.pick_random()
|
var selection = _playlist_remaining.pick_random()
|
||||||
_playlist_remaining.erase(selection)
|
_playlist_remaining.erase(selection)
|
||||||
$Soundtrack.stream = load(selection)
|
_soundtrack.stream = load(selection)
|
||||||
$Soundtrack.play()
|
_soundtrack.play()
|
||||||
|
|
||||||
|
|
||||||
func _exit_tree() -> void:
|
func _exit_tree() -> void:
|
||||||
|
@ -32,9 +32,10 @@ sky = SubResource("Sky_ygvd3")
|
|||||||
ambient_light_color = Color(0, 0.164706, 0.278431, 1)
|
ambient_light_color = Color(0, 0.164706, 0.278431, 1)
|
||||||
ambient_light_energy = 2.0
|
ambient_light_energy = 2.0
|
||||||
|
|
||||||
[node name="Ingame" type="Node3D" node_paths=PackedStringArray("_players", "_chat_panel", "_chat_input", "_chat_history_scroll", "_chat_history", "_chat_panel_inactive", "_chat_history_inactive", "_chat_history_scroll_inactive")]
|
[node name="Ingame" type="Node3D" node_paths=PackedStringArray("_soundtrack", "_players", "_chat_panel", "_chat_input", "_chat_history_scroll", "_chat_history", "_chat_panel_inactive", "_chat_history_inactive", "_chat_history_scroll_inactive")]
|
||||||
script = ExtResource("1_akuuj")
|
script = ExtResource("1_akuuj")
|
||||||
_player_scene = ExtResource("2_w1gjc")
|
_player_scene = ExtResource("2_w1gjc")
|
||||||
|
_soundtrack = NodePath("Soundtrack")
|
||||||
_players = NodePath("Players")
|
_players = NodePath("Players")
|
||||||
_chat_panel = NodePath("UI/ChatPanel")
|
_chat_panel = NodePath("UI/ChatPanel")
|
||||||
_chat_input = NodePath("UI/ChatPanel/ChatInput")
|
_chat_input = NodePath("UI/ChatPanel/ChatInput")
|
||||||
@ -45,6 +46,7 @@ _chat_history_inactive = NodePath("UI/ChatPanelInactive/ChatHistoryScroll/ChatHi
|
|||||||
_chat_history_scroll_inactive = NodePath("UI/ChatPanelInactive/ChatHistoryScroll")
|
_chat_history_scroll_inactive = NodePath("UI/ChatPanelInactive/ChatHistoryScroll")
|
||||||
|
|
||||||
[node name="Soundtrack" type="AudioStreamPlayer" parent="."]
|
[node name="Soundtrack" type="AudioStreamPlayer" parent="."]
|
||||||
|
bus = &"Music"
|
||||||
|
|
||||||
[node name="UI" type="CanvasLayer" parent="." node_paths=PackedStringArray("_combo_timer")]
|
[node name="UI" type="CanvasLayer" parent="." node_paths=PackedStringArray("_combo_timer")]
|
||||||
script = ExtResource("3_p340v")
|
script = ExtResource("3_p340v")
|
||||||
|
6
src/lib/item.gd
Normal file
6
src/lib/item.gd
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
class_name Item
|
||||||
|
extends Resource
|
||||||
|
|
||||||
|
@export var icon: Texture2D = preload("res://icon.svg")
|
||||||
|
@export var name := "NAME"
|
||||||
|
@export var id := &"ID"
|
Loading…
Reference in New Issue
Block a user