1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00

asonov:: added a geometry flag to recognize Arnold's cat

This commit is contained in:
Zeno Rogue 2021-03-25 10:57:48 +01:00
parent 1dc655df5a
commit 4a80af6912
3 changed files with 5 additions and 3 deletions

View File

@ -19,7 +19,7 @@ int zgmod(int a, int b);
EX namespace asonov { EX namespace asonov {
EX bool in() { return geometry == gArnoldCat; } EX bool in() { return cgflags & qCAT; }
EX hyperpoint tx, ty, tz; EX hyperpoint tx, ty, tz;
EX transmatrix straighten; EX transmatrix straighten;

View File

@ -807,6 +807,8 @@ static const flagtype qPORTALSPACE = Flag(26);
static const flagtype qSTRETCHABLE = Flag(27); static const flagtype qSTRETCHABLE = Flag(27);
static const flagtype qCAT = Flag(28);
// note: dnext assumes that x&7 equals 7 // note: dnext assumes that x&7 equals 7
static const int SEE_ALL = 50; static const int SEE_ALL = 50;
static const int OINF = 100; static const int OINF = 100;
@ -910,7 +912,7 @@ EX vector<geometryinfo> ginf = {
{"{3,3,6}","none", "{3,3,6} hyperbolic honeycomb", "336", 4, 6, qIDEAL, giHyperb3, {{7, 2}}, eVariation::pure}, {"{3,3,6}","none", "{3,3,6} hyperbolic honeycomb", "336", 4, 6, qIDEAL, giHyperb3, {{7, 2}}, eVariation::pure},
{"{3,4,4}","none", "{3,4,4} hyperbolic honeycomb", "344", 8, 4, qIDEAL, giHyperb3, {{7, 2}}, eVariation::pure}, {"{3,4,4}","none", "{3,4,4} hyperbolic honeycomb", "344", 8, 4, qIDEAL, giHyperb3, {{7, 2}}, eVariation::pure},
{"{3,4,4}","Crystal", "4D crystal in H3", "Cryst3" , 8, 4, qIDEAL | qANYQ | qCRYSTAL, giHyperb3, {{7, 3}}, eVariation::pure}, {"{3,4,4}","Crystal", "4D crystal in H3", "Cryst3" , 8, 4, qIDEAL | qANYQ | qCRYSTAL, giHyperb3, {{7, 3}}, eVariation::pure},
{"cat", "cat", "Arnold's cat mapping torus", "cat", 12, 3, qBINARY | qSOL | qsBQ | qOPTQ, giSolNIH, {{6, 4}}, eVariation::pure}, {"cat", "cat", "Arnold's cat mapping torus", "cat", 12, 3, qBINARY | qSOL | qsBQ | qOPTQ | qCAT, giSolNIH, {{6, 4}}, eVariation::pure},
{"file", "none", "load from file", "file", 7, 3, 0, giEuclid2, {{7, 5}}, eVariation::pure}, {"file", "none", "load from file", "file", 7, 3, 0, giEuclid2, {{7, 5}}, eVariation::pure},
{"{4,oo}", "none", "{4,∞} (infinite squares)", "oox4", 4, OINF, qIDEAL, giHyperb2, {{5, 5}}, eVariation::pure}, {"{4,oo}", "none", "{4,∞} (infinite squares)", "oox4", 4, OINF, qIDEAL, giHyperb2, {{5, 5}}, eVariation::pure},
{"{5,3,4}","Crystal", "6D crystal in H3", "Cryst6" , 12, 4, qANYQ | qCRYSTAL, giHyperb3, {{7, 3}}, eVariation::pure}, {"{5,3,4}","Crystal", "6D crystal in H3", "Cryst6" , 12, 4, qANYQ | qCRYSTAL, giHyperb3, {{7, 3}}, eVariation::pure},

View File

@ -3668,7 +3668,7 @@ EX int get_darkval(cell *c, int d) {
if(geometry == gHoroHex) return darkval_hh[d]; if(geometry == gHoroHex) return darkval_hh[d];
if(geometry == gHoroRec) return darkval_hrec[d]; if(geometry == gHoroRec) return darkval_hrec[d];
if(kite::in()) return darkval_kite[d]; if(kite::in()) return darkval_kite[d];
if(geometry == gArnoldCat) return darkval_arnold[d]; if(asonov::in()) return darkval_arnold[d];
if(sol) return darkval_sol[d]; if(sol) return darkval_sol[d];
if(nih) return darkval_nih[d]; if(nih) return darkval_nih[d];
if(bt::in()) return darkval_hbt[d]; if(bt::in()) return darkval_hbt[d];