mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 09:30:35 +00:00
Code Issues Releases Wiki Activity

some fixes for shmup in new geometries (untested, might be still buggy)

Browse Source
This commit is contained in:
Zeno Rogue 2017-11-13 12:49:12 +01:00
parent d8a647d972
commit 18c58fdfde
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
shmup.cpp
View File

@ -3349,15 +3349,15 @@ transmatrix calc_relative_matrix(cell *c, heptagon *h1) {
transmatrix gm = Id; transmatrix gm = Id;
heptagon *h2 = c->master; heptagon *h2 = c->master;
transmatrix where = Id; transmatrix where = Id;
for(int d=0; d<7; d++) if(h2->c7->mov[d] == c) for(int d=0; d<S7; d++) if(h2->c7->mov[d] == c)
where = hexmove[d]; where = hexmove[d];
// always add to last! // always add to last!
//bool hsol = false; //bool hsol = false;
//transmatrix sol; //transmatrix sol;
while(h1 != h2) { while(h1 != h2) {
for(int d=0; d<7; d++) if(h2->move[d] == h1) { for(int d=0; d<S7; d++) if(h2->move[d] == h1) {
int sp = h2->spin(d); int sp = h2->spin(d);
return gm * heptmove[sp] * spin(2*M_PI*d/7) * where; return gm * heptmove[sp] * spin(2*M_PI*d/S7) * where;
} }
if(h1->distance < h2->distance) { if(h1->distance < h2->distance) {
int sp = h2->spin(0); int sp = h2->spin(0);
@ -3421,11 +3421,11 @@ transmatrix calc_relative_matrix_help(cell *c, heptagon *h1) {
transmatrix gm = Id; transmatrix gm = Id;
heptagon *h2 = c->master; heptagon *h2 = c->master;
transmatrix where = Id; transmatrix where = Id;
if(!nontruncated) for(int d=0; d<7; d++) if(h2->c7->mov[d] == c) if(!nontruncated) for(int d=0; d<S7; d++) if(h2->c7->mov[d] == c)
where = hexmove[d]; where = hexmove[d];
// always add to last! // always add to last!
while(h1 != h2) { while(h1 != h2) {
for(int d=0; d<7; d++) if(h1->move[d] == h2) printf("(adj) "); for(int d=0; d<S7; d++) if(h1->move[d] == h2) printf("(adj) ");
if(h1->distance < h2->distance) { if(h1->distance < h2->distance) {
int sp = h2->spin(0); int sp = h2->spin(0);
printf("A%d ", sp); printf("A%d ", sp);
@ -3470,9 +3470,9 @@ void virtualRebase(cell*& base, transmatrix& at, bool tohex) {
while(true) { while(true) {
if(base->type == 6) { if(!ctof(base)) {
cell *c7 = base->master->c7; cell *c7 = base->master->c7;
for(int d=0; d<7; d++) if(c7->mov[d] == base) for(int d=0; d<S7; d++) if(c7->mov[d] == base)
at = hexmove[d] * at; at = hexmove[d] * at;
base = c7; base = c7;
} }
@ -3485,12 +3485,12 @@ void virtualRebase(cell*& base, transmatrix& at, bool tohex) {
transmatrix bestV; transmatrix bestV;
for(int d=0; d<7; d++) { for(int d=0; d<S7; d++) {
heptspin hs; heptspin hs;
hs.h = h; hs.h = h;
hs.spin = d; hs.spin = d;
heptspin hs2 = hsstep(hs, 0); heptspin hs2 = hsstep(hs, 0);
transmatrix V2 = spin((nontruncated?M_PI:0)-hs2.spin*2*M_PI/7) * invheptmove[d]; transmatrix V2 = spin((nontruncated?M_PI:0)-hs2.spin*2*M_PI/S7) * invheptmove[d];
if(nontruncated) V2 = V2 * spin(M_PI); if(nontruncated) V2 = V2 * spin(M_PI);
double newz = (V2 * at * C0) [2]; double newz = (V2 * at * C0) [2];
if(newz < currz) { if(newz < currz) {
@ -3501,9 +3501,9 @@ void virtualRebase(cell*& base, transmatrix& at, bool tohex) {
} }
if(!newbase) { if(!newbase) {
if(tohex && !nontruncated) for(int d=0; d<7; d++) { if(tohex && !nontruncated) 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/6) * invhexmove[d]; transmatrix V2 = spin(-base->spn(d)*2*M_PI/S6) * invhexmove[d];
double newz = (V2 *at * C0) [2]; double newz = (V2 *at * C0) [2];
if(newz < currz) { if(newz < currz) {
currz = newz; currz = newz;