From a376f2d695fc2da2ed8b985a9b5d3a2315788048 Mon Sep 17 00:00:00 2001 From: saschawillems Date: Sat, 10 Dec 2016 12:03:15 +0100 Subject: [PATCH] Clamp particle size (Fixes #256) --- data/shaders/computenbody/particle.vert | 4 +--- data/shaders/computenbody/particle.vert.spv | Bin 2304 -> 2304 bytes 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/data/shaders/computenbody/particle.vert b/data/shaders/computenbody/particle.vert index 4bdeb92e..5d76cec7 100644 --- a/data/shaders/computenbody/particle.vert +++ b/data/shaders/computenbody/particle.vert @@ -23,13 +23,11 @@ out gl_PerVertex void main () { - gl_PointSize = 8.0; - const float spriteSize = 0.005 * inPos.w; // Point size influenced by mass (stored in inPos.w); vec4 eyePos = ubo.modelview * vec4(inPos.x, inPos.y, inPos.z, 1.0); vec4 projectedCorner = ubo.projection * vec4(0.5 * spriteSize, 0.5 * spriteSize, eyePos.z, eyePos.w); - gl_PointSize = ubo.screendim.x * projectedCorner.x / projectedCorner.w; + gl_PointSize = clamp(ubo.screendim.x * projectedCorner.x / projectedCorner.w, 1.0, 128.0); gl_Position = ubo.projection * eyePos; diff --git a/data/shaders/computenbody/particle.vert.spv b/data/shaders/computenbody/particle.vert.spv index b3da09be445ce4afb1603b3be05a0c8fe5fd6381..062ad754cbaada178a82906f316df61ff23f8b23 100644 GIT binary patch literal 2304 zcmZ9N*-{fx5QdKsqJrWI?ij#*K}AFq+0~$;BB-~iNKWA>%utiycEycV-ueu_i7(-+ zcw?3ScV@a6Jyhp(|EKrvg!Z<PR$KJxYoE6KCyBu)IES~S8HFUuZl?n$ zhk!?ME2}VzN3S`=qvy$HtD35BK5pf8mcksO__bftdsUsIFMT4;ykz>o=@8B9)8xT` z{)=g0-2R}K*^yV#4jH>?k@*7Kw#)p}JM^|h)qECU!a*#q*9&>r)pBI))Jk zj2oZmnNNCSHRF@rL`L_Jw9xC94ciUhE3T}&5~vjNrv|Xgvgc;|JAeHcKO(s^e`7Bz zk}VJL@m!|w#Osl~H|Xg@2Y<-jBI0AePdB<*4khK7^$>qY_1>c!o_NIX)r~H>_vJH0 z2jUH%M|Jbge8~x!UW1X-aorUWamfk!L@r~0QhcVno%3m79IIhKyxCLJSrInYvkT&# z+nO@}SAx9#el3%y`V^1(Szn1iE}8y-lRq;14`%)*#1jww$(%3FtSU@rj`v4mu(cjP z&t;n#@9YgaHbeG?`bO1b;?RE%I=_YRT|k#z;WvpJnfdYiQWs^+;q-~M~4}k&Ux|Ri>i!1UKHUQTi%%ecje04B@wxyLoM_N%xbwRo?5Pmtd=41 z;1-X6O7y_`b3;5k1a3OR;)^;ra~*JEF@q5i@r$+G%5l>f&2@_Nxh)Lb>KzkL4#dEo zcdPe~c=AVwdYM1ij3&#jPKl_O9WKshS~72z$BcMvi#oI6eY+2HlBY!(p4E6?GIquM zA4mrOmhaa?@z{dzQP0FQ`>;0Y7(jG`baiV6WWs8LSBZ7PtdxEeOpX7O~zjaAco64oXf)mL)5a4t?6S|CB>U{9>tGSeYv~-F79cM6TR? zTdBIR+}L>MHlyah93A;Vtz54JwVg`Ml_w`|ZC5tmds*F-j+s@i-HK7GmzP|)?!w4@ zk}0%>qjT11`jOuVgm%Sz-Voz{5Uu)O9K5XZE{t(%-q?wXq3Y&>D9I-i_rVX=U0vr3Vp1#Cq1LvCkq;PqQ8D3> zOEG!#kaX69Y6-DgG;T3lAggqIOEQocFyS&Ibr7| zV4M#pIzE=uMd>WFuSjo8*`w0&w;GH|_q^R1Y-&6a+xzEtTK3-gtZa*4NOXJiqHOA6 zHKYg34VcxGxgnpsdNcP>4;Gx?LYQl~%zLlI?xLRjok-i`iCvHvv3exT40G{VH)1mr zoYS8{2|cB6j}(KvPf5VPii3Sx!d!rJ2RVRo2lXD286vsS?!Uri8ok<&1uQSFW7#4~N{~@D}O^W^cJI zowv|)d&{JBaEo_WIyJER+>_2sfE#B@dYW@T;eZp1UOtczKmC^J1UJsZgp=;iBVpk7 z-pA6(ff)F6ZttCuPX2IsFY^IbP-mIdISKEbm85$!FPk&V9)10TW!L1I@q~ix} zensi{rSo5q4gM{eujkV71;>xMeIZHDEjB#PnYove|NB%*aC$(mUrDI1)#9~uIN;o~ ksC`L79QsXtu;Fpe?_*WM?=zkMn*@iyEFJrge!)|czr(Pb^#A|>