diff options
| -rw-r--r-- | client/player/item_bubble.gd | 15 | ||||
| -rw-r--r-- | client/player/item_bubble.tscn | 48 | ||||
| -rw-r--r-- | client/player/player.gd | 4 |
3 files changed, 47 insertions, 20 deletions
diff --git a/client/player/item_bubble.gd b/client/player/item_bubble.gd index b5dd7352..5a013053 100644 --- a/client/player/item_bubble.gd +++ b/client/player/item_bubble.gd @@ -18,14 +18,21 @@ extends MeshInstance3D signal submit_message -@onready var base: Node3D = $SubViewport/ItemMessage/SubViewportContainer/SubViewport/ItemBase +@onready var base: Node3D = $SubViewport/ItemMessage/VBoxContainer/SubViewportContainer/SubViewport/ItemBase +@onready var progress: ProgressBar = $SubViewport/ItemMessage/VBoxContainer/ProgressBar var item: Item -func set_item(t: String): +var timeout_remaining := 0. + +func set_item(t: String, timeout_initial: float, timeout_remaining_: float): visible = true item = ItemFactory.produce(t, base) base.add_child(item) + + timeout_remaining = timeout_remaining_ + progress.max_value = timeout_initial + progress.value = timeout_remaining func remove_item(): visible = false @@ -33,5 +40,7 @@ func remove_item(): item.queue_free() func _process(delta): - if item != null: + if visible: item.rotation.y += delta * TAU * .05 + timeout_remaining -= delta + progress.value = timeout_remaining diff --git a/client/player/item_bubble.tscn b/client/player/item_bubble.tscn index c6365591..71359670 100644 --- a/client/player/item_bubble.tscn +++ b/client/player/item_bubble.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=3 uid="uid://cj777mi5nok6c"] +[gd_scene load_steps=9 format=3 uid="uid://cj777mi5nok6c"] [ext_resource type="Script" path="res://player/item_bubble.gd" id="1_84g24"] @@ -27,6 +27,14 @@ ambient_light_source = 2 ambient_light_color = Color(1, 1, 1, 1) ambient_light_energy = 0.5 +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ima0t"] +corner_radius_bottom_right = 32 +corner_radius_bottom_left = 32 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_x1tnr"] +bg_color = Color(0.415945, 0.888786, 0, 1) +corner_radius_bottom_left = 32 + [node name="ItemBubble" type="MeshInstance3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) visible = false @@ -39,36 +47,46 @@ disable_3d = true transparent_bg = true size = Vector2i(256, 256) -[node name="ItemMessage" type="Panel" parent="SubViewport"] +[node name="ItemMessage" type="PanelContainer" parent="SubViewport"] offset_right = 256.0 offset_bottom = 256.0 +size_flags_vertical = 3 auto_translate = false theme_override_styles/panel = SubResource("StyleBoxFlat_dpele") -[node name="SubViewportContainer" type="SubViewportContainer" parent="SubViewport/ItemMessage"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 +[node name="VBoxContainer" type="VBoxContainer" parent="SubViewport/ItemMessage"] +layout_mode = 2 +theme_override_constants/separation = 0 + +[node name="SubViewportContainer" type="SubViewportContainer" parent="SubViewport/ItemMessage/VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 3 -[node name="SubViewport" type="SubViewport" parent="SubViewport/ItemMessage/SubViewportContainer"] +[node name="SubViewport" type="SubViewport" parent="SubViewport/ItemMessage/VBoxContainer/SubViewportContainer"] own_world_3d = true transparent_bg = true handle_input_locally = false -size = Vector2i(256, 256) +size = Vector2i(256, 224) render_target_update_mode = 4 -[node name="Camera3D" type="Camera3D" parent="SubViewport/ItemMessage/SubViewportContainer/SubViewport"] +[node name="Camera3D" type="Camera3D" parent="SubViewport/ItemMessage/VBoxContainer/SubViewportContainer/SubViewport"] transform = Transform3D(1, 0, 0, 0, 0.939693, 0.34202, 0, -0.34202, 0.939693, 0, 0.5, 1) projection = 1 size = 0.6 -[node name="ItemBase" type="Node3D" parent="SubViewport/ItemMessage/SubViewportContainer/SubViewport"] +[node name="ItemBase" type="Node3D" parent="SubViewport/ItemMessage/VBoxContainer/SubViewportContainer/SubViewport"] -[node name="DirectionalLight3D" type="DirectionalLight3D" parent="SubViewport/ItemMessage/SubViewportContainer/SubViewport"] +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="SubViewport/ItemMessage/VBoxContainer/SubViewportContainer/SubViewport"] transform = Transform3D(1, 0, 0, 0, 0.173648, 0.984808, 0, -0.984808, 0.173648, 0, 0, 0) -[node name="WorldEnvironment" type="WorldEnvironment" parent="SubViewport/ItemMessage/SubViewportContainer/SubViewport"] +[node name="WorldEnvironment" type="WorldEnvironment" parent="SubViewport/ItemMessage/VBoxContainer/SubViewportContainer/SubViewport"] environment = SubResource("Environment_iyxrx") + +[node name="ProgressBar" type="ProgressBar" parent="SubViewport/ItemMessage/VBoxContainer"] +custom_minimum_size = Vector2(0, 32) +layout_mode = 2 +theme_override_styles/background = SubResource("StyleBoxFlat_ima0t") +theme_override_styles/fill = SubResource("StyleBoxFlat_x1tnr") +step = 0.0 +value = 82.94 +show_percentage = false diff --git a/client/player/player.gd b/client/player/player.gd index 117ee76c..43d7dd7f 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -151,8 +151,8 @@ func clear_message(): chat_bubble.remove_text() effect.clear_effect() -func item_message(item_name: String, _timeout_initial: float, timeout_remaining: float): - item_bubble.set_item(item_name) +func item_message(item_name: String, timeout_initial: float, timeout_remaining: float): + item_bubble.set_item(item_name, timeout_initial, timeout_remaining) clear_timer.start(timeout_remaining) func text_message(m: String, _timeout_initial: float, timeout_remaining: float): |