diff --git a/assets/materials/dark_metal.material b/assets/materials/dark_metal.material index dc0b4f9..2022098 100644 Binary files a/assets/materials/dark_metal.material and b/assets/materials/dark_metal.material differ diff --git a/models/gun.mtl b/assets/models/gun.mtl similarity index 100% rename from models/gun.mtl rename to assets/models/gun.mtl diff --git a/models/gun.obj b/assets/models/gun.obj similarity index 100% rename from models/gun.obj rename to assets/models/gun.obj diff --git a/assets/models/gun.obj.import b/assets/models/gun.obj.import new file mode 100644 index 0000000..4495c91 --- /dev/null +++ b/assets/models/gun.obj.import @@ -0,0 +1,22 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://cxw30fmp15jsd" +path="res://.godot/imported/gun.obj-55069552efb9edd9572234d08c8d1b45.mesh" + +[deps] + +files=["res://.godot/imported/gun.obj-55069552efb9edd9572234d08c8d1b45.mesh"] + +source_file="res://assets/models/gun.obj" +dest_files=["res://.godot/imported/gun.obj-55069552efb9edd9572234d08c8d1b45.mesh", "res://.godot/imported/gun.obj-55069552efb9edd9572234d08c8d1b45.mesh"] + +[params] + +generate_tangents=true +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +optimize_mesh=true +force_disable_mesh_compression=false diff --git a/models/interior.mtl b/assets/models/interior.mtl similarity index 100% rename from models/interior.mtl rename to assets/models/interior.mtl diff --git a/models/interior.obj b/assets/models/interior.obj similarity index 100% rename from models/interior.obj rename to assets/models/interior.obj diff --git a/models/interior.obj.import b/assets/models/interior.obj.import similarity index 78% rename from models/interior.obj.import rename to assets/models/interior.obj.import index 484bf20..4a86bed 100644 --- a/models/interior.obj.import +++ b/assets/models/interior.obj.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://ddwkhfly2xyyt" -path="res://.godot/imported/interior.obj-e9c75aed421e938d72aee2931136abf2.scn" +path="res://.godot/imported/interior.obj-55c2104422dd265472e2dc908c77e55b.scn" [deps] -source_file="res://models/interior.obj" -dest_files=["res://.godot/imported/interior.obj-e9c75aed421e938d72aee2931136abf2.scn"] +source_file="res://assets/models/interior.obj" +dest_files=["res://.godot/imported/interior.obj-55c2104422dd265472e2dc908c77e55b.scn"] [params] diff --git a/assets/textures/world/material/scratcheslight/scratcheslight_nrm.jpg b/assets/textures/material/scratcheslight/scratcheslight_nrm.jpg similarity index 100% rename from assets/textures/world/material/scratcheslight/scratcheslight_nrm.jpg rename to assets/textures/material/scratcheslight/scratcheslight_nrm.jpg diff --git a/assets/textures/world/material/scratcheslight/scratcheslight_nrm.jpg.import b/assets/textures/material/scratcheslight/scratcheslight_nrm.jpg.import similarity index 69% rename from assets/textures/world/material/scratcheslight/scratcheslight_nrm.jpg.import rename to assets/textures/material/scratcheslight/scratcheslight_nrm.jpg.import index 0812405..e5d846b 100644 --- a/assets/textures/world/material/scratcheslight/scratcheslight_nrm.jpg.import +++ b/assets/textures/material/scratcheslight/scratcheslight_nrm.jpg.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://d3dolqycw3mpv" -path.s3tc="res://.godot/imported/scratcheslight_nrm.jpg-cef2cd69837be982cb939057d4094ba7.s3tc.ctex" +path.s3tc="res://.godot/imported/scratcheslight_nrm.jpg-18fa429a360cced79d3be2adbdd7724a.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://assets/textures/world/material/scratcheslight/scratcheslight_nrm.jpg" -dest_files=["res://.godot/imported/scratcheslight_nrm.jpg-cef2cd69837be982cb939057d4094ba7.s3tc.ctex"] +source_file="res://assets/textures/material/scratcheslight/scratcheslight_nrm.jpg" +dest_files=["res://.godot/imported/scratcheslight_nrm.jpg-18fa429a360cced79d3be2adbdd7724a.s3tc.ctex"] [params] diff --git a/assets/textures/world/material/scratcheslight/scratcheslight_overlay_var1.jpg b/assets/textures/material/scratcheslight/scratcheslight_overlay_var1.jpg similarity index 100% rename from assets/textures/world/material/scratcheslight/scratcheslight_overlay_var1.jpg rename to assets/textures/material/scratcheslight/scratcheslight_overlay_var1.jpg diff --git a/assets/textures/world/material/scratcheslight/scratcheslight_overlay_var1.jpg.import b/assets/textures/material/scratcheslight/scratcheslight_overlay_var1.jpg.import similarity index 78% rename from assets/textures/world/material/scratcheslight/scratcheslight_overlay_var1.jpg.import rename to assets/textures/material/scratcheslight/scratcheslight_overlay_var1.jpg.import index d3d2843..b47448d 100644 --- a/assets/textures/world/material/scratcheslight/scratcheslight_overlay_var1.jpg.import +++ b/assets/textures/material/scratcheslight/scratcheslight_overlay_var1.jpg.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://j0mywmwge6t5" -path.s3tc="res://.godot/imported/scratcheslight_overlay_var1.jpg-ef703486524ebdba7d069cba4d5dc9d6.s3tc.ctex" +path.s3tc="res://.godot/imported/scratcheslight_overlay_var1.jpg-91ccb47b3096ae71637fd2521d193943.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://assets/textures/world/material/scratcheslight/scratcheslight_overlay_var1.jpg" -dest_files=["res://.godot/imported/scratcheslight_overlay_var1.jpg-ef703486524ebdba7d069cba4d5dc9d6.s3tc.ctex"] +source_file="res://assets/textures/material/scratcheslight/scratcheslight_overlay_var1.jpg" +dest_files=["res://.godot/imported/scratcheslight_overlay_var1.jpg-91ccb47b3096ae71637fd2521d193943.s3tc.ctex"] [params] diff --git a/assets/textures/world/material/scratcheslight/scratcheslight_overlay_var2.jpg b/assets/textures/material/scratcheslight/scratcheslight_overlay_var2.jpg similarity index 100% rename from assets/textures/world/material/scratcheslight/scratcheslight_overlay_var2.jpg rename to assets/textures/material/scratcheslight/scratcheslight_overlay_var2.jpg diff --git a/assets/textures/world/material/scratcheslight/scratcheslight_overlay_var2.jpg.import b/assets/textures/material/scratcheslight/scratcheslight_overlay_var2.jpg.import similarity index 78% rename from assets/textures/world/material/scratcheslight/scratcheslight_overlay_var2.jpg.import rename to assets/textures/material/scratcheslight/scratcheslight_overlay_var2.jpg.import index 1e48dca..afd47a1 100644 --- a/assets/textures/world/material/scratcheslight/scratcheslight_overlay_var2.jpg.import +++ b/assets/textures/material/scratcheslight/scratcheslight_overlay_var2.jpg.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://bawjipies8h2d" -path.s3tc="res://.godot/imported/scratcheslight_overlay_var2.jpg-a387bd354d94a039bd96a93866271136.s3tc.ctex" +path.s3tc="res://.godot/imported/scratcheslight_overlay_var2.jpg-f3bf346e6cb7984fa5ef13230cd1822c.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://assets/textures/world/material/scratcheslight/scratcheslight_overlay_var2.jpg" -dest_files=["res://.godot/imported/scratcheslight_overlay_var2.jpg-a387bd354d94a039bd96a93866271136.s3tc.ctex"] +source_file="res://assets/textures/material/scratcheslight/scratcheslight_overlay_var2.jpg" +dest_files=["res://.godot/imported/scratcheslight_overlay_var2.jpg-f3bf346e6cb7984fa5ef13230cd1822c.s3tc.ctex"] [params] diff --git a/assets/textures/material/tiles_white/tiles_white_ambientocclusion.png b/assets/textures/material/tiles_white/tiles_white_ambientocclusion.png new file mode 100644 index 0000000..2da5e0d Binary files /dev/null and b/assets/textures/material/tiles_white/tiles_white_ambientocclusion.png differ diff --git a/assets/textures/material/tiles_white/tiles_white_ambientocclusion.png.import b/assets/textures/material/tiles_white/tiles_white_ambientocclusion.png.import new file mode 100644 index 0000000..5707c82 --- /dev/null +++ b/assets/textures/material/tiles_white/tiles_white_ambientocclusion.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bs0qseslb0ilu" +path.s3tc="res://.godot/imported/tiles_white_ambientocclusion.png-cd3dc31a62e7f63a228f8de74f1047e2.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/tiles_white/tiles_white_ambientocclusion.png" +dest_files=["res://.godot/imported/tiles_white_ambientocclusion.png-cd3dc31a62e7f63a228f8de74f1047e2.s3tc.ctex"] + +[params] + +compress/mode=2 +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/textures/material/tiles_white/tiles_white_color.png b/assets/textures/material/tiles_white/tiles_white_color.png new file mode 100644 index 0000000..3cbcdc2 Binary files /dev/null and b/assets/textures/material/tiles_white/tiles_white_color.png differ diff --git a/assets/textures/world/material/concretepoured/concretepoured_ao.png.import b/assets/textures/material/tiles_white/tiles_white_color.png.import similarity index 64% rename from assets/textures/world/material/concretepoured/concretepoured_ao.png.import rename to assets/textures/material/tiles_white/tiles_white_color.png.import index 8327890..fcbf10c 100644 --- a/assets/textures/world/material/concretepoured/concretepoured_ao.png.import +++ b/assets/textures/material/tiles_white/tiles_white_color.png.import @@ -2,8 +2,8 @@ importer="texture" type="CompressedTexture2D" -uid="uid://di4obkop8ephm" -path.s3tc="res://.godot/imported/concretepoured_ao.png-a79d0814135b8362ad9308bcce5b0ad3.s3tc.ctex" +uid="uid://c72iofq6gmfaa" +path.s3tc="res://.godot/imported/tiles_white_color.png-b7e4d4d6cf5346ed952e132b7eefef92.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://assets/textures/world/material/concretepoured/concretepoured_ao.png" -dest_files=["res://.godot/imported/concretepoured_ao.png-a79d0814135b8362ad9308bcce5b0ad3.s3tc.ctex"] +source_file="res://assets/textures/material/tiles_white/tiles_white_color.png" +dest_files=["res://.godot/imported/tiles_white_color.png-b7e4d4d6cf5346ed952e132b7eefef92.s3tc.ctex"] [params] diff --git a/assets/textures/material/tiles_white/tiles_white_displacement.png b/assets/textures/material/tiles_white/tiles_white_displacement.png new file mode 100644 index 0000000..0d98b11 Binary files /dev/null and b/assets/textures/material/tiles_white/tiles_white_displacement.png differ diff --git a/assets/textures/world/material/concretepoured/concretepoured_roughness.png.import b/assets/textures/material/tiles_white/tiles_white_displacement.png.import similarity index 62% rename from assets/textures/world/material/concretepoured/concretepoured_roughness.png.import rename to assets/textures/material/tiles_white/tiles_white_displacement.png.import index 9b34198..e66b2f7 100644 --- a/assets/textures/world/material/concretepoured/concretepoured_roughness.png.import +++ b/assets/textures/material/tiles_white/tiles_white_displacement.png.import @@ -2,8 +2,8 @@ importer="texture" type="CompressedTexture2D" -uid="uid://w4n61moqflg3" -path.s3tc="res://.godot/imported/concretepoured_roughness.png-1bd395c52dbe156f9db125f35bbbef64.s3tc.ctex" +uid="uid://6sx7ulg3hkq6" +path.s3tc="res://.godot/imported/tiles_white_displacement.png-eebd8e1b942b393a45c749872844c3be.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://assets/textures/world/material/concretepoured/concretepoured_roughness.png" -dest_files=["res://.godot/imported/concretepoured_roughness.png-1bd395c52dbe156f9db125f35bbbef64.s3tc.ctex"] +source_file="res://assets/textures/material/tiles_white/tiles_white_displacement.png" +dest_files=["res://.godot/imported/tiles_white_displacement.png-eebd8e1b942b393a45c749872844c3be.s3tc.ctex"] [params] diff --git a/assets/textures/material/tiles_white/tiles_white_normal.png b/assets/textures/material/tiles_white/tiles_white_normal.png new file mode 100644 index 0000000..fa671c6 Binary files /dev/null and b/assets/textures/material/tiles_white/tiles_white_normal.png differ diff --git a/assets/textures/world/material/concretepoured/concretepoured_nrm.png.import b/assets/textures/material/tiles_white/tiles_white_normal.png.import similarity index 56% rename from assets/textures/world/material/concretepoured/concretepoured_nrm.png.import rename to assets/textures/material/tiles_white/tiles_white_normal.png.import index dfe67f1..383257f 100644 --- a/assets/textures/world/material/concretepoured/concretepoured_nrm.png.import +++ b/assets/textures/material/tiles_white/tiles_white_normal.png.import @@ -2,8 +2,8 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cklnmi23c8c3j" -path.s3tc="res://.godot/imported/concretepoured_nrm.png-5c5c82cc35ae4b3d1b493fae59bc8c6e.s3tc.ctex" +uid="uid://cpw4myruauqs6" +path.s3tc="res://.godot/imported/tiles_white_normal.png-067941daf4127f774bbd09bf243a9d97.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://assets/textures/world/material/concretepoured/concretepoured_nrm.png" -dest_files=["res://.godot/imported/concretepoured_nrm.png-5c5c82cc35ae4b3d1b493fae59bc8c6e.s3tc.ctex"] +source_file="res://assets/textures/material/tiles_white/tiles_white_normal.png" +dest_files=["res://.godot/imported/tiles_white_normal.png-067941daf4127f774bbd09bf243a9d97.s3tc.ctex"] [params] @@ -25,7 +25,7 @@ compress/channel_pack=0 mipmaps/generate=true mipmaps/limit=-1 roughness/mode=1 -roughness/src_normal="res://assets/textures/world/material/concretepoured/concretepoured_nrm.png" +roughness/src_normal="res://assets/textures/material/tiles_white/tiles_white_normal.png" process/fix_alpha_border=true process/premult_alpha=false process/normal_map_invert_y=false diff --git a/assets/textures/material/tiles_white/tiles_white_roughness.png b/assets/textures/material/tiles_white/tiles_white_roughness.png new file mode 100644 index 0000000..38da997 Binary files /dev/null and b/assets/textures/material/tiles_white/tiles_white_roughness.png differ diff --git a/assets/textures/world/material/concretepoured/concretepoured_col.png.import b/assets/textures/material/tiles_white/tiles_white_roughness.png.import similarity index 63% rename from assets/textures/world/material/concretepoured/concretepoured_col.png.import rename to assets/textures/material/tiles_white/tiles_white_roughness.png.import index 7ba4821..e374e38 100644 --- a/assets/textures/world/material/concretepoured/concretepoured_col.png.import +++ b/assets/textures/material/tiles_white/tiles_white_roughness.png.import @@ -2,8 +2,8 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cgw1p1kkos7on" -path.s3tc="res://.godot/imported/concretepoured_col.png-5f34d7da5bec2d868cbf5f0776aa3b1e.s3tc.ctex" +uid="uid://uy7vdufb7mhc" +path.s3tc="res://.godot/imported/tiles_white_roughness.png-a85b81a13a3945f7f867fb7c502416be.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://assets/textures/world/material/concretepoured/concretepoured_col.png" -dest_files=["res://.godot/imported/concretepoured_col.png-5f34d7da5bec2d868cbf5f0776aa3b1e.s3tc.ctex"] +source_file="res://assets/textures/material/tiles_white/tiles_white_roughness.png" +dest_files=["res://.godot/imported/tiles_white_roughness.png-a85b81a13a3945f7f867fb7c502416be.s3tc.ctex"] [params] diff --git a/assets/textures/material/tilesslatesquare/tilesslatesquare_ao.png b/assets/textures/material/tilesslatesquare/tilesslatesquare_ao.png new file mode 100644 index 0000000..a5e91f3 Binary files /dev/null and b/assets/textures/material/tilesslatesquare/tilesslatesquare_ao.png differ diff --git a/assets/textures/world/material/concretepoured/concretepoured_metalness.png.import b/assets/textures/material/tilesslatesquare/tilesslatesquare_ao.png.import similarity index 62% rename from assets/textures/world/material/concretepoured/concretepoured_metalness.png.import rename to assets/textures/material/tilesslatesquare/tilesslatesquare_ao.png.import index 2bb0f9b..8b5c8b4 100644 --- a/assets/textures/world/material/concretepoured/concretepoured_metalness.png.import +++ b/assets/textures/material/tilesslatesquare/tilesslatesquare_ao.png.import @@ -2,8 +2,8 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bcbgpyrfr4123" -path.s3tc="res://.godot/imported/concretepoured_metalness.png-098824f115938a4557485d813f767042.s3tc.ctex" +uid="uid://dkggxcnlqd2rb" +path.s3tc="res://.godot/imported/tilesslatesquare_ao.png-16a45080f01188541f0838150f3014c2.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://assets/textures/world/material/concretepoured/concretepoured_metalness.png" -dest_files=["res://.godot/imported/concretepoured_metalness.png-098824f115938a4557485d813f767042.s3tc.ctex"] +source_file="res://assets/textures/material/tilesslatesquare/tilesslatesquare_ao.png" +dest_files=["res://.godot/imported/tilesslatesquare_ao.png-16a45080f01188541f0838150f3014c2.s3tc.ctex"] [params] diff --git a/assets/textures/material/tilesslatesquare/tilesslatesquare_col.png b/assets/textures/material/tilesslatesquare/tilesslatesquare_col.png new file mode 100644 index 0000000..4bfa78e Binary files /dev/null and b/assets/textures/material/tilesslatesquare/tilesslatesquare_col.png differ diff --git a/assets/textures/material/tilesslatesquare/tilesslatesquare_col.png.import b/assets/textures/material/tilesslatesquare/tilesslatesquare_col.png.import new file mode 100644 index 0000000..11e6cd1 --- /dev/null +++ b/assets/textures/material/tilesslatesquare/tilesslatesquare_col.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bu7e43m8dswwk" +path.s3tc="res://.godot/imported/tilesslatesquare_col.png-6f986e74052d72b68355bd25dc6cd6df.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/tilesslatesquare/tilesslatesquare_col.png" +dest_files=["res://.godot/imported/tilesslatesquare_col.png-6f986e74052d72b68355bd25dc6cd6df.s3tc.ctex"] + +[params] + +compress/mode=2 +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/textures/material/tilesslatesquare/tilesslatesquare_metalness.png b/assets/textures/material/tilesslatesquare/tilesslatesquare_metalness.png new file mode 100644 index 0000000..b459859 Binary files /dev/null and b/assets/textures/material/tilesslatesquare/tilesslatesquare_metalness.png differ diff --git a/assets/textures/material/tilesslatesquare/tilesslatesquare_metalness.png.import b/assets/textures/material/tilesslatesquare/tilesslatesquare_metalness.png.import new file mode 100644 index 0000000..a6752aa --- /dev/null +++ b/assets/textures/material/tilesslatesquare/tilesslatesquare_metalness.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bsklw2r406fc7" +path.s3tc="res://.godot/imported/tilesslatesquare_metalness.png-56e73327735453c8081af0f8320756b0.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/tilesslatesquare/tilesslatesquare_metalness.png" +dest_files=["res://.godot/imported/tilesslatesquare_metalness.png-56e73327735453c8081af0f8320756b0.s3tc.ctex"] + +[params] + +compress/mode=2 +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/textures/material/tilesslatesquare/tilesslatesquare_nrm.png b/assets/textures/material/tilesslatesquare/tilesslatesquare_nrm.png new file mode 100644 index 0000000..c50f105 Binary files /dev/null and b/assets/textures/material/tilesslatesquare/tilesslatesquare_nrm.png differ diff --git a/assets/textures/material/tilesslatesquare/tilesslatesquare_nrm.png.import b/assets/textures/material/tilesslatesquare/tilesslatesquare_nrm.png.import new file mode 100644 index 0000000..9ab8ffd --- /dev/null +++ b/assets/textures/material/tilesslatesquare/tilesslatesquare_nrm.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cet7gsgfgw1m2" +path.s3tc="res://.godot/imported/tilesslatesquare_nrm.png-a3d296bebdfa35e8189fbccb1e4e82d3.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/tilesslatesquare/tilesslatesquare_nrm.png" +dest_files=["res://.godot/imported/tilesslatesquare_nrm.png-a3d296bebdfa35e8189fbccb1e4e82d3.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://assets/textures/material/tilesslatesquare/tilesslatesquare_nrm.png" +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/textures/material/tilesslatesquare/tilesslatesquare_roughness.png b/assets/textures/material/tilesslatesquare/tilesslatesquare_roughness.png new file mode 100644 index 0000000..6d2d746 Binary files /dev/null and b/assets/textures/material/tilesslatesquare/tilesslatesquare_roughness.png differ diff --git a/assets/textures/material/tilesslatesquare/tilesslatesquare_roughness.png.import b/assets/textures/material/tilesslatesquare/tilesslatesquare_roughness.png.import new file mode 100644 index 0000000..9a1f2f1 --- /dev/null +++ b/assets/textures/material/tilesslatesquare/tilesslatesquare_roughness.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://48js50w57wk4" +path.s3tc="res://.godot/imported/tilesslatesquare_roughness.png-4f4f6aa37a1b5ce4c384b3d49a30beab.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/tilesslatesquare/tilesslatesquare_roughness.png" +dest_files=["res://.godot/imported/tilesslatesquare_roughness.png-4f4f6aa37a1b5ce4c384b3d49a30beab.s3tc.ctex"] + +[params] + +compress/mode=2 +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/textures/world/flashlight_effect.png b/assets/textures/world/flashlight_effect.png deleted file mode 100644 index 10b7ebb..0000000 Binary files a/assets/textures/world/flashlight_effect.png and /dev/null differ diff --git a/assets/textures/world/flashlight_effect.png.import b/assets/textures/world/flashlight_effect.png.import deleted file mode 100644 index 98134be..0000000 --- a/assets/textures/world/flashlight_effect.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://2xwafdhiha6x" -path="res://.godot/imported/flashlight_effect.png-39f6e7fded086510ce3aace3d3d018c6.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/textures/world/flashlight_effect.png" -dest_files=["res://.godot/imported/flashlight_effect.png-39f6e7fded086510ce3aace3d3d018c6.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=false -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=1 diff --git a/assets/textures/world/material/concretepoured/concretepoured_ao.png b/assets/textures/world/material/concretepoured/concretepoured_ao.png deleted file mode 100644 index d21eb24..0000000 Binary files a/assets/textures/world/material/concretepoured/concretepoured_ao.png and /dev/null differ diff --git a/assets/textures/world/material/concretepoured/concretepoured_col.png b/assets/textures/world/material/concretepoured/concretepoured_col.png deleted file mode 100644 index 554022e..0000000 Binary files a/assets/textures/world/material/concretepoured/concretepoured_col.png and /dev/null differ diff --git a/assets/textures/world/material/concretepoured/concretepoured_metalness.png b/assets/textures/world/material/concretepoured/concretepoured_metalness.png deleted file mode 100644 index a262242..0000000 Binary files a/assets/textures/world/material/concretepoured/concretepoured_metalness.png and /dev/null differ diff --git a/assets/textures/world/material/concretepoured/concretepoured_nrm.png b/assets/textures/world/material/concretepoured/concretepoured_nrm.png deleted file mode 100644 index dbe5f15..0000000 Binary files a/assets/textures/world/material/concretepoured/concretepoured_nrm.png and /dev/null differ diff --git a/assets/textures/world/material/concretepoured/concretepoured_roughness.png b/assets/textures/world/material/concretepoured/concretepoured_roughness.png deleted file mode 100644 index 8ea189e..0000000 Binary files a/assets/textures/world/material/concretepoured/concretepoured_roughness.png and /dev/null differ diff --git a/models/gun.obj.import b/models/gun.obj.import deleted file mode 100644 index fc9a5c0..0000000 --- a/models/gun.obj.import +++ /dev/null @@ -1,22 +0,0 @@ -[remap] - -importer="wavefront_obj" -importer_version=1 -type="Mesh" -uid="uid://cxw30fmp15jsd" -path="res://.godot/imported/gun.obj-ffb7f3878e9e13531f79f0665c22a5e9.mesh" - -[deps] - -files=["res://.godot/imported/gun.obj-ffb7f3878e9e13531f79f0665c22a5e9.mesh"] - -source_file="res://models/gun.obj" -dest_files=["res://.godot/imported/gun.obj-ffb7f3878e9e13531f79f0665c22a5e9.mesh", "res://.godot/imported/gun.obj-ffb7f3878e9e13531f79f0665c22a5e9.mesh"] - -[params] - -generate_tangents=true -scale_mesh=Vector3(1, 1, 1) -offset_mesh=Vector3(0, 0, 0) -optimize_mesh=true -force_disable_mesh_compression=false diff --git a/project.godot b/project.godot index a44a45c..053929c 100644 --- a/project.godot +++ b/project.godot @@ -27,6 +27,19 @@ window/stretch/mode="canvas_items" enabled=PackedStringArray("res://addons/destruction/plugin.cfg") +[file_customization] + +folder_colors={ +"res://addons/": "purple", +"res://assets/": "pink", +"res://assets/models/": "pink", +"res://cube/": "gray", +"res://resources/": "yellow", +"res://scenes/": "blue", +"res://scripts/": "green", +"res://shaders/": "orange" +} + [input] move_left={ @@ -87,5 +100,6 @@ anti_aliasing/quality/msaa_3d=1 anti_aliasing/quality/screen_space_aa=1 anti_aliasing/quality/use_taa=true anti_aliasing/quality/use_debanding=true +occlusion_culling/use_occlusion_culling=true environment/defaults/default_environment="res://resources/environment.tres" environment/defaults/default_clear_color.release=Color(0, 0, 0, 1) diff --git a/resources/environment.tres b/resources/environment.tres index 7007f4b..e135513 100644 --- a/resources/environment.tres +++ b/resources/environment.tres @@ -2,10 +2,8 @@ [resource] background_mode = 2 -background_color = Color(1, 1, 1, 1) +background_color = Color(1, 0.956863, 0.74902, 1) ambient_light_source = 2 -ambient_light_color = Color(0.678431, 0.501961, 0, 1) -ambient_light_energy = 1.5 -tonemap_mode = 1 +ambient_light_color = Color(1, 0.956863, 0.74902, 1) +tonemap_mode = 2 ssao_enabled = true -glow_enabled = true diff --git a/scenes/completion_counter.tscn b/scenes/completion_counter.tscn index 4c99006..3bbb495 100644 --- a/scenes/completion_counter.tscn +++ b/scenes/completion_counter.tscn @@ -1,11 +1,24 @@ -[gd_scene load_steps=3 format=3 uid="uid://22blfybi6n4q"] +[gd_scene load_steps=5 format=3 uid="uid://22blfybi6n4q"] [ext_resource type="Script" path="res://scripts/completion_counter.gd" id="1_40xge"] [sub_resource type="BoxMesh" id="BoxMesh_w280a"] size = Vector3(1, 0.2, 0.1) +[sub_resource type="BoxMesh" id="BoxMesh_b3hjf"] +size = Vector3(0.1, 0.1, 0.1) + +[sub_resource type="MultiMesh" id="MultiMesh_lx3df"] +transform_format = 1 +instance_count = 2 +mesh = SubResource("BoxMesh_b3hjf") +buffer = PackedFloat32Array(1.001, 0, 0, -0.075992, 0, 0, -1.001, -0.0484443, 0, 1.001, 0, -0.16236, 0, 0, 1.001, -0.295454, 0, -1.001, 0, -0.1, 1.001, 0, 0, -0.1905) + [node name="CompletionCounter" type="MeshInstance3D"] editor_description = "The amount of signals it needs connected and fired to emit a signal" mesh = SubResource("BoxMesh_w280a") script = ExtResource("1_40xge") + +[node name="MultiMeshInstance3D" type="MultiMeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.27379, 0.0888374, 0.219394) +multimesh = SubResource("MultiMesh_lx3df") diff --git a/scenes/gravity_gun.tscn b/scenes/gravity_gun.tscn index 0bc0c67..d7a33b1 100644 --- a/scenes/gravity_gun.tscn +++ b/scenes/gravity_gun.tscn @@ -1,14 +1,10 @@ [gd_scene load_steps=21 format=3 uid="uid://cl6gw3huejnrl"] [ext_resource type="Script" path="res://scripts/gravity_gun.gd" id="1_0upyy"] -[ext_resource type="ArrayMesh" uid="uid://cxw30fmp15jsd" path="res://models/gun.obj" id="1_803cf"] +[ext_resource type="ArrayMesh" uid="uid://cxw30fmp15jsd" path="res://assets/models/gun.obj" id="1_803cf"] [ext_resource type="Environment" uid="uid://drn5fwa4uhv4m" path="res://resources/environment.tres" id="1_vtn44"] [ext_resource type="Material" uid="uid://b6r8e4302xg1d" path="res://assets/materials/dark_metal.material" id="2_qrl87"] [ext_resource type="Shader" path="res://shaders/pbr_glass.gdshader" id="3_aeppb"] -[ext_resource type="Material" uid="uid://djwaye0a3cmds" path="res://assets/materials/wood.material" id="4_expk1"] -[ext_resource type="Material" uid="uid://wi5k6axixuwr" path="res://assets/materials/metal.material" id="5_algr0"] -[ext_resource type="Material" uid="uid://dy6hjdu4t4wan" path="res://assets/materials/orange_glow.material" id="6_ocwsh"] -[ext_resource type="Material" uid="uid://c8bic1or51fbf" path="res://assets/materials/old_plastic.material" id="7_c1s4a"] [ext_resource type="Texture2D" uid="uid://b4en3dw3q324p" path="res://assets/textures/circle.png" id="8_al3c7"] [sub_resource type="World3D" id="World3D_wp4pn"] @@ -21,13 +17,37 @@ func _ready() -> void: msaa_3d = ProjectSettings.get_setting(\"rendering/anti_aliasing/quality/msaa_3d\",0) " -[sub_resource type="ShaderMaterial" id="ShaderMaterial_twwch"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_b1al8"] render_priority = 0 shader = ExtResource("3_aeppb") -shader_parameter/albedo = Color(1, 1, 1, 0.0156863) -shader_parameter/roughness = 0.301 -shader_parameter/normal_strength = 16.0 -shader_parameter/edge_color = Color(1, 1, 1, 1) +shader_parameter/albedo = Color(1, 1, 0.729412, 0.270588) +shader_parameter/roughness = 0.15 +shader_parameter/normal_strength = 1.0 +shader_parameter/edge_color = Color(0, 0, 0, 1) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3g65u"] +albedo_color = Color(0.08984, 0.019501, 0, 1) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_sgrb8"] +albedo_color = Color(0.447059, 0.447059, 0.447059, 1) +metallic = 0.94 +roughness = 0.3 +clearcoat_enabled = true +ao_light_affect = 0.22 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6ml44"] +albedo_color = Color(1, 0, 0, 1) +metallic_specular = 0.0 +emission_enabled = true +emission = Color(1, 0.156863, 0, 1) +emission_energy_multiplier = 16.0 +backlight_enabled = true +backlight = Color(1, 0.215686, 0, 1) +disable_receive_shadows = true + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_r64y0"] +albedo_color = Color(1, 0.945098, 0.72549, 1) +metallic_specular = 0.0 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_yttr4"] lifetime_randomness = 0.1 @@ -109,10 +129,9 @@ script = SubResource("GDScript_sr7lp") [node name="Node3D" type="Node3D" parent="SubViewportContainer/SubViewport"] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="SubViewportContainer/SubViewport/Node3D"] -transform = Transform3D(0.707107, -0.5, 0.5, 0, 0.707107, 0.707107, -0.707107, -0.5, 0.5, 0, 0, 0) +transform = Transform3D(0.707107, -0.707107, 0, 0.5, 0.5, 0.707107, -0.5, -0.5, 0.707107, 0, 0, 0) directional_shadow_blend_splits = true sky_mode = 1 -metadata/_edit_lock_ = true [node name="Camera3D" type="Camera3D" parent="SubViewportContainer/SubViewport/Node3D"] @@ -121,11 +140,11 @@ transform = Transform3D(0.00445237, 0.182181, 0.983255, 0.0240231, 0.982961, -0. mesh = ExtResource("1_803cf") skeleton = NodePath("../..") surface_material_override/0 = ExtResource("2_qrl87") -surface_material_override/1 = SubResource("ShaderMaterial_twwch") -surface_material_override/2 = ExtResource("4_expk1") -surface_material_override/3 = ExtResource("5_algr0") -surface_material_override/4 = ExtResource("6_ocwsh") -surface_material_override/5 = ExtResource("7_c1s4a") +surface_material_override/1 = SubResource("ShaderMaterial_b1al8") +surface_material_override/2 = SubResource("StandardMaterial3D_3g65u") +surface_material_override/3 = SubResource("StandardMaterial3D_sgrb8") +surface_material_override/4 = SubResource("StandardMaterial3D_6ml44") +surface_material_override/5 = SubResource("StandardMaterial3D_r64y0") [node name="GPUParticles3D" type="GPUParticles3D" parent="SubViewportContainer/SubViewport/Node3D/Camera3D/MeshInstance3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.20308, -0.000130415, 0.165362) diff --git a/scenes/levels/debug.tscn b/scenes/levels/debug.tscn index 83cdeae..9322e3c 100644 --- a/scenes/levels/debug.tscn +++ b/scenes/levels/debug.tscn @@ -1,58 +1,56 @@ -[gd_scene load_steps=17 format=3 uid="uid://ckad8stc13n83"] +[gd_scene load_steps=18 format=3 uid="uid://ckad8stc13n83"] [ext_resource type="PackedScene" uid="uid://gg5ph541e4p3" path="res://scenes/player.tscn" id="1_2585i"] -[ext_resource type="PackedScene" uid="uid://ddwkhfly2xyyt" path="res://models/interior.obj" id="1_lphcl"] -[ext_resource type="Texture2D" uid="uid://cgw1p1kkos7on" path="res://assets/textures/world/material/concretepoured/concretepoured_col.png" id="2_l4ecd"] -[ext_resource type="Texture2D" uid="uid://bawjipies8h2d" path="res://assets/textures/world/material/scratcheslight/scratcheslight_overlay_var2.jpg" id="2_q6muq"] +[ext_resource type="PackedScene" uid="uid://ddwkhfly2xyyt" path="res://assets/models/interior.obj" id="1_lphcl"] +[ext_resource type="Texture2D" uid="uid://bu7e43m8dswwk" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare_col.png" id="2_irc8l"] [ext_resource type="PackedScene" uid="uid://b8bvidqu7tmfs" path="res://scenes/objects/interactables/task_terminal.tscn" id="3_30m3x"] -[ext_resource type="Texture2D" uid="uid://di4obkop8ephm" path="res://assets/textures/world/material/concretepoured/concretepoured_ao.png" id="3_kjg8t"] -[ext_resource type="Texture2D" uid="uid://d3dolqycw3mpv" path="res://assets/textures/world/material/scratcheslight/scratcheslight_nrm.jpg" id="3_ngvi5"] -[ext_resource type="Texture2D" uid="uid://bcbgpyrfr4123" path="res://assets/textures/world/material/concretepoured/concretepoured_metalness.png" id="4_3bilk"] +[ext_resource type="Texture2D" uid="uid://dkggxcnlqd2rb" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare_ao.png" id="3_465hc"] [ext_resource type="PackedScene" uid="uid://dqy8bqf1chm8c" path="res://scenes/objects/interactables/button_stand.tscn" id="4_cruoa"] -[ext_resource type="Texture2D" uid="uid://j0mywmwge6t5" path="res://assets/textures/world/material/scratcheslight/scratcheslight_overlay_var1.jpg" id="4_krrud"] +[ext_resource type="Texture2D" uid="uid://bsklw2r406fc7" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare_metalness.png" id="4_sn3wt"] [ext_resource type="PackedScene" uid="uid://22blfybi6n4q" path="res://scenes/completion_counter.tscn" id="5_lo1l3"] -[ext_resource type="Texture2D" uid="uid://cklnmi23c8c3j" path="res://assets/textures/world/material/concretepoured/concretepoured_nrm.png" id="5_we3dw"] +[ext_resource type="Texture2D" uid="uid://cet7gsgfgw1m2" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare_nrm.png" id="5_pffg3"] [ext_resource type="PackedScene" uid="uid://cy0x2nliyw8gw" path="res://scenes/door.tscn" id="6_853p2"] -[ext_resource type="Texture2D" uid="uid://w4n61moqflg3" path="res://assets/textures/world/material/concretepoured/concretepoured_roughness.png" id="6_bdw2q"] +[ext_resource type="Texture2D" uid="uid://48js50w57wk4" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare_roughness.png" id="6_vrqt2"] +[ext_resource type="Texture2D" uid="uid://c72iofq6gmfaa" path="res://assets/textures/material/tiles_white/tiles_white_color.png" id="7_qai4q"] +[ext_resource type="Texture2D" uid="uid://bs0qseslb0ilu" path="res://assets/textures/material/tiles_white/tiles_white_ambientocclusion.png" id="8_wcubh"] +[ext_resource type="Texture2D" uid="uid://cpw4myruauqs6" path="res://assets/textures/material/tiles_white/tiles_white_normal.png" id="9_xs8gx"] +[ext_resource type="Texture2D" uid="uid://uy7vdufb7mhc" path="res://assets/textures/material/tiles_white/tiles_white_roughness.png" id="10_mli04"] -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_780x3"] -albedo_texture = ExtResource("2_q6muq") -metallic_specular = 0.0 -roughness_texture = ExtResource("4_krrud") -normal_enabled = true -normal_texture = ExtResource("3_ngvi5") -clearcoat_enabled = true -clearcoat = 0.15 -clearcoat_texture = ExtResource("4_krrud") -uv1_scale = Vector3(30, 30, 30) -uv2_triplanar_sharpness = 3.605 - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cra61"] -albedo_texture = ExtResource("2_l4ecd") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dkjw0"] +albedo_texture = ExtResource("2_irc8l") metallic = 1.0 -metallic_texture = ExtResource("4_3bilk") -roughness_texture = ExtResource("6_bdw2q") +metallic_texture = ExtResource("4_sn3wt") +roughness_texture = ExtResource("6_vrqt2") normal_enabled = true -normal_texture = ExtResource("5_we3dw") +normal_texture = ExtResource("5_pffg3") ao_enabled = true -ao_texture = ExtResource("3_kjg8t") +ao_texture = ExtResource("3_465hc") +uv1_scale = Vector3(35, 35, 35) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cl8ik"] +albedo_texture = ExtResource("7_qai4q") +roughness_texture = ExtResource("10_mli04") +normal_enabled = true +normal_texture = ExtResource("9_xs8gx") +ao_enabled = true +ao_texture = ExtResource("8_wcubh") +uv1_scale = Vector3(8, 30, 8) [node name="Debug" type="Node3D"] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(0.707107, -0.5, 0.5, 0, 0.707107, 0.707107, -0.707107, -0.5, 0.5, 0, 0, 0) +transform = Transform3D(0.707107, -0.707107, 0, 0.5, 0.5, 0.707107, -0.5, -0.5, 0.707107, 0, 0, 0) directional_shadow_blend_splits = true sky_mode = 1 -metadata/_edit_lock_ = true [node name="interior" parent="." instance=ExtResource("1_lphcl")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0) [node name="Hallway" parent="interior" index="0"] -surface_material_override/0 = SubResource("StandardMaterial3D_780x3") +surface_material_override/0 = SubResource("StandardMaterial3D_dkjw0") [node name="Cube" parent="interior" index="1"] -surface_material_override/0 = SubResource("StandardMaterial3D_cra61") +surface_material_override/0 = SubResource("StandardMaterial3D_cl8ik") [node name="Player" parent="." instance=ExtResource("1_2585i")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 5.23956) diff --git a/scripts/player.gd b/scripts/player.gd index d3332ea..a990b86 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -41,7 +41,7 @@ func _input(event: InputEvent) -> void: if event is InputEventMouseMotion && Input.mouse_mode == Input.MOUSE_MODE_CAPTURED: rotate_y(-event.relative.x * camera_senitivity * 0.0025) camera.rotate_x(-event.relative.y * camera_senitivity * 0.0015) - camera.rotation_degrees.x = clamp(camera.rotation_degrees.x, -30, 80) + camera.rotation_degrees.x = clamp(camera.rotation_degrees.x, -40, 80) if event.is_action_pressed("pause"): capture(false) if event.is_action_pressed("mouse_capture"):