From d4a56e94d9a7dc21f6ea6e6aaf9b7780a0df0898 Mon Sep 17 00:00:00 2001 From: unfa Date: Tue, 28 Dec 2021 01:31:28 +0100 Subject: [PATCH] Updated materials, lights and collision on DM1 --- Game/Assets/Maps/DM1.tscn | 80 ++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 17 deletions(-) diff --git a/Game/Assets/Maps/DM1.tscn b/Game/Assets/Maps/DM1.tscn index 8000a66..2fd5bc4 100644 --- a/Game/Assets/Maps/DM1.tscn +++ b/Game/Assets/Maps/DM1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=33 format=3 uid="uid://b7txmrrvh1q4e"] +[gd_scene load_steps=35 format=3 uid="uid://b7txmrrvh1q4e"] [ext_resource type="PackedScene" uid="uid://cbh6i7mi0aqjs" path="res://Map.tscn" id="1_5amr5"] [ext_resource type="PackedScene" uid="uid://k4alrsehhfbc" path="res://Assets/Maps/DM1/DM1.glb" id="2_ov63e"] @@ -8,7 +8,6 @@ [ext_resource type="Material" uid="uid://bt2vsy5dlu6dk" path="res://Assets/Materials/Maps/Dev/Dev_Orange.tres" id="5_6x3po"] [ext_resource type="Material" uid="uid://dtcslshbbiwow" path="res://Assets/Materials/Maps/Dev/Dev_Red.tres" id="6_75ykk"] [ext_resource type="Material" uid="uid://57yq8q50rrni" path="res://Assets/Materials/Maps/Dev/Dev_Blue.tres" id="7_onkmw"] -[ext_resource type="Material" uid="uid://dsmabs5k83n6m" path="res://Assets/Materials/Maps/Dev/Dev_Black.tres" id="8_5hi88"] [ext_resource type="Material" uid="uid://cyer4qv8bnr3m" path="res://Assets/Materials/Maps/Dev/Dev_DarkBlue.tres" id="8_h54t0"] [ext_resource type="Material" uid="uid://cu2yoel6c87k7" path="res://Assets/Materials/Maps/Dev/Dev_DarkPink.tres" id="9_ocotl"] [ext_resource type="Material" uid="uid://2trv2yebx21f" path="res://Assets/Materials/Maps/Dev/Dev_Green.tres" id="10_i7pha"] @@ -20,6 +19,15 @@ [ext_resource type="Material" uid="uid://dcsw5jjbi8fmp" path="res://Assets/Materials/Maps/Dev/Dev_DarkViolet.tres" id="16_kkkke"] [ext_resource type="Texture2D" uid="uid://pnh872qjk0oy" path="res://Assets/Effects/Flame.png" id="19_irh18"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_x751a"] +points = PackedVector3Array(0.273373, 32.0947, 0.273373, -0.294675, -32.0947, -0.294675, -0.294675, 32.0947, -0.294675, 0.273373, -32.0947, 0.273373) + +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_awdhf"] +points = PackedVector3Array(0.273373, 32.0947, 0.273373, -0.294675, -32.0947, -0.294675, -0.294675, 32.0947, -0.294675, 0.273373, -32.0947, 0.273373) + +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_f3tv6"] +points = PackedVector3Array(0.273373, 32.0947, 0.273373, -0.294675, -32.0947, -0.294675, -0.294675, 32.0947, -0.294675, 0.273373, -32.0947, 0.273373) + [sub_resource type="OpenSimplexNoise" id="OpenSimplexNoise_lsg7q"] persistence = 0.9 @@ -38,7 +46,6 @@ noise = SubResource( "OpenSimplexNoise_lsg7q" ) [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jqv3s"] metallic = 1.0 -roughness = 0.48 roughness_texture = SubResource( "NoiseTexture_hbp5p" ) normal_enabled = true normal_texture = SubResource( "NoiseTexture_mqluw" ) @@ -280,9 +287,9 @@ surface_material_override/0 = ExtResource( "3_d54x7" ) surface_material_override/0 = ExtResource( "9_ocotl" ) [node name="Main 050" parent="Geometry/DM1" index="11"] -surface_material_override/0 = ExtResource( "4_2kc7n" ) +surface_material_override/0 = ExtResource( "6_75ykk" ) surface_material_override/1 = ExtResource( "3_d54x7" ) -surface_material_override/2 = ExtResource( "8_5hi88" ) +surface_material_override/2 = ExtResource( "4_2kc7n" ) surface_material_override/3 = ExtResource( "12_mxexg" ) [node name="Main 051" parent="Geometry/DM1" index="12"] @@ -358,19 +365,33 @@ surface_material_override/0 = ExtResource( "12_mxexg" ) visible = false surface_material_override/0 = null -[node name="MeshInstance3D" type="MeshInstance3D" parent="Geometry" index="2"] +[node name="StaticBody3D" type="StaticBody3D" parent="Geometry" index="2"] +transform = Transform3D(1, 0, 0, 0, 0, -1, 0, 1, 0, 39.7, -18.5, 8) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Geometry/StaticBody3D" index="0"] +shape = SubResource( "ConvexPolygonShape3D_x751a" ) + +[node name="CollisionShape3D2" type="CollisionShape3D" parent="Geometry/StaticBody3D" index="1"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1) +shape = SubResource( "ConvexPolygonShape3D_awdhf" ) + +[node name="CollisionShape3D3" type="CollisionShape3D" parent="Geometry/StaticBody3D" index="2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1) +shape = SubResource( "ConvexPolygonShape3D_f3tv6" ) + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Geometry" index="3"] transform = Transform3D(1, 0, 0, 0, 0, -1, 0, 1, 0, 39.7, -18.5, 8) material_override = SubResource( "StandardMaterial3D_jqv3s" ) mesh = SubResource( "CylinderMesh_mk1a8" ) surface_material_override/0 = null -[node name="MeshInstance3D2" type="MeshInstance3D" parent="Geometry" index="3"] +[node name="MeshInstance3D2" type="MeshInstance3D" parent="Geometry" index="4"] transform = Transform3D(1, 0, 0, 0, 0, -1, 0, 1, 0, 39.7, -19.5, 8) material_override = SubResource( "StandardMaterial3D_jqv3s" ) mesh = SubResource( "CylinderMesh_mk1a8" ) surface_material_override/0 = null -[node name="MeshInstance3D3" type="MeshInstance3D" parent="Geometry" index="4"] +[node name="MeshInstance3D3" type="MeshInstance3D" parent="Geometry" index="5"] transform = Transform3D(1, 0, 0, 0, 0, -1, 0, 1, 0, 39.7, -17.5, 8) material_override = SubResource( "StandardMaterial3D_jqv3s" ) mesh = SubResource( "CylinderMesh_mk1a8" ) @@ -460,56 +481,80 @@ shadow_enabled = true spot_range = 30.0 spot_angle = 70.9598 -[node name="SpotLight3D6" type="SpotLight3D" parent="Lights" index="10"] +[node name="SpotLight3D9" type="SpotLight3D" parent="Lights" index="10"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 35.5, -14.4, -10) +light_color = Color(1, 0.372549, 0, 1) +light_energy = 15.0 +shadow_enabled = true +spot_range = 30.0 +spot_angle = 31.286 + +[node name="SpotLight3D10" type="SpotLight3D" parent="Lights" index="11"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 35.5, -14.4, 0) +light_color = Color(1, 0.372549, 0, 1) +light_energy = 15.0 +shadow_enabled = true +spot_range = 30.0 +spot_angle = 31.286 + +[node name="SpotLight3D11" type="SpotLight3D" parent="Lights" index="12"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 35.5, -14.4, 11) +light_color = Color(1, 0.372549, 0, 1) +light_energy = 15.0 +shadow_enabled = true +spot_range = 30.0 +spot_angle = 31.286 + +[node name="SpotLight3D6" type="SpotLight3D" parent="Lights" index="13"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 29.5, -15, -16) light_energy = 15.0 shadow_enabled = true spot_range = 30.0 spot_angle = 70.9598 -[node name="SpotLight3D7" type="SpotLight3D" parent="Lights" index="11"] +[node name="SpotLight3D7" type="SpotLight3D" parent="Lights" index="14"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 2.5, -30, -21) light_energy = 15.0 shadow_enabled = true spot_range = 30.0 spot_angle = 70.9598 -[node name="SpotLight3D8" type="SpotLight3D" parent="Lights" index="12"] +[node name="SpotLight3D8" type="SpotLight3D" parent="Lights" index="15"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -3.5, -29.6, 3) light_energy = 15.0 shadow_enabled = true spot_range = 30.0 spot_angle = 70.9598 -[node name="OmniLight3D3" type="OmniLight3D" parent="Lights" index="13"] +[node name="OmniLight3D3" type="OmniLight3D" parent="Lights" index="16"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -47, -27, -16) shadow_enabled = true omni_range = 15.0 -[node name="OmniLight3D6" type="OmniLight3D" parent="Lights" index="14"] +[node name="OmniLight3D6" type="OmniLight3D" parent="Lights" index="17"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -36, -29, -21) light_color = Color(1, 0.784314, 0.286275, 1) shadow_enabled = true omni_range = 15.0 -[node name="OmniLight3D7" type="OmniLight3D" parent="Lights" index="15"] +[node name="OmniLight3D7" type="OmniLight3D" parent="Lights" index="18"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -36, -31, -13) light_color = Color(1, 0.784314, 0.286275, 1) shadow_enabled = true omni_range = 15.0 -[node name="OmniLight3D8" type="OmniLight3D" parent="Lights" index="16"] +[node name="OmniLight3D8" type="OmniLight3D" parent="Lights" index="19"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24, -31, -14) light_color = Color(1, 0.784314, 0.286275, 1) shadow_enabled = true omni_range = 15.0 -[node name="OmniLight3D4" type="OmniLight3D" parent="Lights" index="17"] +[node name="OmniLight3D4" type="OmniLight3D" parent="Lights" index="20"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, -23, -17) shadow_enabled = true omni_range = 15.0 -[node name="OmniLight3D5" type="OmniLight3D" parent="Lights" index="18"] +[node name="OmniLight3D5" type="OmniLight3D" parent="Lights" index="21"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, -22, -6) shadow_enabled = true omni_range = 15.0 @@ -621,3 +666,4 @@ ambient_color = Color(1, 1, 1, 1) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0) [editable path="Geometry/DM1"] +[editable path="SpecialCollision/KillFloor"]