mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-09-27 21:58:13 +00:00
Code Issues Releases Wiki Activity

rogueviz::flocking:: no more using pat

Browse Source
This commit is contained in:
Zeno Rogue 2019-04-21 20:48:15 +02:00
parent 0509c82b54
commit 3e5fe01597
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rogueviz-flocking.cpp
View File

@ -119,8 +119,6 @@ namespace flocking {
monsat[m->base].push_back(m); monsat[m->base].push_back(m);
} }
for(cell *c: currentmap->allcells()) ggmatrix(c);
lines.clear(); lines.clear();
for(int i=0; i<N; i++) { for(int i=0; i<N; i++) {
@ -143,8 +141,6 @@ namespace flocking {
hyperpoint coh = hpxyz(0, 0, 0); hyperpoint coh = hpxyz(0, 0, 0);
int coh_count = 0; int coh_count = 0;
m->findpat();
for(auto& p: relmatrices[m->base]) { for(auto& p: relmatrices[m->base]) {
for(auto m2: monsat[p.first]) if(m != m2) { for(auto m2: monsat[p.first]) if(m != m2) {
ld vel2 = m2->vel; ld vel2 = m2->vel;
@ -205,13 +201,14 @@ namespace flocking {
vels[i] = max_speed; vels[i] = max_speed;
} }
pats[i] = m->pat * spin(alpha) * xpush(vels[i] * d); pats[i] = m->at * alphaspin * xpush(vels[i] * d);
fixmatrix(pats[i]);
} }
for(int i=0; i<N; i++) { for(int i=0; i<N; i++) {
vertexdata& vd = vdata[i]; vertexdata& vd = vdata[i];
auto m = vd.m; auto m = vd.m;
// these two functions compute new base and at, based on pats[i] // these two functions compute new base and at, based on pats[i]
m->rebasePat(pats[i]); m->at = pats[i];
virtualRebase(m, true); virtualRebase(m, true);
m->vel = vels[i]; m->vel = vels[i];
} }