From 14a02ae4dc2dd6bcf541be53b8072c4ef4d73c13 Mon Sep 17 00:00:00 2001 From: unfa Date: Sun, 26 Dec 2021 17:02:35 +0100 Subject: [PATCH] Updated lights, reflection probles, added some placeholder pipes in DM1 --- Game/Assets/Maps/DM1.tscn | 149 +++++++++++++++++++++++++++++++++----- 1 file changed, 132 insertions(+), 17 deletions(-) diff --git a/Game/Assets/Maps/DM1.tscn b/Game/Assets/Maps/DM1.tscn index 45ad85f..8000a66 100644 --- a/Game/Assets/Maps/DM1.tscn +++ b/Game/Assets/Maps/DM1.tscn @@ -1,25 +1,56 @@ -[gd_scene load_steps=28 format=3 uid="uid://b7txmrrvh1q4e"] +[gd_scene load_steps=33 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"] -[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Gray.tres" id="3_d54x7"] +[ext_resource type="Material" uid="uid://bsck7xbq7ry6m" path="res://Assets/Materials/Maps/Dev/Dev_Gray.tres" id="3_d54x7"] [ext_resource type="Texture2D" uid="uid://bus2g2qhtpwjj" path="res://Assets/Effects/NoiseBlurredHorizontally.png" id="3_yx2bu"] [ext_resource type="Material" uid="uid://cx53mnq3gateb" path="res://Assets/Materials/Maps/Dev/Dev_LightGray.tres" id="4_2kc7n"] -[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Orange.tres" id="5_6x3po"] -[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Red.tres" id="6_75ykk"] +[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" path="res://Assets/Materials/Maps/Dev/Dev_Black.tres" id="8_5hi88"] -[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_DarkBlue.tres" id="8_h54t0"] -[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_DarkPink.tres" id="9_ocotl"] -[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Green.tres" id="10_i7pha"] -[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_DarkGrey.tres" id="11_pw6k3"] -[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Yellow.tres" id="12_mxexg"] -[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Violet.tres" id="13_sstni"] -[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_DarkRed.tres" id="14_n7ied"] -[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Brown.tres" id="15_m803q"] -[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_DarkViolet.tres" id="16_kkkke"] +[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"] +[ext_resource type="Material" uid="uid://hjawk2uyq77i" path="res://Assets/Materials/Maps/Dev/Dev_DarkGrey.tres" id="11_pw6k3"] +[ext_resource type="Material" uid="uid://dnbp5bj1bfwaf" path="res://Assets/Materials/Maps/Dev/Dev_Yellow.tres" id="12_mxexg"] +[ext_resource type="Material" uid="uid://bi1h7rc860ge3" path="res://Assets/Materials/Maps/Dev/Dev_Violet.tres" id="13_sstni"] +[ext_resource type="Material" uid="uid://bfw5bauokky45" path="res://Assets/Materials/Maps/Dev/Dev_DarkRed.tres" id="14_n7ied"] +[ext_resource type="Material" uid="uid://dc80o7nutveai" path="res://Assets/Materials/Maps/Dev/Dev_Brown.tres" id="15_m803q"] +[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="OpenSimplexNoise" id="OpenSimplexNoise_lsg7q"] +persistence = 0.9 + +[sub_resource type="NoiseTexture" id="NoiseTexture_mqluw"] +width = 2048 +height = 2048 +seamless = true +as_normal_map = true +noise = SubResource( "OpenSimplexNoise_lsg7q" ) + +[sub_resource type="NoiseTexture" id="NoiseTexture_hbp5p"] +width = 2048 +height = 2048 +seamless = true +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" ) +uv1_scale = Vector3(1, 96, 1) +texture_filter = 5 + +[sub_resource type="CylinderMesh" id="CylinderMesh_mk1a8"] +top_radius = 0.2 +bottom_radius = 0.2 +height = 64.0 +radial_segments = 16 + [sub_resource type="FogMaterial" id="FogMaterial_xa7nn"] density = 0.3 emission = Color(0.0941176, 0.196078, 1, 1) @@ -240,7 +271,7 @@ surface_material_override/4 = ExtResource( "3_d54x7" ) surface_material_override/0 = ExtResource( "3_d54x7" ) [node name="Main 047" parent="Geometry/DM1" index="8"] -surface_material_override/0 = ExtResource( "10_i7pha" ) +surface_material_override/0 = ExtResource( "6_75ykk" ) [node name="Main 048" parent="Geometry/DM1" index="9"] surface_material_override/0 = ExtResource( "3_d54x7" ) @@ -327,6 +358,24 @@ surface_material_override/0 = ExtResource( "12_mxexg" ) visible = false surface_material_override/0 = null +[node name="MeshInstance3D" type="MeshInstance3D" parent="Geometry" index="2"] +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"] +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"] +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" ) +surface_material_override/0 = null + [node name="GPUParticlesCollisionSDF" parent="ParticlesCollision" index="0"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9, -11, 4) extents = Vector3(53, 28, 37) @@ -432,6 +481,39 @@ shadow_enabled = true spot_range = 30.0 spot_angle = 70.9598 +[node name="OmniLight3D3" type="OmniLight3D" parent="Lights" index="13"] +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"] +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"] +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"] +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"] +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"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58, -22, -6) +shadow_enabled = true +omni_range = 15.0 + [node name="GPUParticles3D" type="GPUParticles3D" parent="Particles" index="0"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34, -21.9, 0) amount = 128 @@ -485,7 +567,16 @@ interior = true enable_shadows = true ambient_color = Color(1, 1, 1, 1) -[node name="ReflectionProbe6" type="ReflectionProbe" parent="ReflectionProbes" index="6"] +[node name="ReflectionProbe12" type="ReflectionProbe" parent="ReflectionProbes" index="6"] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 31.4555, -21.8705, 21) +extents = Vector3(13, 8, 9) +origin_offset = Vector3(0, 0, 1) +box_projection = true +interior = true +enable_shadows = true +ambient_color = Color(1, 1, 1, 1) + +[node name="ReflectionProbe6" type="ReflectionProbe" parent="ReflectionProbes" index="7"] transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 32.4555, -21.8705, 31) extents = Vector3(18, 57, 29) origin_offset = Vector3(-4, 3, 12) @@ -493,7 +584,7 @@ box_projection = true enable_shadows = true ambient_color = Color(1, 1, 1, 1) -[node name="ReflectionProbe7" type="ReflectionProbe" parent="ReflectionProbes" index="7"] +[node name="ReflectionProbe7" type="ReflectionProbe" parent="ReflectionProbes" index="8"] transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -14.5445, -18.8705, 25) extents = Vector3(9, 5, 24) origin_offset = Vector3(-2, 0, -11) @@ -502,6 +593,30 @@ interior = true enable_shadows = true ambient_color = Color(1, 1, 1, 1) +[node name="ReflectionProbe9" type="ReflectionProbe" parent="ReflectionProbes" index="9"] +transform = Transform3D(-1, 0, 8.74228e-08, -2.26267e-08, 0.965926, -0.258819, -8.44439e-08, -0.258819, -0.965926, -58.5445, -22.8705, -8) +extents = Vector3(6, 5, 12) +box_projection = true +interior = true +enable_shadows = true +ambient_color = Color(1, 1, 1, 1) + +[node name="ReflectionProbe10" type="ReflectionProbe" parent="ReflectionProbes" index="10"] +transform = Transform3D(1.28155e-07, 0.258819, 0.965926, -2.26267e-08, 0.965926, -0.258819, -1, 1.13133e-08, 1.29645e-07, -45.5445, -28.8705, -18) +extents = Vector3(6, 5, 14) +box_projection = true +interior = true +enable_shadows = true +ambient_color = Color(1, 1, 1, 1) + +[node name="ReflectionProbe11" type="ReflectionProbe" parent="ReflectionProbes" index="11"] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, -30.5445, -31.8705, -16) +extents = Vector3(6, 5, 9) +box_projection = true +interior = true +enable_shadows = true +ambient_color = Color(1, 1, 1, 1) + [node name="SpawnPoint1" parent="SpawnPoints" index="0"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0)