mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 05:52:59 +00:00
Code Issues Releases Wiki Activity

slr:: virtualRebase

Browse Source
This commit is contained in:
Zeno Rogue
2019-08-24 20:29:32 +02:00
parent 47d309e408
commit 2acc866958
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
geometry2.cpp
View File

@@ -244,6 +244,28 @@ struct horo_distance {
}
};
template<class T, class U>
void virtualRebase_cell(cell*& base, T& at, const U& check) {
horo_distance currz(check(at));
T best_at = at;
while(true) {
cell *newbase = NULL;
forCellCM(c2, base) {
transmatrix V2 = calc_relative_matrix(base, c2, C0);
T cand_at = V2 * at;
horo_distance newz(check(cand_at));
if(newz < currz) {
currz = newz;
best_at = cand_at;
newbase = c2;
}
}
if(!newbase) break;
base = newbase;
at = best_at;
}
}
template<class T, class U>
void virtualRebase(cell*& base, T& at, bool tohex, const U& check) {
if(prod) {
@@ -257,6 +279,10 @@ void virtualRebase(cell*& base, T& at, bool tohex, const U& check) {
base = hybrid::get_at(w.first, w.second);
return;
}
if(sl2) {
virtualRebase_cell(base, at, check);
return;
}
if((euclid || sphere) && WDIM == 2) {
again:
if(euwrap) for(int i=0; i<6; i++) {
@@ -326,23 +352,8 @@ void virtualRebase(cell*& base, T& at, bool tohex, const U& check) {
at = bestV * at;
}
else at = master_relative(base, true) * at;
if(binarytiling || (tohex && (GOLDBERG || IRREGULAR)) || WDIM == 3 || penrose) {
while(true) {
newbase = NULL;
forCellCM(c2, base) {
transmatrix V2 = calc_relative_matrix(base, c2, C0);
horo_distance newz(check(V2 * at));
if(newz < currz) {
currz = newz;
bestV = V2;
newbase = c2;
}
}
if(!newbase) break;
base = newbase;
at = bestV * at;
}
}
if(binarytiling || (tohex && (GOLDBERG || IRREGULAR)) || WDIM == 3 || penrose)
virtualRebase_cell(base, at, check);
break;
}
}