show map type, improved expansion

config.cpp

@@ -3507,6 +3507,22 @@ EX int config3 = addHook(hooks_configfile, 100, [] {
   -> editable("apply color/pattern changes to canvas automatically", 'l');
   param_str(ccolor::color_formula, "color_formula")
   -> editor = [] { ccolor::config_formula(false); };
+
+  param_i(count_max_cells, "count_max_cells", 100000)->editable(100, 1000000, log(10), "max cells to count",
+    "Counting stops if that many cells are reached.", 'c')
+  ->set_sets([] { dialog::scaleLog(); });
+
+  param_i(count_max_dist, "count_max_dist", 999)->editable(5, 1000, 1, "max distance to check",
+    "Counting stops if this distance is reached.", 'd');
+
+  param_b(use_analyzer, "count_use_analyzer", true)->editable("use analyzer if possible", 'a');
+  param_b(use_sight_range_instead, "count_use_sight", true)->editable("use sight range instead", 's');
+
+/*    dialog::editNumber(vid.cells_drawn_limit, 100, 1000000, log(10), 10000, XLAT("limit on cells drawn"),
+      XLAT("This limit exists to protect the engine from freezing when too many cells would be drawn according to the current options.")
+      );
+    dialog::scaleLog(); */
+
   });
 
 EX void switchcolor(unsigned int& c, unsigned int* cs) {

control.cpp

@@ -555,13 +555,13 @@ EX array<int, 8> keys_numpad = {{SDLK_KP6, SDLK_KP3, SDLK_KP2, SDLK_KP1, SDLK_KP
 
 EX void handleKeyNormal(int sym, int uni) {
 
-  if(cheater && sym < 256 && sym > 0) {
+  if(cheater && sym < 256 && sym > 0 && !dialog::key_actions.count(uni)) {
     if(applyCheat(uni))
       uni = sym = 0;
     }
 
   #if CAP_SHOT
-  if(uni == 'A') { pushScreen(shot::menu); uni = sym = 0; }
+  if(uni == 'A' && !dialog::key_actions.count('A')) { pushScreen(shot::menu); uni = sym = 0; }
   #endif
 
   if(DEFAULTNOR(sym)) handlePanning(sym, uni);

expansion.cpp

@@ -732,6 +732,19 @@ string produce_coef_formula(vector<int> coef) {
   }
 
 EX bool auto_extend = true;
+EX bool use_sight_range_instead = true;
+
+EX int count_max_cells = 100000;
+EX int count_max_dist = 999;
+
+void configure_counter() {
+  dialog::init("");
+  add_edit(use_analyzer);
+  add_edit(count_max_dist);
+  add_edit(count_max_cells);
+  add_edit(use_sight_range_instead);
+  dialog::display();
+  }
 
 void expansion_analyzer::view_distances_dialog() {
   static int lastticks;
@@ -749,8 +762,16 @@ void expansion_analyzer::view_distances_dialog() {
   auto& expansion = get_expansion();
 
   bool really_use_analyzer = use_analyzer && sizes_known();
+  bool nomore = false;
+  bool knowall = false;
 
   if(really_use_analyzer) {
+    dialog::addSelItem(XLAT("based on analysis"),
+      reg3::exact_rules() ? XLAT("3D rules") :
+      currentmap->strict_tree_rules() ? XLAT("generated rules") :
+      XLAT("built-in rules"), 'A'
+      );
+    dialog::add_action_push(configure_counter);
     int t;
     if(reg3::exact_rules() || currentmap->strict_tree_rules()) {
       if(!N) preliminary_grouping();      
@@ -762,33 +783,47 @@ void expansion_analyzer::view_distances_dialog() {
       qty[r] = expansion.get_descendants(r, t);
     }
   else {
+    int count_range = (GDIM == 2 && use_sight_range_instead) ? get_sightrange() : count_max_dist;
+    count_range = min(count_range, count_max_dist);
+    count_range = min(count_range, maxlen-1);
+
+    celllister cl(cwt.at, count_range, count_max_cells, NULL);
+    if(cl.reason == celllister::srAll) knowall = true;
+    if(cl.reason == celllister::srCount) count_range = cl.dists.back();
+
     if(distance_from == dfPlayer) {
-      celllister cl(cwt.at, closed_manifold ? maxlen-1 : gamerange(), 100000, NULL);
       for(int d: cl.dists)
         if(d >= 0 && d < maxlen) qty[d]++;
       }
     else {
-      celllister cl(cwt.at, closed_manifold ? maxlen-1 : gamerange(), 100000, NULL);
       for(cell *c: cl.lst) if((not_only_descendants || is_descendant(c)) && curr_dist(c) < maxlen) qty[curr_dist(c)]++;
       }
+    dialog::addSelItem(XLAT("cell counting range"), its(count_range), 'A');
+    dialog::add_action_push(configure_counter);
     #if !CAP_GMP
-    if(sizes_known() && !not_only_descendants) {
+    if((sizes_known() || bt::in()) && !not_only_descendants && !knowall) {
       find_coefficients();
-      if(gamerange()+1 >= valid_from && coefficients_known == 2) {
-        for(int i=gamerange()+1; i<maxlen; i++)
+      if(count_range+1 >= valid_from && coefficients_known == 2) {
+        for(int i=count_range+1; i<maxlen; i++)
           for(int j=0; j<isize(coef); j++) {
             qty[i].addmul(qty[i-1-j], coef[j]);
             }
         }
       }
+    else {
+      maxlen = min(maxlen, count_range+1);
+      if(maxlen == count_range+1) nomore = true;
+      }
     #endif
     }
 
   dialog::start_list(1600, 1600, 'a');
-  for(int i=0; i<maxlen; i++) if(!qty[i].digits.empty()) {
+  bool was_zero = false;
+  for(int i=0; i<maxlen; i++) if(!qty[i].digits.empty() || !was_zero) {
     dialog::addSelItem(qty[i].get_str(100), " " + its(i), dialog::list_fake_key);
     auto& last = dialog::lastItem();
     last.color = last.colorv = distcolors[i];
+    was_zero = qty[i].digits.empty();
     }
   dialog::end_list();
 
@@ -825,7 +860,7 @@ void expansion_analyzer::view_distances_dialog() {
     });
 
   dialog::display();
-  if(auto_extend && dialog::list_skip + dialog::list_actual_size == dialog::list_full_size) last_distance++;
+  if(auto_extend && dialog::list_skip + dialog::list_actual_size == dialog::list_full_size && !was_zero && !nomore && !knowall) last_distance++;
   }
 
 EX void enable_viewdists() {
@@ -845,7 +880,6 @@ bool expansion_handleKey(int sym, int uni) {
     dialog::handleNavigation(sym, uni);
     if(uni == 'S' && (cmode & sm::EXPANSION)) scrolling_distances = !scrolling_distances;
     else if(uni == 'C') pushScreen(viewdist_configure_dialog);
-    else if(uni == 'A' && (cmode & sm::EXPANSION)) use_analyzer = !use_analyzer;
     else if(sym == SDLK_ESCAPE) dialog::list_skip = 0, viewdists = false;
     else return false;
     return true;

geom-exp.cpp

@@ -956,7 +956,7 @@ EX geometry_data compute_geometry_data() {
   }
 
 EX void add_size_action() {
-  if(WDIM == 2 || reg3::exact_rules()) dialog::add_action([] {
+  dialog::add_action([] {
     if(!viewdists) { enable_viewdists(); pushScreen(viewdist_configure_dialog); }
     else if(viewdists) viewdists = false;
     });

locations.cpp

@@ -417,11 +417,14 @@ struct manual_celllister {
     for(int i=0; i<isize(lst); i++) lst[i]->listindex = tmps[i];
     }  
   };
-  
+
 /** \brief automatically generate a list of nearby cells */
 struct celllister : manual_celllister {
   vector<int> dists;
-
+
+  enum stop_reason { srAll, srCount, srCell, srDistance };
+  stop_reason reason;
+
   void add_at(cell *c, int d) {
     if(add(c)) dists.push_back(d);
     }
@@ -439,13 +442,15 @@ struct celllister : manual_celllister {
       cell *c = lst[i];
       if(maxdist) forCellCM(c2, c) {
         add_at(c2, dists[i]+1);
-        if(c2 == breakon) return;
+        if(c2 == breakon) { reason = srCell; return; }
         }
       if(c == last) {
-        if(isize(lst) >= maxcount || dists[i]+1 == maxdist) break;
+        if(isize(lst) >= maxcount) { reason = srCount; return; }
+        if(dists[i]+1 == maxdist) { reason = srDistance; return; }
         last = lst[isize(lst)-1];
         }
       }
+    reason = srAll;
     }
 
   /** \brief for a given cell c on the list, return its distance from orig */

rulegen.cpp

@@ -2582,15 +2582,40 @@ EX void show() {
     "tessellations (contrary to the basic implementation of Archimedean, tes, and unrectified/warped/untruncated tessellations).\n\nYou can convert mostly any "
     "non-spherical periodic 2D tessellation to strict tree based.\n\nSwitching the map format erases your map."));
 
-  if(aperiodic) {
+  if(closed_manifold) {
+    dialog::addInfo("not available (and not necessary) in closed manifolds");
+    dialog::addBack();
+    dialog::display();
+    return;
+    }
+  else if(aperiodic) {
     dialog::addInfo("not available in aperiodic tessellations");
     dialog::addBack();
     dialog::display();
+    return;
+    }
+  else if(bt::in()) {
+    dialog::addInfo("not available in binary-like tilings");
+    dialog::addBack();
+    dialog::display();
+    return;
     }
   else if(WDIM == 3) {
-    dialog::addInfo("not available in 3D tessellations");
+    if(reg3::in() && reg3::variation_rule_available())
+      dialog::addInfo("precomputed rule used (for specific variation)");
+    else if(reg3::in() && reg3::pure_rule_available())
+      dialog::addInfo("precomputed rule used (for regular honeycomb)");
+    else if(euc::in())
+      dialog::addInfo("no rule needed for Euclidean");
+    else if(reg3::in()) {
+      dialog::addInfo("not available in this regular honeycomb");
+      dialog::addInfo("fallback implementation used");
+      }
+    else
+      dialog::addInfo("not available in this 3D tessellation");
     dialog::addBack();
     dialog::display();
+    return;
     }
 
   dialog::addBoolItem(XLAT("in tes internal format"), arb::in(), 't');