diff --git a/asset_dev/level/hallway/hallway.blend b/asset_dev/level/hallway/hallway.blend index 2f9683d..f1ef9dd 100644 Binary files a/asset_dev/level/hallway/hallway.blend and b/asset_dev/level/hallway/hallway.blend differ diff --git a/asset_dev/level/hallway/hallway.blend1 b/asset_dev/level/hallway/hallway.blend1 index fddd1dd..c5376be 100644 Binary files a/asset_dev/level/hallway/hallway.blend1 and b/asset_dev/level/hallway/hallway.blend1 differ diff --git a/asset_dev/level/hallway/hallway_1.ubpd b/asset_dev/level/hallway/hallway_1.ubpd index 30ca3ea..1def6a5 100644 Binary files a/asset_dev/level/hallway/hallway_1.ubpd and b/asset_dev/level/hallway/hallway_1.ubpd differ diff --git a/asset_dev/level/hallway/hallway_2.ubpd b/asset_dev/level/hallway/hallway_2.ubpd index 640619d..9a220ae 100644 Binary files a/asset_dev/level/hallway/hallway_2.ubpd and b/asset_dev/level/hallway/hallway_2.ubpd differ diff --git a/asset_dev/level/hallway/hallway_3.ubpd b/asset_dev/level/hallway/hallway_3.ubpd index e8469a1..4dec58d 100644 Binary files a/asset_dev/level/hallway/hallway_3.ubpd and b/asset_dev/level/hallway/hallway_3.ubpd differ diff --git a/asset_dev/level/hallway_old/hallway.blend b/asset_dev/level/hallway_old/hallway.blend new file mode 100644 index 0000000..2f9683d Binary files /dev/null and b/asset_dev/level/hallway_old/hallway.blend differ diff --git a/asset_dev/level/hallway_old/hallway.blend1 b/asset_dev/level/hallway_old/hallway.blend1 new file mode 100644 index 0000000..fddd1dd Binary files /dev/null and b/asset_dev/level/hallway_old/hallway.blend1 differ diff --git a/asset_dev/level/hallway/hallway.mtl b/asset_dev/level/hallway_old/hallway.mtl similarity index 100% rename from asset_dev/level/hallway/hallway.mtl rename to asset_dev/level/hallway_old/hallway.mtl diff --git a/asset_dev/level/hallway/hallway.obj b/asset_dev/level/hallway_old/hallway.obj similarity index 100% rename from asset_dev/level/hallway/hallway.obj rename to asset_dev/level/hallway_old/hallway.obj diff --git a/asset_dev/level/hallway_old/hallway_1.ubpd b/asset_dev/level/hallway_old/hallway_1.ubpd new file mode 100644 index 0000000..30ca3ea Binary files /dev/null and b/asset_dev/level/hallway_old/hallway_1.ubpd differ diff --git a/asset_dev/level/hallway/hallway_1_C.png b/asset_dev/level/hallway_old/hallway_1_C.png similarity index 100% rename from asset_dev/level/hallway/hallway_1_C.png rename to asset_dev/level/hallway_old/hallway_1_C.png diff --git a/asset_dev/level/hallway/hallway_1_E.png b/asset_dev/level/hallway_old/hallway_1_E.png similarity index 100% rename from asset_dev/level/hallway/hallway_1_E.png rename to asset_dev/level/hallway_old/hallway_1_E.png diff --git a/asset_dev/level/hallway/hallway_1_M.png b/asset_dev/level/hallway_old/hallway_1_M.png similarity index 100% rename from asset_dev/level/hallway/hallway_1_M.png rename to asset_dev/level/hallway_old/hallway_1_M.png diff --git a/asset_dev/level/hallway/hallway_1_N.png b/asset_dev/level/hallway_old/hallway_1_N.png similarity index 100% rename from asset_dev/level/hallway/hallway_1_N.png rename to asset_dev/level/hallway_old/hallway_1_N.png diff --git a/asset_dev/level/hallway/hallway_1_R.png b/asset_dev/level/hallway_old/hallway_1_R.png similarity index 100% rename from asset_dev/level/hallway/hallway_1_R.png rename to asset_dev/level/hallway_old/hallway_1_R.png diff --git a/asset_dev/level/hallway_old/hallway_2.ubpd b/asset_dev/level/hallway_old/hallway_2.ubpd new file mode 100644 index 0000000..640619d Binary files /dev/null and b/asset_dev/level/hallway_old/hallway_2.ubpd differ diff --git a/asset_dev/level/hallway/hallway_2_C.png b/asset_dev/level/hallway_old/hallway_2_C.png similarity index 100% rename from asset_dev/level/hallway/hallway_2_C.png rename to asset_dev/level/hallway_old/hallway_2_C.png diff --git a/asset_dev/level/hallway/hallway_2_E.png b/asset_dev/level/hallway_old/hallway_2_E.png similarity index 100% rename from asset_dev/level/hallway/hallway_2_E.png rename to asset_dev/level/hallway_old/hallway_2_E.png diff --git a/asset_dev/level/hallway/hallway_2_M.png b/asset_dev/level/hallway_old/hallway_2_M.png similarity index 100% rename from asset_dev/level/hallway/hallway_2_M.png rename to asset_dev/level/hallway_old/hallway_2_M.png diff --git a/asset_dev/level/hallway/hallway_2_N.png b/asset_dev/level/hallway_old/hallway_2_N.png similarity index 100% rename from asset_dev/level/hallway/hallway_2_N.png rename to asset_dev/level/hallway_old/hallway_2_N.png diff --git a/asset_dev/level/hallway/hallway_2_R.png b/asset_dev/level/hallway_old/hallway_2_R.png similarity index 100% rename from asset_dev/level/hallway/hallway_2_R.png rename to asset_dev/level/hallway_old/hallway_2_R.png diff --git a/asset_dev/level/hallway_old/hallway_3.ubpd b/asset_dev/level/hallway_old/hallway_3.ubpd new file mode 100644 index 0000000..e8469a1 Binary files /dev/null and b/asset_dev/level/hallway_old/hallway_3.ubpd differ diff --git a/asset_dev/level/hallway/hallway_3_C.png b/asset_dev/level/hallway_old/hallway_3_C.png similarity index 100% rename from asset_dev/level/hallway/hallway_3_C.png rename to asset_dev/level/hallway_old/hallway_3_C.png diff --git a/asset_dev/level/hallway/hallway_3_E.png b/asset_dev/level/hallway_old/hallway_3_E.png similarity index 100% rename from asset_dev/level/hallway/hallway_3_E.png rename to asset_dev/level/hallway_old/hallway_3_E.png diff --git a/asset_dev/level/hallway/hallway_3_M.png b/asset_dev/level/hallway_old/hallway_3_M.png similarity index 100% rename from asset_dev/level/hallway/hallway_3_M.png rename to asset_dev/level/hallway_old/hallway_3_M.png diff --git a/asset_dev/level/hallway/hallway_3_N.png b/asset_dev/level/hallway_old/hallway_3_N.png similarity index 100% rename from asset_dev/level/hallway/hallway_3_N.png rename to asset_dev/level/hallway_old/hallway_3_N.png diff --git a/asset_dev/level/hallway/hallway_3_R.png b/asset_dev/level/hallway_old/hallway_3_R.png similarity index 100% rename from asset_dev/level/hallway/hallway_3_R.png rename to asset_dev/level/hallway_old/hallway_3_R.png diff --git a/assets/level/ceiling/ceiling_1.mesh b/assets/level/ceiling/ceiling_1.mesh new file mode 100644 index 0000000..2c1292e Binary files /dev/null and b/assets/level/ceiling/ceiling_1.mesh differ diff --git a/assets/level/ceiling/ceiling_1.tres b/assets/level/ceiling/ceiling_1.tres deleted file mode 100644 index f65ae14..0000000 --- a/assets/level/ceiling/ceiling_1.tres +++ /dev/null @@ -1,15 +0,0 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://bkwfat6ltd7a7"] - -[ext_resource type="Texture2D" uid="uid://ddjth5slpjrcd" path="res://assets/level/ceiling/ceiling_1_C.png" id="1_6xwl4"] -[ext_resource type="Texture2D" uid="uid://bs1fx1h0tddde" path="res://assets/level/ceiling/ceiling_1_M.png" id="2_ufahw"] -[ext_resource type="Texture2D" uid="uid://bmwmajwul60ti" path="res://assets/level/ceiling/ceiling_1_N.png" id="3_lgwht"] -[ext_resource type="Texture2D" uid="uid://8hav47a84uk" path="res://assets/level/ceiling/ceiling_1_R.png" id="4_ua8nl"] - -[resource] -albedo_texture = ExtResource("1_6xwl4") -metallic = 1.0 -metallic_texture = ExtResource("2_ufahw") -roughness_texture = ExtResource("4_ua8nl") -normal_enabled = true -normal_texture = ExtResource("3_lgwht") -texture_filter = 4 diff --git a/assets/level/ceiling/ceiling_2.mesh b/assets/level/ceiling/ceiling_2.mesh new file mode 100644 index 0000000..18815ea Binary files /dev/null and b/assets/level/ceiling/ceiling_2.mesh differ diff --git a/assets/level/ceiling/ceiling_2.tres b/assets/level/ceiling/ceiling_2.tres deleted file mode 100644 index d026760..0000000 --- a/assets/level/ceiling/ceiling_2.tres +++ /dev/null @@ -1,15 +0,0 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://cxudbowc3a5hy"] - -[ext_resource type="Texture2D" uid="uid://0pya3or7iijm" path="res://assets/level/ceiling/ceiling_2_C.png" id="1_a4ot2"] -[ext_resource type="Texture2D" uid="uid://ikj0y0eguv4v" path="res://assets/level/ceiling/ceiling_2_M.png" id="2_uvugs"] -[ext_resource type="Texture2D" uid="uid://ee1hbwx0apn2" path="res://assets/level/ceiling/ceiling_2_N.png" id="3_ay65r"] -[ext_resource type="Texture2D" uid="uid://13a0iuldch08" path="res://assets/level/ceiling/ceiling_2_R.png" id="4_60sbj"] - -[resource] -albedo_texture = ExtResource("1_a4ot2") -metallic = 1.0 -metallic_texture = ExtResource("2_uvugs") -roughness_texture = ExtResource("4_60sbj") -normal_enabled = true -normal_texture = ExtResource("3_ay65r") -texture_filter = 4 diff --git a/assets/level/floor/floor_1.mesh b/assets/level/floor/floor_1.mesh new file mode 100644 index 0000000..09f2687 Binary files /dev/null and b/assets/level/floor/floor_1.mesh differ diff --git a/assets/level/floor/floor_1.tres b/assets/level/floor/floor_1.tres deleted file mode 100644 index ac2495c..0000000 --- a/assets/level/floor/floor_1.tres +++ /dev/null @@ -1,15 +0,0 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://cdsodbp7rbvip"] - -[ext_resource type="Texture2D" uid="uid://c0a6flcoixsr2" path="res://assets/level/floor/floor_1_C.png" id="1_ojqhw"] -[ext_resource type="Texture2D" uid="uid://dxuxhlycaamcy" path="res://assets/level/floor/floor_1_M.png" id="2_510ks"] -[ext_resource type="Texture2D" uid="uid://bgc8oqsnimb8i" path="res://assets/level/floor/floor_1_N.png" id="3_hn748"] -[ext_resource type="Texture2D" uid="uid://23uupxc78b8n" path="res://assets/level/floor/floor_1_R.png" id="4_maf82"] - -[resource] -albedo_texture = ExtResource("1_ojqhw") -metallic = 1.0 -metallic_texture = ExtResource("2_510ks") -roughness_texture = ExtResource("4_maf82") -normal_enabled = true -normal_texture = ExtResource("3_hn748") -texture_filter = 4 diff --git a/assets/level/floor/floor_2.mesh b/assets/level/floor/floor_2.mesh new file mode 100644 index 0000000..fd0f857 Binary files /dev/null and b/assets/level/floor/floor_2.mesh differ diff --git a/assets/level/floor/floor_2.tres b/assets/level/floor/floor_2.tres deleted file mode 100644 index 3313c71..0000000 --- a/assets/level/floor/floor_2.tres +++ /dev/null @@ -1,15 +0,0 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://phmrg5c5ls4i"] - -[ext_resource type="Texture2D" uid="uid://ddxs8ktw6xxnp" path="res://assets/level/floor/floor_2_C.png" id="1_dfdp7"] -[ext_resource type="Texture2D" uid="uid://cxbw8ey4o4bey" path="res://assets/level/floor/floor_2_M.png" id="2_qgw8x"] -[ext_resource type="Texture2D" uid="uid://crsiwxpj7d4t5" path="res://assets/level/floor/floor_2_N.png" id="3_f6uky"] -[ext_resource type="Texture2D" uid="uid://43ty70xfua4i" path="res://assets/level/floor/floor_2_R.png" id="4_0wfia"] - -[resource] -albedo_texture = ExtResource("1_dfdp7") -metallic = 1.0 -metallic_texture = ExtResource("2_qgw8x") -roughness_texture = ExtResource("4_0wfia") -normal_enabled = true -normal_texture = ExtResource("3_f6uky") -texture_filter = 4 diff --git a/assets/level/hallway/hallway.mtl b/assets/level/hallway/hallway.mtl new file mode 100644 index 0000000..e6d1a16 --- /dev/null +++ b/assets/level/hallway/hallway.mtl @@ -0,0 +1,2 @@ +# Blender 4.3.2 MTL File: 'hallway.blend' +# www.blender.org diff --git a/assets/level/hallway/hallway.obj b/assets/level/hallway/hallway.obj index e87e8ce..5e3fbe4 100644 --- a/assets/level/hallway/hallway.obj +++ b/assets/level/hallway/hallway.obj @@ -2,36 +2,30 @@ # www.blender.org mtllib hallway.mtl o Cube -v -2.000000 -2.000000 2.000000 -v -2.000000 2.000000 2.000000 -v -2.000000 -2.000000 -2.000000 -v -2.000000 2.000000 -2.000000 -v 2.000000 -2.000000 2.000000 -v 2.000000 2.000000 2.000000 -v 2.000000 -2.000000 -2.000000 -v 2.000000 2.000000 -2.000000 -vn -0.0000 -0.0000 1.0000 -vn -0.0000 -0.0000 -1.0000 +v -2.000000 0.000000 8.000000 +v -2.000000 4.000000 8.000000 +v -2.000000 0.000000 -8.000000 +v -2.000000 4.000000 -8.000000 +v 2.000000 0.000000 8.000000 +v 2.000000 4.000000 8.000000 +v 2.000000 0.000000 -8.000000 +v 2.000000 4.000000 -8.000000 +vn 1.0000 -0.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 vn -0.0000 1.0000 -0.0000 vn -0.0000 -1.0000 -0.0000 -vt 0.500000 0.000000 -vt 0.500000 0.500000 -vt 0.000000 0.500000 -vt 0.000000 0.000000 -vt 0.500000 0.500000 -vt 0.500000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.500000 vt 1.000000 0.500000 -vt 0.500000 0.500000 -vt 0.500000 0.000000 -vt 1.000000 0.000000 +vt 0.000000 0.500000 +vt 0.000000 0.250000 +vt 1.000000 0.250000 +vt 0.000000 0.750000 +vt 1.000000 0.750000 vt 1.000000 1.000000 -vt 0.500000 1.000000 -vt 0.500000 0.500000 -vt 1.000000 0.500000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 s 0 -f 3/1/1 7/2/1 8/3/1 4/4/1 -f 5/5/2 1/6/2 2/7/2 6/8/2 -f 3/9/3 1/10/3 5/11/3 7/12/3 -f 8/13/4 6/14/4 2/15/4 4/16/4 +f 1/1/1 3/2/1 4/3/1 2/4/1 +f 7/5/2 5/6/2 6/7/2 8/8/2 +f 3/2/3 1/1/3 5/6/3 7/5/3 +f 8/9/4 6/10/4 2/4/4 4/3/4 diff --git a/assets/level/hallway/hallway.obj.import b/assets/level/hallway/hallway.obj.import index d9917e5..9fbaad9 100644 --- a/assets/level/hallway/hallway.obj.import +++ b/assets/level/hallway/hallway.obj.import @@ -3,7 +3,7 @@ importer="wavefront_obj" importer_version=1 type="Mesh" -uid="uid://bj6v5kgn4of2t" +uid="uid://plyi1ewg6iud" path="res://.godot/imported/hallway.obj-c2558675b5331fb5d31769915011b0c9.mesh" [deps] diff --git a/assets/level/hallway/hallway_1_C.png b/assets/level/hallway/hallway_1_C.png index df2626d..509fcfd 100644 --- a/assets/level/hallway/hallway_1_C.png +++ b/assets/level/hallway/hallway_1_C.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f764951a046792f8fcc30ae5c7e3522ff8da26fcdf75ccc07e83fd6f630118f0 -size 407 +oid sha256:e81d9b4ced3b1fedf2c0824d9462a52bebdcf6b638c36d20b2c22080cb21f423 +size 13628 diff --git a/assets/level/hallway/hallway_1_C.png.import b/assets/level/hallway/hallway_1_C.png.import index 06f1d6d..999b166 100644 --- a/assets/level/hallway/hallway_1_C.png.import +++ b/assets/level/hallway/hallway_1_C.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cj5em70wq1l6f" +uid="uid://bniqwnr66mvwa" path="res://.godot/imported/hallway_1_C.png-9a126edbc39655070332e0af1a5ee780.ctex" metadata={ "vram_texture": false diff --git a/assets/level/hallway/hallway_1_E.png b/assets/level/hallway/hallway_1_E.png deleted file mode 100644 index e09ec71..0000000 --- a/assets/level/hallway/hallway_1_E.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e719f6b6d1ee106d09bc8c4306a6ffb960435b25d30d0c08ce5cf6febab9f821 -size 220 diff --git a/assets/level/hallway/hallway_1_E.png.import b/assets/level/hallway/hallway_1_E.png.import deleted file mode 100644 index b46e49a..0000000 --- a/assets/level/hallway/hallway_1_E.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bi87m5noufg5h" -path="res://.godot/imported/hallway_1_E.png-6ecbafa7ad140eb5c3224e031759ac7c.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/level/hallway/hallway_1_E.png" -dest_files=["res://.godot/imported/hallway_1_E.png-6ecbafa7ad140eb5c3224e031759ac7c.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 diff --git a/assets/level/hallway/hallway_1_M.png b/assets/level/hallway/hallway_1_M.png index bf1c194..c58e562 100644 --- a/assets/level/hallway/hallway_1_M.png +++ b/assets/level/hallway/hallway_1_M.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fea94e7172a2a4e6e2816ae0c173b4cbed12bf50c8fea974111d8489d8478e5 -size 232 +oid sha256:b01c1b1f0a60e78b282d7b1b0b47e7af9719b82c4e531830c41594b225ffd515 +size 8794 diff --git a/assets/level/hallway/hallway_1_M.png.import b/assets/level/hallway/hallway_1_M.png.import index 0d440b2..a427ef7 100644 --- a/assets/level/hallway/hallway_1_M.png.import +++ b/assets/level/hallway/hallway_1_M.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c6ublhoexsuk" +uid="uid://ct2hoo0g0q6im" path="res://.godot/imported/hallway_1_M.png-b3c5e22318ae1f3d03aaa8c1818762f7.ctex" metadata={ "vram_texture": false diff --git a/assets/level/hallway/hallway_1_N.png b/assets/level/hallway/hallway_1_N.png index 8336d0c..de70337 100644 --- a/assets/level/hallway/hallway_1_N.png +++ b/assets/level/hallway/hallway_1_N.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c707be48aec80380a6783e3123ec2661b1b9951d268a88dc8d8a74c335a55c02 -size 634 +oid sha256:47a0ceb8a0c76342acce29cf5687999036c2d98b864540b9eec0dfae4351afe9 +size 11431 diff --git a/assets/level/hallway/hallway_1_N.png.import b/assets/level/hallway/hallway_1_N.png.import index 0032ec4..9d1ce80 100644 --- a/assets/level/hallway/hallway_1_N.png.import +++ b/assets/level/hallway/hallway_1_N.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dtp6ctfi5l4v8" +uid="uid://db8cbo7abqvku" path="res://.godot/imported/hallway_1_N.png-51db985672dd9b41c5fc36f4a085de59.ctex" metadata={ "vram_texture": false diff --git a/assets/level/hallway/hallway_1_R.png b/assets/level/hallway/hallway_1_R.png index 5d8144c..d42ff2c 100644 --- a/assets/level/hallway/hallway_1_R.png +++ b/assets/level/hallway/hallway_1_R.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe0b02f34da53fc2512d680183644be2e005aaf25ebdfb2f6b4e982bbff3c216 -size 338 +oid sha256:37ccf42eca0a0ba89c78194080614c41a3d91e0316ee426ad4900f9a9474302c +size 9753 diff --git a/assets/level/hallway/hallway_1_R.png.import b/assets/level/hallway/hallway_1_R.png.import index d638f96..d285104 100644 --- a/assets/level/hallway/hallway_1_R.png.import +++ b/assets/level/hallway/hallway_1_R.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://5ua6bne0btou" +uid="uid://c1hiafyeu4fyj" path="res://.godot/imported/hallway_1_R.png-9be1c4defb83d9d71353c85d69b7912b.ctex" metadata={ "vram_texture": false diff --git a/assets/level/hallway/hallway_2_C.png b/assets/level/hallway/hallway_2_C.png index ff6596b..cc29d2f 100644 --- a/assets/level/hallway/hallway_2_C.png +++ b/assets/level/hallway/hallway_2_C.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42471c1271979b20fbc707b4652f1c362c2ebe451cf0ec9c2b4e259e182dc452 -size 429 +oid sha256:345af37e06d181131af89e9832cb118ed5f0864a8cba02f4954f74341b0452ba +size 15259 diff --git a/assets/level/hallway/hallway_2_C.png.import b/assets/level/hallway/hallway_2_C.png.import index e12162d..157e369 100644 --- a/assets/level/hallway/hallway_2_C.png.import +++ b/assets/level/hallway/hallway_2_C.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c3yo0fiux7uvl" +uid="uid://bedeo3iu8y8uu" path="res://.godot/imported/hallway_2_C.png-368e035781dbfc292f80210e8377e1f9.ctex" metadata={ "vram_texture": false @@ -21,7 +21,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +31,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=0 +detect_3d/compress_to=1 diff --git a/assets/level/hallway/hallway_2_E.png b/assets/level/hallway/hallway_2_E.png deleted file mode 100644 index e09ec71..0000000 --- a/assets/level/hallway/hallway_2_E.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e719f6b6d1ee106d09bc8c4306a6ffb960435b25d30d0c08ce5cf6febab9f821 -size 220 diff --git a/assets/level/hallway/hallway_2_E.png.import b/assets/level/hallway/hallway_2_E.png.import deleted file mode 100644 index f3b7a07..0000000 --- a/assets/level/hallway/hallway_2_E.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://blicao0n4875s" -path="res://.godot/imported/hallway_2_E.png-d7d6ba060d0d323809edfb662bdb2b4a.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/level/hallway/hallway_2_E.png" -dest_files=["res://.godot/imported/hallway_2_E.png-d7d6ba060d0d323809edfb662bdb2b4a.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 diff --git a/assets/level/hallway/hallway_2_M.png b/assets/level/hallway/hallway_2_M.png index bf1c194..c00c56b 100644 --- a/assets/level/hallway/hallway_2_M.png +++ b/assets/level/hallway/hallway_2_M.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fea94e7172a2a4e6e2816ae0c173b4cbed12bf50c8fea974111d8489d8478e5 -size 232 +oid sha256:741c7493a4fba60d02e81567a2d59c124f6de635781a68f60278e42b7338837c +size 10437 diff --git a/assets/level/hallway/hallway_2_M.png.import b/assets/level/hallway/hallway_2_M.png.import index 7635736..6f91b99 100644 --- a/assets/level/hallway/hallway_2_M.png.import +++ b/assets/level/hallway/hallway_2_M.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://crge5t3vivfhn" +uid="uid://nyomo122xjor" path="res://.godot/imported/hallway_2_M.png-f213557d859a0fe7aab8242b25a4a2c0.ctex" metadata={ "vram_texture": false @@ -21,7 +21,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +31,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=0 +detect_3d/compress_to=1 diff --git a/assets/level/hallway/hallway_2_N.png b/assets/level/hallway/hallway_2_N.png index 4738c70..8318c35 100644 --- a/assets/level/hallway/hallway_2_N.png +++ b/assets/level/hallway/hallway_2_N.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82d16b66b90d864790da6313780ab92aa0c73dc7f49af9cc3787ec890ba06965 -size 634 +oid sha256:028447924b3dddc7bf70907cdebce1ff1de6f71c9173605115d9c5946f4d3d4f +size 14880 diff --git a/assets/level/hallway/hallway_2_N.png.import b/assets/level/hallway/hallway_2_N.png.import index 2ca5dfb..236d5cc 100644 --- a/assets/level/hallway/hallway_2_N.png.import +++ b/assets/level/hallway/hallway_2_N.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://d3eaofj7ntddk" +uid="uid://b8g8a2llqyl1k" path="res://.godot/imported/hallway_2_N.png-6d22130ff0aeb6510ae322aebc31a58e.ctex" metadata={ "vram_texture": false @@ -19,16 +19,16 @@ compress/mode=0 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=1 +compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 -roughness/mode=1 -roughness/src_normal="res://assets/level/hallway/hallway_2_N.png" +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=0 +detect_3d/compress_to=1 diff --git a/assets/level/hallway/hallway_2_R.png b/assets/level/hallway/hallway_2_R.png index e936ce8..b6e6408 100644 --- a/assets/level/hallway/hallway_2_R.png +++ b/assets/level/hallway/hallway_2_R.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d778c5f82cd14edb3f9716ae414ed1c187b9285370818c2d0aebb2bf522474b3 -size 359 +oid sha256:eac9874a11d251c93b6fda56e234c452d23801a52667c4b785f7af1527b05682 +size 11228 diff --git a/assets/level/hallway/hallway_2_R.png.import b/assets/level/hallway/hallway_2_R.png.import index acd8f49..b613aa3 100644 --- a/assets/level/hallway/hallway_2_R.png.import +++ b/assets/level/hallway/hallway_2_R.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dxy4wicwjb38a" +uid="uid://dxfpaks61d1nl" path="res://.godot/imported/hallway_2_R.png-e22266e6db52a2c329569fdae3b64571.ctex" metadata={ "vram_texture": false @@ -21,7 +21,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +31,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=0 +detect_3d/compress_to=1 diff --git a/assets/level/hallway/hallway_3_C.png b/assets/level/hallway/hallway_3_C.png index 0e4df58..efb6ef0 100644 --- a/assets/level/hallway/hallway_3_C.png +++ b/assets/level/hallway/hallway_3_C.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ddd9a159542c553542cb50e584da99828bf74b1c8e25598ea5221ab8ea282fd -size 464 +oid sha256:817b3557e93c0c458c8f86371b8756d46148e5222860041b7d823d711c355e2d +size 14939 diff --git a/assets/level/hallway/hallway_3_C.png.import b/assets/level/hallway/hallway_3_C.png.import index fbeaa25..0e986c5 100644 --- a/assets/level/hallway/hallway_3_C.png.import +++ b/assets/level/hallway/hallway_3_C.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c60foyohyjlj8" +uid="uid://bs48peduua74x" path="res://.godot/imported/hallway_3_C.png-9b45a5b023d4947b4c559574fc3e621c.ctex" metadata={ "vram_texture": false @@ -21,7 +21,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +31,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=0 +detect_3d/compress_to=1 diff --git a/assets/level/hallway/hallway_3_E.png b/assets/level/hallway/hallway_3_E.png deleted file mode 100644 index e09ec71..0000000 --- a/assets/level/hallway/hallway_3_E.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e719f6b6d1ee106d09bc8c4306a6ffb960435b25d30d0c08ce5cf6febab9f821 -size 220 diff --git a/assets/level/hallway/hallway_3_E.png.import b/assets/level/hallway/hallway_3_E.png.import deleted file mode 100644 index 630d1ca..0000000 --- a/assets/level/hallway/hallway_3_E.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cjdkxbs8uwkh6" -path="res://.godot/imported/hallway_3_E.png-f2cf0e0a896e85dd3fdd9f5077a7e45a.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/level/hallway/hallway_3_E.png" -dest_files=["res://.godot/imported/hallway_3_E.png-f2cf0e0a896e85dd3fdd9f5077a7e45a.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 diff --git a/assets/level/hallway/hallway_3_M.png b/assets/level/hallway/hallway_3_M.png index bf1c194..c58e562 100644 --- a/assets/level/hallway/hallway_3_M.png +++ b/assets/level/hallway/hallway_3_M.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fea94e7172a2a4e6e2816ae0c173b4cbed12bf50c8fea974111d8489d8478e5 -size 232 +oid sha256:b01c1b1f0a60e78b282d7b1b0b47e7af9719b82c4e531830c41594b225ffd515 +size 8794 diff --git a/assets/level/hallway/hallway_3_M.png.import b/assets/level/hallway/hallway_3_M.png.import index 1dff06e..31fd737 100644 --- a/assets/level/hallway/hallway_3_M.png.import +++ b/assets/level/hallway/hallway_3_M.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dht2my8tw3hl7" +uid="uid://db56q82xtg4fo" path="res://.godot/imported/hallway_3_M.png-6d432a7e82e31420f6671047ebc348f7.ctex" metadata={ "vram_texture": false @@ -21,7 +21,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +31,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=0 +detect_3d/compress_to=1 diff --git a/assets/level/hallway/hallway_3_N.png b/assets/level/hallway/hallway_3_N.png index 962bda0..2b83503 100644 --- a/assets/level/hallway/hallway_3_N.png +++ b/assets/level/hallway/hallway_3_N.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17edc37c5519a250db8cb23e304ca74baba76efcff936ee4c626c5693e160da1 -size 890 +oid sha256:39be691b820354ce20c2e5ae80da33724ecad10971be6b3316024e78049ebdbc +size 11918 diff --git a/assets/level/hallway/hallway_3_N.png.import b/assets/level/hallway/hallway_3_N.png.import index c096520..0706342 100644 --- a/assets/level/hallway/hallway_3_N.png.import +++ b/assets/level/hallway/hallway_3_N.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b0qjhayccearq" +uid="uid://bxgth5y22ojgo" path="res://.godot/imported/hallway_3_N.png-3a3b90c817ff23ffb14b76803b3c61fc.ctex" metadata={ "vram_texture": false @@ -19,16 +19,16 @@ compress/mode=0 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=1 +compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 -roughness/mode=1 -roughness/src_normal="res://assets/level/hallway/hallway_3_N.png" +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=0 +detect_3d/compress_to=1 diff --git a/assets/level/hallway/hallway_3_R.png b/assets/level/hallway/hallway_3_R.png index 53318f7..3ecaa3a 100644 --- a/assets/level/hallway/hallway_3_R.png +++ b/assets/level/hallway/hallway_3_R.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c401f166663e78d4a8f7c77381cd32f25fe38f9b942f928626fb00c01be9af2 -size 386 +oid sha256:b55bffc26af2fd92d6f8e38a6923b6d03b7d491a405dc4d6141c0d0bbc84a357 +size 9608 diff --git a/assets/level/hallway/hallway_3_R.png.import b/assets/level/hallway/hallway_3_R.png.import index 5707e49..546a61e 100644 --- a/assets/level/hallway/hallway_3_R.png.import +++ b/assets/level/hallway/hallway_3_R.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://ccm4iloi5vyld" +uid="uid://cb7wscyrqxde7" path="res://.godot/imported/hallway_3_R.png-e7b238f537dbeb1347813ad41e0203bb.ctex" metadata={ "vram_texture": false @@ -21,7 +21,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +31,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=0 +detect_3d/compress_to=1 diff --git a/assets/level/wall/wall_1.mesh b/assets/level/wall/wall_1.mesh new file mode 100644 index 0000000..c4f19ec Binary files /dev/null and b/assets/level/wall/wall_1.mesh differ diff --git a/assets/level/wall/wall_1.tres b/assets/level/wall/wall_1.tres deleted file mode 100644 index 028f7e8..0000000 --- a/assets/level/wall/wall_1.tres +++ /dev/null @@ -1,15 +0,0 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://coy3y2u3ujn3u"] - -[ext_resource type="Texture2D" uid="uid://bn4nrclcovuej" path="res://assets/level/wall/wall_1_C.png" id="1_dh271"] -[ext_resource type="Texture2D" uid="uid://da3nqwmiwbu8s" path="res://assets/level/wall/wall_1_M.png" id="2_6cs5k"] -[ext_resource type="Texture2D" uid="uid://bujelwt4b5d0s" path="res://assets/level/wall/wall_1_N.png" id="3_ktesd"] -[ext_resource type="Texture2D" uid="uid://dwi2opqp2s8ak" path="res://assets/level/wall/wall_1_R.png" id="4_hwehc"] - -[resource] -albedo_texture = ExtResource("1_dh271") -metallic = 1.0 -metallic_texture = ExtResource("2_6cs5k") -roughness_texture = ExtResource("4_hwehc") -normal_enabled = true -normal_texture = ExtResource("3_ktesd") -texture_filter = 4 diff --git a/assets/level/wall/wall_2.mesh b/assets/level/wall/wall_2.mesh new file mode 100644 index 0000000..0f42dac Binary files /dev/null and b/assets/level/wall/wall_2.mesh differ diff --git a/assets/level/wall/wall_2.tres b/assets/level/wall/wall_2.tres deleted file mode 100644 index 1f0bcb6..0000000 --- a/assets/level/wall/wall_2.tres +++ /dev/null @@ -1,15 +0,0 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://q1b701b13co6"] - -[ext_resource type="Texture2D" uid="uid://m2qxenym1otw" path="res://assets/level/wall/wall_2_C.png" id="1_5vyxs"] -[ext_resource type="Texture2D" uid="uid://begn6qloo0m1q" path="res://assets/level/wall/wall_2_M.png" id="2_nlwc6"] -[ext_resource type="Texture2D" uid="uid://cpdrvdu3qt62t" path="res://assets/level/wall/wall_2_N.png" id="3_3eofc"] -[ext_resource type="Texture2D" uid="uid://ba5vvrx730go8" path="res://assets/level/wall/wall_2_R.png" id="4_nkqqf"] - -[resource] -albedo_texture = ExtResource("1_5vyxs") -metallic = 1.0 -metallic_texture = ExtResource("2_nlwc6") -roughness_texture = ExtResource("4_nkqqf") -normal_enabled = true -normal_texture = ExtResource("3_3eofc") -texture_filter = 4 diff --git a/assets/level/wall/wall_3.mesh b/assets/level/wall/wall_3.mesh new file mode 100644 index 0000000..4f31eeb Binary files /dev/null and b/assets/level/wall/wall_3.mesh differ diff --git a/assets/level/wall/wall_3.tres b/assets/level/wall/wall_3.tres deleted file mode 100644 index 15867ff..0000000 --- a/assets/level/wall/wall_3.tres +++ /dev/null @@ -1,15 +0,0 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://b1gi4b3ny2q1l"] - -[ext_resource type="Texture2D" uid="uid://1mr7tplfxcrc" path="res://assets/level/wall/wall_3_C.png" id="1_a6sy6"] -[ext_resource type="Texture2D" uid="uid://cwqr6plpp3aov" path="res://assets/level/wall/wall_3_M.png" id="2_ics1d"] -[ext_resource type="Texture2D" uid="uid://qw6yjgadiv5f" path="res://assets/level/wall/wall_3_N.png" id="3_2w6cs"] -[ext_resource type="Texture2D" uid="uid://dqkarguq5m5hn" path="res://assets/level/wall/wall_3_R.png" id="4_skw4q"] - -[resource] -albedo_texture = ExtResource("1_a6sy6") -metallic = 1.0 -metallic_texture = ExtResource("2_ics1d") -roughness_texture = ExtResource("4_skw4q") -normal_enabled = true -normal_texture = ExtResource("3_2w6cs") -texture_filter = 4 diff --git a/assets/materials/gunk_material.tres b/assets/materials/gunk_material.tres index 924824d..d3a3cd2 100644 --- a/assets/materials/gunk_material.tres +++ b/assets/materials/gunk_material.tres @@ -3,10 +3,10 @@ [ext_resource type="Shader" uid="uid://ckxc0ngd37rtk" path="res://src/shaders/gunk.gdshader" id="1_euy6e"] [ext_resource type="FastNoiseLite" uid="uid://cnlvdtx68giv6" path="res://assets/materials/gunk_noise.tres" id="2_u4cba"] -[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_ow0bp"] +[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_hrvvi"] load_path = "res://.godot/imported/debug_mask.png-fd2bc783338ed9439fe81a4eef9d86da.s3tc.ctex" -[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_d70or"] +[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_2roq2"] width = 256 height = 256 depth = 32 @@ -14,7 +14,7 @@ seamless = true seamless_blend_skirt = 0.5 noise = ExtResource("2_u4cba") -[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_0ksu8"] +[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_fk1xc"] width = 256 height = 256 depth = 32 @@ -37,6 +37,6 @@ shader_parameter/emission_strength = 0.02 shader_parameter/uv_scale = Vector2(8, 8) shader_parameter/time_scale = 0.2 shader_parameter/edge_bleed = 0.25 -shader_parameter/gunk_mask = SubResource("CompressedTexture2D_ow0bp") -shader_parameter/gunk_noise = SubResource("NoiseTexture3D_d70or") -shader_parameter/gunk_normal_map = SubResource("NoiseTexture3D_0ksu8") +shader_parameter/gunk_mask = SubResource("CompressedTexture2D_hrvvi") +shader_parameter/gunk_noise = SubResource("NoiseTexture3D_2roq2") +shader_parameter/gunk_normal_map = SubResource("NoiseTexture3D_fk1xc") diff --git a/levels/asset_test/asset_test.tscn b/levels/asset_test/asset_test.tscn index db256ec..bdb1332 100644 --- a/levels/asset_test/asset_test.tscn +++ b/levels/asset_test/asset_test.tscn @@ -1,13 +1,13 @@ -[gd_scene load_steps=27 format=3 uid="uid://ef0nvq0ikdjg"] +[gd_scene load_steps=14 format=3 uid="uid://ef0nvq0ikdjg"] [ext_resource type="PackedScene" uid="uid://bwe2jdmvinhqd" path="res://src/player/player.tscn" id="1_kfkc5"] -[ext_resource type="Material" uid="uid://cdsodbp7rbvip" path="res://assets/level/floor/floor_1.tres" id="2_eqm4j"] -[ext_resource type="Material" uid="uid://phmrg5c5ls4i" path="res://assets/level/floor/floor_2.tres" id="3_yqrx7"] -[ext_resource type="Material" uid="uid://coy3y2u3ujn3u" path="res://assets/level/wall/wall_1.tres" id="4_yy6sa"] -[ext_resource type="Material" uid="uid://q1b701b13co6" path="res://assets/level/wall/wall_2.tres" id="5_rpeyx"] -[ext_resource type="Material" uid="uid://b1gi4b3ny2q1l" path="res://assets/level/wall/wall_3.tres" id="6_emb7q"] -[ext_resource type="Material" uid="uid://bkwfat6ltd7a7" path="res://assets/level/ceiling/ceiling_1.tres" id="7_u881q"] -[ext_resource type="Material" uid="uid://cxudbowc3a5hy" path="res://assets/level/ceiling/ceiling_2.tres" id="8_2mqye"] +[ext_resource type="ArrayMesh" uid="uid://bc476v18chh3o" path="res://assets/level/floor/floor_1.mesh" id="2_eqm4j"] +[ext_resource type="ArrayMesh" uid="uid://gaekd6523jwo" path="res://assets/level/floor/floor_2.mesh" id="3_yqrx7"] +[ext_resource type="ArrayMesh" uid="uid://b3dnnod3nih10" path="res://assets/level/wall/wall_1.mesh" id="4_yy6sa"] +[ext_resource type="ArrayMesh" uid="uid://cphc3nx1xqrgw" path="res://assets/level/wall/wall_2.mesh" id="5_rpeyx"] +[ext_resource type="ArrayMesh" uid="uid://uvq4b445w8dv" path="res://assets/level/wall/wall_3.mesh" id="6_emb7q"] +[ext_resource type="ArrayMesh" uid="uid://dhutbkqatlwpa" path="res://assets/level/ceiling/ceiling_1.mesh" id="7_u881q"] +[ext_resource type="ArrayMesh" uid="uid://c8aauxqfa3w3b" path="res://assets/level/ceiling/ceiling_2.mesh" id="8_2mqye"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_om6ib"] @@ -32,209 +32,6 @@ size = Vector2(6, 6) [sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_imll7"] -[sub_resource type="ArrayMesh" id="ArrayMesh_eqm4j"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2), -"format": 34896613377, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 1, 0, 2, 0, 2, 0, 1, 0, 3, 0), -"name": "Plane", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 4, -"vertex_data": PackedByteArray(255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) -}] -blend_shape_mode = 0 - -[sub_resource type="ArrayMesh" id="ArrayMesh_yqrx7"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2), -"attribute_data": PackedByteArray(255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0), -"format": 34896613399, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 1, 0, 2, 0, 2, 0, 1, 0, 3, 0), -"material": ExtResource("2_eqm4j"), -"name": "Plane", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 4, -"vertex_data": PackedByteArray(255, 255, 0, 0, 255, 255, 255, 191, 0, 0, 0, 0, 255, 255, 255, 191, 255, 255, 0, 0, 0, 0, 255, 191, 0, 0, 0, 0, 0, 0, 255, 191, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127) -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_eqm4j") - -[sub_resource type="ArrayMesh" id="ArrayMesh_yy6sa"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2), -"format": 34896613377, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 1, 0, 2, 0, 2, 0, 1, 0, 3, 0), -"name": "Plane", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 4, -"vertex_data": PackedByteArray(255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) -}] -blend_shape_mode = 0 - -[sub_resource type="ArrayMesh" id="ArrayMesh_rpeyx"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2), -"attribute_data": PackedByteArray(255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0), -"format": 34896613399, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 1, 0, 2, 0, 2, 0, 1, 0, 3, 0), -"material": ExtResource("3_yqrx7"), -"name": "Plane", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 4, -"vertex_data": PackedByteArray(255, 255, 0, 0, 255, 255, 255, 191, 0, 0, 0, 0, 255, 255, 255, 191, 255, 255, 0, 0, 0, 0, 255, 191, 0, 0, 0, 0, 0, 0, 255, 191, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127) -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_yy6sa") - -[sub_resource type="ArrayMesh" id="ArrayMesh_emb7q"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2), -"format": 34896613377, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 1, 0, 2, 0, 2, 0, 1, 0, 3, 0), -"name": "Plane", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 4, -"vertex_data": PackedByteArray(255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) -}] -blend_shape_mode = 0 - -[sub_resource type="ArrayMesh" id="ArrayMesh_u881q"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2), -"attribute_data": PackedByteArray(255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0), -"format": 34896613399, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 1, 0, 2, 0, 2, 0, 1, 0, 3, 0), -"material": ExtResource("4_yy6sa"), -"name": "Plane", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 4, -"vertex_data": PackedByteArray(255, 255, 0, 0, 255, 255, 255, 191, 0, 0, 0, 0, 255, 255, 255, 191, 255, 255, 0, 0, 0, 0, 255, 191, 0, 0, 0, 0, 0, 0, 255, 191, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127) -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_emb7q") - -[sub_resource type="ArrayMesh" id="ArrayMesh_2mqye"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2), -"format": 34896613377, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 1, 0, 2, 0, 2, 0, 1, 0, 3, 0), -"name": "Plane", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 4, -"vertex_data": PackedByteArray(255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) -}] -blend_shape_mode = 0 - -[sub_resource type="ArrayMesh" id="ArrayMesh_smfwr"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2), -"attribute_data": PackedByteArray(255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0), -"format": 34896613399, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 1, 0, 2, 0, 2, 0, 1, 0, 3, 0), -"material": ExtResource("5_rpeyx"), -"name": "Plane", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 4, -"vertex_data": PackedByteArray(255, 255, 0, 0, 255, 255, 255, 191, 0, 0, 0, 0, 255, 255, 255, 191, 255, 255, 0, 0, 0, 0, 255, 191, 0, 0, 0, 0, 0, 0, 255, 191, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127) -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_2mqye") - -[sub_resource type="ArrayMesh" id="ArrayMesh_80jgi"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2), -"attribute_data": PackedByteArray(255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0), -"format": 34896613399, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 1, 0, 2, 0, 2, 0, 1, 0, 3, 0), -"material": ExtResource("6_emb7q"), -"name": "Plane", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 4, -"vertex_data": PackedByteArray(255, 255, 0, 0, 255, 255, 255, 191, 0, 0, 0, 0, 255, 255, 255, 191, 255, 255, 0, 0, 0, 0, 255, 191, 0, 0, 0, 0, 0, 0, 255, 191, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127) -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_emb7q") - -[sub_resource type="ArrayMesh" id="ArrayMesh_vx5xa"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2), -"format": 34896613377, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 1, 0, 2, 0, 2, 0, 1, 0, 3, 0), -"name": "Plane", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 4, -"vertex_data": PackedByteArray(255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) -}] -blend_shape_mode = 0 - -[sub_resource type="ArrayMesh" id="ArrayMesh_w0omc"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2), -"attribute_data": PackedByteArray(255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0), -"format": 34896613399, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 1, 0, 2, 0, 2, 0, 1, 0, 3, 0), -"material": ExtResource("7_u881q"), -"name": "Plane", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 4, -"vertex_data": PackedByteArray(255, 255, 0, 0, 255, 255, 255, 191, 0, 0, 0, 0, 255, 255, 255, 191, 255, 255, 0, 0, 0, 0, 255, 191, 0, 0, 0, 0, 0, 0, 255, 191, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127) -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_vx5xa") - -[sub_resource type="ArrayMesh" id="ArrayMesh_muvdl"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2), -"format": 34896613377, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 1, 0, 2, 0, 2, 0, 1, 0, 3, 0), -"name": "Plane", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 4, -"vertex_data": PackedByteArray(255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) -}] -blend_shape_mode = 0 - -[sub_resource type="ArrayMesh" id="ArrayMesh_bbps6"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2), -"attribute_data": PackedByteArray(255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0), -"format": 34896613399, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 1, 0, 2, 0, 2, 0, 1, 0, 3, 0), -"material": ExtResource("8_2mqye"), -"name": "Plane", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 4, -"vertex_data": PackedByteArray(255, 255, 0, 0, 255, 255, 255, 191, 0, 0, 0, 0, 255, 255, 255, 191, 255, 255, 0, 0, 0, 0, 255, 191, 0, 0, 0, 0, 0, 0, 255, 191, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127) -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_muvdl") - [node name="AssetTest" type="Node3D"] [node name="WorldEnvironment" type="WorldEnvironment" parent="."] @@ -264,12 +61,12 @@ 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 = SubResource("ArrayMesh_yqrx7") +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 = SubResource("ArrayMesh_rpeyx") +mesh = ExtResource("3_yqrx7") skeleton = NodePath("../..") [node name="Walls" type="Node3D" parent="Assets"] @@ -277,22 +74,22 @@ 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 = SubResource("ArrayMesh_u881q") +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 = SubResource("ArrayMesh_smfwr") +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 = SubResource("ArrayMesh_80jgi") +mesh = ExtResource("6_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 = SubResource("ArrayMesh_w0omc") +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 = SubResource("ArrayMesh_bbps6") +mesh = ExtResource("8_2mqye") diff --git a/levels/sandbox/hallway_1.tres b/levels/sandbox/hallway_1.tres deleted file mode 100644 index 77c92d4..0000000 --- a/levels/sandbox/hallway_1.tres +++ /dev/null @@ -1,90 +0,0 @@ -[gd_resource type="ArrayMesh" load_steps=14 format=4 uid="uid://chluobkj3vpht"] - -[ext_resource type="Texture2D" uid="uid://cj5em70wq1l6f" path="res://assets/level/hallway/hallway_1_C.png" id="1_1uy28"] -[ext_resource type="Texture2D" uid="uid://bi87m5noufg5h" path="res://assets/level/hallway/hallway_1_E.png" id="2_3o6xi"] -[ext_resource type="Texture2D" uid="uid://c6ublhoexsuk" path="res://assets/level/hallway/hallway_1_M.png" id="3_qrctk"] -[ext_resource type="Shader" uid="uid://ckxc0ngd37rtk" path="res://src/shaders/gunk.gdshader" id="4_1eiv3"] -[ext_resource type="FastNoiseLite" uid="uid://cnlvdtx68giv6" path="res://assets/materials/gunk_noise.tres" id="5_os6sm"] -[ext_resource type="Texture2D" uid="uid://dtp6ctfi5l4v8" path="res://assets/level/hallway/hallway_1_N.png" id="6_2gcng"] -[ext_resource type="Texture2D" uid="uid://5ua6bne0btou" path="res://assets/level/hallway/hallway_1_R.png" id="7_on856"] - -[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_ow0bp"] -load_path = "res://.godot/imported/debug_mask.png-fd2bc783338ed9439fe81a4eef9d86da.s3tc.ctex" - -[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_d70or"] -width = 256 -height = 256 -depth = 32 -seamless = true -seamless_blend_skirt = 0.5 -noise = ExtResource("5_os6sm") - -[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_0ksu8"] -width = 256 -height = 256 -depth = 32 -seamless = true -seamless_blend_skirt = 0.5 -noise = ExtResource("5_os6sm") - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_2roq2"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("4_1eiv3") -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(4, 4) -shader_parameter/time_scale = 0.2 -shader_parameter/edge_bleed = 0.25 -shader_parameter/gunk_mask = SubResource("CompressedTexture2D_ow0bp") -shader_parameter/gunk_noise = SubResource("NoiseTexture3D_d70or") -shader_parameter/gunk_normal_map = SubResource("NoiseTexture3D_0ksu8") - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_fk1xc"] -next_pass = SubResource("ShaderMaterial_2roq2") -albedo_texture = ExtResource("1_1uy28") -metallic = 1.0 -metallic_texture = ExtResource("3_qrctk") -roughness_texture = ExtResource("7_on856") -emission_enabled = true -emission_texture = ExtResource("2_3o6xi") -normal_enabled = true -normal_texture = ExtResource("6_2gcng") -texture_filter = 4 - -[sub_resource type="ArrayMesh" id="ArrayMesh_f5v27"] -_surfaces = [{ -"aabb": AABB(-2, -2, -2, 4, 4, 4), -"format": 34896613377, -"index_count": 24, -"index_data": PackedByteArray("AAABAAIAAwABAAAAAgABAAQABQABAAMABgACAAQABQADAAYABwACAAYABgADAAcA"), -"name": "Cube", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 8, -"vertex_data": PackedByteArray("//8AAAAAAAAAAAAAAAAAAP////8AAAAA//8AAP//AAAAAP//AAAAAAAAAAD//wAAAAD/////AAD///////8AAA==") -}] -blend_shape_mode = 0 - -[resource] -_surfaces = [{ -"aabb": AABB(-2, -2, -2, 4, 4, 4), -"attribute_data": PackedByteArray("/3//f/9///8AAP9/AAD///9/AAD/f/9/AAAAAAAA/3//f/9/////f/9//////////38AAP//AAD/f/9/////fw=="), -"format": 34896613399, -"index_count": 24, -"index_data": PackedByteArray("AAABAAIAAgABAAMABAAFAAYABgAFAAcACAAJAAoACgAJAAsADAANAA4ADgANAA8A"), -"material": SubResource("StandardMaterial3D_fk1xc"), -"name": "Cube", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 16, -"vertex_data": PackedByteArray("//8AAAAA/78AAAAAAAD/v/////8AAP+/AAD//wAA/78AAAAA////////AAD/////AAD//////////////////wAAAAD//1TVAAAAAAAAVNX//wAA//9U1f//AAAAAFTV////////VNX/////AABU1QAA/////1TVAAD//wAAVNX/f/9//3//f/9//3//f/9//z//v/8//7//P/+//z//v1TVqipU1aoqVNWqKlTVqipUVVRVVFVUVVRVVFVUVVRV") -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_f5v27") diff --git a/levels/sandbox/hallway_2.tres b/levels/sandbox/hallway_2.tres deleted file mode 100644 index bf18ed3..0000000 --- a/levels/sandbox/hallway_2.tres +++ /dev/null @@ -1,90 +0,0 @@ -[gd_resource type="ArrayMesh" load_steps=14 format=4 uid="uid://dcxt6lua0fivn"] - -[ext_resource type="Texture2D" uid="uid://c3yo0fiux7uvl" path="res://assets/level/hallway/hallway_2_C.png" id="1_k1hbq"] -[ext_resource type="Texture2D" uid="uid://blicao0n4875s" path="res://assets/level/hallway/hallway_2_E.png" id="2_8wimg"] -[ext_resource type="Texture2D" uid="uid://crge5t3vivfhn" path="res://assets/level/hallway/hallway_2_M.png" id="3_fcyri"] -[ext_resource type="Shader" uid="uid://ckxc0ngd37rtk" path="res://src/shaders/gunk.gdshader" id="4_l5uwp"] -[ext_resource type="FastNoiseLite" uid="uid://cnlvdtx68giv6" path="res://assets/materials/gunk_noise.tres" id="5_se3k2"] -[ext_resource type="Texture2D" uid="uid://d3eaofj7ntddk" path="res://assets/level/hallway/hallway_2_N.png" id="6_q121c"] -[ext_resource type="Texture2D" uid="uid://dxy4wicwjb38a" path="res://assets/level/hallway/hallway_2_R.png" id="7_g24st"] - -[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_ow0bp"] -load_path = "res://.godot/imported/debug_mask.png-fd2bc783338ed9439fe81a4eef9d86da.s3tc.ctex" - -[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_d70or"] -width = 256 -height = 256 -depth = 32 -seamless = true -seamless_blend_skirt = 0.5 -noise = ExtResource("5_se3k2") - -[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_0ksu8"] -width = 256 -height = 256 -depth = 32 -seamless = true -seamless_blend_skirt = 0.5 -noise = ExtResource("5_se3k2") - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_6fwow"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("4_l5uwp") -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(4, -4) -shader_parameter/time_scale = 0.2 -shader_parameter/edge_bleed = 0.25 -shader_parameter/gunk_mask = SubResource("CompressedTexture2D_ow0bp") -shader_parameter/gunk_noise = SubResource("NoiseTexture3D_d70or") -shader_parameter/gunk_normal_map = SubResource("NoiseTexture3D_0ksu8") - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6idi3"] -next_pass = SubResource("ShaderMaterial_6fwow") -albedo_texture = ExtResource("1_k1hbq") -metallic = 1.0 -metallic_texture = ExtResource("3_fcyri") -roughness_texture = ExtResource("7_g24st") -emission_enabled = true -emission_texture = ExtResource("2_8wimg") -normal_enabled = true -normal_texture = ExtResource("6_q121c") -texture_filter = 4 - -[sub_resource type="ArrayMesh" id="ArrayMesh_f5v27"] -_surfaces = [{ -"aabb": AABB(-2, -2, -2, 4, 4, 4), -"format": 34896613377, -"index_count": 24, -"index_data": PackedByteArray("AAABAAIAAwABAAAAAgABAAQABQABAAMABgACAAQABQADAAYABwACAAYABgADAAcA"), -"name": "Cube", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 8, -"vertex_data": PackedByteArray("//8AAAAAAAAAAAAAAAAAAP////8AAAAA//8AAP//AAAAAP//AAAAAAAAAAD//wAAAAD/////AAD///////8AAA==") -}] -blend_shape_mode = 0 - -[resource] -_surfaces = [{ -"aabb": AABB(-2, -2, -2, 4, 4, 4), -"attribute_data": PackedByteArray("/3//f/9///8AAP9/AAD///9/AAD/f/9/AAAAAAAA/3//f/9/////f/9//////////38AAP//AAD/f/9/////fw=="), -"format": 34896613399, -"index_count": 24, -"index_data": PackedByteArray("AAABAAIAAgABAAMABAAFAAYABgAFAAcACAAJAAoACgAJAAsADAANAA4ADgANAA8A"), -"material": SubResource("StandardMaterial3D_6idi3"), -"name": "Cube", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 16, -"vertex_data": PackedByteArray("//8AAAAA/78AAAAAAAD/v/////8AAP+/AAD//wAA/78AAAAA////////AAD/////AAD//////////////////wAAAAD//1TVAAAAAAAAVNX//wAA//9U1f//AAAAAFTV////////VNX/////AABU1QAA/////1TVAAD//wAAVNX/f/9//3//f/9//3//f/9//z//v/8//7//P/+//z//v1TVqipU1aoqVNWqKlTVqipUVVRVVFVUVVRVVFVUVVRV") -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_f5v27") diff --git a/levels/sandbox/mesh_library.tres b/levels/sandbox/mesh_library.tres deleted file mode 100644 index 81fccab..0000000 --- a/levels/sandbox/mesh_library.tres +++ /dev/null @@ -1,58 +0,0 @@ -[gd_resource type="MeshLibrary" load_steps=9 format=4 uid="uid://vg03fgf3y33r"] - -[ext_resource type="Texture2D" uid="uid://cj5em70wq1l6f" path="res://assets/level/hallway/hallway_1_C.png" id="1_qs4ap"] -[ext_resource type="Texture2D" uid="uid://bi87m5noufg5h" path="res://assets/level/hallway/hallway_1_E.png" id="2_qcnin"] -[ext_resource type="Texture2D" uid="uid://c6ublhoexsuk" path="res://assets/level/hallway/hallway_1_M.png" id="3_qphuf"] -[ext_resource type="Texture2D" uid="uid://dtp6ctfi5l4v8" path="res://assets/level/hallway/hallway_1_N.png" id="4_qv560"] -[ext_resource type="Texture2D" uid="uid://5ua6bne0btou" path="res://assets/level/hallway/hallway_1_R.png" id="5_rd1qh"] - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tx1dy"] -albedo_texture = ExtResource("1_qs4ap") -metallic = 1.0 -metallic_texture = ExtResource("3_qphuf") -roughness_texture = ExtResource("5_rd1qh") -emission_enabled = true -emission_texture = ExtResource("2_qcnin") -normal_enabled = true -normal_texture = ExtResource("4_qv560") -texture_filter = 4 - -[sub_resource type="ArrayMesh" id="ArrayMesh_f5v27"] -_surfaces = [{ -"aabb": AABB(-2, -2, -2, 4, 4, 4), -"format": 34896613377, -"index_count": 24, -"index_data": PackedByteArray("AAABAAIAAwABAAAAAgABAAQABQABAAMABgACAAQABQADAAYABwACAAYABgADAAcA"), -"name": "Cube", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 8, -"vertex_data": PackedByteArray("//8AAAAAAAAAAAAAAAAAAP////8AAAAA//8AAP//AAAAAP//AAAAAAAAAAD//wAAAAD/////AAD///////8AAA==") -}] -blend_shape_mode = 0 - -[sub_resource type="ArrayMesh" id="ArrayMesh_p1wtp"] -_surfaces = [{ -"aabb": AABB(-2, -2, -2, 4, 4, 4), -"attribute_data": PackedByteArray("/3//f/9///8AAP9/AAD///9/AAD/f/9/AAAAAAAA/3//f/9/////f/9//////////38AAP//AAD/f/9/////fw=="), -"format": 34896613399, -"index_count": 24, -"index_data": PackedByteArray("AAABAAIAAgABAAMABAAFAAYABgAFAAcACAAJAAoACgAJAAsADAANAA4ADgANAA8A"), -"material": SubResource("StandardMaterial3D_tx1dy"), -"name": "Cube", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 16, -"vertex_data": PackedByteArray("//8AAAAA/78AAAAAAAD/v/////8AAP+/AAD//wAA/78AAAAA////////AAD/////AAD//////////////////wAAAAD//1TVAAAAAAAAVNX//wAA//9U1f//AAAAAFTV////////VNX/////AABU1QAA/////1TVAAD//wAAVNX/f/9//3//f/9//3//f/9//z//v/8//7//P/+//z//v1TVqipU1aoqVNWqKlTVqipUVVRVVFVUVVRVVFVUVVRV") -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_f5v27") - -[resource] -item/0/name = "Hallway 1" -item/0/mesh = SubResource("ArrayMesh_p1wtp") -item/0/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/0/mesh_cast_shadow = 1 -item/0/shapes = [] -item/0/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/0/navigation_layers = 1 diff --git a/levels/sandbox/sandbox.tscn b/levels/sandbox/sandbox.tscn index 972c29e..b08a687 100644 --- a/levels/sandbox/sandbox.tscn +++ b/levels/sandbox/sandbox.tscn @@ -3,15 +3,12 @@ [ext_resource type="PackedScene" uid="uid://c2omlx4ptrc01" path="res://src/world/gunk_body/gunk_body.tscn" id="1_a67lu"] [ext_resource type="PackedScene" uid="uid://bwe2jdmvinhqd" path="res://src/player/player.tscn" id="1_h436a"] [ext_resource type="Shader" uid="uid://ckxc0ngd37rtk" path="res://src/shaders/gunk.gdshader" id="5_rdjtm"] -[ext_resource type="ArrayMesh" uid="uid://chluobkj3vpht" path="res://levels/sandbox/hallway_1.tres" id="6_2218n"] +[ext_resource type="Texture2D" uid="uid://bniqwnr66mvwa" path="res://assets/level/hallway/hallway_1_C.png" id="6_hrvvi"] [ext_resource type="FastNoiseLite" uid="uid://cnlvdtx68giv6" path="res://assets/materials/gunk_noise.tres" id="6_l64ek"] -[ext_resource type="ArrayMesh" uid="uid://dcxt6lua0fivn" path="res://levels/sandbox/hallway_2.tres" id="7_6fwow"] -[ext_resource type="Texture2D" uid="uid://c60foyohyjlj8" path="res://assets/level/hallway/hallway_3_C.png" id="8_6idi3"] +[ext_resource type="Texture2D" uid="uid://ct2hoo0g0q6im" path="res://assets/level/hallway/hallway_1_M.png" id="7_2roq2"] +[ext_resource type="Texture2D" uid="uid://db8cbo7abqvku" path="res://assets/level/hallway/hallway_1_N.png" id="8_fk1xc"] +[ext_resource type="Texture2D" uid="uid://c1hiafyeu4fyj" path="res://assets/level/hallway/hallway_1_R.png" id="9_6fwow"] [ext_resource type="PackedScene" uid="uid://b6eg8t04rkh0c" path="res://src/props/wall_switch/wall_switch.tscn" id="9_p27ol"] -[ext_resource type="Texture2D" uid="uid://cjdkxbs8uwkh6" path="res://assets/level/hallway/hallway_3_E.png" id="9_sh2xs"] -[ext_resource type="Texture2D" uid="uid://dht2my8tw3hl7" path="res://assets/level/hallway/hallway_3_M.png" id="10_tpfln"] -[ext_resource type="Texture2D" uid="uid://b0qjhayccearq" path="res://assets/level/hallway/hallway_3_N.png" id="11_2218n"] -[ext_resource type="Texture2D" uid="uid://ccm4iloi5vyld" path="res://assets/level/hallway/hallway_3_R.png" id="12_j0yby"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_cj8bk"] @@ -287,10 +284,26 @@ shadow_mesh = SubResource("ArrayMesh_jllhp") [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_6ood3"] data = PackedVector3Array(-0.0001, 6, -4, -0.0001, -6, -4, 0.7803, 6, -3.9232, 0.7803, 6, -3.9232, -0.0001, -6, -4, 0.7803, -6, -3.9232, 0.7803, 6, -3.9232, 0.7803, -6, -3.9232, 1.5307, 6, -3.6956, 1.5307, 6, -3.6956, 0.7803, -6, -3.9232, 1.5307, -6, -3.6956, 1.5307, 6, -3.6956, 1.5307, -6, -3.6956, 2.2223, 6, -3.3259, 2.2223, 6, -3.3259, 1.5307, -6, -3.6956, 2.2223, -6, -3.3259, 2.2223, 6, -3.3259, 2.2223, -6, -3.3259, 2.8284, 6, -2.8285, 2.8284, 6, -2.8285, 2.2223, -6, -3.3259, 2.8284, -6, -2.8285, 2.8284, 6, -2.8285, 2.8284, -6, -2.8285, 3.3258, 6, -2.2224, 3.3258, 6, -2.2224, 2.8284, -6, -2.8285, 3.3258, -6, -2.2224, 3.3258, 6, -2.2224, 3.3258, -6, -2.2224, 3.6954, 6, -1.5308, 3.6954, 6, -1.5308, 3.3258, -6, -2.2224, 3.6954, -6, -1.5308, 3.6954, 6, -1.5308, 3.6954, -6, -1.5308, 3.9231, 6, -0.7805, 3.9231, 6, -0.7805, 3.6954, -6, -1.5308, 3.9231, -6, -0.7805, 3.9231, 6, -0.7805, 3.9231, -6, -0.7805, 4, 6, -0.0001, 4, 6, -0.0001, 3.9231, -6, -0.7805, 4, -6, -0.0001, 4, 6, -0.0001, 4, -6, -0.0001, 3.9231, 6, 0.7803, 3.9231, 6, 0.7803, 4, -6, -0.0001, 3.9231, -6, 0.7803, 3.9231, 6, 0.7803, 3.9231, -6, 0.7803, 3.6954, 6, 1.5307, 3.6954, 6, 1.5307, 3.9231, -6, 0.7803, 3.6954, -6, 1.5307, 3.6954, 6, 1.5307, 3.6954, -6, 1.5307, 3.3258, 6, 2.2223, 3.3258, 6, 2.2223, 3.6954, -6, 1.5307, 3.3258, -6, 2.2223, 3.3258, 6, 2.2223, 3.3258, -6, 2.2223, 2.8284, 6, 2.8284, 2.8284, 6, 2.8284, 3.3258, -6, 2.2223, 2.8284, -6, 2.8284, 2.8284, 6, 2.8284, 2.8284, -6, 2.8284, 2.2223, 6, 3.3258, 2.2223, 6, 3.3258, 2.8284, -6, 2.8284, 2.2223, -6, 3.3258, 2.2223, 6, 3.3258, 2.2223, -6, 3.3258, 1.5307, 6, 3.6954, 1.5307, 6, 3.6954, 2.2223, -6, 3.3258, 1.5307, -6, 3.6954, 1.5307, 6, 3.6954, 1.5307, -6, 3.6954, 0.7803, 6, 3.9231, 0.7803, 6, 3.9231, 1.5307, -6, 3.6954, 0.7803, -6, 3.9231, 0.7803, 6, 3.9231, 0.7803, -6, 3.9231, -0.0001, 6, 4, -0.0001, 6, 4, 0.7803, -6, 3.9231, -0.0001, -6, 4, -0.0001, 6, 4, -0.0001, -6, 4, -0.7805, 6, 3.9231, -0.7805, 6, 3.9231, -0.0001, -6, 4, -0.7805, -6, 3.9231, -0.7805, 6, 3.9231, -0.7805, -6, 3.9231, -1.5308, 6, 3.6954, -1.5308, 6, 3.6954, -0.7805, -6, 3.9231, -1.5308, -6, 3.6954, -1.5308, 6, 3.6954, -1.5308, -6, 3.6954, -2.2224, 6, 3.3258, -2.2224, 6, 3.3258, -1.5308, -6, 3.6954, -2.2224, -6, 3.3258, -2.2224, 6, 3.3258, -2.2224, -6, 3.3258, -2.8285, 6, 2.8284, -2.8285, 6, 2.8284, -2.2224, -6, 3.3258, -2.8285, -6, 2.8284, -2.8285, 6, 2.8284, -2.8285, -6, 2.8284, -3.3259, 6, 2.2223, -3.3259, 6, 2.2223, -2.8285, -6, 2.8284, -3.3259, -6, 2.2223, -3.3259, 6, 2.2223, -3.3259, -6, 2.2223, -3.6956, 6, 1.5307, -3.6956, 6, 1.5307, -3.3259, -6, 2.2223, -3.6956, -6, 1.5307, -3.6956, 6, 1.5307, -3.6956, -6, 1.5307, -3.9232, 6, 0.7803, -3.9232, 6, 0.7803, -3.6956, -6, 1.5307, -3.9232, -6, 0.7803, -3.9232, 6, 0.7803, -3.9232, -6, 0.7803, -4, 6, -0.0001, -4, 6, -0.0001, -3.9232, -6, 0.7803, -4, -6, -0.0001, -4, 6, -0.0001, -4, -6, -0.0001, -3.9232, 6, -0.7805, -3.9232, 6, -0.7805, -4, -6, -0.0001, -3.9232, -6, -0.7805, -3.9232, 6, -0.7805, -3.9232, -6, -0.7805, -3.6956, 6, -1.5308, -3.6956, 6, -1.5308, -3.9232, -6, -0.7805, -3.6956, -6, -1.5308, -3.6956, 6, -1.5308, -3.6956, -6, -1.5308, -3.3259, 6, -2.2224, -3.3259, 6, -2.2224, -3.6956, -6, -1.5308, -3.3259, -6, -2.2224, -3.3259, 6, -2.2224, -3.3259, -6, -2.2224, -2.8285, 6, -2.8285, -2.8285, 6, -2.8285, -3.3259, -6, -2.2224, -2.8285, -6, -2.8285, -2.8285, 6, -2.8285, -2.8285, -6, -2.8285, -2.2224, 6, -3.3259, -2.2224, 6, -3.3259, -2.8285, -6, -2.8285, -2.2224, -6, -3.3259, -2.2224, 6, -3.3259, -2.2224, -6, -3.3259, -1.5308, 6, -3.6956, -1.5308, 6, -3.6956, -2.2224, -6, -3.3259, -1.5308, -6, -3.6956, -0.0001, 6, -4, 0.7803, 6, -3.9232, -0.7805, 6, -3.9232, -0.7805, 6, -3.9232, 0.7803, 6, -3.9232, -1.5308, 6, -3.6956, -1.5308, 6, -3.6956, 0.7803, 6, -3.9232, -2.2224, 6, -3.3259, -2.2224, 6, -3.3259, 0.7803, 6, -3.9232, -2.8285, 6, -2.8285, -2.8285, 6, -2.8285, 0.7803, 6, -3.9232, -3.3259, 6, -2.2224, -3.3259, 6, -2.2224, 0.7803, 6, -3.9232, -3.6956, 6, -1.5308, -3.6956, 6, -1.5308, 0.7803, 6, -3.9232, -3.9232, 6, -0.7805, -3.9232, 6, -0.7805, 0.7803, 6, -3.9232, -4, 6, -0.0001, -4, 6, -0.0001, 0.7803, 6, -3.9232, -3.9232, 6, 0.7803, -3.9232, 6, 0.7803, 0.7803, 6, -3.9232, -3.6956, 6, 1.5307, -3.6956, 6, 1.5307, 0.7803, 6, -3.9232, -3.3259, 6, 2.2223, -3.3259, 6, 2.2223, 0.7803, 6, -3.9232, -2.8285, 6, 2.8284, -2.8285, 6, 2.8284, 0.7803, 6, -3.9232, -2.2224, 6, 3.3258, -2.2224, 6, 3.3258, 0.7803, 6, -3.9232, -1.5308, 6, 3.6954, -1.5308, 6, 3.6954, 0.7803, 6, -3.9232, -0.7805, 6, 3.9231, -0.7805, 6, 3.9231, 0.7803, 6, -3.9232, -0.0001, 6, 4, -0.0001, 6, 4, 0.7803, 6, -3.9232, 0.7803, 6, 3.9231, 0.7803, 6, 3.9231, 0.7803, 6, -3.9232, 1.5307, 6, 3.6954, 1.5307, 6, 3.6954, 0.7803, 6, -3.9232, 2.2223, 6, 3.3258, 2.2223, 6, 3.3258, 0.7803, 6, -3.9232, 2.8284, 6, 2.8284, 2.8284, 6, 2.8284, 0.7803, 6, -3.9232, 3.3258, 6, 2.2223, 3.3258, 6, 2.2223, 0.7803, 6, -3.9232, 3.6954, 6, 1.5307, 3.6954, 6, 1.5307, 0.7803, 6, -3.9232, 3.9231, 6, 0.7803, 3.9231, 6, 0.7803, 0.7803, 6, -3.9232, 4, 6, -0.0001, 4, 6, -0.0001, 0.7803, 6, -3.9232, 3.9231, 6, -0.7805, 3.9231, 6, -0.7805, 0.7803, 6, -3.9232, 3.6954, 6, -1.5308, 3.6954, 6, -1.5308, 0.7803, 6, -3.9232, 3.3258, 6, -2.2224, 3.3258, 6, -2.2224, 0.7803, 6, -3.9232, 2.8284, 6, -2.8285, 2.8284, 6, -2.8285, 0.7803, 6, -3.9232, 2.2223, 6, -3.3259, 2.2223, 6, -3.3259, 0.7803, 6, -3.9232, 1.5307, 6, -3.6956, -1.5308, 6, -3.6956, -1.5308, -6, -3.6956, -0.7805, 6, -3.9232, -0.7805, 6, -3.9232, -1.5308, -6, -3.6956, -0.7805, -6, -3.9232, -0.7805, 6, -3.9232, -0.7805, -6, -3.9232, -0.0001, 6, -4, -0.0001, 6, -4, -0.7805, -6, -3.9232, -0.0001, -6, -4, 0.7803, -6, -3.9232, -0.0001, -6, -4, 1.5307, -6, -3.6956, 1.5307, -6, -3.6956, -0.0001, -6, -4, 2.2223, -6, -3.3259, 2.2223, -6, -3.3259, -0.0001, -6, -4, 2.8284, -6, -2.8285, 2.8284, -6, -2.8285, -0.0001, -6, -4, 3.3258, -6, -2.2224, 3.3258, -6, -2.2224, -0.0001, -6, -4, 3.6954, -6, -1.5308, 3.6954, -6, -1.5308, -0.0001, -6, -4, 3.9231, -6, -0.7805, 3.9231, -6, -0.7805, -0.0001, -6, -4, 4, -6, -0.0001, 4, -6, -0.0001, -0.0001, -6, -4, 3.9231, -6, 0.7803, 3.9231, -6, 0.7803, -0.0001, -6, -4, 3.6954, -6, 1.5307, 3.6954, -6, 1.5307, -0.0001, -6, -4, 3.3258, -6, 2.2223, 3.3258, -6, 2.2223, -0.0001, -6, -4, 2.8284, -6, 2.8284, 2.8284, -6, 2.8284, -0.0001, -6, -4, 2.2223, -6, 3.3258, 2.2223, -6, 3.3258, -0.0001, -6, -4, 1.5307, -6, 3.6954, 1.5307, -6, 3.6954, -0.0001, -6, -4, 0.7803, -6, 3.9231, 0.7803, -6, 3.9231, -0.0001, -6, -4, -0.0001, -6, 4, -0.0001, -6, 4, -0.0001, -6, -4, -0.7805, -6, 3.9231, -0.7805, -6, 3.9231, -0.0001, -6, -4, -1.5308, -6, 3.6954, -1.5308, -6, 3.6954, -0.0001, -6, -4, -2.2224, -6, 3.3258, -2.2224, -6, 3.3258, -0.0001, -6, -4, -2.8285, -6, 2.8284, -2.8285, -6, 2.8284, -0.0001, -6, -4, -3.3259, -6, 2.2223, -3.3259, -6, 2.2223, -0.0001, -6, -4, -3.6956, -6, 1.5307, -3.6956, -6, 1.5307, -0.0001, -6, -4, -3.9232, -6, 0.7803, -3.9232, -6, 0.7803, -0.0001, -6, -4, -4, -6, -0.0001, -4, -6, -0.0001, -0.0001, -6, -4, -3.9232, -6, -0.7805, -3.9232, -6, -0.7805, -0.0001, -6, -4, -3.6956, -6, -1.5308, -3.6956, -6, -1.5308, -0.0001, -6, -4, -3.3259, -6, -2.2224, -3.3259, -6, -2.2224, -0.0001, -6, -4, -2.8285, -6, -2.8285, -2.8285, -6, -2.8285, -0.0001, -6, -4, -2.2224, -6, -3.3259, -2.2224, -6, -3.3259, -0.0001, -6, -4, -1.5308, -6, -3.6956, -1.5308, -6, -3.6956, -0.0001, -6, -4, -0.7805, -6, -3.9232) -[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_s1ctw"] -data = PackedVector3Array(2, -2, -2, -2, -2, -2, 2, 2, -2, 2, 2, -2, -2, -2, -2, -2, 2, -2, -2, -2, 2, 2, -2, 2, -2, 2, 2, -2, 2, 2, 2, -2, 2, 2, 2, 2, -2, -2, 2, -2, -2, -2, 2, -2, 2, 2, -2, 2, -2, -2, -2, 2, -2, -2, 2, 2, 2, 2, 2, -2, -2, 2, 2, -2, 2, 2, 2, 2, -2, -2, 2, -2) +[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_hrvvi"] +load_path = "res://.godot/imported/debug_mask.png-fd2bc783338ed9439fe81a4eef9d86da.s3tc.ctex" -[sub_resource type="ShaderMaterial" id="ShaderMaterial_sh2xs"] +[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_2roq2"] +width = 256 +height = 256 +depth = 32 +seamless = true +seamless_blend_skirt = 0.5 +noise = ExtResource("6_l64ek") + +[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_fk1xc"] +width = 256 +height = 256 +depth = 32 +seamless = true +seamless_blend_skirt = 0.5 +noise = ExtResource("6_l64ek") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_hrvvi"] resource_local_to_scene = true render_priority = 0 shader = ExtResource("5_rdjtm") @@ -302,56 +315,57 @@ 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(4, 4) +shader_parameter/uv_scale = Vector2(8, 8) shader_parameter/time_scale = 0.2 shader_parameter/edge_bleed = 0.25 -shader_parameter/gunk_mask = SubResource("CompressedTexture2D_ow0bp") -shader_parameter/gunk_noise = SubResource("NoiseTexture3D_d70or") -shader_parameter/gunk_normal_map = SubResource("NoiseTexture3D_0ksu8") +shader_parameter/gunk_mask = SubResource("CompressedTexture2D_hrvvi") +shader_parameter/gunk_noise = SubResource("NoiseTexture3D_2roq2") +shader_parameter/gunk_normal_map = SubResource("NoiseTexture3D_fk1xc") -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tpfln"] -next_pass = SubResource("ShaderMaterial_sh2xs") -albedo_texture = ExtResource("8_6idi3") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_2roq2"] +next_pass = SubResource("ShaderMaterial_hrvvi") +albedo_texture = ExtResource("6_hrvvi") metallic = 1.0 -metallic_texture = ExtResource("10_tpfln") -roughness_texture = ExtResource("12_j0yby") -emission_enabled = true -emission_texture = ExtResource("9_sh2xs") +metallic_texture = ExtResource("7_2roq2") +roughness_texture = ExtResource("9_6fwow") normal_enabled = true -normal_texture = ExtResource("11_2218n") +normal_texture = ExtResource("8_fk1xc") texture_filter = 4 [sub_resource type="ArrayMesh" id="ArrayMesh_f5v27"] _surfaces = [{ -"aabb": AABB(-2, -2, -2, 4, 4, 4), +"aabb": AABB(-2, 0, -8, 4, 4, 16), "format": 34896613377, "index_count": 24, -"index_data": PackedByteArray("AAABAAIAAwABAAAAAgABAAQABQABAAMABgACAAQABQADAAYABwACAAYABgADAAcA"), +"index_data": PackedByteArray("AAABAAIAAgABAAMAAQAAAAQAAwAFAAIABAAAAAYABwAFAAMABAAGAAcABwAGAAUA"), "name": "Cube", "primitive": 3, "uv_scale": Vector4(0, 0, 0, 0), "vertex_count": 8, -"vertex_data": PackedByteArray("//8AAAAAAAAAAAAAAAAAAP////8AAAAA//8AAP//AAAAAP//AAAAAAAAAAD//wAAAAD/////AAD///////8AAA==") +"vertex_data": PackedByteArray("AAAAAAAAAAAAAAAA//8AAAAA//8AAAAAAAD/////AAD//wAA//8AAP////8AAAAA//8AAAAAAAD///////8AAA==") }] blend_shape_mode = 0 -[sub_resource type="ArrayMesh" id="ArrayMesh_6idi3"] +[sub_resource type="ArrayMesh" id="ArrayMesh_fk1xc"] _surfaces = [{ -"aabb": AABB(-2, -2, -2, 4, 4, 4), -"attribute_data": PackedByteArray("/3//f/9///8AAP9/AAD///9/AAD/f/9/AAAAAAAA/3//f/9/////f/9//////////38AAP//AAD/f/9/////fw=="), +"aabb": AABB(-2, 0, -8, 4, 4, 16), +"attribute_data": PackedByteArray("AAD/f////38AAP+/////v////z8AAP8///8AAAAAAAD///9/AAD/f////z8AAP8//////wAA//////+/AAD/vw=="), "format": 34896613399, "index_count": 24, "index_data": PackedByteArray("AAABAAIAAgABAAMABAAFAAYABgAFAAcACAAJAAoACgAJAAsADAANAA4ADgANAA8A"), -"material": SubResource("StandardMaterial3D_tpfln"), +"material": SubResource("StandardMaterial3D_2roq2"), "name": "Cube", "primitive": 3, "uv_scale": Vector4(0, 0, 0, 0), "vertex_count": 16, -"vertex_data": PackedByteArray("//8AAAAA/78AAAAAAAD/v/////8AAP+/AAD//wAA/78AAAAA////////AAD/////AAD//////////////////wAAAAD//1TVAAAAAAAAVNX//wAA//9U1f//AAAAAFTV////////VNX/////AABU1QAA/////1TVAAD//wAAVNX/f/9//3//f/9//3//f/9//z//v/8//7//P/+//z//v1TVqipU1aoqVNWqKlTVqipUVVRVVFVUVVRVVFVUVVRV") +"vertex_data": PackedByteArray("AAAAAAAA//8AAAAA/////wAA//8AAP//AAD//////////wAA////v///AAAAAP+//////////7//////AAD/vwAAAAD//1TVAAAAAAAAVNX//wAA//9U1f//AAAAAFTV////////VNX/////AABU1QAA/////1TVAAD//wAAVNX/v/9//7//f/+//3//v/9//3////9/////f////3///6qqqqqqqqqqqqqqqqqqqqqqKlTVqipU1aoqVNWqKlTV") }] blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_f5v27") +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_6fwow"] +data = PackedVector3Array(-2, 0, -8, -2, 0, 8, -2, 4, -8, -2, 4, -8, -2, 0, 8, -2, 4, 8, 2, 0, 8, 2, 0, -8, 2, 4, 8, 2, 4, 8, 2, 0, -8, 2, 4, -8, -2, 0, 8, -2, 0, -8, 2, 0, 8, 2, 0, 8, -2, 0, -8, 2, 0, -8, 2, 4, 8, 2, 4, -8, -2, 4, 8, -2, 4, 8, 2, 4, -8, -2, 4, -8) + [node name="Sandbox" type="Node3D"] [node name="WorldEnvironment" type="WorldEnvironment" parent="."] @@ -429,33 +443,14 @@ transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 3.9, 1 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) [node name="LevelTiles" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 25) -[node name="Hallway" parent="LevelTiles" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 2, 27) -mesh_instance = NodePath("MeshInstance3D") +[node name="Hallway1" parent="LevelTiles" instance=ExtResource("1_a67lu")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 8) +mask_dim = 512 -[node name="MeshInstance3D" type="MeshInstance3D" parent="LevelTiles/Hallway"] -mesh = ExtResource("6_2218n") +[node name="MeshInstance3D" type="MeshInstance3D" parent="LevelTiles/Hallway1"] +mesh = SubResource("ArrayMesh_fk1xc") -[node name="CollisionShape3D" type="CollisionShape3D" parent="LevelTiles/Hallway"] -shape = SubResource("ConcavePolygonShape3D_s1ctw") - -[node name="Hallway2" parent="LevelTiles" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 2, 31) -mesh_instance = NodePath("MeshInstance3D") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="LevelTiles/Hallway2"] -mesh = ExtResource("7_6fwow") - -[node name="CollisionShape3D" type="CollisionShape3D" parent="LevelTiles/Hallway2"] -shape = SubResource("ConcavePolygonShape3D_s1ctw") - -[node name="Hallway3" parent="LevelTiles" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 2, 35) -mesh_instance = NodePath("MeshInstance3D") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="LevelTiles/Hallway3"] -mesh = SubResource("ArrayMesh_6idi3") - -[node name="CollisionShape3D" type="CollisionShape3D" parent="LevelTiles/Hallway3"] -shape = SubResource("ConcavePolygonShape3D_s1ctw") +[node name="CollisionShape3D" type="CollisionShape3D" parent="LevelTiles/Hallway1"] +shape = SubResource("ConcavePolygonShape3D_6fwow") diff --git a/src/world/gunk_body/draw_controller.gd b/src/world/gunk_body/draw_controller.gd index 8c700b1..9091ede 100644 --- a/src/world/gunk_body/draw_controller.gd +++ b/src/world/gunk_body/draw_controller.gd @@ -8,6 +8,10 @@ var _draw_queue: Array[Callable] = [] var _dirty := false +func clear(color: Color) -> void: + queue_draw(func() -> void: draw_rect(Rect2(0, 0, size.x, size.y), color, true)) + + func queue_draw(op: Callable) -> void: _draw_queue.push_back(op) _dirty = true diff --git a/src/world/gunk_body/gunk_body.gd b/src/world/gunk_body/gunk_body.gd index 1fe3ca2..446a246 100644 --- a/src/world/gunk_body/gunk_body.gd +++ b/src/world/gunk_body/gunk_body.gd @@ -7,6 +7,7 @@ signal clear_total_updated(clear_total: float) const CONTINUITY_LIMIT := 16 const BUFFER_LIMIT := 3 const FACE_EPSILON := 0.01 +const CLEAR_COLOR := Color.BLACK const MASK_COLOR := Color.RED const CLEAR_TOTAL_EPSILON := 1 @@ -31,9 +32,6 @@ var _mutex: Mutex = Mutex.new() var _semaphore: Semaphore = Semaphore.new() var _exit_thread := false -@onready var mesh: ArrayMesh = mesh_instance.mesh -@onready var gunk_mat: ShaderMaterial = mesh_instance.mesh.surface_get_material(0).next_pass - @onready var mask_viewport: SubViewport = %MaskViewport @onready var mask_control: DrawController = %MaskControl @@ -41,9 +39,17 @@ var _exit_thread := false func _ready() -> void: + # If no mesh_instance was provided, use the first direct child. + if not mesh_instance: + for c: Node in get_children(): + if c is MeshInstance3D: + mesh_instance = c as MeshInstance3D + assert(mesh_instance, "GunkBody %s has no associated mesh!" % str(self)) + mask_viewport.size = Vector2(mask_dim, mask_dim) + var gunk_mat: ShaderMaterial = mesh_instance.mesh.surface_get_material(0).next_pass gunk_mat.set_shader_parameter("gunk_mask", mask_viewport.get_texture()) - meshtool.create_from_surface(mesh, 0) + meshtool.create_from_surface(mesh_instance.mesh as ArrayMesh, 0) _thread = Thread.new() _thread.start(_async_compute_clear_total) @@ -97,12 +103,7 @@ func _exit_tree() -> void: func clear_all() -> void: - mask_control.queue_draw( - func() -> void: - mask_control.draw_rect( - Rect2(0, 0, mask_control.size.x, mask_control.size.y), MASK_COLOR - ) - ) + mask_control.clear(MASK_COLOR) ## Get the precise number of gunk pixels cleared from this image.