mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

renamed gSL2 to gRotSpace

This commit is contained in:
Zeno Rogue 2019-08-27 09:18:21 +02:00
parent c33c79a902
commit 2e066c106c
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes.cpp
View File

@ -585,7 +585,7 @@ vector<geometryinfo> ginf = {
{"kd3", "none", "kite-and-dart on horospheres", "kd3", 12, 3, qsBP, giHyperb3, 0x48200, {{7, 3}}, eVariation::pure},
{"nil", "none", "Nil geometry", "nil", 6, 3, 0, giNil, 0x48600, {{7, 5}}, eVariation::pure},
{"product","none", "product space", "product", 7, 3, qHYBRID, giProduct, 0x48400, {{7, 3}}, eVariation::pure},
{"twisted","none", "space of isometries", "twisted", 7, 3, qHYBRID, giSL2, 0x49000, {{6, 4}}, eVariation::pure},
{"twisted","none", "rotation space", "twisted", 7, 3, qHYBRID, giSL2, 0x49000, {{6, 4}}, eVariation::pure},
};
// bits: 9, 10, 15, 16, (reserved for later) 17, 18

2
classes.h
View File

@ -214,7 +214,7 @@ enum eGeometry {
gHoroTris, gHoroRec, gHoroHex,
gField435, gField534,
gBinary4, gSol,
gKiteDart2, gKiteDart3, gNil, gProduct, gSL2,
gKiteDart2, gKiteDart3, gNil, gProduct, gRotSpace,
gGUARD};
enum eGeometryClass { gcHyperbolic, gcEuclid, gcSphere, gcSol, gcNil, gcProduct, gcSL2 };

10
geom-exp.cpp
View File

@ -398,7 +398,7 @@ vector<eGeometry> list3d = {
gCell24, gECell24,
gCell16, gECell16,
gCell8, gECell8,
gCell5, gKiteDart3, gSol, gNil, gProduct, gSL2
gCell5, gKiteDart3, gSol, gNil, gProduct, gRotSpace
};
void ge_select_tiling(const vector<eGeometry>& lst) {
@ -418,8 +418,8 @@ void ge_select_tiling(const vector<eGeometry>& lst) {
if(cryst && !CAP_CRYSTAL) continue;
if(geometry == gFieldQuotient && !CAP_FIELD) continue;
dialog::addBoolItem(XLAT(
(geometry == gProduct && !on) ? XLAT("current geometry x E") :
(geometry == gSL2 && !on) ? XLAT("isometries of current geometry") :
(geometry == gProduct && !hybri) ? XLAT("current geometry x E") :
(geometry == gRotSpace && !hybri) ? XLAT("space of rotations in current geometry") :
ginf[i].menu_displayed_name), on, letter++);
dialog::lastItem().value += validclasses[land_validity(specialland).quality_level];
dialog::add_action(dual::mayboth([i] {
@ -434,12 +434,12 @@ void ge_select_tiling(const vector<eGeometry>& lst) {
pushScreen(arcm::show);
#endif
else dialog::do_if_confirmed([targetgeometry] () {
bool th = among(targetgeometry, gProduct, gSL2);
bool th = among(targetgeometry, gProduct, gRotSpace);
if(th && (WDIM == 3 || euclid)) {
addMessage(XLAT("Only works with 2D non-Euclidean geometries"));
return;
}
if(targetgeometry == gSL2) {
if(targetgeometry == gRotSpace) {
bool ok = true;
if(archimedean) ok = PURE;
else if(binarytiling || penrose) ok = false;

2
landlock.cpp
View File

@ -685,7 +685,7 @@ EX land_validity_t& land_validity(eLand l) {
return lv::not_implemented;
if(among(l, laReptile, laDragon, laTortoise))
return lv::bad_graphics;
if((hybrid::actual_geometry == gSL2 || geometry == gSL2) && l == laDryForest)
if((hybrid::actual_geometry == gRotSpace || geometry == gRotSpace) && l == laDryForest)
return lv::hedgehogs;
if(hybri) return *PIU(&land_validity(l));
}

6
nonisotropic.cpp
View File

@ -579,7 +579,7 @@ EX namespace hybrid {
auto keep = ginf[g].menu_displayed_name;
ginf[g] = ginf[underlying];
ginf[g].menu_displayed_name = keep;
if(g == gSL2) {
if(g == gRotSpace) {
ginf[g].g = sph ? giSphere3 : giSL2;
ginf[g].tiling_name = "Iso(" + ginf[g].tiling_name + ")";
string& qn = ginf[g].quotient_name;
@ -589,7 +589,7 @@ EX namespace hybrid {
if(sph) ginf[g].flags |= qELLIPTIC;
}
else {
ginf[g].cclass = g == gSL2 ? gcSL2 : gcProduct;
ginf[g].cclass = g == gRotSpace ? gcSL2 : gcProduct;
ginf[g].g.gameplay_dimension++;
ginf[g].g.graphical_dimension++;
ginf[g].tiling_name += "xZ";
@ -1349,7 +1349,7 @@ EX namespace nisot {
}
else if(argis("-rotspace")) {
PHASEFROM(2);
set_geometry(gSL2);
set_geometry(gRotSpace);
return 0;
}
return 1;

2
system.cpp
View File

@ -1161,7 +1161,7 @@ EX void set_geometry(eGeometry target) {
int old_DIM = GDIM;
stop_game();
ors::reset();
if(among(target, gProduct, gSL2)) hybrid::configure(target);
if(among(target, gProduct, gRotSpace)) hybrid::configure(target);
geometry = target;
if(chaosmode && bounded) chaosmode = false;