From b3d82de85043c83f2e05e7df02bd82cf0d0a72ca Mon Sep 17 00:00:00 2001 From: Tiger Jove Date: Mon, 5 Jan 2026 18:42:27 +0100 Subject: [PATCH] chore: found many broken / orphaned viewports in youth room --- .../youth_room/youth_room.gd | 2 - .../youth_room/youth_room.tscn | 99 +------------------ .../interactive_sprite.tscn | 10 +- .../interactive_sprite/ui_sprite.gd | 4 + .../interactive_sprite/ui_sprite.gd.uid | 1 + 5 files changed, 13 insertions(+), 103 deletions(-) create mode 100644 src/logic-scenes/interactive_sprite/ui_sprite.gd create mode 100644 src/logic-scenes/interactive_sprite/ui_sprite.gd.uid diff --git a/src/base-environments/youth_room/youth_room.gd b/src/base-environments/youth_room/youth_room.gd index cd629ce..f55897d 100644 --- a/src/base-environments/youth_room/youth_room.gd +++ b/src/base-environments/youth_room/youth_room.gd @@ -10,8 +10,6 @@ extends RoomTemplate @onready var card_picker: CardPicker = %Picker @onready var ui: Control = %UI -signal interaction(interactable: Object) - func start_room(): %UI.show() $logic/PlayerController.process_mode = Node.PROCESS_MODE_INHERIT diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 09578dc..a4f6191 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=136 format=4 uid="uid://b3b0gyvklqn50"] +[gd_scene load_steps=117 format=4 uid="uid://b3b0gyvklqn50"] [ext_resource type="Script" uid="uid://bsop46tqngddc" path="res://base-environments/youth_room/youth_room.gd" id="1_aitp0"] [ext_resource type="AudioStream" uid="uid://1h6k2d8q1kw3" path="res://base-environments/youth_room/import/sounds/rain_on_window.mp3" id="2_3haaq"] @@ -27,7 +27,6 @@ [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="Shader" uid="uid://ci37nlh06b5y2" path="res://logic-scenes/collectable/collectable.gdshader" id="25_dqyng"] [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"] [ext_resource type="PackedScene" uid="uid://bw47g00bi710i" path="res://base-environments/youth_room/youth_room_visuals.tscn" id="30_dqyng"] @@ -870,78 +869,6 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_lag5h") -[sub_resource type="ViewportTexture" id="ViewportTexture_dqyng"] -viewport_path = NodePath("logic/MaskMemento/UiWrapper/UiSprite/SubViewport") - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_xbjb2"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("25_dqyng") -shader_parameter/default_texture = SubResource("ViewportTexture_dqyng") - -[sub_resource type="ViewportTexture" id="ViewportTexture_mhuct"] -viewport_path = NodePath("UiWrapper/UiSprite/SubViewport") - -[sub_resource type="ViewportTexture" id="ViewportTexture_e5y1q"] -viewport_path = NodePath("logic/MaskMemento/UiWrapper/UiSprite/SubViewport") - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_5bsh1"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("25_dqyng") -shader_parameter/default_texture = SubResource("ViewportTexture_e5y1q") - -[sub_resource type="ViewportTexture" id="ViewportTexture_wc1hp"] -viewport_path = NodePath("UiWrapper/UiSprite/SubViewport") - -[sub_resource type="ViewportTexture" id="ViewportTexture_ks23q"] -viewport_path = NodePath("logic/MaskMemento/UiWrapper/UiSprite/SubViewport") - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_e5y1q"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("25_dqyng") -shader_parameter/default_texture = SubResource("ViewportTexture_ks23q") - -[sub_resource type="ViewportTexture" id="ViewportTexture_murax"] -viewport_path = NodePath("UiWrapper/UiSprite/SubViewport") - -[sub_resource type="ViewportTexture" id="ViewportTexture_5bsh1"] -viewport_path = NodePath("logic/MaskMemento/UiWrapper/UiSprite/SubViewport") - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_ypa88"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("25_dqyng") -shader_parameter/default_texture = SubResource("ViewportTexture_5bsh1") - -[sub_resource type="ViewportTexture" id="ViewportTexture_culng"] -viewport_path = NodePath("UiWrapper/UiSprite/SubViewport") - -[sub_resource type="ViewportTexture" id="ViewportTexture_ypa88"] -viewport_path = NodePath("logic/MaskMemento/UiWrapper/UiSprite/SubViewport") - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_mhuct"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("25_dqyng") -shader_parameter/default_texture = SubResource("ViewportTexture_ypa88") - -[sub_resource type="ViewportTexture" id="ViewportTexture_5ovnq"] -viewport_path = NodePath("UiWrapper/UiSprite/SubViewport") - -[sub_resource type="ViewportTexture" id="ViewportTexture_xbjb2"] -viewport_path = NodePath("UiWrapper/UiSprite/SubViewport") - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_wc1hp"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("25_dqyng") -shader_parameter/default_texture = SubResource("ViewportTexture_xbjb2") - -[sub_resource type="ViewportTexture" id="ViewportTexture_qkj5t"] -viewport_path = NodePath("UiWrapper/UiSprite/SubViewport") - [sub_resource type="Animation" id="Animation_xum02"] length = 0.001 tracks/0/type = "value" @@ -1967,28 +1894,16 @@ omni_range = 16.8518 [node name="MaskMemento" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(-0.8630245, 0, 0.5051597, 0, 1, 0, -0.5051597, 0, -0.8630245, 0.0754588, 0.948372, 2.42068) -[node name="UiSprite" parent="logic/MaskMemento/UiWrapper" index="1"] -material_override = SubResource("ShaderMaterial_xbjb2") -texture = SubResource("ViewportTexture_mhuct") - [node name="childhood" parent="logic/MaskMemento/CanvasLayer" index="0" instance=ExtResource("12_viwxf")] [node name="ClothesMemento" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(0.8604294, 0, -0.5095667, 0, 1, 0, 0.5095667, 0, 0.8604294, 1.3658599, 1.17096, -0.6365988) -[node name="UiSprite" parent="logic/ClothesMemento/UiWrapper" index="1"] -material_override = SubResource("ShaderMaterial_5bsh1") -texture = SubResource("ViewportTexture_wc1hp") - [node name="JuiJutsu" parent="logic/ClothesMemento/CanvasLayer" index="0" instance=ExtResource("12_x3dlb")] [node name="ComicMemento" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(0.9699434, 0, 0.24332686, 0, 1, 0, -0.24332686, 0, 0.9699434, 2.91664, 0.595014, -0.75655603) -[node name="UiSprite" parent="logic/ComicMemento/UiWrapper" index="1"] -material_override = SubResource("ShaderMaterial_e5y1q") -texture = SubResource("ViewportTexture_murax") - [node name="voice_training" parent="logic/ComicMemento/CanvasLayer" index="0" instance=ExtResource("13_v3447")] story_array = [] paragraph_lengths = [1] @@ -1996,10 +1911,6 @@ paragraph_lengths = [1] [node name="CeilingMemento" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(0.71489924, 0, 0.6992255, 0, 1, 0, -0.6992255, 0, 0.71489924, -0.13478619, 2.0720484, -0.42032808) -[node name="UiSprite" parent="logic/CeilingMemento/UiWrapper" index="1"] -material_override = SubResource("ShaderMaterial_ypa88") -texture = SubResource("ViewportTexture_culng") - [node name="draven" parent="logic/CeilingMemento/CanvasLayer" index="0" instance=ExtResource("19_d3c7p")] story_array = [] paragraph_lengths = [1] @@ -2008,20 +1919,12 @@ paragraph_lengths = [1] unique_name_in_owner = true transform = Transform3D(-4.3711374e-08, 0, 0.9999984, 0, 1, 0, -0.9999984, 0, -4.3711374e-08, -0.907206, 1.17661, 1.74337) -[node name="UiSprite" parent="logic/MindBoard/UiWrapper" index="1"] -material_override = SubResource("ShaderMaterial_mhuct") -texture = SubResource("ViewportTexture_5ovnq") - [node name="board" parent="logic/MindBoard/CanvasLayer" index="0" instance=ExtResource("4_gyjxx")] [node name="Door" parent="logic" instance=ExtResource("30_ypa88")] unique_name_in_owner = true transform = Transform3D(0.9999984, 0, 4.973797e-14, 0, 1, 0, -4.973797e-14, 0, 0.9999984, 0.115203, 1.3931, -0.954428) -[node name="UiSprite" parent="logic/Door/UiWrapper" index="1"] -material_override = SubResource("ShaderMaterial_wc1hp") -texture = SubResource("ViewportTexture_qkj5t") - [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { &"": SubResource("AnimationLibrary_vwrt1") diff --git a/src/logic-scenes/interactive_sprite/interactive_sprite.tscn b/src/logic-scenes/interactive_sprite/interactive_sprite.tscn index 7146f48..92b291d 100644 --- a/src/logic-scenes/interactive_sprite/interactive_sprite.tscn +++ b/src/logic-scenes/interactive_sprite/interactive_sprite.tscn @@ -1,14 +1,15 @@ -[gd_scene load_steps=9 format=3 uid="uid://cy4yesucptcr3"] +[gd_scene load_steps=10 format=3 uid="uid://cy4yesucptcr3"] [ext_resource type="Script" uid="uid://dr4wd80dobxjd" path="res://base-environments/youth_room/interactive_sprite.gd" id="1_v8gd7"] [ext_resource type="PackedScene" uid="uid://bdnesuqroi7ss" path="res://vfx/collectable_particles.tscn" id="2_lqlgh"] [ext_resource type="Script" uid="uid://dbdw3v7mbqscf" path="res://dev-util/click-trough-area.gd" id="3_1fk5i"] +[ext_resource type="Script" uid="uid://cdjjn1jx1fdeb" path="res://logic-scenes/interactive_sprite/ui_sprite.gd" id="4_uwc8q"] [ext_resource type="PackedScene" uid="uid://wfyna16xhlo0" path="res://logic-scenes/collectable/collectable_ui.tscn" id="5_kqyl2"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="6_13pus"] [sub_resource type="BoxShape3D" id="BoxShape3D_v8gd7"] -[sub_resource type="ViewportTexture" id="ViewportTexture_bc0j1"] +[sub_resource type="ViewportTexture" id="ViewportTexture_uwc8q"] viewport_path = NodePath("UiWrapper/UiSprite/SubViewport") [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_v8gd7"] @@ -35,11 +36,14 @@ gi_mode = 0 modulate = Color(0.9999996, 0.96863645, 0.88173, 1) pixel_size = 0.015 no_depth_test = true -texture = SubResource("ViewportTexture_bc0j1") +texture = SubResource("ViewportTexture_uwc8q") +script = ExtResource("4_uwc8q") [node name="SubViewport" type="SubViewport" parent="UiWrapper/UiSprite"] +unique_name_in_owner = true transparent_bg = true size = Vector2i(400, 350) +render_target_update_mode = 4 [node name="CollectableUi" parent="UiWrapper/UiSprite/SubViewport" instance=ExtResource("5_kqyl2")] diff --git a/src/logic-scenes/interactive_sprite/ui_sprite.gd b/src/logic-scenes/interactive_sprite/ui_sprite.gd new file mode 100644 index 0000000..eec39dc --- /dev/null +++ b/src/logic-scenes/interactive_sprite/ui_sprite.gd @@ -0,0 +1,4 @@ +extends Sprite3D + +func _ready() -> void: + pass diff --git a/src/logic-scenes/interactive_sprite/ui_sprite.gd.uid b/src/logic-scenes/interactive_sprite/ui_sprite.gd.uid new file mode 100644 index 0000000..b91d31a --- /dev/null +++ b/src/logic-scenes/interactive_sprite/ui_sprite.gd.uid @@ -0,0 +1 @@ +uid://cdjjn1jx1fdeb