diff --git a/Asset Sources/Maps/Models/DM1/DM1_update_01.blend b/Asset Sources/Maps/Models/DM1/DM1_update_01.blend index 8953d60..de604c2 100644 --- a/Asset Sources/Maps/Models/DM1/DM1_update_01.blend +++ b/Asset Sources/Maps/Models/DM1/DM1_update_01.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4e641fe0b0f565e76afdf44f791e1d14af6ddcf80767c0215f375cbf1be6513 -size 8059072 +oid sha256:b33a5625fa2f6555326b3181fbdf23f3d6c4b9327943a75586a10d91b8d31ad2 +size 8145024 diff --git a/Game/Assets/Maps/DM1.tscn b/Game/Assets/Maps/DM1.tscn new file mode 100644 index 0000000..a3abe99 --- /dev/null +++ b/Game/Assets/Maps/DM1.tscn @@ -0,0 +1,34 @@ +[gd_scene load_steps=3 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://k4alrsehhfbc" path="res://Assets/Maps/DM1/DM1.glb" id="2_ov63e"] + +[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="LightmapGI" parent="Lighting" index="2"] +environment_mode = 1 + +[node name="Prototype" parent="Geometry" index="0"] +visible = false +use_collision = false + +[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) + +[node name="Collision" parent="Geometry/DM1" index="32"] +visible = false + +[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) + +[node name="ReflectionProbe" parent="ReflectionProbes" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.12948, 0) + +[node name="SpawnPoint1" parent="SpawnPoints" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0) + +[editable path="Geometry/DM1"] diff --git a/Game/Assets/Maps/DM1/DM1.glb b/Game/Assets/Maps/DM1/DM1.glb index 0dfa934..559f223 100644 Binary files a/Game/Assets/Maps/DM1/DM1.glb and b/Game/Assets/Maps/DM1/DM1.glb differ diff --git a/Game/Assets/Maps/DM1/DM1.glb.import b/Game/Assets/Maps/DM1/DM1.glb.import index 6beba7f..551071d 100644 --- a/Game/Assets/Maps/DM1/DM1.glb.import +++ b/Game/Assets/Maps/DM1/DM1.glb.import @@ -3,7 +3,7 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://w476ulvte1f6" +uid="uid://k4alrsehhfbc" path="res://.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.scn" [deps] @@ -17,19 +17,19 @@ nodes/root_type="Node3D" nodes/root_name="Scene Root" nodes/root_scale=1.0 meshes/ensure_tangents=true -meshes/generate_lods=true +meshes/generate_lods=false meshes/create_shadow_meshes=true meshes/light_baking=2 meshes/lightmap_texel_size=0.1 skins/use_named_skins=true animation/import=true -animation/bake_reset_animation=true animation/fps=15 import_script/path="" _subresources={ "nodes": { -"PATH:Main": { -"generate/physics": 1 +"PATH:Collision": { +"generate/physics": true, +"physics/shape_type": 2 } } } diff --git a/Game/Map.tscn b/Game/Map.tscn index 27190d0..05f132f 100644 --- a/Game/Map.tscn +++ b/Game/Map.tscn @@ -8,8 +8,8 @@ dof_blur_far_enabled = true dof_blur_far_distance = 0.01 dof_blur_far_transition = 173.56 dof_blur_near_enabled = true -dof_blur_near_distance = 33.81 -dof_blur_near_transition = 17.18 +dof_blur_near_distance = 38.96 +dof_blur_near_transition = 155.25 dof_blur_amount = 1.0 override_exposure = 0.0 @@ -59,12 +59,17 @@ effects = SubResource( "CameraEffects_i6883" ) current = true fov = 60.0 -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +[node name="Lighting" type="Node3D" parent="."] +__meta__ = { +"_edit_lock_": true +} + +[node name="WorldEnvironment" type="WorldEnvironment" parent="Lighting"] environment = SubResource( "3" ) camera_effects = SubResource( "4" ) -[node name="Sun" type="DirectionalLight3D" parent="."] -transform = Transform3D(-0.5, 0.433013, -0.75, -1.49012e-08, 0.866025, 0.5, 0.866026, 0.25, -0.433013, 0, 32, 0) +[node name="Sun" type="DirectionalLight3D" parent="Lighting"] +transform = Transform3D(-0.5, 0.433013, -0.75, -1.49012e-08, 0.866025, 0.5, 0.866026, 0.25, -0.433012, 0, 32, 0) light_energy = 4.0 light_angular_distance = 1.5 shadow_enabled = true @@ -72,6 +77,8 @@ shadow_bias = 0.35 shadow_blur = 0.1 directional_shadow_blend_splits = true +[node name="LightmapGI" type="LightmapGI" parent="Lighting"] + [node name="Geometry" type="Node3D" parent="."] __meta__ = { "_edit_lock_": true @@ -110,7 +117,6 @@ __meta__ = { } [node name="Decals" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) __meta__ = { "_edit_lock_": true }