diff --git a/asset_dev/particles/dust.xcf b/asset_dev/particles/dust.xcf new file mode 100644 index 0000000..a4f8881 Binary files /dev/null and b/asset_dev/particles/dust.xcf differ diff --git a/asset_dev/props/cube.blend b/asset_dev/props/debug/cube.blend similarity index 100% rename from asset_dev/props/cube.blend rename to asset_dev/props/debug/cube.blend diff --git a/asset_dev/props/cube.blend.import b/asset_dev/props/debug/cube.blend.import similarity index 95% rename from asset_dev/props/cube.blend.import rename to asset_dev/props/debug/cube.blend.import index b08e279..3dbfe18 100644 --- a/asset_dev/props/cube.blend.import +++ b/asset_dev/props/debug/cube.blend.import @@ -8,7 +8,7 @@ valid=false [deps] -source_file="res://asset_dev/props/cube.blend" +source_file="res://asset_dev/props/debug/cube.blend" [params] diff --git a/asset_dev/props/cylinder.blend b/asset_dev/props/debug/cylinder.blend similarity index 100% rename from asset_dev/props/cylinder.blend rename to asset_dev/props/debug/cylinder.blend diff --git a/asset_dev/props/cylinder.blend.import b/asset_dev/props/debug/cylinder.blend.import similarity index 95% rename from asset_dev/props/cylinder.blend.import rename to asset_dev/props/debug/cylinder.blend.import index 7a76758..13b2157 100644 --- a/asset_dev/props/cylinder.blend.import +++ b/asset_dev/props/debug/cylinder.blend.import @@ -8,7 +8,7 @@ valid=false [deps] -source_file="res://asset_dev/props/cylinder.blend" +source_file="res://asset_dev/props/debug/cylinder.blend" [params] diff --git a/asset_dev/props/cylinder.blend1 b/asset_dev/props/debug/cylinder.blend1 similarity index 100% rename from asset_dev/props/cylinder.blend1 rename to asset_dev/props/debug/cylinder.blend1 diff --git a/asset_dev/props/icosahedron.blend b/asset_dev/props/debug/icosahedron.blend similarity index 100% rename from asset_dev/props/icosahedron.blend rename to asset_dev/props/debug/icosahedron.blend diff --git a/asset_dev/props/icosahedron.blend.import b/asset_dev/props/debug/icosahedron.blend.import similarity index 95% rename from asset_dev/props/icosahedron.blend.import rename to asset_dev/props/debug/icosahedron.blend.import index f266940..004888c 100644 --- a/asset_dev/props/icosahedron.blend.import +++ b/asset_dev/props/debug/icosahedron.blend.import @@ -8,7 +8,7 @@ valid=false [deps] -source_file="res://asset_dev/props/icosahedron.blend" +source_file="res://asset_dev/props/debug/icosahedron.blend" [params] diff --git a/asset_dev/props/monkey.blend b/asset_dev/props/debug/monkey.blend similarity index 100% rename from asset_dev/props/monkey.blend rename to asset_dev/props/debug/monkey.blend diff --git a/asset_dev/props/monkey.blend.import b/asset_dev/props/debug/monkey.blend.import similarity index 95% rename from asset_dev/props/monkey.blend.import rename to asset_dev/props/debug/monkey.blend.import index 3ab4a56..b0bc792 100644 --- a/asset_dev/props/monkey.blend.import +++ b/asset_dev/props/debug/monkey.blend.import @@ -8,7 +8,7 @@ valid=false [deps] -source_file="res://asset_dev/props/monkey.blend" +source_file="res://asset_dev/props/debug/monkey.blend" [params] diff --git a/asset_dev/props/monkey.blend1 b/asset_dev/props/debug/monkey.blend1 similarity index 100% rename from asset_dev/props/monkey.blend1 rename to asset_dev/props/debug/monkey.blend1 diff --git a/asset_dev/props/wall_switch/wall_switch.blend b/asset_dev/props/wall_switch/wall_switch.blend new file mode 100644 index 0000000..2898ef7 Binary files /dev/null and b/asset_dev/props/wall_switch/wall_switch.blend differ diff --git a/asset_dev/props/wall_switch/wall_switch.blend.import b/asset_dev/props/wall_switch/wall_switch.blend.import new file mode 100644 index 0000000..41c9a78 --- /dev/null +++ b/asset_dev/props/wall_switch/wall_switch.blend.import @@ -0,0 +1,50 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bhitoqxaf5wi1" +valid=false + +[deps] + +source_file="res://asset_dev/props/wall_switch/wall_switch.blend" + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +blender/nodes/visible=0 +blender/nodes/active_collection_only=false +blender/nodes/punctual_lights=true +blender/nodes/cameras=true +blender/nodes/custom_properties=true +blender/nodes/modifiers=1 +blender/meshes/colors=false +blender/meshes/uvs=true +blender/meshes/normals=true +blender/meshes/tangents=true +blender/meshes/skins=2 +blender/meshes/export_bones_deforming_mesh_only=false +blender/materials/unpack_enabled=true +blender/materials/export_materials=1 +blender/animation/limit_playback=true +blender/animation/always_sample=true +blender/animation/group_tracks=true diff --git a/asset_dev/props/wall_switch/wall_switch.blend1 b/asset_dev/props/wall_switch/wall_switch.blend1 new file mode 100644 index 0000000..4b39071 Binary files /dev/null and b/asset_dev/props/wall_switch/wall_switch.blend1 differ diff --git a/asset_dev/props/wall_switch/wall_switch1.blend b/asset_dev/props/wall_switch/wall_switch1.blend new file mode 100644 index 0000000..05a92d9 Binary files /dev/null and b/asset_dev/props/wall_switch/wall_switch1.blend differ diff --git a/asset_dev/props/wall_switch/wall_switch1.blend.import b/asset_dev/props/wall_switch/wall_switch1.blend.import new file mode 100644 index 0000000..608f912 --- /dev/null +++ b/asset_dev/props/wall_switch/wall_switch1.blend.import @@ -0,0 +1,50 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://c53ypeltftdgt" +valid=false + +[deps] + +source_file="res://asset_dev/props/wall_switch/wall_switch1.blend" + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +blender/nodes/visible=0 +blender/nodes/active_collection_only=false +blender/nodes/punctual_lights=true +blender/nodes/cameras=true +blender/nodes/custom_properties=true +blender/nodes/modifiers=1 +blender/meshes/colors=false +blender/meshes/uvs=true +blender/meshes/normals=true +blender/meshes/tangents=true +blender/meshes/skins=2 +blender/meshes/export_bones_deforming_mesh_only=false +blender/materials/unpack_enabled=true +blender/materials/export_materials=1 +blender/animation/limit_playback=true +blender/animation/always_sample=true +blender/animation/group_tracks=true diff --git a/asset_dev/props/wall_switch/wall_switch1.blend1 b/asset_dev/props/wall_switch/wall_switch1.blend1 new file mode 100644 index 0000000..46d606d Binary files /dev/null and b/asset_dev/props/wall_switch/wall_switch1.blend1 differ diff --git a/assets/materials/gunk_material.tres b/assets/materials/gunk_material.tres index 2e858a8..34e602d 100644 --- a/assets/materials/gunk_material.tres +++ b/assets/materials/gunk_material.tres @@ -28,14 +28,14 @@ shader = ExtResource("1_euy6e") 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.875, 1, 1) -shader_parameter/pixellation = 100.0 +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(8, 8) shader_parameter/time_scale = 0.2 -shader_parameter/edge_bleed = 0.1 +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") diff --git a/assets/particles/dust/dust_1.png b/assets/particles/dust/dust_1.png new file mode 100644 index 0000000..d4517dd --- /dev/null +++ b/assets/particles/dust/dust_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bde705aba7471208be08d83047d9029376da6d4db8142008b5514c772d427a6 +size 580 diff --git a/assets/particles/dust/dust_1.png.import b/assets/particles/dust/dust_1.png.import new file mode 100644 index 0000000..4e93ae6 --- /dev/null +++ b/assets/particles/dust/dust_1.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://iysu3fufqrbr" +path.s3tc="res://.godot/imported/dust_1.png-1ba1c9b4a47b6d4f270482b6b52a82c7.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/particles/dust/dust_1.png" +dest_files=["res://.godot/imported/dust_1.png-1ba1c9b4a47b6d4f270482b6b52a82c7.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/particles/dust/dust_2.png b/assets/particles/dust/dust_2.png new file mode 100644 index 0000000..5c65e3b --- /dev/null +++ b/assets/particles/dust/dust_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:874c9a214760ea8e596f2c8e5bb27abd55036f29abe52c6ef9a3f1d5b24880c3 +size 572 diff --git a/assets/particles/dust/dust_2.png.import b/assets/particles/dust/dust_2.png.import new file mode 100644 index 0000000..bd792eb --- /dev/null +++ b/assets/particles/dust/dust_2.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dy1b3rv3b473p" +path.s3tc="res://.godot/imported/dust_2.png-20e139a86704238b162b60ceac7897ca.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/particles/dust/dust_2.png" +dest_files=["res://.godot/imported/dust_2.png-20e139a86704238b162b60ceac7897ca.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/particles/dust/dust_3.png b/assets/particles/dust/dust_3.png new file mode 100644 index 0000000..c0f814b --- /dev/null +++ b/assets/particles/dust/dust_3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c36a48508ae73cfd4354f91445396134c4ef2a7e10f6a5c31003c12985ee6dc +size 582 diff --git a/assets/particles/dust/dust_3.png.import b/assets/particles/dust/dust_3.png.import new file mode 100644 index 0000000..49db0e0 --- /dev/null +++ b/assets/particles/dust/dust_3.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bwpyjfo1j4wis" +path.s3tc="res://.godot/imported/dust_3.png-ed20bd8984d4daf8b10c35f4fdb519f6.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/particles/dust/dust_3.png" +dest_files=["res://.godot/imported/dust_3.png-ed20bd8984d4daf8b10c35f4fdb519f6.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/particles/dust/dust_4.png b/assets/particles/dust/dust_4.png new file mode 100644 index 0000000..d96faaa --- /dev/null +++ b/assets/particles/dust/dust_4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:410cc82d3f2a8d196de16bebeef29cdfe0debb40fb1876576c3f79d4890a5e8d +size 593 diff --git a/assets/particles/dust/dust_4.png.import b/assets/particles/dust/dust_4.png.import new file mode 100644 index 0000000..a020a31 --- /dev/null +++ b/assets/particles/dust/dust_4.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b1ph44sqon6p7" +path.s3tc="res://.godot/imported/dust_4.png-178faedb6cbcd2333e179680871d76c3.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/particles/dust/dust_4.png" +dest_files=["res://.godot/imported/dust_4.png-178faedb6cbcd2333e179680871d76c3.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/props/wall_switch/wall_switch.bin b/assets/props/wall_switch/wall_switch.bin new file mode 100644 index 0000000..6c9518d Binary files /dev/null and b/assets/props/wall_switch/wall_switch.bin differ diff --git a/assets/props/wall_switch/wall_switch.gltf b/assets/props/wall_switch/wall_switch.gltf new file mode 100644 index 0000000..8e5035e --- /dev/null +++ b/assets/props/wall_switch/wall_switch.gltf @@ -0,0 +1,557 @@ +{ + "asset":{ + "generator":"Khronos glTF Blender I/O v4.3.47", + "version":"2.0" + }, + "scene":0, + "scenes":[ + { + "name":"Scene", + "nodes":[ + 3 + ] + } + ], + "nodes":[ + { + "name":"Case", + "scale":[ + 0.9999999403953552, + 0.9999999403953552, + 0.9999999403953552 + ] + }, + { + "name":"Switch", + "rotation":[ + 0, + 1.1920928955078125e-07, + 0, + 1 + ], + "scale":[ + 0.9999999403953552, + 0.9999999403953552, + 0.9999999403953552 + ], + "translation":[ + -0.10576892644166946, + 0.22247494757175446, + 0.11068853735923767 + ] + }, + { + "mesh":0, + "name":"Handle", + "skin":0 + }, + { + "children":[ + 2, + 0, + 1 + ], + "name":"Armature", + "scale":[ + 0.7136169075965881, + 0.7136169075965881, + 0.7136169075965881 + ], + "translation":[ + 0, + -0.32776108384132385, + 0 + ] + } + ], + "animations":[ + { + "channels":[ + { + "sampler":0, + "target":{ + "node":0, + "path":"translation" + } + }, + { + "sampler":1, + "target":{ + "node":0, + "path":"rotation" + } + }, + { + "sampler":2, + "target":{ + "node":0, + "path":"scale" + } + }, + { + "sampler":3, + "target":{ + "node":1, + "path":"translation" + } + }, + { + "sampler":4, + "target":{ + "node":1, + "path":"rotation" + } + }, + { + "sampler":5, + "target":{ + "node":1, + "path":"scale" + } + } + ], + "name":"activate", + "samplers":[ + { + "input":7, + "interpolation":"STEP", + "output":8 + }, + { + "input":7, + "interpolation":"STEP", + "output":9 + }, + { + "input":7, + "interpolation":"STEP", + "output":10 + }, + { + "input":7, + "interpolation":"STEP", + "output":11 + }, + { + "input":12, + "interpolation":"LINEAR", + "output":13 + }, + { + "input":7, + "interpolation":"STEP", + "output":14 + } + ] + }, + { + "channels":[ + { + "sampler":0, + "target":{ + "node":0, + "path":"translation" + } + }, + { + "sampler":1, + "target":{ + "node":0, + "path":"rotation" + } + }, + { + "sampler":2, + "target":{ + "node":0, + "path":"scale" + } + }, + { + "sampler":3, + "target":{ + "node":1, + "path":"translation" + } + }, + { + "sampler":4, + "target":{ + "node":1, + "path":"rotation" + } + }, + { + "sampler":5, + "target":{ + "node":1, + "path":"scale" + } + } + ], + "name":"RESET", + "samplers":[ + { + "input":15, + "interpolation":"LINEAR", + "output":16 + }, + { + "input":15, + "interpolation":"LINEAR", + "output":17 + }, + { + "input":15, + "interpolation":"LINEAR", + "output":18 + }, + { + "input":15, + "interpolation":"LINEAR", + "output":19 + }, + { + "input":15, + "interpolation":"LINEAR", + "output":20 + }, + { + "input":15, + "interpolation":"LINEAR", + "output":21 + } + ] + } + ], + "materials":[ + { + "doubleSided":true, + "name":"WallSwitch", + "pbrMetallicRoughness":{ + "baseColorFactor":[ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1 + ], + "metallicFactor":0, + "roughnessFactor":0.5 + } + } + ], + "meshes":[ + { + "name":"Cube.001", + "primitives":[ + { + "attributes":{ + "POSITION":0, + "NORMAL":1, + "TEXCOORD_0":2, + "JOINTS_0":3, + "WEIGHTS_0":4 + }, + "indices":5, + "material":0 + } + ] + } + ], + "skins":[ + { + "inverseBindMatrices":6, + "joints":[ + 0, + 1 + ], + "name":"Armature" + } + ], + "accessors":[ + { + "bufferView":0, + "componentType":5126, + "count":312, + "max":[ + 0.3149999976158142, + 0.3999999761581421, + 0.12200002372264862 + ], + "min":[ + -0.3149999976158142, + -0.3999999761581421, + -0.11000002920627594 + ], + "type":"VEC3" + }, + { + "bufferView":1, + "componentType":5126, + "count":312, + "type":"VEC3" + }, + { + "bufferView":2, + "componentType":5126, + "count":312, + "type":"VEC2" + }, + { + "bufferView":3, + "componentType":5121, + "count":312, + "type":"VEC4" + }, + { + "bufferView":4, + "componentType":5126, + "count":312, + "type":"VEC4" + }, + { + "bufferView":5, + "componentType":5123, + "count":564, + "type":"SCALAR" + }, + { + "bufferView":6, + "componentType":5126, + "count":2, + "type":"MAT4" + }, + { + "bufferView":7, + "componentType":5126, + "count":2, + "max":[ + 5.625 + ], + "min":[ + 0.041666666666666664 + ], + "type":"SCALAR" + }, + { + "bufferView":8, + "componentType":5126, + "count":2, + "type":"VEC3" + }, + { + "bufferView":9, + "componentType":5126, + "count":2, + "type":"VEC4" + }, + { + "bufferView":10, + "componentType":5126, + "count":2, + "type":"VEC3" + }, + { + "bufferView":11, + "componentType":5126, + "count":2, + "type":"VEC3" + }, + { + "bufferView":12, + "componentType":5126, + "count":135, + "max":[ + 5.625 + ], + "min":[ + 0.041666666666666664 + ], + "type":"SCALAR" + }, + { + "bufferView":13, + "componentType":5126, + "count":135, + "type":"VEC4" + }, + { + "bufferView":14, + "componentType":5126, + "count":2, + "type":"VEC3" + }, + { + "bufferView":15, + "componentType":5126, + "count":1, + "max":[ + 0.041666666666666664 + ], + "min":[ + 0.041666666666666664 + ], + "type":"SCALAR" + }, + { + "bufferView":16, + "componentType":5126, + "count":1, + "type":"VEC3" + }, + { + "bufferView":17, + "componentType":5126, + "count":1, + "type":"VEC4" + }, + { + "bufferView":18, + "componentType":5126, + "count":1, + "type":"VEC3" + }, + { + "bufferView":19, + "componentType":5126, + "count":1, + "type":"VEC3" + }, + { + "bufferView":20, + "componentType":5126, + "count":1, + "type":"VEC4" + }, + { + "bufferView":21, + "componentType":5126, + "count":1, + "type":"VEC3" + } + ], + "bufferViews":[ + { + "buffer":0, + "byteLength":3744, + "byteOffset":0, + "target":34962 + }, + { + "buffer":0, + "byteLength":3744, + "byteOffset":3744, + "target":34962 + }, + { + "buffer":0, + "byteLength":2496, + "byteOffset":7488, + "target":34962 + }, + { + "buffer":0, + "byteLength":1248, + "byteOffset":9984, + "target":34962 + }, + { + "buffer":0, + "byteLength":4992, + "byteOffset":11232, + "target":34962 + }, + { + "buffer":0, + "byteLength":1128, + "byteOffset":16224, + "target":34963 + }, + { + "buffer":0, + "byteLength":128, + "byteOffset":17352 + }, + { + "buffer":0, + "byteLength":8, + "byteOffset":17480 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":17488 + }, + { + "buffer":0, + "byteLength":32, + "byteOffset":17512 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":17544 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":17568 + }, + { + "buffer":0, + "byteLength":540, + "byteOffset":17592 + }, + { + "buffer":0, + "byteLength":2160, + "byteOffset":18132 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":20292 + }, + { + "buffer":0, + "byteLength":4, + "byteOffset":20316 + }, + { + "buffer":0, + "byteLength":12, + "byteOffset":20320 + }, + { + "buffer":0, + "byteLength":16, + "byteOffset":20332 + }, + { + "buffer":0, + "byteLength":12, + "byteOffset":20348 + }, + { + "buffer":0, + "byteLength":12, + "byteOffset":20360 + }, + { + "buffer":0, + "byteLength":16, + "byteOffset":20372 + }, + { + "buffer":0, + "byteLength":12, + "byteOffset":20388 + } + ], + "buffers":[ + { + "byteLength":20400, + "uri":"wall_switch.bin" + } + ] +} diff --git a/assets/props/wall_switch/wall_switch.gltf.import b/assets/props/wall_switch/wall_switch.gltf.import new file mode 100644 index 0000000..284a3a1 --- /dev/null +++ b/assets/props/wall_switch/wall_switch.gltf.import @@ -0,0 +1,36 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://b7nqbny1xop8t" +path="res://.godot/imported/wall_switch.gltf-66cf36f473896d0320315d5127bdf889.scn" + +[deps] + +source_file="res://assets/props/wall_switch/wall_switch.gltf" +dest_files=["res://.godot/imported/wall_switch.gltf-66cf36f473896d0320315d5127bdf889.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/levels/sandbox/sandbox.tscn b/levels/sandbox/sandbox.tscn index b114378..1ed9369 100644 --- a/levels/sandbox/sandbox.tscn +++ b/levels/sandbox/sandbox.tscn @@ -61,14 +61,14 @@ shader = ExtResource("5_rdjtm") 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.875, 1, 1) -shader_parameter/pixellation = 50.0 +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(8, 8) shader_parameter/time_scale = 0.2 -shader_parameter/edge_bleed = 0.1 +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") @@ -86,14 +86,14 @@ shader = ExtResource("5_rdjtm") 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.875, 1, 1) -shader_parameter/pixellation = 50.0 +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(8, 8) shader_parameter/time_scale = 0.2 -shader_parameter/edge_bleed = 0.1 +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") @@ -111,14 +111,14 @@ shader = ExtResource("5_rdjtm") 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.875, 1, 1) -shader_parameter/pixellation = 50.0 +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(8, 8) shader_parameter/time_scale = 0.2 -shader_parameter/edge_bleed = 0.1 +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") diff --git a/project.godot b/project.godot index 587ca74..ccd73cc 100644 --- a/project.godot +++ b/project.godot @@ -41,6 +41,14 @@ movie_writer/movie_file="demos/demo.avi" enabled=PackedStringArray("res://addons/format_on_save/plugin.cfg", "res://addons/gdlint_plugin/plugin.cfg") +[file_customization] + +folder_colors={ +"res://assets/": "red", +"res://levels/": "blue", +"res://src/": "green" +} + [game] config/input/mouse_sensitivity_x=0.45 diff --git a/src/effects/gunk_dust.tscn b/src/effects/gunk_dust.tscn new file mode 100644 index 0000000..7f52088 --- /dev/null +++ b/src/effects/gunk_dust.tscn @@ -0,0 +1,35 @@ +[gd_scene load_steps=7 format=3 uid="uid://c3iv00vmdqxp0"] + +[ext_resource type="Texture2D" uid="uid://bwpyjfo1j4wis" path="res://assets/particles/dust/dust_3.png" id="1_hqns8"] + +[sub_resource type="Gradient" id="Gradient_o6g24"] +colors = PackedColorArray(0, 0.101961, 0.301961, 1, 0, 0.0313726, 0.101961, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_mlqhf"] +gradient = SubResource("Gradient_o6g24") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_ykxlg"] +direction = Vector3(0, 1, 0) +initial_velocity_min = 1.0 +initial_velocity_max = 1.0 +gravity = Vector3(0, -4, 0) +color_ramp = SubResource("GradientTexture1D_mlqhf") + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_v20ab"] +transparency = 1 +vertex_color_use_as_albedo = true +albedo_texture = ExtResource("1_hqns8") +texture_filter = 2 +billboard_mode = 3 +particles_anim_h_frames = 1 +particles_anim_v_frames = 1 +particles_anim_loop = false + +[sub_resource type="QuadMesh" id="QuadMesh_1ijv1"] +material = SubResource("StandardMaterial3D_v20ab") +size = Vector2(0.1, 0.1) + +[node name="GunkDust" type="GPUParticles3D"] +lifetime = 0.4 +process_material = SubResource("ParticleProcessMaterial_ykxlg") +draw_pass_1 = SubResource("QuadMesh_1ijv1") diff --git a/src/equipment/wide_spray/wide_spray.gd b/src/equipment/wide_spray/wide_spray.gd index 0932ae2..758e9b1 100644 --- a/src/equipment/wide_spray/wide_spray.gd +++ b/src/equipment/wide_spray/wide_spray.gd @@ -3,7 +3,7 @@ class_name WideSpray extends Spray const SPRAYCAST_GROUP := "SprayCast" -@export var spray_scale := 3.0 +@export var spray_scale := 2.0 @onready var spray_casts: Node3D = %SprayCasts @onready var spray_effect: MeshInstance3D = %SprayEffect diff --git a/src/shaders/gunk.gdshader b/src/shaders/gunk.gdshader index 102669d..2379d40 100644 --- a/src/shaders/gunk.gdshader +++ b/src/shaders/gunk.gdshader @@ -5,7 +5,7 @@ uniform vec3 color_1: source_color = vec3(0.0, 0.03, 0.1); uniform vec3 color_2: source_color = vec3(0.0, 0.1, 0.3); uniform vec3 emission_color: source_color = vec3(0.25, 0.88, 1.0); -uniform float pixellation = 50.0; +uniform float pixellation = 128.0; uniform float time_pixellation = 30.0; uniform float roughness: hint_range(0.0, 1.0) = 0.15; @@ -17,7 +17,7 @@ uniform vec2 uv_scale = vec2(1.0); uniform float time_scale = 1.0; -uniform float edge_bleed = 0.1; +uniform float edge_bleed = 0.25; uniform sampler2D gunk_mask;