From df4673ce40e3fd9fa6a840c2da99713ef5234023 Mon Sep 17 00:00:00 2001 From: betalars Date: Mon, 10 Jul 2023 16:20:37 +0200 Subject: [PATCH] Updating Room colission, lighting overhaul, tweaking starting perspective --- .../youth_room/youth_room.tscn | 285 ++++++++++++------ .../player_controller/player_controller.tscn | 2 +- 2 files changed, 195 insertions(+), 92 deletions(-) diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 7705804..69480f0 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=54 format=3 uid="uid://b3b0gyvklqn50"] +[gd_scene load_steps=70 format=3 uid="uid://b3b0gyvklqn50"] [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"] @@ -21,6 +21,18 @@ [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"] +[sub_resource type="VoxelGIData" id="VoxelGIData_rugs0"] +_data = { +"bounds": AABB(-3.01158, -1.35444, -2.27116, 6.02316, 2.70888, 4.54232), +"level_counts": PackedInt32Array(1, 0, 0, 0, 0, 0, 0), +"octree_cells": PackedByteArray(255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255), +"octree_data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), +"octree_df_png": PackedByteArray(137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 8, 0, 0, 0, 0, 64, 8, 0, 0, 0, 0, 171, 123, 200, 231, 0, 0, 0, 1, 115, 82, 71, 66, 0, 174, 206, 28, 233, 0, 0, 1, 36, 73, 68, 65, 84, 120, 156, 237, 214, 49, 1, 0, 32, 12, 192, 48, 192, 191, 231, 225, 2, 142, 38, 10, 122, 118, 207, 2, 0, 106, 206, 239, 0, 0, 224, 61, 3, 0, 0, 65, 6, 0, 0, 130, 12, 0, 0, 4, 25, 0, 0, 8, 50, 0, 0, 16, 100, 0, 0, 32, 200, 0, 0, 64, 144, 1, 0, 128, 32, 3, 0, 0, 65, 6, 0, 0, 130, 12, 0, 0, 4, 25, 0, 0, 8, 50, 0, 0, 16, 100, 0, 0, 32, 200, 0, 0, 64, 144, 1, 0, 128, 32, 3, 0, 0, 65, 6, 0, 0, 130, 12, 0, 0, 4, 25, 0, 0, 8, 50, 0, 0, 16, 100, 0, 0, 32, 200, 0, 0, 64, 144, 1, 0, 128, 32, 3, 0, 0, 65, 6, 0, 0, 130, 12, 0, 0, 4, 25, 0, 0, 8, 50, 0, 0, 16, 100, 0, 0, 32, 200, 0, 0, 64, 144, 1, 0, 128, 32, 3, 0, 0, 65, 6, 0, 0, 130, 12, 0, 0, 4, 25, 0, 0, 8, 50, 0, 0, 16, 100, 0, 0, 32, 200, 0, 0, 64, 144, 1, 0, 128, 32, 3, 0, 0, 65, 6, 0, 0, 130, 12, 0, 0, 4, 25, 0, 0, 8, 50, 0, 0, 16, 100, 0, 0, 32, 200, 0, 0, 64, 144, 1, 0, 128, 32, 3, 0, 0, 65, 6, 0, 0, 130, 12, 0, 0, 4, 25, 0, 0, 8, 50, 0, 0, 16, 100, 0, 0, 32, 200, 0, 0, 64, 144, 1, 0, 128, 32, 3, 0, 0, 65, 6, 0, 0, 130, 12, 0, 0, 4, 25, 0, 0, 8, 50, 0, 0, 16, 100, 0, 0, 32, 232, 2, 116, 129, 1, 127, 27, 115, 22, 199, 0, 0, 0, 0, 73, 69, 78, 68, 174, 66, 96, 130), +"octree_size": Vector3(64, 32, 64), +"to_cell_xform": Transform3D(10.6257, 0, 0, 0, 10.6257, 0, 0, 0, 10.6257, 32, 14.3918, 24.1326) +} +interior = true + [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_kcdrx"] sky_top_color = Color(0, 0, 1, 1) sky_horizon_color = Color(0.858824, 0.541176, 0.4, 1) @@ -50,6 +62,8 @@ ssil_intensity = 0.72 ssil_normal_rejection = 0.56 sdfgi_enabled = true sdfgi_use_occlusion = true +sdfgi_cascades = 3 +sdfgi_min_cell_size = 0.0664062 glow_enabled = true glow_levels/2 = 0.3 glow_levels/7 = 2.0 @@ -122,6 +136,48 @@ func switch_off(): tween.tween_property(self, \"litnes\", 0, 1) " +[sub_resource type="BoxShape3D" id="BoxShape3D_j3mqx"] +size = Vector3(0.711297, 2.53136, 1.74815) + +[sub_resource type="BoxShape3D" id="BoxShape3D_ddjvs"] +size = Vector3(0.797403, 1.05979, 1.74423) + +[sub_resource type="SphereShape3D" id="SphereShape3D_gjlrn"] +radius = 0.415979 + +[sub_resource type="BoxShape3D" id="BoxShape3D_r40dp"] +size = Vector3(1.30429, 0.270057, 2.5769) + +[sub_resource type="BoxShape3D" id="BoxShape3D_qck8u"] +size = Vector3(0.510823, 1.21862, 1.61497) + +[sub_resource type="SphereShape3D" id="SphereShape3D_srxfv"] +radius = 0.379997 + +[sub_resource type="BoxShape3D" id="BoxShape3D_16r57"] +size = Vector3(0.125842, 1.22363, 0.79255) + +[sub_resource type="BoxShape3D" id="BoxShape3D_qmnj2"] +size = Vector3(0.82534, 0.820503, 0.503813) + +[sub_resource type="SphereShape3D" id="SphereShape3D_4ckrq"] +radius = 0.981137 + +[sub_resource type="BoxShape3D" id="BoxShape3D_wdkxn"] +size = Vector3(5.75304, 0.238875, 4.229) + +[sub_resource type="BoxShape3D" id="BoxShape3D_3lwkl"] +size = Vector3(2.02493, 2.13981, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_1nque"] +size = Vector3(5.24258, 2.13981, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_eq1fk"] +size = Vector3(0.25896, 2.51771, 0.244169) + +[sub_resource type="BoxShape3D" id="BoxShape3D_js8wo"] +size = Vector3(0.56931, 1.23778, 1.62664) + [sub_resource type="Animation" id="Animation_hqls1"] length = 0.001 tracks/0/type = "value" @@ -825,7 +881,10 @@ func reset(_discard): " [sub_resource type="BoxShape3D" id="BoxShape3D_gim5a"] -size = Vector3(1, 0.305693, 0.775269) +size = Vector3(1.63347, 0.305693, 0.775269) + +[sub_resource type="BoxShape3D" id="BoxShape3D_bq15k"] +size = Vector3(0.375967, 1, 0.245859) [sub_resource type="GDScript" id="GDScript_yn0pl"] script/source = "extends SpotLight3D @@ -844,29 +903,55 @@ func _process(delta): [node name="youth room" type="Node3D"] script = ExtResource("1_aitp0") -[node name="ReflectionProbe2" type="ReflectionProbe" parent="."] +[node name="lighting aids" type="Node3D" parent="."] + +[node name="ReflectionProbe2" type="ReflectionProbe" parent="lighting aids"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.3601, 0.545583, 2.48498) max_distance = 5.0 size = Vector3(2, 2, 2) -[node name="ReflectionProbe4" type="ReflectionProbe" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.587879, 1.13451, -0.159134) +[node name="ReflectionProbe4" type="ReflectionProbe" parent="lighting aids"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.587879, 1.71708, -0.403385) max_distance = 5.0 -size = Vector3(3.31181, 2.47509, 3.8628) +size = Vector3(3.31181, 3.24101, 2.95173) +origin_offset = Vector3(0, -0.625, 0) box_projection = true enable_shadows = true -[node name="ReflectionProbe3" type="ReflectionProbe" parent="."] +[node name="ReflectionProbe5" type="ReflectionProbe" parent="lighting aids"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.58996, 0.192757, -0.633191) +max_distance = 5.0 +size = Vector3(2.58293, 1.36611, 3.1946) +origin_offset = Vector3(-0.718262, 0, 0.460938) +box_projection = true +enable_shadows = true + +[node name="ReflectionProbe6" type="ReflectionProbe" parent="lighting aids"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.89428, 1.75054, -0.0384804) +max_distance = 5.0 +size = Vector3(2.39921, 1.61006, 2.62172) +origin_offset = Vector3(-0.456543, -0.353516, -0.0356445) +box_projection = true +interior = true +enable_shadows = true + +[node name="ReflectionProbe3" type="ReflectionProbe" parent="lighting aids"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.539355, 1.28256, 1.24151) max_distance = 5.0 size = Vector3(1.22007, 1.24704, 2) origin_offset = Vector3(0, -0.438, 0) +[node name="VoxelGI" type="VoxelGI" parent="lighting aids"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.68493, 1.19162, 0.809353) +visible = false +subdiv = 0 +size = Vector3(6.02316, 2.70888, 4.54232) +data = SubResource("VoxelGIData_rugs0") + [node name="picker" parent="." instance=ExtResource("19_a4n1o")] visible = false [node name="youth_room" parent="." instance=ExtResource("1_jf3oi")] -visible = false [node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="youth_room"] transform = Transform3D(-0.410985, -0.460061, 0.787042, -0.904759, 0.311726, -0.290238, -0.111814, -0.831367, -0.544359, 3.06375, 1.7366, -0.351724) @@ -922,108 +1007,119 @@ transform = Transform3D(0.999, 0, 0, 0, 0.999, 0, 0, 0, 0.999, 0, 0, 0) layers = 2 mesh = ExtResource("6_gy6jv") -[node name="OmniLight3D" type="OmniLight3D" parent="starlight_mesh"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.644969, 2.60833, -0.247641) +[node name="starlight_ambient" type="SpotLight3D" parent="starlight_mesh"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.644969, 2.60833, -0.247641) light_color = Color(0.0313726, 0, 1, 1) light_energy = 0.2 light_volumetric_fog_energy = 0.0 light_specular = 0.0 light_cull_mask = 4294967293 shadow_blur = 1.277 -omni_range = 3.99198 -omni_attenuation = 0.287175 +spot_angle = 85.9425 +spot_angle_attenuation = 0.57435 -[node name="SpotLight3D" type="SpotLight3D" parent="starlight_mesh/OmniLight3D"] -transform = Transform3D(0.55069, -0.676558, 0.488887, 0.695251, 0.047661, -0.717185, 0.461917, 0.734845, 0.496624, 1.11932, -2.35411, 1.18807) +[node name="starlight_lamp" type="SpotLight3D" parent="starlight_mesh"] +transform = Transform3D(0.551241, -0.677235, 0.489376, 0.695947, 0.0477087, -0.717903, 0.462379, 0.735581, 0.497121, 1.76541, 0.251864, 0.941618) light_color = Color(0, 1, 1, 1) light_energy = 2.0 +light_specular = 0.0 light_cull_mask = 4293918722 spot_range = 3.85757 spot_attenuation = 0.732044 spot_angle = 27.6108 spot_angle_attenuation = 1.18921 -[node name="Blockout" type="CSGCombiner3D" parent="."] +[node name="Desk_Colission" type="StaticBody3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.500324, 0, 1.36908) + +[node name="wardrobe" type="CollisionShape3D" parent="Desk_Colission"] +transform = Transform3D(0.998323, 0, -0.0578951, 0, 1, 0, 0.0578951, 0, 0.998323, -0.340775, 1.06708, -1.66491) +shape = SubResource("BoxShape3D_j3mqx") + +[node name="desk" type="CollisionShape3D" parent="Desk_Colission"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0231352, 0.250741, 0.104591) +shape = SubResource("BoxShape3D_ddjvs") + +[node name="beanbag" type="CollisionShape3D" parent="Desk_Colission"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.617999, 0.0319539, 0.997871) +shape = SubResource("SphereShape3D_gjlrn") + +[node name="Bed_Colission" type="StaticBody3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.33596, 0, -0.345267) + +[node name="bed" type="CollisionShape3D" parent="Bed_Colission"] +transform = Transform3D(0.997568, 0, 0.0697043, 0, 1, 0, -0.0697042, 0, 0.997568, -0.474526, 0.939937, 0.0332472) +shape = SubResource("BoxShape3D_r40dp") + +[node name="shelf" type="CollisionShape3D" parent="Bed_Colission"] +transform = Transform3D(0.999866, 0, 0.0163991, 0, 1, 0, -0.016399, 0, 0.999865, -1.30004, 0.523912, 0.0332471) +shape = SubResource("BoxShape3D_qck8u") + +[node name="beanbag" type="CollisionShape3D" parent="Bed_Colission"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 2.98023e-08, 0, 1, -1.02669, 0.222592, 1.01232) +shape = SubResource("SphereShape3D_srxfv") + +[node name="ladder" type="CollisionShape3D" parent="Bed_Colission"] +transform = Transform3D(0.903933, 0.427674, 0, -0.427674, 0.903933, 0, 2.98023e-08, 0, 1, -1.27755, 0.47535, 1.08849) +shape = SubResource("BoxShape3D_16r57") + +[node name="seat" type="StaticBody3D" parent="."] +transform = Transform3D(0.915582, 0, -0.402131, 0, 1, 0, 0.402131, 0, 0.915582, 1.393, 0, -0.762) + +[node name="rest" type="CollisionShape3D" parent="seat"] +transform = Transform3D(1, 0, -3.74434e-08, 0, 1, 0, 3.74434e-08, 0, 1, -4.94719e-06, 0.266536, -0.000100613) +shape = SubResource("BoxShape3D_qmnj2") + +[node name="seat" type="CollisionShape3D" parent="seat"] +transform = Transform3D(1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 0.246583, -0.1835, 0.392215) +shape = SubResource("BoxShape3D_qmnj2") + +[node name="step" type="CollisionShape3D" parent="seat"] +transform = Transform3D(1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 0.124096, -0.746043, 0.388092) +shape = SubResource("SphereShape3D_4ckrq") + +[node name="Room_Colission" type="StaticBody3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.811571, 0, 0) -use_collision = true -[node name="Floor" type="CSGBox3D" parent="Blockout"] +[node name="Floor2" type="CollisionShape3D" parent="Room_Colission"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.931684, -0.12195, 0.721855) -size = Vector3(5.75304, 0.238875, 4.229) +shape = SubResource("BoxShape3D_wdkxn") -[node name="Wall1" type="CSGBox3D" parent="Blockout/Floor"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.09251, 1.18903, 2.10151) -size = Vector3(2.02493, 2.13981, 1) +[node name="Wall1" type="CollisionShape3D" parent="Room_Colission"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.02419, 1.06708, 2.75985) +shape = SubResource("BoxShape3D_3lwkl") -[node name="Wall2" type="CSGBox3D" parent="Blockout/Floor"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.12438, 1.18903, 2.10151) -size = Vector3(1.11794, 2.13981, 1) +[node name="Wall2" type="CollisionShape3D" parent="Room_Colission"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.64826, 1.06708, 2.75985) +shape = SubResource("BoxShape3D_3lwkl") -[node name="Wall3" type="CSGBox3D" parent="Blockout/Floor"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.692784, 1.18903, 2.51779) -size = Vector3(1.97467, 2.13981, 1) +[node name="Wall3" type="CollisionShape3D" parent="Room_Colission"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.254488, 1.06708, 3.24245) +shape = SubResource("BoxShape3D_3lwkl") -[node name="Wall4" type="CSGBox3D" parent="Blockout/Floor"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0505961, 1.18903, -2.27114) -size = Vector3(5.49963, 2.13981, 1) +[node name="Wall4" type="CollisionShape3D" parent="Room_Colission"] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 3.34814, 1.06708, 1.83013) +shape = SubResource("BoxShape3D_3lwkl") -[node name="Wall5" type="CSGBox3D" parent="Blockout/Floor"] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 2.41253, 1.18903, 1.10946) -size = Vector3(2.02493, 2.13981, 1) +[node name="Wall5" type="CollisionShape3D" parent="Room_Colission"] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 3.83265, 1.06708, -0.147208) +shape = SubResource("BoxShape3D_3lwkl") -[node name="Wall6" type="CSGBox3D" parent="Blockout/Floor"] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 1.69649, 1.62974, -0.736064) -size = Vector3(2.02493, 1.06586, 1) +[node name="Wall7" type="CollisionShape3D" parent="Room_Colission"] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 2.62379, 2.06427, -0.010276) +shape = SubResource("BoxShape3D_3lwkl") -[node name="Wall7" type="CSGBox3D" parent="Blockout/Floor"] -transform = Transform3D(-6.06896e-08, 0, 1, 0, 1, 0, -1.38842, 0, -4.37114e-08, 2.94248, 0.554825, -0.893607) -size = Vector3(2.02493, 1.06586, 1) +[node name="Wall6" type="CollisionShape3D" parent="Room_Colission"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.1011, 1.06708, -1.5493) +shape = SubResource("BoxShape3D_1nque") -[node name="Pillar" type="CSGBox3D" parent="Blockout/Floor"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.340459, 1.18903, 0.542746) -size = Vector3(0.25896, 2.51771, 0.244169) +[node name="Pillar" type="CollisionShape3D" parent="Room_Colission"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.27524, 1.07009, 1.26831) +shape = SubResource("BoxShape3D_eq1fk") -[node name="wardrobe" type="CSGBox3D" parent="Blockout"] -transform = Transform3D(0.998323, 0, -0.0578951, 0, 1, 0, 0.0578951, 0, 0.998323, -1.65267, 1.06708, -0.295834) -size = Vector3(0.690756, 2.51771, 1.74006) - -[node name="desk" type="CSGBox3D" parent="Blockout"] -transform = Transform3D(1.1474, 0, 0, 0, 1, 0, 0, 0, 1, -1.33503, 0.250741, 1.47367) -size = Vector3(0.690756, 1.04931, 1.74006) - -[node name="beanBag1" type="CSGSphere3D" parent="Blockout"] -transform = Transform3D(0.930761, 0, 0, 0, 0.811193, 0, 0, 0, 0.811193, -0.693896, 0.11103, 2.36695) - -[node name="beanBag2" type="CSGSphere3D" parent="Blockout"] -transform = Transform3D(0.930761, 0, 0, 0, 0.811193, 0, 0, 0, 0.811193, 1.4977, 0.222592, 0.667055) -radius = 0.442542 - -[node name="shelf" type="CSGBox3D" parent="Blockout"] -transform = Transform3D(1.50675, 0, 0.113429, 0, 1.21197, 0, -0.0247126, 0, 1.59021, 1.22435, 0.523912, -0.31202) -size = Vector3(0.334722, 1, 1) - -[node name="shelf2" type="CSGBox3D" parent="Blockout"] -transform = Transform3D(1.51977, 0, -0.268689, 0, 1.21197, 0, 0.299637, 0, 1.90867, 2.65587, 0.308069, 1.91858) -size = Vector3(0.334722, 1, 0.709023) - -[node name="bed" type="CSGBox3D" parent="Blockout"] -transform = Transform3D(3.88154, 0, 0.183517, 0, 1.21197, 0, -0.063662, 0, 2.5728, 2.04986, 0.939937, -0.31202) -size = Vector3(0.334722, 0.208577, 1) - -[node name="seat" type="CSGBox3D" parent="Blockout"] -transform = Transform3D(1.37974, 0, -0.560171, 0, 0.811194, 0, 0.605992, 0, 1.4926, 0.581465, 0.266536, -0.762094) -size = Vector3(0.548618, 1, 0.313878) - -[node name="CSGBox3D2" type="CSGBox3D" parent="Blockout/seat"] -transform = Transform3D(1, 0, 2.98023e-08, 0, 1, 0, -3.27826e-07, 0, 0.999999, 0.0905743, -0.552749, 0.233639) -size = Vector3(0.447724, 1, 0.329058) - -[node name="CSGSphere3D" type="CSGSphere3D" parent="Blockout/seat"] -transform = Transform3D(1, 0, 5.96046e-08, 0, 1.34598, 0, -6.55651e-07, 0, 0.999999, 0.0164497, -0.711718, 0.294858) - -[node name="ladder" type="CSGBox3D" parent="Blockout"] -transform = Transform3D(0.629683, 0.289502, 0, -0.297919, 0.611894, 0, 0, 0, 1.8813, 1.23808, 0.491789, 0.746785) -size = Vector3(0.180483, 1.62661, 0.160638) +[node name="shelf3" type="CollisionShape3D" parent="Room_Colission"] +transform = Transform3D(0.98956, 0, -0.144121, 0, 1, 0, 0.144121, 0, 0.98956, 2.60628, 0.308069, 1.91136) +shape = SubResource("BoxShape3D_js8wo") [node name="OmniLight3D2" type="OmniLight3D" parent="."] transform = Transform3D(-0.477862, -0.663484, 0.575705, -0.860239, 0.220753, -0.459627, 0.177866, -0.714882, -0.676245, 3.15688, 0.480778, 0.0648447) @@ -1038,7 +1134,7 @@ 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.04786, 2.38418e-07, 1.14663) +transform = Transform3D(0.686123, 0, 0.727485, 0, 1, 0, -0.727485, 0, 0.686123, 0.63, 0, 0.925) [node name="AudioPlayer" type="AnimationPlayer" parent="."] libraries = { @@ -1154,7 +1250,7 @@ transform = Transform3D(0.1, -1.86265e-09, 0, 0, 0.0906676, 0.0421827, 0, -0.042 script = ExtResource("11_7uxd8") [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) +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) shape = SubResource("BoxShape3D_cb3g8") [node name="UiSprite" type="Sprite3D" parent="Collectable/UiWrapper"] @@ -1178,9 +1274,9 @@ content_notes = "CN: testing testing 123" shape = SubResource("CapsuleShape3D_72g2i") [node name="Bed and Ladders" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.84538, 0, 0.803611) [node name="ladder_trigger" type="Area3D" parent="Bed and Ladders"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.84538, 0, 0.803611) collision_layer = 2 collision_mask = 2 @@ -1189,7 +1285,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.170028, 0.244833, -0.045577 shape = SubResource("CapsuleShape3D_f1g8m") [node name="ladder_reset" type="Area3D" parent="Bed and Ladders"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.84538, 0, 0.803611) collision_layer = 2 collision_mask = 2 @@ -1198,7 +1293,7 @@ transform = Transform3D(0.995341, 0.096419, 0, 4.21461e-09, -4.35077e-08, -1, -0 shape = SubResource("CapsuleShape3D_kewqg") [node name="bed_enter" type="Area3D" parent="Bed and Ladders"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.20255, 0, 0.547867) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.35717, 0, -0.255744) collision_layer = 2 collision_mask = 2 @@ -1207,7 +1302,7 @@ transform = Transform3D(0.995341, 0.096419, 0, 4.21461e-09, -4.35077e-08, -1, -0 shape = SubResource("CapsuleShape3D_k4x40") [node name="bed_reset" type="Area3D" parent="Bed and Ladders"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.08894, 0, 0.00684631) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.24356, 0, -0.796765) collision_layer = 2 collision_mask = 2 @@ -1216,7 +1311,7 @@ transform = Transform3D(0.995341, 0.096419, 0, 4.21461e-09, -4.35077e-08, -1, -0 shape = SubResource("CapsuleShape3D_4q8vc") [node name="reset_failover" type="Area3D" parent="Bed and Ladders"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.08894, 0, 0.272245) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.24356, 0, -0.531366) collision_layer = 2 collision_mask = 2 @@ -1225,13 +1320,21 @@ transform = Transform3D(0.995341, 0.096419, 0, 4.21461e-09, -4.35077e-08, -1, -0 shape = SubResource("CapsuleShape3D_n20ff") [node name="ladder" type="StaticBody3D" parent="Bed and Ladders"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.77546, 0, 0.720878) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0699199, 0, -0.082733) script = SubResource("GDScript_uyt24") [node name="CollisionShape3D" type="CollisionShape3D" parent="Bed and Ladders/ladder"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.336261, -0.199846, 0.0549462) shape = SubResource("BoxShape3D_gim5a") +[node name="CollisionShape3D2" type="CollisionShape3D" parent="Bed and Ladders/ladder"] +transform = Transform3D(0.833085, 0, -0.553144, 0, 1, 0, 0.553144, 0, 0.833085, -0.0238513, 0, -0.359131) +shape = SubResource("BoxShape3D_bq15k") + +[node name="CollisionShape3D3" type="CollisionShape3D" parent="Bed and Ladders/ladder"] +transform = Transform3D(0.707304, 0, 0.706909, 0, 1, 0, -0.706909, 0, 0.707304, 0.188369, 0, 0.502213) +shape = SubResource("BoxShape3D_bq15k") + [node name="SceneUI" type="Control" parent="."] visible = false layout_mode = 3 diff --git a/src/logic-scenes/player_controller/player_controller.tscn b/src/logic-scenes/player_controller/player_controller.tscn index 387a0ad..f2fd71a 100644 --- a/src/logic-scenes/player_controller/player_controller.tscn +++ b/src/logic-scenes/player_controller/player_controller.tscn @@ -329,7 +329,7 @@ script = ExtResource("1_0b4mi") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.22534, 0) [node name="Pitch" type="Node3D" parent="Yaw"] -transform = Transform3D(1, 0, 0, 0, 0.5, -0.866025, 0, 0.866025, 0.5, 0, 0.256493, 0) +transform = Transform3D(1, 0, 0, 0, 0.642787, -0.766044, 0, 0.766044, 0.642787, 0, 0.256493, 0) [node name="Mount" type="Node3D" parent="Yaw/Pitch"]