From 4f7df5fabf920154a018facf1e47382cbfb52196 Mon Sep 17 00:00:00 2001 From: betalars Date: Thu, 19 Sep 2024 12:31:49 +0200 Subject: [PATCH] enhancing material naming convention and texture references for youth room --- design/youth room/youth-construction.blend | 4 ++-- .../import/materials/desk_lamp_arm_01.tres | 1 + .../import/materials/green_box.tres | 16 +++++++--------- .../youth_room/import/materials/plush.tres | 13 +++++++++++-- .../youth_room/import/youth_room.glb | 4 ++-- .../youth_room/import/youth_room.glb.import | 7 ++++--- .../shaders/fairylight_halo.material | Bin 1957 -> 1916 bytes 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/design/youth room/youth-construction.blend b/design/youth room/youth-construction.blend index 3be1dde..c04918f 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:41d783f583b7c42555197811448ef0161747df542dff51802255da9812e90cb2 -size 197535190 +oid sha256:b6bd379f713644b10576bd0e692f6f9216893666c69c82a198f86df8e14efec3 +size 197237118 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 2838fd1..37e29a0 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 @@ -10,6 +10,7 @@ cull_mode = 2 vertex_color_use_as_albedo = true albedo_color = Color(0.906332, 0.906332, 0.906332, 1) albedo_texture = ExtResource("1_wkb38") +metallic = 0.5 roughness_texture = ExtResource("3_lrj08") normal_enabled = true normal_texture = ExtResource("2_xpcvm") 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 dc9621c..d523591 100644 --- a/src/base-environments/youth_room/import/materials/green_box.tres +++ b/src/base-environments/youth_room/import/materials/green_box.tres @@ -1,18 +1,16 @@ [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"] -[ext_resource type="Texture2D" uid="uid://ear53lqetgah" path="res://base-environments/youth_room/import/textures/Material_001_normal.png" id="3_nppaw"] +[ext_resource type="Texture2D" uid="uid://bgordgwj3fmnq" path="res://base-environments/youth_room/import/textures/green_box_albedo.jpeg" id="1_s8rqc"] +[ext_resource type="Texture2D" uid="uid://j53n6bevsqly" path="res://base-environments/youth_room/import/textures/green_box_metallicRoughness.png" id="2_rflwr"] +[ext_resource type="Texture2D" uid="uid://cs1x4ywk851qt" path="res://base-environments/youth_room/import/textures/green_box_normal.png" id="3_5dphg"] [resource] resource_name = "green_box" cull_mode = 2 vertex_color_use_as_albedo = true -albedo_color = Color(0.839216, 0.839216, 0.839216, 1) -albedo_texture = ExtResource("1_hrimj") -metallic_texture = ExtResource("2_d8bn6") -roughness_texture = ExtResource("2_d8bn6") +albedo_texture = ExtResource("1_s8rqc") +metallic_texture = ExtResource("2_rflwr") +roughness_texture = ExtResource("2_rflwr") roughness_texture_channel = 1 normal_enabled = true -normal_texture = ExtResource("3_nppaw") -ao_texture = ExtResource("2_d8bn6") +normal_texture = ExtResource("3_5dphg") diff --git a/src/base-environments/youth_room/import/materials/plush.tres b/src/base-environments/youth_room/import/materials/plush.tres index aea4215..15daa5f 100644 --- a/src/base-environments/youth_room/import/materials/plush.tres +++ b/src/base-environments/youth_room/import/materials/plush.tres @@ -1,8 +1,17 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://cg5b0u7vnttr6"] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://cg5b0u7vnttr6"] + +[ext_resource type="Texture2D" uid="uid://ckv2c2qr4ysb1" path="res://base-environments/youth_room/import/textures/pattern_237_diffuse.png" id="1_v0i7a"] +[ext_resource type="Texture2D" uid="uid://ddo88j25qqiv4" path="res://base-environments/youth_room/import/textures/Paper003_1K_NormalGL.jpg" id="2_6jqtg"] +[ext_resource type="Texture2D" uid="uid://cyapx84i7dykm" path="res://base-environments/youth_room/import/textures/pattern_237_normal.png" id="3_pwydx"] [resource] resource_name = "plush" cull_mode = 2 vertex_color_use_as_albedo = true -albedo_color = Color(0.906332, 0.906332, 0.906332, 1) +albedo_texture = ExtResource("1_v0i7a") roughness = 0.731818 +normal_enabled = true +normal_texture = ExtResource("3_pwydx") +detail_enabled = true +detail_blend_mode = 3 +detail_normal = ExtResource("2_6jqtg") diff --git a/src/base-environments/youth_room/import/youth_room.glb b/src/base-environments/youth_room/import/youth_room.glb index c09753d..c6295d1 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:c0858e9b52c8a7499601a6c6099ef2070d9deb9aaedba9d4f0efb68f60ba7b5d -size 35981804 +oid sha256:9c4de4b275cd6705ca2327274de7a0fce1bc2a09e59d7370e5f89007ea2a95ce +size 35532644 diff --git a/src/base-environments/youth_room/import/youth_room.glb.import b/src/base-environments/youth_room/import/youth_room.glb.import index a48b4b7..590102f 100644 --- a/src/base-environments/youth_room/import/youth_room.glb.import +++ b/src/base-environments/youth_room/import/youth_room.glb.import @@ -129,6 +129,10 @@ _subresources={ "use_external/enabled": true, "use_external/path": "res://base-environments/youth_room/import/materials/metal.tres" }, +"plush": { +"use_external/enabled": true, +"use_external/path": "res://base-environments/youth_room/import/materials/plush.tres" +}, "shelf_black": { "use_external/enabled": true, "use_external/path": "res://base-environments/youth_room/import/materials/shelf_black.tres" @@ -178,7 +182,6 @@ _subresources={ "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": "" }, "youth_room_drawing_002": { @@ -188,7 +191,6 @@ _subresources={ "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": "" }, "youth_room_room": { @@ -198,7 +200,6 @@ _subresources={ "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": "" } } diff --git a/src/base-environments/youth_room/shaders/fairylight_halo.material b/src/base-environments/youth_room/shaders/fairylight_halo.material index 4bdb3a651c3064613c73d3056e88f356df8ee1f7..4f234e355f34f4eca26dfc2980fa53232fddf711 100644 GIT binary patch literal 1916 zcmV-?2ZQ)hQ$s@n000005C8z#6953D1polN0RR9fwJ-f(01wqH0D3^g3_}2u(+2FS zNFq10K5S2l&#AIEvwU#g-NpP7{k81OWNhf?iSF}X$e+;*C#e9)MUE5 zx}KrEpW$^Y(r#1v*#g}?(%H@%ad#8A*gIKxO)po!&_3xgb<*xuY5b(i3hj({w@G8y zDBS9NnQ9Po+1(5p<#Y3E-+k=m`}SqcX6-$L)j)goh~MW&VSM^LUhT2p?ndeE5|+mg z8>tl;Q&TvvXE@@zgr^hTeW1Gsba#O64(SdkCo3M$bzLXdO6NKmjYOhQ2n70kJeJ2K zSIJA#q`yVB}kIL?2xWb#?jOXjyvoi)a z@HnJ8H3-$7%#w6zKlJ?lcn%s46R>lf)u-uYSArrtYO%clxoq!D0pR?W}*Q{ zHvo`U03+i(g{POg6Ji#=p8el<%G#$aT>s9kdIiU@WLcyRH~K?&^S4r>qE8c}wM5fd z%v$#B3xygjs#l&$+^5f>0!fI*+IHa{4W&HA2_rAsM>7<9_9erooX#?(4fPzq%|3dE z`#Cxc$4Ac@nmZsQboY!l&8@C@)GPM;!R3>nP{R|(vPcxhpKvjT_T?F`_ovJ1*YsE_ z#v~Pk8ANapvd>tH?}5un=|>feJ^r;R7iJt36RA8G$-bm63!348KqMFxAJ2#6ENjEk zVM*Zu1dQ8=*f7Gx3kgkrsj(TPQGh(4Ks1DepcJS;TnB+6s3A#(jLeXTBq>PJ0Wk%HFzG0w zIuZagF^IB|bH*S-h9sDgkqJ{!l0v2f+CsUF1|jV!uoapDcJ85Bo5!!i;en$wxiC^aVr=SGeQgVP@=TyL9P9_h88pTSdy zk66k`bRDIFMWPeCIyEJFd15PeURH8Vf?4R2O$xBB-hxRREJ>c|{Ac6~4Kw9_Lf!D}-pDw3|KG>>U>MqSe2k?J+A5_6hwZC^=goiZ&9d|NXVj&M zvVUU$D7DZlP4nDm*tFj<^MpdZ?oEb&FaC-Hxx(FJURD5o@ZAuQV5@J&VBOJO%l4EN$b_Jko%J3T7JL!NlexNJ6)Ob+R~G4;u6J zt5t@(rQ49Jh%Z=ebR9>MM|hZB5cCHiL;&)Dd57=y>~46`K z$mjr4Z{$=HhS}rD2*4UYh>w}#^nEz0(p19#MU_y6_UQDdIuK?kpjZ?+MKZX!30PDW zjH!*NQO?QBh-4G?ni2bS`Pu;}wJ-f(*#eaf0M=1KI6%cXYr`-MbH3uA;Yr5uPL{_M z;;v== z*qd!I9^=h0Dx&sgVwi2$qoAG6oHJzaheMWQYQvhLdRZ!>^fgRSgcDtTxBvIgnhFw(?104nZl}zH{ zC-`s}-(5UE1>;t>a`#6ior_z2020oIyABJ#h9uy-k>{UbQ1}C!>147zi&E+fRUrA5 zRG`MkarzG`TPT%_1vO(L7!&H2us{Khp*m9ue6QZ-NI>s9rDhbkIfl`OoB-R$c{CQ$s^@ C)1lJ< literal 1957 zcmV;W2U_@2Q$s@n000005C8z46aWBz1pojG0ssIgwJ-f(01u@r02cqpLLhU~0YFF; zkSYK!1k;M(AQ%=541_{|vbRiWWs>U;X>BKwC5nZ^K2by#mwt7`MonmQ%_&6UjQW?U z>)&71|K?Mq0IC4D0I+(~v(c4q?U;Zg?K!G`YCH#%emr?2N#GciW znHjLDW!APj>z2FLtGigenD_Ol0dCsxonJQ}^ywN}%)c!&pD=R@t~`F+IHAChm>GoU zleX_OVLQH(3T8gQ%mJ7=!^|Pf0VW)j4aY=-hENCu`g~SaJf2R~DY>*S(zDjXrqp2r zrY^61uhpiaB)1gsUpebL5;p4C)Lo>{HEz(pJ?);e@;v8N4zKU#Mfr*+e1-Fo`$buoQyXRgYZf528-X+ps9DMsbX zJNN$!UPgDn?<>{$-2ba>E9p&(nH{iw6N6p9AG0hO=fncl+rHebD_zV_)l;`Jqm7~e zjjDA2|)+EJRLrGCBO>=FJt~XuNG)-eLO%vmDjcS=s-dDeY)F1&MdU4WVM}`oQ2pBp< zBOeY%3Q!V6FPJ&x$UqUv2NEI|8xbO8L^)>6m?7grCIEpBAt5JJrg4S|DCvNM83aIP zfr?AT=PS9BmCp)+7pM_Ugp3T4h@>D%(g86AgedBqDtZ#&GAT>45M+iRLX0B8jF3>E zatfIa&YJtW)kCL?Rgal*0KU#~fl8hVN};7WF*rB&2nesV%XL-7B$N@^=kZoZWy6zM z`^n?}EOM|m__I}XRRf?E1?@Ov;X1N~uwNg90%pLQn<%h}smFic91d++e7%n%(4XTn zzCXp4K{zb>_$koiN|6Vod{uwdX@lOwfx@KtAW@}8C;xa+3Qs$aY15_QVRJuV;pV;e z8kV5-3kPp6(Ck{s{RjY>VuluSsHZE%*CuV7_Pm^eTn1OOq3Lk=@-IXGp(pe6oPe*J zi+zb6E_9e64cMAKPE=6>z9d~WVAN=pvx7~9E)-3a@1i`|IT$^WSeAQ9lfCfZRl(?wr-jh=8Hy5Bmb{g}8(_iGG!mpG}0lrPD_u%X^r#xVUAVE~k(cIu2(O25<87Q!+;|$zg_)W3TH+XLfV0|oARcLH;&{P}Nl{Wt z3}oF3{4~HRL3FB9q7$7Ggu&uMGXn*dBe>0?VgiImQgP(y&7uj3=-`;>rIlK(npG3c zGJ3J-B97suUaS%#yjX>SA66}Ns#OKQs%n>u&`~iQ($_ykx-sY9-`o%{{!3kicaQ#9M}xMQJ8;#W=k~q1!R`;TXd*VQDaj=K~j_~bFc!D zsjCMOfE|M91|_YG0m?`V=`cb;$X2_#nB%%-7I5EFF}n`~GoW>1)7A{U*I`WS`k{NP zCzUTzaN9qbYhdw_h7`GB@ioJC!{RHN8sJJb<)G}`mCNwX%Nr%zk@qo<$Xf~+^5%t& zVMG4t&Um{lPxuOrP7x&vRRlu-LHQF;Z!a|&bP>*vXgFv#qi)zWKm{I}4}Bcik2;Bt rVkziMzq9%YxD~XgEi(#^@a-Dm;bwKy`5