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

faster celldistance on smallbounded

Browse Source
This commit is contained in:
Zeno Rogue 2018-04-10 07:59:48 +02:00
parent baffd5be17
commit b9062e6a07
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cell.cpp
View File

@ -1361,6 +1361,8 @@ int heptdistance(cell *c1, cell *c2) {
else return heptdistance(c1->master, c2->master); else return heptdistance(c1->master, c2->master);
} }
map<pair<cell*, cell*>, int> saved_distances;
int celldistance(cell *c1, cell *c2) { int celldistance(cell *c1, cell *c2) {
int d = 0; int d = 0;
@ -1371,9 +1373,26 @@ int celldistance(cell *c1, cell *c2) {
} }
if(sphere || quotient == 1 || gp::on) { if(sphere || quotient == 1 || gp::on) {
if(saved_distances.count(make_pair(c1,c2)))
return saved_distances[make_pair(c1,c2)];
celllister cl(c1, 64, 1000, c2);
for(int i=0; i<size(cl.lst); i++)
saved_distances[make_pair(c1, cl.lst[i])] = cl.dists[i];
if(saved_distances.count(make_pair(c1,c2)))
return saved_distances[make_pair(c1,c2)];
return 64;
}
if(gp::on) {
celllister cl(c1, 64, 1000, c2); celllister cl(c1, 64, 1000, c2);
for(int i=0; i<size(cl.lst); i++) for(int i=0; i<size(cl.lst); i++)
if(cl.lst[i] == c2) return cl.dists[i]; if(cl.lst[i] == c2) return cl.dists[i];
return 64; return 64;
} }
@ -1452,6 +1471,7 @@ void clearCellMemory() {
delete allmaps[i]; delete allmaps[i];
allmaps.clear(); allmaps.clear();
last_cleared = NULL; last_cleared = NULL;
saved_distances.clear();
} }
auto cellhooks = addHook(clearmemory, 500, clearCellMemory); auto cellhooks = addHook(clearmemory, 500, clearCellMemory);