From 5db92996993420b1bb0c96ab50a41e46884303e7 Mon Sep 17 00:00:00 2001 From: Brandon Mak Date: Sun, 30 Oct 2022 00:07:02 +0800 Subject: [PATCH] Reverted back to old asset IDs --- Assets/Cube.003.shmesh.shmeta | 2 +- Assets/Cube.012.shmesh.shmeta | 2 +- Assets/RaccoonBag_Color_Ver4.shtex.shmeta | 2 +- .../RaccoonPreTexturedVer1_Base9.shtex.shmeta | 2 +- Assets/Shaders/Kirsch_CS.shshaderb | Bin 5909 -> 5909 bytes Assets/Shaders/Kirsch_CS.shshaderb.shmeta | 2 +- Assets/Shaders/PureCopy_CS.shshaderb | Bin 1273 -> 1273 bytes Assets/Shaders/PureCopy_CS.shshaderb.shmeta | 2 +- Assets/Shaders/TestCube_FS.glsl | 21 +++++++++--------- Assets/Shaders/TestCube_FS.shshaderb | Bin 2545 -> 2309 bytes Assets/Shaders/TestCube_FS.shshaderb.shmeta | 2 +- Assets/Shaders/TestCube_VS.glsl | 13 ++++------- Assets/Shaders/TestCube_VS.shshaderb | Bin 3305 -> 2501 bytes Assets/Shaders/TestCube_VS.shshaderb.shmeta | 2 +- Assets/TD_Checker_Base_Color.shtex.shmeta | 2 +- 15 files changed, 23 insertions(+), 29 deletions(-) diff --git a/Assets/Cube.003.shmesh.shmeta b/Assets/Cube.003.shmesh.shmeta index 99185bf3..628ecd00 100644 --- a/Assets/Cube.003.shmesh.shmeta +++ b/Assets/Cube.003.shmesh.shmeta @@ -1,3 +1,3 @@ Name: Cube.003 -ID: 77135977 +ID: 71245919 Type: 4 diff --git a/Assets/Cube.012.shmesh.shmeta b/Assets/Cube.012.shmesh.shmeta index b3bf270f..56d2d0f5 100644 --- a/Assets/Cube.012.shmesh.shmeta +++ b/Assets/Cube.012.shmesh.shmeta @@ -1,3 +1,3 @@ Name: Cube.012 -ID: 81876417 +ID: 80365422 Type: 4 diff --git a/Assets/RaccoonBag_Color_Ver4.shtex.shmeta b/Assets/RaccoonBag_Color_Ver4.shtex.shmeta index 70631c1e..d386e9a4 100644 --- a/Assets/RaccoonBag_Color_Ver4.shtex.shmeta +++ b/Assets/RaccoonBag_Color_Ver4.shtex.shmeta @@ -1,3 +1,3 @@ Name: RaccoonBag_Color_Ver4 -ID: 66703095 +ID: 58303057 Type: 3 diff --git a/Assets/RaccoonPreTexturedVer1_Base9.shtex.shmeta b/Assets/RaccoonPreTexturedVer1_Base9.shtex.shmeta index 61be80e0..e1a72340 100644 --- a/Assets/RaccoonPreTexturedVer1_Base9.shtex.shmeta +++ b/Assets/RaccoonPreTexturedVer1_Base9.shtex.shmeta @@ -1,3 +1,3 @@ Name: RaccoonPreTexturedVer1_Base9 -ID: 60820650 +ID: 64651793 Type: 3 diff --git a/Assets/Shaders/Kirsch_CS.shshaderb b/Assets/Shaders/Kirsch_CS.shshaderb index 6219d9a9c9a9e8ae16a498e700cba315f72f58b8..4c54946c91f269b181aa2869965af1861c3cd8c5 100644 GIT binary patch delta 10 RcmbQLH&u^OVI!l6H~a4?u=O&SG&9a-P6xm&HOuMic{M+zu%ZI%(OXVmP^PSHT#5^g8%VV z$^Z2HFY#$JWj5AdL@TeJM*}hkXPqRz8N(b$gSEY58- z-iik{i-xb?+I~L%)JGkQ#h=FcdNv#_$9b&jHnf}a^!??gCIrT8{ry$;fmiTn zc5yP=iYpi!d2JO`r=b|L;>u++7bhgNS?;KW7}z)iiqN5_qz8PF>5V$D zaqo8(gM7XsU)YoD#Vo7yV4mpoN6e1bi8-st@Hxe!9^?~}=%+0@DSy6ebiR$Y{`0eh zFZdm=vjebiw2f(T{K;26K|dwWgEHWEM)H^9=)^uG&H*DfI1*kZ;774xqn%lT;SwK z=l43~|IW+7pLa_vVuX5bdW?9tyi88?yW-57euvX=dc&EpfQ> zkC29VNB^14X%X{c?)T)$9L|WqJF1fTv_APTi(3w;uE(c443 zAEkdDZ%G(9@z~8zq7V-oyQ44mbz6jeUB1Ns*<;{=KKOoq5k`J|-h1qhWctK*U)$n4 r2ctgr{6Iu~VNUG)p$Hs*-UWK_eF(3Bt>>?qn%YN}jvCW4bLNEkZVH(*=7^0nyt+rDGIn`tpSpa<95XZZ`QBh_usp8P<<%S4 zNqy3^>l?^@${aTxNq8@DISxuXAwDa&dzthBZ&H0GHSb#$sXh}V92 z5RdIBDU-^^t`a`&Vt z_u}6sN#>q7TgpF&zxU`-Z?F*$N27RL9b`7nTyEpkmAc98Tkfj!_&Apjvq{f6(`BS#1_$VVxRdj+6ZtG0Y@a*-2(}s$I{ruZ-Nu zOsBqaZ8P5_+qP+eziZx>UD>DAq_mpY6q}d)KB+d#Vzi!ANnHyVG%T{Bl$_CvfKiJ- z-)9eG9>!Bwl8ttg2F50ATO}2Bl_QeWUAA;d#)WFtQ3?IygHnnR(a)l!uT6H_yo*Cb zJwe~|`9eX=4PQ%aU3wTxeVN?~EvM1sWdHj4it=~sJuD{GMqat7YkmIx393_sZE21b8i z`g9NDxECxElm8vb88II!xgtr37^tU8BT3E?Pi=71UXTqD%j{0pdZ*T3^x8Jd!v9n; z#BpEHKRwht^}IRL5_2E_0oe3%R=>yvo#%e^^U|n45?@d}{}b5EGt%#@B(dPPz0Dhe z5kDtMJh|r8Ki?d&;7D>Dm!uwi&jq$hCv zJ+=cN9q-uZzL&>ID0V9pcYPC!QS%@#m$36VEPT z6VI&P7c;+*pSgVC@ipDXygm{yiiyF;JjqS$$71|j-d^??`I#->E;|Iy8RpD43{DL5 z{!C2GAuqFE_4rSUq30W7&Vh&8Z%Ti)_RocZQ#)_>g*eoXFZ4;yFTFqHyDj_Gd|wFz zCm(NrR~+);3v*^4?s@;FV#$BsW8i`R@cpa_!v68{f*b=Xk= diff --git a/Assets/Shaders/TestCube_FS.shshaderb.shmeta b/Assets/Shaders/TestCube_FS.shshaderb.shmeta index 0e7e4bda..42f270af 100644 --- a/Assets/Shaders/TestCube_FS.shshaderb.shmeta +++ b/Assets/Shaders/TestCube_FS.shshaderb.shmeta @@ -1,3 +1,3 @@ Name: TestCube_FS -ID: 47024851 +ID: 37450402 Type: 2 diff --git a/Assets/Shaders/TestCube_VS.glsl b/Assets/Shaders/TestCube_VS.glsl index 49f107dd..7b58d1cf 100644 --- a/Assets/Shaders/TestCube_VS.glsl +++ b/Assets/Shaders/TestCube_VS.glsl @@ -14,14 +14,13 @@ layout(location = 8) in uvec2 integerData; layout(location = 0) out struct { - vec4 vertPos; // location 0 + vec4 vertColor; // location 0 vec2 uv; // location = 1 - vec4 normal; // location = 2 } Out; // material stuff -layout(location = 3) out struct +layout(location = 2) out struct { int materialIndex; uint eid; @@ -37,14 +36,10 @@ layout(set = 2, binding = 0) uniform CameraData void main() { - + Out.uv = aUV; Out2.materialIndex = gl_InstanceIndex; Out2.eid = integerData[0]; Out2.lightLayerIndex = integerData[1]; - - Out.vertPos = worldTransform * vec4(aVertexPos, 1.0f); - Out.uv = aUV; - Out.normal.rgb = mat3(transpose(inverse(worldTransform))) * aNormal.rgb; - Out.normal.rgb = normalize (Out.normal.rgb); gl_Position = cameraData.vpMat * worldTransform * vec4 (aVertexPos, 1.0f); + Out.vertColor = vec4 (aVertexPos, 1.0f); } \ No newline at end of file diff --git a/Assets/Shaders/TestCube_VS.shshaderb b/Assets/Shaders/TestCube_VS.shshaderb index 03e23af37451b6c4c0791110541c7b6e31d07bbe..e070a9a6e4478efc121bc03a322dd966e0b786cd 100644 GIT binary patch literal 2501 zcmZ9M+foxj5QYZ`LB$iIf{GYGMFsJEL_q}&XaFsc+tgID;#Mu2)MmlMm9L=B`rQnNp(&C-GBG=O!ube_hI8!U+>g_F+JvpIcC-~lNmC-vKTXH%5JaLHfwX8 zv^jVG!EGqVO`l`JIiVk`B-yoLj6NvAdRB5ya!E2Lc_euzsY%u(efsrk|D!}DRZy+f zs~a2D+Ut6w-L7}iZ&6T>!Z@fm!z5^=;eG(`P=Oc5jcBh~B=n0>tfgOPg%3Xaw zNYbTN)Jk-ISrKr!&)&W<#Bhg=z0~R4#eUp&`f2H`vKcU5-?eFwgf?1@o55G-D>)ze zg0R`;a@Q!_`JC45w;;*b)XO{Rth?HD#(;aXov6MVcTyWS0-sjCe)pDPoCZ5VvTRc; zOWDjSPW<;lvaMUW5@gNnf9N^AL?fJa=SvzO<64 zxs}+s^Qo2WW?bgUX4lpov6b9>*>zED)LCg`RDh~Y}2WWxmF_>Dw^aRXX zfSF@rW^&9-<3A)>(J8ze3l7WM$cK&H+sKKHxAZo2Y|L&|9^VK2{_UpZW37mVjhy`s zXB;q`lLu`2z@3e}#Q8h%&XWi5gfNRc^XA+!tEuF^T`&uOO?&Z;cxNzo8P+MBGa&>< zKP#=Qy&@S=JavJ|59TewaL0xDCgEVO2p`c-F6{F;_V0K`_^9J$?=q9)W3urs#2?Rf z@(~ZF@7_Noo&5O8H>|xPVU6ph`QAALd*&;Nm&M>CCz#nGkFQ}wI*S@cwR0YM;Debh zU&96I#Ny{oE^6m2-h_DG7cO?jarBzrGKXO7#NW|Q4cLhXGoSw6_j29y z9|}_=7(SSJ#m2im)lS`sgkM2w8 z8)uM%{ydOi_xQ1Ndi6^&_@7ANV24AGo=fP@2XW}lVs6vcwY|t~^uY68<~I8AUfrXA zuO!63kl?4!Kb05Xl7#c&a0mMSTEgu5w+6%WwY`yEtgR}HjpgfDk&dlc+iGqr*7jC5 Y;^E_`Hebg(>CA|)0}TJ4vObpl2LeRA7XSbN literal 3305 zcmZ9O`*svX5XL*%OOODH$VJ7to1mi6cmqU{OUz{xS+a`>@y^=p4$J85Y|iW?f`9o6 z`ba*BkKsR@4h2Rrrc3?+>LX{opjSeoSSv^ zY;U!<+e?#luypD2M^H|`ccVo$t#k#Bo`&`OFomVOYTb`R`fTm z{U0T&Dyr4)wK|^n)NtyW@$lYKBqE{=qX2wZ!9O z)dI%avqGfPM{sI6*t_FX?ZkWS{Zc#_v*&kwJPcxJu2sC} zoOEi!<~?U6i-pZB<7Y70jc=e;hS{1$&+Ix%O&Y-mTQrCI2_GxmI86HC7qw8H_pc@zF6X~Z@q*jKc} zrDo!>`Ch>Af36)qe(JrUowLB~ymjfu-zGbHl;(yfM$aH#^|F$&?3}5cA zx}T+U2Hz&qGs}0%+%xMp6oCx~KQnh$!dxk$};B(h^CCm>t@AiR&`M9eZ8rnaUfUykYKN?{4#;}hI zj6QXBo2GXD0VWkl>@ zyW2JC-0hfNh`W9%p=NU7+bMc*T{=GQLTxuCV62XQ$>_^12{^(c4|lbgW$DC#Tg+F| z!4Vd|a?FZsV!$kBRXRArvY4*!z_+y~xg{YtTzj{c^mPgSrQQt*T<~SZ^4)zcpW0a;_gT%jv9%B2WD{{=@z#o-Qv2^iR0eH!2`27xGUY_ zxL;HDHxh8`({_P@v#d|NHTT~sur=*)t)_d@EqA#GyTXZKQ4>5ci~Cl(#g%*Top3vg zICx+d_kAg@+=CyAIO_pCFnaJndtc%u%(l(*puo)zWM7p0tr+I}p#%=N&Bai9`FnmO z8;oV|5lRQ6hlc%HVAN;d^Ka6LhmXJfJx8)RACA4_NIJjCvl4oP4ezN=x+?h}iWKt; diff --git a/Assets/Shaders/TestCube_VS.shshaderb.shmeta b/Assets/Shaders/TestCube_VS.shshaderb.shmeta index ad3a1725..b133437b 100644 --- a/Assets/Shaders/TestCube_VS.shshaderb.shmeta +++ b/Assets/Shaders/TestCube_VS.shshaderb.shmeta @@ -1,3 +1,3 @@ Name: TestCube_VS -ID: 40523220 +ID: 41688429 Type: 2 diff --git a/Assets/TD_Checker_Base_Color.shtex.shmeta b/Assets/TD_Checker_Base_Color.shtex.shmeta index c25ba444..8c0d5b77 100644 --- a/Assets/TD_Checker_Base_Color.shtex.shmeta +++ b/Assets/TD_Checker_Base_Color.shtex.shmeta @@ -1,3 +1,3 @@ Name: TD_Checker_Base_Color -ID: 55706287 +ID: 51995224 Type: 3