mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-23 15:36:59 +00:00
Code Issues Releases Wiki Activity

detect incorrect matching in (k,l) for k!=l

Browse Source
This commit is contained in:
Zeno Rogue 2018-08-21 17:55:17 +02:00
parent f3dd312562
commit a54dab047c
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archimedean.cpp
View File

@ -128,6 +128,18 @@ void archimedean_tiling::prepare() {
return; return;
} }
real_faces = 0, real_face_type = 0;
for(int i=0; i<N; i++) if(faces[i] > 2) real_faces++, real_face_type += faces[i];
real_face_type /= 2;
if(real_faces == 2) {
for(int i: faces) if(i != real_face_type) {
errormsg = XLAT("polygons match incorrectly");
errors++;
}
}
errors = 0; errors = 0;
/* build the 'adjacent' table */ /* build the 'adjacent' table */
@ -289,17 +301,13 @@ void archimedean_tiling::compute_geometry() {
alphas.resize(N); alphas.resize(N);
ld elmin = 0, elmax = hyperbolic ? 10 : sphere ? M_PI : 1; ld elmin = 0, elmax = hyperbolic ? 10 : sphere ? M_PI : 1;
real_faces = 0;
int rf = 0;
for(int i=0; i<N; i++) if(faces[i] > 2) real_faces++, rf += faces[i];
if(real_faces == 2) { if(real_faces == 2) {
/* standard methods fail for dihedra, but the answer is easy */ /* standard methods fail for dihedra, but the answer is easy */
edgelength = 2 * M_PI / faces[0]; edgelength = 2 * M_PI / faces[0];
for(int i=0; i<N; i++) for(int i=0; i<N; i++)
if(faces[i] == 2) if(faces[i] == 2)
alphas[i] = 0, alphas[i] = 0,
circumradius[i] = 2 * M_PI / rf, circumradius[i] = M_PI / real_face_type,
inradius[i] = 0; inradius[i] = 0;
else else
alphas[i] = M_PI/2, alphas[i] = M_PI/2,