1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-06-29 08:33:25 +00:00

fixed the floor patterns in non-bitrunc square grid

This commit is contained in:
Zeno Rogue 2018-05-08 01:59:57 +02:00
parent 081913fc4e
commit 469530d321
2 changed files with 3 additions and 1 deletions

View File

@ -154,7 +154,7 @@ void generate_matrices_scale(ld scale, int noft) {
} }
else { else {
generate_matrices(hex_matrices, ohex, msh(geometry, S6, hexvdist, hexhexdist, hcrossf, (S3-3)*M_PI/S3, scale)); generate_matrices(hex_matrices, ohex, msh(geometry, S6, hexvdist, hexhexdist, hcrossf, (S3-3)*M_PI/S3, scale));
generate_matrices(hept_matrices, ohept, msh(geometry, S7, rhexf, hcrossf, hcrossf, euclid6?0:M_PI/S7, scale)); generate_matrices(hept_matrices, ohept, msh(geometry, S7, rhexf, hcrossf, hcrossf, euclid6?0:euclid4?0:M_PI/S7, scale));
} }
} }

View File

@ -63,6 +63,7 @@ void precalc() {
hexvdist = hexf; hexvdist = hexf;
hepvdist = hexf; hepvdist = hexf;
rhexf = crossf * sqrt(2) / 2; rhexf = crossf * sqrt(2) / 2;
tessf = crossf;
} }
else if(a4) { else if(a4) {
ld s2 = sqrt(2); ld s2 = sqrt(2);
@ -75,6 +76,7 @@ void precalc() {
hexvdist = crossf * hypot(1-xx, xx); hexvdist = crossf * hypot(1-xx, xx);
hepvdist = crossf; hepvdist = crossf;
rhexf = hexf; rhexf = hexf;
tessf = crossf;
} }
else { else {
crossf = .5; crossf = .5;