From b7acd093153719844eb1a7dbd08847029480aeb4 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Thu, 23 Apr 2026 15:59:37 -0400 Subject: [PATCH] - Reworked UV mapping and materials on map marker. - Renamed dark green plastic material to its proper name. - Adjusted host and player camera anchor far plane distances in round 3. --- Assembly-CSharp.csproj | 1 - Assets/Materials/Maps/M_Marker_Spokes_SDF.mat | 95 ------------ .../Maps/M_Marker_Spokes_SDF.mat.meta | 8 - ...enPlastic 1.mat => M_DarkGreenPlastic.mat} | 2 +- ...1.mat.meta => M_DarkGreenPlastic.mat.meta} | 0 Assets/Models/Maps/SM_FloorMap_Marker.fbx | Bin 20556 -> 36336 bytes .../Models/Maps/SM_FloorMap_Marker.fbx.meta | 2 +- Assets/Prefabs/Maps/Floor Map Marker.prefab | 15 ++ Assets/Scenes/witwics.unity | 144 ++++-------------- Assets/Shaders/SDF Map Marker Spokes.shader | 129 ---------------- .../Shaders/SDF Map Marker Spokes.shader.meta | 9 -- Assets/UdonSharp/Maps/FloorMapMarker.cs | 2 +- 12 files changed, 44 insertions(+), 363 deletions(-) delete mode 100644 Assets/Materials/Maps/M_Marker_Spokes_SDF.mat delete mode 100644 Assets/Materials/Maps/M_Marker_Spokes_SDF.mat.meta rename Assets/Materials/Plastic/{M_GreenPlastic 1.mat => M_DarkGreenPlastic.mat} (96%) rename Assets/Materials/Plastic/{M_GreenPlastic 1.mat.meta => M_DarkGreenPlastic.mat.meta} (100%) delete mode 100644 Assets/Shaders/SDF Map Marker Spokes.shader delete mode 100644 Assets/Shaders/SDF Map Marker Spokes.shader.meta diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index c5b2249..f78d9d2 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -195,7 +195,6 @@ - diff --git a/Assets/Materials/Maps/M_Marker_Spokes_SDF.mat b/Assets/Materials/Maps/M_Marker_Spokes_SDF.mat deleted file mode 100644 index 2d572d7..0000000 --- a/Assets/Materials/Maps/M_Marker_Spokes_SDF.mat +++ /dev/null @@ -1,95 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: M_Marker_Spokes_SDF - m_Shader: {fileID: 4800000, guid: ee8714d3a4c72874697299893a31f79a, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _EMISSION - - _ENABLE_GEOMETRIC_SPECULAR_AA - m_InvalidKeywords: [] - m_LightmapFlags: 0 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ColourTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: f9769dd687fc7b541ac23b1f56c618bb, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Bicubic: 0 - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EnableGeometricSpecularAA: 1 - - _GlossMapScale: 1 - - _Glossiness: 1 - - _GlossyReflections: 1 - - _LightmapType: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SDFCutoff: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularAAScreenSpaceVariance: 0.1 - - _SpecularAAThreshold: 0.2 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Maps/M_Marker_Spokes_SDF.mat.meta b/Assets/Materials/Maps/M_Marker_Spokes_SDF.mat.meta deleted file mode 100644 index c8c70c4..0000000 --- a/Assets/Materials/Maps/M_Marker_Spokes_SDF.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cc22c7f9de95cab4488b30fe8699a82a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Plastic/M_GreenPlastic 1.mat b/Assets/Materials/Plastic/M_DarkGreenPlastic.mat similarity index 96% rename from Assets/Materials/Plastic/M_GreenPlastic 1.mat rename to Assets/Materials/Plastic/M_DarkGreenPlastic.mat index 002804d..ae368ef 100644 --- a/Assets/Materials/Plastic/M_GreenPlastic 1.mat +++ b/Assets/Materials/Plastic/M_DarkGreenPlastic.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: M_GreenPlastic 1 + m_Name: M_DarkGreenPlastic m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} m_Parent: {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} m_ModifiedSerializedProperties: 0 diff --git a/Assets/Materials/Plastic/M_GreenPlastic 1.mat.meta b/Assets/Materials/Plastic/M_DarkGreenPlastic.mat.meta similarity index 100% rename from Assets/Materials/Plastic/M_GreenPlastic 1.mat.meta rename to Assets/Materials/Plastic/M_DarkGreenPlastic.mat.meta diff --git a/Assets/Models/Maps/SM_FloorMap_Marker.fbx b/Assets/Models/Maps/SM_FloorMap_Marker.fbx index 23755285f5b2659b1183ad9a6ba02e8957ca3178..401aae11b78fbb3b840d3367db6a983c82c16fca 100644 GIT binary patch literal 36336 zcmd^o2|Sct^#4$zB$Y}<(e`Q+Qb}dYma^4^6fqb~F~iK*x5|rlZ+lv3dD|D2-YB76 zg``az(t=9JF5Ca!dG0mi$yloY@BjJyfA`~fwsXJt+;h)8_uTs|vxpYpLSxeujpi>? zoX=p=*a3=)l#vwEQ51?{UrL8*FyLK4r@7GChW=bSlfz&!xrk8&ZN<=bU>mD7oeddH zzV@O}4hZ4y2e>gG6yUxPz5#|zXLf)W7vL=o@S>YQwn?IhnY0CP;s3s01RNIi&^f*VNEjN#$I;1G;Eh3F8J zL7}io2$OhcDHL&@f>~_pcyIz*5!GOk3fx+H__#5c97SKE*%%xMIbjvkhom+9#4kQV6IwGzzL9XFt%Q zFp+ED*5oeWq7iJe4w8f!olAq|S#}47BZNt8DTC`lr$YR_LRiG9K2EFX&RibTbsO>SgXuFjB)PX2q5G+3xmSPV!&r~zO@Wjp`Bk?RE#2pi>io>V-! zpk-UI8K85~Ja}dfn#hag!*n531Q{pyA=q)P<`9RlRwKbK&K<1h<>kR}=J`i!I@1N% zm7wNfCO&2`33E0dbGQ&pa~klu!Vz;wh;#XfazYT1kM0C?3@i^MT=iMRA*?!dD{WN= zJ(|80j0q0LW=nZm#3%SQ=Iwcq@YMKtg9P!67#{R4>U#!3;WnMXhl2gbl*ZvwX})w9 zA&p9b4G$8o8A)Aj*?ZKgys`v9HF-tw>}&+s?GUt!YMvs=Igbx1FATElcKty@)!?HJ zYln*4v8#qf`TxWw0J%TxVxghI)CU@ciOZ6KV1Hubv@eN@5AUU9CXPSyS55sjQXZ%p znEJO1SYVU@2F_W^sxy?Qt1GI_oHIjpj_Qm#vu3GE_T%xl4Qkjh+Xm#R;CgokWJM<* zhKGxm>H#Qb2WbE?6jSM3F7U@38&bL09NPv{7(ayz!D=@kq#-1XFbNe7x+?SxR$hAk z3=Yr#Gr#}@JC6yIOLwCaqn`;J{`900c%Q7(c@pf$B{2 zpc~PgxnOvMcICqIaRQ+j+%@;{bVBB201iQ_(D5K4>hjL>1cbe@O~9TbKSIc87@#cR zBSWR=c{(vb{G-qE0D?kq$J<+CJf8|HN1TQ^kfa^$OoFWe64r(uafmI@fbL53@!;x% zVVO-6GKLNTSwPh0;^RzbD_Vls-3x@I3}3oC33>t_8p;ZXQW$Mf;owGR`grn(Q4?s) zXGqxv`Z}yT%nnNBvYc5S9YMgp{+$Fd6`X?!SPpDzDwF1A!8Brn$_Wz$a%)3gkg$r> zi9@U+C|Zi@0yHj==mqYFSJTq^>M7t{nEoO*u&S^?SREn|77}o*Liw?(X7KaF&_~~g z%?9==00Tqy4qY|u_$YG^HVdFb=pgmQAvvcINeF!uOjuGeeGm_GP2g!21cK&D6a^k5 zg(87LOeq)lM{WfM#_JHC0ldj3ueEr4rLd|Uq;?}&Bx347)6fp6U^?$iw;*PB(C@JL z6Fpu(d5ZF5`2~zp2C(b#dY~SY;R(#rd36`@R|mopr-mU_U~QoYgd(wo#p0TS&f8|! zLLr1+_*+O@^;<%Br2{i@rgMbmy)eJyOOn7}F@T!|b5u?iNp`HMwy47eU{nZULgoPL z>jd=)64n7ar1T?NhqrV9{Y?9q$Apv%mo8vuJk*Z=EEx~G>1bP}*8Mo#`P3`Ou1lov`MnA(~1aySTpgsVA)IE0P^ zA|fcLE3g*Rk-LWc$4DS*d=NMeA`nHIhnG8zJQ!1f!-XOLxR_L@@Q`?RkjOReYnpjL6LQOz}Ll%mqwq*FSxV({)P>H$$xj+Qmk!Es8 zMOpHTg1r|Ng(~t}B`Ltg7?7}u&mazArJxLW&?cPCd=IedBP?2i#zH5dP35D(0)WBN ziJ2K*t%KJIyMv#w2-rygh1-J5P{(Z9DuO= z5aSP}f5s3%P(3iApuU|yht`g(6hZRVxM9%P0pk)s5+rhWl%E|sj1hrDr~0s6Y0h*@ zcNWuaCCUu0v`g(g`gFML2NEt^z!~!b6nB~n=t0mD+AqGsJVbNCoV@ZlBq$}w0}^OV z7*(1QYCP_*J-7P6^36~OD$$TGAuU~boW5Jz5n6Ltj zh(p-qa7;I6u{~)X&^5qL`3tU_h48T!)cN?(-l6CMD(GTy;Sot#Lp~TB!+C?R7Y$CU ze#!htk0$W2th4y=Fi_&dI|m5JEUXJqC=mz`>(-2qHwf$+FgPI2bf&}GHiW!T$Gp8B zEnB=Mi7l|Q4aF8LMnLQ?RBeoAdRTUz8v|&-F5o~&Sb`w*@6_N3Dhw-Lz*oSL>*vC{ zUyl}2JxK173f5#CDgxm^!eW!$CB_yIR+z0+=)@@UpxUrz5{FRV z&{nAKU@FI?b2x_nUMwas7+&-w3~q*Q9fHHnhl48s2M0kgt@MBkQ!HjD6-N?uuwrJ2 z22EUXfhY;~Lq2-9s*cO~16%fZ0z?F135za_=`2q=mmTl{RRr_n3JJ_iZAp-L0{U}w z0d)JhXz`Xw@;dN==aHVS#9%6V!^Z&IoZ}$nr1zf0rcZ5^%#XfM-!UQe|-j-r}v3N@^ zy}^|ZRvxkt7Ph!Ws7%mRU|@y5UdfBqiA1~Wy18ayC*2N!cgA!1ZBA}l(CcAw{a&mqWKH0k$X>2 zgx2VMPf&!`sFH+28W3;?w_t;ZGkIF+z!S|!nQ%J`%n{&91;zmPt(@sbEVe1blfkuM zdUQBQLH+I_;bG4TIx7s`+wizxCJN)fWxT+z)8L&#DeWPsZFfNRra*c5(Qa3gF7FQL zCK9MBQ3iA*u)D&$^rm!TDYer&kJtT%kZ>W3q9Fw2%#1E+HDA-6;VcUIM&5PzV*ZY zWx{j^OVHfTZXbD*5J>J9#U-8F_7jAGEzg)QML)2MFn+_d)sYA4qJZvMc1O2Od{6;G z^vJJ)P{U5_E`m^VXy`72P-~crRx`V(MJHAr(p?0hwMgqOg3ww_MspI}*o*nr1aBgs zRRV^yK=k&jlZ)-7qRjb44H7I0d$wOKr-4+C8NZx?g5@AP>rOEpS+NOP$Hnb05C%zs zVn7Ep056Lyp)uX)-HKRZx{uebVC8f7@wyeKXrd)9VfCf?_pH7fx{ueb`o8KuUbpHy z6|Fzw`f9c}BhTeX5(sGq zfJ0LjYqcI1KNZBA&5)lwGaw-dgf!6GT6q!Ej7~Aa5C&HK7$^!zAm)dHQQcX79Zk{U znqCemD>{T(<-lcgx*K?6#Fq}9Lj^B~aluk2c(cpL%Zmk`&4kb$Jl--6b#yF@03uwp zLyy4faly+)PVfynrVHI)_`~7w!9_t+D*$|u;!gAV1^`B03 ztAun?2}Up%NI-`$_J$?k@tk}N+1k~hqtRRj&E;{cqZk6>!>C$dshxD#0Xmz6We9md z0$9VqhL5F)rVKRjbYo|iU}oOkN8SUe@aPYv3G)abygJ?&;R-IL!)^j5_VoTFUaTpB zm2{y}?Lqe(aXCj6k56f=hBq1Ceo$Enx zkN^&p?|1HxwU9(aD<%*cIwgG%hL;Ib=riX~2$&4f6M9%%Xu$zj6rx!8bp06oCK3!u z7<4lL7Sh?n^tmJyfj$fk+tPy;0B%Tw*W+LXJ6%hoP)6tg9*}Uw1O`UvU!c!k;==?t zq}_!1-lZgjF+9AsK@AM8LLWAZ?mVj*7%9-=9Bz zY+RUEw)=(_mp+ECv*zAeuGdfOmBhOHPZY2G7~@(KZdiR+LG;`#z1%AacV-^()cZ%- z!^_7dAtYStiuJeZ(6C2Unn7hXExkrP=ET-jrIuF(<`--FqTyEoV0P%7n_xzTfG_!RG9WP=fc8DOy9JWwp4(5B@{`Pk6! z3MPKav{qGz=A@m@j*Fh2tL@`l7W&?C+m`VSVNMsPdoJ2CB4p~5O?7|C2B{rwiLM%%oaTBXHVXz9cqux<`$dM5cjy`ki3xzeL}yE5@X?8`fs z4lT9iX2+*&XsPmWsNphMM`TNkt3|awHu|JQR6bC-mY(o6<>0ZkU;28~)*h_XesE-7 zbHmdOKEpmdb(ru%>~v6*rlutA;nrC=gNcCaO%=3w9tcXbPd9WjD>T$a*>5`4N4^}Fxwte&XmNT#S;751DKAR`sUO zs?^Gl#Z#h-+DgLFIuI&(!TCI(Jw^o@iFO=hexj!WrT#KY3sbO zZ!yV@s=ZNjLHyIuQQ6+3L$(?JsQ5v1__$5`dgx18pRC-`l~smyl~HyI4{z7}<97f1 z~nd=_t9HMlVSR)5SJtJPDC9TZ zO`RJ2B&sg-qRN+j@$(uQ9*%2h6`7;t<@eu0p8somjfo~o91pf+c?7tzn9wiM{dv=A z#xmp@mjWJt5#?=e3wC+S8?l1Q>9=dIq-2=NEr0!Jp?l5|L;dA03wOKsoj9`|H?n>_ri8v@ev>MkTlOMf;-PneNi#Y zZ#AnI%PX<=O2tUO)qYh2G~VbVFx2WUT_gMi`y9RhS1&=EjK0sRZ;7@*^TP5?Ry=oFySfX)Cq3+Ozcct95bT>^9& z&=o+5fRX@R19TlwDxjNyZUMRt=q{jpfYJdy0Q3-02B0iJj{s!@dIIPLpx1!%0lfoM z2bK0jUF;0ca*54M4L2!H<{C0W=rTJV082bO7lB(gQRfkUk&- zK!$*f0WAOom!}p2S_H@xkQpEgK$d_O16l$IuEZ?`WCh3ukf%9N0Mr4oX`7cxk61Y3SsKadrca`C|SV&d>Mxj zhm>LHjZyfKG4PTI?<;Ze(_zx!`uu=)KQgf9$a}n3F26ss4&MR16+X@XMhX-BIlN_UP^TvwncZX=yUhQ|1ListvF!vdkJ@` z{P^kbhdev2c<6{Z&7=2Cam7KyYbGz>V>Qsh@r>xg3~I2=w*L9q+XgRRY`Z4hx=+M{ z3O%(!xAgzX*HpUtdHD|8rjcdQeKOVbOX_sbP0N~=8%@5lYWj@pkvmPLWD7k0$tk%}?x|h%(!kd} z>**j1sj%6fuHJTEGMTPk@%C%pmW#)Byx%)?$qUHVVy8LnR`ufQg3S07AlZV%bO}u_6-FcDnoy5kEnUn*@Ay$6Qg>w&l zmGP$sJS;qttZaHWs9(w>mezJpJ%zhhXJ`9)P6}3#k6w1jPHTC6 zc9v{O+B7=-q)zdAI`iU+scvWM2E{BBxi-zL{7IExee0-@!&Z@@x0)tpO&2d3{#C+o z%W2UcqxP82j;z}kl(Nh)h+ci=kd0WKaZ8^hi}mv#DHmSyP`VwQoH;?X+*5mlEFY2C#DWq!JaW6+K8rBr|EbPO`AJp;n<@vkMuqi22 zjqA~Y>jMIIO}?mSbl&8ZR#Ke&SM$dT4?Zn?72w}`U*^ zm1$M_(+YD27EG~yNAvubXxKXKCG>J7UOS{qC=5-x=u zC@xx6!zroMZTu`#Ibc__?5PEd&RLJFXpr5(j16izuwdVr$Whj(-7RCDelGo+;`&*& zIO3Sd_+(bXEB?U>|x+V}WaT|?>eDdk$d=Uq>pB@*!W)o0u?$9cC> zhCdAousN=&6j?M~^RC6zt%|L~R`snrEYs|q=QwS|GMARY#j&;ngD6E$ZZ_Fk#?(%z z@cL_>kxr`{^KMeGLPZpF)wI6GVOzIkXe9TkiIK^fHp1lGj2Rc}i%nW`A84c>jT>#g zYQpw}akW8jpFF;&U3X;C8g-4`=d<1pyffs2AS zX?4}bD;G?*-e`?4T|o=4-!Daz`z9G4bDg7pMSbkdzO6^9Lez`hTnaxV75E=xgVcKB=u|5Mxiw@Rfp8{bF?YEUe-nJxClEa~lnzIS|%te&hs!dbFB zDmQxcX>Y4kQ=gp$^AD6eCnnvKDe^UJI5xjIS%=n`$}yhz?*y-LKN2(^Jz744de`*P zB=+5_lKG9B3Ou&$>o@P&PU9rmnJKyVXIA%(eKT!&wbqwlJJoc%k4N7d*~~qc*(;^; zfcT0*aYuXtsa~hHozL27YGAJw7kfRTshl8^_WFC} zp5pXf)!|Q`OZg>l*F5&^$i)|HPD~!`c8orSaq7*D`;l`;y6)dI#po&z6PX9xjblNcn!|1C@H-E1*>uIKnKrBimN>za*SwZC{sc)_f&koqz26JGDT?WpiE=k(d= zVRi*Kk4dy7%hl>d^(#1-5-{OoTyofi>M>s|0^WLy*6IzmpQ51K662q&pmDTi?7@2? zwR%6MsLZkUo1lKGG&bj?dXu4(XleL?(-K4UTSlaf{j%Br!=l_?X-I-+TiwglZI2pG2mWKEt`B8^&MZlBMBPuPb zq#BfxBbsu-?wkG%N^>Kcr01T=))`u9vALm6?PFYvxN6~D9qDE51B`LRAw>cO7&b02 zfQJ#rFhKqy&W^*yj*d|sDGL5w)(0W%eTs-8DMBkn(Mo@W(SCkk0IvFr%*@$9HK$P` zzGtVptWGf4=x!sC6MJdA;hBEQSB?yszkT7c`-3MvkNXE|!xPqcUvM z-B~pCE4_=(y&SeT(b?GX%7;%^Ws)5⁢WfapX%Mcqn}-8&e*k6;pRJHnWjt;X0S; zKU#NQ>4O85py^7tVl#b@Fb8XnsCChn2%4_2PAleHQenVwV*oJZ<&K7lJb=;TP5{Pq znnlr!mpfiE59n<|X3X}8I-<(<_=R2kFikxqA zKY;0D~Fyg)QYn=lq!9B?(WR`QE4HgG#qn-iYCAGd8({YdhPRWIo~{P#+Lmj zZ!15Gs+#52YoxchUt!8$GmeU#bJw3+c6gji-P`Z6$;_8N1#KCsFBc~sEpVz0iQAud zX?3lAfx2->LiV@4b8{jZ{ntd57)b}_L>c>UR`TEIR+3JM{UFvy?e9Iq?@6pIoSE-9 zg!O$uxmu+3@N{F-cQSveMKFTz^>n)+UD*!NL76*6fT{w}Bwr#Id0XZ>Az z^|JInExmjfEripYj?-&68wCj&NL%1PNHCV?-Qnbg@>@uTB}U|?w1x6?a3YDsGypLX zp?qI()b`v)BZ>7FVtVZr1U#<6FU0goBnWg!>BFly$7Q@Ip&&R#fgO&rR=U=4)y~mU zQ90GB`xJ~a*5C7B^a;Sy7cP=^iSs6gXb=$+VHX6kZjozt$f8O+mL`M2^>R zDRE1Q&Bw#HZ682!I`pkW(@yd&B5UkN$03*6i?^13TYZfqbf7SAp z*>bP8pL@0Y+pBFF3F>poQiu8-d@zTV-apS??M;9Ca@CAc*_m7mmS6q`_3T;~7MEL) zmFgeuSDqb|f9`ijQ;lOS=04%P0z&oS+r~_O)b7;d+kzk*@GRarB}BGPd-s) z`{-j;uv+b-Y}Yx(Y;D=fPcJPJLwCh<)CxYn3D&56l$I^sptgstX>%{X;kjLgMT2H8 z$GP-i>vo5#70jZ#CXlr?)8Xo_H&=HgU-WD7Yk81%bx&gh3$RGvY+3-r1^F3~$7yp=VWQSTzL{X)-tNrL!=o*ClQzD65+ z5yzrd)-G_318OA%obwm)+-{=G6NVcGY7pC(WlNEihQG`s7XSUlR<@=}s+Qv}yT}jf@9h?Srb~IQjcE zUc1)kwQ9Cjsa2_tsZOg<-J01DGIKy=6zBa^qwBdj+b&eunWtN9-|D|7#lMMT9=hA@ zTlr_}o7N#0tfGC+yH%epV5LiYG^|zDdGRW{#5OH$tHR65UMoV+CdB0=gcdrMg={{1 zZ@12SWuxm>($_LR`=5{Y-}9~UagFkJ+*ahI*#s5tY8f57y(G@| z%9R@`w^cM!bG;`ZR9&z0X6J?oWt!SyuigY^ht>hGpYd-Hecdh7q3dYmRqKLKT$ulVQX3O{+5t^`q$NicF!=joEI5nIU~x({fEtrsQqd4 zi~aOD{?+E9`@(Ij_iEPX^?s(5U<}HV4AgiV^$}dGNbVajAW%ajtFUOwidN~^kK#9D zNiIqR43{v81Gm&}1gpj)n2o8oeB^hNi2K$H)_d&wPmI1NM5*!o;Y-xX$=heHcx_;- zA9k|XJ5{|n_)$nXtE@3!({1nugRxRa{~4V*;{F}?%{Q01h$W2DS(#3Qfuxj1srd~9 z5E+`Ep1WZl2qj}hHA;&VWouooe2C0FwYN{ubc-lC-zwE!;Ec0|g1VYyLikk*M^!dr zZ&brg52fe!x+_8Ssj^NkV&Z%?5OStV#ZOq)ADme$=ex&g1Pnr-PiSc^FP${1#gF;2 zMkf;ls?A9k<)>I~yyQ5|*ibe8&S}S$TNW;*Nxg8gSB+1Pbj)9GcC&PDNS*6aXUQv0 za#x(ieVt@|ouzA?6iVw$L+j7Fxy}`T7nv7+GE&YrBz;W%=7Q%pic3e`8{}W)XYAeI zw{&!R-}=!7A%jmi=Bg*~0#2#qmfELYx6kiqUiI$d<~^X;Tjak5@5fF%JfOz?2Hoza zmECQhw>PrxmtFl317pwDVQ()4$uY0eafDpLe0Y>aj!3yySY)yP+CBaex!&agO8M`U^9!}K@1zvl*RN+* zACe6LXLYn`l(_F=;ojv913?6u`awMOUP^JA>ShpvrVZcFNITz3Dc7)HO_)Om|1B8A zN%G(}RB&*kdV=p-g3pe)@y0l57-51$&eArp!^XfFWzDq z1-Cujhgjq!D4*ay9l zN)oIsGTB7R)??x3Ae%+SwQbsIt$|bud{P}ILTdxSo}kvOtj7rH2;H_b9(s@d{o_rr zqooMSc$6FbWE}YJs_CKiQ`YmoLoWr+;|G&@m)f36ekw%hwyp^uXZZ^igV5VH?cS5I zg%1jWBu;E7#%K$k@rUa=_$B`CeI=lycgoJ70&r{3<`)1hrHAj~!OT*qURdM>e8m1> zw`Xsut+CcMK>63;9dz8mW&tW1TRxhnQpDlM*T4irf2kjdLmHuo>-&Ho*aNSbK&_&E z@XkaBWe}$VIK&p)hzjED4d3B1U9$x}yAC}R__;SGw==*l?`?Q^0Uq>W z6PdBp(5_%2x&(au1anRyapFd6vn%NGmkME$Gtu!pB=Rb^j&7&EUhq zUfZM3tAgit{fO+ieGK_%(23!;?#`D$IvS~HBzQa=fV#sH(Z{$uM;HEy-L%fpk#Tj7 z4x|ub1Ec*3T?kPPwt?=zgYT3RC2rJI=ztd!BPnrE9|e>x_r9@hotDyrYe+R$G&?U%FXxPYsv&(GNXF2 zR)e3vY45#bQ6=!`hAY!HyBy^H$unlyn8en1qPP@&GPek1un}t9x>#_G{ldyi>d*37>2^j1D zjQ76qH(@c@dyhp1$@kul707$TSsWESz0V{$?-gN0o=%*ncMJ)gq#A4kzv{d{A$Z)50==xq&RYe!42<>b&O4NZBw(!nGtS#JifB{pyp@qb zit#=XWU8tgM||7?E}EkTRz$z9MiJrh@D@|ymu<#G5P3xq1XL?b#PV2gum`yuB6%l& z`q$3g<{~JpU^M50-2~!v{k0%dz-2JUP9LnH*}>l|4zROcqVG=QD%!Bv9xfa^KL*#2 z;monqar2BF zTCl`=f(2In(7(bogxF9d^w})l@4%YC6QqBLrw5y-n>%Kf z)Mqi7#1Bw${7Aif1j-_!PlcMauxPur2d#jYPIs9Fk7RAGp$uig6`qWsa4D8;ocucn z{Q(cMSYDhv2Gs`pp`RtiUq@;ad1;qf@O_H5EKyx%!OLT9S*~@N1<%RavY_h!yivh7 zib$8lmeRm7+%R+%cO2}Bz>PZI&zbX_EGcI<4u4!fBlRpR$L$j5$GVaAQ_z|Rk~kpG+A2`onf;_vtQ&&OqVXXbt9y*F>(yqVeP$O_@G zge)yP>m^#&Ts}(}qNT<7no&BM!6;B-w4^~$KA&K52;sb7F~Jvc1$-|kRDeqnt^qB@ z9)u7TI+XQdFoJ0{RG@~m41ph}mGz&;XA498#Xz?(#Gi10BE}C08mECaLV`t>a{UOV znC0i610~Y7m0Dn-$(OW(-ktfDKmR6v+kSpd9Ohmk&maW7LSos~n7Lx_1Xa#+&0>rC8BZ%M{ zEnnG@2niAhIU=&8kY3_W1agrLk|p)D5+xgfpC7@e8bN?9=_)b@oYdTe0)Ij%<`N=P zLvIiiNk0oN1vjQD+-wEx0EDtg$YUZhN2XZF<@+#^N>Co$7-U5QZvm)ZsPDZp_zZ?I zhcbZakE#gSJwbX7NXYOeP)Mk^T!ma87`Z&M>p(<*K>(jau>qwFbEu9)aDofk{u*vl zicl+me;$`jjx7(cHqbL&BB;rra0bDX)E?~+JV_FTkzJt_kVn9+Gh`PQjM~m|htqJ| z*?9>Dx1_*F$pFWLUj{ysn;b3H@PuBRDKs=VT37|!B^H8bS#IyVkkp|xqg97Y#HgW> z0sJ$XWooEpXgHhvr*CLzxE({|z8y%1w&U^$IpQO8qFG5gAc52jZMZ<6ec|TB5{a3t zK!PKqbHDD>MlPhK7LqUQ-CzvuMsYJz7PK7s+M{ur=V;Vmq_}n8&|CW;|0~83>STpzxC(m+hAOOe7G!%hg% zh5SZgLSp=hDGez~H2bzvcG+%4$98SNLOAl1If$F}Vpvj^>nhi+4U?boGLtw}Z^2y!a znu(gFvf+V&IqK}81oMdfBeD=%!kZPq6WhRaDrCv>4tddPrr>MM=KM3X>JFjL*O=BwVgf}51_-sPdrYcjn^;H#2mJ1^a zf^pG0+$NHu#i4WHC5l#n6^=Aeg0qpRDwJl(^$B93?Nsr&BLEVvP11v~3}vD|p`)RJ zU{47A2(d6^9JrItdLEM^`yGJS1|bUxKYt#wKs560RtBS)dN5R!rZyd(1i+}C6B59xVU3Iuq~1a%nXSj)!5Qz&B8XEqQA zi?o=lSR6r+NETfm=m69xvOs7Q%?|Dan*jIM6(!W{PP#jRvJm8*=vIUpMXr=bU|T^M zH0P0t>ExOa8iVJdqBONJp%N?__N6GCTMz*DC*-5e7Kmwt{sPh-dqYV(XN~|Zp$Cwm zIKl<0L4(L$AZDSF>FVt*BE&uI=))NJKNK+PD=DxWH&D=H+^UYaXqJc2@XPqM2Y-ST z;Xv_=dIaNs5xeUF7InHl1&chvLLrMUf<6HiQ?9x*vxRz$e9RK9Z)mh%Fsw}=8fe$) zbl{$kZUF$d8)$T3E`NzES>wB+^pr(e+!f_FvM9&EXpzG$D_ADCi@Tzf$?cx5C}nbc z6I0ThpL9UE3SmExl(Lf%-VfHiNXi*-!3amobtxT$Y;3|#AavsTamB8DUZ;*1>N7kr zh8cwcL$DP?%=Px>6C%-)u7fTHBd!}jp4|Z|?FP^{-2s{iQ9e?SAtf3b7HGNTMDV+& zo?saY)QAMf_$WMf6A~@@MNvc#rrkV@O7lf-0+IMjVbx$G4v9Jyu6Dj&z9U)*gzco1 z^6~{<=z<*7p1Yt*EaYTLNaV+9yviKW6JcB+-E>YSb2xu1mrUkZ-YQD3Zc- zUtnTi!@j2s(C%4Sm4z)Z0*UtE2B1itG`+NPD$~F=$)l3lb*b{GWcJ*9*;I0@YZC17 z$&iZ`ER(}!@~C8Tm1vD1rbP@r4L(Q0Y8=74Q1B?~!izaBTj~vZ ziY><2&J;E*Nm{Y79drkpW>76Ab^)MK58$a9#mr#*ws5ZL&f@zJ-I`$~@-ezKxmvrdvWy(xMbY7m8BMX9*?f5~f>1o$nH+TS7Hr7*j?|hy(E$+K=K`@qKvR8$y<2 zDb2_N>6Snny8!8yI2Qo~&9iu_L925ofxy>FEZuG*W7PJ0g4LJ`Pr=ATE%K+rP`PyD z#!+$uIdaOVVdg49P-n|01t?pEtIwpW!<@r#A$(w68%V$gGkk9#hHV-6a3H|nUjVzp z2(FVoozrbmV38x;&$bf7`T0upK?Qv75G?z|1sx$2V3hF`FKD08PDl`Is7>s4%|an# z0MtY-jz-|*Y74t%o$-kXcu>@&HVvHe(7CMQOBcyLPXgAjV_* zc@#Y?;%M|*IJ{)R-Z4{75s8cbkeh<&p&Q9g7jz5t(4K7T_Co^*+z2k*(P--uHm}HC zLK$Z_h=RnuiOF>+a-?o&IQZc@u|n|rzY|LzIgv60Yl;ZTKhKXV62UN~Hk%QA>(Nt} z#_9=phytpmBrYy2Z^6%*{MXH^_674#uAaVFo@n z>{LHckxU((j2g@xhy=%!XzQjGk{!|wwxEA82HrS8`f`P>BeYZB2cBj3brcYy+IDb3 zU-w0o1wua-4?bGxPLSN0vn<7!xW{?}rgeZ{kKrc6iXZ7`8pR?SQwWZx7rBSVRTdin z0Lkb~0id;pEms7GKx_hi4c7I64iJ#3W8dAzyqQ5cs1NlW9lHBG>QA9~WKuw|y@a== z=x|@cX&5wsw1_(e_Fy_`p!@vZ#{ANJ784Gv19&W<9G@lIN%RBDMeNahmK2Z1lx#bm zkLmRQ1KTlk6&zrqeNVYVV7lctOlm@rBJ*e=ofqsc;G;N6-YA-G`4k|Kg&_lh)~Vww zZyq|p7x3li1FDm$qhV>n1cmf59WFpbeg;l$F=DqgLIQv0pJ22c$4QAgxfNZtq>j(Q zi!+p^2d+-Lf7pVeN(L$GLV++q#88kHk^vezR=pu>mPM2;={26bk+|wo4C$A_p^(Wn z03E>H_bcE43dCGEx#moSER?$pa)TAZ_RjHLWHn&ZaEa9Ct5b)Z1MLLRX*n zF|S{2G%Vrto$!whv#%}NWzg`f>QUyb2ahC=?Hd}NJ`5?oxx8_+X#(G(YR%i?n!4i& zyk!!l)p0K}Q%__KZuT~AzWi#QrY_$puE{wkwY2Q&A=kj;lWI+yD>AG0%&h(?fj?R| zc+RI%$LiYSn?rtbja{BPJ^f*E!L|CUj+F+>)-=Ch21g|1e3C?ze2SY9zUu|MDJngw zIX=y}sdE8KL5bhpEH3MEHTP{dUGwJMdZuf{%wgJLkBi^m+|v{Z(J5s`(gE(h!<%`3tpRD*>W>;Q9{U#%%R)%MKWDAT%0uSguW=+ zY7&$bC~yvYe#v4>fXLY5(p;zd;I(1@3=RFcI5=*hX3fo<8t0g~*F<4f32Q#G4L+1B z=}c5F3A>p&)K}xZ|C^hcfE%^T+-r5SX54;p$VrG5kfn_WOB>`S;Dz`I_{a>2U~=8V zorx`R7-@+ndtNhlutr3xZ<*xiImOdu-mg6E17~CJ>g(-2SCtb#K<}UXi`m1`fxIa0D#8C)fZps z21hnRz_h zuPQnwEB~uqHy&kA%C^YqJ8M^p2`A_AyX|I@JLR5@-Z^XT#N_CHKc;F>fyR6NSE`{p zd0xsn@1BmWWX;XocKB6V)ewXJDf{bt8?d5ludq{fIhCOs8^bS^NGhx6+`bf7$^F>4 z>V`{1WX_y2fyvr`zI`S1R{On3KYVuxV`qkqM7i2{P^ysA*;V%Kl-P`nfv`WxbJkgn{|Dr zi{gQWtJm#YDB7AA^W&y(-u!mrhoqQd^BvQ3omBt$GuK7ws8`{*Ll>NeFTQZgKm3B9~e7cw|^dg|QBh&9K4h zM|E00U?SkflUC51{0s|K-->h5!f6=9!TzxNL%+m;uo%tf{Du<6ZtJx6H|b1v9I)^mYBl8QaOTfd<5!(c z8=$xS=%sjfoRH%TvFR_`O19lskn@BVX^&LHiOBi5=`?}r{#nv!6= zTm4wAsi=~jn7uCf-$!dJQc7Z@o`xk%+MH>%%O+DQw;WwrpEhw!Y z5}jo6;XgI57AdZE9}c}*o|B}Zcj|55XE96uy8TV+ws4<@6-F7=iPeV!6qgej_UTb- z3CGsQ84C2@M8~=3to_v>yo&qj<%|tUpEm5$Xxvy(9vAwxq)*_5-VqfIl3rC&m+Dj- z40g_VcVxqy1f6U4>0zVle~FEIH_9yMMVMvsB8#fm$yHmL4VT9yFfYB!Z@L=R5Ys#& zHeybM&RqMejyM0<=@NgTCaB(}@sHRyN}9j>%)XXfziFvOL$+z^{roqH8jU*#=kpui zC?w1-vD=w5HzuU+rtPqt*LMpdn-fk~Wtdm{hW+{^GVl5)<2_eJvjgYGyByMKcvM~b zoZpnSBz+q@^oshLDqV|5u8V!LYqfK)!kc+>-un$D9=tGB-?SuihuX?b18X&ZWmW}F zKbnz{JlW>nOn@^LT9(+(> zrqZ0bY<08u2eZP&UqdHs_Gq{~_2uH|I-&|(vuhEZE<%`rJ|8q>;;(<;=jpXUd zPm)oYHIk-V53bk6>)Xz4%Jw@K`~J!wv3Vz+y*!@N826@laFc#Sm3n1}!wMcApMQX% zt6?Ljrp=X*gUtUJT;KsSBWGA64|r&(^`4_{lRbYdA2@bAu`f!}?0TU#W>jyh0g0I| z7t7CIKa=+Hk>GCyr7_0eWwY$Jo4q+)>@xH9{=A7XMz2qa?i?}pyQY}*%4>S%-mKFX z-b5=teCnU~lXh}`;Pr27^J_2L>@q)JzU736d3C<($z^L^o-_R?^&CIbtTL=BS0^s) z-2>Ajml}&sEDvvFXDxs7sa}15-k`m}Vr!~`$XDue2GU&)8R?TA=N!!|wedLjaRKrz zl*d7yq-7&j6+@$qELpAxtuCxX+QcE&nCvqh&`+2QEsXn+%!@e6@Qjir`Io_{uPe2{ zkL_+%IA8X?7~{iQk)c8<2W=F$1Wa%c20hQ_tXQ#P^wr}m!{|PCd5n=<#&3jMFGjV7 z0$Pf-rdxAb)!v`3_C+3~&L_h;iL_hV=-d_;r~nqFb2Jew@&MPq78iY{z7sLoXX?8i zwh0i2Gr_liwaA0>9G=npRCo_oAP%ItE(Bk{oOLYu+@m`YjP20_;`-UCUUB<+koA=U zqy69Pt#`sn&^3${R;1)K5{nn_=epj-Lp>IfWHZcZ?`Y3ClV(Q^KkL{p#)C_LUtGT&Z};zF*8Qs2>p!(VX(u zwOr%UY};qUbIuB zMtjIRMp-%w;fLi$H1w8-nL zD3N{tflcGH8aFm+i;mjfxA~YgIBfLCh+R!TYm9p{)GjUKx5XoBRE{qb?t7msOk*C^ zQc=pN_OWmi99A;^$*^SOY{}OC=@~J@Pe(4#on>&p=(?V6;T$!FMaB{xUiIFGnY&7> z#^Z+>2A<7B;&v@v8xb9w7k(u;$2Pf9KfyFT>TP&-sQZh|S$iv;0xmU&R%VSj^^Im; z%)3v`mCIaf&70MKJ9PHI`_(%+&vHxrH5!<%ao?_r*zh*|&Rq_soqD|ouk>`z&eE}E|N76_>j=1GMwKOvH9H=8YTC0Jv%0qc z{P(8Q1$PA}B2Tf4MbBQYns}|?Z0Kg6;#${!^==RQ+ElzxFW%lShvQR2_%z*2sMblZ z{!Xj;R@M)aX$F1X?=siCQBcj(ipa|QL1Nss%#S6aTd|GL5>Hl+ zH7jc#Z|3V5dt{?$%xllxv!V`$ct#VR`xZqF9piK2Z_irJQSGxoUNk=MSGp!r&&NFJ zbgBvCEj@kXr{G;dIobD1|I&GK_Z&BC(`o0WGsJ$66OCq-h>Xh;XCy_I zKYOzMrE~uh_FO_YHZ5mk@T=^fB|G{pO$_=sFy|t#^l>s_6Qp|{9wbV+OD&sW)VHR8 z=C*pSA#~3sJ@z2|TVGnOHvUbMR?r&7y5ZceqgXtZL}G%^bZR#-8QSaVD`i;3T>!7h zw`sx!K7PfBC6{~u89QL&3+vE^zOS_>y#^JHuxZFDD7NR21Bz@_3QXP~$!h5gMnDH* zR7+^$qPIlOec9b@$ik9rkNnd{q+w8ilrR`Bsv*?5^oACB7~?ufQF6sO2^FQOO)Kjx zsa8fpDb)&^9qFw|dpQ=@?6NJOmyxDfQ@e{3pd5bR4&mNifS{_f{FU!BtwBZ zed~>KU}JHJRVUU^3WevPK$_Z|>xrNMu?Z0g+E4AlAvS`I$0%^Xflv^eU3_q-fXL|S z9zdW>QfIAagQU5=rIqz1%NDYHssB`=7w8F*L8QP?!Y7h83KMZI3JH~L0^t8DfM2tt zFb6-w2lw#Onrz{i2c4IWg-co5i%u~MUm2r1DtRD!g+{B=PFz#qMw;4m)?^!K2ueU5NX=?+>-xwKDjg$#b<^P?1j7L< z2o9N*^gNUtn6#huKvCOc`_7KoQveSMh?E9+Xbej6y0J44nuqQFcH(t?z6y<4^3{GP zzjkcH1$f4Zse<1Mt6;v*Fn8f zyl$xXt_2g*>rn#rg5VVmc+yXCDOt znas50KdtV!)gh$q+cpl7Fws2b#)BVlaoO#B!a-mP`6I+w8=sJZ3*`8O2Q=FDKEV+f zlBPC3VUB%=LGvX(VF!kz8Le~-%QsqJt}~x-8}N`Wdg>EK&+j1Km-vLG0EgJ=p-+gx zvV+#EZMnJ;k($1ohtX1~ZK6arp5o0Z~q!)DbA2??0I$1b56 zi$hbdbO`szC0ICjP_GoP8|uAlu?Exkz$K(%(l2lc>R{CWU6-%`5dT*$K|1`%`wG|A zS5+GUpHF?}B1*=71FahsY?xoc&DFJKH3z*-&R(WFb2mTJ14 zR+9!WE!CKvR+IX)mTFQS$@^iNoQh~6CfWu$EgsG$K!`s1BUeam=-RwAq@L`1_r`ti mvw@B4N7qgarxl|AOYi?H)qS)5yJt0z!pmQ)6$k8^tonZk>F=%p diff --git a/Assets/Models/Maps/SM_FloorMap_Marker.fbx.meta b/Assets/Models/Maps/SM_FloorMap_Marker.fbx.meta index 638e41a..653eede 100644 --- a/Assets/Models/Maps/SM_FloorMap_Marker.fbx.meta +++ b/Assets/Models/Maps/SM_FloorMap_Marker.fbx.meta @@ -20,7 +20,7 @@ ModelImporter: name: Spokes second: {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} materials: - materialImportMode: 2 + materialImportMode: 0 materialName: 0 materialSearch: 1 materialLocation: 1 diff --git a/Assets/Prefabs/Maps/Floor Map Marker.prefab b/Assets/Prefabs/Maps/Floor Map Marker.prefab index da39bb7..d1643a7 100644 --- a/Assets/Prefabs/Maps/Floor Map Marker.prefab +++ b/Assets/Prefabs/Maps/Floor Map Marker.prefab @@ -328,6 +328,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 02b4b8ced7ec91947943a7a393611db0, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} + - target: {fileID: -7511558181221131132, guid: 02b4b8ced7ec91947943a7a393611db0, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - target: {fileID: -7511558181221131132, guid: 02b4b8ced7ec91947943a7a393611db0, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - target: {fileID: 919132149155446097, guid: 02b4b8ced7ec91947943a7a393611db0, type: 3} propertyPath: m_Name diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 06c6de9..23fd753 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -13084,7 +13084,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -15185,7 +15185,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -16119,7 +16119,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -17215,7 +17215,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -19457,7 +19457,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -23936,7 +23936,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -26467,7 +26467,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -26829,7 +26829,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -29478,7 +29478,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -35666,7 +35666,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -36290,7 +36290,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -36570,7 +36570,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -39512,7 +39512,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -39903,7 +39903,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -42399,7 +42399,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -43470,7 +43470,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -53632,7 +53632,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -58246,7 +58246,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -59262,7 +59262,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -59997,7 +59997,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -60525,7 +60525,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -60627,89 +60627,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} ---- !u!1 &1375149631 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1375149634} - - component: {fileID: 1375149633} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!20 &1375149633 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1375149631} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1375149634 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1375149631} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.59267277, z: -0, w: 0.8054434} - m_LocalPosition: {x: 3.2, y: 2.57, z: 13.05} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: -72.694, z: 0} --- !u!1 &1377320496 GameObject: m_ObjectHideFlags: 0 @@ -86151,7 +86068,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -86804,7 +86721,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -91871,7 +91788,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -92936,7 +92853,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -95256,7 +95173,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -112711,14 +112628,6 @@ MonoBehaviour: ID: 1345 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 0} - ID: 1346 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 0} - ID: 1347 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] @@ -113606,4 +113515,3 @@ SceneRoots: - {fileID: 1027471609} - {fileID: 1276291775} - {fileID: 1855771788} - - {fileID: 1375149634} diff --git a/Assets/Shaders/SDF Map Marker Spokes.shader b/Assets/Shaders/SDF Map Marker Spokes.shader deleted file mode 100644 index 8996d21..0000000 --- a/Assets/Shaders/SDF Map Marker Spokes.shader +++ /dev/null @@ -1,129 +0,0 @@ -Shader "Carmen/SDF/Map Marker Spokes" -{ - Properties - { - _MainTex("Albedo(RGB)", 2D) = "white" {} - _Color("Color", Color) = (1.0, 1.0, 1.0, 1.0) - _SDFCutoff("SDF Cutoff", Range(0.0, 1.0)) = 1.0 - - [ToggleOff] _SpecularHighlights("Specular Highlights", Float) = 0.0 - [ToggleOff] _GlossyReflections("Glossy Reflections", Float) = 0.0 - - [Toggle(_ENABLE_GEOMETRIC_SPECULAR_AA)] _EnableGeometricSpecularAA("EnableGeometricSpecularAA", Float) = 1.0 - _SpecularAAScreenSpaceVariance("SpecularAAScreenSpaceVariance", Range(0.0, 1.0)) = 0.1 - _SpecularAAThreshold("SpecularAAThreshold", Range(0.0, 1.0)) = 0.2 - - [Enum(Default,0,MonoSH,1,MonoSH (no highlights),2)] _LightmapType ("Lightmap Type", Float) = 0.0 - - // TODO: This has questionable performance impact on Mobile but very little discernable impact on PC. Should - // make a toggle once we have properly branched compilation between those platforms, that's PC-only - [Toggle(_BICUBIC)] _Bicubic ("Enable Bicubic Sampling", Float) = 0.0 - } - - SubShader - { - Tags { "RenderType"="Opaque" } - LOD 200 - - CGPROGRAM - - //#define _DEBUG_VRC - #ifdef _DEBUG_VRC - #define DEBUG_COL(rgb) debugCol = half4(rgb, 1) - #define DEBUG_VAL(val) debugCol = half4(val, val, val, 1) - half4 debugCol = half4(0,0,0,1); - #else - #define DEBUG_COL(rgb) - #define DEBUG_VAL(val) - #endif - - #pragma target 3.0 - #pragma multi_compile_fragment _ _EMISSION - #pragma multi_compile _ _DETAIL - #pragma multi_compile_fragment _ _SPECULARHIGHLIGHTS_OFF - #pragma multi_compile_fragment _ _GLOSSYREFLECTIONS_OFF - #pragma multi_compile_fragment _ _MONOSH_SPECULAR _MONOSH_NOSPECULAR - #pragma multi_compile_fragment _ _ENABLE_GEOMETRIC_SPECULAR_AA - #pragma dynamic_branch_local_fragment _ DISABLE_VERTEX_COLORING - //SDK-SYNC-IGNORE-LINE - unused variants in SDK projects - #pragma multi_compile_fragment _ FORCE_UNITY_DLDR_LIGHTMAP_ENCODING FORCE_UNITY_RGBM_LIGHTMAP_ENCODING FORCE_UNITY_LIGHTMAP_FULL_HDR_ENCODING UNITY_LIGHTMAP_NONE - //#pragma multi_compile _ _BICUBIC - - #if defined(LIGHTMAP_ON) - #if defined(_MONOSH_SPECULAR) || defined(_MONOSH_NOSPECULAR) - #define _MONOSH - #if defined(_MONOSH_SPECULAR) - #define _LMSPEC - #endif - #endif - #endif - - #include "/Packages/com.vrchat.base/Runtime/VRCSDK/Sample Assets/Shaders/Mobile/VRChat.cginc" - - #pragma surface surf StandardVRC vertex:vert exclude_path:prepass exclude_path:deferred noforwardadd noshadow nodynlightmap nolppv noshadowmask - #pragma skip_variants LIGHTMAP_SHADOW_MIXING - - // ------------------------------------- - - struct Input - { - float2 texcoord0; - #ifdef _DETAIL - float2 texcoord1; - #endif - fixed4 color : COLOR; - }; - - UNITY_DECLARE_TEX2D(_MainTex); - float4 _MainTex_ST; - half4 _Color; - uniform half _SDFCutoff; - - uniform half _SpecularAAScreenSpaceVariance; - uniform half _SpecularAAThreshold; - -#ifdef _EMISSION - UNITY_DECLARE_TEX2D(_EmissionMap); - half4 _EmissionColor; -#endif - -#ifdef _DETAIL - uniform half _UVSec; - float4 _DetailAlbedoMap_ST; - UNITY_DECLARE_TEX2D(_DetailMask); - UNITY_DECLARE_TEX2D(_DetailAlbedoMap); - UNITY_DECLARE_TEX2D(_DetailNormalMap); - uniform half _DetailNormalMapScale; -#endif - - // Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader. - // See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing. - // #pragma instancing_options assumeuniformscaling - UNITY_INSTANCING_BUFFER_START(Props) - // put more per-instance properties here - UNITY_INSTANCING_BUFFER_END(Props) - - // ------------------------------------- - void vert(inout appdata_full v, out Input o) - { - UNITY_INITIALIZE_OUTPUT(Input,o); - o.texcoord0 = TRANSFORM_TEX(v.texcoord.xy, _MainTex); // Always source from uv0 - } - - void surf(Input IN, inout SurfaceOutputStandardVRC o) - { - half alphastep = step(UNITY_SAMPLE_TEX2D(_MainTex, IN.texcoord0), 0.002f); - if (alphastep < 0.5f) discard; - - o.Albedo = _Color; - o.Alpha = alphastep; - - o.Metallic = 0.0f; - o.Smoothness = 1.0f; - o.Normal = half3(0, 0, 1); - } - ENDCG - } - - FallBack "VRChat/Mobile/Diffuse" - CustomEditor "StandardLiteShaderGUI" -} \ No newline at end of file diff --git a/Assets/Shaders/SDF Map Marker Spokes.shader.meta b/Assets/Shaders/SDF Map Marker Spokes.shader.meta deleted file mode 100644 index ae2451b..0000000 --- a/Assets/Shaders/SDF Map Marker Spokes.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: ee8714d3a4c72874697299893a31f79a -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UdonSharp/Maps/FloorMapMarker.cs b/Assets/UdonSharp/Maps/FloorMapMarker.cs index 2d3a1ac..0df9148 100644 --- a/Assets/UdonSharp/Maps/FloorMapMarker.cs +++ b/Assets/UdonSharp/Maps/FloorMapMarker.cs @@ -118,7 +118,7 @@ public class FloorMapMarker : UdonSharpBehaviour private void SwapLampMaterial() { Material[] Materials = _MarkerMesh.materials; - Materials[2] = IsLit ? _LitLampMaterial : _UnlitLampMaterial; + Materials[1] = IsLit ? _LitLampMaterial : _UnlitLampMaterial; _MarkerMesh.materials = Materials; }