From 92daf043fc20d93be4e176842052cac7b680cb5b Mon Sep 17 00:00:00 2001 From: betalars Date: Fri, 5 Sep 2025 02:01:28 +0200 Subject: [PATCH] WIP: adding frame to collectable ui so objects can be viewed in the scene --- .../youth_room/Collectable.gd | 8 +++++ .../youth_room/youth_room.tscn | 29 ++++++++++++++----- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/base-environments/youth_room/Collectable.gd b/src/base-environments/youth_room/Collectable.gd index 872200d..6090e54 100644 --- a/src/base-environments/youth_room/Collectable.gd +++ b/src/base-environments/youth_room/Collectable.gd @@ -5,13 +5,21 @@ class_name InteractiveSprite extends Area3D @onready var ui: CollectableUi = $UiWrapper/UiSprite/SubViewport.get_child(0) @onready var viewport:= $UiWrapper/UiSprite/SubViewport +var distance_tween = Tween.new() + var revealed: bool = false: set(reveal): revealed = reveal if reveal: wrapper.show() + if distance_tween.is_running(): distance_tween.stop() + distance_tween = get_tree().create_tween() + distance_tween.tween_property($UiWrapper/Frame, "visibility_range_end", 3, 1) else: ui.vanish() + if distance_tween.is_running(): distance_tween.stop() + distance_tween = get_tree().create_tween() + distance_tween.tween_property($UiWrapper/Frame, "visibility_range_end", 0.6, 1) await get_tree().create_timer(1).timeout if not ui.visible: wrapper.hide() diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 07d4736..6fdea93 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=115 format=4 uid="uid://b3b0gyvklqn50"] +[gd_scene load_steps=117 format=4 uid="uid://b3b0gyvklqn50"] [ext_resource type="Script" uid="uid://belkrno67sft0" path="res://base-environments/youth_room/room_handle.gd" id="1_aitp0"] [ext_resource type="PackedScene" uid="uid://c0i4ydmxtxfho" path="res://base-environments/youth_room/import/youth_room.glb" id="1_jf3oi"] [ext_resource type="AudioStream" uid="uid://1h6k2d8q1kw3" path="res://base-environments/youth_room/import/sounds/rain_on_window.mp3" id="2_3haaq"] +[ext_resource type="Resource" uid="uid://bgplfqxa852wo" path="res://dev-util/debug_save.tres" id="2_h6j14"] [ext_resource type="PackedScene" uid="uid://mkccbig41bqb" path="res://logic-scenes/player_controller/player_controller.tscn" id="3_foj4y"] [ext_resource type="AudioStream" uid="uid://bbpo1hu35yer8" path="res://base-environments/youth_room/import/sounds/thunder.mp3" id="3_wcypa"] [ext_resource type="Script" uid="uid://c281w7earok6w" path="res://base-environments/youth_room/crouch_volume.gd" id="3_x3dlb"] @@ -26,6 +27,7 @@ [ext_resource type="ArrayMesh" uid="uid://bfc3d4g40n0wy" path="res://logic-scenes/collectable/import/old-mask.res" id="19_jr2bb"] [ext_resource type="PackedScene" uid="uid://dwtxjvprjyx8p" path="res://base-environments/youth_room/lava-lamp.tscn" id="21_0k2gr"] [ext_resource type="AudioStream" uid="uid://bghjiqkyehs1p" path="res://base-environments/youth_room/import/sounds/rain and thunder.mp3" id="22_xrkbj"] +[ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="24_ghmim"] [ext_resource type="PackedScene" uid="uid://wfyna16xhlo0" path="res://logic-scenes/collectable/new_collectable_ui.tscn" id="25_ghmim"] [ext_resource type="PackedScene" uid="uid://bpjympn3ps3wo" path="res://logic-scenes/luna/luna_imported.tscn" id="27_pb1jl"] [ext_resource type="Material" uid="uid://ct7uc5i5yp5qf" path="res://base-environments/youth_room/import/materials/wall.tres" id="28_oiweb"] @@ -902,14 +904,14 @@ func play(anin_name: StringName = \"\", a: float = -1, b: float = 1, c: bool = f " [sub_resource type="BoxShape3D" id="BoxShape3D_cb3g8"] -size = Vector3(1.81843, 2.13395, 0.0774798) +size = Vector3(2.31545, 2.13395, 0.0774798) [sub_resource type="ViewportTexture" id="ViewportTexture_ghmim"] viewport_path = NodePath("logic/MaskMemento/UiWrapper/UiSprite/SubViewport") [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_72g2i"] -radius = 0.342951 -height = 1.08154 +radius = 0.387255 +height = 1.11319 [sub_resource type="ViewportTexture" id="ViewportTexture_7hana"] viewport_path = NodePath("logic/ClothesMemento/UiWrapper/UiSprite/SubViewport") @@ -1600,6 +1602,7 @@ func hide(): [node name="youth room" type="Node3D" groups=["serializable"]] process_mode = 1 script = ExtResource("1_aitp0") +save_game = ExtResource("2_h6j14") [node name="logic" type="Node3D" parent="."] @@ -1607,7 +1610,6 @@ script = ExtResource("1_aitp0") unique_name_in_owner = true process_mode = 4 transform = Transform3D(0.686123, 0, 0.727485, 0, 1, 0, -0.727485, 0, 0.686123, 0.63, 0, 0.925) -collision_mask = 3 [node name="colission" type="Node3D" parent="logic"] @@ -1920,15 +1922,15 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00898492, -0.14171, 0.15275 visible = false [node name="UiWrapper" type="Area3D" parent="logic/MaskMemento"] -transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, -2.38419e-07, 0, 0.0718942) +transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, -0.134171, -0.20001, -0.000299692) script = ExtResource("11_7uxd8") [node name="UI_click_collider" type="CollisionShape3D" parent="logic/MaskMemento/UiWrapper"] -transform = Transform3D(2.56, -5.96046e-08, 4.76837e-07, 1.78814e-07, 2.56, -4.17233e-07, -2.38419e-07, -5.96046e-08, 2.56, 0, 1.90735e-06, 0.238397) +transform = Transform3D(2.56, -5.96046e-08, 4.76837e-07, 1.78814e-07, 2.56, -4.17233e-07, 0, -5.96046e-08, 2.56, -3.32987, -0.143251, 0.0614357) shape = SubResource("BoxShape3D_cb3g8") [node name="UiSprite" type="Sprite3D" parent="logic/MaskMemento/UiWrapper"] -transform = Transform3D(1, 0, 2.98023e-08, 0, 1, 0, -2.98023e-08, 0, 1, -9.53674e-07, 0, 0.61076) +transform = Transform3D(1, 0, -5.96046e-08, 0, 1, 0, 5.96046e-08, 0, 1, -3.4386, -0.143253, 0.433798) modulate = Color(0.941176, 0.905882, 0.886275, 1) pixel_size = 0.015 no_depth_test = true @@ -1941,7 +1943,18 @@ render_target_update_mode = 4 [node name="CollectableUi" parent="logic/MaskMemento/UiWrapper/UiSprite/SubViewport" instance=ExtResource("25_ghmim")] +[node name="Frame" type="Sprite3D" parent="logic/MaskMemento/UiWrapper"] +transform = Transform3D(0.704571, 0, -1.19209e-07, 0, 0.704571, 0, 1.19209e-07, 0, 0.704571, 1.00458, -1.47577, 0.523485) +visibility_range_end = 0.6 +visibility_range_end_margin = 0.3 +visibility_range_fade_mode = 1 +no_depth_test = true +texture = ExtResource("24_ghmim") +region_enabled = true +region_rect = Rect2(735.5, 0, 995.5, 1024) + [node name="HoverDetect" type="CollisionShape3D" parent="logic/MaskMemento"] +transform = Transform3D(-0.0152331, -0.999545, -0.0260244, 0.863025, -5.87663e-08, -0.50516, 0.50493, -0.0301548, 0.862633, -0.266952, -0.0898764, 0.0160832) shape = SubResource("CapsuleShape3D_72g2i") [node name="ClothesMemento" type="Area3D" parent="logic" groups=["interactables"]]