From ce2d8d3d299094130ad5d74fbf07de2cc9bacfa3 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 27 Dec 2019 02:08:04 +0100
Subject: [PATCH] arb:: selectable in geom-exp

---
 arbitrile.cpp | 20 ++++++++++++++++++++
 classes.cpp   |  2 +-
 geom-exp.cpp  |  9 +++++----
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/arbitrile.cpp b/arbitrile.cpp
index 460e1d9a..024368aa 100644
--- a/arbitrile.cpp
+++ b/arbitrile.cpp
@@ -365,5 +365,25 @@ auto hook = addHook(hooks_args, 100, readArgs);
 
 EX bool in() { return geometry == gArbitrary; }
 
+EX string tes = "tessellations/marjorie-rice.tes";
+
+EX void choose() {
+  dialog::openFileDialog(tes, XLAT("open a tiling"), ".tes", 
+  [] () {
+    stop_game();
+    set_geometry(gArbitrary);
+    try {
+      load(tes);
+      ginf[gArbitrary].tiling_name = current.name;
+      }
+    catch(hr_parse_exception& ex) {
+      println(hlog, "failed: ", ex.s);
+      set_geometry(gNormal);
+      }
+    start_game();
+    return true;
+    });
+  }
+
 EX }
 }
\ No newline at end of file
diff --git a/classes.cpp b/classes.cpp
index 992981b6..10f6db65 100644
--- a/classes.cpp
+++ b/classes.cpp
@@ -886,7 +886,7 @@ EX vector<geometryinfo> ginf = {
   {"{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},
-  {"arb",    "none",    "arbitrary",                                  "arb",      7, 3, qEXPERIMENTAL,  giEuclid2, 0, {{7, 5}}, 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},
   };
   // bits: 9, 10, 15, 16, (reserved for later) 17, 18
diff --git a/geom-exp.cpp b/geom-exp.cpp
index 4dc68b50..06a7995e 100644
--- a/geom-exp.cpp
+++ b/geom-exp.cpp
@@ -226,9 +226,9 @@ EX geometry_filter *current_filter;
 
 bool forced_quotient() { return quotient && !(cgflags & qOPTQ); }
 
-EX geometry_filter gf_hyperbolic = {"hyperbolic", [] { return (arcm::in() || hyperbolic) && !forced_quotient(); }};
-EX geometry_filter gf_spherical = {"spherical", [] { return (arcm::in() || sphere) && !forced_quotient(); }};
-EX geometry_filter gf_euclidean = {"Euclidean", [] { return (arcm::in() || euclid) && !forced_quotient(); }};
+EX geometry_filter gf_hyperbolic = {"hyperbolic", [] { return (arcm::in() || arb::in() || hyperbolic) && !forced_quotient(); }};
+EX geometry_filter gf_spherical = {"spherical", [] { return (arcm::in() || arb::in() || sphere) && !forced_quotient(); }};
+EX geometry_filter gf_euclidean = {"Euclidean", [] { return (arcm::in() || arb::in() || euclid) && !forced_quotient(); }};
 EX geometry_filter gf_other = {"non-isotropic", [] { return prod || nonisotropic; }};
 EX geometry_filter gf_regular_2d = {"regular 2D tesselations", [] { 
   return standard_tiling() && WDIM == 2 && !forced_quotient();
@@ -277,6 +277,8 @@ void set_or_configure_geometry(eGeometry g) {
   else if(g == gArchimedean)
     pushScreen(arcm::show);
   #endif
+  else if(g == gArbitrary)
+    arb::choose();
   else {
     if(among(g, gProduct, gRotSpace)) {
       if(WDIM == 3 || (g == gRotSpace && euclid)) {
@@ -348,7 +350,6 @@ void ge_select_tiling() {
     bool on = geometry == g;
     bool in_2d = WDIM == 2;
     dynamicval<eGeometry> cg(geometry, g);
-    if(g == gArbitrary) continue;
     if(g == gTorus) continue;
     if(arcm::in() && !CAP_ARCM) continue;
     if(cryst && !CAP_CRYSTAL) continue;