From fb7113080c559850374f107148f3a58ecc98bba1 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Sat, 27 Jan 2024 16:46:04 +0100 Subject: [PATCH] add chair collisions --- scenes/World.tscn | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/scenes/World.tscn b/scenes/World.tscn index 59a7535..64ec209 100644 --- a/scenes/World.tscn +++ b/scenes/World.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=16 format=3 uid="uid://dc0cngrxpqgyh"] +[gd_scene load_steps=17 format=3 uid="uid://dc0cngrxpqgyh"] [ext_resource type="PackedScene" uid="uid://b78y8nhrad6ag" path="res://scenes/Player.tscn" id="1_r5ocp"] [ext_resource type="ArrayMesh" uid="uid://dxfoqqm2nloti" path="res://models/desktop/bureau3.obj" id="2_b86p5"] [ext_resource type="ArrayMesh" uid="uid://ryvqneyivql2" path="res://models/bed/lettoAzzurro.obj" id="3_yfdxs"] -[ext_resource type="ArrayMesh" uid="uid://ctrw34ahl0147" path="res://models/ceilinglight/hangingLight.obj" id="4_e1pay"] +[ext_resource type="ArrayMesh" uid="uid://ctrw34ahl0147" path="res://models/ceilinglight/hangingLight.obj" id="4_1tc5e"] [ext_resource type="ArrayMesh" uid="uid://locruss302l4" path="res://models/computer/tourPC.obj" id="5_focw6"] [ext_resource type="ArrayMesh" uid="uid://bdf0r6v8c0i3u" path="res://models/computer/monitorLCD.obj" id="5_mfc80"] [ext_resource type="ArrayMesh" uid="uid://dtxl74y7beunj" path="res://models/computer/clavier.obj" id="5_ue750"] @@ -27,6 +27,9 @@ data = PackedVector3Array(209.499, 50.0047, 540.498, 209.499, 50.0047, 379.499, [sub_resource type="BoxShape3D" id="BoxShape3D_fvwov"] size = Vector3(9.82483, 4.04047, 0.548828) +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_8ki86"] +data = PackedVector3Array(-1.8499, -0.0242, -1.982, -1.8498, 0.002, -1.6831, -1.5499, -0.0242, -1.9821, -1.5499, -0.0242, -1.9821, -1.8498, 0.002, -1.6831, -1.5497, 0.002, -1.6832, -1.8498, 0.002, -1.6831, -1.8498, 4.4849, -2.0753, -1.5497, 0.002, -1.6832, -1.5497, 0.002, -1.6832, -1.8498, 4.4849, -2.0753, -1.5498, 4.4848, -2.0754, -1.85, 4.4587, -2.3742, -1.55, 4.4587, -2.3743, -1.8498, 4.4849, -2.0753, -1.8498, 4.4849, -2.0753, -1.55, 4.4587, -2.3743, -1.5498, 4.4848, -2.0754, -1.8499, -0.0242, -1.982, -1.85, 4.4587, -2.3742, -1.8498, 0.002, -1.6831, -1.8498, 0.002, -1.6831, -1.85, 4.4587, -2.3742, -1.8498, 4.4849, -2.0753, -1.5497, 0.002, -1.6832, -1.5498, 4.4848, -2.0754, -1.5499, -0.0242, -1.9821, -1.5499, -0.0242, -1.9821, -1.5498, 4.4848, -2.0754, -1.55, 4.4587, -2.3743, -1.55, 4.4587, -2.3743, -1.85, 4.4587, -2.3742, -1.5499, -0.0242, -1.9821, -1.5499, -0.0242, -1.9821, -1.85, 4.4587, -2.3742, -1.8499, -0.0242, -1.982, 1.55, -4.51, 1.83, 1.85, -4.51, 1.83, 1.55, -4.51, 1.53, 1.55, -4.51, 1.53, 1.85, -4.51, 1.83, 1.85, -4.51, 1.53, 1.55, -0.01, 1.53, 1.55, -4.51, 1.53, 1.85, -0.01, 1.53, 1.85, -0.01, 1.53, 1.55, -4.51, 1.53, 1.85, -4.51, 1.53, 1.55, -0.01, 1.83, 1.55, -4.51, 1.83, 1.55, -0.01, 1.53, 1.55, -0.01, 1.53, 1.55, -4.51, 1.83, 1.55, -4.51, 1.53, 1.55, -0.01, 1.53, 1.85, -0.01, 1.53, 1.55, -0.01, 1.83, 1.55, -0.01, 1.83, 1.85, -0.01, 1.53, 1.85, -0.01, 1.83, 1.55, -4.51, 1.83, 1.55, -0.01, 1.83, 1.85, -4.51, 1.83, 1.85, -4.51, 1.83, 1.55, -0.01, 1.83, 1.85, -0.01, 1.83, 1.85, -4.51, 1.83, 1.85, -0.01, 1.83, 1.85, -4.51, 1.53, 1.85, -4.51, 1.53, 1.85, -0.01, 1.83, 1.85, -0.01, 1.53, -1.55, -0.0101, -1.7, -1.55, -4.51, -1.7, -1.85, -0.0101, -1.7, -1.85, -0.0101, -1.7, -1.55, -4.51, -1.7, -1.85, -4.51, -1.7, -1.55, -0.0101, -1.7, -1.85, -0.0101, -1.7, -1.55, -0.0101, -2, -1.55, -0.0101, -2, -1.85, -0.0101, -1.7, -1.85, -0.0101, -2, -1.55, -4.51, -1.7, -1.55, -0.0101, -1.7, -1.55, -4.51, -2, -1.55, -4.51, -2, -1.55, -0.0101, -1.7, -1.55, -0.0101, -2, -1.55, -4.51, -2, -1.55, -0.0101, -2, -1.85, -4.51, -2, -1.85, -4.51, -2, -1.55, -0.0101, -2, -1.85, -0.0101, -2, -1.85, -4.51, -1.7, -1.55, -4.51, -1.7, -1.85, -4.51, -2, -1.85, -4.51, -2, -1.55, -4.51, -1.7, -1.55, -4.51, -2, -1.85, -0.0101, -2, -1.85, -0.0101, -1.7, -1.85, -4.51, -2, -1.85, -4.51, -2, -1.85, -0.0101, -1.7, -1.85, -4.51, -1.7, 1.7077, 1.9434, -2.0973, 1.6998, 2.84, -2.1758, -1.8222, 1.9127, -2.096, -1.8222, 1.9127, -2.096, 1.6998, 2.84, -2.1758, -1.8301, 2.8092, -2.1744, -1.8222, 1.9127, -2.096, -1.8301, 2.8092, -2.1744, -1.8223, 1.9257, -1.9466, -1.8223, 1.9257, -1.9466, -1.8301, 2.8092, -2.1744, -1.8301, 2.8223, -2.025, 1.6998, 2.853, -2.0263, -1.8301, 2.8223, -2.025, 1.6998, 2.84, -2.1758, 1.6998, 2.84, -2.1758, -1.8301, 2.8223, -2.025, -1.8301, 2.8092, -2.1744, 1.7075, 1.9565, -1.9479, 1.7077, 1.9434, -2.0973, -1.8223, 1.9257, -1.9466, -1.8223, 1.9257, -1.9466, 1.7077, 1.9434, -2.0973, -1.8222, 1.9127, -2.096, -1.8301, 2.8223, -2.025, 1.6998, 2.853, -2.0263, -1.8223, 1.9257, -1.9466, -1.8223, 1.9257, -1.9466, 1.6998, 2.853, -2.0263, 1.7075, 1.9565, -1.9479, 1.7075, 1.9565, -1.9479, 1.6998, 2.853, -2.0263, 1.7077, 1.9434, -2.0973, 1.7077, 1.9434, -2.0973, 1.6998, 2.853, -2.0263, 1.6998, 2.84, -2.1758, 1.55, -4.51, -1.7, 1.85, -4.51, -1.7, 1.55, -4.51, -2, 1.55, -4.51, -2, 1.85, -4.51, -1.7, 1.85, -4.51, -2, 1.55, -4.51, -1.7, 1.55, -0.01, -1.7, 1.85, -4.51, -1.7, 1.85, -4.51, -1.7, 1.55, -0.01, -1.7, 1.85, -0.01, -1.7, 1.85, -0.01, -1.7, 1.85, -0.01, -2, 1.85, -4.51, -1.7, 1.85, -4.51, -1.7, 1.85, -0.01, -2, 1.85, -4.51, -2, 1.55, -0.01, -2, 1.55, -4.51, -2, 1.85, -0.01, -2, 1.85, -0.01, -2, 1.55, -4.51, -2, 1.85, -4.51, -2, 1.85, -0.01, -1.7, 1.55, -0.01, -1.7, 1.85, -0.01, -2, 1.85, -0.01, -2, 1.55, -0.01, -1.7, 1.55, -0.01, -2, 1.55, -4.51, -2, 1.55, -0.01, -2, 1.55, -4.51, -1.7, 1.55, -4.51, -1.7, 1.55, -0.01, -2, 1.55, -0.01, -1.7, 1.9999, -0.09, -2.01, 1.9999, 0.09, -2.01, -2, -0.09, -2.01, -2, -0.09, -2.01, 1.9999, 0.09, -2.01, -2, 0.09, -2.01, -2, 0.09, -2.01, -2, 0.09, 1.99, -2, -0.09, -2.01, -2, -0.09, -2.01, -2, 0.09, 1.99, -2, -0.09, 1.99, 1.9999, 0.09, 1.99, -2, 0.09, 1.99, 1.9999, 0.09, -2.01, 1.9999, 0.09, -2.01, -2, 0.09, 1.99, -2, 0.09, -2.01, -2, -0.09, -2.01, -2, -0.09, 1.99, 1.9999, -0.09, -2.01, 1.9999, -0.09, -2.01, -2, -0.09, 1.99, 1.9999, -0.09, 1.99, 1.9999, 0.09, 1.99, 1.9999, 0.09, -2.01, 1.9999, -0.09, 1.99, 1.9999, -0.09, 1.99, 1.9999, 0.09, -2.01, 1.9999, -0.09, -2.01, 1.9999, -0.09, 1.99, -2, -0.09, 1.99, 1.9999, 0.09, 1.99, 1.9999, 0.09, 1.99, -2, -0.09, 1.99, -2, 0.09, 1.99, 1.7077, 3.4834, -2.2173, 1.6998, 4.38, -2.2958, -1.8222, 3.4527, -2.216, -1.8222, 3.4527, -2.216, 1.6998, 4.38, -2.2958, -1.8301, 4.3492, -2.2944, -1.8222, 3.4527, -2.216, -1.8301, 4.3492, -2.2944, -1.8223, 3.4657, -2.0666, -1.8223, 3.4657, -2.0666, -1.8301, 4.3492, -2.2944, -1.8301, 4.3623, -2.145, 1.6998, 4.393, -2.1463, -1.8301, 4.3623, -2.145, 1.6998, 4.38, -2.2958, 1.6998, 4.38, -2.2958, -1.8301, 4.3623, -2.145, -1.8301, 4.3492, -2.2944, -1.8223, 3.4657, -2.0666, -1.8301, 4.3623, -2.145, 1.7075, 3.4965, -2.0679, 1.7075, 3.4965, -2.0679, -1.8301, 4.3623, -2.145, 1.6998, 4.393, -2.1463, 1.7075, 3.4965, -2.0679, 1.7077, 3.4834, -2.2173, -1.8223, 3.4657, -2.0666, -1.8223, 3.4657, -2.0666, 1.7077, 3.4834, -2.2173, -1.8222, 3.4527, -2.216, 1.7075, 3.4965, -2.0679, 1.6998, 4.393, -2.1463, 1.7077, 3.4834, -2.2173, 1.7077, 3.4834, -2.2173, 1.6998, 4.393, -2.1463, 1.6998, 4.38, -2.2958, 1.85, 4.5144, -2.0767, 1.55, 4.5145, -2.0766, 1.8498, 4.4884, -2.3756, 1.8498, 4.4884, -2.3756, 1.55, 4.5145, -2.0766, 1.5499, 4.4884, -2.3755, 1.55, 4.5145, -2.0766, 1.5501, 0.0316, -1.6844, 1.5499, 4.4884, -2.3755, 1.5499, 4.4884, -2.3755, 1.5501, 0.0316, -1.6844, 1.55, 0.0055, -1.9833, 1.85, 0.0055, -1.9834, 1.8498, 4.4884, -2.3756, 1.55, 0.0055, -1.9833, 1.55, 0.0055, -1.9833, 1.8498, 4.4884, -2.3756, 1.5499, 4.4884, -2.3755, 1.55, 0.0055, -1.9833, 1.5501, 0.0316, -1.6844, 1.85, 0.0055, -1.9834, 1.85, 0.0055, -1.9834, 1.5501, 0.0316, -1.6844, 1.8501, 0.0316, -1.6845, 1.85, 4.5144, -2.0767, 1.8501, 0.0316, -1.6845, 1.55, 4.5145, -2.0766, 1.55, 4.5145, -2.0766, 1.8501, 0.0316, -1.6845, 1.5501, 0.0316, -1.6844, 1.85, 4.5144, -2.0767, 1.8498, 4.4884, -2.3756, 1.8501, 0.0316, -1.6845, 1.8501, 0.0316, -1.6845, 1.8498, 4.4884, -2.3756, 1.85, 0.0055, -1.9834, -1.85, -4.51, 1.83, -1.55, -4.51, 1.83, -1.85, -4.51, 1.53, -1.85, -4.51, 1.53, -1.55, -4.51, 1.83, -1.55, -4.51, 1.53, -1.55, -4.51, 1.53, -1.55, -0.01, 1.53, -1.85, -4.51, 1.53, -1.85, -4.51, 1.53, -1.55, -0.01, 1.53, -1.85, -0.01, 1.53, -1.55, -0.01, 1.83, -1.85, -0.01, 1.83, -1.55, -0.01, 1.53, -1.55, -0.01, 1.53, -1.85, -0.01, 1.83, -1.85, -0.01, 1.53, -1.85, -0.01, 1.83, -1.85, -4.51, 1.83, -1.85, -0.01, 1.53, -1.85, -0.01, 1.53, -1.85, -4.51, 1.83, -1.85, -4.51, 1.53, -1.85, -0.01, 1.83, -1.55, -0.01, 1.83, -1.85, -4.51, 1.83, -1.85, -4.51, 1.83, -1.55, -0.01, 1.83, -1.55, -4.51, 1.83, -1.55, -4.51, 1.83, -1.55, -0.01, 1.83, -1.55, -4.51, 1.53, -1.55, -4.51, 1.53, -1.55, -0.01, 1.83, -1.55, -0.01, 1.53) + [node name="World" type="Node3D"] [node name="OmniLight3D" type="OmniLight3D" parent="."] @@ -113,7 +116,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.185498, 3, -2.68985) [node name="HangingLight" type="MeshInstance3D" parent="CeillingLight"] transform = Transform3D(0.025, 0, 0, 0, 0.025, 0, 0, 0, 0.025, 0, 0, 0) -mesh = ExtResource("4_e1pay") +mesh = ExtResource("4_1tc5e") skeleton = NodePath("../..") [node name="SpotLight3D" type="SpotLight3D" parent="CeillingLight"] @@ -125,22 +128,22 @@ spot_angle = 38.57 [node name="SetupGaming" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.02288, -3.54164) -[node name="TourPc" type="MeshInstance3D" parent="SetupGaming"] +[node name="Computer" type="MeshInstance3D" parent="SetupGaming"] transform = Transform3D(0.175129, 0, 0.106559, 0, 0.205, 0, -0.106559, 0, 0.175129, 0.85583, 0.31505, -0.124053) mesh = ExtResource("5_focw6") skeleton = NodePath("../..") -[node name="MonitorLcd" type="MeshInstance3D" parent="SetupGaming"] +[node name="Monitor" type="MeshInstance3D" parent="SetupGaming"] transform = Transform3D(1.2, 0, 0, 0, 1.2, 0, 0, 0, 1.2, -0.0782957, 0.736201, 0.837431) mesh = ExtResource("5_mfc80") skeleton = NodePath("../..") -[node name="Souris" type="MeshInstance3D" parent="SetupGaming"] +[node name="Mouse" type="MeshInstance3D" parent="SetupGaming"] transform = Transform3D(-2.18557e-09, 0, -0.05, 0, 0.05, 0, 0.05, 0, -2.18557e-09, 0.665008, 0.0434707, 0.187065) mesh = ExtResource("6_k6vns") skeleton = NodePath("../..") -[node name="Clavier" type="MeshInstance3D" parent="SetupGaming"] +[node name="Keyboard" type="MeshInstance3D" parent="SetupGaming"] transform = Transform3D(0.22, 0, 0, 0, 0.22, 0, 0, 0, 0.22, 0, -0.0699072, 0.223786) mesh = ExtResource("5_ue750") skeleton = NodePath("../..") @@ -149,3 +152,8 @@ skeleton = NodePath("../..") transform = Transform3D(-0.0362347, 0, -0.13523, 0, 0.14, 0, 0.13523, 0, -0.0362347, 0.828688, -0.377238, 0.846272) mesh = ExtResource("9_len63") skeleton = NodePath("../..") + +[node name="StaticBody3D" type="StaticBody3D" parent="SetupGaming/Chair"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="SetupGaming/Chair/StaticBody3D"] +shape = SubResource("ConcavePolygonShape3D_8ki86")