diff --git a/design/youth room/youth-construction.blend b/design/youth room/youth-construction.blend index c6de9c7..3be1dde 100644 --- a/design/youth room/youth-construction.blend +++ b/design/youth room/youth-construction.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1df3c4365550328a69c2ed3aa34232e7635c3fb6cd596802f732a2b45afea6b8 -size 198287196 +oid sha256:41d783f583b7c42555197811448ef0161747df542dff51802255da9812e90cb2 +size 197535190 diff --git a/src/base-environments/youth_room/import/materials/Drawer.tres b/src/base-environments/youth_room/import/materials/Drawer.tres index d22e6cb..8945014 100644 --- a/src/base-environments/youth_room/import/materials/Drawer.tres +++ b/src/base-environments/youth_room/import/materials/Drawer.tres @@ -1,17 +1,15 @@ [gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://ddx8gbx1u5y74"] -[ext_resource type="Texture2D" uid="uid://s6snykgkt2cc" path="res://base-environments/youth_room/import/textures/Scene_-_Root_baseColor.png" id="1_ku8ab"] -[ext_resource type="Texture2D" uid="uid://cjlswv5rusy5p" path="res://base-environments/youth_room/import/textures/Scene_-_Root_metallicRoughness.png" id="2_3i6ww"] -[ext_resource type="Texture2D" uid="uid://cis2ionj4b06e" path="res://base-environments/youth_room/import/textures/Scene_-_Root_normal.png" id="3_8eg3d"] +[ext_resource type="Texture2D" uid="uid://bu38g1bol8byp" path="res://base-environments/youth_room/import/textures/blue_closet_Color.png" id="1_n7hb8"] +[ext_resource type="Texture2D" uid="uid://b2n6qgvpd4u70" path="res://base-environments/youth_room/import/textures/blue_closet_MR.png" id="2_o4wn8"] +[ext_resource type="Texture2D" uid="uid://mc1albqsfnbj" path="res://base-environments/youth_room/import/textures/blue_closet_normal.png" id="3_6iy4g"] [resource] resource_name = "Drawer" cull_mode = 2 -vertex_color_use_as_albedo = true -albedo_texture = ExtResource("1_ku8ab") -metallic = 1.0 -metallic_texture = ExtResource("2_3i6ww") -metallic_texture_channel = 1 -roughness_texture = ExtResource("2_3i6ww") +albedo_texture = ExtResource("1_n7hb8") +metallic_texture = ExtResource("2_o4wn8") +roughness_texture = ExtResource("2_o4wn8") +roughness_texture_channel = 1 normal_enabled = true -normal_texture = ExtResource("3_8eg3d") +normal_texture = ExtResource("3_6iy4g") diff --git a/src/base-environments/youth_room/import/materials/plush.tres b/src/base-environments/youth_room/import/materials/plush.tres new file mode 100644 index 0000000..aea4215 --- /dev/null +++ b/src/base-environments/youth_room/import/materials/plush.tres @@ -0,0 +1,8 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://cg5b0u7vnttr6"] + +[resource] +resource_name = "plush" +cull_mode = 2 +vertex_color_use_as_albedo = true +albedo_color = Color(0.906332, 0.906332, 0.906332, 1) +roughness = 0.731818 diff --git a/src/base-environments/youth_room/import/textures/Fabric008_2K_Color_AO.png b/src/base-environments/youth_room/import/textures/Fabric008_2K_Color_AO.png new file mode 100644 index 0000000..2d62fa0 --- /dev/null +++ b/src/base-environments/youth_room/import/textures/Fabric008_2K_Color_AO.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a09e68a4a027b146c2976a632bd30e6cb54f4287aaa564f6597bd23bee13a2ba +size 2756854 diff --git a/src/base-environments/youth_room/import/textures/Fabric008_2K_Color_AO.png.import b/src/base-environments/youth_room/import/textures/Fabric008_2K_Color_AO.png.import new file mode 100644 index 0000000..baba793 --- /dev/null +++ b/src/base-environments/youth_room/import/textures/Fabric008_2K_Color_AO.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b74ac0r0diq6u" +path="res://.godot/imported/Fabric008_2K_Color_AO.png-c4ad57820f80208904dce2d7ff9c1fc4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base-environments/youth_room/import/textures/Fabric008_2K_Color_AO.png" +dest_files=["res://.godot/imported/Fabric008_2K_Color_AO.png-c4ad57820f80208904dce2d7ff9c1fc4.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/src/base-environments/youth_room/import/textures/Wicker010B_2K_Color.png-autosave.kra b/src/base-environments/youth_room/import/textures/Wicker010B_2K_Color.png-autosave.kra new file mode 100644 index 0000000..3a5bd9c Binary files /dev/null and b/src/base-environments/youth_room/import/textures/Wicker010B_2K_Color.png-autosave.kra differ diff --git a/src/base-environments/youth_room/import/textures/Wicker010B_2K_Color_AO.png b/src/base-environments/youth_room/import/textures/Wicker010B_2K_Color_AO.png new file mode 100644 index 0000000..9080fa3 --- /dev/null +++ b/src/base-environments/youth_room/import/textures/Wicker010B_2K_Color_AO.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3e09eb4c05e564dfe527ca791432c3aca686933d072e5faf4f6f217907a40a8 +size 7107092 diff --git a/src/base-environments/youth_room/import/textures/Wicker010B_2K_Color_AO.png.import b/src/base-environments/youth_room/import/textures/Wicker010B_2K_Color_AO.png.import new file mode 100644 index 0000000..881dee9 --- /dev/null +++ b/src/base-environments/youth_room/import/textures/Wicker010B_2K_Color_AO.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://xcn0a43iy5xx" +path="res://.godot/imported/Wicker010B_2K_Color_AO.png-c4a50ff0b36b89671f09d9b2f522762c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base-environments/youth_room/import/textures/Wicker010B_2K_Color_AO.png" +dest_files=["res://.godot/imported/Wicker010B_2K_Color_AO.png-c4a50ff0b36b89671f09d9b2f522762c.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/src/base-environments/youth_room/import/textures/Wicker010B_2K_Color_AO.png~ b/src/base-environments/youth_room/import/textures/Wicker010B_2K_Color_AO.png~ new file mode 100644 index 0000000..70c0051 Binary files /dev/null and b/src/base-environments/youth_room/import/textures/Wicker010B_2K_Color_AO.png~ differ diff --git a/src/base-environments/youth_room/import/textures/Wicker010B_2K_normalgl_roughness.png b/src/base-environments/youth_room/import/textures/Wicker010B_2K_normalgl_roughness.png new file mode 100644 index 0000000..4f4b762 --- /dev/null +++ b/src/base-environments/youth_room/import/textures/Wicker010B_2K_normalgl_roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cacb5549f4a704b19332d9b6837b1e3b19e7eee718ea9bd242388eb55a93487b +size 7735821 diff --git a/src/base-environments/youth_room/import/textures/Wicker010B_2K_normalgl_roughness.png.import b/src/base-environments/youth_room/import/textures/Wicker010B_2K_normalgl_roughness.png.import new file mode 100644 index 0000000..8c64ca3 --- /dev/null +++ b/src/base-environments/youth_room/import/textures/Wicker010B_2K_normalgl_roughness.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bik7iyfg73u35" +path="res://.godot/imported/Wicker010B_2K_normalgl_roughness.png-99ddfab3e39c60c2a44f620cc8b06761.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base-environments/youth_room/import/textures/Wicker010B_2K_normalgl_roughness.png" +dest_files=["res://.godot/imported/Wicker010B_2K_normalgl_roughness.png-99ddfab3e39c60c2a44f620cc8b06761.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/src/base-environments/youth_room/import/textures/blue_closet_Color.png.import b/src/base-environments/youth_room/import/textures/blue_closet_Color.png.import index 848c7b4..f093c0d 100644 --- a/src/base-environments/youth_room/import/textures/blue_closet_Color.png.import +++ b/src/base-environments/youth_room/import/textures/blue_closet_Color.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://bu38g1bol8byp" -path="res://.godot/imported/blue_closet_Color.png-9fd98c07dc5b477fe14e4404196ddc2d.ctex" +path.s3tc="res://.godot/imported/blue_closet_Color.png-9fd98c07dc5b477fe14e4404196ddc2d.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://base-environments/youth_room/import/textures/blue_closet_Color.png" -dest_files=["res://.godot/imported/blue_closet_Color.png-9fd98c07dc5b477fe14e4404196ddc2d.ctex"] +dest_files=["res://.godot/imported/blue_closet_Color.png-9fd98c07dc5b477fe14e4404196ddc2d.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/src/base-environments/youth_room/import/textures/blue_closet_MR.png.import b/src/base-environments/youth_room/import/textures/blue_closet_MR.png.import index 30d49a9..6782cee 100644 --- a/src/base-environments/youth_room/import/textures/blue_closet_MR.png.import +++ b/src/base-environments/youth_room/import/textures/blue_closet_MR.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://b2n6qgvpd4u70" -path="res://.godot/imported/blue_closet_MR.png-1c3bcf8887302b675b3d5ce5f6c0f1f9.ctex" +path.s3tc="res://.godot/imported/blue_closet_MR.png-1c3bcf8887302b675b3d5ce5f6c0f1f9.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://base-environments/youth_room/import/textures/blue_closet_MR.png" -dest_files=["res://.godot/imported/blue_closet_MR.png-1c3bcf8887302b675b3d5ce5f6c0f1f9.ctex"] +dest_files=["res://.godot/imported/blue_closet_MR.png-1c3bcf8887302b675b3d5ce5f6c0f1f9.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/normal_map=1 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/src/base-environments/youth_room/import/textures/blue_closet_normal.png.import b/src/base-environments/youth_room/import/textures/blue_closet_normal.png.import index 417f3ff..855feb7 100644 --- a/src/base-environments/youth_room/import/textures/blue_closet_normal.png.import +++ b/src/base-environments/youth_room/import/textures/blue_closet_normal.png.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://mc1albqsfnbj" -path="res://.godot/imported/blue_closet_normal.png-1f20921df76aa461a766ffb7f81dd6eb.ctex" +path.s3tc="res://.godot/imported/blue_closet_normal.png-1f20921df76aa461a766ffb7f81dd6eb.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://base-environments/youth_room/import/textures/blue_closet_normal.png" -dest_files=["res://.godot/imported/blue_closet_normal.png-1f20921df76aa461a766ffb7f81dd6eb.ctex"] +dest_files=["res://.godot/imported/blue_closet_normal.png-1f20921df76aa461a766ffb7f81dd6eb.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/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://base-environments/youth_room/import/textures/blue_closet_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=1 +detect_3d/compress_to=0 diff --git a/src/base-environments/youth_room/import/textures/wood_flooring_normal_roughness.png b/src/base-environments/youth_room/import/textures/wood_flooring_normal_roughness.png new file mode 100644 index 0000000..505756b --- /dev/null +++ b/src/base-environments/youth_room/import/textures/wood_flooring_normal_roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d6d0f7f6ac2bf13fa3ca7708cca2e8a8f2529929bf13488722e76ecbf45c4f9 +size 3477088 diff --git a/src/base-environments/youth_room/import/textures/wood_flooring_normal_roughness.png.import b/src/base-environments/youth_room/import/textures/wood_flooring_normal_roughness.png.import new file mode 100644 index 0000000..390b222 --- /dev/null +++ b/src/base-environments/youth_room/import/textures/wood_flooring_normal_roughness.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b6egogm3kt5gm" +path="res://.godot/imported/wood_flooring_normal_roughness.png-fc0d2281628dc6b7fcc215071df0c76c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base-environments/youth_room/import/textures/wood_flooring_normal_roughness.png" +dest_files=["res://.godot/imported/wood_flooring_normal_roughness.png-fc0d2281628dc6b7fcc215071df0c76c.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/src/base-environments/youth_room/import/youth_room.glb b/src/base-environments/youth_room/import/youth_room.glb index 74b4e9e..c09753d 100644 --- a/src/base-environments/youth_room/import/youth_room.glb +++ b/src/base-environments/youth_room/import/youth_room.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c53e57900161da36718e24d837f8c46576355a1c99d88b5664d8f88a7baa6fd7 -size 35038380 +oid sha256:c0858e9b52c8a7499601a6c6099ef2070d9deb9aaedba9d4f0efb68f60ba7b5d +size 35981804 diff --git a/src/base-environments/youth_room/shaders/starlight-textures.png.import b/src/base-environments/youth_room/shaders/starlight-textures.png.import index 7df7438..eb59cf0 100644 --- a/src/base-environments/youth_room/shaders/starlight-textures.png.import +++ b/src/base-environments/youth_room/shaders/starlight-textures.png.import @@ -22,7 +22,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" diff --git a/src/base-environments/youth_room/shaders/window.material b/src/base-environments/youth_room/shaders/window.material index d0cb259..7ad2d71 100644 Binary files a/src/base-environments/youth_room/shaders/window.material and b/src/base-environments/youth_room/shaders/window.material differ