mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-11 18:00:34 +00:00
Code Issues Releases Wiki Activity

fake:: ordered modes

Browse Source
This commit is contained in:
Zeno Rogue 2020-07-03 15:06:33 +02:00
parent 7d874890ac
commit b8444a7fa2
1 changed files with 68 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
fake.cpp
View File

@ -18,6 +18,8 @@ EX namespace fake {
EX hrmap *pmap; EX hrmap *pmap;
EX geometry_information *pcgip; EX geometry_information *pcgip;
EX eGeometry actual_geometry; EX eGeometry actual_geometry;
EX int ordered_mode = 0;
EX bool in() { return geometry == gFake; } EX bool in() { return geometry == gFake; }
@ -32,6 +34,8 @@ EX namespace fake {
if(among(geometry, gRhombic3, gBitrunc3)) return false; if(among(geometry, gRhombic3, gBitrunc3)) return false;
return euc::in() || reg3::in(); return euc::in() || reg3::in();
} }
map<cell*, ld> random_order;
// a dummy map that does nothing // a dummy map that does nothing
struct hrmap_fake : hrmap { struct hrmap_fake : hrmap {
@ -183,15 +187,68 @@ EX namespace fake {
return; return;
} }
dq::visited_c.clear(); dq::clear_all();
dq::visited_by_matrix.clear();
auto enqueue = (multiple && multiple_special_draw ? dq::enqueue_by_matrix_c : dq::enqueue_c);
enqueue(centerover, cview());
int id = 0; int id = 0;
int limit = 100 * pow(1.2, sightrange_bonus); int limit = 100 * pow(1.2, sightrange_bonus);
if(WDIM == 3 || vid.use_smart_range) if(WDIM == 3 || vid.use_smart_range)
limit = INT_MAX; limit = INT_MAX;
if(ordered_mode && !(multiple && multiple_special_draw)) {
using pct = pair<cell*, transmatrix>;
auto comparer = [] (pct& a1, pct& a2) {
if(ordered_mode > 2) {
auto val = [] (pct& a) {
if(!random_order.count(a.first))
random_order[a.first] = randd() * 2;
return random_order[a.first] + hdist0(tC0(a.second));
};
return val(a1) > val(a2);
}
return a1.second[LDIM][LDIM] > a2.second[LDIM][LDIM];
};
std::priority_queue<pct, std::vector<pct>, decltype(comparer)> myqueue(comparer);
auto enq = [&] (cell *c, const transmatrix& V) {
if(!c) return;
if(ordered_mode == 1 || ordered_mode == 3) {
if(dq::visited_c.count(c)) return;
dq::visited_c.insert(c);
}
myqueue.emplace(c, V);
};
enq(centerover, cview());
while(!myqueue.empty()) {
auto& p = myqueue.top();
id++;
cell *c = get<0>(p);
transmatrix V = get<1>(p);
myqueue.pop();
if(ordered_mode == 2 || ordered_mode == 4) {
if(dq::visited_c.count(c)) continue;
dq::visited_c.insert(c);
}
if(!do_draw(c, V)) continue;
drawcell(c, V);
if(in_wallopt() && isWall3(c) && isize(dq::drawqueue_c) > 1000) continue;
if(id > limit) continue;
for(int i=0; i<c->type; i++) if(c->move(i)) {
enq(c->move(i), V * adj(c, i));
}
}
return;
}
auto enqueue = (multiple && multiple_special_draw ? dq::enqueue_by_matrix_c : dq::enqueue_c);
enqueue(centerover, cview());
while(!dq::drawqueue_c.empty()) { while(!dq::drawqueue_c.empty()) {
auto& p = dq::drawqueue_c.front(); auto& p = dq::drawqueue_c.front();
@ -508,6 +565,10 @@ EX void configure() {
dialog::addBoolItem_action("draw all if multiple of original", multiple_special_draw, 'M'); dialog::addBoolItem_action("draw all if multiple of original", multiple_special_draw, 'M');
dialog::addBoolItem_action("draw copies (2D only)", recursive_draw, 'C'); dialog::addBoolItem_action("draw copies (2D only)", recursive_draw, 'C');
dialog::addBoolItem_choice("unordered", ordered_mode, 0, 'U');
dialog::addBoolItem_choice("pre-ordered", ordered_mode, 1, 'P');
dialog::addBoolItem_choice("post-ordered", ordered_mode, 2, 'Q');
}; };
} }
@ -519,6 +580,9 @@ int readArgs() {
start_game(); start_game();
shift_arg_formula(around, change_around); shift_arg_formula(around, change_around);
} }
else if(argis("-gfake-order")) {
shift(); ordered_mode = argi();
}
else return 1; else return 1;
return 0; return 0;
} }