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

3D:: fixed (?) virtualRebase

This commit is contained in:
? 2019-02-25 14:50:19 +01:00 committed by Zeno Rogue
parent e7110b7492
commit 02920b5d2f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
geometry2.cpp
View File

@ -268,7 +268,7 @@ transmatrix calc_relative_matrix_help(cell *c, heptagon *h1) {
template<class T, class U>
void virtualRebase(cell*& base, T& at, bool tohex, const U& check) {
if(euclid || sphere) {
if((euclid || sphere) && DIM == 2) {
again:
if(euwrap) for(int i=0; i<6; i++) {
// fix cylinder and square grid
@ -297,7 +297,7 @@ void virtualRebase(cell*& base, T& at, bool tohex, const U& check) {
while(true) {
double currz = check(at)[2];
double currz = check(at)[DIM];
heptagon *h = base->master;
@ -305,11 +305,11 @@ void virtualRebase(cell*& base, T& at, bool tohex, const U& check) {
transmatrix bestV;
if(!binarytiling) for(int d=0; d<S7; d++) {
if(DIM == 2 && !binarytiling) for(int d=0; d<S7; d++) {
heptspin hs(h, d, false);
heptspin hs2 = hs + wstep;
transmatrix V2 = spin(-hs2.spin*2*M_PI/S7) * invheptmove[d];
double newz = check(V2 * at) [2];
double newz = check(V2 * at) [DIM];
if(newz < currz) {
currz = newz;
bestV = V2;
@ -325,7 +325,7 @@ void virtualRebase(cell*& base, T& at, bool tohex, const U& check) {
if(tohex && BITRUNCATED) for(int d=0; d<S7; d++) {
cell *c = createMov(base, d);
transmatrix V2 = spin(-base->c.spin(d)*2*M_PI/S6) * invhexmove[d];
double newz = check(V2 *at) [2];
double newz = check(V2 *at) [DIM];
if(newz < currz) {
currz = newz;
bestV = V2;
@ -337,12 +337,12 @@ 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))) {
if(binarytiling || (tohex && (GOLDBERG || IRREGULAR)) || DIM == 3) {
while(true) {
newbase = NULL;
forCellCM(c2, base) {
transmatrix V2 = calc_relative_matrix(base, c2, C0);
double newz = check(V2 * at) [2];
double newz = check(V2 * at) [DIM];
if(newz < currz) {
currz = newz;
bestV = V2;