diff --git a/assets/level/2x2quad.obj b/assets/level/2x2quad.obj deleted file mode 100644 index ea5eb7a..0000000 --- a/assets/level/2x2quad.obj +++ /dev/null @@ -1,15 +0,0 @@ -# Blender 4.3.2 -# www.blender.org -mtllib 2x2quad.mtl -o Plane -v -1.000000 0.000000 1.000000 -v 1.000000 0.000000 1.000000 -v -1.000000 0.000000 -1.000000 -v 1.000000 0.000000 -1.000000 -vn -0.0000 1.0000 -0.0000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -s 0 -f 1/1/1 2/2/1 4/3/1 3/4/1 diff --git a/assets/level/2x2quad.obj.import b/assets/level/2x2quad.obj.import deleted file mode 100644 index 4a8506c..0000000 --- a/assets/level/2x2quad.obj.import +++ /dev/null @@ -1,25 +0,0 @@ -[remap] - -importer="wavefront_obj" -importer_version=1 -type="Mesh" -uid="uid://nmulbfs1qbnt" -path="res://.godot/imported/2x2quad.obj-d048119e96c0c2696f1246a3e62e0908.mesh" - -[deps] - -files=["res://.godot/imported/2x2quad.obj-d048119e96c0c2696f1246a3e62e0908.mesh"] - -source_file="res://assets/level/2x2quad.obj" -dest_files=["res://.godot/imported/2x2quad.obj-d048119e96c0c2696f1246a3e62e0908.mesh", "res://.godot/imported/2x2quad.obj-d048119e96c0c2696f1246a3e62e0908.mesh"] - -[params] - -generate_tangents=true -generate_lods=true -generate_shadow_mesh=true -generate_lightmap_uv2=false -generate_lightmap_uv2_texel_size=0.2 -scale_mesh=Vector3(1, 1, 1) -offset_mesh=Vector3(0, 0, 0) -force_disable_mesh_compression=false diff --git a/assets/level/ceiling/ceiling_1.mesh b/assets/level/ceiling/ceiling_1.mesh new file mode 100644 index 0000000..35c594c Binary files /dev/null and b/assets/level/ceiling/ceiling_1.mesh differ diff --git a/assets/level/ceiling/ceiling_1_2x2.mesh b/assets/level/ceiling/ceiling_1_2x2.mesh deleted file mode 100644 index ba51533..0000000 Binary files a/assets/level/ceiling/ceiling_1_2x2.mesh and /dev/null differ diff --git a/assets/level/ceiling/ceiling_1_9x9.mesh b/assets/level/ceiling/ceiling_1_9x9.mesh deleted file mode 100644 index 70af948..0000000 Binary files a/assets/level/ceiling/ceiling_1_9x9.mesh and /dev/null differ diff --git a/assets/level/ceiling/ceiling_2.mesh b/assets/level/ceiling/ceiling_2.mesh new file mode 100644 index 0000000..e4fd2a2 Binary files /dev/null and b/assets/level/ceiling/ceiling_2.mesh differ diff --git a/assets/level/ceiling/ceiling_2_2x2.mesh b/assets/level/ceiling/ceiling_2_2x2.mesh deleted file mode 100644 index e4a6e06..0000000 Binary files a/assets/level/ceiling/ceiling_2_2x2.mesh and /dev/null differ diff --git a/assets/level/ceiling/ceiling_9x9.mesh b/assets/level/ceiling/ceiling_9x9.mesh new file mode 100644 index 0000000..1121498 Binary files /dev/null and b/assets/level/ceiling/ceiling_9x9.mesh differ diff --git a/assets/level/floor/floor_1.mesh b/assets/level/floor/floor_1.mesh new file mode 100644 index 0000000..9243839 Binary files /dev/null and b/assets/level/floor/floor_1.mesh differ diff --git a/assets/level/floor/floor_1_2x2.mesh b/assets/level/floor/floor_1_2x2.mesh deleted file mode 100644 index 55eb32d..0000000 Binary files a/assets/level/floor/floor_1_2x2.mesh and /dev/null differ diff --git a/assets/level/floor/floor_2.mesh b/assets/level/floor/floor_2.mesh new file mode 100644 index 0000000..7a99ed3 Binary files /dev/null and b/assets/level/floor/floor_2.mesh differ diff --git a/assets/level/floor/floor_2_2x2.mesh b/assets/level/floor/floor_2_2x2.mesh deleted file mode 100644 index 294f174..0000000 Binary files a/assets/level/floor/floor_2_2x2.mesh and /dev/null differ diff --git a/assets/level/floor/floor_1_9x9.mesh b/assets/level/floor/floor_9x9.mesh similarity index 100% rename from assets/level/floor/floor_1_9x9.mesh rename to assets/level/floor/floor_9x9.mesh diff --git a/assets/level/t-junction/t-junction_1.mesh.depren b/assets/level/t-junction/t-junction_1.mesh.depren new file mode 100644 index 0000000..d596627 Binary files /dev/null and b/assets/level/t-junction/t-junction_1.mesh.depren differ diff --git a/assets/level/t-junction/t-junction_2.mesh.depren b/assets/level/t-junction/t-junction_2.mesh.depren new file mode 100644 index 0000000..36dc9f8 Binary files /dev/null and b/assets/level/t-junction/t-junction_2.mesh.depren differ diff --git a/assets/level/wall/wall_1_3x3.mesh b/assets/level/wall/wall_1.mesh similarity index 100% rename from assets/level/wall/wall_1_3x3.mesh rename to assets/level/wall/wall_1.mesh diff --git a/assets/level/wall/wall_1_2x2.mesh b/assets/level/wall/wall_1_2x2.mesh deleted file mode 100644 index 2586bc4..0000000 Binary files a/assets/level/wall/wall_1_2x2.mesh and /dev/null differ diff --git a/assets/level/wall/wall_2_3x3.mesh b/assets/level/wall/wall_2.mesh similarity index 100% rename from assets/level/wall/wall_2_3x3.mesh rename to assets/level/wall/wall_2.mesh diff --git a/assets/level/wall/wall_2_2x2.mesh b/assets/level/wall/wall_2_2x2.mesh deleted file mode 100644 index cb90d44..0000000 Binary files a/assets/level/wall/wall_2_2x2.mesh and /dev/null differ diff --git a/assets/level/wall/wall_3_3x3.mesh b/assets/level/wall/wall_3.mesh similarity index 100% rename from assets/level/wall/wall_3_3x3.mesh rename to assets/level/wall/wall_3.mesh diff --git a/assets/level/wall/wall_3_2x2.mesh b/assets/level/wall/wall_3_2x2.mesh deleted file mode 100644 index 16bf0db..0000000 Binary files a/assets/level/wall/wall_3_2x2.mesh and /dev/null differ diff --git a/assets/level/wall/wall_4_3x3.mesh b/assets/level/wall/wall_4.mesh similarity index 100% rename from assets/level/wall/wall_4_3x3.mesh rename to assets/level/wall/wall_4.mesh diff --git a/assets/level/wall/wall_4_2x2.mesh b/assets/level/wall/wall_4_2x2.mesh deleted file mode 100644 index 00569b4..0000000 Binary files a/assets/level/wall/wall_4_2x2.mesh and /dev/null differ diff --git a/assets/materials/level/ceiling_1.material b/assets/materials/level/ceiling_1.material index 7f1758e..5f9e5ce 100644 Binary files a/assets/materials/level/ceiling_1.material and b/assets/materials/level/ceiling_1.material differ diff --git a/assets/level/t-junction/t-junction_1.material b/assets/materials/level/t-junction_1.material similarity index 100% rename from assets/level/t-junction/t-junction_1.material rename to assets/materials/level/t-junction_1.material diff --git a/assets/level/t-junction/t-junction_2.material b/assets/materials/level/t-junction_2.material similarity index 100% rename from assets/level/t-junction/t-junction_2.material rename to assets/materials/level/t-junction_2.material diff --git a/levels/asset_test/asset_test.tscn b/levels/asset_test/asset_test.tscn deleted file mode 100644 index 3abac4a..0000000 --- a/levels/asset_test/asset_test.tscn +++ /dev/null @@ -1,218 +0,0 @@ -[gd_scene load_steps=24 format=4 uid="uid://ef0nvq0ikdjg"] - -[ext_resource type="PackedScene" uid="uid://bwe2jdmvinhqd" path="res://src/player/player.tscn" id="1_kfkc5"] -[ext_resource type="ArrayMesh" uid="uid://bc476v18chh3o" path="res://assets/level/floor/floor_1_2x2.mesh" id="2_eqm4j"] -[ext_resource type="ArrayMesh" uid="uid://gaekd6523jwo" path="res://assets/level/floor/floor_2_2x2.mesh" id="3_yqrx7"] -[ext_resource type="ArrayMesh" uid="uid://b3dnnod3nih10" path="res://assets/level/wall/wall_1_2x2.mesh" id="4_yy6sa"] -[ext_resource type="ArrayMesh" uid="uid://cphc3nx1xqrgw" path="res://assets/level/wall/wall_2_2x2.mesh" id="5_rpeyx"] -[ext_resource type="ArrayMesh" uid="uid://uvq4b445w8dv" path="res://assets/level/wall/wall_3_2x2.mesh" id="6_emb7q"] -[ext_resource type="ArrayMesh" uid="uid://iachnau2wfjg" path="res://assets/level/wall/wall_4_2x2.mesh" id="7_emb7q"] -[ext_resource type="ArrayMesh" uid="uid://dhutbkqatlwpa" path="res://assets/level/ceiling/ceiling_1_2x2.mesh" id="7_u881q"] -[ext_resource type="ArrayMesh" uid="uid://c8aauxqfa3w3b" path="res://assets/level/ceiling/ceiling_2_2x2.mesh" id="8_2mqye"] -[ext_resource type="ArrayMesh" uid="uid://cqd0a7ousx01n" path="res://assets/level/hallway/hallway_1.mesh" id="13_muvdl"] -[ext_resource type="Material" uid="uid://djoqy5skkmabr" path="res://assets/level/t-junction/t-junction_1.material" id="13_vx5xa"] -[ext_resource type="Material" uid="uid://csu11a0qxtg2g" path="res://assets/level/t-junction/t-junction_2.material" id="14_2mqye"] -[ext_resource type="ArrayMesh" uid="uid://5jt7xxr05lw3" path="res://assets/level/hallway/hallway_2.mesh" id="14_bbps6"] -[ext_resource type="ArrayMesh" uid="uid://o6k7ebet848p" path="res://assets/level/hallway/hallway_3.mesh" id="15_tbq5c"] - -[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_om6ib"] - -[sub_resource type="Sky" id="Sky_8jqw1"] -sky_material = SubResource("ProceduralSkyMaterial_om6ib") - -[sub_resource type="Environment" id="Environment_4nlsy"] -background_mode = 1 -sky = SubResource("Sky_8jqw1") -ambient_light_source = 2 -ambient_light_color = Color(1, 1, 1, 1) -ambient_light_energy = 0.06 -tonemap_mode = 3 -glow_enabled = true -glow_bloom = 0.1 -fog_enabled = true -fog_light_color = Color(0, 0, 0, 1) -fog_density = 0.2 - -[sub_resource type="PlaneMesh" id="PlaneMesh_1krrn"] -size = Vector2(6, 6) - -[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_imll7"] - -[sub_resource type="ArrayMesh" id="ArrayMesh_8am31"] -_surfaces = [{ -"aabb": AABB(-1.5, 0, -1.5, 3, 3, 3), -"format": 34896613377, -"index_count": 18, -"index_data": PackedByteArray("AAABAAIAAQAAAAMAAwAAAAQAAgABAAUABQAGAAIABwAGAAUA"), -"name": "Cube", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 8, -"vertex_data": PackedByteArray("AAAAAAAAAAAAAAAA//8AAAAA//8AAAAA//8AAP//AAD//wAAAAAAAAAA/////wAA/////wAAAAD///////8AAA==") -}] -blend_shape_mode = 0 - -[sub_resource type="ArrayMesh" id="ArrayMesh_m53g0"] -_surfaces = [{ -"aabb": AABB(-1.5, 0, -1.5, 3, 3, 3), -"attribute_data": PackedByteArray("AABUVVRVVFUAAKqqVFWqqlRVVFUAAFRVVFUAAAAAAABUVf//AAD//1RVqqoAAKqq"), -"format": 34896613399, -"index_count": 18, -"index_data": PackedByteArray("AAABAAIAAgABAAMABAAFAAYABgAFAAcACAAJAAoACgAJAAsA"), -"material": ExtResource("13_vx5xa"), -"name": "Cube", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 12, -"vertex_data": PackedByteArray("AAAAAAAA//8AAAAA/////wAA//8AAP//AAD///////8AAAAA//9U1QAAAAAAAFTV//8AAP//VNX//wAAAABU1f///////1TV/////wAAVNUAAP////9U1QAA//8AAFTV/7//f/+//3//v/9//7//f6qqqqqqqqqqqqqqqqqqqqqqKlTVqipU1aoqVNWqKlTV") -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_8am31") - -[sub_resource type="ArrayMesh" id="ArrayMesh_qn1y2"] -_surfaces = [{ -"aabb": AABB(-1.5, 0, -1.5, 3, 3, 3), -"format": 34896613377, -"index_count": 18, -"index_data": PackedByteArray("AAABAAIAAQAAAAMAAwAAAAQAAgABAAUABQAGAAIABwAGAAUA"), -"name": "Cube", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 8, -"vertex_data": PackedByteArray("AAAAAAAAAAAAAAAA//8AAAAA//8AAAAA//8AAP//AAD//wAAAAAAAAAA/////wAA/////wAAAAD///////8AAA==") -}] -blend_shape_mode = 0 - -[sub_resource type="ArrayMesh" id="ArrayMesh_4m454"] -_surfaces = [{ -"aabb": AABB(-1.5, 0, -1.5, 3, 3, 3), -"attribute_data": PackedByteArray("AABUVVRVVFUAAKqqVFWqqlRVVFUAAFRVVFUAAAAAAABUVf//AAD//1RVqqoAAKqq"), -"format": 34896613399, -"index_count": 18, -"index_data": PackedByteArray("AAABAAIAAgABAAMABAAFAAYABgAFAAcACAAJAAoACgAJAAsA"), -"material": ExtResource("14_2mqye"), -"name": "Cube", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 12, -"vertex_data": PackedByteArray("AAAAAAAA//8AAAAA/////wAA//8AAP//AAD///////8AAAAA//9U1QAAAAAAAFTV//8AAP//VNX//wAAAABU1f///////1TV/////wAAVNUAAP////9U1QAA//8AAFTV/7//f/+//3//v/9//7//f6qqqqqqqqqqqqqqqqqqqqqqKlTVqipU1aoqVNWqKlTV") -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_qn1y2") - -[node name="AssetTest" type="Node3D"] - -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] -environment = SubResource("Environment_4nlsy") - -[node name="OmniLight3D" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 1.87456, -4) -light_energy = 8.0 -shadow_enabled = true -omni_range = 20.0 - -[node name="OmniLight3D2" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 1.87456, -4) -light_energy = 8.0 -shadow_enabled = true -omni_range = 20.0 - -[node name="OmniLight3D3" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 1.87456, 10) -light_energy = 8.0 -shadow_enabled = true -omni_range = 20.0 - -[node name="OmniLight3D4" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 1.87456, 10) -light_energy = 8.0 -shadow_enabled = true -omni_range = 20.0 - -[node name="OmniLight3D5" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4, 1.87456, 10) -light_energy = 8.0 -shadow_enabled = true -omni_range = 20.0 - -[node name="Player" parent="." instance=ExtResource("1_kfkc5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) - -[node name="Floor" type="StaticBody3D" parent="."] - -[node name="MeshInstance3D" type="MeshInstance3D" parent="Floor"] -mesh = SubResource("PlaneMesh_1krrn") -skeleton = NodePath("../..") - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Floor"] -shape = SubResource("WorldBoundaryShape3D_imll7") - -[node name="Assets" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, -4) - -[node name="Floors" type="Node3D" parent="Assets"] - -[node name="Floor1" type="MeshInstance3D" parent="Assets/Floors"] -mesh = ExtResource("2_eqm4j") -skeleton = NodePath("../..") - -[node name="Floor2" type="MeshInstance3D" parent="Assets/Floors"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, 0) -mesh = ExtResource("3_yqrx7") -skeleton = NodePath("../..") - -[node name="Walls" type="Node3D" parent="Assets"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -1) - -[node name="Wall1" type="MeshInstance3D" parent="Assets/Walls"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0) -mesh = ExtResource("4_yy6sa") - -[node name="Wall2" type="MeshInstance3D" parent="Assets/Walls"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 2, 0, 0) -mesh = ExtResource("5_rpeyx") - -[node name="Wall3" type="MeshInstance3D" parent="Assets/Walls"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 4, 0, 0) -mesh = ExtResource("6_emb7q") - -[node name="Wall4" type="MeshInstance3D" parent="Assets/Walls"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 6, 0, 0) -mesh = ExtResource("7_emb7q") - -[node name="Ceilings" type="Node3D" parent="Assets"] - -[node name="Ceiling1" type="MeshInstance3D" parent="Assets/Ceilings"] -transform = Transform3D(1, 0, 0, 0, -1, 8.74228e-08, 0, -8.74228e-08, -1, 0, 2, 0) -mesh = ExtResource("7_u881q") - -[node name="Ceiling2" type="MeshInstance3D" parent="Assets/Ceilings"] -transform = Transform3D(-4.37114e-08, 0, -1, -8.74228e-08, -1, 3.82137e-15, -1, 8.74228e-08, 4.37114e-08, 2, 2, 0) -mesh = ExtResource("8_2mqye") - -[node name="Hallways" type="Node3D" parent="Assets"] - -[node name="Hallway1" type="MeshInstance3D" parent="Assets/Hallways"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 0, 13) -mesh = ExtResource("13_muvdl") -skeleton = NodePath("../..") - -[node name="Hallway2" type="MeshInstance3D" parent="Assets/Hallways"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 13) -mesh = ExtResource("14_bbps6") - -[node name="Hallway3" type="MeshInstance3D" parent="Assets/Hallways"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, 13) -mesh = ExtResource("15_tbq5c") - -[node name="T-Junctions" type="Node3D" parent="Assets"] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 4, 0, 20.5) - -[node name="T-Junction1" type="MeshInstance3D" parent="Assets/T-Junctions"] -mesh = SubResource("ArrayMesh_m53g0") -skeleton = NodePath("../..") - -[node name="T-Junction2" type="MeshInstance3D" parent="Assets/T-Junctions"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -3) -mesh = SubResource("ArrayMesh_4m454") -skeleton = NodePath("../..") diff --git a/levels/ghost_ship/ghost_ship_level.tscn b/levels/ghost_ship/ghost_ship_level.tscn index 3be4a68..dad69d1 100644 --- a/levels/ghost_ship/ghost_ship_level.tscn +++ b/levels/ghost_ship/ghost_ship_level.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=94 format=4 uid="uid://crydi5cjgfwe5"] +[gd_scene load_steps=90 format=4 uid="uid://crydi5cjgfwe5"] [ext_resource type="PackedScene" uid="uid://oowut88kr2ox" path="res://levels/ghost_ship/player_ship/player_ship.tscn" id="1_2pyr1"] [ext_resource type="PackedScene" uid="uid://c2omlx4ptrc01" path="res://src/world/gunk_body/gunk_body.tscn" id="2_2egij"] [ext_resource type="Texture2D" uid="uid://dthjo3ymo7say" path="res://levels/ghost_ship/airlock/floor_mask.png" id="3_35kna"] [ext_resource type="Shader" uid="uid://ckxc0ngd37rtk" path="res://src/shaders/gunk.gdshader" id="5_1njh5"] [ext_resource type="FastNoiseLite" uid="uid://cnlvdtx68giv6" path="res://assets/materials/gunk_noise.tres" id="6_3kphg"] -[ext_resource type="ArrayMesh" uid="uid://dpr5cgq743f4s" path="res://assets/level/floor/floor_1_9x9.mesh" id="6_6giaa"] -[ext_resource type="ArrayMesh" uid="uid://bumwpsm42csme" path="res://assets/level/ceiling/ceiling_1_9x9.mesh" id="7_otfxe"] +[ext_resource type="ArrayMesh" uid="uid://dpr5cgq743f4s" path="res://assets/level/floor/floor_9x9.mesh" id="6_6giaa"] +[ext_resource type="ArrayMesh" uid="uid://bumwpsm42csme" path="res://assets/level/ceiling/ceiling_9x9.mesh" id="7_otfxe"] [ext_resource type="Texture2D" uid="uid://m2qxenym1otw" path="res://assets/level/wall/wall_2_C.png" id="13_fll4m"] [ext_resource type="Texture2D" uid="uid://begn6qloo0m1q" path="res://assets/level/wall/wall_2_M.png" id="14_dly4i"] [ext_resource type="Texture2D" uid="uid://bn4nrclcovuej" path="res://assets/level/wall/wall_1_C.png" id="14_gim1e"] @@ -14,7 +14,7 @@ [ext_resource type="Texture2D" uid="uid://cpdrvdu3qt62t" path="res://assets/level/wall/wall_2_N.png" id="15_rp2qp"] [ext_resource type="Texture2D" uid="uid://ba5vvrx730go8" path="res://assets/level/wall/wall_2_R.png" id="16_if0c2"] [ext_resource type="Texture2D" uid="uid://bujelwt4b5d0s" path="res://assets/level/wall/wall_1_N.png" id="16_otfxe"] -[ext_resource type="ArrayMesh" uid="uid://bx00qgk2dyjrw" path="res://assets/level/wall/wall_2_3x3.mesh" id="16_sqa4l"] +[ext_resource type="ArrayMesh" uid="uid://bx00qgk2dyjrw" path="res://assets/level/wall/wall_2.mesh" id="16_sqa4l"] [ext_resource type="PackedScene" uid="uid://b6eg8t04rkh0c" path="res://src/props/wall_switch/wall_switch.tscn" id="17_0idgf"] [ext_resource type="Texture2D" uid="uid://dwi2opqp2s8ak" path="res://assets/level/wall/wall_1_R.png" id="17_smvh1"] [ext_resource type="PackedScene" uid="uid://2yqi5u5eo025" path="res://src/world/gunk_node/grunk_nodule.tscn" id="19_ji5cn"] @@ -26,9 +26,9 @@ [ext_resource type="ArrayMesh" uid="uid://o6k7ebet848p" path="res://assets/level/hallway/hallway_3.mesh" id="28_17ivy"] [ext_resource type="Texture2D" uid="uid://da5p04vbiy3xe" path="res://assets/props/crate_long/crate_long_M.png" id="28_f0xh4"] [ext_resource type="ArrayMesh" uid="uid://b3f5p4o7qr1mf" path="res://assets/level/t-junction/t-junction_2.mesh" id="28_ji5cn"] -[ext_resource type="ArrayMesh" uid="uid://c785n3j3aq4sf" path="res://assets/level/wall/wall_1_3x3.mesh" id="29_35kna"] +[ext_resource type="ArrayMesh" uid="uid://c785n3j3aq4sf" path="res://assets/level/wall/wall_1.mesh" id="29_35kna"] [ext_resource type="Texture2D" uid="uid://bsovubygl3go2" path="res://assets/props/crate_long/crate_long_N.png" id="29_nmnkj"] -[ext_resource type="ArrayMesh" uid="uid://xn5nceqby4wd" path="res://assets/level/wall/wall_3_3x3.mesh" id="30_ji5cn"] +[ext_resource type="ArrayMesh" uid="uid://xn5nceqby4wd" path="res://assets/level/wall/wall_3.mesh" id="30_ji5cn"] [ext_resource type="Texture2D" uid="uid://b1m1my5q2vlwi" path="res://assets/props/crate_long/crate_long_R.png" id="30_u2hqf"] [ext_resource type="ArrayMesh" uid="uid://5jt7xxr05lw3" path="res://assets/level/hallway/hallway_2.mesh" id="31_ji5cn"] [ext_resource type="PackedScene" uid="uid://cubwniraol1qn" path="res://src/props/bulkhead/bulkhead.tscn" id="35_f0xh4"] @@ -605,98 +605,6 @@ shader_parameter/jitter_time_scale = 0.1 shader_parameter/vertex_inflation = 0.0 shader_parameter/inflation_pixellation = 10.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_nmnkj"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("5_1njh5") -shader_parameter/color_1 = Color(0, 0.03, 0.1, 1) -shader_parameter/color_2 = Color(0, 0.1, 0.3, 1) -shader_parameter/emission_color = Color(0.25, 0.88, 1, 1) -shader_parameter/pixellation = 128.0 -shader_parameter/time_pixellation = 30.0 -shader_parameter/roughness = 0.15 -shader_parameter/specular_contribution = 0.8 -shader_parameter/emission_strength = 0.02 -shader_parameter/uv_scale = Vector2(2, 2) -shader_parameter/time_scale = 0.2 -shader_parameter/edge_bleed = 0.25 -shader_parameter/gunk_mask = SubResource("CompressedTexture2D_hrvvi") -shader_parameter/gunk_noise = SubResource("NoiseTexture3D_2roq2") -shader_parameter/gunk_normal_map = SubResource("NoiseTexture3D_fk1xc") -shader_parameter/jitter_magnitude = 0.0 -shader_parameter/jitter_time_scale = 0.1 -shader_parameter/vertex_inflation = 0.0 -shader_parameter/inflation_pixellation = 10.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_62grt"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("5_1njh5") -shader_parameter/color_1 = Color(0, 0.03, 0.1, 1) -shader_parameter/color_2 = Color(0, 0.1, 0.3, 1) -shader_parameter/emission_color = Color(0.25, 0.88, 1, 1) -shader_parameter/pixellation = 128.0 -shader_parameter/time_pixellation = 30.0 -shader_parameter/roughness = 0.15 -shader_parameter/specular_contribution = 0.8 -shader_parameter/emission_strength = 0.02 -shader_parameter/uv_scale = Vector2(2, 2) -shader_parameter/time_scale = 0.2 -shader_parameter/edge_bleed = 0.25 -shader_parameter/gunk_mask = SubResource("CompressedTexture2D_hrvvi") -shader_parameter/gunk_noise = SubResource("NoiseTexture3D_2roq2") -shader_parameter/gunk_normal_map = SubResource("NoiseTexture3D_fk1xc") -shader_parameter/jitter_magnitude = 0.0 -shader_parameter/jitter_time_scale = 0.1 -shader_parameter/vertex_inflation = 0.0 -shader_parameter/inflation_pixellation = 10.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_6nvhk"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("5_1njh5") -shader_parameter/color_1 = Color(0, 0.03, 0.1, 1) -shader_parameter/color_2 = Color(0, 0.1, 0.3, 1) -shader_parameter/emission_color = Color(0.25, 0.88, 1, 1) -shader_parameter/pixellation = 128.0 -shader_parameter/time_pixellation = 30.0 -shader_parameter/roughness = 0.15 -shader_parameter/specular_contribution = 0.8 -shader_parameter/emission_strength = 0.02 -shader_parameter/uv_scale = Vector2(2, 2) -shader_parameter/time_scale = 0.2 -shader_parameter/edge_bleed = 0.25 -shader_parameter/gunk_mask = SubResource("CompressedTexture2D_hrvvi") -shader_parameter/gunk_noise = SubResource("NoiseTexture3D_2roq2") -shader_parameter/gunk_normal_map = SubResource("NoiseTexture3D_fk1xc") -shader_parameter/jitter_magnitude = 0.0 -shader_parameter/jitter_time_scale = 0.1 -shader_parameter/vertex_inflation = 0.0 -shader_parameter/inflation_pixellation = 10.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_54end"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("5_1njh5") -shader_parameter/color_1 = Color(0, 0.03, 0.1, 1) -shader_parameter/color_2 = Color(0, 0.1, 0.3, 1) -shader_parameter/emission_color = Color(0.25, 0.88, 1, 1) -shader_parameter/pixellation = 128.0 -shader_parameter/time_pixellation = 30.0 -shader_parameter/roughness = 0.15 -shader_parameter/specular_contribution = 0.8 -shader_parameter/emission_strength = 0.02 -shader_parameter/uv_scale = Vector2(2, 2) -shader_parameter/time_scale = 0.2 -shader_parameter/edge_bleed = 0.25 -shader_parameter/gunk_mask = SubResource("CompressedTexture2D_hrvvi") -shader_parameter/gunk_noise = SubResource("NoiseTexture3D_2roq2") -shader_parameter/gunk_normal_map = SubResource("NoiseTexture3D_fk1xc") -shader_parameter/jitter_magnitude = 0.0 -shader_parameter/jitter_time_scale = 0.1 -shader_parameter/vertex_inflation = 0.0 -shader_parameter/inflation_pixellation = 10.0 - [sub_resource type="ShaderMaterial" id="ShaderMaterial_f0xh4"] resource_local_to_scene = true render_priority = 0 @@ -1041,7 +949,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27, 0, -53) [node name="Walls" type="Node3D" parent="MessHall"] [node name="Wall" parent="MessHall/Walls" instance=ExtResource("2_2egij")] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 3, 1.5, -8.5) +transform = Transform3D(-1, 8.74228e-08, -3.82137e-15, 0, -4.37114e-08, -1, -8.74228e-08, -1, 4.37114e-08, 3, 1.5, 9.5) mask_dim = 64 source_gunk_material = SubResource("ShaderMaterial_lfacn") @@ -1052,9 +960,9 @@ mesh = ExtResource("29_35kna") shape = SubResource("ConcavePolygonShape3D_p11ap") [node name="Wall2" parent="MessHall/Walls" instance=ExtResource("2_2egij")] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 1.5, -8.5) +transform = Transform3D(-4.37114e-08, -1, 4.37114e-08, 0, -4.37114e-08, -1, 1, -4.37114e-08, 1.91069e-15, 4.5, 1.5, 8) mask_dim = 64 -source_gunk_material = SubResource("ShaderMaterial_nmnkj") +source_gunk_material = SubResource("ShaderMaterial_lfacn") [node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall2"] mesh = ExtResource("29_35kna") @@ -1063,9 +971,9 @@ mesh = ExtResource("29_35kna") shape = SubResource("ConcavePolygonShape3D_p11ap") [node name="Wall3" parent="MessHall/Walls" instance=ExtResource("2_2egij")] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, -3, 1.5, -8.5) +transform = Transform3D(-4.37114e-08, -1, 4.37114e-08, 0, -4.37114e-08, -1, 1, -4.37114e-08, 1.91069e-15, 4.5, 1.5, 5) mask_dim = 64 -source_gunk_material = SubResource("ShaderMaterial_62grt") +source_gunk_material = SubResource("ShaderMaterial_lfacn") [node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall3"] mesh = ExtResource("29_35kna") @@ -1074,9 +982,9 @@ mesh = ExtResource("29_35kna") shape = SubResource("ConcavePolygonShape3D_p11ap") [node name="Wall4" parent="MessHall/Walls" instance=ExtResource("2_2egij")] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, -6, 1.5, -8.5) +transform = Transform3D(-4.37114e-08, -1, 4.37114e-08, 0, -4.37114e-08, -1, 1, -4.37114e-08, 1.91069e-15, 4.5, 1.5, 2) mask_dim = 64 -source_gunk_material = SubResource("ShaderMaterial_6nvhk") +source_gunk_material = SubResource("ShaderMaterial_lfacn") [node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall4"] mesh = ExtResource("29_35kna") @@ -1085,9 +993,9 @@ mesh = ExtResource("29_35kna") shape = SubResource("ConcavePolygonShape3D_p11ap") [node name="Wall5" parent="MessHall/Walls" instance=ExtResource("2_2egij")] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, -12, 1.5, -8.5) +transform = Transform3D(-4.37114e-08, -1, 4.37114e-08, 0, -4.37114e-08, -1, 1, -4.37114e-08, 1.91069e-15, 4.5, 1.5, -1) mask_dim = 64 -source_gunk_material = SubResource("ShaderMaterial_54end") +source_gunk_material = SubResource("ShaderMaterial_lfacn") [node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall5"] mesh = ExtResource("29_35kna") @@ -1095,6 +1003,204 @@ mesh = ExtResource("29_35kna") [node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall5"] shape = SubResource("ConcavePolygonShape3D_p11ap") +[node name="Wall6" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(-4.37114e-08, -1, 4.37114e-08, 0, -4.37114e-08, -1, 1, -4.37114e-08, 1.91069e-15, 4.5, 1.5, -4) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall6"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall6"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall7" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(-4.37114e-08, -1, 4.37114e-08, 0, -4.37114e-08, -1, 1, -4.37114e-08, 1.91069e-15, 4.5, 1.5, -7) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall7"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall7"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall8" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 3, 1.5, -8.5) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall8"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall8"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall9" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 1.5, -8.5) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall9"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall9"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall10" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, -3, 1.5, -8.5) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall10"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall10"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall11" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, -6, 1.5, -8.5) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall11"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall11"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall12" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, -9, 1.5, -8.5) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall12"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall12"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall13" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, -12, 1.5, -8.5) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall13"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall13"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall14" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(-4.37114e-08, 1, -4.37114e-08, 0, -4.37114e-08, -1, -1, -4.37114e-08, 1.91069e-15, -13.5, 1.5, -7) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall14"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall14"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall15" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(-4.37114e-08, 1, -4.37114e-08, 0, -4.37114e-08, -1, -1, -4.37114e-08, 1.91069e-15, -13.5, 1.5, -4) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall15"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall15"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall16" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(-4.37114e-08, 1, -4.37114e-08, 0, -4.37114e-08, -1, -1, -4.37114e-08, 1.91069e-15, -13.5, 1.5, -1) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall16"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall16"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall17" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(-4.37114e-08, 1, -4.37114e-08, 0, -4.37114e-08, -1, -1, -4.37114e-08, 1.91069e-15, -13.5, 1.5, 2) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall17"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall17"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall18" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(-4.37114e-08, 1, -4.37114e-08, 0, -4.37114e-08, -1, -1, -4.37114e-08, 1.91069e-15, -13.5, 1.5, 5) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall18"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall18"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall19" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(-4.37114e-08, 1, -4.37114e-08, 0, -4.37114e-08, -1, -1, -4.37114e-08, 1.91069e-15, -13.5, 1.5, 8) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall19"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall19"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall20" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(-1, -8.74228e-08, 3.82137e-15, 0, -4.37114e-08, -1, 8.74228e-08, -1, 4.37114e-08, -12, 1.5, 9.5) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall20"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall20"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall21" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(-1, -8.74228e-08, 3.82137e-15, 0, -4.37114e-08, -1, 8.74228e-08, -1, 4.37114e-08, -9, 1.5, 9.5) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall21"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall21"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall22" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(-1, -8.74228e-08, 3.82137e-15, 0, -4.37114e-08, -1, 8.74228e-08, -1, 4.37114e-08, -6, 1.5, 9.5) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall22"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall22"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + +[node name="Wall23" parent="MessHall/Walls" instance=ExtResource("2_2egij")] +transform = Transform3D(-1, -8.74228e-08, 3.82137e-15, 0, -4.37114e-08, -1, 8.74228e-08, -1, 4.37114e-08, -3, 1.5, 9.5) +mask_dim = 64 +source_gunk_material = SubResource("ShaderMaterial_lfacn") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MessHall/Walls/Wall23"] +mesh = ExtResource("29_35kna") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MessHall/Walls/Wall23"] +shape = SubResource("ConcavePolygonShape3D_p11ap") + [node name="Floors" type="Node3D" parent="MessHall"] [node name="Floor" parent="MessHall/Floors" instance=ExtResource("2_2egij")]