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

findbaseAround for all binary tilings

This commit is contained in:
Zeno Rogue 2019-03-17 04:08:17 +01:00
parent 608692b6df
commit 378d21b509
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
binary-tiling.cpp
View File

@ -525,6 +525,16 @@ namespace binary {
ld co = vid.binary_width / log(2) / 4; ld co = vid.binary_width / log(2) / 4;
return hr::parabolic13(y * co, z * co); return hr::parabolic13(y * co, z * co);
} }
// on which horocycle are we
ld horo_level(hyperpoint h) {
using namespace hyperpoint_vec;
h /= (1 + h[DIM]);
h[0] -= 1;
h /= sqhypot_d(DIM, h);
h[0] += .5;
return log(2) + log(-h[0]);
}
hyperpoint deparabolic3(hyperpoint h) { hyperpoint deparabolic3(hyperpoint h) {
using namespace hyperpoint_vec; using namespace hyperpoint_vec;

37
shmup.cpp
View File

@ -1035,26 +1035,33 @@ typedef multimap<cell*, monster*>::iterator mit;
vector<monster*> active, nonvirtual, additional; vector<monster*> active, nonvirtual, additional;
cell *findbaseAround(hyperpoint p, cell *around) { struct horo_distance {
#if MAXMDIM == 4 && CAP_BT ld a, b;
// this needs a more precise algorithm because the cells have curved faces horo_distance(hyperpoint h1, cell *c) {
if(DIM == 3 && binarytiling) { if(binarytiling) {
hyperpoint h = binary::deparabolic3(inverse(ggmatrix(around)) * p); hyperpoint ih1 = inverse(ggmatrix(c)) * h1;
if(h[0] < -log(2)/2) return around->cmove((h[1] > 0 ? 1 : 0) + (h[2] > 0 ? 2 : 0)); b = intval(ih1, C0);
if(h[1] < -1) return around->cmove(4); a = abs(binary::horo_level(ih1));
if(h[1] > +1) return around->cmove(5); }
if(h[2] < -1) return around->cmove(6); else
if(h[2] > +1) return around->cmove(7); b = intval(h1, tC0(ggmatrix(c)));
if(h[0] > +log(2)/2) return around->cmove(8);
return around;
} }
#endif bool operator < (const horo_distance z) {
if(binarytiling) {
if(a < z.a-1e-6) return true;
if(a > z.a+1e-6) return false;
}
return b < z.b;
}
};
cell *findbaseAround(hyperpoint p, cell *around) {
cell *best = around; cell *best = around;
double d0 = intval(p, ggmatrix(around) * C0); horo_distance d0(p, around);
for(int i=0; i<around->type; i++) { for(int i=0; i<around->type; i++) {
cell *c2 = around->move(i); cell *c2 = around->move(i);
if(c2) { if(c2) {
double d1 = intval(p, ggmatrix(c2) * C0); horo_distance d1(p, c2);
if(d1 < d0) { best = c2; d0 = d1; } if(d1 < d0) { best = c2; d0 = d1; }
} }
} }