diff --git a/.gitattributes b/.gitattributes index 4c4ec8f..c8d3175 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,5 +2,6 @@ * text=auto eol=lf *.png filter=lfs diff=lfs merge=lfs -text assets filter=lfs diff=lfs merge=lfs -text -assets/models filter=lfs diff=lfs merge=lfs -text -assets/sounds filter=lfs diff=lfs merge=lfs -text +assets/** filter=lfs diff=lfs merge=lfs -text +resources filter=lfs diff=lfs merge=lfs -text +resources/** filter=lfs diff=lfs merge=lfs -text diff --git a/addons/kenney_prototype_textures/dark/texture_02.png.import b/addons/kenney_prototype_textures/dark/texture_02.png.import index eab9268..b1e82df 100644 --- a/addons/kenney_prototype_textures/dark/texture_02.png.import +++ b/addons/kenney_prototype_textures/dark/texture_02.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://bawho1fs8uowk" -path="res://.godot/imported/texture_02.png-814d4f515892bb8274d285748f4a73a0.ctex" +path.s3tc="res://.godot/imported/texture_02.png-814d4f515892bb8274d285748f4a73a0.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_02.png" -dest_files=["res://.godot/imported/texture_02.png-814d4f515892bb8274d285748f4a73a0.ctex"] +dest_files=["res://.godot/imported/texture_02.png-814d4f515892bb8274d285748f4a73a0.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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=1 +detect_3d/compress_to=0 diff --git a/addons/kenney_prototype_textures/dark/texture_03.png.import b/addons/kenney_prototype_textures/dark/texture_03.png.import index 1d27c3c..6ffa424 100644 --- a/addons/kenney_prototype_textures/dark/texture_03.png.import +++ b/addons/kenney_prototype_textures/dark/texture_03.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://kijtpalgio4q" -path="res://.godot/imported/texture_03.png-eef45c22e5a84c5df22e7f80e41112c6.ctex" +path.s3tc="res://.godot/imported/texture_03.png-eef45c22e5a84c5df22e7f80e41112c6.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_03.png" -dest_files=["res://.godot/imported/texture_03.png-eef45c22e5a84c5df22e7f80e41112c6.ctex"] +dest_files=["res://.godot/imported/texture_03.png-eef45c22e5a84c5df22e7f80e41112c6.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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=1 +detect_3d/compress_to=0 diff --git a/addons/kenney_prototype_textures/dark/texture_06.png.import b/addons/kenney_prototype_textures/dark/texture_06.png.import index 8eb25dd..8d1dc4f 100644 --- a/addons/kenney_prototype_textures/dark/texture_06.png.import +++ b/addons/kenney_prototype_textures/dark/texture_06.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://du0f7hc4skged" -path="res://.godot/imported/texture_06.png-004ed3d5b88361cdfb83a20714e917e7.ctex" +path.s3tc="res://.godot/imported/texture_06.png-004ed3d5b88361cdfb83a20714e917e7.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_06.png" -dest_files=["res://.godot/imported/texture_06.png-004ed3d5b88361cdfb83a20714e917e7.ctex"] +dest_files=["res://.godot/imported/texture_06.png-004ed3d5b88361cdfb83a20714e917e7.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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=1 +detect_3d/compress_to=0 diff --git a/addons/kenney_prototype_textures/dark/texture_07.png.import b/addons/kenney_prototype_textures/dark/texture_07.png.import index b40c4ba..66f733e 100644 --- a/addons/kenney_prototype_textures/dark/texture_07.png.import +++ b/addons/kenney_prototype_textures/dark/texture_07.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://bg7hbu285xx3c" -path="res://.godot/imported/texture_07.png-7c77ff22e41b4a54319073cb71530d81.ctex" +path.s3tc="res://.godot/imported/texture_07.png-7c77ff22e41b4a54319073cb71530d81.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_07.png" -dest_files=["res://.godot/imported/texture_07.png-7c77ff22e41b4a54319073cb71530d81.ctex"] +dest_files=["res://.godot/imported/texture_07.png-7c77ff22e41b4a54319073cb71530d81.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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=1 +detect_3d/compress_to=0 diff --git a/addons/kenney_prototype_textures/dark/texture_08.png.import b/addons/kenney_prototype_textures/dark/texture_08.png.import index 53b923a..4cf77b0 100644 --- a/addons/kenney_prototype_textures/dark/texture_08.png.import +++ b/addons/kenney_prototype_textures/dark/texture_08.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://o0rxfy5dvpsb" -path="res://.godot/imported/texture_08.png-5883ddd047173c8b118ead887054e6fc.ctex" +path.s3tc="res://.godot/imported/texture_08.png-5883ddd047173c8b118ead887054e6fc.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_08.png" -dest_files=["res://.godot/imported/texture_08.png-5883ddd047173c8b118ead887054e6fc.ctex"] +dest_files=["res://.godot/imported/texture_08.png-5883ddd047173c8b118ead887054e6fc.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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=1 +detect_3d/compress_to=0 diff --git a/addons/kenney_prototype_textures/dark/texture_09.png.import b/addons/kenney_prototype_textures/dark/texture_09.png.import index 6ada7a7..81c72f1 100644 --- a/addons/kenney_prototype_textures/dark/texture_09.png.import +++ b/addons/kenney_prototype_textures/dark/texture_09.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://cxj3qslcw455r" -path="res://.godot/imported/texture_09.png-8e25cd5657e2d326068eb27bfa1aacec.ctex" +path.s3tc="res://.godot/imported/texture_09.png-8e25cd5657e2d326068eb27bfa1aacec.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_09.png" -dest_files=["res://.godot/imported/texture_09.png-8e25cd5657e2d326068eb27bfa1aacec.ctex"] +dest_files=["res://.godot/imported/texture_09.png-8e25cd5657e2d326068eb27bfa1aacec.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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=1 +detect_3d/compress_to=0 diff --git a/addons/kenney_prototype_textures/dark/texture_10.png.import b/addons/kenney_prototype_textures/dark/texture_10.png.import index fd7c986..53c3f21 100644 --- a/addons/kenney_prototype_textures/dark/texture_10.png.import +++ b/addons/kenney_prototype_textures/dark/texture_10.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://n25a1tlc20r2" -path="res://.godot/imported/texture_10.png-1e788999a192eabd201c3b3435475799.ctex" +path.s3tc="res://.godot/imported/texture_10.png-1e788999a192eabd201c3b3435475799.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_10.png" -dest_files=["res://.godot/imported/texture_10.png-1e788999a192eabd201c3b3435475799.ctex"] +dest_files=["res://.godot/imported/texture_10.png-1e788999a192eabd201c3b3435475799.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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=1 +detect_3d/compress_to=0 diff --git a/addons/kenney_prototype_textures/dark/texture_11.png.import b/addons/kenney_prototype_textures/dark/texture_11.png.import index e57d8a2..c32fe65 100644 --- a/addons/kenney_prototype_textures/dark/texture_11.png.import +++ b/addons/kenney_prototype_textures/dark/texture_11.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://ciwwbgcpode0d" -path="res://.godot/imported/texture_11.png-f61ad46caf1a41d85454e490ec43c8ec.ctex" +path.s3tc="res://.godot/imported/texture_11.png-f61ad46caf1a41d85454e490ec43c8ec.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_11.png" -dest_files=["res://.godot/imported/texture_11.png-f61ad46caf1a41d85454e490ec43c8ec.ctex"] +dest_files=["res://.godot/imported/texture_11.png-f61ad46caf1a41d85454e490ec43c8ec.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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=1 +detect_3d/compress_to=0 diff --git a/addons/kenney_prototype_textures/dark/texture_12.png.import b/addons/kenney_prototype_textures/dark/texture_12.png.import index 1f7bb79..504e71c 100644 --- a/addons/kenney_prototype_textures/dark/texture_12.png.import +++ b/addons/kenney_prototype_textures/dark/texture_12.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dsf0exq5n4glb" -path="res://.godot/imported/texture_12.png-aa893b2c5354267551e55ec14bb1999b.ctex" +path.s3tc="res://.godot/imported/texture_12.png-aa893b2c5354267551e55ec14bb1999b.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_12.png" -dest_files=["res://.godot/imported/texture_12.png-aa893b2c5354267551e55ec14bb1999b.ctex"] +dest_files=["res://.godot/imported/texture_12.png-aa893b2c5354267551e55ec14bb1999b.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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=1 +detect_3d/compress_to=0 diff --git a/addons/kenney_prototype_textures/green/texture_02.png.import b/addons/kenney_prototype_textures/green/texture_02.png.import index 455147d..7b4c3f1 100644 --- a/addons/kenney_prototype_textures/green/texture_02.png.import +++ b/addons/kenney_prototype_textures/green/texture_02.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://yg2714dns88k" -path="res://.godot/imported/texture_02.png-aa1bb055b55bdc7c20e196b7286eebdf.ctex" +path.s3tc="res://.godot/imported/texture_02.png-aa1bb055b55bdc7c20e196b7286eebdf.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/green/texture_02.png" -dest_files=["res://.godot/imported/texture_02.png-aa1bb055b55bdc7c20e196b7286eebdf.ctex"] +dest_files=["res://.godot/imported/texture_02.png-aa1bb055b55bdc7c20e196b7286eebdf.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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=1 +detect_3d/compress_to=0 diff --git a/addons/kenney_prototype_textures/light/texture_01.png.import b/addons/kenney_prototype_textures/light/texture_01.png.import index d5718ff..4232cf2 100644 --- a/addons/kenney_prototype_textures/light/texture_01.png.import +++ b/addons/kenney_prototype_textures/light/texture_01.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dkaygit5l83nq" -path="res://.godot/imported/texture_01.png-e10423e44834e1b4a90c3134e446b32d.ctex" +path.s3tc="res://.godot/imported/texture_01.png-e10423e44834e1b4a90c3134e446b32d.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/light/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-e10423e44834e1b4a90c3134e446b32d.ctex"] +dest_files=["res://.godot/imported/texture_01.png-e10423e44834e1b4a90c3134e446b32d.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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=1 +detect_3d/compress_to=0 diff --git a/addons/kenney_prototype_textures/purple/texture_02.png.import b/addons/kenney_prototype_textures/purple/texture_02.png.import index 34e4e69..320c1f5 100644 --- a/addons/kenney_prototype_textures/purple/texture_02.png.import +++ b/addons/kenney_prototype_textures/purple/texture_02.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dx31pblshvnjw" -path="res://.godot/imported/texture_02.png-fcb52d424cd62d43221e4153fa3176f8.ctex" +path.s3tc="res://.godot/imported/texture_02.png-fcb52d424cd62d43221e4153fa3176f8.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/purple/texture_02.png" -dest_files=["res://.godot/imported/texture_02.png-fcb52d424cd62d43221e4153fa3176f8.ctex"] +dest_files=["res://.godot/imported/texture_02.png-fcb52d424cd62d43221e4153fa3176f8.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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=1 +detect_3d/compress_to=0 diff --git a/assets/models/character/character.glb b/assets/models/character/character.glb new file mode 100644 index 0000000..54ce246 Binary files /dev/null and b/assets/models/character/character.glb differ diff --git a/assets/models/character/character.glb.import b/assets/models/character/character.glb.import new file mode 100644 index 0000000..5fe9c83 --- /dev/null +++ b/assets/models/character/character.glb.import @@ -0,0 +1,36 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dxjboibv5umwp" +path="res://.godot/imported/character.glb-dd4ea7e677566e53b63833cf4cec6b59.scn" + +[deps] + +source_file="res://assets/models/character/character.glb" +dest_files=["res://.godot/imported/character.glb-dd4ea7e677566e53b63833cf4cec6b59.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/assets/models/character/character_Ch02_1001_Diffuse.png b/assets/models/character/character_Ch02_1001_Diffuse.png new file mode 100644 index 0000000..993e19c --- /dev/null +++ b/assets/models/character/character_Ch02_1001_Diffuse.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4887e2cc3e9e1dc219cadd4822b3c210cb6b5457f92641fb5226a9e7261f66ef +size 14472808 diff --git a/assets/models/character/character_Ch02_1001_Diffuse.png.import b/assets/models/character/character_Ch02_1001_Diffuse.png.import new file mode 100644 index 0000000..2045b9d --- /dev/null +++ b/assets/models/character/character_Ch02_1001_Diffuse.png.import @@ -0,0 +1,38 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://pnn1k0p5jpfi" +path.s3tc="res://.godot/imported/character_Ch02_1001_Diffuse.png-707487459f39924eb924c8371b9680dd.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "06ae86b04070040bebfc1ac7cd4daae2" +} + +[deps] + +source_file="res://assets/models/character/character_Ch02_1001_Diffuse.png" +dest_files=["res://.godot/imported/character_Ch02_1001_Diffuse.png-707487459f39924eb924c8371b9680dd.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/models/character/character_Ch02_1001_Glossiness.png b/assets/models/character/character_Ch02_1001_Glossiness.png new file mode 100644 index 0000000..c5958f3 --- /dev/null +++ b/assets/models/character/character_Ch02_1001_Glossiness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efa800bdf4cdb1dac5d84ec7071428721c6fe64bd6db65c93ccf75bd2d1d0fd1 +size 10812395 diff --git a/assets/models/character/character_Ch02_1001_Glossiness.png.import b/assets/models/character/character_Ch02_1001_Glossiness.png.import new file mode 100644 index 0000000..e40ea66 --- /dev/null +++ b/assets/models/character/character_Ch02_1001_Glossiness.png.import @@ -0,0 +1,38 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d27lkxg04bn0q" +path.s3tc="res://.godot/imported/character_Ch02_1001_Glossiness.png-63e580e8cccdb52230c8a4cbcf0a0642.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "04991c19c77019b5ba4d4549768d54a8" +} + +[deps] + +source_file="res://assets/models/character/character_Ch02_1001_Glossiness.png" +dest_files=["res://.godot/imported/character_Ch02_1001_Glossiness.png-63e580e8cccdb52230c8a4cbcf0a0642.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/models/character/character_Ch02_1001_Normal.png b/assets/models/character/character_Ch02_1001_Normal.png new file mode 100644 index 0000000..09787f1 --- /dev/null +++ b/assets/models/character/character_Ch02_1001_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f499ffc4bd92fd73a659cdbe67b3c22c9b5611100b0380b157c1adbeffad9075 +size 20150787 diff --git a/assets/models/character/character_Ch02_1001_Normal.png.import b/assets/models/character/character_Ch02_1001_Normal.png.import new file mode 100644 index 0000000..a0e8bb0 --- /dev/null +++ b/assets/models/character/character_Ch02_1001_Normal.png.import @@ -0,0 +1,38 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cp1bdlyicev16" +path.s3tc="res://.godot/imported/character_Ch02_1001_Normal.png-e2440cf34acd8af9900038aa2d22a52c.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "f5d8b6e769b0e1f79e3ced96b4b8a169" +} + +[deps] + +source_file="res://assets/models/character/character_Ch02_1001_Normal.png" +dest_files=["res://.godot/imported/character_Ch02_1001_Normal.png-e2440cf34acd8af9900038aa2d22a52c.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/models/character/character_Ch02_1001_Normal.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/models/character/character_Ch02_1001_Specular.png b/assets/models/character/character_Ch02_1001_Specular.png new file mode 100644 index 0000000..28a9bb8 --- /dev/null +++ b/assets/models/character/character_Ch02_1001_Specular.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa1e15b7bcc2c37168f785a5550a5ce46fe927359056e9c4ee27125f81f57347 +size 58789 diff --git a/assets/models/character/character_Ch02_1001_Specular.png.import b/assets/models/character/character_Ch02_1001_Specular.png.import new file mode 100644 index 0000000..8967c2e --- /dev/null +++ b/assets/models/character/character_Ch02_1001_Specular.png.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dc2av5yv6vsp5" +path="res://.godot/imported/character_Ch02_1001_Specular.png-ecbed91c47cdbf7acdcbcfa1e7c2c3c1.ctex" +metadata={ +"vram_texture": false +} +generator_parameters={ +"md5": "cc54f89ab2f803775b259523df174726" +} + +[deps] + +source_file="res://assets/models/character/character_Ch02_1001_Specular.png" +dest_files=["res://.godot/imported/character_Ch02_1001_Specular.png-ecbed91c47cdbf7acdcbcfa1e7c2c3c1.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=1 diff --git a/assets/models/character/character_Ch02_1002_Diffuse.png b/assets/models/character/character_Ch02_1002_Diffuse.png new file mode 100644 index 0000000..9df6078 --- /dev/null +++ b/assets/models/character/character_Ch02_1002_Diffuse.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08d78bd40fb4609ac546ecaa8dfdece8676f532961244b48374f7cbea795378f +size 3997617 diff --git a/assets/models/character/character_Ch02_1002_Diffuse.png.import b/assets/models/character/character_Ch02_1002_Diffuse.png.import new file mode 100644 index 0000000..fa64f46 --- /dev/null +++ b/assets/models/character/character_Ch02_1002_Diffuse.png.import @@ -0,0 +1,38 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c23bvwayx8ccx" +path.s3tc="res://.godot/imported/character_Ch02_1002_Diffuse.png-8643a80db54d318370df1c002f2b3867.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "13a493cfe90c0a7fc31d835aa1c37ff6" +} + +[deps] + +source_file="res://assets/models/character/character_Ch02_1002_Diffuse.png" +dest_files=["res://.godot/imported/character_Ch02_1002_Diffuse.png-8643a80db54d318370df1c002f2b3867.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/models/character/character_Ch02_1002_Normal.png b/assets/models/character/character_Ch02_1002_Normal.png new file mode 100644 index 0000000..0516db7 --- /dev/null +++ b/assets/models/character/character_Ch02_1002_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8221595d4a575d1e95f059288ce11f1bd0bc7c107ad77bbe482ae7c717816c65 +size 2272406 diff --git a/assets/models/character/character_Ch02_1002_Normal.png.import b/assets/models/character/character_Ch02_1002_Normal.png.import new file mode 100644 index 0000000..9c53529 --- /dev/null +++ b/assets/models/character/character_Ch02_1002_Normal.png.import @@ -0,0 +1,38 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://hn1dvyo4cwgk" +path.s3tc="res://.godot/imported/character_Ch02_1002_Normal.png-826a15a0b74c9f75c7625cde762659a3.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "994a6af3fcc3508f8e8f93dc1795f55a" +} + +[deps] + +source_file="res://assets/models/character/character_Ch02_1002_Normal.png" +dest_files=["res://.godot/imported/character_Ch02_1002_Normal.png-826a15a0b74c9f75c7625cde762659a3.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/models/character/character_Ch02_1002_Normal.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/resources/blender/character.blend b/resources/blender/character.blend new file mode 100644 index 0000000..99a8655 Binary files /dev/null and b/resources/blender/character.blend differ diff --git a/resources/blender/character.blend.import b/resources/blender/character.blend.import new file mode 100644 index 0000000..e46726d --- /dev/null +++ b/resources/blender/character.blend.import @@ -0,0 +1,51 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://b7jr8xbo2f8n7" +path="res://.godot/imported/character.blend-a7059734a074b915b956c89a68d7cabe.scn" + +[deps] + +source_file="res://resources/blender/character.blend" +dest_files=["res://.godot/imported/character.blend-a7059734a074b915b956c89a68d7cabe.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={} +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/resources/blender/textures/Ch02_1001_Diffuse.png b/resources/blender/textures/Ch02_1001_Diffuse.png new file mode 100644 index 0000000..993e19c --- /dev/null +++ b/resources/blender/textures/Ch02_1001_Diffuse.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4887e2cc3e9e1dc219cadd4822b3c210cb6b5457f92641fb5226a9e7261f66ef +size 14472808 diff --git a/resources/blender/textures/Ch02_1001_Diffuse.png.import b/resources/blender/textures/Ch02_1001_Diffuse.png.import new file mode 100644 index 0000000..b00ed36 --- /dev/null +++ b/resources/blender/textures/Ch02_1001_Diffuse.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b8pyp1wrao7g8" +path.s3tc="res://.godot/imported/Ch02_1001_Diffuse.png-be8443a66fcdba335ccc626d3ee507e2.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://resources/blender/textures/Ch02_1001_Diffuse.png" +dest_files=["res://.godot/imported/Ch02_1001_Diffuse.png-be8443a66fcdba335ccc626d3ee507e2.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/resources/blender/textures/Ch02_1001_Glossiness.png b/resources/blender/textures/Ch02_1001_Glossiness.png new file mode 100644 index 0000000..62b0361 --- /dev/null +++ b/resources/blender/textures/Ch02_1001_Glossiness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b31688c086963100c4fe836fe0a945a1dac2319e256a2030e2a74fa3017cd99 +size 6365991 diff --git a/resources/blender/textures/Ch02_1001_Glossiness.png.import b/resources/blender/textures/Ch02_1001_Glossiness.png.import new file mode 100644 index 0000000..8ba56d1 --- /dev/null +++ b/resources/blender/textures/Ch02_1001_Glossiness.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dcyhsg2exug4j" +path.s3tc="res://.godot/imported/Ch02_1001_Glossiness.png-311a15692f16ebafd2971310794de848.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://resources/blender/textures/Ch02_1001_Glossiness.png" +dest_files=["res://.godot/imported/Ch02_1001_Glossiness.png-311a15692f16ebafd2971310794de848.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/resources/blender/textures/Ch02_1001_Normal.png b/resources/blender/textures/Ch02_1001_Normal.png new file mode 100644 index 0000000..09787f1 --- /dev/null +++ b/resources/blender/textures/Ch02_1001_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f499ffc4bd92fd73a659cdbe67b3c22c9b5611100b0380b157c1adbeffad9075 +size 20150787 diff --git a/resources/blender/textures/Ch02_1001_Normal.png.import b/resources/blender/textures/Ch02_1001_Normal.png.import new file mode 100644 index 0000000..5f06bf9 --- /dev/null +++ b/resources/blender/textures/Ch02_1001_Normal.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cigrjs1blf1pf" +path.s3tc="res://.godot/imported/Ch02_1001_Normal.png-f49aa32435644d57263d5929c7eb6574.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://resources/blender/textures/Ch02_1001_Normal.png" +dest_files=["res://.godot/imported/Ch02_1001_Normal.png-f49aa32435644d57263d5929c7eb6574.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://resources/blender/textures/Ch02_1001_Normal.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/resources/blender/textures/Ch02_1001_Specular.png b/resources/blender/textures/Ch02_1001_Specular.png new file mode 100644 index 0000000..28a9bb8 --- /dev/null +++ b/resources/blender/textures/Ch02_1001_Specular.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa1e15b7bcc2c37168f785a5550a5ce46fe927359056e9c4ee27125f81f57347 +size 58789 diff --git a/resources/blender/textures/Ch02_1001_Specular.png.import b/resources/blender/textures/Ch02_1001_Specular.png.import new file mode 100644 index 0000000..d24995e --- /dev/null +++ b/resources/blender/textures/Ch02_1001_Specular.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cxsbcvluu2y53" +path="res://.godot/imported/Ch02_1001_Specular.png-36dc219fa19eab0b9fdec99081d229f9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/blender/textures/Ch02_1001_Specular.png" +dest_files=["res://.godot/imported/Ch02_1001_Specular.png-36dc219fa19eab0b9fdec99081d229f9.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/resources/blender/textures/Ch02_1002_Diffuse.png b/resources/blender/textures/Ch02_1002_Diffuse.png new file mode 100644 index 0000000..5f01815 --- /dev/null +++ b/resources/blender/textures/Ch02_1002_Diffuse.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb33ffa42f2d1f60e6515a2e4d846a8e70c55f7f6dd74403e768a7fbaa3b5331 +size 3927727 diff --git a/resources/blender/textures/Ch02_1002_Diffuse.png.import b/resources/blender/textures/Ch02_1002_Diffuse.png.import new file mode 100644 index 0000000..270721a --- /dev/null +++ b/resources/blender/textures/Ch02_1002_Diffuse.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://yojjaplgldct" +path.s3tc="res://.godot/imported/Ch02_1002_Diffuse.png-dd63e4bfbae61671584ae5f9722ea551.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://resources/blender/textures/Ch02_1002_Diffuse.png" +dest_files=["res://.godot/imported/Ch02_1002_Diffuse.png-dd63e4bfbae61671584ae5f9722ea551.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/resources/blender/textures/Ch02_1002_Normal.png b/resources/blender/textures/Ch02_1002_Normal.png new file mode 100644 index 0000000..0516db7 --- /dev/null +++ b/resources/blender/textures/Ch02_1002_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8221595d4a575d1e95f059288ce11f1bd0bc7c107ad77bbe482ae7c717816c65 +size 2272406 diff --git a/resources/blender/textures/Ch02_1002_Normal.png.import b/resources/blender/textures/Ch02_1002_Normal.png.import new file mode 100644 index 0000000..a59db3d --- /dev/null +++ b/resources/blender/textures/Ch02_1002_Normal.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d02x1naqnuxtd" +path.s3tc="res://.godot/imported/Ch02_1002_Normal.png-5866a749dfca963f00bf1a6997545b7c.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://resources/blender/textures/Ch02_1002_Normal.png" +dest_files=["res://.godot/imported/Ch02_1002_Normal.png-5866a749dfca963f00bf1a6997545b7c.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://resources/blender/textures/Ch02_1002_Normal.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/scenes/maps/test_map.tscn b/scenes/maps/test_map.tscn index 84a05f4..893ea4b 100644 --- a/scenes/maps/test_map.tscn +++ b/scenes/maps/test_map.tscn @@ -1,23 +1,39 @@ -[gd_scene load_steps=9 format=3 uid="uid://hivk5ek6u887"] +[gd_scene load_steps=13 format=3 uid="uid://hivk5ek6u887"] -[ext_resource type="Texture2D" uid="uid://c5uytbu1wc1bq" path="res://addons/kenney_prototype_textures/orange/texture_09.png" id="1_llm1c"] -[ext_resource type="Texture2D" uid="uid://e4nd8b6f0tw7" path="res://addons/kenney_prototype_textures/dark/texture_04.png" id="2_k2arh"] +[ext_resource type="Texture2D" uid="uid://du0f7hc4skged" path="res://addons/kenney_prototype_textures/dark/texture_06.png" id="1_lae2b"] +[ext_resource type="Texture2D" uid="uid://dmge3tk7w0b1n" path="res://addons/kenney_prototype_textures/dark/texture_01.png" id="2_7newm"] [ext_resource type="PackedScene" uid="uid://ccm77j5rkh21w" path="res://scenes/utils/character.tscn" id="3_omcjn"] -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_llvtk"] -albedo_texture = ExtResource("1_llm1c") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_bcdcw"] +albedo_texture = ExtResource("1_lae2b") -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_50gm5"] -albedo_texture = ExtResource("2_k2arh") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_p4psn"] +albedo_texture = ExtResource("2_7newm") -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_c334k"] -albedo_texture = ExtResource("2_k2arh") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0jiki"] +albedo_texture = ExtResource("2_7newm") -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nlanx"] -albedo_texture = ExtResource("2_k2arh") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1pwnn"] +albedo_texture = ExtResource("2_7newm") -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cjh6x"] -albedo_texture = ExtResource("2_k2arh") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1yo6k"] +albedo_texture = ExtResource("2_7newm") + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_3aaun"] + +[sub_resource type="Sky" id="Sky_xco2g"] +sky_material = SubResource("ProceduralSkyMaterial_3aaun") + +[sub_resource type="Environment" id="Environment_5t2t5"] +background_mode = 2 +sky = SubResource("Sky_xco2g") +sdfgi_enabled = true +fog_light_energy = 0.52 +fog_density = 0.1387 +volumetric_fog_enabled = true +volumetric_fog_density = 0.0 + +[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_32hnm"] [node name="TestMap" type="Node3D"] @@ -28,33 +44,47 @@ shadow_enabled = true [node name="Base" type="Node3D" parent="."] [node name="Floor" type="CSGBox3D" parent="Base"] -material_override = SubResource("StandardMaterial3D_llvtk") +material_override = SubResource("StandardMaterial3D_bcdcw") use_collision = true size = Vector3(100, 1, 100) [node name="Wall_1" type="CSGBox3D" parent="Base"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 50, 0, 0) -material_override = SubResource("StandardMaterial3D_50gm5") +material_override = SubResource("StandardMaterial3D_p4psn") use_collision = true size = Vector3(1, 20, 100) [node name="Wall_2" type="CSGBox3D" parent="Base"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -50, 0, 0) -material_override = SubResource("StandardMaterial3D_c334k") +material_override = SubResource("StandardMaterial3D_0jiki") use_collision = true size = Vector3(1, 20, 100) [node name="Wall_3" type="CSGBox3D" parent="Base"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 50) -material_override = SubResource("StandardMaterial3D_nlanx") +material_override = SubResource("StandardMaterial3D_1pwnn") use_collision = true size = Vector3(100, 20, 1) [node name="Wall_4" type="CSGBox3D" parent="Base"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -50) -material_override = SubResource("StandardMaterial3D_cjh6x") +material_override = SubResource("StandardMaterial3D_1yo6k") use_collision = true size = Vector3(100, 20, 1) [node name="Character" parent="." instance=ExtResource("3_omcjn")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.9816, 0, 28.0621) + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_5t2t5") +camera_attributes = SubResource("CameraAttributesPractical_32hnm") + +[node name="Room" type="Node3D" parent="."] + +[node name="Roof" type="CSGBox3D" parent="Room"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 40, 10, 40) +size = Vector3(20, 1, 20) + +[node name="Box" type="CSGBox3D" parent="Room"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 45.354, 2, 30) +size = Vector3(15, 4, 5) diff --git a/scenes/utils/body.tscn b/scenes/utils/body.tscn new file mode 100644 index 0000000..e10b5f7 --- /dev/null +++ b/scenes/utils/body.tscn @@ -0,0 +1,102 @@ +[gd_scene load_steps=2 format=3 uid="uid://ceywbkneyatpw"] + +[ext_resource type="PackedScene" uid="uid://dxjboibv5umwp" path="res://assets/models/character/character.glb" id="1_ldvdo"] + +[node name="character" instance=ExtResource("1_ldvdo")] + +[node name="Skeleton3D" parent="Armature" index="0"] +bones/0/position = Vector3(0.27864, 0.0511703, -94.5392) +bones/0/rotation = Quaternion(-0.604149, -0.348807, 0.29163, 0.654439) +bones/1/rotation = Quaternion(-0.0341781, 0.0566953, 0.0240948, 0.997515) +bones/2/rotation = Quaternion(0.0232735, 0.0685228, 0.0060157, 0.99736) +bones/3/rotation = Quaternion(0.0239388, 0.0686278, 0.00447139, 0.997345) +bones/4/rotation = Quaternion(0.160264, 0.0650181, -0.0283947, 0.984521) +bones/5/rotation = Quaternion(0.00615673, 0.173887, 0.0695452, 0.982288) +bones/7/rotation = Quaternion(-0.573553, -0.410703, 0.634322, -0.316221) +bones/8/position = Vector3(-5.17998e-07, 12.6417, 7.24198e-06) +bones/8/rotation = Quaternion(0.172527, -0.218225, 0.436503, 0.855615) +bones/9/position = Vector3(5.25072e-07, 21.8647, -1.64733e-06) +bones/9/rotation = Quaternion(0.0784446, -0.00225524, 0.650572, 0.755379) +bones/10/position = Vector3(-6.68945e-06, 25.0647, 1.19204e-06) +bones/10/rotation = Quaternion(-0.166441, -0.334552, -0.373809, 0.848905) +bones/11/rotation = Quaternion(0.0956501, -0.0429417, 0.168576, 0.980097) +bones/12/position = Vector3(-0.347165, 3.29954, -8.22866e-06) +bones/12/rotation = Quaternion(-0.0984275, 0.0713401, 0.117913, 0.985555) +bones/13/position = Vector3(0.410877, 3.32378, 6.80089e-06) +bones/13/rotation = Quaternion(-0.0316813, 0.0203845, 0.14611, 0.988551) +bones/14/position = Vector3(-0.0637035, 2.82069, -2.79248e-05) +bones/15/position = Vector3(-3.18417, 9.19059, 0.0928621) +bones/15/rotation = Quaternion(0.259408, 0.000923331, 0.03495, 0.965135) +bones/16/position = Vector3(-0.0111496, 3.04017, 1.97763e-06) +bones/16/rotation = Quaternion(0.5136, 0.000858785, -0.035911, 0.857278) +bones/17/position = Vector3(0.000624061, 2.89652, 1.03269e-05) +bones/17/rotation = Quaternion(0.207564, -0.000416576, -0.0132767, 0.978131) +bones/18/position = Vector3(0.0105192, 2.56021, 2.20537e-05) +bones/19/position = Vector3(-0.955101, 9.47556, -0.253679) +bones/19/rotation = Quaternion(0.342569, -0.00821127, 0.050494, 0.938099) +bones/20/position = Vector3(-0.00172836, 3.39762, 6.92725e-06) +bones/20/rotation = Quaternion(0.50153, -0.000192444, -0.0367875, 0.864358) +bones/21/position = Vector3(0.00409269, 3.19824, 4.93312e-07) +bones/21/rotation = Quaternion(0.335944, -8.39514e-05, -0.0261373, 0.941519) +bones/22/position = Vector3(-0.00237793, 2.99991, 9.83477e-06) +bones/23/position = Vector3(1.01976, 9.84634, -0.193835) +bones/23/rotation = Quaternion(0.409699, -0.0244552, 0.0804267, 0.908339) +bones/24/position = Vector3(-0.0118652, 3.04989, 1.77043e-06) +bones/24/rotation = Quaternion(0.509526, 0.000396417, -0.0340288, 0.859782) +bones/25/position = Vector3(0.00632149, 2.85057, -3.69064e-06) +bones/25/rotation = Quaternion(0.173468, -0.000380233, -0.0125006, 0.98476) +bones/26/position = Vector3(0.00549984, 2.53632, -6.19888e-06) +bones/27/rotation = Quaternion(0.311367, -0.0292845, 0.133976, 0.940342) +bones/28/position = Vector3(-0.00902244, 2.81508, -2.19431e-06) +bones/28/rotation = Quaternion(0.492928, 0.00128819, -0.0329787, 0.869444) +bones/29/position = Vector3(-0.00492001, 2.3477, 1.43756e-06) +bones/29/rotation = Quaternion(0.273847, -0.000518838, -0.0143469, 0.961666) +bones/30/position = Vector3(0.0139517, 2.09557, -1.09673e-05) +bones/31/rotation = Quaternion(0.494488, -0.36288, 0.60222, 0.511009) +bones/32/position = Vector3(4.22225e-06, 12.6416, -1.10171e-05) +bones/32/rotation = Quaternion(0.37955, 0.0300409, -0.743407, 0.549896) +bones/33/position = Vector3(-5.33444e-06, 21.8736, 5.47588e-06) +bones/33/rotation = Quaternion(0.0292594, 0.00337502, -0.249351, 0.967965) +bones/34/position = Vector3(7.18826e-06, 25.0758, -4.14478e-06) +bones/34/rotation = Quaternion(-0.195169, 0.329259, 0.200115, 0.901916) +bones/35/rotation = Quaternion(0.296356, -0.111756, -0.179233, 0.931429) +bones/36/position = Vector3(0.456064, 3.20386, -8.12512e-06) +bones/36/rotation = Quaternion(-0.0614832, -0.184996, 0.128837, 0.972315) +bones/37/position = Vector3(-0.244571, 3.32856, -1.36769e-05) +bones/37/rotation = Quaternion(-0.158524, -0.0307899, 0.465163, 0.870371) +bones/38/position = Vector3(-0.211511, 3.05178, -1.10865e-05) +bones/39/position = Vector3(3.12053, 9.18468, 0.0421683) +bones/39/rotation = Quaternion(0.204655, -0.00671871, -0.018747, 0.978632) +bones/40/position = Vector3(-0.00222988, 3.1519, 9.17081e-06) +bones/40/rotation = Quaternion(0.421442, 0.00103411, 0.0148947, 0.906733) +bones/41/position = Vector3(-0.0128262, 2.89937, 1.74316e-06) +bones/41/rotation = Quaternion(0.432079, -0.000288449, 0.0214826, 0.90158) +bones/42/position = Vector3(0.0150719, 2.69096, 2.13236e-05) +bones/43/position = Vector3(0.930105, 9.47023, -0.320952) +bones/43/rotation = Quaternion(0.418293, -0.0532811, 0.0815441, 0.903074) +bones/44/position = Vector3(-0.000950336, 3.40719, 1.28055e-05) +bones/44/rotation = Quaternion(0.827156, 0.000328466, 0.0351444, 0.560872) +bones/45/rotation = Quaternion(0.163151, -2.80439e-05, 0.00763214, 0.986572) +bones/46/position = Vector3(0.00259387, 3.02687, 6.4373e-06) +bones/47/position = Vector3(-0.989343, 9.67951, 0.0239833) +bones/47/rotation = Quaternion(0.465976, -0.0287381, 0.0115431, 0.884255) +bones/48/position = Vector3(0.0445154, 3.01189, -1.12322e-06) +bones/48/rotation = Quaternion(0.755862, -0.00557906, 0.0184576, 0.654447) +bones/49/position = Vector3(0.00265485, 2.88887, 2.71164e-06) +bones/49/rotation = Quaternion(0.418283, 0.00289807, 0.00376654, 0.908304) +bones/50/position = Vector3(-0.0471536, 2.55138, -1.09673e-05) +bones/51/position = Vector3(-3.06127, 8.97437, 0.211041) +bones/51/rotation = Quaternion(0.478424, -0.00936341, -0.0220554, 0.877802) +bones/52/position = Vector3(0.0111583, 2.80333, 8.22487e-06) +bones/52/rotation = Quaternion(0.585571, -0.00241607, 0.0190579, 0.810394) +bones/53/position = Vector3(0.0101426, 2.38341, 9.88739e-06) +bones/53/rotation = Quaternion(0.436353, 0.00101625, 0.00774158, 0.899742) +bones/54/position = Vector3(-0.0213175, 2.19929, 1.97887e-05) +bones/55/rotation = Quaternion(0.126585, 0.224655, 0.950727, -0.17212) +bones/56/rotation = Quaternion(-0.243967, -0.0859724, -0.00367405, 0.965958) +bones/57/rotation = Quaternion(0.435121, -0.0653114, -0.00439514, 0.897989) +bones/58/rotation = Quaternion(0.351876, -0.0232251, 0.00873377, 0.935718) +bones/60/rotation = Quaternion(-0.124929, 0.0737917, 0.986052, 0.0815441) +bones/61/rotation = Quaternion(-0.156, -0.0709137, 0.0190794, 0.985024) +bones/62/rotation = Quaternion(0.496512, 0.112741, 0.0299064, 0.860157) +bones/63/rotation = Quaternion(0.352338, 0.0234385, -0.00882726, 0.935538) diff --git a/scenes/utils/character.tscn b/scenes/utils/character.tscn index e87b8c7..56bb7f3 100644 --- a/scenes/utils/character.tscn +++ b/scenes/utils/character.tscn @@ -1,11 +1,8 @@ -[gd_scene load_steps=6 format=3 uid="uid://ccm77j5rkh21w"] +[gd_scene load_steps=5 format=3 uid="uid://ccm77j5rkh21w"] [ext_resource type="Script" path="res://scripts/character_controller.gd" id="1_sue4n"] +[ext_resource type="PackedScene" uid="uid://ceywbkneyatpw" path="res://scenes/utils/body.tscn" id="2_2couv"] [ext_resource type="PackedScene" uid="uid://d21giy40pnjhe" path="res://scenes/weapon/pistol.tscn" id="2_blr4e"] -[ext_resource type="Texture2D" uid="uid://d1nfjip21kjpu" path="res://addons/kenney_prototype_textures/orange/texture_13.png" id="2_i60ip"] - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_m6bjf"] -albedo_texture = ExtResource("2_i60ip") [sub_resource type="CylinderShape3D" id="CylinderShape3D_1sre5"] @@ -14,22 +11,23 @@ albedo_texture = ExtResource("2_i60ip") [node name="CharacterBody3D" type="CharacterBody3D" parent="."] script = ExtResource("1_sue4n") -[node name="Body" type="CSGCylinder3D" parent="CharacterBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.975222, 0) -material_override = SubResource("StandardMaterial3D_m6bjf") - -[node name="UpperTorso" type="CSGSphere3D" parent="CharacterBody3D/Body"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.298181, 0) - -[node name="CameraMount" type="Node3D" parent="CharacterBody3D/Body/UpperTorso"] -transform = Transform3D(1, 0, 0, 0, 0.999971, 0.00759248, 0, -0.00759248, 0.999971, 0, 0.212444, 0) - -[node name="Camera" type="Camera3D" parent="CharacterBody3D/Body/UpperTorso/CameraMount"] -transform = Transform3D(1, 0, 0, 0, 1, -4.65661e-10, 0, 0, 1, 0, 0.0051769, -0.68182) - -[node name="Pistol" parent="CharacterBody3D/Body/UpperTorso" instance=ExtResource("2_blr4e")] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0.26718, -0.000199199, -0.945376) - [node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.981342, 0) shape = SubResource("CylinderShape3D_1sre5") + +[node name="character" parent="CharacterBody3D" instance=ExtResource("2_2couv")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) +visible = false + +[node name="UpperTorso" type="CSGSphere3D" parent="CharacterBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2734, 0) +radius = 0.001 + +[node name="CameraMount" type="Node3D" parent="CharacterBody3D/UpperTorso"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.236781, 0.381951) + +[node name="Camera" type="Camera3D" parent="CharacterBody3D/UpperTorso/CameraMount"] +transform = Transform3D(1, 0, 0, 0, 1, -4.65661e-10, 0, 0, 1, 0, 0.0051769, -0.68182) + +[node name="Pistol" parent="CharacterBody3D/UpperTorso" instance=ExtResource("2_blr4e")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0.0372534, 0.13185, -0.486869) diff --git a/scripts/character_controller.gd b/scripts/character_controller.gd index 4a462d6..3d17592 100644 --- a/scripts/character_controller.gd +++ b/scripts/character_controller.gd @@ -22,7 +22,7 @@ var walk_vel: Vector3 # Walking velocity var grav_vel: Vector3 # Gravity velocity var jump_vel: Vector3 # Jumping velocity -@onready var camera: Node3D = $Body/UpperTorso +@onready var camera: Node3D = $UpperTorso @onready var character: Node3D = $"." func _ready() -> void: @@ -34,8 +34,8 @@ func _unhandled_input(event: InputEvent) -> void: if mouse_captured: _rotate_camera() if Input.is_action_just_pressed("jump"): jumping = true if Input.is_action_just_pressed("exit"): get_tree().quit() - if Input.is_action_just_pressed("shot"): $Body/UpperTorso/Pistol.shot() - if Input.is_action_just_pressed("reload"): $Body/UpperTorso/Pistol.reload() + if Input.is_action_just_pressed("shot"): $UpperTorso/Pistol.shot() + if Input.is_action_just_pressed("reload"): $UpperTorso/Pistol.reload() func _physics_process(delta: float) -> void: @@ -68,6 +68,8 @@ func _walk(delta: float) -> Vector3: var _forward: Vector3 = camera.global_transform.basis * Vector3(move_dir.x, 0, move_dir.y) var walk_dir: Vector3 = Vector3(_forward.x, 0, _forward.z).normalized() walk_vel = walk_vel.move_toward(walk_dir * speed * move_dir.length(), acceleration * delta) + var body := $character + return walk_vel func _gravity(delta: float) -> Vector3: