mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-06-25 22:52:49 +00:00
Code Issues Releases Wiki Activity

reg3:: improved strafe test

Browse Source
This commit is contained in:
Zeno Rogue 2022-07-11 17:30:47 +02:00
parent ef712a3b4f
commit 6113e0fd56
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
reg3.cpp
View File

@ -1293,6 +1293,8 @@ EX namespace reg3 {
EX bool minimize_quotient_maps = false; EX bool minimize_quotient_maps = false;
EX bool strafe_test = false;
hrmap_quotient3 *gen_quotient_map(bool minimized, fieldpattern::fpattern &fp) { hrmap_quotient3 *gen_quotient_map(bool minimized, fieldpattern::fpattern &fp) {
#if CAP_FIELD #if CAP_FIELD
#if CAP_CRYSTAL #if CAP_CRYSTAL
@ -1402,20 +1404,24 @@ EX namespace reg3 {
cellwalker strafe(cellwalker cw, int j) override { cellwalker strafe(cellwalker cw, int j) override {
hyperpoint hfront = tC0(cgi.adjmoves[cw.spin]);
cw.at->cmove(j);
transmatrix T = currentmap->adj(cw.at, j);
cellwalker res1;
for(int i=0; i<S7; i++) if(i != cw.at->c.spin(j))
if(hdist(hfront, T * tC0(cgi.adjmoves[i])) < cgi.strafedist + .01)
res1 = cellwalker(cw.at->cmove(j), i);
int aid = PURE ? cw.at->master->fieldval : cell_id.at(cw.at); int aid = PURE ? cw.at->master->fieldval : cell_id.at(cw.at);
auto res = quotient_map->strafe(cellwalker(quotient_map->acells[aid], cw.spin), j); auto ress = quotient_map->strafe(cellwalker(quotient_map->acells[aid], cw.spin), j);
cellwalker res2 = cellwalker(cw.at->cmove(j), res.spin); cellwalker res = cellwalker(cw.at->cmove(j), ress.spin);
if(PURE && res1 != res2) println(hlog, "h3: ", res1, " vs ", res2); if(PURE && strafe_test) {
return res2; hyperpoint hfront = tC0(cgi.adjmoves[cw.spin]);
cw.at->cmove(j);
transmatrix T = currentmap->adj(cw.at, j);
for(int i=0; i<S7; i++) if(i != cw.at->c.spin(j))
if(hdist(hfront, T * tC0(cgi.adjmoves[i])) < cgi.strafedist + .01) {
auto resx = cellwalker(cw.at->cmove(j), i);
if(res == resx) return res;
if(PURE && res != resx) println(hlog, "h3: ", res, " vs ", resx);
}
throw hr_exception("incorrect strafe");
}
return res;
} }
}; };