diff options
| -rw-r--r-- | client/game.gd | 14 | ||||
| -rw-r--r-- | client/game.tscn | 21 | ||||
| -rw-r--r-- | client/menu/game.gd | 10 | ||||
| -rw-r--r-- | client/menu/game.tscn | 20 | ||||
| -rw-r--r-- | client/menu/lobby.gd | 1 | ||||
| -rw-r--r-- | client/menu/popup_message.gd | 2 |
6 files changed, 36 insertions, 32 deletions
diff --git a/client/game.gd b/client/game.gd index ccc72e11..c18f8d67 100644 --- a/client/game.gd +++ b/client/game.gd @@ -42,11 +42,10 @@ var players := {} @onready var camera: FollowCamera = $FollowCamera @onready var mp: Multiplayer = $Multiplayer @onready var map: Map = $Map -@onready var environment = $WorldEnvironment -@onready var debug_label = $Debug -@onready var overlay = $Overlay -@onready var lobby = $"../Lobby" -@onready var popup_message: PopupMessage = $PopupMessage +@onready var environment: WorldEnvironment = $WorldEnvironment +@onready var lobby: Lobby = $"../Lobby" +@onready var overlay: Overlay = $"../Overlay" +@onready var popup_message: PopupMessage = $"../PopupMessage" func _ready(): if !Global.on_vulkan(): @@ -256,11 +255,6 @@ func _process(delta): if is_replay and mp != null: mp.send_replay_tick(delta) - if Global.get_setting("debug_info"): - debug_label.show() - debug_label.text = "%d FPS" % Engine.get_frames_per_second() - else: debug_label.hide() - func get_tile_collision(pos: Vector2i) -> bool: var t = map.get_tile_name(pos) if t == null: return true diff --git a/client/game.tscn b/client/game.tscn index 82fef27a..345a35b8 100644 --- a/client/game.tscn +++ b/client/game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://c6krh36hoqfg8"] +[gd_scene load_steps=10 format=3 uid="uid://c6krh36hoqfg8"] [ext_resource type="Script" path="res://game.gd" id="1_sftfn"] [ext_resource type="PackedScene" uid="uid://b31mlnao6ybt8" path="res://player/follow_camera.tscn" id="2_s8y6o"] @@ -6,8 +6,6 @@ [ext_resource type="Script" path="res://map/auto_setup/light_setup.gd" id="5_6fpff"] [ext_resource type="Script" path="res://multiplayer.gd" id="6_fbxu8"] [ext_resource type="PackedScene" uid="uid://b4gone8fu53r7" path="res://map/map.tscn" id="6_prg6t"] -[ext_resource type="PackedScene" uid="uid://bpikve6wlsjfl" path="res://menu/overlay.tscn" id="7_7xrr6"] -[ext_resource type="PackedScene" uid="uid://b21nrnkygiyjt" path="res://menu/popup_message.tscn" id="9_l5d71"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_py7px"] ground_bottom_color = Color(0.0826605, 0.065772, 0.0461518, 1) @@ -47,20 +45,3 @@ script = ExtResource("5_6fpff") [node name="Map" parent="." instance=ExtResource("6_prg6t")] [node name="Center" type="Node3D" parent="."] - -[node name="Overlay" parent="." instance=ExtResource("7_7xrr6")] -offset_left = -280.0 -offset_bottom = 102.0 - -[node name="Debug" type="RichTextLabel" parent="."] -visible = false -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -theme_override_colors/font_outline_color = Color(0, 0, 0, 1) -theme_override_constants/outline_size = 5 - -[node name="PopupMessage" parent="." instance=ExtResource("9_l5d71")] diff --git a/client/menu/game.gd b/client/menu/game.gd index 362bf169..78c01c42 100644 --- a/client/menu/game.gd +++ b/client/menu/game.gd @@ -16,6 +16,10 @@ # extends Menu +@onready var debug_label = $Debug +@onready var overlay = $Overlay +@onready var popup_message: PopupMessage = $PopupMessage + func _ready(): get_tree().get_root().connect("go_back_requested", open_ingame_menu) super() @@ -24,6 +28,12 @@ func _input(_event): if Input.is_action_just_pressed("ui_menu"): open_ingame_menu() +func _process(delta): + if Global.get_setting("debug_info"): + debug_label.show() + debug_label.text = "%d FPS" % Engine.get_frames_per_second() + else: debug_label.hide() + func open_ingame_menu(): if popup != null: return Sound.play_click() diff --git a/client/menu/game.tscn b/client/menu/game.tscn index af7f22a8..417aaf96 100644 --- a/client/menu/game.tscn +++ b/client/menu/game.tscn @@ -1,8 +1,10 @@ -[gd_scene load_steps=4 format=3 uid="uid://bbjwoxs71fnsk"] +[gd_scene load_steps=6 format=3 uid="uid://bbjwoxs71fnsk"] [ext_resource type="Script" path="res://menu/game.gd" id="1_cdpsh"] [ext_resource type="PackedScene" uid="uid://c6krh36hoqfg8" path="res://game.tscn" id="2_uojcy"] +[ext_resource type="PackedScene" uid="uid://bpikve6wlsjfl" path="res://menu/overlay.tscn" id="3_i0ytb"] [ext_resource type="PackedScene" uid="uid://bc50la65ntifb" path="res://menu/lobby.tscn" id="3_udxby"] +[ext_resource type="PackedScene" uid="uid://b21nrnkygiyjt" path="res://menu/popup_message.tscn" id="5_n1wy0"] [node name="GameMenu" type="Control"] layout_mode = 3 @@ -16,5 +18,21 @@ auto_anim = false [node name="Game" parent="." instance=ExtResource("2_uojcy")] +[node name="Overlay" parent="." instance=ExtResource("3_i0ytb")] +layout_mode = 1 + [node name="Lobby" parent="." instance=ExtResource("3_udxby")] layout_mode = 1 + +[node name="Debug" type="RichTextLabel" parent="."] +visible = false +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 1 + +[node name="PopupMessage" parent="." instance=ExtResource("5_n1wy0")] +layout_mode = 1 diff --git a/client/menu/lobby.gd b/client/menu/lobby.gd index ae7548b7..3c4a6f58 100644 --- a/client/menu/lobby.gd +++ b/client/menu/lobby.gd @@ -15,6 +15,7 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. # extends Control +class_name Lobby const PLAYER = preload("res://menu/lobby/player.tscn") diff --git a/client/menu/popup_message.gd b/client/menu/popup_message.gd index 1748f59a..480a7591 100644 --- a/client/menu/popup_message.gd +++ b/client/menu/popup_message.gd @@ -32,7 +32,7 @@ var is_joined := false @onready var reset_timer = $Reset -@onready var game: Game = get_parent() +@onready var game: Game = $"../Game" func _ready(): game.joined.connect( |