From 2b54a23d373721d4f600971123f70ab3bc996fd7 Mon Sep 17 00:00:00 2001 From: betalars Date: Mon, 19 Feb 2024 00:23:41 +0100 Subject: [PATCH] material import, lighting tests --- design/contributions.md | 9 ++- .../volunteer_room_construction.blend | 4 +- .../import/textures/Carpet_A.tres | 11 ++- .../import/textures/Chairs_A.tres | 11 ++- .../import/textures/Kitchen_Hardware.tres | 16 ++++- .../import/textures/Kitchen_Machinery.tres | 16 ++++- .../import/textures/Table_Kitchen_A.tres | 10 ++- .../textures/clay_floor_001_nor_gl_2k.png | 3 + .../clay_floor_001_nor_gl_2k.png.import | 35 ++++++++++ .../textures/clay_floor_001_rough_2k.jpg | 3 + .../clay_floor_001_rough_2k.jpg.import | 35 ++++++++++ .../import/textures/lenolium_1_albedo.png | 3 + .../textures/lenolium_1_albedo.png.import | 35 ++++++++++ .../import/textures/lenolium_2_albedo.png | 3 + .../textures/lenolium_2_albedo.png.import | 35 ++++++++++ .../import/textures/lenonium.tres | 17 +++++ .../import/textures/radiator.tres | 15 +++- .../textures/radiator_normal.png.import | 2 +- .../import/textures/volunteer_room.tscn | 70 +++++++++++++++++++ .../import/textures/wallpaper.tres | 6 ++ .../volunteer_room/import/volunteer_room.glb | 4 +- .../import/volunteer_room.glb.import | 20 ++++++ 22 files changed, 343 insertions(+), 20 deletions(-) create mode 100644 src/base-environments/volunteer_room/import/textures/clay_floor_001_nor_gl_2k.png create mode 100644 src/base-environments/volunteer_room/import/textures/clay_floor_001_nor_gl_2k.png.import create mode 100644 src/base-environments/volunteer_room/import/textures/clay_floor_001_rough_2k.jpg create mode 100644 src/base-environments/volunteer_room/import/textures/clay_floor_001_rough_2k.jpg.import create mode 100644 src/base-environments/volunteer_room/import/textures/lenolium_1_albedo.png create mode 100644 src/base-environments/volunteer_room/import/textures/lenolium_1_albedo.png.import create mode 100644 src/base-environments/volunteer_room/import/textures/lenolium_2_albedo.png create mode 100644 src/base-environments/volunteer_room/import/textures/lenolium_2_albedo.png.import create mode 100644 src/base-environments/volunteer_room/import/textures/lenonium.tres create mode 100644 src/base-environments/volunteer_room/import/textures/volunteer_room.tscn create mode 100644 src/base-environments/volunteer_room/import/textures/wallpaper.tres diff --git a/design/contributions.md b/design/contributions.md index 58ee111..68f395a 100644 --- a/design/contributions.md +++ b/design/contributions.md @@ -22,22 +22,21 @@ ## Textures from polyhaven.com - [Rough Wood](https://polyhaven.com/a/rough_wood) by [Rob Tuytel](https://polyhaven.com/all?a=Rob%20Tuytel) CC-0 -- [Brick Wall 001](https://polyhaven.com/a/brick_wall_001) by [Dimitrios Savva](https://polyhaven.com/all?a=Dimitrios%20Savva) +- [Brick Wall 001](https://polyhaven.com/a/brick_wall_001) and [Smooth Concrete Floor](https://polyhaven.com/a/smooth_concrete_floor) by [Dimitrios Savva](https://polyhaven.com/all?a=Dimitrios%20Savva) +- [Clay Floor 001](https://polyhaven.com/a/clay_floor_001) by [Dimitrios Savva](https://polyhaven.com/all?a=Dimitrios%20Savva) and [Rico Cilliers](https://www.artstation.com/rico_b3d) ## Textures from AmbientCG.com - [Fabric 030](https://ambientcg.com/view?id=Fabric030) - [Wood Substance 009](https://ambientcg.com/view?id=WoodSubstance009) - [Wicker 010 B](https://ambientcg.com/view?id=Wicker010B) + - [Terrazzo 019 L](https://ambientcg.com/view?id=Terrazzo019L) ## Wikimedia Commons - [Gebäude in Darmstadt](https://commons.wikimedia.org/wiki/File:Geb%C3%A4ude_in_Darmstadt.jpg) by [Neq00](https://commons.wikimedia.org/wiki/User:Neq00) CC-BY-SA 4.0 ## Illustrations - - by [Fernand0FC](https://www.deviantart.com/fernand0fc), CC-BY-3.0 - + [Corporate level bodyguard](https://www.deviantart.com/fernand0fc/art/Corporate-level-bodyguard-803579124) - + [Into the glowing sea](https://www.deviantart.com/fernand0fc/art/Into-the-glowing-sea-834238466) - + [Anti-Hero](https://www.deviantart.com/fernand0fc/art/Anti-Hero-555054767) + + [Corporate level bodyguard](https://www.deviantart.com/fernand0fc/art/Corporate-level-bodyguard-803579124), [Into the glowing sea](https://www.deviantart.com/fernand0fc/art/Into-the-glowing-sea-834238466) and [Anti-Hero](https://www.deviantart.com/fernand0fc/art/Anti-Hero-555054767) by [Fernand0FC](https://www.deviantart.com/fernand0fc), CC-BY-3.0 + [Unknown Horizons](https://unknown-horizons.org/) Artwork, provided by a [GPL-2.0 license](https://github.com/unknown-horizons/unknown-horizons.github.io/blob/source/LICENSE) + [Strange Adventures in Infinite Space](https://rich.itch.io/strangeadventures) by [Digital Eel](https://rich.itch.io), CC-BY-NC 4.0 + [Star Ruler 2](https://github.com/BlindMindStudios/StarRuler2-Source), CC-BY-NC 2.0 diff --git a/design/volunteer room/volunteer_room_construction.blend b/design/volunteer room/volunteer_room_construction.blend index 8690345..3442f6b 100644 --- a/design/volunteer room/volunteer_room_construction.blend +++ b/design/volunteer room/volunteer_room_construction.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c813640b781304afc011901e38c15627d04f349459083f15d64d7bb3a229919 -size 156793380 +oid sha256:a71135d523a617f24c07fa96ee09598d37215ef3308e2083abe3a79c980005df +size 18792024 diff --git a/src/base-environments/volunteer_room/import/textures/Carpet_A.tres b/src/base-environments/volunteer_room/import/textures/Carpet_A.tres index 120deb0..621dd48 100644 --- a/src/base-environments/volunteer_room/import/textures/Carpet_A.tres +++ b/src/base-environments/volunteer_room/import/textures/Carpet_A.tres @@ -1,6 +1,13 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://cvhwvtqcmrlu5"] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://cvhwvtqcmrlu5"] + +[ext_resource type="Texture2D" uid="uid://cjwkox8k72t50" path="res://base-environments/volunteer_room/import/textures/kitchen_carpet_AlbedoR.png" id="1_mdmo4"] +[ext_resource type="Texture2D" uid="uid://51abtaf57d3k" path="res://base-environments/volunteer_room/import/textures/kitchen_carpet_normal.png" id="2_yuqxq"] [resource] resource_name = "Carpet_A" cull_mode = 2 -albedo_color = Color(0.906332, 0.906332, 0.906332, 1) +albedo_texture = ExtResource("1_mdmo4") +roughness_texture = ExtResource("1_mdmo4") +roughness_texture_channel = 3 +normal_enabled = true +normal_texture = ExtResource("2_yuqxq") diff --git a/src/base-environments/volunteer_room/import/textures/Chairs_A.tres b/src/base-environments/volunteer_room/import/textures/Chairs_A.tres index 44312f3..5873679 100644 --- a/src/base-environments/volunteer_room/import/textures/Chairs_A.tres +++ b/src/base-environments/volunteer_room/import/textures/Chairs_A.tres @@ -1,6 +1,13 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://4oqsgu4nblta"] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://4oqsgu4nblta"] + +[ext_resource type="Texture2D" uid="uid://comh0ujvfmibb" path="res://base-environments/volunteer_room/import/textures/kitchen_chairs_AlbedoR.png" id="1_gq10p"] +[ext_resource type="Texture2D" uid="uid://dvsbybivoh25f" path="res://base-environments/volunteer_room/import/textures/kitchen_chairs_normal.png" id="2_ps1rc"] [resource] resource_name = "Chairs_A" cull_mode = 2 -albedo_color = Color(0.906332, 0.906332, 0.906332, 1) +albedo_texture = ExtResource("1_gq10p") +roughness_texture = ExtResource("1_gq10p") +roughness_texture_channel = 3 +normal_enabled = true +normal_texture = ExtResource("2_ps1rc") diff --git a/src/base-environments/volunteer_room/import/textures/Kitchen_Hardware.tres b/src/base-environments/volunteer_room/import/textures/Kitchen_Hardware.tres index bcdccd7..03920d3 100644 --- a/src/base-environments/volunteer_room/import/textures/Kitchen_Hardware.tres +++ b/src/base-environments/volunteer_room/import/textures/Kitchen_Hardware.tres @@ -1,7 +1,19 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://bat8vosar7yrl"] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://bat8vosar7yrl"] + +[ext_resource type="Texture2D" uid="uid://ccb77ceniy2l8" path="res://base-environments/volunteer_room/import/textures/kitchen_hardware_albedo.tga" id="1_q04p5"] +[ext_resource type="Texture2D" uid="uid://cji37m4q7xynv" path="res://base-environments/volunteer_room/import/textures/kitchen_hardware_MRAO.png" id="2_0hqj8"] +[ext_resource type="Texture2D" uid="uid://cb5fs31mlbetg" path="res://base-environments/volunteer_room/import/textures/kitchen_hardware_normal.tga" id="3_2qqi4"] [resource] resource_name = "Kitchen_Hardware" cull_mode = 2 -albedo_color = Color(0.906332, 0.906332, 0.906332, 1) +albedo_texture = ExtResource("1_q04p5") metallic = 1.0 +metallic_texture = ExtResource("2_0hqj8") +roughness_texture = ExtResource("2_0hqj8") +roughness_texture_channel = 1 +normal_enabled = true +normal_texture = ExtResource("3_2qqi4") +ao_enabled = true +ao_texture = ExtResource("2_0hqj8") +ao_texture_channel = 2 diff --git a/src/base-environments/volunteer_room/import/textures/Kitchen_Machinery.tres b/src/base-environments/volunteer_room/import/textures/Kitchen_Machinery.tres index fdbb373..ba4ebcc 100644 --- a/src/base-environments/volunteer_room/import/textures/Kitchen_Machinery.tres +++ b/src/base-environments/volunteer_room/import/textures/Kitchen_Machinery.tres @@ -1,7 +1,19 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://bvfyd2nagsnml"] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://bvfyd2nagsnml"] + +[ext_resource type="Texture2D" uid="uid://bbtjxpt0hfl1b" path="res://base-environments/volunteer_room/import/textures/kitchen_machinery_albedo.png" id="1_x8vxu"] +[ext_resource type="Texture2D" uid="uid://3n067krsj5r4" path="res://base-environments/volunteer_room/import/textures/kitchen_machinery_MRAO.png" id="2_o6p81"] +[ext_resource type="Texture2D" uid="uid://d3ln5y3thmb2a" path="res://base-environments/volunteer_room/import/textures/kitchen_machinery_normal.png" id="3_2ivsb"] [resource] resource_name = "Kitchen_Machinery" cull_mode = 2 -albedo_color = Color(0.906332, 0.906332, 0.906332, 1) +albedo_texture = ExtResource("1_x8vxu") metallic = 1.0 +metallic_texture = ExtResource("2_o6p81") +roughness_texture = ExtResource("2_o6p81") +roughness_texture_channel = 1 +normal_enabled = true +normal_texture = ExtResource("3_2ivsb") +ao_enabled = true +ao_texture = ExtResource("2_o6p81") +ao_texture_channel = 2 diff --git a/src/base-environments/volunteer_room/import/textures/Table_Kitchen_A.tres b/src/base-environments/volunteer_room/import/textures/Table_Kitchen_A.tres index 93d65a4..4d7bdda 100644 --- a/src/base-environments/volunteer_room/import/textures/Table_Kitchen_A.tres +++ b/src/base-environments/volunteer_room/import/textures/Table_Kitchen_A.tres @@ -1,6 +1,14 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://dihxgmdyfst1f"] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://dihxgmdyfst1f"] + +[ext_resource type="Texture2D" uid="uid://ck0xndy6ucjru" path="res://base-environments/volunteer_room/import/textures/kitchen_table_AlbedoR.png" id="1_e7jbt"] +[ext_resource type="Texture2D" uid="uid://cew6dwa1cnoce" path="res://base-environments/volunteer_room/import/textures/kitchen_table_normal.png" id="2_vfsyp"] [resource] resource_name = "Table_Kitchen_A" cull_mode = 2 albedo_color = Color(0.906332, 0.906332, 0.906332, 1) +albedo_texture = ExtResource("1_e7jbt") +roughness_texture = ExtResource("1_e7jbt") +roughness_texture_channel = 3 +normal_enabled = true +normal_texture = ExtResource("2_vfsyp") diff --git a/src/base-environments/volunteer_room/import/textures/clay_floor_001_nor_gl_2k.png b/src/base-environments/volunteer_room/import/textures/clay_floor_001_nor_gl_2k.png new file mode 100644 index 0000000..431e5c2 --- /dev/null +++ b/src/base-environments/volunteer_room/import/textures/clay_floor_001_nor_gl_2k.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:684d112653427cbe0263e19a6c13832c6b77c42d22c338097f5ebd4315f8ab71 +size 22194950 diff --git a/src/base-environments/volunteer_room/import/textures/clay_floor_001_nor_gl_2k.png.import b/src/base-environments/volunteer_room/import/textures/clay_floor_001_nor_gl_2k.png.import new file mode 100644 index 0000000..437a03f --- /dev/null +++ b/src/base-environments/volunteer_room/import/textures/clay_floor_001_nor_gl_2k.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c1cq4emilktae" +path.s3tc="res://.godot/imported/clay_floor_001_nor_gl_2k.png-9269fc8f2e59a640b5ccc915cef0c59c.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/volunteer_room/import/textures/clay_floor_001_nor_gl_2k.png" +dest_files=["res://.godot/imported/clay_floor_001_nor_gl_2k.png-9269fc8f2e59a640b5ccc915cef0c59c.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://base-environments/volunteer_room/import/textures/clay_floor_001_nor_gl_2k.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/src/base-environments/volunteer_room/import/textures/clay_floor_001_rough_2k.jpg b/src/base-environments/volunteer_room/import/textures/clay_floor_001_rough_2k.jpg new file mode 100644 index 0000000..3019eb7 --- /dev/null +++ b/src/base-environments/volunteer_room/import/textures/clay_floor_001_rough_2k.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43a93290531209acfbf0669d47869f95122ba9badca154d79c8600c46abc97e9 +size 507378 diff --git a/src/base-environments/volunteer_room/import/textures/clay_floor_001_rough_2k.jpg.import b/src/base-environments/volunteer_room/import/textures/clay_floor_001_rough_2k.jpg.import new file mode 100644 index 0000000..52f9221 --- /dev/null +++ b/src/base-environments/volunteer_room/import/textures/clay_floor_001_rough_2k.jpg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cfb3ycb7s0r1t" +path.s3tc="res://.godot/imported/clay_floor_001_rough_2k.jpg-004284c95f1255e2f8877acb1717be55.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/volunteer_room/import/textures/clay_floor_001_rough_2k.jpg" +dest_files=["res://.godot/imported/clay_floor_001_rough_2k.jpg-004284c95f1255e2f8877acb1717be55.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/src/base-environments/volunteer_room/import/textures/lenolium_1_albedo.png b/src/base-environments/volunteer_room/import/textures/lenolium_1_albedo.png new file mode 100644 index 0000000..470b7d7 --- /dev/null +++ b/src/base-environments/volunteer_room/import/textures/lenolium_1_albedo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8fe6e955737d18a06c88f9ac0c9f6217a90b16101139acc8682bd50ddb69832 +size 6715876 diff --git a/src/base-environments/volunteer_room/import/textures/lenolium_1_albedo.png.import b/src/base-environments/volunteer_room/import/textures/lenolium_1_albedo.png.import new file mode 100644 index 0000000..8bfe0ed --- /dev/null +++ b/src/base-environments/volunteer_room/import/textures/lenolium_1_albedo.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ciph1tgwy74fs" +path.s3tc="res://.godot/imported/lenolium_1_albedo.png-c2d18a3359113a58852111e6fee668c4.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/volunteer_room/import/textures/lenolium_1_albedo.png" +dest_files=["res://.godot/imported/lenolium_1_albedo.png-c2d18a3359113a58852111e6fee668c4.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/src/base-environments/volunteer_room/import/textures/lenolium_2_albedo.png b/src/base-environments/volunteer_room/import/textures/lenolium_2_albedo.png new file mode 100644 index 0000000..d4e0958 --- /dev/null +++ b/src/base-environments/volunteer_room/import/textures/lenolium_2_albedo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4894abb2c45e86c9d8542da802ba45836a090fbc3615f59d36b3cfdbec6db5a7 +size 6045805 diff --git a/src/base-environments/volunteer_room/import/textures/lenolium_2_albedo.png.import b/src/base-environments/volunteer_room/import/textures/lenolium_2_albedo.png.import new file mode 100644 index 0000000..12f509d --- /dev/null +++ b/src/base-environments/volunteer_room/import/textures/lenolium_2_albedo.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://btcdvl5eilmip" +path.s3tc="res://.godot/imported/lenolium_2_albedo.png-c6afea871d147f8bce839794cc57f388.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/volunteer_room/import/textures/lenolium_2_albedo.png" +dest_files=["res://.godot/imported/lenolium_2_albedo.png-c6afea871d147f8bce839794cc57f388.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=-3 +roughness/src_normal="res://base-environments/volunteer_room/import/textures/clay_floor_001_nor_gl_2k.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/src/base-environments/volunteer_room/import/textures/lenonium.tres b/src/base-environments/volunteer_room/import/textures/lenonium.tres new file mode 100644 index 0000000..1dbac0c --- /dev/null +++ b/src/base-environments/volunteer_room/import/textures/lenonium.tres @@ -0,0 +1,17 @@ +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://crdad5n8f8rx4"] + +[ext_resource type="Texture2D" uid="uid://ciph1tgwy74fs" path="res://base-environments/volunteer_room/import/textures/lenolium_1_albedo.png" id="1_j2jlc"] +[ext_resource type="Texture2D" uid="uid://btcdvl5eilmip" path="res://base-environments/volunteer_room/import/textures/lenolium_2_albedo.png" id="2_fyf66"] +[ext_resource type="Texture2D" uid="uid://c1cq4emilktae" path="res://base-environments/volunteer_room/import/textures/clay_floor_001_nor_gl_2k.png" id="3_4hxi5"] +[ext_resource type="Texture2D" uid="uid://cfb3ycb7s0r1t" path="res://base-environments/volunteer_room/import/textures/clay_floor_001_rough_2k.jpg" id="4_syjhe"] + +[resource] +resource_name = "lenonium" +albedo_texture = ExtResource("1_j2jlc") +roughness = 0.69 +roughness_texture = ExtResource("4_syjhe") +normal_enabled = true +normal_texture = ExtResource("3_4hxi5") +detail_enabled = true +detail_blend_mode = 1 +detail_albedo = ExtResource("2_fyf66") diff --git a/src/base-environments/volunteer_room/import/textures/radiator.tres b/src/base-environments/volunteer_room/import/textures/radiator.tres index bca073f..23ecd70 100644 --- a/src/base-environments/volunteer_room/import/textures/radiator.tres +++ b/src/base-environments/volunteer_room/import/textures/radiator.tres @@ -1,7 +1,20 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://ba2berjxaqhvj"] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://ba2berjxaqhvj"] + +[ext_resource type="Texture2D" uid="uid://u0scimq7eu2q" path="res://base-environments/volunteer_room/import/textures/radiator_albedo.png" id="1_67gr3"] +[ext_resource type="Texture2D" uid="uid://dkgt0s0llide0" path="res://base-environments/volunteer_room/import/textures/radiator_MRAO.png" id="2_v1j7h"] +[ext_resource type="Texture2D" uid="uid://dbgthh3bksiqg" path="res://base-environments/volunteer_room/import/textures/radiator_normal.png" id="3_r10uy"] [resource] resource_name = "radiator" cull_mode = 2 albedo_color = Color(0.906332, 0.906332, 0.906332, 1) +albedo_texture = ExtResource("1_67gr3") metallic = 1.0 +metallic_texture = ExtResource("2_v1j7h") +roughness_texture = ExtResource("2_v1j7h") +roughness_texture_channel = 1 +normal_enabled = true +normal_texture = ExtResource("3_r10uy") +ao_enabled = true +ao_texture = ExtResource("2_v1j7h") +ao_texture_channel = 2 diff --git a/src/base-environments/volunteer_room/import/textures/radiator_normal.png.import b/src/base-environments/volunteer_room/import/textures/radiator_normal.png.import index c2ae6cb..6c47cfc 100644 --- a/src/base-environments/volunteer_room/import/textures/radiator_normal.png.import +++ b/src/base-environments/volunteer_room/import/textures/radiator_normal.png.import @@ -28,7 +28,7 @@ roughness/mode=0 roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/normal_map_invert_y=false +process/normal_map_invert_y=true process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 diff --git a/src/base-environments/volunteer_room/import/textures/volunteer_room.tscn b/src/base-environments/volunteer_room/import/textures/volunteer_room.tscn new file mode 100644 index 0000000..39d813f --- /dev/null +++ b/src/base-environments/volunteer_room/import/textures/volunteer_room.tscn @@ -0,0 +1,70 @@ +[gd_scene load_steps=5 format=3 uid="uid://flisupth27th"] + +[ext_resource type="PackedScene" uid="uid://fcxu7diwgr4c" path="res://base-environments/volunteer_room/import/volunteer_room.glb" id="1_qf4mf"] + +[sub_resource type="PhysicalSkyMaterial" id="PhysicalSkyMaterial_8h7yl"] + +[sub_resource type="Sky" id="Sky_mp8yo"] +sky_material = SubResource("PhysicalSkyMaterial_8h7yl") + +[sub_resource type="Environment" id="Environment_p00cs"] +background_mode = 2 +sky = SubResource("Sky_mp8yo") +sky_rotation = Vector3(0, 0.352557, 0) +ambient_light_source = 3 +ambient_light_color = Color(1, 1, 1, 1) +tonemap_mode = 2 +ssr_enabled = true +ssr_max_steps = 512 +ssr_depth_tolerance = 0.01 +ssao_enabled = true +ssao_radius = 1.24 +ssao_intensity = 3.09 +ssao_power = 1.91184 +ssao_detail = 3.0 +ssil_enabled = true +ssil_intensity = 0.72 +ssil_normal_rejection = 0.56 +sdfgi_use_occlusion = true +glow_enabled = true +glow_levels/2 = 0.3 +glow_levels/7 = 2.0 +glow_intensity = 0.4 +glow_strength = 0.7 +glow_bloom = 0.13 +glow_blend_mode = 1 +glow_hdr_threshold = 0.46 +fog_light_color = Color(0.141176, 0.133333, 0.301961, 1) +fog_sky_affect = 0.0 +fog_height = 1.0 +fog_height_density = 0.1 +adjustment_enabled = true + +[node name="Node3D" type="Node3D"] + +[node name="volunteer_room" parent="." instance=ExtResource("1_qf4mf")] + +[node name="OmniLight3D2" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 6.70552e-08, 0, -6.70552e-08, 1, 1.8719, 1.58367, -5.11048) +light_size = 1.0 +shadow_enabled = true + +[node name="OmniLight3D3" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 6.70552e-08, 0, -6.70552e-08, 1, -1.20952, 1.58367, -5.11048) +light_size = 1.0 +shadow_enabled = true +omni_range = 6.98474 + +[node name="OmniLight3D4" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 6.70552e-08, 0, -6.70552e-08, 1, -1.20952, 1.58367, 5.65622) +light_energy = 0.5 +light_size = 1.0 +shadow_enabled = true +omni_range = 6.98474 + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_p00cs") + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="WorldEnvironment"] +transform = Transform3D(1, 0, 0, 0, -0.608166, 0.79381, 0, -0.79381, -0.608166, 1.35136, 0, -12.2202) +sky_mode = 2 diff --git a/src/base-environments/volunteer_room/import/textures/wallpaper.tres b/src/base-environments/volunteer_room/import/textures/wallpaper.tres new file mode 100644 index 0000000..58d8c99 --- /dev/null +++ b/src/base-environments/volunteer_room/import/textures/wallpaper.tres @@ -0,0 +1,6 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://ke3t3myw8bp5"] + +[resource] +resource_name = "wallpaper" +albedo_color = Color(0.906332, 0.906332, 0.906332, 1) +roughness = 0.5 diff --git a/src/base-environments/volunteer_room/import/volunteer_room.glb b/src/base-environments/volunteer_room/import/volunteer_room.glb index eed9f8f..b9ac147 100644 --- a/src/base-environments/volunteer_room/import/volunteer_room.glb +++ b/src/base-environments/volunteer_room/import/volunteer_room.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cac0b6fc8afac127aef66dcac7ee9b0ad9f2951c4af7828f4ce6ee125099d94 -size 2038444 +oid sha256:30a7a3ba8588ddf1d6b136e94e7544ab03b7e4c77ba2c7c57c623e8217a3a16e +size 2104460 diff --git a/src/base-environments/volunteer_room/import/volunteer_room.glb.import b/src/base-environments/volunteer_room/import/volunteer_room.glb.import index dded2fb..61265af 100644 --- a/src/base-environments/volunteer_room/import/volunteer_room.glb.import +++ b/src/base-environments/volunteer_room/import/volunteer_room.glb.import @@ -79,6 +79,10 @@ _subresources={ "use_external/enabled": true, "use_external/path": "res://base-environments/volunteer_room/import/textures/door.001.tres" }, +"lenonium": { +"use_external/enabled": true, +"use_external/path": "res://base-environments/volunteer_room/import/textures/lenonium.tres" +}, "metal": { "use_external/enabled": true, "use_external/path": "res://base-environments/volunteer_room/import/textures/metal.tres" @@ -91,10 +95,26 @@ _subresources={ "use_external/enabled": true, "use_external/path": "res://base-environments/volunteer_room/import/textures/sculpture.tres" }, +"wallpaper": { +"use_external/enabled": true, +"use_external/path": "res://base-environments/volunteer_room/import/textures/wallpaper.tres" +}, "window_glass": { "use_external/enabled": true, "use_external/path": "res://base-environments/volunteer_room/import/textures/window_glass.tres" } +}, +"meshes": { +"volunteer_room_Cube_001": { +"generate/lightmap_uv": 0, +"generate/lods": 2, +"generate/shadow_meshes": 0, +"lods/normal_merge_angle": 60.0, +"lods/normal_split_angle": 25.0, +"save_to_file/enabled": false, +"save_to_file/make_streamable": "", +"save_to_file/path": "" +} } } gltf/naming_version=1