From 2b11045331e500cc4726f73b2d157e758970ed74 Mon Sep 17 00:00:00 2001 From: blackhole Date: Fri, 16 Sep 2022 13:48:19 -0700 Subject: [PATCH] Example 49 - hextile (Changes to fix regular tiling (tiling rate) to match hex tile rate) (#2924) --- examples/49-hextile/fs_hextile.bin | Bin 0 -> 8741 bytes examples/49-hextile/fs_hextile.sc | 16 ++++++++-------- examples/runtime/shaders/dx11/fs_hextile.bin | Bin 8733 -> 8741 bytes examples/runtime/shaders/essl/fs_hextile.bin | Bin 8097 -> 8061 bytes examples/runtime/shaders/glsl/fs_hextile.bin | Bin 7658 -> 7628 bytes examples/runtime/shaders/metal/fs_hextile.bin | Bin 6873 -> 6819 bytes examples/runtime/shaders/spirv/fs_hextile.bin | Bin 7983 -> 7895 bytes 7 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 examples/49-hextile/fs_hextile.bin diff --git a/examples/49-hextile/fs_hextile.bin b/examples/49-hextile/fs_hextile.bin new file mode 100644 index 0000000000000000000000000000000000000000..30c4e7f669d3e474828830b87aac9fb6dac1a470 GIT binary patch literal 8741 zcmeI2O=x9j8OPsylH8=Xr4vS4rV%mCau94MVkOev)1=8XP$y-+n2IvCD2O1`jKUxy zmn@>9D5want_GaVEM2&ql3l^UZv3oU1rc1#!ln5Cz32U(dG5(QjsX`geBqqu+~?!} ze7w*5-uIql=hDlM{`!v}{BhElOG{t7{^slZuYdW*X?+~PON%$Ie|7)n_0K<}kA0lq zKb_J`*EYBQ{L7zz@+()~xOwZsjX&M`&U=4DAK9GfM|Ay6*L%8lFP*>eMN#-mx?a`A zKp!6Cl&;U{g2#Z*^Ws9ohsS_l6?*CF^;h>U?Oxv9yO1t#U)$Q-yZBPNbLY;U{NW#a z{H^Npi2h`M`NfOpw=c`+(#zY|($h_BwT!;>?KF5TrTLxjuVz!QK8^d&E$7eI&ZPPD zX7haIN=k1mr@4#E%h~4_q<4R{kty%$F(rG;~;;T;yePbj?2!dscFW?XKAI;DHR zdgXb^7j3gs^lpzDjEHC1vjGnb#zw&XaGIYxTX1ICZ>RL#qm(9FSDr}srAN-j-uY(Z z*ZE`L>O9`)s*47*aC>+|=YBTCi0(m&ksQ|7*T-KkwPW5LkMxE|(t|ggU!J@u%J_zK z&A+Xx1TAx4dV>Ui(SF!>;MIX*}u&9`PaX;t`ko8j3FS z=eiRI`N3N&&(y^{{5pU0j>H3(bqdAyoOq5MYF_jYZ z)coQPoNgV&YUimBkF_AXDLnfz9uz%|c0Mh0jiSsv&uN_JC<8Fgb3exaPQNTF$Zo&D zqo16c`vtyuxwbsJUwEcp%wztFZp))z;L$JEqhIFW7253=WTPVcZ}iJ7y#M!0N^yTt z$@9FMdLQxr!uj84X74ZX+%G)3U*Nl6cy_<=Ouv{%zZBh;N58+&M!at7_fK@R^o;tVc}f!|U#Y z;+;57@1e8ew2V0MMSRY$s%M_Lb4*dsagr~#P{%pab5-lsQ%~gBn8td-qsCF@dg7mY zBCBfM%IMY;J?aTnOha-kxb40!Q9hU14^WPYnw^%-qk(s*&wNk0o>BJOa-NeopB+86UY zJ6HSr-rvuj=dwS3@7Uh9lFiHsj96Rg=h{+pjT6_FJ-x5C$TTu0_{3)F+7dT)M+SXZ zZKK}5tF851Td-%+y4j@4G|oU18%)Q^60ZIB)6Gy9)w z8)ft@GL0Mu5A>XMp!6-ZWsOpcvQ~57BCl%R2~78G)T6f6>-MenTwC;9Tb|vwJfmxz zzS>4TnY1}!%P@x5BK7t6o;~lYu@~jxv-t9PUXjyj)w%Mur&(Dr6#!XIftwkBJSw z>#;Y}!(Nl}`@)0k!J6glRMon5hWjF)afJhQ-%@X|O&_)#Q!9;`F;Z`2?%9=+M|a(!6xSV}`_>&Y=jd8Moe$>?Y5^SFKWl%HQto7KKPwk@(_3g?AH5zrz-*UP#YSHCcUwP#BnOMuu)c)pN?BB8T z4$pYzHF(WCJnIYcSl;&QcfLJ1HMW~2?`a>CvH#X1o&0?OrJfAOL5#LH&p6E8!Ib{w zu1wolH#&at=UUj0u?lv64{m?x%n1-3DE3h%R@(=zmEVgZn`LkRj?H$C%{H6 zkvU(m8I}>7Wf7b81vb?AlZ*X=gUmMl{wL#p|IJ+fC;rLpVg6ks*QDfF$Jjdg*W?B^ z!?{7b`EM5g#&-U;>DdqRT6Ek{^o#|DdHdy=eJJw0M?tYYiQdC()pJX(*`SsKjnQN^ xQ*OMEcfR&*OviYjxZySSld=EqPMp?-V&Bze58y)P|54b{{))c7v_+QFzW}M_M!Nt2 literal 0 HcmV?d00001 diff --git a/examples/49-hextile/fs_hextile.sc b/examples/49-hextile/fs_hextile.sc index aabf3fb36..65c888205 100644 --- a/examples/49-hextile/fs_hextile.sc +++ b/examples/49-hextile/fs_hextile.sc @@ -196,19 +196,19 @@ void FetchColorAndWeight(out vec3 color, out vec3 weights, vec2 uv) void main() { + // actual world space position + vec3 surfPosInWorld = v_position.xyz; + + vec3 sp = GetTileRate() * surfPosInWorld; + + vec2 uv0 = vec2(sp.x, sp.z); + if(u_useRegularTiling > 0.0) { - gl_FragColor = vec4(texture2D(s_trx_d, v_texcoord0.xy)); + gl_FragColor = vec4(texture2D(s_trx_d, uv0.xy)); } else { - // actual world space position - vec3 surfPosInWorld = v_position.xyz; - - vec3 sp = GetTileRate() * surfPosInWorld; - - vec2 uv0 = vec2(sp.x, sp.z); - vec3 color, weights; FetchColorAndWeight(color, weights, uv0); diff --git a/examples/runtime/shaders/dx11/fs_hextile.bin b/examples/runtime/shaders/dx11/fs_hextile.bin index c499e4d0bae0f146db8d91bd168e17310546608a..30c4e7f669d3e474828830b87aac9fb6dac1a470 100644 GIT binary patch delta 1874 zcmaJ?%}Z2K6hHTk^Yy5iar8NkPv=9)KngLj#IW}oKNfuD&(F->Tf21U^V-AB9|8cjS7&buSbaa81Y}KN#g@IolJlZ<;Uqxx z1Z1!Vu$0LF@rMBt6|dIeln7Ew*Z?0tTo^?>&U+?3-gDj62XB-MyQ2ExyQn62GClQLdYJTgGM9yNbz>RHnwU2prnfbXht-Xr ziNdXKMLk(QNV$~#w5w5{ZFw1#>@^(aRg=@rbuMSu#jK7K=F;w}T&fsa)v-uUurmx*> zCTR+c4pDU_H%t?;<+hv@o!5^OKB>9gQsBhH6(>b?sXUB0O}NXHwa#NhMB#bp*m1?P z-kiGkBv-;HgKnzHR5Yj3=?F1!0(CMZ!OehnG9Q9OYJ_r#g$PKm_Tq6^Eth7}_6 ccA>4s;(v%;ae1qdmw(FnL*#V^2Lbf`2iat%BLDyZ delta 1818 zcmb7FO=uHQ5T4y_(0#o3=TK;va%oEK(?xo}>yw56x1= zLxk4ypeH@*q2MVOQBdejJy;Yx2#Oak9y}BgPvXpbJMCsm1>YfW_nU9NZ)V6lc<4 z45ZVbBQgtMY+Gr30+<8P6Jp8E)<--`BJ@*&HX{y-F$r*g6Tln4Y{IsW)qJJelH$O1 zwVwoN-{B+`mI2TRAHZCy@E+#UehMI3^|8EXiHBOQPI%47p2QU|n9H&Mz#{BX3G_$# z%f6510t^lgI*S0}nckVB8ZaKheW(w6qdaM#2ay;KZVh#kbKD+8mlGO?1(H;0U; zMvQ0`GH8B}tZJIpT#WYVxNXFb>bpVlDN&MsXVHf0jA9yWacZXXHsv%@Q>Y*ssd6*c z)vxsiOCZ}A=A-~RGXAqFWja$ZiTSbJmqms=0Jir6mPR0GjfNpx$7gR5f!`Lt>j6OBXXkpIKT$}^sq7(;tfW>UHK#aLp?dOE#xh33$vjL}%!YaulLfg&CdV>;V>H|x!u+2H SL3^n{_;{XV2!m3sX4`| z3e{jU;Px0#=3|tacu;L}31cyLyh0x1LL|2!Z{Kmf#Z L6a-U2LfX6llT$jT diff --git a/examples/runtime/shaders/glsl/fs_hextile.bin b/examples/runtime/shaders/glsl/fs_hextile.bin index 2d8c2f0286f77ddd55fbc6a577b327173427ffac..ee1b998d415ec52f2ed5f0b4f37fbbd2c2723a64 100644 GIT binary patch delta 90 zcmaE5ea3o%vGf#K28Oc4qRPy?bcM3iWMhT0_=5c6%#zIfyonjE{9vJy+ybDIctdNh k$uf+_6W2OQz(n*asx+;+6clO|Qgez^6{4=`);0I65}p^QMvK@dz$6LRJN0PUX~m;e9( delta 132 zcmZ2%ded}5Dr3&Xw4cffK#-P`pIBm~P!?a3T9KTeUzB2?5FK4woLZ!jlb@VtI5~>( z{p58_@w}ONdI&X>1(-FNEsQKC`!hvN)@7Drw3zI{ti)(BiA9XlT)|dBBOWNZxrcDF z3$+(4qMbiM>;+>`@Y|4kuy1E)W^ec2ZS}o!S#(#;U^$=GfYghlo&95=ewvqe(VA<; zBdK4{wWFLr7uWsJHJ0S7m6A3+>4toQ`Gu&^o+fX>n|7wbUcC*z#%KHm+&G?ja2L+B zTHjXy8*eA!ihT~NR`Cr<2MQp~Y+|y^0ytTwjXPOp5#F>1nm_nR32fXw_*ZDB{zKOPfle*8r45a^FKTQ delta 479 zcmXw$ze~e#5XJACG%;Ens)%5rZVvvcSV3x2p@Vd_i;kt(3L;t%6$?TpHxcW1b#M|C zL?qy#PF(~S-CP|C{sV$qZ1KI21}^vRb1!%KChytX#nY7fs?RMAI}#BIVym>V4Jp5d zNV|S~7qg@dxnJC^9IREVJLMU@pl*7}60j-%LzxlP&`oP%=nqf>m1COesL~YQfK55|Kjuh!N!O z{4yBkd%=PiJkVWGL4(aBEa1X*=u5l+`3cwv*gSL#jJ-nWOGA_M>atA8V3lR~cu*IN zUiNaL)6Q&+$P2&2Bebgzol)ib=T6>KDZd$w+sZu~cvY@`jB=z3zzVwu!WiTFR2Bufea