Align patterns better around what UI components are. Move script related controllers to scripts folder

This commit is contained in:
2026-08-15 14:33:53 -05:00
parent 27411ea5fa
commit 2b196455b2
57 changed files with 128 additions and 60 deletions

View File

@@ -0,0 +1,62 @@
class_name CameraController extends Control
@onready var prev_bttn: Button = $margin_container/vbox/hbox/hbox2/prev_bttn
@onready var next_bttn: Button = $margin_container/vbox/hbox/hbox2/next_bttn
@export var cameras: Array[Camera3D]
var cue_cam: Camera3D
var current_cam: Camera3D
var current_cam_index: int = 0
func _ready() -> void:
setup_signals()
setup_multiplayer()
for camera in get_children():
if not is_instance_of(camera, Camera3D): continue
cameras.append(camera)
if not camera.name == "cue_cam": continue
cue_cam = camera
current_cam = cameras.get(current_cam_index)
func setup_signals() -> void:
Globals.game_state.update_cue_cam_position.connect(
_on_update_cue_cam_position
)
func setup_multiplayer() -> void:
if not Globals.multiplayer_data.is_multiplayer_active: return
func _on_update_cue_cam_position(marker_rotation: Vector3, marker_position: Vector3) -> void:
cue_cam.global_rotation = marker_rotation
cue_cam.global_position = marker_position
func _on_prev_bttn_pressed() -> void:
accept_event()
if current_cam_index == 0:
current_cam_index = cameras.size() - 1
else:
current_cam_index -= 1
_set_active_camera()
func _on_next_bttn_pressed() -> void:
accept_event()
if current_cam_index == (cameras.size() - 1):
current_cam_index = 0
else:
current_cam_index += 1
_set_active_camera()
func _set_active_camera():
current_cam.set_current(false)
current_cam = cameras.get(current_cam_index)
current_cam.set_current(true)

View File

@@ -0,0 +1 @@
uid://bpf107mmjiswh

View File

@@ -0,0 +1,65 @@
[gd_scene load_steps=3 format=3 uid="uid://w3vh1gj6t2k2"]
[ext_resource type="Script" uid="uid://bpf107mmjiswh" path="res://scenes/ui/game/camera/camera_controller.gd" id="1_mvpa7"]
[sub_resource type="LabelSettings" id="LabelSettings_mvpa7"]
font_size = 24
[node name="camera_controller" type="Control"]
layout_mode = 3
anchors_preset = 12
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_top = -68.0
offset_bottom = -68.0
grow_horizontal = 2
grow_vertical = 0
script = ExtResource("1_mvpa7")
[node name="margin_container" type="MarginContainer" parent="."]
layout_mode = 1
anchors_preset = 10
anchor_right = 1.0
offset_bottom = 69.0
grow_horizontal = 2
theme_override_constants/margin_left = 10
theme_override_constants/margin_top = 5
theme_override_constants/margin_right = 10
[node name="vbox" type="VBoxContainer" parent="margin_container"]
layout_mode = 2
[node name="hbox" type="HBoxContainer" parent="margin_container/vbox"]
layout_mode = 2
size_flags_vertical = 3
[node name="hbox2" type="HBoxContainer" parent="margin_container/vbox/hbox"]
layout_mode = 2
size_flags_horizontal = 10
[node name="prev_bttn" type="Button" parent="margin_container/vbox/hbox/hbox2"]
z_index = 1
layout_mode = 2
focus_mode = 0
mouse_default_cursor_shape = 2
text = "<Prev>"
flat = true
[node name="label" type="Label" parent="margin_container/vbox/hbox/hbox2"]
layout_mode = 2
text = " Camera "
label_settings = SubResource("LabelSettings_mvpa7")
horizontal_alignment = 1
vertical_alignment = 1
[node name="next_bttn" type="Button" parent="margin_container/vbox/hbox/hbox2"]
z_index = 1
layout_mode = 2
focus_mode = 0
mouse_default_cursor_shape = 2
text = "<Next>"
flat = true
[connection signal="pressed" from="margin_container/vbox/hbox/hbox2/prev_bttn" to="." method="_on_prev_bttn_pressed"]
[connection signal="pressed" from="margin_container/vbox/hbox/hbox2/next_bttn" to="." method="_on_next_bttn_pressed"]

View File

@@ -0,0 +1,33 @@
extends Control
@onready var player_lbl: Label = $vbox/hbox/hbox/player_lbl
@onready var active_lbl: Label = $vbox/hbox/hbox/active_lbl
@onready var reset_bttn: Button = $vbox/hbox/hbox2/reset_bttn
func _ready() -> void:
setup_signals()
setup_multiplayer()
MessageBus.emit_local("update_active_lbl", null)
func setup_signals() -> void:
MessageBus.subscribe("update_active_lbl", _on_update_active_lbl)
func setup_multiplayer() -> void:
player_lbl.text = Globals.game_data.player_id
if not Globals.multiplayer_data.is_multiplayer_active: return
reset_bttn.pressed.disconnect(_on_reset_bttn_pressed)
reset_bttn.visible = false
func _on_update_active_lbl() -> void:
active_lbl.visible = \
Globals.multiplayer_data.current_turn_player_id == multiplayer.get_unique_id()
func _on_reset_bttn_pressed() -> void:
Globals.game_state.reload_scene.emit()

View File

@@ -0,0 +1 @@
uid://br6jmlm4poh62

View File

@@ -0,0 +1,54 @@
[gd_scene load_steps=3 format=3 uid="uid://l3bve6miq8od"]
[ext_resource type="Script" uid="uid://br6jmlm4poh62" path="res://scenes/ui/game/data/data_ui.gd" id="1_nropj"]
[sub_resource type="LabelSettings" id="LabelSettings_o1hjn"]
font_color = Color(0, 1, 0.14117648, 1)
[node name="data_ui" type="Control"]
layout_mode = 3
anchors_preset = 10
anchor_right = 1.0
grow_horizontal = 2
script = ExtResource("1_nropj")
[node name="vbox" type="VBoxContainer" parent="."]
layout_mode = 0
offset_left = 10.0
offset_top = 5.0
offset_right = 1142.0
offset_bottom = 69.0
[node name="hbox" type="HBoxContainer" parent="vbox"]
layout_mode = 2
size_flags_vertical = 3
[node name="hbox" type="HBoxContainer" parent="vbox/hbox"]
layout_mode = 2
size_flags_horizontal = 3
[node name="player_lbl" type="Label" parent="vbox/hbox/hbox"]
layout_mode = 2
text = "Player 1"
[node name="active_lbl" type="Label" parent="vbox/hbox/hbox"]
visible = false
layout_mode = 2
text = "Active"
label_settings = SubResource("LabelSettings_o1hjn")
uppercase = true
[node name="hbox2" type="HBoxContainer" parent="vbox/hbox"]
layout_mode = 2
size_flags_horizontal = 8
size_flags_vertical = 3
[node name="reset_bttn" type="Button" parent="vbox/hbox/hbox2"]
layout_mode = 2
focus_mode = 0
mouse_default_cursor_shape = 2
text = "Reset"
flat = true
alignment = 0
[connection signal="pressed" from="vbox/hbox/hbox2/reset_bttn" to="." method="_on_reset_bttn_pressed"]

25
scenes/ui/game/game_ui.gd Normal file
View File

@@ -0,0 +1,25 @@
extends Control
@onready var panel: Panel = $panel
@onready var win_message_lbl: RichTextLabel = $panel/win_message_lbl
func _ready() -> void:
setup_signals()
setup_multiplayer()
func setup_signals() -> void:
MessageBus.subscribe("declare_win_condition", _on_declare_win_condition)
func setup_multiplayer() -> void:
if not Globals.multiplayer_data.is_multiplayer_active: return
func _on_declare_win_condition(message: String) -> void:
panel.visible = true
win_message_lbl.text = message
await get_tree().create_timer(5).timeout
MessageBus.emit_local("game_peer_disconnected", null)

View File

@@ -0,0 +1 @@
uid://b3torx8lbkrj7

View File

@@ -0,0 +1,66 @@
[gd_scene load_steps=4 format=3 uid="uid://himb0o6py5pt"]
[ext_resource type="Script" uid="uid://b3torx8lbkrj7" path="res://scenes/ui/game/game_ui.gd" id="1_4moq4"]
[ext_resource type="PackedScene" uid="uid://l3bve6miq8od" path="res://scenes/ui/game/data/data_ui.tscn" id="1_ff2ky"]
[ext_resource type="PackedScene" uid="uid://w3vh1gj6t2k2" path="res://scenes/ui/game/camera/camera_controller.tscn" id="2_4moq4"]
[node name="game_ui" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_4moq4")
[node name="panel" type="Panel" parent="."]
visible = false
z_index = 10
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -400.0
offset_top = -300.0
offset_right = 400.0
offset_bottom = 300.0
grow_horizontal = 2
grow_vertical = 2
[node name="win_message_lbl" type="RichTextLabel" parent="panel"]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -240.0
offset_top = -160.0
offset_right = 240.0
offset_bottom = 160.0
grow_horizontal = 2
grow_vertical = 2
scroll_active = false
autowrap_mode = 0
shortcut_keys_enabled = false
horizontal_alignment = 1
vertical_alignment = 1
[node name="data_ui" parent="." instance=ExtResource("1_ff2ky")]
z_index = 5
layout_mode = 1
[node name="camera_controller" parent="." instance=ExtResource("2_4moq4")]
z_index = 5
layout_mode = 1
[node name="camera1" type="Camera3D" parent="camera_controller"]
transform = Transform3D(-4.371139e-08, 1, 4.371139e-08, 0, -4.371139e-08, 1, 1, 4.371139e-08, 1.9106855e-15, 0, 1.8, 0)
[node name="camera2" type="Camera3D" parent="camera_controller"]
transform = Transform3D(0.03457907, -0.3120391, -0.9494398, 0, 0.9500079, -0.31222585, 0.999402, 0.010796479, 0.03285039, -0.35511678, 0.79579777, -0.83073556)
[node name="cue_cam" type="Camera3D" parent="camera_controller"]
transform = Transform3D(1, 0, 0, 0, 1.0000001, 0, 0, 0, 1.0000001, 0, 0, 0)

View File

@@ -0,0 +1,164 @@
[gd_scene load_steps=3 format=3 uid="uid://dg7pgj6i5pk8p"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_e03fk"]
content_margin_left = 4.0
content_margin_top = 4.0
content_margin_right = 4.0
content_margin_bottom = 4.0
bg_color = Color(0.22352941, 0.47058824, 0.23137255, 1)
corner_radius_top_left = 3
corner_radius_top_right = 3
corner_radius_bottom_right = 3
corner_radius_bottom_left = 3
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lqt48"]
content_margin_left = 4.0
content_margin_top = 4.0
content_margin_right = 4.0
content_margin_bottom = 4.0
bg_color = Color(0.84705883, 0.21960784, 0.24705882, 1)
corner_radius_top_left = 3
corner_radius_top_right = 3
corner_radius_bottom_right = 3
corner_radius_bottom_left = 3
[node name="lobby_ui" type="MarginContainer"]
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 16.0
offset_top = 23.0
offset_right = -19.0
offset_bottom = -27.0
grow_horizontal = 2
grow_vertical = 2
[node name="body" type="HBoxContainer" parent="."]
layout_mode = 2
size_flags_vertical = 3
[node name="left_body" type="VBoxContainer" parent="body"]
layout_mode = 2
size_flags_horizontal = 3
[node name="server_host_hbox" type="HBoxContainer" parent="body/left_body"]
layout_mode = 2
size_flags_horizontal = 3
[node name="home_bttn" type="Button" parent="body/left_body/server_host_hbox"]
layout_mode = 2
text = "Home"
[node name="host_address_input" type="LineEdit" parent="body/left_body/server_host_hbox"]
layout_mode = 2
size_flags_horizontal = 3
text = "127.0.0.1"
placeholder_text = "Server Address: (Eg. 0.0.0.0)"
alignment = 1
max_length = 15
emoji_menu_enabled = false
clear_button_enabled = true
caret_blink = true
[node name="host_port_range" type="SpinBox" parent="body/left_body/server_host_hbox"]
layout_mode = 2
min_value = 1.0
max_value = 65535.0
page = 10.0
value = 8080.0
rounded = true
alignment = 1
[node name="host_connect_bttn" type="Button" parent="body/left_body/server_host_hbox"]
layout_mode = 2
mouse_default_cursor_shape = 2
theme_override_styles/normal = SubResource("StyleBoxFlat_e03fk")
text = "Connect"
[node name="host_disconnect_bttn" type="Button" parent="body/left_body/server_host_hbox"]
visible = false
layout_mode = 2
mouse_default_cursor_shape = 2
theme_override_styles/normal = SubResource("StyleBoxFlat_lqt48")
text = "Disconnect"
[node name="search_vbox" type="VBoxContainer" parent="body/left_body"]
visible = false
layout_mode = 2
size_flags_vertical = 3
[node name="search_hbox" type="HBoxContainer" parent="body/left_body/search_vbox"]
layout_mode = 2
size_flags_horizontal = 3
[node name="match_search_input" type="LineEdit" parent="body/left_body/search_vbox/search_hbox"]
layout_mode = 2
size_flags_horizontal = 3
placeholder_text = "Search Match List... "
max_length = 12
emoji_menu_enabled = false
clear_button_enabled = true
caret_blink = true
[node name="match_search_bttn" type="Button" parent="body/left_body/search_vbox/search_hbox"]
layout_mode = 2
mouse_default_cursor_shape = 2
text = "Search"
[node name="scroll_container" type="ScrollContainer" parent="body/left_body/search_vbox"]
layout_mode = 2
size_flags_vertical = 3
[node name="match_list" type="VBoxContainer" parent="body/left_body/search_vbox/scroll_container"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="right_body" type="VBoxContainer" parent="body"]
layout_mode = 2
size_flags_horizontal = 3
[node name="create_match_hbox" type="HBoxContainer" parent="body/right_body"]
layout_mode = 2
size_flags_horizontal = 3
[node name="new_match_name_input" type="LineEdit" parent="body/right_body/create_match_hbox"]
layout_mode = 2
size_flags_horizontal = 3
placeholder_text = "New Match Name..."
max_length = 12
emoji_menu_enabled = false
clear_button_enabled = true
[node name="match_create_bttn" type="Button" parent="body/right_body/create_match_hbox"]
layout_mode = 2
mouse_default_cursor_shape = 2
text = "Create"
[node name="vbox" type="VBoxContainer" parent="body/right_body"]
layout_mode = 2
size_flags_vertical = 3
alignment = 1
[node name="8ball" type="Button" parent="body/right_body/vbox"]
layout_mode = 2
mouse_default_cursor_shape = 2
disabled = true
text = "8-Ball"
[node name="9ball" type="Button" parent="body/right_body/vbox"]
layout_mode = 2
mouse_default_cursor_shape = 2
disabled = true
text = "9-Ball"
[node name="snooker" type="Button" parent="body/right_body/vbox"]
layout_mode = 2
mouse_default_cursor_shape = 2
disabled = true
text = "Snooker"
[node name="freeball" type="Button" parent="body/right_body/vbox"]
layout_mode = 2
mouse_default_cursor_shape = 2
text = "Free Ball"

View File

@@ -0,0 +1,14 @@
class_name StartMenuControls extends Control
@onready var button_sound: AudioStreamPlayer = $button_sound
func _bttn_mouse_entered() -> void:
button_sound.play(0.0)
func _on_play_bttn_pressed() -> void:
Globals.game_state.set_game_scene("res://scenes/game.tscn")
func _on_multiplayer_bttn_pressed() -> void:
Globals.game_state.set_game_scene("res://scenes/screens/lobby_screen/lobby.tscn")

View File

@@ -0,0 +1 @@
uid://ykbcl0j1wouh

View File

@@ -0,0 +1,40 @@
[gd_scene load_steps=3 format=3 uid="uid://da0ok71rkjpx8"]
[ext_resource type="Script" uid="uid://ykbcl0j1wouh" path="res://scenes/ui/start_screen/start_ui.gd" id="1_mwcbl"]
[ext_resource type="AudioStream" uid="uid://dcaul3y5u0mko" path="res://sounds/effects/ball-hits.wav" id="2_uxmhm"]
[node name="start_ui" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_mwcbl")
[node name="vbox" type="VBoxContainer" parent="."]
layout_mode = 1
anchors_preset = 9
anchor_bottom = 1.0
offset_left = 56.0
offset_right = 312.0
grow_vertical = 2
alignment = 1
[node name="play_bttn" type="Button" parent="vbox"]
layout_mode = 2
mouse_default_cursor_shape = 2
text = "Play"
[node name="multiplayer_bttn" type="Button" parent="vbox"]
layout_mode = 2
mouse_default_cursor_shape = 2
text = "Multiplayer"
[node name="button_sound" type="AudioStreamPlayer" parent="."]
stream = ExtResource("2_uxmhm")
[connection signal="mouse_entered" from="vbox/play_bttn" to="." method="_bttn_mouse_entered"]
[connection signal="pressed" from="vbox/play_bttn" to="." method="_on_play_bttn_pressed"]
[connection signal="mouse_entered" from="vbox/multiplayer_bttn" to="." method="_bttn_mouse_entered"]
[connection signal="pressed" from="vbox/multiplayer_bttn" to="." method="_on_multiplayer_bttn_pressed"]