diff --git a/blender_assets.cats.txt b/blender_assets.cats.txt index 85b3a27..952ed0d 100644 --- a/blender_assets.cats.txt +++ b/blender_assets.cats.txt @@ -7,6 +7,7 @@ VERSION 1 2d156ad2-c792-445d-9126-9cb757a17dc1:models:models +2c971558-b0ed-4e6d-bb00-538a7cbd2197:models/concrete:models-concrete 4c17a9ae-9ce0-4244-801d-5de230574082:models/general:models-general f442a275-9128-4013-a62f-bcb09bb9103c:models/paintings:models-paintings 53882271-4519-4ad2-bc6e-24e8c13bedc1:textures:textures @@ -15,4 +16,5 @@ aacd3110-beaf-41fe-83fc-e4b96bc584e4:textures/dev:textures-dev f38a2905-eb61-4b61-a5e8-a63f8f288e01:textures/metal:textures-metal 95f1e260-50a9-4d0b-b24a-75bfcd12a7b7:textures/models:textures-models 49c26a51-1841-43df-a47a-2652179f320d:textures/paintings:textures-paintings +ab1b452a-ddb7-46f1-8831-650331b28437:textures/plastic:textures-plastic 892b461a-5bec-4bad-808d-379263f009ed:textures/wood:textures-wood diff --git a/blender_assets.cats.txt~ b/blender_assets.cats.txt~ index 85b3a27..952ed0d 100644 --- a/blender_assets.cats.txt~ +++ b/blender_assets.cats.txt~ @@ -7,6 +7,7 @@ VERSION 1 2d156ad2-c792-445d-9126-9cb757a17dc1:models:models +2c971558-b0ed-4e6d-bb00-538a7cbd2197:models/concrete:models-concrete 4c17a9ae-9ce0-4244-801d-5de230574082:models/general:models-general f442a275-9128-4013-a62f-bcb09bb9103c:models/paintings:models-paintings 53882271-4519-4ad2-bc6e-24e8c13bedc1:textures:textures @@ -15,4 +16,5 @@ aacd3110-beaf-41fe-83fc-e4b96bc584e4:textures/dev:textures-dev f38a2905-eb61-4b61-a5e8-a63f8f288e01:textures/metal:textures-metal 95f1e260-50a9-4d0b-b24a-75bfcd12a7b7:textures/models:textures-models 49c26a51-1841-43df-a47a-2652179f320d:textures/paintings:textures-paintings +ab1b452a-ddb7-46f1-8831-650331b28437:textures/plastic:textures-plastic 892b461a-5bec-4bad-808d-379263f009ed:textures/wood:textures-wood diff --git a/maps/levelpool.blend b/maps/levelpool.blend index a18c4c7..a00da40 100644 Binary files a/maps/levelpool.blend and b/maps/levelpool.blend differ diff --git a/models/concrete/fish64.blend b/models/concrete/fish64.blend new file mode 100644 index 0000000..0908e35 Binary files /dev/null and b/models/concrete/fish64.blend differ diff --git a/models/concrete/fish64.blend.import b/models/concrete/fish64.blend.import new file mode 100644 index 0000000..67f0f02 --- /dev/null +++ b/models/concrete/fish64.blend.import @@ -0,0 +1,51 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://b1o6bku7lunpm" +path="res://.godot/imported/fish64.blend-51e62709fb63e7036f644b432eb8c5c6.scn" + +[deps] + +source_file="res://assets/models/concrete/fish64.blend" +dest_files=["res://.godot/imported/fish64.blend-51e62709fb63e7036f644b432eb8c5c6.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/textures/concrete/IMG_20230910_131230.png b/textures/concrete/IMG_20230910_131230.png new file mode 100644 index 0000000..d40b7a5 Binary files /dev/null and b/textures/concrete/IMG_20230910_131230.png differ diff --git a/textures/concrete/IMG_20230910_131230.png.import b/textures/concrete/IMG_20230910_131230.png.import new file mode 100644 index 0000000..191256a --- /dev/null +++ b/textures/concrete/IMG_20230910_131230.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dd4lson6frjf4" +path="res://.godot/imported/IMG_20230910_131230.png-e129cc4831a96bf5eae345a65bd97865.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/concrete/IMG_20230910_131230.png" +dest_files=["res://.godot/imported/IMG_20230910_131230.png-e129cc4831a96bf5eae345a65bd97865.ctex"] + +[params] + +compress/mode=3 +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/textures/concrete/fish64.png b/textures/concrete/fish64.png new file mode 100644 index 0000000..b8ccd89 Binary files /dev/null and b/textures/concrete/fish64.png differ diff --git a/textures/concrete/fish64.png.import b/textures/concrete/fish64.png.import new file mode 100644 index 0000000..c6ac448 --- /dev/null +++ b/textures/concrete/fish64.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bqt1rpcewc4he" +path.s3tc="res://.godot/imported/fish64.png-445fcb5ee58964cb81376331aff03515.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/concrete/fish64.png" +dest_files=["res://.godot/imported/fish64.png-445fcb5ee58964cb81376331aff03515.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/textures/concrete/fish64.xcf b/textures/concrete/fish64.xcf new file mode 100644 index 0000000..984f71e Binary files /dev/null and b/textures/concrete/fish64.xcf differ diff --git a/textures/concrete/rockydirt.png b/textures/concrete/rockydirt.png new file mode 100644 index 0000000..4b0994b Binary files /dev/null and b/textures/concrete/rockydirt.png differ diff --git a/textures/concrete/rockydirt.png.import b/textures/concrete/rockydirt.png.import new file mode 100644 index 0000000..9912cae --- /dev/null +++ b/textures/concrete/rockydirt.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b7eernjpdtkr3" +path="res://.godot/imported/rockydirt.png-d3156b4622191fc4d833c4cfcda2fbfd.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/concrete/rockydirt.png" +dest_files=["res://.godot/imported/rockydirt.png-d3156b4622191fc4d833c4cfcda2fbfd.ctex"] + +[params] + +compress/mode=3 +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/textures/concrete/rockydirt.xcf b/textures/concrete/rockydirt.xcf new file mode 100644 index 0000000..4c3f38c Binary files /dev/null and b/textures/concrete/rockydirt.xcf differ diff --git a/textures/concrete/rockydirt_brownedition.png b/textures/concrete/rockydirt_brownedition.png new file mode 100644 index 0000000..adccff2 Binary files /dev/null and b/textures/concrete/rockydirt_brownedition.png differ diff --git a/textures/concrete/rockydirt_brownedition.png.import b/textures/concrete/rockydirt_brownedition.png.import new file mode 100644 index 0000000..d1d08ce --- /dev/null +++ b/textures/concrete/rockydirt_brownedition.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bjo8rts6ae6bh" +path.s3tc="res://.godot/imported/rockydirt_brownedition.png-6a5f234524fc9d241eae5e2f3d75fbe7.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/concrete/rockydirt_brownedition.png" +dest_files=["res://.godot/imported/rockydirt_brownedition.png-6a5f234524fc9d241eae5e2f3d75fbe7.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/textures/concrete/rockydirt_brownedition.xcf b/textures/concrete/rockydirt_brownedition.xcf new file mode 100644 index 0000000..8358153 Binary files /dev/null and b/textures/concrete/rockydirt_brownedition.xcf differ diff --git a/textures/dev/tiles01_pink_clip.png.import b/textures/dev/tiles01_pink_clip.png.import index 13e0854..6ebc59e 100644 --- a/textures/dev/tiles01_pink_clip.png.import +++ b/textures/dev/tiles01_pink_clip.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dhnlhkqotrwcq" -path="res://.godot/imported/tiles01_pink_clip.png-3eb729c53b3c32779c39808759873f3a.ctex" +path.s3tc="res://.godot/imported/tiles01_pink_clip.png-3eb729c53b3c32779c39808759873f3a.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/dev/tiles01_pink_clip.png" -dest_files=["res://.godot/imported/tiles01_pink_clip.png-3eb729c53b3c32779c39808759873f3a.ctex"] +dest_files=["res://.godot/imported/tiles01_pink_clip.png-3eb729c53b3c32779c39808759873f3a.s3tc.ctex"] [params] -compress/mode=3 +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/textures/metal/grate02.png b/textures/metal/grate02.png new file mode 100755 index 0000000..5b71bce Binary files /dev/null and b/textures/metal/grate02.png differ diff --git a/textures/metal/grate02.png.import b/textures/metal/grate02.png.import new file mode 100644 index 0000000..0deae4d --- /dev/null +++ b/textures/metal/grate02.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cf6mt0x11uq0y" +path.s3tc="res://.godot/imported/grate02.png-50ca379b37bf26081b4e420e4a690e2e.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/metal/grate02.png" +dest_files=["res://.godot/imported/grate02.png-50ca379b37bf26081b4e420e4a690e2e.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/textures/plastic/ceilingtilesa.png b/textures/plastic/ceilingtilesa.png new file mode 100755 index 0000000..0194bf4 Binary files /dev/null and b/textures/plastic/ceilingtilesa.png differ diff --git a/textures/plastic/ceilingtilesa.png.import b/textures/plastic/ceilingtilesa.png.import new file mode 100644 index 0000000..3de9db6 --- /dev/null +++ b/textures/plastic/ceilingtilesa.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c8nxecs035ek8" +path.s3tc="res://.godot/imported/ceilingtilesa.png-5b1acf4bcb7f340631a5b920f1b61c1d.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/plastic/ceilingtilesa.png" +dest_files=["res://.godot/imported/ceilingtilesa.png-5b1acf4bcb7f340631a5b920f1b61c1d.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/textures/plastic/ceilingtilesa.xcf b/textures/plastic/ceilingtilesa.xcf new file mode 100644 index 0000000..ba5cb32 Binary files /dev/null and b/textures/plastic/ceilingtilesa.xcf differ diff --git a/textures/plastic/plasticwallscene.blend b/textures/plastic/plasticwallscene.blend new file mode 100644 index 0000000..f6edcf8 Binary files /dev/null and b/textures/plastic/plasticwallscene.blend differ diff --git a/textures/plastic/plasticwallscene.blend.import b/textures/plastic/plasticwallscene.blend.import new file mode 100644 index 0000000..19a3b03 --- /dev/null +++ b/textures/plastic/plasticwallscene.blend.import @@ -0,0 +1,51 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://cr638loftoogm" +path="res://.godot/imported/plasticwallscene.blend-fbb0a2260fb52a4d5cd8ed0a148f0a73.scn" + +[deps] + +source_file="res://assets/textures/plastic/plasticwallscene.blend" +dest_files=["res://.godot/imported/plasticwallscene.blend-fbb0a2260fb52a4d5cd8ed0a148f0a73.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/textures/plastic/wallplastic128.png b/textures/plastic/wallplastic128.png new file mode 100644 index 0000000..f340327 Binary files /dev/null and b/textures/plastic/wallplastic128.png differ diff --git a/textures/plastic/wallplastic128.png.import b/textures/plastic/wallplastic128.png.import new file mode 100644 index 0000000..dc7781a --- /dev/null +++ b/textures/plastic/wallplastic128.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cq56ab5qsaopq" +path.s3tc="res://.godot/imported/wallplastic128.png-7047d4735111a4638ed19c052a774218.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/plastic/wallplastic128.png" +dest_files=["res://.godot/imported/wallplastic128.png-7047d4735111a4638ed19c052a774218.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/textures/plastic/wallplastic256.png b/textures/plastic/wallplastic256.png new file mode 100644 index 0000000..f4947d2 Binary files /dev/null and b/textures/plastic/wallplastic256.png differ diff --git a/textures/plastic/wallplastic256.png.import b/textures/plastic/wallplastic256.png.import new file mode 100644 index 0000000..0b83a6a --- /dev/null +++ b/textures/plastic/wallplastic256.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ddoxsuqnf32df" +path="res://.godot/imported/wallplastic256.png-62c91a11337cb9dabfd8a7e0d53a3a69.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/plastic/wallplastic256.png" +dest_files=["res://.godot/imported/wallplastic256.png-62c91a11337cb9dabfd8a7e0d53a3a69.ctex"] + +[params] + +compress/mode=3 +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/textures/textures.blend b/textures/textures.blend index 6e347e8..fb7a95a 100644 Binary files a/textures/textures.blend and b/textures/textures.blend differ