mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-06-26 15:12:48 +00:00
Code Issues Releases Wiki Activity

expansion:: rule-based honeycombs

Browse Source
This commit is contained in:
Zeno Rogue 2020-07-05 00:53:23 +02:00
parent 6f2e7e90d5
commit 50be2133d1
1 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
expansion.cpp
View File

@ -103,13 +103,27 @@ template<class T, class U> vector<int> get_children_codes(cell *c, const T& dist
void expansion_analyzer::preliminary_grouping() { void expansion_analyzer::preliminary_grouping() {
samples.clear(); samples.clear();
codeid.clear(); codeid.clear();
children.clear(); children.clear();
sample_id(currentmap->gamestart()); if(reg3::in_rule()) {
// queue for, do not change to range-based for rootid = reg3::rule_get_root(0);
for(int i=0; i<isize(samples); i++) auto& chi = reg3::rule_get_children();
children.push_back(get_children_codes(samples[i], celldist, [this] (cell *c) { return sample_id(c); })); N = isize(chi) / S7;
N = isize(samples); children.resize(N);
rootid = 0; int k = 0;
for(int i=0; i<N; i++) for(int j=0; j<S7; j++) {
if(chi[k] >= 0)
children[i].push_back(chi[k]);
k++;
}
}
else {
sample_id(currentmap->gamestart());
// queue for, do not change to range-based for
for(int i=0; i<isize(samples); i++)
children.push_back(get_children_codes(samples[i], celldist, [this] (cell *c) { return sample_id(c); }));
N = isize(samples);
rootid = 0;
}
diskid = N; diskid = N;
children.push_back(children[rootid]); children.push_back(children[rootid]);
children[diskid].push_back(diskid); children[diskid].push_back(diskid);
@ -117,6 +131,7 @@ void expansion_analyzer::preliminary_grouping() {
} }
void expansion_analyzer::reduce_grouping() { void expansion_analyzer::reduce_grouping() {
if(reg3::in_rule()) return;
int old_N = N; int old_N = N;
vector<int> grouping; vector<int> grouping;
grouping.resize(N); grouping.resize(N);
@ -362,7 +377,7 @@ int type_in_quick(expansion_analyzer& ea, cell *c, const cellfunction& f) {
} }
EX bool sizes_known() { EX bool sizes_known() {
if(GDIM == 3) return false; if(reg3::in_rule()) return true;
if(bounded) return false; if(bounded) return false;
// Castle Anthrax is infinite // Castle Anthrax is infinite
if(bt::in()) return false; if(bt::in()) return false;
@ -539,7 +554,19 @@ void celldrawer::do_viewdist() {
break; break;
} }
case ncType: { case ncType: {
int t = type_in_reduced(expansion, c, curr_dist); int t = -1;
if(reg3::in_rule()) switch(distance_from) {
case dfPlayer:
t = -1;
break;
case dfStart:
t = c->master->fiftyval;
break;
case dfWorld:
if(c->master->alt) t = c->master->alt->fiftyval;
break;
}
else t = type_in_reduced(expansion, c, curr_dist);
if(t >= 0) label = its(t), dc = distribute_color(t); if(t >= 0) label = its(t), dc = distribute_color(t);
break; break;
} }
@ -662,7 +689,13 @@ void expansion_analyzer::view_distances_dialog() {
bool really_use_analyzer = use_analyzer && sizes_known(); bool really_use_analyzer = use_analyzer && sizes_known();
if(really_use_analyzer) { if(really_use_analyzer) {
int t = type_in_reduced(expansion, cwt.at, curr_dist); int t;
if(reg3::in_rule()) {
if(!N) preliminary_grouping();
t = rootid;
}
else
t = type_in_reduced(expansion, cwt.at, curr_dist);
for(int r=0; r<maxlen; r++) for(int r=0; r<maxlen; r++)
qty[r] = expansion.get_descendants(r, t); qty[r] = expansion.get_descendants(r, t);
} }