Changes to main scenes to accomondate focus

src/base-environments/youth_room/room_handle.gd

@@ -28,7 +28,7 @@ func _process(delta):
 func start():
     $light_animation.play("light_up")
     $AudioPlayer.play("intro")
-    $PlayerController.active = true
+    State.pass_focus_to($PlayerController)
     current_mode = Modes.WALKING
     
 func _update_scene(new_mode) -> int:

src/base-environments/youth_room/youth_room.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=41 format=3 uid="uid://b3b0gyvklqn50"]
+[gd_scene load_steps=45 format=3 uid="uid://b8ht7h7b6rs8b"]
 
 [ext_resource type="Script" 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"]
@@ -10,8 +10,10 @@
 [ext_resource type="AudioStream" uid="uid://cl74a68tjwinh" path="res://base-environments/youth_room/audio/Youth Loop.wav" id="9_i8mqk"]
 [ext_resource type="AudioStream" uid="uid://ceoqo46r0kgfv" path="res://base-environments/youth_room/audio/jui-jutsu.mp3" id="10_5rpba"]
 [ext_resource type="AudioStream" uid="uid://cho5neuxkvpyh" path="res://base-environments/youth_room/audio/Voice Loop.wav" id="10_wwwdq"]
+[ext_resource type="Script" path="res://base-environments/youth_room/Collectable.gd" id="11_6fwv8"]
 [ext_resource type="Script" path="res://dev-util/click-trough-area.gd" id="11_7uxd8"]
 [ext_resource type="PackedScene" uid="uid://cceyp2yd6o3sq" path="res://logic-scenes/collectable/collectable_ui.tscn" id="11_jxai0"]
+[ext_resource type="Texture2D" uid="uid://d005qvnbnishb" path="res://import/interface-elements/cursor_grab.png" id="13_lqj71"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_kcdrx"]
 sky_top_color = Color(0, 0, 1, 1)
@@ -60,7 +62,6 @@ adjustment_enabled = true
 [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_26mp0"]
 auto_exposure_enabled = true
 auto_exposure_scale = 0.2
-dof_blur_near_enabled = true
 dof_blur_near_distance = 0.79
 dof_blur_amount = 0.4
 auto_exposure_min_sensitivity = 100.0
@@ -466,12 +467,18 @@ func start_soundtrack():
 size = Vector3(1.81843, 2.13395, 0.0774798)
 
 [sub_resource type="ViewportTexture" id="ViewportTexture_gwx6q"]
-viewport_path = NodePath("Collectable/Collectable_ui/Sprite3D/SubViewport")
+viewport_path = NodePath("Collectable/UiWrapper/UiSprite/SubViewport")
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_72g2i"]
 radius = 0.342951
 height = 1.08154
 
+[sub_resource type="ViewportTexture" id="ViewportTexture_2kdqs"]
+viewport_path = NodePath("Exit/Collectable_ui/Sprite3D/SubViewport")
+
+[sub_resource type="ViewportTexture" id="ViewportTexture_60rck"]
+viewport_path = NodePath("Board/Collectable_ui/Sprite3D/SubViewport")
+
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_f1g8m"]
 radius = 0.156739
 
@@ -676,7 +683,6 @@ libraries = {
 
 [node name="PlayerController" parent="." groups=["camera_owner"] instance=ExtResource("3_foj4y")]
 transform = Transform3D(0.686123, 0, 0.727485, 0, 1, 0, -0.727485, 0, 0.686123, 1.14815, 1.19209e-07, 0.730062)
-active = false
 
 [node name="AudioPlayer" type="AnimationPlayer" parent="."]
 autoplay = "RESET"
@@ -707,46 +713,35 @@ bus = &"music"
 [node name="Jui Jutsu" type="AudioStreamPlayer" parent="AudioPlayer"]
 bus = &"music"
 
-[node name="Control" type="Control" parent="."]
-visible = false
-layout_mode = 3
-anchors_preset = 0
-offset_right = 40.0
-offset_bottom = 40.0
-
-[node name="Label" type="Label" parent="Control"]
-layout_mode = 0
-offset_right = 40.0
-offset_bottom = 23.0
-text = "n out of 3 Memories collected"
-
 [node name="Collectable" type="Area3D" parent="." groups=["collectables"]]
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.940637, 1.34703, 0.817837)
 collision_layer = 16
+script = ExtResource("11_6fwv8")
 
-[node name="Collectable_ui" type="Area3D" parent="Collectable"]
+[node name="UiWrapper" type="Area3D" parent="Collectable"]
 transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, -2.38419e-07, 0, 0.071894)
 visible = false
 script = ExtResource("11_7uxd8")
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Collectable/Collectable_ui"]
+[node name="UI_click_collider" type="CollisionShape3D" parent="Collectable/UiWrapper"]
 transform = Transform3D(2.56, 0, 7.10543e-14, 0, 2.56, 0, -7.10543e-14, 0, 2.56, 0, 0, 0.238397)
 shape = SubResource("BoxShape3D_cb3g8")
 
-[node name="Sprite3D" type="Sprite3D" parent="Collectable/Collectable_ui"]
+[node name="UiSprite" type="Sprite3D" parent="Collectable/UiWrapper"]
 transform = Transform3D(1, 0, 2.4869e-14, 0, 1, 0, -2.4869e-14, 0, 1, 0, 0, 0.610758)
 pixel_size = 0.015
 no_depth_test = true
 texture = SubResource("ViewportTexture_gwx6q")
 
-[node name="SubViewport" type="SubViewport" parent="Collectable/Collectable_ui/Sprite3D"]
+[node name="SubViewport" type="SubViewport" parent="Collectable/UiWrapper/UiSprite"]
 transparent_bg = true
 size = Vector2i(300, 350)
 render_target_update_mode = 4
 
-[node name="Collectable_ui" parent="Collectable/Collectable_ui/Sprite3D/SubViewport" instance=ExtResource("11_jxai0")]
+[node name="Collectable_ui" parent="Collectable/UiWrapper/UiSprite/SubViewport" instance=ExtResource("11_jxai0")]
+is_story = true
 
-[node name="DisplayMenu" type="CollisionShape3D" parent="Collectable"]
+[node name="HoverDetect" type="CollisionShape3D" parent="Collectable"]
 shape = SubResource("CapsuleShape3D_72g2i")
 
 [node name="Exit" type="Area3D" parent="." groups=["exit"]]
@@ -765,7 +760,7 @@ shape = SubResource("BoxShape3D_cb3g8")
 transform = Transform3D(1, 0, 2.4869e-14, 0, 1, 0, -2.4869e-14, 0, 1, 0, 0, 0.610758)
 pixel_size = 0.015
 no_depth_test = true
-texture = SubResource("ViewportTexture_gwx6q")
+texture = SubResource("ViewportTexture_2kdqs")
 
 [node name="SubViewport" type="SubViewport" parent="Exit/Collectable_ui/Sprite3D"]
 transparent_bg = true
@@ -796,7 +791,7 @@ shape = SubResource("BoxShape3D_cb3g8")
 transform = Transform3D(1, 0, 2.4869e-14, 0, 1, 0, -2.4869e-14, 0, 1, 0, 0, 0.610758)
 pixel_size = 0.015
 no_depth_test = true
-texture = SubResource("ViewportTexture_gwx6q")
+texture = SubResource("ViewportTexture_60rck")
 
 [node name="SubViewport" type="SubViewport" parent="Board/Collectable_ui/Sprite3D"]
 transparent_bg = true
@@ -866,9 +861,31 @@ script = SubResource("GDScript_uyt24")
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.336261, -0.199846, 0.0549462)
 shape = SubResource("BoxShape3D_gim5a")
 
-[connection signal="mouse_entered" from="Collectable" to="Collectable/Collectable_ui" method="show"]
+[node name="SceneUI" type="Control" parent="."]
-[connection signal="mouse_entered" from="Collectable" to="Collectable/DisplayMenu" method="set_disabled" binds= [true]]
+visible = false
-[connection signal="input_event" from="Collectable/Collectable_ui" to="Collectable/Collectable_ui" method="_on_input_event" flags=18]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 1
+
+[node name="Mouse" type="CenterContainer" parent="SceneUI"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="TextureRect" type="TextureRect" parent="SceneUI/Mouse"]
+layout_mode = 2
+texture = ExtResource("13_lqj71")
+
+[connection signal="ui_entered" from="PlayerController" to="SceneUI" method="show"]
+[connection signal="ui_exited" from="PlayerController" to="SceneUI" method="hide"]
+[connection signal="input_event" from="Collectable/UiWrapper" to="Collectable/UiWrapper" method="_on_input_event" flags=18]
 [connection signal="mouse_entered" from="Exit" to="Exit/Collectable_ui" method="show"]
 [connection signal="mouse_entered" from="Exit" to="Exit/DisplayMenu" method="set_disabled"]
 [connection signal="input_event" from="Exit/Collectable_ui" to="Exit/Collectable_ui" method="_on_input_event" flags=18]

src/logic-scenes/main menu/Main Menu.gd

@@ -0,0 +1,9 @@
+extends Panel
+
+@onready var has_focus = true:
+    set(focus):
+        if focus:
+            has_focus = State.request_focus(self)
+        else:
+            has_focus = false            
+            State.drop_own_focus(self)

src/main.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=7 format=3 uid="uid://befxf8uruwnrl"]
+[gd_scene load_steps=8 format=3 uid="uid://befxf8uruwnrl"]
 
 [ext_resource type="Texture2D" uid="uid://balmcptv73l2j" path="res://dev-util/menu_background.png" id="1_0oiki"]
 [ext_resource type="PackedScene" uid="uid://cq2s8oa1ql28l" path="res://logic-scenes/startup/startup.tscn" id="1_v5rpm"]
-[ext_resource type="PackedScene" uid="uid://b3b0gyvklqn50" path="res://base-environments/youth_room/youth_room.tscn" id="2_23ia3"]
+[ext_resource type="PackedScene" uid="uid://b8ht7h7b6rs8b" path="res://base-environments/youth_room/youth_room.tscn" id="2_23ia3"]
 [ext_resource type="Theme" uid="uid://b056fn288p8ha" path="res://logic-scenes/themes/messy.theme" id="3_8hrj7"]
 [ext_resource type="Texture2D" uid="uid://d3ewjumh0b0g6" path="res://logic-scenes/main menu/logo.png" id="4_kslkj"]
+[ext_resource type="Script" path="res://logic-scenes/main menu/Main Menu.gd" id="4_vj0j6"]
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_njt06"]
 
@@ -30,6 +31,7 @@ grow_horizontal = 2
 grow_vertical = 2
 theme = ExtResource("3_8hrj7")
 theme_override_styles/panel = SubResource("StyleBoxEmpty_njt06")
+script = ExtResource("4_vj0j6")
 
 [node name="TextureRect" type="TextureRect" parent="Main Menu"]
 layout_mode = 1