diff --git a/project/scenes/menu_body/world.tscn b/project/scenes/menu_body/world.tscn index 1ed6d10..5362d6a 100644 --- a/project/scenes/menu_body/world.tscn +++ b/project/scenes/menu_body/world.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=23 format=3 uid="uid://kywrsqro3d5i"] +[gd_scene load_steps=22 format=3 uid="uid://kywrsqro3d5i"] [ext_resource type="Script" path="res://scripts/loading/gate_loader.gd" id="1_uxhy6"] [ext_resource type="Resource" uid="uid://b1xvdym0qh6td" path="res://resources/gate_events.res" id="2_q7cvi"] @@ -12,6 +12,7 @@ [ext_resource type="Script" path="res://scripts/sandbox/command_sync.gd" id="10_cqo55"] [ext_resource type="Script" path="res://scripts/ui/world/world_ui.gd" id="12_jdwjt"] [ext_resource type="Script" path="res://scripts/ui/world/gate_info.gd" id="14_8hca5"] +[ext_resource type="Script" path="res://scripts/ui/world/loading_status.gd" id="14_jjuux"] [ext_resource type="Script" path="res://scripts/ui/world/release_focus.gd" id="16_8emm0"] [ext_resource type="Script" path="res://scripts/ui/fullscreen_animation.gd" id="18_sx3kr"] @@ -24,12 +25,6 @@ corner_radius_bottom_left = 25 [sub_resource type="LabelSettings" id="LabelSettings_i1x1e"] font_size = 32 -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rndqt"] -draw_center = false - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_a03l7"] -draw_center = false - [sub_resource type="Animation" id="Animation_beyyv"] length = 0.001 tracks/0/type = "value" @@ -346,7 +341,7 @@ command_events = ExtResource("6_18mgg") custom_minimum_size = Vector2(50, 0) layout_mode = 2 -[node name="GateInfo" type="VBoxContainer" parent="HBoxContainer" node_paths=PackedStringArray("image", "title", "description", "url")] +[node name="GateInfo" type="VBoxContainer" parent="HBoxContainer" node_paths=PackedStringArray("image", "title", "description")] layout_mode = 2 size_flags_horizontal = 3 theme_override_constants/separation = 30 @@ -355,7 +350,6 @@ gate_events = ExtResource("2_q7cvi") image = NodePath("HBoxContainer/ImageMask/TextureRect") title = NodePath("HBoxContainer/Title") description = NodePath("Description") -url = NodePath("Url") [node name="HBoxContainer" type="HBoxContainer" parent="HBoxContainer/GateInfo"] custom_minimum_size = Vector2(0, 100) @@ -390,24 +384,23 @@ text_overrun_behavior = 3 [node name="Description" type="RichTextLabel" parent="HBoxContainer/GateInfo"] layout_mode = 2 size_flags_vertical = 3 +focus_mode = 2 theme_override_font_sizes/normal_font_size = 24 +bbcode_enabled = true text = "Downloading gate info... Please wait" - -[node name="Url" type="LineEdit" parent="HBoxContainer/GateInfo"] -visible = false -layout_mode = 2 -theme_override_colors/font_uneditable_color = Color(1, 1, 1, 1) -theme_override_font_sizes/font_size = 20 -theme_override_styles/focus = SubResource("StyleBoxFlat_rndqt") -theme_override_styles/read_only = SubResource("StyleBoxFlat_a03l7") -text = "url" -alignment = 1 -editable = false -caret_blink = true -caret_blink_interval = 0.5 +context_menu_enabled = true +selection_enabled = true script = ExtResource("16_8emm0") +[node name="LoadingStatus" type="Label" parent="HBoxContainer/GateInfo"] +layout_mode = 2 +theme_override_font_sizes/font_size = 24 +text = "Connecting..." +horizontal_alignment = 1 +script = ExtResource("14_jjuux") +gate_events = ExtResource("2_q7cvi") + [node name="Spacing2" type="Control" parent="HBoxContainer"] custom_minimum_size = Vector2(50, 0) layout_mode = 2 diff --git a/project/scripts/ui/world/gate_info.gd b/project/scripts/ui/world/gate_info.gd index cd8357d..80e2f01 100644 --- a/project/scripts/ui/world/gate_info.gd +++ b/project/scripts/ui/world/gate_info.gd @@ -5,7 +5,6 @@ extends Control @export var image: TextureRect @export var title: Label @export var description: RichTextLabel -@export var url: LineEdit var gate: Gate @@ -18,5 +17,4 @@ func display_info(_gate: Gate) -> void: gate = _gate title.text = "Unnamed" if gate.title.is_empty() else gate.title description.text = "No description" if gate.description.is_empty() else gate.description - url.text = gate.url.replace("world.gate", "") image.texture = FileTools.load_external_tex(gate.image) diff --git a/project/scripts/ui/world/loading_status.gd b/project/scripts/ui/world/loading_status.gd new file mode 100644 index 0000000..2b3a34a --- /dev/null +++ b/project/scripts/ui/world/loading_status.gd @@ -0,0 +1,16 @@ +extends Label + +@export var gate_events: GateEvents + + +func _ready() -> void: + gate_events.gate_info_loaded.connect(func(_gate): on_gate_info_loaded()) + gate_events.gate_entered.connect(on_gate_entered) + + +func on_gate_info_loaded() -> void: + text = "Downloading files..." + + +func on_gate_entered() -> void: + text = "" diff --git a/project/scripts/ui/world/release_focus.gd b/project/scripts/ui/world/release_focus.gd index b73dc5f..332c25e 100644 --- a/project/scripts/ui/world/release_focus.gd +++ b/project/scripts/ui/world/release_focus.gd @@ -1,4 +1,4 @@ -extends LineEdit +extends Control func _input(event: InputEvent) -> void: