mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-27 02:20:36 +00:00
Code Issues Releases Wiki Activity

embeddings:: better info about wrong options and how to change them

Browse Source
This commit is contained in:
Zeno Rogue 2023-02-05 11:18:13 +01:00
parent 23e4f90685
commit ce90bb6db2
2 changed files with 56 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
config.cpp
View File

@ -2249,12 +2249,21 @@ EX bool in_tpp() { return pmodel == mdDisk && pconf.camera_angle; }
EX void display_embedded_errors() { EX void display_embedded_errors() {
using namespace geom3; using namespace geom3;
if(meuclid && among(spatial_embedding, seNil, seSol, seSolN, seNIH, seProductH, seProductS, seCliffordTorus, seSL2) && (!among(geometry, gEuclid, gEuclidSquare) || !PURE)) { auto eucs = [] {
dialog::addItem(XLAT("set square tiling"), 'A'); dialog::add_action([] { dialog::do_if_confirmed( [] { stop_game(); set_geometry(gEuclidSquare); set_variation(eVariation::pure); start_game(); });});
dialog::addItem(XLAT("set hex tiling"), 'B'); dialog::add_action([] { dialog::do_if_confirmed( [] { stop_game(); set_geometry(gEuclid); set_variation(eVariation::pure); start_game(); });});
};
if(among(spatial_embedding, seNil, seProductH, seProductS, seCliffordTorus, seSL2) && (!among(geometry, gEuclid, gEuclidSquare) || !PURE)) {
dialog::addInfo(XLAT("error: currently works only in PURE Euclidean regular square or hex tiling"), 0xC00000); dialog::addInfo(XLAT("error: currently works only in PURE Euclidean regular square or hex tiling"), 0xC00000);
eucs();
return; return;
} }
if(mhyperbolic && among(spatial_embedding, seSol, seSolN, seNIH) && !bt::in()) { if(among(spatial_embedding, seSol, seSolN, seNIH) && (!bt::in() && !among(geometry, gEuclid, gEuclidSquare))) {
dialog::addInfo(XLAT("error: currently works only in binary tiling and similar"), 0xC00000); dialog::addInfo(XLAT("error: currently works only in pure Euclidean, or binary tiling and similar"), 0xC00000);
eucs();
dialog::addItem(XLAT("set binary tiling variant"), 'C'); dialog::add_action([] { dialog::do_if_confirmed( [] { stop_game(); set_geometry(gBinaryTiling); geom3::switch_fpp(); geom3::switch_fpp(); start_game(); }); });
dialog::addItem(XLAT("set ternary tiling"), 'D'); dialog::add_action([] { dialog::do_if_confirmed( [] { stop_game(); set_geometry(gTernary); geom3::switch_fpp(); geom3::switch_fpp(); start_game(); }); });
dialog::addItem(XLAT("set binary tiling"), 'E'); dialog::add_action([] { dialog::do_if_confirmed( [] { stop_game(); set_geometry(gBinary4); geom3::switch_fpp(); geom3::switch_fpp(); start_game(); }); });
return; return;
} }
if(shmup::on && cgi.emb->no_spin()) { if(shmup::on && cgi.emb->no_spin()) {
@ -2262,11 +2271,16 @@ EX void display_embedded_errors() {
return; return;
} }
if(meuclid && spatial_embedding == seCliffordTorus) { if(meuclid && spatial_embedding == seCliffordTorus) {
rug::clifford_torus ct; if(!clifford_torus_valid()) {
ld h = ct.xh | ct.yh;
bool err = sqhypot_d(2, ct.xh) < 1e-3 || sqhypot_d(2, ct.yh) < 1e-3 || abs(h) > 1e-3;
if(err) {
dialog::addInfo(XLAT("error: this method works only in rectangular torus"), 0xC00000); dialog::addInfo(XLAT("error: this method works only in rectangular torus"), 0xC00000);
dialog::addItem(XLAT("set 20x20 torus"), 'A'); dialog::add_action([] { dialog::do_if_confirmed( [] { stop_game();
auto& T0 = euc::eu_input.user_axes;
T0[0][0] = T0[1][1] = 20;
T0[0][1] = 0;
T0[1][0] = geometry == gEuclid ? 10 : 0;
euc::eu_input.twisted = false;
euc::build_torus3();
geom3::switch_fpp(); geom3::switch_fpp(); start_game(); }); });
return; return;
} }
} }
@ -2275,6 +2289,13 @@ EX void display_embedded_errors() {
bool err = sqhypot_d(2, ct.xh) < 1e-3 && sqhypot_d(2, ct.yh) < 1e-3; bool err = sqhypot_d(2, ct.xh) < 1e-3 && sqhypot_d(2, ct.yh) < 1e-3;
if(err) { if(err) {
dialog::addInfo(XLAT("error: this method works only in cylinder"), 0xC00000); dialog::addInfo(XLAT("error: this method works only in cylinder"), 0xC00000);
dialog::addItem(XLAT("set cylinder"), 'A'); dialog::add_action([] { dialog::do_if_confirmed( [] { stop_game();
auto& T0 = euc::eu_input.user_axes;
T0[0][0] = 10;
T0[0][1] = T0[1][0] = T0[1][1] = 0;
euc::eu_input.twisted = false;
euc::build_torus3();
geom3::switch_fpp(); geom3::switch_fpp(); start_game(); }); });
return; return;
} }
} }
@ -2303,6 +2324,9 @@ EX void show_spatial_embedding() {
auto se = geom3::eSpatialEmbedding(i); auto se = geom3::eSpatialEmbedding(i);
dialog::addBoolItem(XLAT(seo[i].first), emb == i, 'a' + i); dialog::addBoolItem(XLAT(seo[i].first), emb == i, 'a' + i);
dialog::add_action([se] { invoke_embed(se); }); dialog::add_action([se] { invoke_embed(se); });
string s = why_wrong(se);
if(s != "")
dialog::items.back().value = (emb == i ? ONOFF(true) : XLAT("needs")) + s;
} }
dialog::addBreak(100); dialog::addBreak(100);

26
embeddings.cpp
View File

@ -67,6 +67,30 @@ EX namespace geom3 {
{"SL2 cylinder", "Embed Euclidean as a cylinder in twisted product geometry."}, {"SL2 cylinder", "Embed Euclidean as a cylinder in twisted product geometry."},
}; };
EX bool clifford_torus_valid() {
rug::clifford_torus ct;
ld h = ct.xh | ct.yh;
return !(sqhypot_d(2, ct.xh) < 1e-3 || sqhypot_d(2, ct.yh) < 1e-3 || abs(h) > 1e-3);
}
EX string why_wrong(eSpatialEmbedding sp) {
string ans = "";
if(among(sp, seNil, seCliffordTorus, seProductH, seProductS, seSL2) || any_cylinder(sp)) {
if(!PURE)
ans += " pure";
if(!meuclid)
ans += " E";
if((sp == seProductS || any_cylinder(sp)) && !quotient)
ans += " cyl";
if(sp == seCliffordTorus && !clifford_torus_valid())
ans += " torus";
}
if(among(sp, seSol, seNIH, seSolN)) {
if((meuclid && !PURE) && !bt::in()) ans += " pure or bin";
}
return ans;
}
EX eSpatialEmbedding spatial_embedding = seDefault; EX eSpatialEmbedding spatial_embedding = seDefault;
EX ld euclid_embed_scale = 1; EX ld euclid_embed_scale = 1;
EX ld euclid_embed_scale_y = 1; EX ld euclid_embed_scale_y = 1;
@ -92,7 +116,7 @@ EX namespace geom3 {
} }
EX bool any_cylinder(eSpatialEmbedding e) { EX bool any_cylinder(eSpatialEmbedding e) {
return among(e, seCylinderE, seCylinderH, seCylinderHE, seCylinderHoro, seCylinderNil); return among(e, seCylinderE, seCylinderH, seCylinderHE, seCylinderHoro, seCylinderNil, seCylinderSL2);
} }
EX bool in_product() { EX bool in_product() {