From 25cafa33889f1806c5cc49ed9d9dc11dc50f9314 Mon Sep 17 00:00:00 2001
From: Sebastian Gaida <gaida@ca-digit.com>
Date: Tue, 22 Jun 2021 16:01:57 +0200
Subject: [PATCH] [#69] adjusted forces
---
.../particle_simulation/shaders/comp1.spv | Bin 5272 -> 5328 bytes
.../particle_simulation/shaders/shader1.comp | 2 +-
projects/particle_simulation/src/main.cpp | 7 ++-----
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/projects/particle_simulation/shaders/comp1.spv b/projects/particle_simulation/shaders/comp1.spv
index 386bd33749f3e09b1fa3bf76fff23812fd7f87c1..e328ebb349371bff7bebebd787f04a2ffca07f24 100644
GIT binary patch
delta 1941
zcmbQCc|ntxnMs+Qfq{{Mi-DKn)<)jXOo9g)7#Io?ixP7g7#LU?SQrj(7G!2-WW2dq
zlqH_ow~he}9JCo&7}yvX7+M(^7|xzKV+-R?1xq*V2l0g&7#J2ZfJ|p#fblmlFfcGN
zFfb@EurM5%e2`sO_XJpngCk7E4G^D^fkB6XjlqV2f#D_t0|Q75WYWUPj2!7;7qT-j
zFjzCNFmNz1FdW`o$sx|n>Bzv!;LpIoP(Aq}hj45Shy`{aE7+m63=9la3=9k)aa#r!
z29N>u3=9n63=9k)z6S#XLjwZ?1IXJTllT}I7#bNE7{sCCAT=O8O(5~fj6A~i&I}9;
zAQM0$%?uD*S{N7@Kta^Zz`(%6zz(*#4H^U*3=9k)c~FpnOas~2j%H&A)JBjvNDauw
zP6h@Bka!;hE7;Xt3=9mNAge(J!xVKxy#jIwNK+330|Q7QNSud(4Xm*j>JV231_qEk
z%)mYd1_qEED2QO@^)oOq#DKgCwR8dl0|Q75q}GmsnIVQDo`C@*_>+N&p^$-r;Rlok
z836LxM5xai7+4uV{7DQ93?MOY1_lO@0ibXOiGlRzLG>3fFff3^UWtK$Ve({0Ug5|o
zAQl4y!wv>kh7<+{hG`583?MO3GF!pG0v4MN75~n_%rFy_co-NMelf5xfW&7oFo4BC
zt^=`Qrq2SIUO$_GfngQ{1H&$;>2nwu7(im03=9k)cY#a;=>*YV8Q8(L&4t<qaw|wZ
z$W)k1<}olZfaF0gS%BmckobHC1_qEA$UG3+k%6_I0p!s|(3k_IZ&2WYa@Ar61_qEg
z%-c&C7#KieAa8>l1~Ujm!yL90YB|WUAoU<iU=CZxz`y{K2RUp7++p=B3?PZ+3=9k)
zL6FNpY*-kr#Nx133=9k)aaf40W?*0diNQh)W)6skIcyEoa*$&|>OppZ9R|ugYZ(|A
zKng%ETMu^`3j;`e9RmXcNDSmK5F6&OjZlYy$`V+JZDL?x0ExpwY%>D`14s-OVlZ<+
zG|XZ3TcDPMTno|wvIOih1_p+$3=9k)d62`lBRLEtzKwx_0VD=;7>EsX*bXcX+X+s+
zh%~l~fq?-erU}Zyptyt?1fpRs+YPlG<XVshkR>38>_u`2NX;Gw1_qEA$RQv$C^SI1
ze;+jW)<X-r{R|8YATd~uKfu7iupd--!O9|#rbAHIgK{UR5&-c*K0Cs|z;Kj-fx(Y~
zfx#16T7uLcgNlRHA7)@+0P!uMMa^+=`NzNjG6y6Fv-l(f0|Q77ROmM*K+Bd>3=9k)
z7l9-}hJnf*kQgX*V7>#<FyEbq`VLmEok1$sKyn~QgDQfvpo+lr9H@q3U|@hb;XDHa
z14su*9A@GLsMi~zF1pCTzyJ~hsRg+RR7qT%Y%3(s7(O{xNIDc03?T6<3=9mHp+N$w
v?XH4rB}jz=3ZiRJmpU@AGej~lFkEL~U~q>9BS>u=v@isTU)$U&B+LW=Y)1|w
delta 1899
zcmcbhIYX0|nMs+Qfq{{Mi-DKn`bOT*OoICu7#Io?ixP7g7#LU?SQrj$7G!2-WW2Un
zlqH_ox0(SA9JCo&7}yvX7@8Ou7|xzKV+-R?0!ugS2l0g&7#QX;fJ|p#fbrKdFfcGN
zFfb@EurM5)e2`sO_b6D0gCk7ERS=(%fkB6XjlqV2f#Dhh0|Q75WYWCJj2!7;7qT-j
zFjzCNFmNz1FdW!i$sx{MZ_B{K01~cYU|<MmU|<08Js21mY8e<9K%Q}AU}fNAU|^_Y
zU|<l3ii6aE^wdMec^KHi-fDn4+nIrZ0c0LXzL|j)EZ4}uzyJyckQ$i!W(J0O21W)3
z1`P%V29N?!xPS}?IiLm20j*F6fW$#+Kn`eQU|;}=_c5@7J<-m<zyK0!hI#~~rUU9R
zkV8QHP6h@BkUEe!4?{Q`SYsE|<*p123?KzC1G^a*7(jAWNCx&m4Qzy3+RMPe01^YK
zwPRoghhpz!Szc+?KByNO7+4uVUg~FHU;v4EGcYiKRD!~{e{w9Zbo~UVnf6e7K#61`
z0|Ns{d<O$7Lka@}!(;{q29Oviv8-TV0gFw6ihpNdW|#&_0t^fczZh5;K;lyw7{Fpb
z7?>D9Y*0)pF)%Pp$F!@SVFpxU7u2$u3=Ci~O$G*rpA1ZJgFu#iWnc$eJ_~Aj0RsaA
zNIl3Bn8Ri>Fff4RK@OXX<S>x<90mpkkQm5eAhshzJu3sqW%Hpf10`Be6oW!x0RsaA
zNE{Xl3mF&~Kw_X!067e15Qv63Y!TFQkYhpWL6*QAwwQr|0VEG{*ix9o>KRxVKoUzB
z7#Ki;AeVvIupnE8#bL`C7#Kj}un=3pz`y_!gM}E(91sn2*h;A7Ajg8#gX{n~tR57<
zs~8v<Kng%ETLW_$0}BI4d^H0D14s<yFc2H&uys&}feHv%h^=Q}U;v53LTm#A0|Q75
z7Gf}SKs3~0^$Z)KmV;ai(g3mq<T8-MHZd@O<v|YHg5)re_+|zM29OxYVIVflVOy~{
zY#Rdu14tYeV%r%Q7(im04E2yi1~UjmLtVzO18O<QwIB^3OF$0Uh2#*Bnw<;`3?MO(
zLqKd$Xn?Z&ZUzR17zR*511abBFfcHH#9%pmF9QR^9#BCAD|<ki_Cs9{%A}x@9mEIu
z>>vXJ!yyI+20sP{22W^K1*ty_6$hz5z`(!&;#)F6ik2e`3=BLB3=AN1KyomPk1;SX
zfaE|Wc_OSVInKbq0CEvX5@Z<2<sdOoN{9IlM8kY{0_r;+sAVUS$}x}}$kF}`3=F3x
zKjaXuKMi7m%OFT`d4_?30i**Y4m0sA)ax)8odZ=>3=9k)wICOP>Ije+NIj^kIuEW=
zAoT_)C@w(tJ2J2{L^3ciTx4KiaEAn!5CcdtDBM5>fg~<W))kUxjG62!B+VNKEflXX
NFfd%+yjMt=2>{870O|k$
diff --git a/projects/particle_simulation/shaders/shader1.comp b/projects/particle_simulation/shaders/shader1.comp
index 7b58b55f..38abe941 100644
--- a/projects/particle_simulation/shaders/shader1.comp
+++ b/projects/particle_simulation/shaders/shader1.comp
@@ -56,7 +56,7 @@ void main() {
for(int i = 0; i < n; i++)
{
- pos += deltaTime * deltaTime * normalize(max(2 - distance(pos,gravityPoint[i]),0.1) * gravityPoint[i] - pos);
+ vel += deltaTime * deltaTime * deltaTime * normalize(max(2 - distance(pos,gravityPoint[i]),0.1) * gravityPoint[i] - pos);
}
// vec3 delta = respawnPos - pos;
diff --git a/projects/particle_simulation/src/main.cpp b/projects/particle_simulation/src/main.cpp
index 17104ddf..a0dc4012 100644
--- a/projects/particle_simulation/src/main.cpp
+++ b/projects/particle_simulation/src/main.cpp
@@ -122,8 +122,8 @@ int main(int argc, const char **argv) {
glm::vec3 minVelocity = glm::vec3(-0.1f,-0.1f,0.f);
glm::vec3 maxVelocity = glm::vec3(0.1f,0.1f,0.f);
- glm::vec2 lifeTime = glm::vec2(0.f,5.f);
- ParticleSystem particleSystem = ParticleSystem( 1000 , minVelocity, maxVelocity, lifeTime);
+ glm::vec2 lifeTime = glm::vec2(-1.f,8.f);
+ ParticleSystem particleSystem = ParticleSystem( 10000 , minVelocity, maxVelocity, lifeTime);
vkcv::Buffer<Particle> particleBuffer = core.createBuffer<Particle>(
vkcv::BufferType::STORAGE,
@@ -155,9 +155,6 @@ int main(int argc, const char **argv) {
vkcv::DescriptorSetUsage descriptorUsage(0, core.getDescriptorSet(descriptorSet).vulkanHandle);
//vkcv::DrawcallInfo drawcalls(renderMesh, {vkcv::DescriptorSetUsage(0, core.getDescriptorSet(descriptorSet).vulkanHandle)});
- std::uniform_real_distribution<float> rdmVel(-0.1f, 0.1f);
- std::default_random_engine rdmEngine;
-
glm::vec2 pos = glm::vec2(0.f);
glm::vec3 spawnPosition = glm::vec3(0.f);
glm::vec4 tempPosition = glm::vec4(0.f);
--
GitLab