1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-11-14 04:37:10 +00:00

split namespace conformal into models and history

This commit is contained in:
Zeno Rogue
2019-08-10 00:58:50 +02:00
parent 6ed530c50c
commit 5ea055b39e
25 changed files with 999 additions and 1630 deletions

View File

@@ -496,7 +496,7 @@ void run_kuen() {
for(auto p: mesh) {
auto px = map_to_surface(p->h, m);
p->surface_point = px;
conformal::progress(XLAT("solving the geodesics on: %1, %2/%3", XLAT(captions[part]), its(p->dexp_id), its(isize(mesh))));
history::progress(XLAT("solving the geodesics on: %1, %2/%3", XLAT(captions[part]), its(p->dexp_id), its(isize(mesh))));
}
for(auto p: mesh) {
// make it a bit nicer by including the edges where only one endpoint is valid
@@ -568,7 +568,7 @@ void run_other() {
p->surface_point = map_to_surface(h, dp);
p->flat = coord(p->surface_point.params);
conformal::progress(XLAT("solving the geodesics on: %1, %2/%3", XLAT(shape_name[sh]), its(it), its(isize(rug::points))));
history::progress(XLAT("solving the geodesics on: %1, %2/%3", XLAT(shape_name[sh]), its(it), its(isize(rug::points))));
if(p->surface_point.remaining_distance == 0)
coverage.emplace_back(h, rchar(it) + 256 * 7);
}
@@ -597,7 +597,7 @@ EX void run_shape(eShape s) {
rug::init();
// if(!rug::rugged) rug::reopen();
pushScreen(conformal::progress_screen);
pushScreen(history::progress_screen);
if(sh != dsNone) rug::good_shape = true;
switch(sh) {