mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00
Code Issues Releases Wiki Activity

virtualRebase for hyperpoints (not transmatrices)

Browse Source
This commit is contained in:
Zeno Rogue 2018-08-04 22:36:08 +02:00
parent d8f63a9f3d
commit bbebb55bd9
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hyper.h
View File

@ -710,6 +710,7 @@ namespace shmup {
bool boatAt(cell *c); bool boatAt(cell *c);
void virtualRebase(cell*& base, transmatrix& at, bool tohex); void virtualRebase(cell*& base, transmatrix& at, bool tohex);
void virtualRebase(cell*& base, hyperpoint& h, bool tohex);
void virtualRebase(shmup::monster *m, bool tohex); void virtualRebase(shmup::monster *m, bool tohex);
transmatrix calc_relative_matrix(cell *c, cell *c1, const hyperpoint& point_hint); transmatrix calc_relative_matrix(cell *c, cell *c1, const hyperpoint& point_hint);
transmatrix calc_relative_matrix(cell *c, cell *c1, int direction_hint); transmatrix calc_relative_matrix(cell *c, cell *c1, int direction_hint);

32
shmup.cpp
View File

@ -985,6 +985,11 @@ void fixelliptic(transmatrix& at) {
} }
} }
void fixelliptic(hyperpoint& h) {
if(elliptic && h[2] < 0)
for(int i=0; i<3; i++) h[i] = -h[i];
}
void monster::store() { void monster::store() {
monstersAt.insert(make_pair(base, this)); monstersAt.insert(make_pair(base, this));
} }
@ -3511,21 +3516,22 @@ transmatrix calc_relative_matrix_help(cell *c, heptagon *h1) {
return gm * where; return gm * where;
} }
void virtualRebase(cell*& base, transmatrix& at, bool tohex) { template<class T, class U>
void virtualRebase(cell*& base, T& at, bool tohex, const U& check) {
if(euclid || sphere) { if(euclid || sphere) {
again: again:
if(torus) for(int i=0; i<6; i++) { if(torus) for(int i=0; i<6; i++) {
transmatrix newat = eumovedir(3+i) * at; auto newat = eumovedir(3+i) * at;
if(hdist0(tC0(newat)) < hdist0(tC0(at))) { if(hdist0(check(newat)) < hdist0(check(at))) {
at = newat; at = newat;
base = createMov(base, i); base = createMov(base, i);
goto again; goto again;
} }
} }
else forCellCM(c2, base) { else forCellCM(c2, base) {
transmatrix newat = inverse(ggmatrix(c2)) * ggmatrix(base) * at; auto newat = inverse(ggmatrix(c2)) * ggmatrix(base) * at;
if(hypot(tC0(newat)[0], tC0(newat)[1]) if(hypot(check(newat)[0], check(newat)[1])
< hypot(tC0(at)[0], tC0(at)[1])) { < hypot(check(at)[0], check(at)[1])) {
at = newat; at = newat;
base = c2; base = c2;
goto again; goto again;
@ -3540,7 +3546,7 @@ void virtualRebase(cell*& base, transmatrix& at, bool tohex) {
while(true) { while(true) {
double currz = (at * C0)[2]; double currz = check(at)[2];
heptagon *h = base->master; heptagon *h = base->master;
@ -3554,7 +3560,7 @@ void virtualRebase(cell*& base, transmatrix& at, bool tohex) {
hs.spin = d; hs.spin = d;
heptspin hs2 = hs + wstep; heptspin hs2 = hs + wstep;
transmatrix V2 = spin(-hs2.spin*2*M_PI/S7) * invheptmove[d]; transmatrix V2 = spin(-hs2.spin*2*M_PI/S7) * invheptmove[d];
double newz = (V2 * at * C0) [2]; double newz = check(V2 * at) [2];
if(newz < currz) { if(newz < currz) {
currz = newz; currz = newz;
bestV = V2; bestV = V2;
@ -3570,7 +3576,7 @@ void virtualRebase(cell*& base, transmatrix& at, bool tohex) {
if(tohex && !nonbitrunc) for(int d=0; d<S7; d++) { if(tohex && !nonbitrunc) for(int d=0; d<S7; d++) {
cell *c = createMov(base, d); cell *c = createMov(base, d);
transmatrix V2 = spin(-base->spn(d)*2*M_PI/S6) * invhexmove[d]; transmatrix V2 = spin(-base->spn(d)*2*M_PI/S6) * invhexmove[d];
double newz = (V2 *at * C0) [2]; double newz = check(V2 *at) [2];
if(newz < currz) { if(newz < currz) {
currz = newz; currz = newz;
bestV = V2; bestV = V2;
@ -3588,6 +3594,14 @@ void virtualRebase(cell*& base, transmatrix& at, bool tohex) {
} }
void virtualRebase(cell*& base, transmatrix& at, bool tohex) {
virtualRebase(base, at, tohex, tC0);
}
void virtualRebase(cell*& base, hyperpoint& h, bool tohex) {
virtualRebase(base, h, tohex, [] (const hyperpoint& h) { return h; });
}
void virtualRebase(shmup::monster *m, bool tohex) { void virtualRebase(shmup::monster *m, bool tohex) {
virtualRebase(m->base, m->at, tohex); virtualRebase(m->base, m->at, tohex);
} }