diff --git a/design/youth-construction.blend b/design/youth-construction.blend index 31ca286..ec7023d 100644 Binary files a/design/youth-construction.blend and b/design/youth-construction.blend differ diff --git a/design/youth-construction.blend1 b/design/youth-construction.blend1 index 001fb24..31ca286 100644 Binary files a/design/youth-construction.blend1 and b/design/youth-construction.blend1 differ diff --git a/src/base-environments/youth_room/import/materials/CarpetFluffy.tres b/src/base-environments/youth_room/import/materials/CarpetFluffy.tres index b7bd62e..1b4b9ba 100644 --- a/src/base-environments/youth_room/import/materials/CarpetFluffy.tres +++ b/src/base-environments/youth_room/import/materials/CarpetFluffy.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=3 format=3] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://dl2cx8e6l2wwj"] [ext_resource type="Texture2D" uid="uid://k6a1jutqj4b6" path="res://base-environments/youth_room/import/textures/CarpetFluffy_baseColor.jpeg" id="1_61ey6"] [ext_resource type="Texture2D" uid="uid://cogp7xyo3v0p6" path="res://base-environments/youth_room/import/textures/CarpetFluffy_normal.png" id="2_5l5dn"] diff --git a/src/base-environments/youth_room/import/materials/Drawer.tres b/src/base-environments/youth_room/import/materials/Drawer.tres index e2468ce..d22e6cb 100644 --- a/src/base-environments/youth_room/import/materials/Drawer.tres +++ b/src/base-environments/youth_room/import/materials/Drawer.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3] +[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"] diff --git a/src/base-environments/youth_room/import/materials/antique_drawer.tres b/src/base-environments/youth_room/import/materials/antique_drawer.tres index e2012b4..3925e2f 100644 --- a/src/base-environments/youth_room/import/materials/antique_drawer.tres +++ b/src/base-environments/youth_room/import/materials/antique_drawer.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://chppunh2n0ssf"] [ext_resource type="Texture2D" uid="uid://cowibadoybj38" path="res://base-environments/youth_room/import/textures/Material.1_baseColor.png" id="1_q31dd"] [ext_resource type="Texture2D" uid="uid://dpgm5nl43nab3" path="res://base-environments/youth_room/import/textures/Material.1_metallicRoughness.png" id="2_rse82"] diff --git a/src/base-environments/youth_room/import/materials/beam_metal.tres b/src/base-environments/youth_room/import/materials/beam_metal.tres index 8b4c961..0bbae74 100644 --- a/src/base-environments/youth_room/import/materials/beam_metal.tres +++ b/src/base-environments/youth_room/import/materials/beam_metal.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://xkk6aow32pkr"] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://cxl8ax8s2hst1"] [resource] resource_name = "beam_metal" diff --git a/src/base-environments/youth_room/import/materials/bed sheets.tres b/src/base-environments/youth_room/import/materials/bed sheets.tres index f8fc98b..a763d0a 100644 --- a/src/base-environments/youth_room/import/materials/bed sheets.tres +++ b/src/base-environments/youth_room/import/materials/bed sheets.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://ch2wcsu06e0tt"] [ext_resource type="Texture2D" uid="uid://dtoyd54qillno" path="res://base-environments/youth_room/import/textures/Fabric050_2K_Color.png" id="1_xg8c1"] [ext_resource type="Texture2D" uid="uid://csdwagyvpk1c" path="res://base-environments/youth_room/import/textures/Fabric050_2K_NormalGL.png" id="2_73qn1"] diff --git a/src/base-environments/youth_room/import/materials/black plastic.tres b/src/base-environments/youth_room/import/materials/black plastic.tres index 8848882..64621d2 100644 --- a/src/base-environments/youth_room/import/materials/black plastic.tres +++ b/src/base-environments/youth_room/import/materials/black plastic.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://dms0awepucxgh"] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://b4vual8rcq2b5"] [resource] resource_name = "black plastic" diff --git a/src/base-environments/youth_room/import/materials/book-cover.tres b/src/base-environments/youth_room/import/materials/book-cover.tres index ab3a753..5a13d47 100644 --- a/src/base-environments/youth_room/import/materials/book-cover.tres +++ b/src/base-environments/youth_room/import/materials/book-cover.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=3] +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://dk0tihehhbqo0"] [ext_resource type="Texture2D" uid="uid://qg7mgh221y88" path="res://base-environments/youth_room/import/textures/poster_albedo.png" id="1_ob15n"] [ext_resource type="Texture2D" uid="uid://dktehwplekb5u" path="res://base-environments/youth_room/import/textures/posters.png" id="2_lc2m7"] @@ -9,7 +9,6 @@ resource_name = "book-cover" cull_mode = 2 vertex_color_use_as_albedo = true -albedo_color = Color(0.906332, 0.906332, 0.906332, 1) albedo_texture = ExtResource("1_ob15n") roughness_texture = ExtResource("4_ki8vu") normal_enabled = true diff --git a/src/base-environments/youth_room/import/materials/bricks.tres b/src/base-environments/youth_room/import/materials/bricks.tres index bf16dfd..c481dbd 100644 --- a/src/base-environments/youth_room/import/materials/bricks.tres +++ b/src/base-environments/youth_room/import/materials/bricks.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=3] +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://1drgankkjl8r"] [ext_resource type="Texture2D" uid="uid://c5kmn62qmlbcx" path="res://base-environments/youth_room/import/textures/brick_wall_001_diffuse_1k.jpg" id="1_xbpdg"] [ext_resource type="Texture2D" uid="uid://due0m2r312cw0" path="res://base-environments/youth_room/import/textures/brick_wall_001_ao_1k.png" id="2_w0u8x"] diff --git a/src/base-environments/youth_room/import/materials/clay.tres b/src/base-environments/youth_room/import/materials/clay.tres index 5a56aa4..65fd413 100644 --- a/src/base-environments/youth_room/import/materials/clay.tres +++ b/src/base-environments/youth_room/import/materials/clay.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://dtn45uhfjfl3b"] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://b3saxvh80emb8"] [resource] resource_name = "clay" diff --git a/src/base-environments/youth_room/import/materials/coated metal.tres b/src/base-environments/youth_room/import/materials/coated metal.tres index 81d16d6..0cb4181 100644 --- a/src/base-environments/youth_room/import/materials/coated metal.tres +++ b/src/base-environments/youth_room/import/materials/coated metal.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://ck8kptg5mwkx0"] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://cxiuf6ywtjjou"] [resource] resource_name = "coated metal" diff --git a/src/base-environments/youth_room/import/materials/dark_wood.tres b/src/base-environments/youth_room/import/materials/dark_wood.tres index e7ed366..4b376be 100644 --- a/src/base-environments/youth_room/import/materials/dark_wood.tres +++ b/src/base-environments/youth_room/import/materials/dark_wood.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=3 format=3] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://c2dafitp8op44"] [ext_resource type="Texture2D" uid="uid://cek578irbojkj" path="res://base-environments/youth_room/import/textures/Wood005_2K_Color.jpg" id="1_jmr2s"] [ext_resource type="Texture2D" uid="uid://c6a7mt7uh4vh1" path="res://base-environments/youth_room/import/textures/Wood005_2K_NormalDX.jpg" id="2_3udni"] diff --git a/src/base-environments/youth_room/import/materials/desk-utilities.tres b/src/base-environments/youth_room/import/materials/desk-utilities.tres index 2f40131..5c89410 100644 --- a/src/base-environments/youth_room/import/materials/desk-utilities.tres +++ b/src/base-environments/youth_room/import/materials/desk-utilities.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=2 format=3] +[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://mar8nawwfvto"] [ext_resource type="Texture2D" uid="uid://bq1pg1hik6bdq" path="res://base-environments/youth_room/import/textures/desk-atlas-albedo.png" id="1_tlmn0"] diff --git a/src/base-environments/youth_room/import/materials/desk_lamp_arm_01.tres b/src/base-environments/youth_room/import/materials/desk_lamp_arm_01.tres index 20b4533..2838fd1 100644 --- a/src/base-environments/youth_room/import/materials/desk_lamp_arm_01.tres +++ b/src/base-environments/youth_room/import/materials/desk_lamp_arm_01.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://b0h6iluvj8xkt"] [ext_resource type="Texture2D" uid="uid://dufe3e0h3ll4v" path="res://base-environments/youth_room/import/textures/desk_lamp_arm_01_diff_1k.png" id="1_wkb38"] [ext_resource type="Texture2D" uid="uid://4jk4s1b67ct2" path="res://base-environments/youth_room/import/textures/desk_lamp_arm_01_nor_gl_1k.png" id="2_xpcvm"] diff --git a/src/base-environments/youth_room/import/materials/door.tres b/src/base-environments/youth_room/import/materials/door.tres index 2ebf22d..57e3b6c 100644 --- a/src/base-environments/youth_room/import/materials/door.tres +++ b/src/base-environments/youth_room/import/materials/door.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://t2ygvn5osob6"] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://bv1tjnn70kxv8"] [resource] resource_name = "door" diff --git a/src/base-environments/youth_room/import/materials/gi.tres b/src/base-environments/youth_room/import/materials/gi.tres index cedeab7..de00fdd 100644 --- a/src/base-environments/youth_room/import/materials/gi.tres +++ b/src/base-environments/youth_room/import/materials/gi.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=3 format=3] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://dn6n6ca60gktv"] [ext_resource type="Texture2D" uid="uid://4utnkevs7llx" path="res://base-environments/youth_room/import/textures/gi_albedo.png" id="1_iuuet"] [ext_resource type="Texture2D" uid="uid://cnu1h0a32nfwn" path="res://base-environments/youth_room/import/textures/gi_normal.png" id="2_5kua2"] diff --git a/src/base-environments/youth_room/import/materials/green_box.tres b/src/base-environments/youth_room/import/materials/green_box.tres index 4b151aa..dc9621c 100644 --- a/src/base-environments/youth_room/import/materials/green_box.tres +++ b/src/base-environments/youth_room/import/materials/green_box.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://5l16t1ycitrh"] [ext_resource type="Texture2D" uid="uid://cc50mahmvv36d" path="res://base-environments/youth_room/import/textures/Material_001_baseColor.jpeg" id="1_hrimj"] [ext_resource type="Texture2D" uid="uid://ftoeexad078p" path="res://base-environments/youth_room/import/textures/Material_001_metallicRoughness.png" id="2_d8bn6"] diff --git a/src/base-environments/youth_room/import/materials/grey_fabric.tres b/src/base-environments/youth_room/import/materials/grey_fabric.tres index e8fb3a6..8234bd3 100644 --- a/src/base-environments/youth_room/import/materials/grey_fabric.tres +++ b/src/base-environments/youth_room/import/materials/grey_fabric.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=3 format=3] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://cuytgqlowqq3e"] [ext_resource type="Texture2D" uid="uid://h4cfa1tduxk7" path="res://base-environments/youth_room/import/textures/Fabric030_2K_Color.jpg" id="1_3m3bc"] [ext_resource type="Texture2D" uid="uid://bv2ujbe3wc8hf" path="res://base-environments/youth_room/import/textures/Fabric030_2K_NormalGL.jpg" id="2_00r74"] diff --git a/src/base-environments/youth_room/import/materials/lack.tres b/src/base-environments/youth_room/import/materials/lack.tres index a6cff32..7fc76ed 100644 --- a/src/base-environments/youth_room/import/materials/lack.tres +++ b/src/base-environments/youth_room/import/materials/lack.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://c23x0g4sbrx0l"] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://c4kxc3y2k6jeb"] [resource] resource_name = "lack" diff --git a/src/base-environments/youth_room/import/materials/laptop.tres b/src/base-environments/youth_room/import/materials/laptop.tres index a13664b..ed8c9ca 100644 --- a/src/base-environments/youth_room/import/materials/laptop.tres +++ b/src/base-environments/youth_room/import/materials/laptop.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://ntd6toyfxqc3"] [ext_resource type="Texture2D" uid="uid://o1eu8hs2gdf7" path="res://base-environments/youth_room/import/textures/laptop_albedo.png" id="1_bq2e2"] [ext_resource type="Texture2D" uid="uid://cfqhjp4trbfis" path="res://base-environments/youth_room/import/textures/laptop_metallic_roughness.png" id="2_bqe4r"] diff --git a/src/base-environments/youth_room/import/materials/light.tres b/src/base-environments/youth_room/import/materials/light.tres index 88b6c78..39e71a6 100644 --- a/src/base-environments/youth_room/import/materials/light.tres +++ b/src/base-environments/youth_room/import/materials/light.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://dyapori8wpvyw"] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://ctanbvxymcfjc"] [resource] resource_name = "light" diff --git a/src/base-environments/youth_room/import/materials/light_wood.tres b/src/base-environments/youth_room/import/materials/light_wood.tres index 9df4a31..191c0a4 100644 --- a/src/base-environments/youth_room/import/materials/light_wood.tres +++ b/src/base-environments/youth_room/import/materials/light_wood.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://da6dsnjlb2jmh"] [ext_resource type="Texture2D" uid="uid://cj1n8lsksfh04" path="res://base-environments/youth_room/import/textures/Wood083B_4K_Color.jpg" id="1_ofb10"] [ext_resource type="Texture2D" uid="uid://n6vg08emqmgu" path="res://base-environments/youth_room/import/textures/Wood083B_4K_NormalGL.jpg" id="2_s2xq5"] diff --git a/src/base-environments/youth_room/import/materials/mattress.tres b/src/base-environments/youth_room/import/materials/mattress.tres index 3736839..0e70839 100644 --- a/src/base-environments/youth_room/import/materials/mattress.tres +++ b/src/base-environments/youth_room/import/materials/mattress.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://dbdyilwve4poa"] [ext_resource type="Texture2D" uid="uid://dkmxccmlqncoh" path="res://base-environments/youth_room/import/textures/Fabric008_2K_Color.png" id="1_vu7no"] [ext_resource type="Texture2D" uid="uid://ukfs7s471h2a" path="res://base-environments/youth_room/import/textures/Fabric008_2K_Opacity1.png" id="2_46wfg"] diff --git a/src/base-environments/youth_room/import/materials/mattress_cover.tres b/src/base-environments/youth_room/import/materials/mattress_cover.tres index d38d5ea..6065936 100644 --- a/src/base-environments/youth_room/import/materials/mattress_cover.tres +++ b/src/base-environments/youth_room/import/materials/mattress_cover.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://c83vw7trsvlsf"] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://qphgx0d7v85h"] [resource] resource_name = "mattress_cover" diff --git a/src/base-environments/youth_room/import/materials/metal.tres b/src/base-environments/youth_room/import/materials/metal.tres index 09eb693..ed79d28 100644 --- a/src/base-environments/youth_room/import/materials/metal.tres +++ b/src/base-environments/youth_room/import/materials/metal.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://d0vn5wlsklv3e"] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://y26jf7elkgak"] [resource] resource_name = "metal" diff --git a/src/base-environments/youth_room/import/materials/shelf_black.tres b/src/base-environments/youth_room/import/materials/shelf_black.tres index bd0a542..a8ec25f 100644 --- a/src/base-environments/youth_room/import/materials/shelf_black.tres +++ b/src/base-environments/youth_room/import/materials/shelf_black.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=3 format=3] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://be1d7osurf8mn"] [ext_resource type="Texture2D" uid="uid://c6a7mt7uh4vh1" path="res://base-environments/youth_room/import/textures/Wood005_2K_NormalDX.jpg" id="1_mq436"] [ext_resource type="Texture2D" uid="uid://c61ekclk8loxn" path="res://base-environments/youth_room/import/textures/red_plaster_weathered_rough_4k.png" id="2_bd8dr"] diff --git a/src/base-environments/youth_room/import/materials/sitting_fabric.tres b/src/base-environments/youth_room/import/materials/sitting_fabric.tres index b053362..32a09ea 100644 --- a/src/base-environments/youth_room/import/materials/sitting_fabric.tres +++ b/src/base-environments/youth_room/import/materials/sitting_fabric.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=3 format=3] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://bkphs6482ybh0"] [ext_resource type="Texture2D" uid="uid://dlifbn2d7lwob" path="res://base-environments/youth_room/import/textures/sitting_fabric_albedo.png" id="1_knwc8"] [ext_resource type="Texture2D" uid="uid://nccoy6pqw04l" path="res://base-environments/youth_room/import/textures/sitting_fabric_normal.png" id="2_goxn3"] diff --git a/src/base-environments/youth_room/import/materials/speaker.tres b/src/base-environments/youth_room/import/materials/speaker.tres index 44ed031..b7496df 100644 --- a/src/base-environments/youth_room/import/materials/speaker.tres +++ b/src/base-environments/youth_room/import/materials/speaker.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://c0is0jt1if26s"] [ext_resource type="Texture2D" uid="uid://7rvbwr33hnmy" path="res://base-environments/youth_room/import/textures/speaker_baseColor.png" id="1_by2ih"] [ext_resource type="Texture2D" uid="uid://phg5e3kwtmbu" path="res://base-environments/youth_room/import/textures/speaker_metallicRoughness.png" id="2_3aaaj"] diff --git a/src/base-environments/youth_room/import/materials/wall.tres b/src/base-environments/youth_room/import/materials/wall.tres index dba88b4..31af601 100644 --- a/src/base-environments/youth_room/import/materials/wall.tres +++ b/src/base-environments/youth_room/import/materials/wall.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=3 format=3] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://ct7uc5i5yp5qf"] [ext_resource type="Texture2D" uid="uid://c61ekclk8loxn" path="res://base-environments/youth_room/import/textures/red_plaster_weathered_rough_4k.png" id="1_2nxvx"] [ext_resource type="Texture2D" uid="uid://kf0vfm4sf0o3" path="res://base-environments/youth_room/import/textures/red_plaster_weathered_nor_gl_4k.png" id="2_80i0p"] diff --git a/src/base-environments/youth_room/import/materials/wall_orange.tres b/src/base-environments/youth_room/import/materials/wall_orange.tres index 8184909..3445266 100644 --- a/src/base-environments/youth_room/import/materials/wall_orange.tres +++ b/src/base-environments/youth_room/import/materials/wall_orange.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://c7wuscubirbkj"] [ext_resource type="Texture2D" uid="uid://mfmkg4rhdj6b" path="res://base-environments/youth_room/import/textures/red_plaster_weathered_diff_4k.jpg" id="1_fgt32"] [ext_resource type="Texture2D" uid="uid://kf0vfm4sf0o3" path="res://base-environments/youth_room/import/textures/red_plaster_weathered_nor_gl_4k.png" id="2_w1hy2"] diff --git a/src/base-environments/youth_room/import/materials/weed_plant_02.001.tres b/src/base-environments/youth_room/import/materials/weed_plant_02.001.tres index 5c15d67..41c6c46 100644 --- a/src/base-environments/youth_room/import/materials/weed_plant_02.001.tres +++ b/src/base-environments/youth_room/import/materials/weed_plant_02.001.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=3 format=3] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://dy7w06asd3ypn"] [ext_resource type="Texture2D" uid="uid://chqflvtnirixw" path="res://base-environments/youth_room/import/textures/weed_plant_02_diff_1k.jpg" id="1_josl2"] [ext_resource type="Texture2D" uid="uid://ocl45llk3qnp" path="res://base-environments/youth_room/import/textures/weed_plant_02_nor_gl_1k.png" id="2_pu8km"] diff --git a/src/base-environments/youth_room/import/materials/wicker.tres b/src/base-environments/youth_room/import/materials/wicker.tres index c4d19a8..0b59187 100644 --- a/src/base-environments/youth_room/import/materials/wicker.tres +++ b/src/base-environments/youth_room/import/materials/wicker.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=3] +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://c5rhuergjfkfu"] [ext_resource type="Texture2D" uid="uid://llyf3ueia64" path="res://base-environments/youth_room/import/textures/Wicker010B_2K_Color.png" id="1_lmmwl"] [ext_resource type="Texture2D" uid="uid://dgaix33l2yxa7" path="res://base-environments/youth_room/import/textures/Wicker010B_2K_AmbientOcclusion.png" id="2_77c6s"] diff --git a/src/base-environments/youth_room/import/materials/wood_flooring.tres b/src/base-environments/youth_room/import/materials/wood_flooring.tres index e171d64..3ebed1a 100644 --- a/src/base-environments/youth_room/import/materials/wood_flooring.tres +++ b/src/base-environments/youth_room/import/materials/wood_flooring.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=3 format=3] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://ca7tmkkulmr5n"] [ext_resource type="Texture2D" uid="uid://b6a2bk7e4r402" path="res://base-environments/youth_room/import/textures/wood_flooring.png" id="1_47j14"] [ext_resource type="Texture2D" uid="uid://d4krraqfbkyp5" path="res://base-environments/youth_room/import/textures/wood_flooring_rough.png" id="2_1wdh7"] diff --git a/src/base-environments/youth_room/import/materials/wooden_beam.tres b/src/base-environments/youth_room/import/materials/wooden_beam.tres index c074628..58d5150 100644 --- a/src/base-environments/youth_room/import/materials/wooden_beam.tres +++ b/src/base-environments/youth_room/import/materials/wooden_beam.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=3 format=3] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://bo1hpdb72r0vj"] [ext_resource type="Texture2D" uid="uid://cli8h46jpcpxa" path="res://base-environments/youth_room/import/textures/rough_wood_diff_4k.jpg" id="1_6mvb7"] [ext_resource type="Texture2D" uid="uid://drgoydym6kdq4" path="res://base-environments/youth_room/import/textures/rough_wood_nor_gl_4k.jpg" id="2_k3mvi"] diff --git a/src/base-environments/youth_room/import/materials/wooden_crate_01.tres b/src/base-environments/youth_room/import/materials/wooden_crate_01.tres index 685656c..deb87e8 100644 --- a/src/base-environments/youth_room/import/materials/wooden_crate_01.tres +++ b/src/base-environments/youth_room/import/materials/wooden_crate_01.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://031ijl43lfnr"] [ext_resource type="Texture2D" uid="uid://bfnxgln5xy44v" path="res://base-environments/youth_room/import/textures/wooden_crate_01_diff_4k.png" id="1_47bk1"] [ext_resource type="Texture2D" uid="uid://blnbyaa3k511h" path="res://base-environments/youth_room/import/textures/wooden_crate_01_nor_gl_4k.png" id="2_jd456"] diff --git a/src/base-environments/youth_room/import/sounds/rain and thunder.mp3 b/src/base-environments/youth_room/import/sounds/rain and thunder.mp3 new file mode 100644 index 0000000..c3bb058 Binary files /dev/null and b/src/base-environments/youth_room/import/sounds/rain and thunder.mp3 differ diff --git a/src/base-environments/youth_room/import/sounds/rain and thunder.mp3.import b/src/base-environments/youth_room/import/sounds/rain and thunder.mp3.import new file mode 100644 index 0000000..3f15e0f --- /dev/null +++ b/src/base-environments/youth_room/import/sounds/rain and thunder.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://bghjiqkyehs1p" +path="res://.godot/imported/rain and thunder.mp3-30442d11a9118c3b34cbcb8b2b63857c.mp3str" + +[deps] + +source_file="res://base-environments/youth_room/import/sounds/rain and thunder.mp3" +dest_files=["res://.godot/imported/rain and thunder.mp3-30442d11a9118c3b34cbcb8b2b63857c.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/src/base-environments/youth_room/import/sounds/rain_on_window.mp3 b/src/base-environments/youth_room/import/sounds/rain_on_window.mp3 new file mode 100644 index 0000000..4e998f2 Binary files /dev/null and b/src/base-environments/youth_room/import/sounds/rain_on_window.mp3 differ diff --git a/src/base-environments/youth_room/import/sounds/rain_on_window.mp3.import b/src/base-environments/youth_room/import/sounds/rain_on_window.mp3.import new file mode 100644 index 0000000..4366cee --- /dev/null +++ b/src/base-environments/youth_room/import/sounds/rain_on_window.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://1h6k2d8q1kw3" +path="res://.godot/imported/rain_on_window.mp3-664fb303575c9e9aa5fa1c106c050367.mp3str" + +[deps] + +source_file="res://base-environments/youth_room/import/sounds/rain_on_window.mp3" +dest_files=["res://.godot/imported/rain_on_window.mp3-664fb303575c9e9aa5fa1c106c050367.mp3str"] + +[params] + +loop=true +loop_offset=1.0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/src/base-environments/youth_room/import/sounds/thunder.mp3 b/src/base-environments/youth_room/import/sounds/thunder.mp3 new file mode 100644 index 0000000..2eaa785 Binary files /dev/null and b/src/base-environments/youth_room/import/sounds/thunder.mp3 differ diff --git a/src/base-environments/youth_room/import/sounds/thunder.mp3.import b/src/base-environments/youth_room/import/sounds/thunder.mp3.import new file mode 100644 index 0000000..84ae1c3 --- /dev/null +++ b/src/base-environments/youth_room/import/sounds/thunder.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://bbpo1hu35yer8" +path="res://.godot/imported/thunder.mp3-26c52c787ee9b85ca309f18c972d13d6.mp3str" + +[deps] + +source_file="res://base-environments/youth_room/import/sounds/thunder.mp3" +dest_files=["res://.godot/imported/thunder.mp3-26c52c787ee9b85ca309f18c972d13d6.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 5a3b82c..40cfd6d 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -1,7 +1,10 @@ -[gd_scene load_steps=5 format=3 uid="uid://b3b0gyvklqn50"] +[gd_scene load_steps=8 format=3 uid="uid://b3b0gyvklqn50"] [ext_resource type="PackedScene" uid="uid://c0i4ydmxtxfho" path="res://base-environments/youth_room/import/youth_room.glb" id="1_jf3oi"] +[ext_resource type="AudioStream" uid="uid://1h6k2d8q1kw3" path="res://base-environments/youth_room/import/sounds/rain_on_window.mp3" id="2_3haaq"] [ext_resource type="Texture2D" uid="uid://cs6gtn285a4al" path="res://dev-util/logo_background.png" id="3_1mw2j"] +[ext_resource type="PackedScene" uid="uid://mkccbig41bqb" path="res://logic-scenes/player_controller/player_controller.tscn" id="3_foj4y"] +[ext_resource type="AudioStream" uid="uid://bbpo1hu35yer8" path="res://base-environments/youth_room/import/sounds/thunder.mp3" id="3_wcypa"] [sub_resource type="Environment" id="Environment_pllnm"] background_mode = 2 @@ -49,14 +52,25 @@ auto_exposure_min_sensitivity = 100.0 [node name="youth_room" parent="." instance=ExtResource("1_jf3oi")] +[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="youth_room"] +transform = Transform3D(-0.410985, -0.460061, 0.787042, -0.904759, 0.311726, -0.290238, -0.111814, -0.831367, -0.544359, 3.06375, 1.7366, -0.351724) +stream = ExtResource("2_3haaq") +volume_db = -15.367 +autoplay = true +panning_strength = 0.5 +bus = &"test" +emission_angle_enabled = true +emission_angle_degrees = 57.0 + +[node name="AudioStreamPlayer3D2" type="AudioStreamPlayer3D" parent="youth_room"] +transform = Transform3D(-0.410985, -0.460061, 0.787042, -0.904759, 0.311726, -0.290238, -0.111814, -0.831367, -0.544359, -0.248397, 4.34956, 8.85405) +stream = ExtResource("3_wcypa") +bus = &"New Bus" + [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_pllnm") camera_attributes = SubResource("CameraAttributesPractical_26mp0") -[node name="Camera3D" type="Camera3D" parent="."] -transform = Transform3D(-0.435231, -0.154791, 0.886912, 0, 0.985109, 0.171929, -0.900319, 0.0748289, -0.42875, 2.30557, 1.6027, -0.465481) -fov = 57.2654 - [node name="SpotLight3D" type="SpotLight3D" parent="."] transform = Transform3D(1, 0, 0, 0, 0.416868, 0.908967, 0, -0.908967, 0.416868, -0.599038, 1.39757, 1.64821) light_color = Color(0.94902, 0.737255, 0.627451, 1) @@ -95,3 +109,17 @@ light_energy = 10.0 light_projector = ExtResource("3_1mw2j") shadow_enabled = true spot_angle = 42.8718 + +[node name="PlayerController" parent="." instance=ExtResource("3_foj4y")] + +[node name="CSGCombiner3D" type="CSGCombiner3D" parent="."] +use_collision = true + +[node name="CSGBox3D" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.931684, -0.12195, 0.721855) +size = Vector3(5.75304, 0.238875, 4.229) + +[node name="OmniLight3D2" type="OmniLight3D" parent="."] +transform = Transform3D(-0.477862, -0.663484, 0.575706, -0.860239, 0.220753, -0.459626, 0.177866, -0.714882, -0.676245, 3.06375, 0.417945, -0.351724) +light_size = 0.1 +shadow_enabled = true diff --git a/src/default_bus_layout.tres b/src/default_bus_layout.tres new file mode 100644 index 0000000..35e32e9 --- /dev/null +++ b/src/default_bus_layout.tres @@ -0,0 +1,20 @@ +[gd_resource type="AudioBusLayout" load_steps=2 format=3 uid="uid://djkwd76o033io"] + +[sub_resource type="AudioEffectLimiter" id="AudioEffectLimiter_wyra4"] +resource_name = "Limiter" + +[resource] +bus/1/name = &"test" +bus/1/solo = false +bus/1/mute = false +bus/1/bypass_fx = false +bus/1/volume_db = 0.0 +bus/1/send = &"test 2" +bus/2/name = &"New Bus" +bus/2/solo = false +bus/2/mute = false +bus/2/bypass_fx = false +bus/2/volume_db = 0.0 +bus/2/send = &"Master" +bus/2/effect/0/effect = SubResource("AudioEffectLimiter_wyra4") +bus/2/effect/0/enabled = true