From bb8366ebb87d8841b25a1f33b5d83f222c0fb62d Mon Sep 17 00:00:00 2001 From: yannk Date: Sun, 6 Feb 2022 14:10:26 +0100 Subject: [PATCH] Moving scene elements to sub-scenes --- maps/basic_setup.tscn | 245 +++++++---------------------------------- maps/obstacles.tscn | 6 +- maps/ramp-complex.tscn | 5 +- maps/ramp-moving.tscn | 8 +- 4 files changed, 50 insertions(+), 214 deletions(-) diff --git a/maps/basic_setup.tscn b/maps/basic_setup.tscn index d2ec732..9225ea9 100644 --- a/maps/basic_setup.tscn +++ b/maps/basic_setup.tscn @@ -1,10 +1,12 @@ -[gd_scene load_steps=14 format=3 uid="uid://cvdmfc2hi172g"] +[gd_scene load_steps=12 format=3 uid="uid://cvdmfc2hi172g"] [ext_resource type="Material" uid="uid://cdijyqa881tvv" path="res://maps/materials/simple_grid_world.material" id="1_h84bv"] -[ext_resource type="Material" uid="uid://jrlyuynpu62b" path="res://maps/materials/simple_grid.material" id="1_ympm1"] +[ext_resource type="PackedScene" uid="uid://cveshwnu272vf" path="res://maps/ramp-complex.tscn" id="2_4eueh"] +[ext_resource type="PackedScene" uid="uid://omess6wwwwcq" path="res://maps/ramp-moving.tscn" id="3_bvbgo"] [ext_resource type="PackedScene" path="res://maps/moutain.tscn" id="3_rbp35"] [ext_resource type="PackedScene" path="res://maps/cave.tscn" id="4_pc85h"] [ext_resource type="PackedScene" path="res://maps/ramp.tscn" id="5_dfm8h"] +[ext_resource type="PackedScene" uid="uid://bl1widitqdugs" path="res://maps/obstacles.tscn" id="5_mi3we"] [ext_resource type="PackedScene" uid="uid://bkcvep4ijijmc" path="res://maps/water-zone.tscn" id="6_0o80c"] [ext_resource type="PackedScene" uid="uid://c7sga2ipka52x" path="res://maps/waypoint/waypoint.tscn" id="7_5rpqq"] @@ -14,42 +16,6 @@ material = ExtResource( "1_h84bv" ) [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_y7uft"] data = PackedVector3Array(-1, 1, 1, 1, 1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, 1, 1, -1, -1, 1, -1, 1, -1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, 1, 1, 1, -1, 1, 1, 1, 1, -1, -1, 1, 1, -1, 1, -1, 1, 1, -1, -1, -1, 1, 1, -1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, -1, -1) -[sub_resource type="BoxShape3D" id="BoxShape3D_6y272"] - -[sub_resource type="BoxMesh" id="BoxMesh_s0ird"] - -[sub_resource type="Animation" id="Animation_4xqr7"] -resource_name = "MECH_moving_platform" -length = 10.0 -loop_mode = 1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 5, 10), -"transitions": PackedFloat32Array(1, 1, 1), -"update": 0, -"values": [Vector3(5.30321, 0, 0), Vector3(-5.57525, 0, -1.90735e-06), Vector3(5.30321, 0, 0)] -} - -[sub_resource type="Animation" id="Animation_c4u4e"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(5.30321, 0, 0)] -} - [node name="basic_setup" type="Node3D"] [node name="floor" type="MeshInstance3D" parent="."] @@ -61,147 +27,62 @@ mesh = SubResource( "BoxMesh_k23th" ) [node name="shape" type="CollisionShape3D" parent="floor/collision"] shape = SubResource( "ConcavePolygonShape3D_y7uft" ) -[node name="ramp-complex" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.5717, 0, 15.2275) +[node name="labels" type="Node3D" parent="."] -[node name="ramp" type="MeshInstance3D" parent="ramp-complex"] -transform = Transform3D(1.69964, 0.0527074, 0, -1.05415, 0.0849819, 0, 0, 0, 2, 3.88877, 1, 1.27697) -mesh = SubResource( "BoxMesh_k23th" ) -skeleton = NodePath("../..") +[node name="Blue - Zone names" type="Node3D" parent="labels"] -[node name="collision" type="StaticBody3D" parent="ramp-complex/ramp"] +[node name="BluePoint" type="Position3D" parent="labels/Blue - Zone names"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.2869, 4.21191, 10.6861) -[node name="shape" type="CollisionShape3D" parent="ramp-complex/ramp/collision"] -shape = SubResource( "BoxShape3D_6y272" ) +[node name="Plateforme mouvante" parent="labels/Blue - Zone names/BluePoint" instance=ExtResource( "7_5rpqq" )] +modulate = Color(0.227451, 0.184314, 1, 1) +text = "Plateforme mouvante" -[node name="ramp2" type="MeshInstance3D" parent="ramp-complex"] -transform = Transform3D(0, -2.98023e-09, 2, -1.05391, 0.0849893, 0, -1.69979, -0.0526956, 0, -2.71124, 1, -2.4059) -mesh = SubResource( "BoxMesh_k23th" ) -skeleton = NodePath("../..") +[node name="BluePoint2" type="Position3D" parent="labels/Blue - Zone names"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -82.0222, 4.78227, -4.13589) -[node name="collision" type="StaticBody3D" parent="ramp-complex/ramp2"] +[node name="Zone aquatique" parent="labels/Blue - Zone names/BluePoint2" instance=ExtResource( "7_5rpqq" )] +modulate = Color(0.227451, 0.184314, 1, 1) +text = "Zone aquatique" -[node name="shape" type="CollisionShape3D" parent="ramp-complex/ramp2/collision"] -shape = SubResource( "BoxShape3D_6y272" ) +[node name="BluePoint3" type="Position3D" parent="labels/Blue - Zone names"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.6298, 7.89366, -18.7856) -[node name="ramp-horizontal" type="MeshInstance3D" parent="ramp-complex"] -transform = Transform3D(3.503, 0, 0, 0, 0.1, 0, 0, 0, 2, -1.26628, 2, 1.27697) -mesh = SubResource( "BoxMesh_k23th" ) -skeleton = NodePath("../..") +[node name="Terrain irrégulier" parent="labels/Blue - Zone names/BluePoint3" instance=ExtResource( "7_5rpqq" )] +modulate = Color(0.227451, 0.184314, 1, 1) +text = "Terrain irrégulier" -[node name="collision" type="StaticBody3D" parent="ramp-complex/ramp-horizontal"] +[node name="Green - Informations" type="Node3D" parent="labels"] -[node name="shape" type="CollisionShape3D" parent="ramp-complex/ramp-horizontal/collision"] -shape = SubResource( "BoxShape3D_6y272" ) +[node name="GreenPoint" type="Position3D" parent="labels/Green - Informations"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.5125, 5.69293, -17.2869) -[node name="wall" type="MeshInstance3D" parent="ramp-complex"] -transform = Transform3D(3.503, 0, 0, 0, 0, -2, 0, 0.1, 0, -1.26628, 2, 3.18398) -mesh = SubResource( "BoxMesh_k23th" ) -skeleton = NodePath("../..") +[node name="Tester ressenti des collisions selon angle de pente" parent="labels/Green - Informations/GreenPoint" instance=ExtResource( "7_5rpqq" )] +modulate = Color(0.0196078, 1, 0, 1) +text = "Tester ressenti des collisions selon angle de pente" +sticky = false -[node name="collision" type="StaticBody3D" parent="ramp-complex/wall"] +[node name="Red - Important" type="Node3D" parent="labels"] -[node name="shape" type="CollisionShape3D" parent="ramp-complex/wall/collision"] -shape = SubResource( "BoxShape3D_6y272" ) +[node name="RedPoint" type="Position3D" parent="labels/Red - Important"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -78.3165, 1.80831, -3.74854) -[node name="wall2" type="MeshInstance3D" parent="ramp-complex"] -transform = Transform3D(1.19209e-07, 0.1, 0, 0, 5.96046e-09, -2, -2, 0, 1.19209e-07, -4.7697, 2, 1.19322) -mesh = SubResource( "BoxMesh_k23th" ) -skeleton = NodePath("../..") +[node name="Nage non implémentée" parent="labels/Red - Important/RedPoint" instance=ExtResource( "7_5rpqq" )] +modulate = Color(1, 0.192157, 0.156863, 1) +text = "Nage non implémentée" -[node name="collision" type="StaticBody3D" parent="ramp-complex/wall2"] +[node name="ramp-complex" parent="." instance=ExtResource( "2_4eueh" )] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15, 0, 15) -[node name="shape" type="CollisionShape3D" parent="ramp-complex/wall2/collision"] -shape = SubResource( "BoxShape3D_6y272" ) - -[node name="ramp-moving" type="Node3D" parent="."] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 11.952, 0, 15.2275) - -[node name="ramp" type="MeshInstance3D" parent="ramp-moving"] -transform = Transform3D(1.69964, 0.0527074, 0, -1.05415, 0.0849819, 0, 0, 0, 2, 14.8888, 1, 1.27697) -mesh = SubResource( "BoxMesh_k23th" ) -skeleton = NodePath("../..") - -[node name="collision" type="StaticBody3D" parent="ramp-moving/ramp"] - -[node name="shape" type="CollisionShape3D" parent="ramp-moving/ramp/collision"] -shape = SubResource( "BoxShape3D_6y272" ) - -[node name="ramp2" type="MeshInstance3D" parent="ramp-moving"] -transform = Transform3D(-1.69979, -0.0526956, -8.74228e-08, -1.05391, 0.0849893, 0, 1.14822e-08, 1.03494e-08, -2, -6.26628, 1, 1.27697) -mesh = SubResource( "BoxMesh_k23th" ) -skeleton = NodePath("../..") - -[node name="collision" type="StaticBody3D" parent="ramp-moving/ramp2"] - -[node name="shape" type="CollisionShape3D" parent="ramp-moving/ramp2/collision"] -shape = SubResource( "BoxShape3D_6y272" ) - -[node name="moving" type="Node3D" parent="ramp-moving"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.71566, 0, 1.90735e-06) - -[node name="AnimatableBody3D" type="AnimatableBody3D" parent="ramp-moving/moving"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.30321, 0, 0) - -[node name="horizontal" type="CollisionShape3D" parent="ramp-moving/moving/AnimatableBody3D"] -transform = Transform3D(3.503, 0, 0, 0, 0.1, 0, 0, 0, 2, -1.26628, 2, 1.27697) -shape = SubResource( "BoxShape3D_6y272" ) - -[node name="MeshInstance3D" type="MeshInstance3D" parent="ramp-moving/moving/AnimatableBody3D/horizontal"] -mesh = SubResource( "BoxMesh_s0ird" ) -surface_material_override/0 = ExtResource( "1_ympm1" ) - -[node name="AnimationPlayer" type="AnimationPlayer" parent="ramp-moving/moving/AnimatableBody3D"] -autoplay = "MECH_moving_platform" -anims/MECH_moving_platform = SubResource( "Animation_4xqr7" ) -anims/RESET = SubResource( "Animation_c4u4e" ) - -[node name="obstacles" type="Node3D" parent="."] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 3, 0, 19) - -[node name="obstacle1" type="MeshInstance3D" parent="obstacles"] -transform = Transform3D(1, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.5, 0) -mesh = SubResource( "BoxMesh_k23th" ) -skeleton = NodePath("../..") - -[node name="collision" type="StaticBody3D" parent="obstacles/obstacle1"] - -[node name="shape" type="CollisionShape3D" parent="obstacles/obstacle1/collision"] -shape = SubResource( "ConcavePolygonShape3D_y7uft" ) - -[node name="obstacle2" type="MeshInstance3D" parent="obstacles"] -transform = Transform3D(1, 0, 0, 0, 0.25, 0, 0, 0, 0.5, 2, 0.25, 0) -mesh = SubResource( "BoxMesh_k23th" ) -skeleton = NodePath("../..") - -[node name="collision" type="StaticBody3D" parent="obstacles/obstacle2"] - -[node name="shape" type="CollisionShape3D" parent="obstacles/obstacle2/collision"] -shape = SubResource( "ConcavePolygonShape3D_y7uft" ) - -[node name="obstacle3" type="MeshInstance3D" parent="obstacles"] -transform = Transform3D(1, 0, 0, 0, 0.125, 0, 0, 0, 0.5, 4, 0.125, 0) -mesh = SubResource( "BoxMesh_k23th" ) -skeleton = NodePath("../..") - -[node name="collision" type="StaticBody3D" parent="obstacles/obstacle3"] - -[node name="shape" type="CollisionShape3D" parent="obstacles/obstacle3/collision"] -shape = SubResource( "ConcavePolygonShape3D_y7uft" ) - -[node name="obstacle4" type="MeshInstance3D" parent="obstacles"] -transform = Transform3D(1, 0, 0, 0, 0.063, 0, 0, 0, 0.5, 6, 0.0625, 0) -mesh = SubResource( "BoxMesh_k23th" ) -skeleton = NodePath("../..") - -[node name="collision" type="StaticBody3D" parent="obstacles/obstacle4"] - -[node name="shape" type="CollisionShape3D" parent="obstacles/obstacle4/collision"] -shape = SubResource( "ConcavePolygonShape3D_y7uft" ) +[node name="ramp-moving" parent="." instance=ExtResource( "3_bvbgo" )] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 12, 0, 15) [node name="moutain" parent="." instance=ExtResource( "3_rbp35" )] transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 17.5054, -0.419849, -19.5951) +[node name="obstacles" parent="." instance=ExtResource( "5_mi3we" )] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 3, 0, 19) + [node name="cave" parent="." instance=ExtResource( "4_pc85h" )] transform = Transform3D(-0.344037, 0, 0.938956, 0, 1, 0, -0.938956, 0, -0.344037, 29.908, -0.141321, 29.4435) @@ -210,47 +91,3 @@ transform = Transform3D(-0.218552, 0, -0.975825, 0, 1, 0, 0.975825, 0, -0.218552 [node name="water-zone" parent="." instance=ExtResource( "6_0o80c" )] transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -79.9445, 0, 0) - -[node name="Labels" type="Node3D" parent="."] - -[node name="Blue - Zone names" type="Node3D" parent="Labels"] - -[node name="BluePoint" type="Position3D" parent="Labels/Blue - Zone names"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.2869, 4.21191, 10.6861) - -[node name="Plateforme mouvante" parent="Labels/Blue - Zone names/BluePoint" instance=ExtResource( "7_5rpqq" )] -modulate = Color(0.227451, 0.184314, 1, 1) -text = "Plateforme mouvante" - -[node name="BluePoint2" type="Position3D" parent="Labels/Blue - Zone names"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -82.0222, 4.78227, -4.13589) - -[node name="Zone aquatique" parent="Labels/Blue - Zone names/BluePoint2" instance=ExtResource( "7_5rpqq" )] -modulate = Color(0.227451, 0.184314, 1, 1) -text = "Zone aquatique" - -[node name="BluePoint3" type="Position3D" parent="Labels/Blue - Zone names"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.6298, 7.89366, -18.7856) - -[node name="Terrain irrégulier" parent="Labels/Blue - Zone names/BluePoint3" instance=ExtResource( "7_5rpqq" )] -modulate = Color(0.227451, 0.184314, 1, 1) -text = "Terrain irrégulier" - -[node name="Green - Informations" type="Node3D" parent="Labels"] - -[node name="GreenPoint" type="Position3D" parent="Labels/Green - Informations"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.5125, 5.69293, -17.2869) - -[node name="Tester ressenti des collisions selon angle de pente" parent="Labels/Green - Informations/GreenPoint" instance=ExtResource( "7_5rpqq" )] -modulate = Color(0.0196078, 1, 0, 1) -text = "Tester ressenti des collisions selon angle de pente" -sticky = false - -[node name="Red - Important" type="Node3D" parent="Labels"] - -[node name="RedPoint" type="Position3D" parent="Labels/Red - Important"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -78.3165, 1.80831, -3.74854) - -[node name="Nage non implémentée" parent="Labels/Red - Important/RedPoint" instance=ExtResource( "7_5rpqq" )] -modulate = Color(1, 0.192157, 0.156863, 1) -text = "Nage non implémentée" diff --git a/maps/obstacles.tscn b/maps/obstacles.tscn index 704704d..d4592c0 100644 --- a/maps/obstacles.tscn +++ b/maps/obstacles.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=4 format=3] +[gd_scene load_steps=4 format=3 uid="uid://bl1widitqdugs"] -[ext_resource type="Material" path="res://maps/materials/simple_grid_world.material" id="1_reg3t"] +[ext_resource type="Material" uid="uid://cdijyqa881tvv" path="res://maps/materials/simple_grid_world.material" id="1_reg3t"] [sub_resource type="BoxMesh" id="BoxMesh_k23th"] material = ExtResource( "1_reg3t" ) @@ -9,7 +9,7 @@ material = ExtResource( "1_reg3t" ) data = PackedVector3Array(-1, 1, 1, 1, 1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, 1, 1, -1, -1, 1, -1, 1, -1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, 1, 1, 1, -1, 1, 1, 1, 1, -1, -1, 1, 1, -1, 1, -1, 1, 1, -1, -1, -1, 1, 1, -1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, -1, -1) [node name="obstacles" type="Node3D"] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 3, 0, 19) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) [node name="obstacle1" type="MeshInstance3D" parent="."] transform = Transform3D(1, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.5, 0) diff --git a/maps/ramp-complex.tscn b/maps/ramp-complex.tscn index 3c82496..cda8aa1 100644 --- a/maps/ramp-complex.tscn +++ b/maps/ramp-complex.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=4 format=3] +[gd_scene load_steps=4 format=3 uid="uid://cveshwnu272vf"] -[ext_resource type="Material" path="res://maps/materials/simple_grid_world.material" id="1_6ofch"] +[ext_resource type="Material" uid="uid://cdijyqa881tvv" path="res://maps/materials/simple_grid_world.material" id="1_6ofch"] [sub_resource type="BoxMesh" id="BoxMesh_k23th"] material = ExtResource( "1_6ofch" ) @@ -8,7 +8,6 @@ material = ExtResource( "1_6ofch" ) [sub_resource type="BoxShape3D" id="BoxShape3D_6y272"] [node name="ramp-complex" type="Node3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.5717, 0, 15.2275) [node name="ramp" type="MeshInstance3D" parent="."] transform = Transform3D(1.69964, 0.0527074, 0, -1.05415, 0.0849819, 0, 0, 0, 2, 3.88877, 1, 1.27697) diff --git a/maps/ramp-moving.tscn b/maps/ramp-moving.tscn index 59cce16..5ebc5e1 100644 --- a/maps/ramp-moving.tscn +++ b/maps/ramp-moving.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=8 format=3] +[gd_scene load_steps=8 format=3 uid="uid://omess6wwwwcq"] -[ext_resource type="Material" path="res://maps/materials/simple_grid_world.material" id="1_7o0gj"] -[ext_resource type="Material" path="res://maps/materials/simple_grid.material" id="2_m1mte"] +[ext_resource type="Material" uid="uid://cdijyqa881tvv" path="res://maps/materials/simple_grid_world.material" id="1_7o0gj"] +[ext_resource type="Material" uid="uid://jrlyuynpu62b" path="res://maps/materials/simple_grid.material" id="2_m1mte"] [sub_resource type="BoxMesh" id="BoxMesh_k23th"] material = ExtResource( "1_7o0gj" ) @@ -43,7 +43,7 @@ tracks/0/keys = { } [node name="ramp-moving" type="Node3D"] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 11.952, 0, 15.2275) +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0) [node name="ramp" type="MeshInstance3D" parent="."] transform = Transform3D(1.69964, 0.0527074, 0, -1.05415, 0.0849819, 0, 0, 0, 2, 14.8888, 1, 1.27697)