mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-07-05 19:22:48 +00:00
Code Issues Releases Wiki Activity

fixed Euclidean celldistalt

Browse Source
This commit is contained in:
Zeno Rogue 2020-05-29 01:52:47 +02:00
parent 98b1e659a5
commit 4f1742f21f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cell.cpp
View File

@ -511,7 +511,7 @@ EX int celldistAlt(cell *c) {
return celldist(c) - 3; return celldist(c) - 3;
} }
#if MAXMDIM >= 4 #if MAXMDIM >= 4
if(euc::in(3)) return euc::dist_alt(c); if(euc::in()) return euc::dist_alt(c);
if(hyperbolic && WDIM == 3 && !reg3::in_rule()) if(hyperbolic && WDIM == 3 && !reg3::in_rule())
return reg3::altdist(c->master); return reg3::altdist(c->master);
#endif #endif

6
euclid.cpp
View File

@ -339,6 +339,10 @@ EX namespace euc {
} }
EX int dist_alt(cell *c) { EX int dist_alt(cell *c) {
if(WDIM == 2) {
auto v = full_coords2(c);
return euclidAlt(v.first, v.second);
}
if(specialland == laCamelot) return dist_relative(c) + roundTableRadius(c); if(specialland == laCamelot) return dist_relative(c) + roundTableRadius(c);
auto v = cubemap()->ispacemap[c->master]; auto v = cubemap()->ispacemap[c->master];
if(S7 == 6) return v[2]; if(S7 == 6) return v[2];
@ -393,6 +397,8 @@ EX namespace euc {
EX int celldistance(cell *c1, cell *c2) { EX int celldistance(cell *c1, cell *c2) {
auto cm = cubemap(); auto cm = cubemap();
if(GDIM == 2)
return dist(full_coords2(c1), full_coords2(c2));
return celldistance(basic_canonicalize(cm->ispacemap[c1->master] - cm->ispacemap[c2->master])); return celldistance(basic_canonicalize(cm->ispacemap[c1->master] - cm->ispacemap[c2->master]));
} }