From 8db5b0868ff273fdf3803ea26f67aea80d1e0131 Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Sat, 26 Nov 2016 14:43:24 +0100
Subject: [PATCH] Scale point size to match camera distance, base point size on
 particle mass

---
 computenbody/computenbody.cpp               |   6 ++++--
 data/shaders/computenbody/particle.vert     |  13 +++++++++++--
 data/shaders/computenbody/particle.vert.spv | Bin 1468 -> 2304 bytes
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/computenbody/computenbody.cpp b/computenbody/computenbody.cpp
index a2415a73..24e41df3 100644
--- a/computenbody/computenbody.cpp
+++ b/computenbody/computenbody.cpp
@@ -27,7 +27,7 @@
 // Lower particle count on Android for performance reasons
 #define PARTICLES_PER_ATTRACTOR 2 * 1024
 #else
-#define PARTICLES_PER_ATTRACTOR 8 * 1024
+#define PARTICLES_PER_ATTRACTOR 4 * 1024
 #endif
 
 class VulkanExample : public VulkanExampleBase
@@ -56,6 +56,7 @@ public:
 		struct {
 			glm::mat4 projection;
 			glm::mat4 view;
+			glm::vec2 screenDim;
 		} ubo;
 	} graphics;
 
@@ -371,7 +372,7 @@ public:
 			vkTools::initializers::vertexInputAttributeDescription(
 				VERTEX_BUFFER_BIND_ID,
 				0,
-				VK_FORMAT_R32G32B32_SFLOAT,
+				VK_FORMAT_R32G32B32A32_SFLOAT,
 				offsetof(Particle, pos));
 		// Location 1 : Velocity (used for gradient lookup)
 		vertices.attributeDescriptions[1] =
@@ -703,6 +704,7 @@ public:
 	{
 		graphics.ubo.projection = camera.matrices.perspective;
 		graphics.ubo.view = camera.matrices.view;
+		graphics.ubo.screenDim = glm::vec2((float)width, (float)height);
 		memcpy(graphics.uniformBuffer.mapped, &graphics.ubo, sizeof(graphics.ubo));
 	}
 
diff --git a/data/shaders/computenbody/particle.vert b/data/shaders/computenbody/particle.vert
index d16b4ae1..4bdeb92e 100644
--- a/data/shaders/computenbody/particle.vert
+++ b/data/shaders/computenbody/particle.vert
@@ -3,7 +3,7 @@
 #extension GL_ARB_separate_shader_objects : enable
 #extension GL_ARB_shading_language_420pack : enable
 
-layout (location = 0) in vec3 inPos;
+layout (location = 0) in vec4 inPos;
 layout (location = 1) in vec4 inVel;
 
 layout (location = 0) out float outGradientPos;
@@ -12,6 +12,7 @@ layout (binding = 2) uniform UBO
 {
 	mat4 projection;
 	mat4 modelview;
+	vec2 screendim;
 } ubo;
 
 out gl_PerVertex
@@ -23,6 +24,14 @@ 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_Position = ubo.projection * eyePos;
+
 	outGradientPos = inVel.w;
-	gl_Position = ubo.projection * ubo.modelview * vec4(inPos, 1.0);
 }
\ No newline at end of file
diff --git a/data/shaders/computenbody/particle.vert.spv b/data/shaders/computenbody/particle.vert.spv
index 5a113e4ed411558bc1c413cf0d74028baf189871..b3da09be445ce4afb1603b3be05a0c8fe5fd6381 100644
GIT binary patch
literal 2304
zcmZ9N+foxj5QY~>0FQ`>;0Y7(jG`baiV6WWs8LSBZ7PtdxEeOpX7O~zjaA<I48Dmk
z;j4IKmH)TdhSf=Rru(12r+d0P(9u59<#}!TbbD)FYxR2VvOVvR*BS4{(rRg}8CAz7
z@7#iM)a!_eaC*E0v7XWQR>co64oXf)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)O9K5XZ<qfQ?KE2wT+o2!17K7Nl&kuB6%*l9X
zwY$$Q2Jk;Gdu?tpj*rgT4ja6X@OwD%w;EMf|KPii(#aP-^=fX0&IMI}OFDPvweM^+
zq<4Db(v$mKb-ob>E{t(%-q?wXq3Y&>D9I-i_rVX=U0vr3Vp1#Cq1LvCkq;PqQ8D3>
zOEG!#kaX69Y<pKWwzGToNX%%(F^-1JJC^d}{<I%9ezOwt!w+oVuZ58dyj=<TS*^$~
zFKk%CG8@eDr#6;9=gcNHar(r9m)D(4H~L9wo!WDf0rANNo4Fg(H?=V=C!1dazTne|
z%^ZRC%cib53Gqe~`*6zU?jsVd0{0!2f^RE_Ok6*Uhd=mn$-!Sgrs4NV=WaN}$7W8!
zh~KY0Ct=}_eNsXU{0FqdwRmTwa~CqG^K*&L`>6-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!rJ2RVRo2lXD2<R!%54r+fv0&a0GNhc1yusD~c
zgB$0nbU5_KIM<|u8|S)oIP}aoH>86vsS?!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&V<B4>9)10TW!L1I@q~ix}
zensi{rSo5q4gM{eujkV71;>xMeIZHDEjB#PnYove|NB%*aC$(mUrDI1)#9~uIN;o~
ksC`L79QsXtu;Fpe?_*WM?=zkMn*@iyEFJrge!)|czr(Pb^#A|>

literal 1468
zcmY+C*>2N76o!W^ZK2RoN*A``G%Z^pRHz^%#FE~)7m+Ab^wx5lQ81)-<T!x1;uYYL
zcq(p?_`iuK3KN~2bN>0y>Zw+mv&Nj$Z_Ye6<FjNc@{O4{Gfsz{qfTpBbX$8*cVR4;
zsw2W#H0PaN)BjnVq&OEOmnByu+mfn&73tp!sEHqTqW1g!XlMs<9v3zmevG>|kFt|b
z_OuxO&(T$q_M(2A_C|5fMte_o2l44=Q&*<xnsxO$ry9L}bZGNqn-}(*T%lteo4ah7
z6iJo}oppR>aCnjyN6B{!udaTXfkR$q$woz(s~4LV$^l+;^CjuA?K@u8T$lc^|JK#S
z<_z+TsVF(Ysd<)lZU0MRzsjcGP3h4|=JK+$Bz0xXfe_~6%#YOsBM%rlR1SFTIaF`-
zydmM>^DXe<9?19o)tz6T_)Ym7>UxeIh|A~W$T1y<Puv@cj|1~@^hPe<8?$aoIP`|!
zkobG%_q{I*1#c(^uMT@v){Jx@SyMc9@Ocj#`ezRw3*_@ci3NXA`g~uo75VHikkIo^
z>0g}k$$d$p(<a}73}V5_htIyjxL=Yc7d>!~&;G%vw=5k<IMl<xD)I3vvf+~7_p>gW
zvo8KMX>$8{*)14C{TtHk37q=)>==yuTcr)3{WYbj<?C<Bran0F_<R#E`hj~_V$6@%
z<a;EGSbBP<mq8tR<ADDW!h31!pIt3V*grddB?dnG<(}DBCG3lxye#Xjl{kEMjSrt$
zcq`1uj^H!bZ3(#N1hU~!({mcK1IaJtA!buT95@{2zawGxcj7Sjy%Lj}VE0Rm{dnGk
s5@Q#K+6=qdkq{4`dv^F!dAWNip*|dXW~VI)dtxr;#)tP;U*fssAJAiBa{vGU