From 76434636995b34b4c8d79f746a48435bb8205bf6 Mon Sep 17 00:00:00 2001 From: yannk Date: Mon, 9 May 2022 14:31:22 +0200 Subject: [PATCH] Separate base ground as separate scene --- maps/base_testing_ground.tscn | 66 +++++++++++++++++++++++++++++++++++ maps/basic_setup.tscn | 64 ++------------------------------- 2 files changed, 69 insertions(+), 61 deletions(-) create mode 100644 maps/base_testing_ground.tscn diff --git a/maps/base_testing_ground.tscn b/maps/base_testing_ground.tscn new file mode 100644 index 0000000..d0a588b --- /dev/null +++ b/maps/base_testing_ground.tscn @@ -0,0 +1,66 @@ +[gd_scene load_steps=14 format=3 uid="uid://qa0lhrk2y8rw"] + +[ext_resource type="Material" uid="uid://dpegsmygxcfmv" path="res://maps/materials/basic_ground.material" id="1_6gp05"] +[ext_resource type="PackedScene" uid="uid://cveshwnu272vf" path="res://maps/objects/ramp-complex.tscn" id="2_55sx5"] +[ext_resource type="PackedScene" uid="uid://omess6wwwwcq" path="res://maps/objects/ramp-moving.tscn" id="3_lqbc8"] +[ext_resource type="PackedScene" uid="uid://dvsl8x3lb1h4e" path="res://maps/objects/moutain.tscn" id="4_j23ub"] +[ext_resource type="PackedScene" uid="uid://bl1widitqdugs" path="res://maps/objects/obstacles.tscn" id="5_3swr4"] +[ext_resource type="PackedScene" path="res://maps/objects/cave.tscn" id="6_vf3ux"] +[ext_resource type="PackedScene" uid="uid://b61edh0bre65c" path="res://maps/objects/ramp.tscn" id="7_86je4"] +[ext_resource type="PackedScene" uid="uid://damn2u4n5ien" path="res://maps/objects/panel.tscn" id="8_qp8ek"] +[ext_resource type="PackedScene" uid="uid://dxghflr1tlhai" path="res://maps/objects/panel_dummy.tscn" id="9_4hcem"] +[ext_resource type="PackedScene" uid="uid://b2vv2knvetbwf" path="res://maps/objects/panel-mega.tscn" id="10_eq21i"] +[ext_resource type="PackedScene" uid="uid://uyxppgx6n0ws" path="res://maps/objects/ashtarie-bench.tscn" id="11_x1ifw"] + +[sub_resource type="BoxMesh" id="BoxMesh_k23th"] +material = ExtResource( "1_6gp05" ) + +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_lld3w"] +data = PackedVector3Array(-0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, -0.5, -0.5, -0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, 0.5, -0.5, 0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, -0.5, -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, 0.5, 0.5, -0.5, 0.5, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, -0.5, -0.5, -0.5, -0.5) + +[node name="base_testing_ground" type="Node3D"] + +[node name="floor" type="MeshInstance3D" parent="."] +transform = Transform3D(80, 0, 0, 0, 0.1, 0, 0, 0, 80, 0, 0, 0) +mesh = SubResource( "BoxMesh_k23th" ) +skeleton = NodePath("../..") + +[node name="StaticBody3D" type="StaticBody3D" parent="floor"] +visible = false + +[node name="44976" type="CollisionShape3D" parent="floor/StaticBody3D"] +visible = false +shape = SubResource( "ConcavePolygonShape3D_lld3w" ) + +[node name="ramp-complex" parent="." instance=ExtResource( "2_55sx5" )] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15, 0.1, 15) + +[node name="ramp-moving" parent="." instance=ExtResource( "3_lqbc8" )] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 12, 0, 22) + +[node name="moutain" parent="." instance=ExtResource( "4_j23ub" )] +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 20.5054, -0.419849, -6.5951) + +[node name="obstacles" parent="." instance=ExtResource( "5_3swr4" )] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 3, 0.05, 19) + +[node name="cave" parent="." instance=ExtResource( "6_vf3ux" )] +transform = Transform3D(-0.344037, 0, 0.938956, 0, 1, 0, -0.938956, 0, -0.344037, 29.908, -0.141321, 29.4435) + +[node name="ramp" parent="." instance=ExtResource( "7_86je4" )] +transform = Transform3D(-0.218552, 0, -0.975825, 0, 1, 0, 0.975825, 0, -0.218552, -27.5919, 0, 5.449) + +[node name="panel" parent="." instance=ExtResource( "8_qp8ek" )] +transform = Transform3D(-0.947718, 0, 0.319108, 0, 1, 0, -0.319108, 0, -0.947718, -14, 0, -1) + +[node name="panel_dummy" parent="." instance=ExtResource( "9_4hcem" )] +transform = Transform3D(-0.755122, 0, 0.655585, 0, 1, 0, -0.655585, 0, -0.755122, -16, 0, -2) + +[node name="panel_mega" parent="." instance=ExtResource( "10_eq21i" )] +transform = Transform3D(-0.998917, 0, 0.0465135, 0, 1, 0, -0.0465135, 0, -0.998917, -11.5643, 0, -0.999999) + +[node name="ashtarie-bench" parent="." instance=ExtResource( "11_x1ifw" )] +transform = Transform3D(0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, -17, 0, -3) + +[node name="ashtarie-bench2" parent="." instance=ExtResource( "11_x1ifw" )] +transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, -17.8, 0, -4.1) diff --git a/maps/basic_setup.tscn b/maps/basic_setup.tscn index 4b41064..448011c 100644 --- a/maps/basic_setup.tscn +++ b/maps/basic_setup.tscn @@ -1,24 +1,14 @@ -[gd_scene load_steps=25 format=3 uid="uid://b8p2h0rmwy7qn"] +[gd_scene load_steps=13 format=3 uid="uid://b8p2h0rmwy7qn"] -[ext_resource type="Material" uid="uid://dpegsmygxcfmv" path="res://maps/materials/basic_ground.material" id="1_lodye"] [ext_resource type="Shader" path="res://maps/shaders/khanat_sky.gdshader" id="1_mheqi"] [ext_resource type="Texture2D" uid="uid://b5jer2nm17ld" path="res://maps/textures/samayun_tex_001.png" id="1_thm7k"] -[ext_resource type="PackedScene" uid="uid://cveshwnu272vf" path="res://maps/objects/ramp-complex.tscn" id="2_4eueh"] [ext_resource type="Texture2D" uid="uid://y0ka7tysfp6b" path="res://maps/textures/zabr_tex_001.png" id="3_bgghj"] -[ext_resource type="PackedScene" uid="uid://omess6wwwwcq" path="res://maps/objects/ramp-moving.tscn" id="3_bvbgo"] [ext_resource type="Texture2D" uid="uid://dlxp52r0wnwlq" path="res://maps/textures/stigi_tex_001.png" id="3_jqgsm"] -[ext_resource type="PackedScene" uid="uid://dvsl8x3lb1h4e" path="res://maps/objects/moutain.tscn" id="3_rbp35"] -[ext_resource type="PackedScene" path="res://maps/objects/cave.tscn" id="4_pc85h"] -[ext_resource type="PackedScene" uid="uid://b61edh0bre65c" path="res://maps/objects/ramp.tscn" id="5_dfm8h"] -[ext_resource type="PackedScene" uid="uid://bl1widitqdugs" path="res://maps/objects/obstacles.tscn" id="5_mi3we"] [ext_resource type="PackedScene" uid="uid://clmlpy36ghsio" path="res://maps/water-zone.tscn" id="6_0o80c"] +[ext_resource type="PackedScene" uid="uid://qa0lhrk2y8rw" path="res://maps/base_testing_ground.tscn" id="6_k311b"] [ext_resource type="PackedScene" uid="uid://c7sga2ipka52x" path="res://maps/waypoint/waypoint.tscn" id="7_5rpqq"] -[ext_resource type="PackedScene" uid="uid://dxghflr1tlhai" path="res://maps/objects/panel_dummy.tscn" id="11_gb0sk"] -[ext_resource type="PackedScene" uid="uid://damn2u4n5ien" path="res://maps/objects/panel.tscn" id="11_vd4qp"] -[ext_resource type="PackedScene" uid="uid://b2vv2knvetbwf" path="res://maps/objects/panel-mega.tscn" id="11_y1j8d"] [ext_resource type="PackedScene" uid="uid://bfo13c5k8xu0x" path="res://maps/natural_ground.tscn" id="12_r7x73"] [ext_resource type="PackedScene" uid="uid://mdsxnqsijdqv" path="res://maps/dispensaire_01.tscn" id="13_ald41"] -[ext_resource type="PackedScene" uid="uid://uyxppgx6n0ws" path="res://maps/objects/ashtarie-bench.tscn" id="15_k5x3t"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_s2q0l"] shader = ExtResource( "1_mheqi" ) @@ -53,12 +43,6 @@ volumetric_fog_density = 0.0 volumetric_fog_emission = Color(0.407843, 0.415686, 0.439216, 1) volumetric_fog_detail_spread = 1.60766 -[sub_resource type="BoxMesh" id="BoxMesh_k23th"] -material = ExtResource( "1_lodye" ) - -[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_lld3w"] -data = PackedVector3Array(-0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, -0.5, -0.5, -0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, 0.5, -0.5, 0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, -0.5, -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, 0.5, 0.5, -0.5, 0.5, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, -0.5, -0.5, -0.5, -0.5) - [node name="basic_setup" type="Node3D"] [node name="sunlight" type="DirectionalLight3D" parent="."] @@ -70,17 +54,6 @@ shadow_enabled = true [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource( "Environment_n5kgx" ) -[node name="floor" type="MeshInstance3D" parent="."] -transform = Transform3D(80, 0, 0, 0, 0.1, 0, 0, 0, 80, 0, 0, 0) -mesh = SubResource( "BoxMesh_k23th" ) - -[node name="StaticBody3D" type="StaticBody3D" parent="floor"] -visible = false - -[node name="44976" type="CollisionShape3D" parent="floor/StaticBody3D"] -visible = false -shape = SubResource( "ConcavePolygonShape3D_lld3w" ) - [node name="labels" type="Node3D" parent="."] [node name="Blue - Zone names" type="Node3D" parent="labels"] @@ -125,44 +98,13 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -78.3165, 1.80831, -3.74854) modulate = Color(1, 0.192157, 0.156863, 1) text = "Nage implémentée" -[node name="ramp-complex" parent="." instance=ExtResource( "2_4eueh" )] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15, 0.1, 15) - -[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, 22) - -[node name="moutain" parent="." instance=ExtResource( "3_rbp35" )] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 20.5054, -0.419849, -6.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.05, 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) - -[node name="ramp" parent="." instance=ExtResource( "5_dfm8h" )] -transform = Transform3D(-0.218552, 0, -0.975825, 0, 1, 0, 0.975825, 0, -0.218552, -27.5919, 0, 5.449) +[node name="base_testing_ground" parent="." instance=ExtResource( "6_k311b" )] [node name="water-zone" parent="." instance=ExtResource( "6_0o80c" )] transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -79.945, 0.05, 0) -[node name="panel" parent="." instance=ExtResource( "11_vd4qp" )] -transform = Transform3D(-0.947718, 0, 0.319108, 0, 1, 0, -0.319108, 0, -0.947718, -14, 0, -1) - -[node name="panel_dummy" parent="." instance=ExtResource( "11_gb0sk" )] -transform = Transform3D(-0.755122, 0, 0.655585, 0, 1, 0, -0.655585, 0, -0.755122, -16, 0, -2) - -[node name="panel_mega" parent="." instance=ExtResource( "11_y1j8d" )] -transform = Transform3D(-0.998917, 0, 0.0465135, 0, 1, 0, -0.0465135, 0, -0.998917, -11.5643, 0, -0.999999) - [node name="natural_ground" parent="." instance=ExtResource( "12_r7x73" )] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 65, 0.05, -15) [node name="dispensaire_01" parent="." instance=ExtResource( "13_ald41" )] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -7.073, -89.152) - -[node name="ashtarie-bench" parent="." instance=ExtResource( "15_k5x3t" )] -transform = Transform3D(0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, -17, 0, -3) - -[node name="ashtarie-bench2" parent="." instance=ExtResource( "15_k5x3t" )] -transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, -17.8, 0, -4.1)