diff --git a/classes.cpp b/classes.cpp index 10f6db65..f7b9197b 100644 --- a/classes.cpp +++ b/classes.cpp @@ -881,13 +881,13 @@ EX vector ginf = { {"ternary","none", "standard ternary tiling", "ternary", 6, 3, qBINARY, giHyperb2, 0x48400, {{6, 4}}, eVariation::pure}, {"3x2", "none", "stretched hyperbolic", "3:2", 11, 3, qBINARY|qNIH, giSolNIH, 0x49000, {{6, 3}}, eVariation::pure}, {"3x1/2", "none", "stretched Solv", "3:1/2", 9, 3, (qBINARY|qSOL|qNIH), giSolNIH, 0x49200, {{7, 3}}, eVariation::pure}, - {"{3,oo}", "none", "{3,∞} (infinite triangles)", "oox3", 3, 100, qIDEAL, giHyperb2, 0x49400, {{7, 7}}, eVariation::pure}, + {"{3,oo}", "none", "{3,∞} (infinite triangles)", "oox3", 3, OINF, qIDEAL, giHyperb2, 0x49400, {{7, 7}}, eVariation::pure}, {"{3,3,6}","none", "{3,3,6} hyperbolic honeycomb", "336", 4, 6, qIDEAL, giHyperb3, 0x49600, {{7, 2}}, eVariation::pure}, {"{3,4,4}","none", "{3,4,4} hyperbolic honeycomb", "344", 8, 4, qIDEAL, giHyperb3, 0x50000, {{7, 2}}, eVariation::pure}, {"{3,4,4}","Crystal", "4D crystal in H3", "Cryst3" , 8, 4, qIDEAL | qANYQ | qCRYSTAL, giHyperb3, 0x52000, {{7, 3}}, eVariation::pure}, {"cat", "cat", "Arnold's cat mapping torus", "cat", 12, 3, qBINARY | qSOL | qsBQ | qOPTQ, giSolNIH, 0x52200, {{6, 4}}, eVariation::pure}, {"file", "none", "load from file", "file", 7, 3, qEXPERIMENTAL, giEuclid2, 0, {{7, 5}}, eVariation::pure}, - {"{4,oo}", "none", "{4,∞} (infinite squares)", "oox4", 4, 100, qIDEAL, giHyperb2, 0x49400, {{5, 5}}, eVariation::pure}, + {"{4,oo}", "none", "{4,∞} (infinite squares)", "oox4", 4, OINF, qIDEAL, giHyperb2, 0x49400, {{5, 5}}, eVariation::pure}, }; // bits: 9, 10, 15, 16, (reserved for later) 17, 18 diff --git a/hypgraph.cpp b/hypgraph.cpp index 6bcd49b5..25a81d9e 100644 --- a/hypgraph.cpp +++ b/hypgraph.cpp @@ -1500,7 +1500,7 @@ EX transmatrix atscreenpos(ld x, ld y, ld size) { V[0][0] = size * 2 * cgi.hcrossf / cgi.crossf; V[1][1] = size * 2 * cgi.hcrossf / cgi.crossf; V[2][2] = current_display->radius; - if(S3 == OINF) V[0][0] /= 5, V[1][1] /= 5; + if(S3 >= OINF) V[0][0] /= 5, V[1][1] /= 5; } return V; diff --git a/system.cpp b/system.cpp index d958fe9e..273f8d96 100644 --- a/system.cpp +++ b/system.cpp @@ -1234,7 +1234,7 @@ EX void set_geometry(eGeometry target) { #if CAP_BT if(bt::in() || WDIM == 3 || kite::in() || arb::in()) if(!hybri) variation = eVariation::pure; #endif - if(S3 == OINF) variation = eVariation::pure; + if(S3 >= OINF) variation = eVariation::pure; if(was_default) pmodel = default_model(); if(nonisotropic && old_DIM == 2 && vid.texture_step < 4) vid.texture_step = 4; if(prod) { pmodel = mdPerspective; if(vid.texture_step < 4) vid.texture_step = 4; }