From b954dda6760571dacebca36b3b2cefe8c3ea360e Mon Sep 17 00:00:00 2001 From: PopSlime Date: Fri, 18 Nov 2022 10:32:24 +0800 Subject: [PATCH] Update materials. --- Assets/Cryville/Crtr/GenericResources.cs | 3 +-- Assets/Cryville/Crtr/MeshWrapper.cs | 4 ++-- .../{CutoutMat.mat => SpriteMat.mat} | Bin 5408 -> 5524 bytes ...{CutoutMat.mat.meta => SpriteMat.mat.meta} | 0 Assets/Resources/TransparentMat.mat | Bin 5404 -> 0 bytes Assets/Resources/TransparentMat.mat.meta | 8 -------- 6 files changed, 3 insertions(+), 12 deletions(-) rename Assets/Resources/{CutoutMat.mat => SpriteMat.mat} (79%) rename Assets/Resources/{CutoutMat.mat.meta => SpriteMat.mat.meta} (100%) delete mode 100644 Assets/Resources/TransparentMat.mat delete mode 100644 Assets/Resources/TransparentMat.mat.meta diff --git a/Assets/Cryville/Crtr/GenericResources.cs b/Assets/Cryville/Crtr/GenericResources.cs index 010d42a..421f387 100644 --- a/Assets/Cryville/Crtr/GenericResources.cs +++ b/Assets/Cryville/Crtr/GenericResources.cs @@ -30,8 +30,7 @@ namespace Cryville.Crtr { Meshes.Add("quad_scale3h", Resources.Load("quad_scale3h")); Meshes.Add("quad_scale9", Resources.Load("quad_scale9")); - Materials.Add("-CutoutMat", Resources.Load("CutoutMat")); - Materials.Add("-TransparentMat", Resources.Load("TransparentMat")); + Materials.Add("-SpriteMat", Resources.Load("SpriteMat")); loaded = true; } diff --git a/Assets/Cryville/Crtr/MeshWrapper.cs b/Assets/Cryville/Crtr/MeshWrapper.cs index bd21bf8..54da694 100644 --- a/Assets/Cryville/Crtr/MeshWrapper.cs +++ b/Assets/Cryville/Crtr/MeshWrapper.cs @@ -28,7 +28,7 @@ namespace Cryville.Crtr { } public Material NewMaterial { get { - return Material.Instantiate(GenericResources.Materials["-CutoutMat"]); + return Material.Instantiate(GenericResources.Materials["-SpriteMat"]); } } public void Init(Transform parent) { @@ -41,7 +41,7 @@ namespace Cryville.Crtr { MeshObject.AddComponent(); MeshFilter = MeshObject.GetComponent(); Renderer = MeshObject.GetComponent(); - Renderer.material = GenericResources.Materials["-CutoutMat"]; + Renderer.material = GenericResources.Materials["-SpriteMat"]; Initialized = true; } public void Destroy() { diff --git a/Assets/Resources/CutoutMat.mat b/Assets/Resources/SpriteMat.mat similarity index 79% rename from Assets/Resources/CutoutMat.mat rename to Assets/Resources/SpriteMat.mat index 3bfbf09ba011f94974ddf6bc44c4909d6b1c3b6b..8c4496b96786584223069cad5eaf94d0619e2730 100644 GIT binary patch delta 230 zcmZ3WHAQ=ZJmZv!3gS$L1{*D!1q2ni6&R2~$>g&F^`gNAMVTe3zKJD3DMk?10uqyB z1@%=yJP`N~1P~Sj0~e6N3B>V^IRzPsA*mIU-wMf3-XO%f`KsV_Mo}TCbUjh4*zj;LFdwv{L&KN#1fzsBM|FNP88I4 z1gQh@KwuIlgv|wH2c_nvq!xu#7NjyT2m<*bMTvRE1&Kwec_k2oKpKF6bMr;P`HYML XlUs$OH~$e9U}R*P%q!~50+Is&`-L9y diff --git a/Assets/Resources/CutoutMat.mat.meta b/Assets/Resources/SpriteMat.mat.meta similarity index 100% rename from Assets/Resources/CutoutMat.mat.meta rename to Assets/Resources/SpriteMat.mat.meta diff --git a/Assets/Resources/TransparentMat.mat b/Assets/Resources/TransparentMat.mat deleted file mode 100644 index d0cf651a3d9fc61ba6cfa23609755532684a71bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5404 zcmb7|TaO$^6~}A#W^9v-Ny0588SWu~owWlb!SU|eyXzgYyPkN~4hff`cBXc=lb-IO zyT^E6NImh$2Y?qM5K=%$h$ndS7vM2MLI{b=JK`O&{QsxAr@Ok7wJ51iSD#;f7eoW0UEmGRTT2mc-UA_ z_Jg?3;qv*M`YU`t1wHNOgkGIqkll@Kzt>?ehMx7f0|k= zNCfi3%dam$>&Jh|%dcn1OLNqhy!`rNgS-CEAjjGNmuPD#T&ef}WvEZ;|2%na%Uiww z3k~k_`_Is`|7U4rDO{PG-vn96#T0 zMgCoG@FlPRm%#n_obvj=LSDK@{gjt~D-FJ=o`eDOkMEw zA}Kh2`d`icUl-CANm1Ar{hZZvX3GZk_`KTSetfpkobaz1(= zewg#a26yM<8{pjE0lT#nuGG&*d}o|^KE9dT6*r!bZ^3u*eG(Gbf^shI``{;e|KkSt zzfU4?e|`M#lbF18FY&Fe&!oX!|G&ul|2}Okg)7J(FFz8fPwGD<&uw|*`c?bSYJ5j$ zCJA(?y4@_fyfF;2IN7+HnJ5k7=!zQmH-pf0)=}x|><|@c*GquUyzi!!41 zcnZ`DhGuxZgXe40G>gYKO@v-wnVP9lX_mlbPmgx=L=A(Ku7++fU7e;TRkxxbJL)F! z#3b2K@6ebGj(Ylz8Rp6WjmG^wb9W=UlQ(w{PMb{=LyLh9jk>FjP``0-kcyj*8|G#h zYZ>pgIE<52C2FMhl}5{}(;yte8=dqrJ$N%!4b@F^U=o9%s!L`yHLuUoP+KdpAzT zI=qi>e(v=*#zD%hcAvH~za1S!NFO(oLi%GkN1r>GUl<01>tURx4aaEV+dM#<8-qbO zeb0e3+RM1RIzb=$Zo|Fr8^($;=Q_&zxSfM1yTZSUu!*zyfQO1&;a?AVtY`6?HAj1{ zbALU}u7=q1v{3Ce$*W?Xv&MEs)=l(5WKzBq)e8SQ>5J|NyDT(=3~?8f`!3?f)+md( z`aAKEMLr76zCT-CV*6XSdxqycip22sR};J<b+^mh5=7Q~%`X9xEEm8mg diff --git a/Assets/Resources/TransparentMat.mat.meta b/Assets/Resources/TransparentMat.mat.meta deleted file mode 100644 index a98b955..0000000 --- a/Assets/Resources/TransparentMat.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6805a4a1bc3dde4418e39fe1e4ab68b0 -timeCreated: 1614591336 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: