mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-30 15:39:54 +00:00
Code Issues Releases Wiki Activity

renamed penrose.cpp to kite.cpp and 'penrose' to 'kite::in()'

Browse Source
This commit is contained in:
Zeno Rogue 2019-12-14 12:12:24 +01:00
parent 1d6576ef92
commit 8cfc5a578f
24 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigstuff.cpp
View File

@ -1324,7 +1324,7 @@ EX int wallchance(cell *c, bool deepOcean) {
/** should we generate the horocycles in the current geometry? */ /** should we generate the horocycles in the current geometry? */
EX bool horo_ok() { EX bool horo_ok() {
return hyperbolic && !bt::in() && !arcm::in() && !penrose && !experimental && !hybri; return hyperbolic && !bt::in() && !arcm::in() && !kite::in() && !experimental && !hybri;
} }
EX bool gp_wall_test() { EX bool gp_wall_test() {
@ -1378,7 +1378,7 @@ EX bool walls_not_implemented() {
} }
EX void buildBigStuff(cell *c, cell *from) { EX void buildBigStuff(cell *c, cell *from) {
if(sphere || quotient || nonisotropic || (penrose && !bt::in()) || experimental) return; if(sphere || quotient || nonisotropic || (kite::in() && !bt::in()) || experimental) return;
if(chaosmode > 1) return; if(chaosmode > 1) return;
bool deepOcean = deep_ocean_at(c, from); bool deepOcean = deep_ocean_at(c, from);

2
binary-tiling.cpp
View File

@ -612,7 +612,7 @@ EX namespace bt {
if(geometry == gBinary4) return 3; if(geometry == gBinary4) return 3;
if(geometry == gTernary) return 4; if(geometry == gTernary) return 4;
if(geometry == gBinaryTiling) return 5; if(geometry == gBinaryTiling) return 5;
if(penrose) return 0; if(kite::in()) return 0;
if(!bt::in()) return 0; if(!bt::in()) return 0;
return S7-1; return S7-1;
} }

12
cell.cpp
View File

@ -180,7 +180,7 @@ EX cell *createMov(cell *c, int d) {
else if(hybri) else if(hybri)
hybrid::find_cell_connection(c, d); hybrid::find_cell_connection(c, d);
#if CAP_BT #if CAP_BT
else if(penrose) else if(kite::in())
kite::find_cell_connection(c, d); kite::find_cell_connection(c, d);
#endif #endif
#if CAP_IRR #if CAP_IRR
@ -279,7 +279,7 @@ EX void initcells() {
#endif #endif
else if(euc::in()) currentmap = euc::new_map(); else if(euc::in()) currentmap = euc::new_map();
#if CAP_BT #if CAP_BT
else if(penrose) currentmap = kite::new_map(); else if(kite::in()) currentmap = kite::new_map();
#endif #endif
#if MAXMDIM >= 4 #if MAXMDIM >= 4
else if(WDIM == 3 && !bt::in()) currentmap = reg3::new_map(); else if(WDIM == 3 && !bt::in()) currentmap = reg3::new_map();
@ -446,7 +446,7 @@ EX int celldist(cell *c) {
return hybrid::celldistance(c, currentmap->gamestart()); return hybrid::celldistance(c, currentmap->gamestart());
if(nil && !quotient) return DISTANCE_UNKNOWN; if(nil && !quotient) return DISTANCE_UNKNOWN;
if(euclid) return celldistance(currentmap->gamestart(), c); if(euclid) return celldistance(currentmap->gamestart(), c);
if(sphere || bt::in() || WDIM == 3 || cryst || solnih || penrose) return celldistance(currentmap->gamestart(), c); if(sphere || bt::in() || WDIM == 3 || cryst || solnih || kite::in()) return celldistance(currentmap->gamestart(), c);
#if CAP_IRR #if CAP_IRR
if(IRREGULAR) return irr::celldist(c, false); if(IRREGULAR) return irr::celldist(c, false);
#endif #endif
@ -1017,7 +1017,7 @@ EX int celldistance(cell *c1, cell *c2) {
return euc::cyldist(euc2_coordinates(c1), euc2_coordinates(c2)); return euc::cyldist(euc2_coordinates(c1), euc2_coordinates(c2));
} }
if(arcm::in() || quotient || solnih || (penrose && euclid) || experimental || sl2 || nil) { if(arcm::in() || quotient || solnih || (kite::in() && euclid) || experimental || sl2 || nil) {
if(saved_distances.count(make_pair(c1,c2))) if(saved_distances.count(make_pair(c1,c2)))
return saved_distances[make_pair(c1,c2)]; return saved_distances[make_pair(c1,c2)];
@ -1043,7 +1043,7 @@ EX int celldistance(cell *c1, cell *c2) {
#endif #endif
#if MAXMDIM >= 4 #if MAXMDIM >= 4
if(euclid && !penrose && !arcm::in()) if(euclid && !kite::in() && !arcm::in())
return euc::celldistance(c1, c2); return euc::celldistance(c1, c2);
if(hyperbolic && WDIM == 3) return reg3::celldistance(c1, c2); if(hyperbolic && WDIM == 3) return reg3::celldistance(c1, c2);
@ -1238,7 +1238,7 @@ EX vector<int> reverse_directions(heptagon *c, int dir) {
} }
EX bool standard_tiling() { EX bool standard_tiling() {
return !arcm::in() && !penrose && !bt::in(); return !arcm::in() && !kite::in() && !bt::in();
} }
} }

2
celldrawer.cpp
View File

@ -1528,7 +1528,7 @@ void celldrawer::draw_features_and_walls_3d() {
if(c->move(a) && (among(pmodel, mdPerspective, mdGeodesic) || gmatrix0.count(c->move(a)))) if(c->move(a) && (among(pmodel, mdPerspective, mdGeodesic) || gmatrix0.count(c->move(a))))
b = (patterns::innerwalls && (tC0(V)[2] < tC0(V * currentmap->adj(c, a))[2])) || !isWall3(c->move(a), dummy); b = (patterns::innerwalls && (tC0(V)[2] < tC0(V * currentmap->adj(c, a))[2])) || !isWall3(c->move(a), dummy);
if(b) { if(b) {
if(pmodel == mdPerspective && !sphere && !quotient && !penrose && !nonisotropic && !hybri && !experimental && !nih) { if(pmodel == mdPerspective && !sphere && !quotient && !kite::in() && !nonisotropic && !hybri && !experimental && !nih) {
if(a < 4 && among(geometry, gHoroTris, gBinary3) && celldistAlt(c) >= celldistAlt(centerover)) continue; if(a < 4 && among(geometry, gHoroTris, gBinary3) && celldistAlt(c) >= celldistAlt(centerover)) continue;
else if(a < 2 && among(geometry, gHoroRec) && celldistAlt(c) >= celldistAlt(centerover)) continue; else if(a < 2 && among(geometry, gHoroRec) && celldistAlt(c) >= celldistAlt(centerover)) continue;
else if(c->move(a)->master->distance > c->master->distance && c->master->distance > centerover->master->distance && !quotient) continue; else if(c->move(a)->master->distance > c->master->distance && c->master->distance > centerover->master->distance && !quotient) continue;

4
classes.cpp
View File

@ -514,7 +514,7 @@ static const flagtype qsDOCKS = qANYQ | qSMALL | qBOUNDED | qDOCKS;
static const flagtype qsSMALLB = qSMALL | qBOUNDED; static const flagtype qsSMALLB = qSMALL | qBOUNDED;
static const flagtype qsSMALLBF = qsSMALLB | qsFIELD | qANYQ; static const flagtype qsSMALLBF = qsSMALLB | qsFIELD | qANYQ;
static const flagtype qsSMALLBE = qsSMALLB | qELLIPTIC | qANYQ; static const flagtype qsSMALLBE = qsSMALLB | qELLIPTIC | qANYQ;
static const flagtype qsBP = qBINARY | qPENROSE; static const flagtype qsBP = qBINARY | qKITE;
EX geometryinfo1 giEuclid2 = { gcEuclid, 2, 2, 3, {1,1, 0,0 } }; EX geometryinfo1 giEuclid2 = { gcEuclid, 2, 2, 3, {1,1, 0,0 } };
EX geometryinfo1 giHyperb2 = { gcHyperbolic, 2, 2, 3, {1,1,-1,0 } }; EX geometryinfo1 giHyperb2 = { gcHyperbolic, 2, 2, 3, {1,1,-1,0 } };
@ -582,7 +582,7 @@ vector<geometryinfo> ginf = {
{"{5,3,4}","field", "{5,3,4} field quotient space", "f435", 12, 4, qsSMALLBF, giHyperb3, 0x40800, {{SEE_ALL, SEE_ALL}}, eVariation::pure}, {"{5,3,4}","field", "{5,3,4} field quotient space", "f435", 12, 4, qsSMALLBF, giHyperb3, 0x40800, {{SEE_ALL, SEE_ALL}}, eVariation::pure},
{"binary4","none", "standard binary tiling", "binary4", 5, 3, qBINARY, giHyperb2, 0x41400, {{7, 5}}, eVariation::pure}, {"binary4","none", "standard binary tiling", "binary4", 5, 3, qBINARY, giHyperb2, 0x41400, {{7, 5}}, eVariation::pure},
{"sol", "none", "Solv geometry", "sol", 8, 3, qBINARY|qSOL, giSolNIH, 0x41600, {{7, 5}}, eVariation::pure}, {"sol", "none", "Solv geometry", "sol", 8, 3, qBINARY|qSOL, giSolNIH, 0x41600, {{7, 5}}, eVariation::pure},
{"kd2", "none", "kite-and-dart", "kd2", 4, 3, qPENROSE, giEuclid2, 0x48000, {{7, 7}}, eVariation::pure}, {"kd2", "none", "kite-and-dart", "kd2", 4, 3, qKITE, giEuclid2, 0x48000, {{7, 7}}, eVariation::pure},
{"kd3", "none", "kite-and-dart on horospheres", "kd3", 12, 3, qsBP, giHyperb3, 0x48200, {{7, 3}}, eVariation::pure}, {"kd3", "none", "kite-and-dart on horospheres", "kd3", 12, 3, qsBP, giHyperb3, 0x48200, {{7, 3}}, eVariation::pure},
{"nil", "none", "Nil geometry", "nil", 6, 3, qOPTQ, giNil, 0x48600, {{7, 5}}, eVariation::pure}, {"nil", "none", "Nil geometry", "nil", 6, 3, qOPTQ, giNil, 0x48600, {{7, 5}}, eVariation::pure},
{"product","none", "product space", "product", 7, 3, qHYBRID, giProduct, 0x00000, {{7, 3}}, eVariation::pure}, {"product","none", "product space", "product", 7, 3, qHYBRID, giProduct, 0x00000, {{7, 3}}, eVariation::pure},

4
complex.cpp
View File

@ -1104,7 +1104,7 @@ EX namespace mirror {
#endif #endif
EX bool build(cell *c) { EX bool build(cell *c) {
if(penrose || sol) return false; if(kite::in() || sol) return false;
#if CAP_GP #if CAP_GP
if(GOLDBERG) { if(GOLDBERG) {
if(c == c->master->c7) { if(c == c->master->c7) {
@ -1232,7 +1232,7 @@ EX namespace mirror {
EX void createMirrors(cellwalker cw, int cpid) { EX void createMirrors(cellwalker cw, int cpid) {
if(penrose || sol) return; if(kite::in() || sol) return;
#if CAP_ARCM #if CAP_ARCM
if(arcm::in()) { if(arcm::in()) {

2
expansion.cpp
View File

@ -490,7 +490,7 @@ EX bool sizes_known() {
if(bt::in()) return false; if(bt::in()) return false;
// not implemented // not implemented
if(arcm::in()) return false; if(arcm::in()) return false;
if(penrose) return false; if(kite::in()) return false;
return true; return true;
} }

6
floorshapes.cpp
View File

@ -650,7 +650,7 @@ void geometry_information::generate_floorshapes() {
else if(GOLDBERG) { /* will be generated on the fly */ } else if(GOLDBERG) { /* will be generated on the fly */ }
#if CAP_BT #if CAP_BT
else if(penrose) { else if(kite::in()) {
dynamicval<bool> ncor(approx_nearcorner, true); dynamicval<bool> ncor(approx_nearcorner, true);
for(int i=0; i<2; i++) { for(int i=0; i<2; i++) {
modelh.s = hstate(i); /* kite/dart shape */ modelh.s = hstate(i); /* kite/dart shape */
@ -834,7 +834,7 @@ EX int shvid(cell *c) {
return pseudohept(c); return pseudohept(c);
else if(geometry == gBinaryTiling) else if(geometry == gBinaryTiling)
return c->type-6; return c->type-6;
else if(penrose) else if(kite::in())
return kite::getshape(c->master); return kite::getshape(c->master);
else if(geometry == gBinary4 || geometry == gTernary) else if(geometry == gBinary4 || geometry == gTernary)
return c->master->zebraval; return c->master->zebraval;
@ -870,7 +870,7 @@ EX struct dqi_poly *draw_shapevec(cell *c, const transmatrix& V, const vector<hp
#endif #endif
else if(GOLDBERG && ishex1(c)) else if(GOLDBERG && ishex1(c))
return &queuepolyat(V * pispin, shv[0], col, prio); return &queuepolyat(V * pispin, shv[0], col, prio);
else if(!(S7&1) && PURE && !penrose && !a4) { else if(!(S7&1) && PURE && !kite::in() && !a4) {
auto si = patterns::getpatterninfo(c, patterns::PAT_COLORING, 0); auto si = patterns::getpatterninfo(c, patterns::PAT_COLORING, 0);
if(si.id == 8) si.dir++; if(si.id == 8) si.dir++;
transmatrix D = applyPatterndir(c, si); transmatrix D = applyPatterndir(c, si);

8
geom-exp.cpp
View File

@ -235,7 +235,7 @@ EX geometry_filter gf_regular_2d = {"regular 2D tesselations", [] {
}}; }};
EX geometry_filter gf_regular_3d = {"regular 3D honeycombs", [] { EX geometry_filter gf_regular_3d = {"regular 3D honeycombs", [] {
if(euclid) return geometry == gCubeTiling; if(euclid) return geometry == gCubeTiling;
return !bt::in() && !penrose && WDIM == 3 && !forced_quotient() && !nonisotropic && !prod; return !bt::in() && !kite::in() && WDIM == 3 && !forced_quotient() && !nonisotropic && !prod;
}}; }};
EX geometry_filter gf_quotient = {"interesting quotient spaces", [] { EX geometry_filter gf_quotient = {"interesting quotient spaces", [] {
return forced_quotient() && !elliptic; return forced_quotient() && !elliptic;
@ -290,7 +290,7 @@ void set_or_configure_geometry(eGeometry g) {
if(g == gRotSpace) { if(g == gRotSpace) {
bool ok = true; bool ok = true;
if(arcm::in()) ok = PURE; if(arcm::in()) ok = PURE;
else if(bt::in() || penrose) ok = false; else if(bt::in() || kite::in()) ok = false;
else ok = PURE || BITRUNCATED; else ok = PURE || BITRUNCATED;
if(!ok) { if(!ok) {
addMessage(XLAT("Only works with (semi-)regular tilings")); addMessage(XLAT("Only works with (semi-)regular tilings"));
@ -470,7 +470,7 @@ EX void select_quotient_screen() {
} }
EX void select_quotient() { EX void select_quotient() {
if(euclid && !penrose && !arcm::in()) { if(euclid && !kite::in() && !arcm::in()) {
euc::prepare_torus3(); euc::prepare_torus3();
pushScreen(euc::show_torus3); pushScreen(euc::show_torus3);
} }
@ -678,7 +678,7 @@ EX void showEuclideanMenu() {
extern void add_edit_wall_quality(char); extern void add_edit_wall_quality(char);
add_edit_wall_quality('W'); add_edit_wall_quality('W');
} }
else if(WDIM == 3 || penrose) dialog::addBreak(100); else if(WDIM == 3 || kite::in()) dialog::addBreak(100);
else { else {
dialog::addSelItem(XLAT("variations"), gp::operation_name(), 'v'); dialog::addSelItem(XLAT("variations"), gp::operation_name(), 'v');
dialog::add_action([] { dialog::add_action([] {

2
geometry.cpp
View File

@ -510,7 +510,7 @@ void geometry_information::prepare_basics() {
#endif #endif
#if CAP_BT #if CAP_BT
if(bt::in()) hexvdist = rhexf = 1, tessf = 1, scalefactor = 1, crossf = hcrossf7; if(bt::in()) hexvdist = rhexf = 1, tessf = 1, scalefactor = 1, crossf = hcrossf7;
if(geometry == gHoroRec || penrose || sol || nil || nih) hexvdist = rhexf = .5, tessf = .5, scalefactor = .5, crossf = hcrossf7/2; if(geometry == gHoroRec || kite::in() || sol || nil || nih) hexvdist = rhexf = .5, tessf = .5, scalefactor = .5, crossf = hcrossf7/2;
if(bt::in()) scalefactor *= min<ld>(vid.binary_width, 1), crossf *= min<ld>(vid.binary_width, 1); if(bt::in()) scalefactor *= min<ld>(vid.binary_width, 1), crossf *= min<ld>(vid.binary_width, 1);
#endif #endif
#if CAP_BT && MAXMDIM >= 4 #if CAP_BT && MAXMDIM >= 4

10
geometry2.cpp
View File

@ -310,7 +310,7 @@ void hrmap_hyperbolic::virtualRebase(heptagon*& base, transmatrix& at) {
} }
EX bool no_easy_spin() { EX bool no_easy_spin() {
return NONSTDVAR || arcm::in() || WDIM == 3 || bt::in() || penrose; return NONSTDVAR || arcm::in() || WDIM == 3 || bt::in() || kite::in();
} }
ld hrmap_standard::spin_angle(cell *c, int d) { ld hrmap_standard::spin_angle(cell *c, int d) {
@ -369,7 +369,7 @@ transmatrix hrmap_standard::adj(cell *c, int i) {
EX double randd() { return (rand() + .5) / (RAND_MAX + 1.); } EX double randd() { return (rand() + .5) / (RAND_MAX + 1.); }
EX hyperpoint randomPointIn(int t) { EX hyperpoint randomPointIn(int t) {
if(NONSTDVAR || arcm::in() || penrose) { if(NONSTDVAR || arcm::in() || kite::in()) {
// Let these geometries be less confusing. // Let these geometries be less confusing.
// Also easier to implement ;) // Also easier to implement ;)
return xspinpush0(2 * M_PI * randd(), asinh(randd() / 20)); return xspinpush0(2 * M_PI * randd(), asinh(randd() / 20));
@ -394,7 +394,7 @@ EX hyperpoint get_corner_position(cell *c, int cid, ld cf IS(3)) {
} }
#endif #endif
#if CAP_BT #if CAP_BT
if(penrose) return kite::get_corner(c, cid, cf); if(kite::in()) return kite::get_corner(c, cid, cf);
if(bt::in()) { if(bt::in()) {
if(WDIM == 3) { if(WDIM == 3) {
println(hlog, "get_corner_position called"); println(hlog, "get_corner_position called");
@ -502,7 +502,7 @@ EX hyperpoint nearcorner(cell *c, int i) {
neis[5] = bt::get_horopoint(0, -1); neis[5] = bt::get_horopoint(0, -1);
return neis[i]; return neis[i];
} }
if(penrose) { if(kite::in()) {
if(approx_nearcorner) if(approx_nearcorner)
return kite::get_corner(c, i, 3) + kite::get_corner(c, i+1, 3) - C0; return kite::get_corner(c, i, 3) + kite::get_corner(c, i+1, 3) - C0;
else else
@ -560,7 +560,7 @@ EX hyperpoint farcorner(cell *c, int i, int which) {
} }
#endif #endif
#if CAP_BT #if CAP_BT
if(bt::in() || penrose) if(bt::in() || kite::in())
return nearcorner(c, (i+which) % c->type); // lazy return nearcorner(c, (i+which) % c->type); // lazy
#endif #endif
#if CAP_ARCM #if CAP_ARCM

6
graph.cpp
View File

@ -3507,7 +3507,7 @@ EX int get_darkval(cell *c, int d) {
const int darkval_hrec[7] = {0,0,2,4,2,4,0}; const int darkval_hrec[7] = {0,0,2,4,2,4,0};
const int darkval_sol[8] = {0,2,4,4,0,2,4,4}; const int darkval_sol[8] = {0,2,4,4,0,2,4,4};
const int darkval_arnold[12] = {0,2,0,2,4,5,0,2,0,2,4,5}; const int darkval_arnold[12] = {0,2,0,2,4,5,0,2,0,2,4,5};
const int darkval_penrose[12] = {0, 2, 0, 2, 4, 4, 6, 6, 6, 6, 6, 6}; const int darkval_kite[12] = {0, 2, 0, 2, 4, 4, 6, 6, 6, 6, 6, 6};
const int darkval_nil[8] = {6,6,0,3,6,6,0,3}; const int darkval_nil[8] = {6,6,0,3,6,6,0,3};
const int darkval_nih[11] = {0,2,0,2,4,6,6,6,6,6,6}; const int darkval_nih[11] = {0,2,0,2,4,6,6,6,6,6,6};
if(sphere) return darkval_s12[d]; if(sphere) return darkval_s12[d];
@ -3516,7 +3516,7 @@ EX int get_darkval(cell *c, int d) {
if(euclid && S7 == 14) return darkval_e14[d]; if(euclid && S7 == 14) return darkval_e14[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(penrose) return darkval_penrose[d]; if(kite::in()) return darkval_kite[d];
if(geometry == gArnoldCat) return darkval_arnold[d]; if(geometry == gArnoldCat) 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];
@ -3610,7 +3610,7 @@ EX void gridline(const transmatrix& V, const hyperpoint h1, const hyperpoint h2,
EX int wall_offset(cell *c) { EX int wall_offset(cell *c) {
if(hybri) return hybrid::wall_offset(c); if(hybri) return hybrid::wall_offset(c);
if(penrose && kite::getshape(c->master) == kite::pKite) return 10; if(kite::in() && kite::getshape(c->master) == kite::pKite) return 10;
return 0; return 0;
} }

2
hyper.cpp
View File

@ -35,7 +35,7 @@
#include "binary-tiling.cpp" #include "binary-tiling.cpp"
#include "nonisotropic.cpp" #include "nonisotropic.cpp"
#include "asonov.cpp" #include "asonov.cpp"
#include "penrose.cpp" #include "kite.cpp"
#include "archimedean.cpp" #include "archimedean.cpp"
#include "arbitrile.cpp" #include "arbitrile.cpp"
#include "euclid.cpp" #include "euclid.cpp"

1
hyper.h
View File

@ -120,7 +120,6 @@ void addMessage(string s, char spamtype = 0);
#define cgflags cginf.flags #define cgflags cginf.flags
#define cryst (cgflags & qCRYSTAL) #define cryst (cgflags & qCRYSTAL)
#define penrose (cgflags & qPENROSE)
/** convenience flag for geometries with major aspects missing */ /** convenience flag for geometries with major aspects missing */
#define experimental (cgflags & qEXPERIMENTAL) #define experimental (cgflags & qEXPERIMENTAL)

2
hypgraph.cpp
View File

@ -989,7 +989,7 @@ EX transmatrix actualV(const heptspin& hs, const transmatrix& V) {
#if CAP_BT #if CAP_BT
if(bt::in()) return V; if(bt::in()) return V;
#endif #endif
if(penrose) return V; if(kite::in()) return V;
return (hs.spin || !BITRUNCATED) ? V * spin(hs.spin*2*M_PI/S7 + master_to_c7_angle()) : V; return (hs.spin || !BITRUNCATED) ? V * spin(hs.spin*2*M_PI/S7 + master_to_c7_angle()) : V;
} }

7
penrose.cpp → kite.cpp
View File

@ -1,7 +1,7 @@
// Hyperbolic Rogue -- Kite-and-dart tiling // Hyperbolic Rogue -- Kite-and-dart tiling
// Copyright (C) 2011-2019 Zeno Rogue, see 'hyper.cpp' for details // Copyright (C) 2011-2019 Zeno Rogue, see 'hyper.cpp' for details
/** \file penrose.cpp /** \file kite.cpp
* \brief Kite-and-dart tiling, both in R^2 and H^3 * \brief Kite-and-dart tiling, both in R^2 and H^3
*/ */
@ -9,6 +9,9 @@
namespace hr { namespace hr {
EX namespace kite { EX namespace kite {
EX bool in() { return cgflags & qKITE; }
#if CAP_BT #if CAP_BT
#if HDR #if HDR
@ -442,7 +445,7 @@ EX void find_cell_connection(cell *c, int d) {
} }
} }
auto hooksw = addHook(hooks_swapdim, 100, [] { if(penrose && currentmap) kite_map()->make_graphrules(); }); auto hooksw = addHook(hooks_swapdim, 100, [] { if(kite::in() && currentmap) kite_map()->make_graphrules(); });
#endif #endif
}} }}

8
landlock.cpp
View File

@ -831,8 +831,8 @@ EX land_validity_t& land_validity(eLand l) {
if(among(l, laMirror, laMirrorOld) && (GOLDBERG && old_daily_id < 33)) if(among(l, laMirror, laMirrorOld) && (GOLDBERG && old_daily_id < 33))
return dont_work; return dont_work;
// mirrors do not work in penrose and sol // mirrors do not work in kite and sol
if(among(l, laMirror, laMirrorOld) && (penrose || sol)) if(among(l, laMirror, laMirrorOld) && (kite::in() || sol))
return dont_work; return dont_work;
if(isCrossroads(l) && geometry == gBinary4) if(isCrossroads(l) && geometry == gBinary4)
@ -970,7 +970,7 @@ EX land_validity_t& land_validity(eLand l) {
return special_chaos; return special_chaos;
return not_in_chaos; return not_in_chaos;
} }
if(arcm::in() || penrose) return not_implemented; if(arcm::in() || kite::in()) return not_implemented;
if(bounded) return unbounded_only; if(bounded) return unbounded_only;
} }
@ -1129,7 +1129,7 @@ EX land_validity_t& land_validity(eLand l) {
return great_walls_missing; return great_walls_missing;
// highlight Crossroads on Euclidean // highlight Crossroads on Euclidean
if(euclid && !quotient && (l == laCrossroads || l == laCrossroads4) && !penrose) if(euclid && !quotient && (l == laCrossroads || l == laCrossroads4) && !kite::in())
return full_game; return full_game;
if(sol && among(l, laCrossroads, laCrossroads4)) if(sol && among(l, laCrossroads, laCrossroads4))

2
nonisotropic.cpp
View File

@ -1383,7 +1383,7 @@ EX namespace product {
EX bool validate_spin() { EX bool validate_spin() {
if(prod) return hybrid::in_underlying_geometry(validate_spin); if(prod) return hybrid::in_underlying_geometry(validate_spin);
if(penrose) return false; if(kite::in()) return false;
if(!quotient && !arcm::in()) return true; if(!quotient && !arcm::in()) return true;
map<cell*, cellwalker> cws; map<cell*, cellwalker> cws;
manual_celllister cl; manual_celllister cl;

10
pattern2.cpp
View File

@ -381,7 +381,7 @@ EX int fieldval_uniq(cell *c) {
if(ctof(c)) return c->master->fieldval; if(ctof(c)) return c->master->fieldval;
else return createMov(c, 0)->master->fieldval + 256 * createMov(c,2)->master->fieldval + (1<<16) * createMov(c,4)->master->fieldval; else return createMov(c, 0)->master->fieldval + 256 * createMov(c,2)->master->fieldval + (1<<16) * createMov(c,4)->master->fieldval;
} }
else if(euclid && !penrose && !arcm::in()) { else if(euclid && !kite::in() && !arcm::in()) {
auto p = euc2_coordinates(c); auto p = euc2_coordinates(c);
if(bounded) return p.first + (p.second << 16); if(bounded) return p.first + (p.second << 16);
return gmod(p.first - 22 * p.second, 3*127); return gmod(p.first - 22 * p.second, 3*127);
@ -1202,14 +1202,14 @@ EX bool geosupport_chessboard() {
(arcm::in() && PURE) ? arcm::current.support_chessboard() : (arcm::in() && PURE) ? arcm::current.support_chessboard() :
(arcm::in() && DUAL) ? arcm::current.support_threecolor_bitruncated() : (arcm::in() && DUAL) ? arcm::current.support_threecolor_bitruncated() :
#endif #endif
(bt::in() || penrose) ? 0 : (bt::in() || kite::in()) ? 0 :
(S3 >= OINF) ? true : (S3 >= OINF) ? true :
(VALENCE % 2 == 0); (VALENCE % 2 == 0);
} }
EX int geosupport_threecolor() { EX int geosupport_threecolor() {
if(IRREGULAR) return 0; if(IRREGULAR) return 0;
if(penrose || bt::in()) return 0; if(kite::in() || bt::in()) return 0;
#if CAP_ARCM #if CAP_ARCM
if(arcm::in() && PURE) return arcm::current.support_threecolor(); if(arcm::in() && PURE) return arcm::current.support_threecolor();
if(arcm::in() && BITRUNCATED) return arcm::current.support_threecolor_bitruncated(); if(arcm::in() && BITRUNCATED) return arcm::current.support_threecolor_bitruncated();
@ -1230,7 +1230,7 @@ EX int geosupport_threecolor() {
EX int geosupport_football() { EX int geosupport_football() {
// always works in bitrunc geometries // always works in bitrunc geometries
if(BITRUNCATED) return 2; if(BITRUNCATED) return 2;
if(bt::in() || penrose) return 0; if(bt::in() || kite::in()) return 0;
#if CAP_ARCM #if CAP_ARCM
if(arcm::in() && DUAL) return false; if(arcm::in() && DUAL) return false;
@ -1387,7 +1387,7 @@ EX bool pseudohept(cell *c) {
if(nil) return c->master->zebraval & c->master->emeraldval & c->master->fieldval & 1; if(nil) return c->master->zebraval & c->master->emeraldval & c->master->fieldval & 1;
if(sol) return (c->master->emeraldval % 3 == 2) && (c->master->zebraval % 3 == 2) && (c->master->distance % 2); if(sol) return (c->master->emeraldval % 3 == 2) && (c->master->zebraval % 3 == 2) && (c->master->distance % 2);
if(nih) return c->master->zebraval % 3 == 2 && c->master->emeraldval % 2 == 1 && (c->master->distance % 2); if(nih) return c->master->zebraval % 3 == 2 && c->master->emeraldval % 2 == 1 && (c->master->distance % 2);
if(penrose) return kite::getshape(c->master) == kite::pDart; if(kite::in()) return kite::getshape(c->master) == kite::pDart;
if(bt::in()) return bt::pseudohept(c); if(bt::in()) return bt::pseudohept(c);
#endif #endif
if(S3 >= OINF) return c->master->distance % 3 == 1; if(S3 >= OINF) return c->master->distance % 3 == 1;

8
polygons.cpp
View File

@ -424,7 +424,7 @@ void geometry_information::procedural_shapes() {
else { else {
ld rad0 = floorrad0, rad1 = floorrad1; ld rad0 = floorrad0, rad1 = floorrad1;
if(penrose) rad0 /= 2, rad1 /= 2; if(kite::in()) rad0 /= 2, rad1 /= 2;
if(S3 >= OINF) rad0 = rad1 = zhexf; if(S3 >= OINF) rad0 = rad1 = zhexf;
bshape(shWall[0], PPR::WALL); bshape(shWall[0], PPR::WALL);
for(int t=0; t<=S6; t++) { for(int t=0; t<=S6; t++) {
@ -847,7 +847,7 @@ void geometry_information::reserve_wall3d(int i) {
void geometry_information::create_wall3d() { void geometry_information::create_wall3d() {
if(WDIM == 2) return; if(WDIM == 2) return;
reserve_wall3d(penrose ? 22 : hybri ? 0 : S7); reserve_wall3d(kite::in() ? 22 : hybri ? 0 : S7);
if(GDIM == 3 && bt::in() && geometry == gBinary3) { if(GDIM == 3 && bt::in() && geometry == gBinary3) {
hyperpoint h00 = point3(-1,-1,-1); hyperpoint h00 = point3(-1,-1,-1);
hyperpoint h01 = point3(-1,0,-1); hyperpoint h01 = point3(-1,0,-1);
@ -1002,7 +1002,7 @@ void geometry_information::create_wall3d() {
} }
} }
if(GDIM == 3 && !euclid && !bt::in() && !nonisotropic && !hybri && !penrose) { if(GDIM == 3 && !euclid && !bt::in() && !nonisotropic && !hybri && !kite::in()) {
reg3::generate(); reg3::generate();
int facesize = isize(reg3::cellshape) / S7; int facesize = isize(reg3::cellshape) / S7;
for(int w=0; w<S7; w++) { for(int w=0; w<S7; w++) {
@ -1081,7 +1081,7 @@ void geometry_information::create_wall3d() {
for(int i=0; i<S7; i++) make_wall(i, nilv::current_ns().facevertices[i]); for(int i=0; i<S7; i++) make_wall(i, nilv::current_ns().facevertices[i]);
} }
if(penrose) { if(kite::in()) {
auto kv = kite::make_walls(); auto kv = kite::make_walls();
for(auto& v: kv.first) for(auto& h: v) { for(auto& v: kv.first) for(auto& h: v) {
h = bt::deparabolic3(h); h = bt::deparabolic3(h);

2
racing.cpp
View File

@ -776,7 +776,7 @@ EX bool set_view() {
transmatrix at = ypush(-vid.yshift) * ggmatrix(who->base) * who->at; transmatrix at = ypush(-vid.yshift) * ggmatrix(who->base) * who->at;
if(racing::player_relative || quotient || (penrose && GDIM == 3)) { if(racing::player_relative || quotient || (kite::in() && GDIM == 3)) {
View = inverse(at) * View; View = inverse(at) * View;
} }
else { else {

2
raycaster.cpp
View File

@ -62,7 +62,7 @@ EX bool available() {
if(noGUI) return false; if(noGUI) return false;
if(!vid.usingGL) return false; if(!vid.usingGL) return false;
if(WDIM == 2) return false; if(WDIM == 2) return false;
if(hyperbolic && pmodel == mdPerspective && !penrose) if(hyperbolic && pmodel == mdPerspective && !kite::in())
return true; return true;
if(nil && S7 == 8) if(nil && S7 == 8)
return false; return false;

4
system.cpp
View File

@ -1215,7 +1215,7 @@ EX void set_geometry(eGeometry target) {
if(DUAL && geometry != gArchimedean) if(DUAL && geometry != gArchimedean)
variation = ginf[geometry].default_variation; variation = ginf[geometry].default_variation;
#if CAP_BT #if CAP_BT
if(bt::in() || WDIM == 3 || penrose) if(!hybri) variation = eVariation::pure; if(bt::in() || WDIM == 3 || kite::in()) if(!hybri) variation = eVariation::pure;
#endif #endif
if(S3 == OINF) variation = eVariation::pure; if(S3 == OINF) variation = eVariation::pure;
if(was_default) pmodel = default_model(); if(was_default) pmodel = default_model();
@ -1229,7 +1229,7 @@ EX void set_geometry(eGeometry target) {
EX void set_variation(eVariation target) { EX void set_variation(eVariation target) {
if(variation != target) { if(variation != target) {
stop_game(); stop_game();
if(bt::in() || sol || penrose || WDIM == 3) if(!prod) geometry = gNormal; if(bt::in() || sol || kite::in() || WDIM == 3) if(!prod) geometry = gNormal;
auto& cd = ginf[gCrystal]; auto& cd = ginf[gCrystal];
if(target == eVariation::bitruncated && cryst && cd.sides == 8 && cd.vertex == 4) { if(target == eVariation::bitruncated && cryst && cd.sides == 8 && cd.vertex == 4) {
cd.vertex = 3; cd.vertex = 3;

2
yendor.cpp
View File

@ -197,7 +197,7 @@ EX namespace yendor {
} }
EX bool exhaustive_distance_appropriate() { EX bool exhaustive_distance_appropriate() {
if(euclid && (penrose || arcm::in() || quotient)) return true; if(euclid && (kite::in() || arcm::in() || quotient)) return true;
if(nil && quotient) return true; if(nil && quotient) return true;
if(asonov::in() && asonov::period_xy && asonov::period_xy <= 256) return true; if(asonov::in() && asonov::period_xy && asonov::period_xy <= 256) return true;