diff --git a/Game/Assets/Maps/DM1.tscn b/Game/Assets/Maps/DM1.tscn index a3abe99..5947e97 100644 --- a/Game/Assets/Maps/DM1.tscn +++ b/Game/Assets/Maps/DM1.tscn @@ -1,32 +1,447 @@ -[gd_scene load_steps=3 format=3 uid="uid://b7txmrrvh1q4e"] +[gd_scene load_steps=12 format=3 uid="uid://b7txmrrvh1q4e"] -[ext_resource type="PackedScene" uid="uid://b1078bn8gy2qf" path="res://Map.tscn" id="1_5amr5"] +[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="Texture2D" uid="uid://pnh872qjk0oy" path="res://Assets/Effects/Flame.png" id="19_irh18"] + +[sub_resource type="FogMaterial" id="FogMaterial_xa7nn"] +density = 0.3 +emission = Color(0.0941176, 0.196078, 1, 1) +edge_fade = 0.672717 + +[sub_resource type="Animation" id="Animation_gditv"] +resource_name = "Light Pulse" +length = 2.0 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("OmniLight3D4:light_color") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 1, 2), +"transitions": PackedFloat32Array(1.02837, 0.450623, 6.27666e-05), +"update": 0, +"values": [Color(0.184314, 0.603922, 1, 1), Color(0.12549, 0.376471, 1, 1), Color(0.184314, 0.603922, 1, 1)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = false +tracks/1/path = NodePath("OmniLight3D4:rotation") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 2), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector3(0, 0, 0), Vector3(0, 6.28319, 0)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = false +tracks/2/path = NodePath("OmniLight3D4:light_projector:noise_offset") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0, 2), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(0, 0), Vector2(512, 0)] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("FogVolume:material:density") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0, 1, 2), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 0, +"values": [0.05, 0.15, 0.05] +} + +[sub_resource type="Animation" id="Animation_c3pul"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("OmniLight3D4:light_color") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Color(1, 0.588235, 0.164706, 1)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("OmniLight3D4:rotation") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector3(0, 0, 0)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("OmniLight3D4:light_projector:noise_offset") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, 0)] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("FogVolume:material:density") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [0.3] +} + +[sub_resource type="Gradient" id="Gradient_ktku0"] +offsets = PackedFloat32Array(0, 0.314189, 0.702703, 1) +colors = PackedColorArray(0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_wjpdp"] +gradient = SubResource( "Gradient_ktku0" ) + +[sub_resource type="ParticlesMaterial" id="ParticlesMaterial_l374b"] +emission_shape = 1 +emission_sphere_radius = 4.66 +spread = 180.0 +flatness = 1.0 +gravity = Vector3(0, 0, 0) +angular_velocity_min = -120.0 +angular_velocity_max = 120.0 +radial_accel_min = -29.42 +radial_accel_max = -15.95 +tangential_accel_min = 20.35 +tangential_accel_max = 29.43 +damping_min = 11.11 +damping_max = 19.43 +angle_min = -180.0 +angle_max = 180.0 +scale_min = 3.0 +scale_max = 4.0 +color_ramp = SubResource( "GradientTexture1D_wjpdp" ) +hue_variation_min = -0.2 +hue_variation_max = 0.1 +anim_offset_max = 4.0 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_n0ym4"] +blend_mode = 1 +shading_mode = 0 +vertex_color_use_as_albedo = true +albedo_color = Color(0.117647, 0.337255, 1, 1) +albedo_texture = ExtResource( "19_irh18" ) +billboard_mode = 3 +particles_anim_h_frames = 2 +particles_anim_v_frames = 2 +particles_anim_loop = false +proximity_fade_enable = true +proximity_fade_distance = 4.0 + +[sub_resource type="QuadMesh" id="QuadMesh_eruqp"] +material = SubResource( "StandardMaterial3D_n0ym4" ) [node name="Map" instance=ExtResource( "1_5amr5" )] [node name="Camera" parent="." index="0"] transform = Transform3D(-4.2222e-08, 0.258819, -0.965926, 1.13133e-08, 0.965926, 0.258819, 1, 0, -4.37114e-08, -53, -19, 0) +[node name="Sun" parent="Lighting" index="1"] +use_in_sky_only = true + [node name="LightmapGI" parent="Lighting" index="2"] +visible = false environment_mode = 1 +[node name="VoxelGI" parent="Lighting" index="3"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10, -1, 2) +extents = Vector3(54, 39, 38) + [node name="Prototype" parent="Geometry" index="0"] visible = false use_collision = false +__meta__ = { +"_edit_lock_": true +} [node name="DM1" parent="Geometry" index="1" instance=ExtResource( "2_ov63e" )] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -33, 0) +__meta__ = { +"_edit_lock_": true +} + +[node name="Main 022" parent="Geometry/DM1" index="0"] +surface_material_override/0 = null +surface_material_override/1 = null +surface_material_override/2 = null +surface_material_override/3 = null + +[node name="Main 031" parent="Geometry/DM1" index="1"] +surface_material_override/0 = null + +[node name="Main 032" parent="Geometry/DM1" index="2"] +surface_material_override/0 = null +surface_material_override/1 = null +surface_material_override/2 = null + +[node name="Main 033" parent="Geometry/DM1" index="3"] +surface_material_override/0 = null + +[node name="Main 034" parent="Geometry/DM1" index="4"] +surface_material_override/0 = null +surface_material_override/1 = null + +[node name="QBlock002" parent="Geometry/DM1" index="5"] +surface_material_override/0 = null +surface_material_override/1 = null + +[node name="Main 035" parent="Geometry/DM1" index="6"] +surface_material_override/0 = null +surface_material_override/1 = null +surface_material_override/2 = null +surface_material_override/3 = null +surface_material_override/4 = null + +[node name="Main 040" parent="Geometry/DM1" index="7"] +surface_material_override/0 = null + +[node name="Main 047" parent="Geometry/DM1" index="8"] +surface_material_override/0 = null + +[node name="Main 048" parent="Geometry/DM1" index="9"] +surface_material_override/0 = null + +[node name="Main 049" parent="Geometry/DM1" index="10"] +surface_material_override/0 = null + +[node name="Main 050" parent="Geometry/DM1" index="11"] +surface_material_override/0 = null +surface_material_override/1 = null +surface_material_override/2 = null +surface_material_override/3 = null + +[node name="Main 051" parent="Geometry/DM1" index="12"] +surface_material_override/0 = null +surface_material_override/1 = null + +[node name="Main 052" parent="Geometry/DM1" index="13"] +surface_material_override/0 = null + +[node name="Main 053" parent="Geometry/DM1" index="14"] +surface_material_override/0 = null + +[node name="Main 054" parent="Geometry/DM1" index="15"] +surface_material_override/0 = null + +[node name="Main 058" parent="Geometry/DM1" index="16"] +surface_material_override/0 = null + +[node name="Main 059" parent="Geometry/DM1" index="17"] +surface_material_override/0 = null + +[node name="Main 060" parent="Geometry/DM1" index="18"] +surface_material_override/0 = null + +[node name="Main 061" parent="Geometry/DM1" index="19"] +surface_material_override/0 = null + +[node name="Main 062" parent="Geometry/DM1" index="20"] +surface_material_override/0 = null +surface_material_override/1 = null +surface_material_override/2 = null +surface_material_override/3 = null +surface_material_override/4 = null +surface_material_override/5 = null + +[node name="Main 063" parent="Geometry/DM1" index="21"] +surface_material_override/0 = null + +[node name="Main 064" parent="Geometry/DM1" index="22"] +surface_material_override/0 = null + +[node name="QBlock003" parent="Geometry/DM1" index="23"] +surface_material_override/0 = null + +[node name="QBlock005" parent="Geometry/DM1" index="24"] +surface_material_override/0 = null + +[node name="Main 065" parent="Geometry/DM1" index="25"] +surface_material_override/0 = null +surface_material_override/1 = null +surface_material_override/2 = null + +[node name="Main 066" parent="Geometry/DM1" index="26"] +surface_material_override/0 = null + +[node name="Main 067" parent="Geometry/DM1" index="27"] +surface_material_override/0 = null + +[node name="Main 068" parent="Geometry/DM1" index="28"] +surface_material_override/0 = null + +[node name="Main 069" parent="Geometry/DM1" index="29"] +surface_material_override/0 = null +surface_material_override/1 = null + +[node name="Main 070" parent="Geometry/DM1" index="30"] +surface_material_override/0 = null + +[node name="Main 072" parent="Geometry/DM1" index="31"] +surface_material_override/0 = null [node name="Collision" parent="Geometry/DM1" index="32"] visible = false +surface_material_override/0 = null [node name="GPUParticlesCollisionSDF" parent="ParticlesCollision" index="0"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16, -5, 0) -extents = Vector3(57, 48, 36) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9, -11, 4) +extents = Vector3(53, 28, 37) +resolution = 3 +__meta__ = { +"_edit_lock_": true +} + +[node name="FogVolume" type="FogVolume" parent="Lights" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34, -22, 0) +visible = false +extents = Vector3(25, 13, 26) +shape = 0 +material = SubResource( "FogMaterial_xa7nn" ) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="Lights" index="1"] +autoplay = "Light Pulse" +"anims/Light Pulse" = SubResource( "Animation_gditv" ) +anims/RESET = SubResource( "Animation_c3pul" ) + +[node name="OmniLight3D" type="SpotLight3D" parent="Lights" index="2"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 16, 15, 0) +light_color = Color(1, 0.788235, 0.737255, 1) +light_energy = 7.0 +light_size = 1.0 +light_specular = 1.0 +shadow_enabled = true +spot_range = 100.0 +spot_attenuation = 0.63728 + +[node name="OmniLight3D2" type="OmniLight3D" parent="Lights" index="3"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16, -6, 28) +light_energy = 7.0 +light_size = 1.0 +light_specular = 1.0 +shadow_enabled = true +omni_range = 66.0 + +[node name="SpotLight3D" type="SpotLight3D" parent="Lights" index="4"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -24, 8, 0) +light_energy = 15.0 +light_specular = 1.0 +shadow_enabled = true +spot_range = 92.0 +spot_attenuation = 0.554785 + +[node name="SpotLight3D2" type="SpotLight3D" parent="Lights" index="5"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -50, 1, 0) +light_energy = 15.0 +light_specular = 1.0 +shadow_enabled = true +spot_range = 92.0 +spot_attenuation = 0.554785 + +[node name="OmniLight3D4" type="OmniLight3D" parent="Lights" index="6"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34, -21, 0) +light_color = Color(1, 0.588235, 0.164706, 1) +light_energy = 80.0 +light_size = 1.0 +shadow_enabled = true +omni_range = 65.0 + +[node name="GPUParticles3D" type="GPUParticles3D" parent="Particles" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34, -21, 0) +amount = 128 +lifetime = 1.5 +process_material = SubResource( "ParticlesMaterial_l374b" ) +draw_pass_1 = SubResource( "QuadMesh_eruqp" ) [node name="ReflectionProbe" parent="ReflectionProbes" index="0"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.12948, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19, -20.8705, 0) +extents = Vector3(15, 16, 16) +interior = true + +[node name="ReflectionProbe8" type="ReflectionProbe" parent="ReflectionProbes" index="1"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7, -32.741, 0) +extents = Vector3(17, 4, 16) +box_projection = true +interior = true +enable_shadows = true +ambient_color = Color(1, 1, 1, 1) + +[node name="ReflectionProbe2" type="ReflectionProbe" parent="ReflectionProbes" index="2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -33.5445, -20.8705, 0) +extents = Vector3(25, 31, 20) +box_projection = true +interior = true +enable_shadows = true +ambient_color = Color(1, 1, 1, 1) + +[node name="ReflectionProbe3" type="ReflectionProbe" parent="ReflectionProbes" index="3"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.5445, -19.8705, -27) +extents = Vector3(28, 6, 9) +box_projection = true +interior = true +enable_shadows = true +ambient_color = Color(1, 1, 1, 1) + +[node name="ReflectionProbe4" type="ReflectionProbe" parent="ReflectionProbes" index="4"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 21.4555, -24.8705, -23) +extents = Vector3(16, 12, 11) +box_projection = true +interior = true +enable_shadows = true +ambient_color = Color(1, 1, 1, 1) + +[node name="ReflectionProbe5" type="ReflectionProbe" parent="ReflectionProbes" index="5"] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 37.4555, -21.8705, -3) +extents = Vector3(15, 8, 4) +origin_offset = Vector3(4, 0, 2) +box_projection = true +interior = true +enable_shadows = true +ambient_color = Color(1, 1, 1, 1) + +[node name="ReflectionProbe6" type="ReflectionProbe" parent="ReflectionProbes" index="6"] +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) +box_projection = true +enable_shadows = true +ambient_color = Color(1, 1, 1, 1) + +[node name="ReflectionProbe7" type="ReflectionProbe" parent="ReflectionProbes" index="7"] +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) +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) diff --git a/Game/Assets/Maps/MapA.tscn b/Game/Assets/Maps/MapA.tscn index 78ef0f1..3e5a327 100644 --- a/Game/Assets/Maps/MapA.tscn +++ b/Game/Assets/Maps/MapA.tscn @@ -1,34 +1,43 @@ -[gd_scene load_steps=3 format=3 uid="uid://b7txmrrvh1q4e"] +[gd_scene load_steps=6 format=3] -[ext_resource type="PackedScene" uid="uid://b1078bn8gy2qf" path="res://Map.tscn" id="1_5amr5"] -[ext_resource type="Material" uid="uid://dsq5f4ams7ibh" path="res://Assets/Materials/World/Development/dev.tres" id="2_ejjx1"] +[ext_resource type="PackedScene" path="res://Map.tscn" id="1_5amr5"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_DarkGrey.tres" id="2_5mbk1"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Blue.tres" id="3_jarnc"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_LightGray.tres" id="4_uany7"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Orange.tres" id="5_rgf5v"] [node name="Map" instance=ExtResource( "1_5amr5" )] +[node name="Prototype" parent="Geometry" index="0"] +gi_mode = 1 + +[node name="CSGBox3D" parent="Geometry/Prototype" index="0"] +material = ExtResource( "2_5mbk1" ) + [node name="CSGBox3D2" type="CSGBox3D" parent="Geometry/Prototype" index="1"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 7) size = Vector3(16, 4, 2) -material = ExtResource( "2_ejjx1" ) +material = ExtResource( "3_jarnc" ) [node name="CSGBox3D4" type="CSGBox3D" parent="Geometry/Prototype" index="2"] transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 7, 5, 0) size = Vector3(16, 4, 2) -material = ExtResource( "2_ejjx1" ) +material = ExtResource( "3_jarnc" ) [node name="CSGBox3D5" type="CSGBox3D" parent="Geometry/Prototype" index="3"] transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -7, 5, 0) size = Vector3(16, 4, 2) -material = ExtResource( "2_ejjx1" ) +material = ExtResource( "3_jarnc" ) [node name="CSGBox3D6" type="CSGBox3D" parent="Geometry/Prototype" index="4"] transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 9, 0) size = Vector3(16, 4, 16) -material = ExtResource( "2_ejjx1" ) +material = ExtResource( "4_uany7" ) [node name="CSGBox3D3" type="CSGBox3D" parent="Geometry/Prototype" index="5"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -7) size = Vector3(16, 4, 2) -material = ExtResource( "2_ejjx1" ) +material = ExtResource( "3_jarnc" ) [node name="CSGCylinder3D" type="CSGCylinder3D" parent="Geometry/Prototype" index="6"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11, 0) @@ -36,4 +45,7 @@ operation = 2 radius = 4.0 height = 8.0 sides = 32 -material = ExtResource( "2_ejjx1" ) +material = ExtResource( "5_rgf5v" ) + +[node name="ReflectionProbe" parent="ReflectionProbes" index="0"] +extents = Vector3(12, 12, 12) diff --git a/Game/Assets/Maps/MapB.tscn b/Game/Assets/Maps/MapB.tscn index 6d6ce5d..e309887 100644 --- a/Game/Assets/Maps/MapB.tscn +++ b/Game/Assets/Maps/MapB.tscn @@ -1,14 +1,10 @@ -[gd_scene load_steps=3 format=3 uid="uid://dmm7a508ui0v7"] +[gd_scene load_steps=3 format=3] -[ext_resource type="PackedScene" uid="uid://b1078bn8gy2qf" path="res://Map.tscn" id="1_qyuew"] -[ext_resource type="Material" uid="uid://dsq5f4ams7ibh" path="res://Assets/Materials/World/Development/dev.tres" id="2_ogcoq"] +[ext_resource type="PackedScene" path="res://Map.tscn" id="1_qyuew"] +[ext_resource type="Material" path="res://Assets/Materials/Maps/Dev/Dev_Violet.tres" id="2_ogcoq"] [node name="Map" instance=ExtResource( "1_qyuew" )] -[node name="Sun" parent="." index="2"] -transform = Transform3D(-0.5, 0.433013, -0.75, 0.648114, 0.761506, 0.00757993, 0.574412, -0.482295, -0.661395, 0, 32, 0) -light_color = Color(1, 0.298039, 0.0823529, 1) - [node name="CSGBox3D" parent="Geometry/Prototype" index="0"] size = Vector3(16, 2, 40) diff --git a/Game/Main.tscn b/Game/Main.tscn index 210531a..29c0af6 100644 --- a/Game/Main.tscn +++ b/Game/Main.tscn @@ -5,7 +5,7 @@ [ext_resource type="PackedScene" uid="uid://bs80rhfpgh2m2" path="res://Assets/HUD/HUD.tscn" id="4"] [ext_resource type="AudioStream" uid="uid://j42e203vte7h" path="res://Assets/Announcer/Go.wav" id="5_ilayd"] [ext_resource type="Script" path="res://Assets/Announcer/Announcer.gd" id="6_gcsgr"] -[ext_resource type="PackedScene" uid="uid://b7txmrrvh1q4e" path="res://Assets/Maps/MapA.tscn" id="7_yvic5"] +[ext_resource type="PackedScene" uid="uid://b7txmrrvh1q4e" path="res://Assets/Maps/DM1.tscn" id="7_yvic5"] [sub_resource type="VisualShaderNodeFloatFunc" id="VisualShaderNodeFloatFunc_6ihsi"] function = 31 diff --git a/Game/Map.tscn b/Game/Map.tscn index 1ee6d36..5426147 100644 --- a/Game/Map.tscn +++ b/Game/Map.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=8 format=3 uid="uid://b1078bn8gy2qf"] +[gd_scene load_steps=8 format=3 uid="uid://cbh6i7mi0aqjs"] [ext_resource type="PackedScene" uid="uid://n3ktc2gomi2p" path="res://Assets/MapComponents/SpawnPoint.tscn" id="1"] -[ext_resource type="Material" uid="uid://dsq5f4ams7ibh" path="res://Assets/Materials/World/Development/dev.tres" id="1_iue03"] +[ext_resource type="Material" uid="uid://cx53mnq3gateb" path="res://Assets/Materials/Maps/Dev/Dev_LightGray.tres" id="1_ndro8"] [sub_resource type="CameraEffects" id="CameraEffects_i6883"] dof_blur_far_enabled = true @@ -46,7 +46,8 @@ glow_intensity = 2.0 glow_hdr_threshold = 2.0 glow_hdr_scale = 4.0 glow_hdr_luminance_cap = 5.0 -volumetric_fog_density = 0.001 +volumetric_fog_enabled = true +volumetric_fog_density = 0.0 volumetric_fog_gi_inject = 0.1 [sub_resource type="CameraEffects" id="4"] @@ -79,6 +80,13 @@ directional_shadow_blend_splits = true [node name="LightmapGI" type="LightmapGI" parent="Lighting"] +[node name="VoxelGI" type="VoxelGI" parent="Lighting"] +visible = false +extents = Vector3(64, 64, 64) +__meta__ = { +"_edit_lock_": true +} + [node name="Geometry" type="Node3D" parent="."] __meta__ = { "_edit_lock_": true @@ -90,7 +98,7 @@ use_collision = true [node name="CSGBox3D" type="CSGBox3D" parent="Geometry/Prototype"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0) size = Vector3(16, 2, 16) -material = ExtResource( "1_iue03" ) +material = ExtResource( "1_ndro8" ) [node name="Props" type="Node3D" parent="."] __meta__ = { @@ -98,15 +106,13 @@ __meta__ = { } [node name="ParticlesCollision" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.22556, 9.57059, 0) __meta__ = { "_edit_lock_": true } -[node name="GPUParticlesCollisionSDF" type="Node" parent="ParticlesCollision"] -__meta__ = { -"_edit_lock_": true -} +[node name="GPUParticlesCollisionSDF" type="GPUParticlesCollisionSDF3D" parent="ParticlesCollision"] +extents = Vector3(64, 64, 64) +resolution = 4 [node name="SpecialCollision" type="Node3D" parent="."] __meta__ = { @@ -123,6 +129,11 @@ __meta__ = { "_edit_lock_": true } +[node name="Particles" type="Node3D" parent="."] +__meta__ = { +"_edit_lock_": true +} + [node name="ReflectionProbes" type="Node3D" parent="."] __meta__ = { "_edit_lock_": true @@ -130,7 +141,7 @@ __meta__ = { [node name="ReflectionProbe" type="ReflectionProbe" parent="ReflectionProbes"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 0) -extents = Vector3(64, 64, 64) +extents = Vector3(16, 16, 16) box_projection = true enable_shadows = true ambient_color = Color(1, 1, 1, 1)