mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-26 00:47:00 +00:00
Code Issues Releases Wiki Activity

replaced atan2 and spin(alpha) by rspintox -- works in 3D now!

Browse Source
This commit is contained in:
Zeno Rogue 2019-04-21 20:51:16 +02:00
parent 936e7fc069
commit 7548e4903b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rogueviz-flocking.cpp
View File

@ -180,7 +180,7 @@ namespace flocking {
// distance and azimuth to m2 // distance and azimuth to m2
ld di = hdist0(ac); ld di = hdist0(ac);
ld alpha = -atan2(ac); transmatrix alphaspin = rspintox(ac); // spin(-atan2(ac));
color_t col = 0; color_t col = 0;
@ -197,13 +197,13 @@ namespace flocking {
// azimuthal equidistant projection of ac // azimuthal equidistant projection of ac
// (thus the cohesion force pushes us towards the // (thus the cohesion force pushes us towards the
// average of azimuthal equidistant projections) // average of azimuthal equidistant projections)
coh += spin(alpha) * hpxyz(di, 0, 0); coh += alphaspin * hpxyz(di, 0, 0);
coh_count++; coh_count++;
col |= 0xFF40; col |= 0xFF40;
} }
if(di < sep_range) { if(di < sep_range && di > 0) {
sep -= spin(alpha) * hpxyz(1 / di, 0, 0); sep -= alphaspin * hpxyz(1 / di, 0, 0);
sep_count++; sep_count++;
col |= 0xFF000040; col |= 0xFF000040;
} }
@ -221,7 +221,8 @@ namespace flocking {
// hypot2 is the length of a vector in R^2 // hypot2 is the length of a vector in R^2
vels[i] = hypot_d(2, velvec); vels[i] = hypot_d(2, velvec);
ld alpha = -atan2(velvec);
transmatrix alphaspin = rspintox(velvec); // spin(-atan2(velvec));
if(vels[i] > max_speed) { if(vels[i] > max_speed) {
velvec = velvec * (max_speed / vels[i]); velvec = velvec * (max_speed / vels[i]);