diff --git a/Game/Assets/Maps/DM1/DM1_update_01_level_geo.tscn b/Game/Assets/Maps/DM1/DM1_update_01_level_geo.tscn index 3f7df08..11ed8ab 100644 --- a/Game/Assets/Maps/DM1/DM1_update_01_level_geo.tscn +++ b/Game/Assets/Maps/DM1/DM1_update_01_level_geo.tscn @@ -1,4 +1,13 @@ -[gd_scene load_steps=122 format=3 uid="uid://bdp8jwqxbki0m"] +[gd_scene load_steps=130 format=3 uid="uid://bdp8jwqxbki0m"] + +[ext_resource type="Material" uid="uid://cswmc7u2vis0x" path="res://Assets/Maps/Materials/dev_materials/dev_blue.material" id="1_wxym2"] +[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_orange.material" id="2_fdkvc"] +[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_red.material" id="3_svtxp"] +[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_red_dark.material" id="4_0sn1m"] +[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_grey_dark.material" id="5_jyl6e"] +[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_green.material" id="6_qc75x"] +[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_brown.material" id="7_uplhy"] +[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_grey_light.material" id="8_4lr4g"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_kh2p0"] @@ -970,6 +979,10 @@ data = PackedVector3Array(7, -4, 10, 13, 3.7, 10, 13, -4, 10, 7, -4, 10, 7, 3.7, gi_mode = 1 mesh = SubResource( "ArrayMesh_b7hyh" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) +surface_material_override/1 = ExtResource( "2_fdkvc" ) +surface_material_override/2 = ExtResource( "3_svtxp" ) +surface_material_override/3 = ExtResource( "4_0sn1m" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 022"] @@ -980,6 +993,7 @@ shape = SubResource( "ConcavePolygonShape3D_5tnln" ) gi_mode = 1 mesh = SubResource( "ArrayMesh_7x7sf" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 031"] @@ -991,6 +1005,9 @@ transform = Transform3D(0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, gi_mode = 1 mesh = SubResource( "ArrayMesh_4uy7e" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) +surface_material_override/1 = ExtResource( "3_svtxp" ) +surface_material_override/2 = ExtResource( "5_jyl6e" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 032"] @@ -1001,6 +1018,7 @@ shape = SubResource( "ConcavePolygonShape3D_ioni6" ) gi_mode = 1 mesh = SubResource( "ArrayMesh_8uc48" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 033"] @@ -1012,6 +1030,8 @@ transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 37, -2, 16) gi_mode = 1 mesh = SubResource( "ArrayMesh_su43k" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) +surface_material_override/1 = ExtResource( "6_qc75x" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 034"] @@ -1023,12 +1043,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 11, -6) gi_mode = 1 mesh = SubResource( "ArrayMesh_ljwhl" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "7_uplhy" ) +surface_material_override/1 = ExtResource( "6_qc75x" ) [node name="Main 035" type="MeshInstance3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 2, 28) gi_mode = 1 mesh = SubResource( "ArrayMesh_djrpy" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) +surface_material_override/1 = ExtResource( "8_4lr4g" ) +surface_material_override/2 = ExtResource( "7_uplhy" ) +surface_material_override/3 = ExtResource( "5_jyl6e" ) +surface_material_override/4 = ExtResource( "3_svtxp" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 035"] @@ -1040,6 +1067,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 0) gi_mode = 1 mesh = SubResource( "ArrayMesh_xn24n" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 040"] @@ -1051,6 +1079,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 35, 0, 0) gi_mode = 1 mesh = SubResource( "ArrayMesh_h2ssv" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 047"] @@ -1062,6 +1091,7 @@ transform = Transform3D(5.96046e-08, 0, 1, 0, 1, 0, -1, 0, 5.96046e-08, 36, 0, - gi_mode = 1 mesh = SubResource( "ArrayMesh_4f066" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 048"] @@ -1073,6 +1103,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 35, 0, 0) gi_mode = 1 mesh = SubResource( "ArrayMesh_7uv8m" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 049"] @@ -1084,6 +1115,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 0) gi_mode = 1 mesh = SubResource( "ArrayMesh_cik7l" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) +surface_material_override/1 = ExtResource( "8_4lr4g" ) +surface_material_override/2 = ExtResource( "2_fdkvc" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 050"] @@ -1094,6 +1128,8 @@ shape = SubResource( "ConcavePolygonShape3D_gcj77" ) gi_mode = 1 mesh = SubResource( "ArrayMesh_xtvb8" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) +surface_material_override/1 = ExtResource( "2_fdkvc" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 051"] @@ -1104,6 +1140,7 @@ shape = SubResource( "ConcavePolygonShape3D_c10tx" ) gi_mode = 1 mesh = SubResource( "ArrayMesh_5aoeu" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 052"] @@ -1114,6 +1151,7 @@ shape = SubResource( "ConcavePolygonShape3D_56aqh" ) gi_mode = 1 mesh = SubResource( "ArrayMesh_32hvl" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 053"] @@ -1124,6 +1162,7 @@ shape = SubResource( "ConcavePolygonShape3D_iecji" ) gi_mode = 1 mesh = SubResource( "ArrayMesh_isxj6" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 054"] @@ -1135,6 +1174,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 2, 28) gi_mode = 1 mesh = SubResource( "ArrayMesh_sciib" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 058"] @@ -1146,6 +1186,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 2, 28) gi_mode = 1 mesh = SubResource( "ArrayMesh_j33u3" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 059"] @@ -1157,6 +1198,7 @@ transform = Transform3D(5.96046e-08, 0, 1, 0, 1, 0, -1, 0, 5.96046e-08, 36, 9, - gi_mode = 1 mesh = SubResource( "ArrayMesh_pnk3u" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 060"] @@ -1167,6 +1209,7 @@ shape = SubResource( "ConcavePolygonShape3D_e6x2l" ) gi_mode = 1 mesh = SubResource( "ArrayMesh_s3tll" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 061"] @@ -1177,6 +1220,12 @@ shape = SubResource( "ConcavePolygonShape3D_wriek" ) gi_mode = 1 mesh = SubResource( "ArrayMesh_3k3x4" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) +surface_material_override/1 = ExtResource( "7_uplhy" ) +surface_material_override/2 = ExtResource( "6_qc75x" ) +surface_material_override/3 = ExtResource( "5_jyl6e" ) +surface_material_override/4 = ExtResource( "2_fdkvc" ) +surface_material_override/5 = ExtResource( "8_4lr4g" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 062"] @@ -1187,6 +1236,7 @@ shape = SubResource( "ConcavePolygonShape3D_yugod" ) gi_mode = 1 mesh = SubResource( "ArrayMesh_2pb4y" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 063"] @@ -1198,6 +1248,7 @@ transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -68, - gi_mode = 1 mesh = SubResource( "ArrayMesh_jw0pg" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 064"] @@ -1209,6 +1260,7 @@ transform = Transform3D(0.909985, 0.00029046, -0.0022146, -0.00026097, 0.999999, gi_mode = 1 mesh = SubResource( "ArrayMesh_wlbxv" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "8_4lr4g" ) [node name="StaticBody3D" type="StaticBody3D" parent="QBlock003"] @@ -1220,6 +1272,7 @@ transform = Transform3D(0.999997, 0.00029046, -0.00243366, -0.000286784, 0.99999 gi_mode = 1 mesh = SubResource( "ArrayMesh_e2gwp" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "6_qc75x" ) [node name="StaticBody3D" type="StaticBody3D" parent="QBlock005"] @@ -1231,6 +1284,9 @@ transform = Transform3D(0.999997, 0.00029046, -0.00243366, -0.000286784, 0.99999 gi_mode = 1 mesh = SubResource( "ArrayMesh_2qh5d" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) +surface_material_override/1 = ExtResource( "2_fdkvc" ) +surface_material_override/2 = ExtResource( "8_4lr4g" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 065"] @@ -1242,6 +1298,7 @@ transform = Transform3D(0.999997, 0.00029046, -0.00243366, -0.000286784, 0.99999 gi_mode = 1 mesh = SubResource( "ArrayMesh_wbeuf" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 066"] @@ -1253,6 +1310,7 @@ transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -30, 0 gi_mode = 1 mesh = SubResource( "ArrayMesh_8hhvd" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 067"] @@ -1264,6 +1322,7 @@ transform = Transform3D(0.999997, 0.00029046, -0.00243366, -0.000286784, 0.99999 gi_mode = 1 mesh = SubResource( "ArrayMesh_pdye2" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 068"] @@ -1274,6 +1333,8 @@ shape = SubResource( "ConcavePolygonShape3D_l8ngj" ) gi_mode = 1 mesh = SubResource( "ArrayMesh_lkqxj" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) +surface_material_override/1 = ExtResource( "8_4lr4g" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 069"] @@ -1285,6 +1346,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 0) gi_mode = 1 mesh = SubResource( "ArrayMesh_bqf6l" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 070"] @@ -1296,8 +1358,11 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 0) gi_mode = 1 mesh = SubResource( "ArrayMesh_3o6so" ) skeleton = NodePath("") +surface_material_override/0 = ExtResource( "1_wxym2" ) [node name="StaticBody3D" type="StaticBody3D" parent="Main 072"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Main 072/StaticBody3D"] shape = SubResource( "ConcavePolygonShape3D_u67w2" ) + +[node name="Area3D" type="Area3D" parent="."] diff --git a/Game/Map.tscn b/Game/Map.tscn index cb395a3..7c84bab 100644 --- a/Game/Map.tscn +++ b/Game/Map.tscn @@ -47,8 +47,6 @@ ambient_light_color = Color(0.913725, 0.913725, 0.913725, 1) ambient_light_sky_contribution = 0.04 tonemap_mode = 2 tonemap_white = 2.0 -ss_reflections_enabled = true -ssao_enabled = true ssao_radius = 8.0 ssao_intensity = 1.0 sdfgi_use_occlusion = true @@ -337,7 +335,6 @@ enable_shadows = true [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(-0.884419, -0.331665, -0.32833, -0.261912, -0.229553, 0.937394, -0.38627, 0.915043, 0.116154, 0, 38, -1) -visible = false light_energy = 4.0 light_angular_distance = 8.0 shadow_enabled = true @@ -351,6 +348,7 @@ camera_effects = SubResource( "4" ) [node name="VoxelGI" type="VoxelGI" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.85326, 17.3657, 0) +visible = false subdiv = 0 extents = Vector3(54.5438, 30.6863, 42.1836) data = SubResource( "VoxelGIData_838pm" )