mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

crystal:: celldist(ance) gives precise distance, heptdistance gives imprecise one

This commit is contained in:
Zeno Rogue 2018-12-04 21:16:39 +01:00
parent 05df60ae70
commit 5221ac07a3
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cell.cpp
View File

@ -1713,6 +1713,7 @@ cell *heptatdir(cell *c, int d) {
int heptdistance(heptagon *h1, heptagon *h2) {
// very rough distance
int d = 0;
if(geometry == gCrystal) return crystal::space_distance(h1->c7, h2->c7);
while(true) {
if(h1 == h2) return d;
for(int i=0; i<S7; i++) if(h1->move(i) == h2) return d + 1;
@ -1723,6 +1724,7 @@ int heptdistance(heptagon *h1, heptagon *h2) {
}
int heptdistance(cell *c1, cell *c2) {
if(geometry == gCrystal) return crystal::space_distance(c1, c2);
if(!hyperbolic || quotient) return celldistance(c1, c2);
else return heptdistance(c1->master, c2->master);
}
@ -1758,6 +1760,8 @@ int celldistance(cell *c1, cell *c2) {
return 64;
}
if(geometry == gCrystal) return crystal::precise_distance(c1, c2);
if(masterless || archimedean || quotient) {
if(saved_distances.count(make_pair(c1,c2)))

1
hyper.h
View File

@ -4147,6 +4147,7 @@ namespace crystal {
extern bool view_coordinates;
color_t colorize(cell *c);
int precise_distance(cell *c1, cell *c2);
ld space_distance(cell *c1, cell *c2);
hrmap *new_map();
void create_step(heptagon *h, int d);
void build_rugdata();