From 910775a25dcce7659a034807afbf248f43e3deb6 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Sun, 13 Sep 2020 06:32:18 +0200 Subject: [PATCH] rvtour:: finished changing rvtour to pres --- rogueviz/banachtarski.cpp | 4 ++-- rogueviz/collatz.cpp | 4 ++-- rogueviz/grigorchuk.cpp | 4 ++-- rogueviz/impossible-ring.cpp | 2 +- rogueviz/noniso-honeycombs.cpp | 4 ++-- rogueviz/pentagonal.cpp | 2 +- rogueviz/random-walk.cpp | 2 +- rogueviz/sag.cpp | 4 ++-- rogueviz/snow.cpp | 2 +- rogueviz/staircase.cpp | 2 +- rogueviz/sunflower.cpp | 2 +- rogueviz/tree.cpp | 4 ++-- rogueviz/triangle.cpp | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/rogueviz/banachtarski.cpp b/rogueviz/banachtarski.cpp index ece8d4dc..aecfc293 100644 --- a/rogueviz/banachtarski.cpp +++ b/rogueviz/banachtarski.cpp @@ -558,8 +558,8 @@ int readArgs() { auto hook = addHook(hooks_args, 100, readArgs) + addHook(hooks_initgame, 100, bantar) + addHook(hooks_frame, 100, bantar_stats) - + addHook(rvtour::hooks_build_rvtour, 140, [] (vector& v) { - using namespace rvtour; + + addHook(pres::hooks_build_rvtour, 140, [] (vector& v) { + using namespace pres; v.push_back( tour::slide{"unsorted/Banach-Tarski-like", 62, LEGAL::NONE, "Banach-Tarski-like decomposition. Break a hyperbolic plane into two hyperbolic planes.\n\n" diff --git a/rogueviz/collatz.cpp b/rogueviz/collatz.cpp index 391a570c..a831ed4b 100644 --- a/rogueviz/collatz.cpp +++ b/rogueviz/collatz.cpp @@ -313,7 +313,7 @@ int readArgs() { } int ah = addHook(hooks_args, 100, readArgs) + - addHook(rvtour::hooks_build_rvtour, 142, [] (vector& v) { + addHook(pres::hooks_build_rvtour, 142, [] (vector& v) { using namespace tour; v.push_back( tour::slide{"unsorted/Collatz conjecture", 51, LEGAL::UNLIMITED | QUICKGEO, @@ -321,7 +321,7 @@ int ah = addHook(hooks_args, 100, readArgs) + "Press '5' for a spiral rendering of the Collatz conjecture visualization.\n\n" "Note that this, and many other RogueViz visualizations, have " "Euclidean versions (press ESC).\n", - rvtour::roguevizslide('d', [] () { + pres::roguevizslide('d', [] () { rogueviz::dftcolor = 0x206020FF; int fac = euclid ? 2 : 1; diff --git a/rogueviz/grigorchuk.cpp b/rogueviz/grigorchuk.cpp index a5a030f6..a203a582 100644 --- a/rogueviz/grigorchuk.cpp +++ b/rogueviz/grigorchuk.cpp @@ -496,8 +496,8 @@ auto hook = addHook(hooks_args, 100, readArgsG) }) + addHook(hooks_initialize, 100, create_grigorchuk_geometry) - + addHook(rogueviz::rvtour::hooks_build_rvtour, 140, [] (vector& v) { - using namespace rogueviz::rvtour; + + addHook(rogueviz::pres::hooks_build_rvtour, 140, [] (vector& v) { + using namespace rogueviz::pres; v.push_back(tour::slide{ "unsorted/Grigorchuk group", 10, tour::LEGAL::NONE, diff --git a/rogueviz/impossible-ring.cpp b/rogueviz/impossible-ring.cpp index f6e8c6fe..113a503e 100644 --- a/rogueviz/impossible-ring.cpp +++ b/rogueviz/impossible-ring.cpp @@ -290,7 +290,7 @@ auto hchook = addHook(hooks_drawcell, 100, draw_ptriangle) + addHook(hooks_o_key, 80, o_key) -+ addHook(rvtour::hooks_build_rvtour, 167, [] (vector& v) { ++ addHook(pres::hooks_build_rvtour, 167, [] (vector& v) { using namespace tour; v.push_back( tour::slide{"non-isotropic geometries/Impossible architecture in Nil/impossible ring", 18, LEGAL::NONE | QUICKGEO, diff --git a/rogueviz/noniso-honeycombs.cpp b/rogueviz/noniso-honeycombs.cpp index 9a9e7b8c..2efbfff2 100644 --- a/rogueviz/noniso-honeycombs.cpp +++ b/rogueviz/noniso-honeycombs.cpp @@ -161,7 +161,7 @@ void start_noniso(vector& v) { }); } -auto hooks = addHook(rvtour::hooks_build_rvtour, 163, honey) - + addHook(rvtour::hooks_build_rvtour, 160, start_noniso); +auto hooks = addHook(pres::hooks_build_rvtour, 163, honey) + + addHook(pres::hooks_build_rvtour, 160, start_noniso); } } diff --git a/rogueviz/pentagonal.cpp b/rogueviz/pentagonal.cpp index c5b06e09..ce08743c 100644 --- a/rogueviz/pentagonal.cpp +++ b/rogueviz/pentagonal.cpp @@ -347,7 +347,7 @@ auto xhook = addHook(hooks_args, 100, readArgs) + addHook(hooks_handleKey, 0, handleKey) + addHook(hooks_prestats, 0, frame) + addHook(hooks_clearmemory, 40, [] () { snubon = false; } ) -+ addHook(rvtour::hooks_build_rvtour, 142, [] (vector& v) { ++ addHook(pres::hooks_build_rvtour, 142, [] (vector& v) { using namespace tour; v.push_back( tour::slide{"unsorted/Pentagonal Exploration", 62, LEGAL::NONE | QUICKGEO, diff --git a/rogueviz/random-walk.cpp b/rogueviz/random-walk.cpp index 26b2338f..d6507a5d 100644 --- a/rogueviz/random-walk.cpp +++ b/rogueviz/random-walk.cpp @@ -208,7 +208,7 @@ auto msc = walkers.clear(); total_time = 0; }) -+ addHook(rvtour::hooks_build_rvtour, 180, [] (vector& v) { ++ addHook(pres::hooks_build_rvtour, 180, [] (vector& v) { v.push_back(tour::slide{ cap+"random walk visualization", 10, tour::LEGAL::NONE | tour::QUICKSKIP, "Here we see random walk in various geometries.\n" diff --git a/rogueviz/sag.cpp b/rogueviz/sag.cpp index c805c9ae..7de22061 100644 --- a/rogueviz/sag.cpp +++ b/rogueviz/sag.cpp @@ -560,8 +560,8 @@ int ah = addHook(hooks_args, 100, readArgs) dialog::addSelItem(XLAT("SAG mode"), sag::sagmodes[sag::sagmode], 'm'); dialog::add_action([] { sag::sagmode = sag::eSagmode( (1+sag::sagmode) % 3 ); }); }) - + addHook(rvtour::hooks_build_rvtour, 120, [] (vector& v) { - using namespace rvtour; + + addHook(pres::hooks_build_rvtour, 120, [] (vector& v) { + using namespace pres; string sagf = "hyperbolic geometry and data/SAG/"; v.push_back( slide{sagf+"Roguelikes", 63, LEGAL::UNLIMITED | QUICKGEO, diff --git a/rogueviz/snow.cpp b/rogueviz/snow.cpp index 603b8d72..1a50091a 100644 --- a/rogueviz/snow.cpp +++ b/rogueviz/snow.cpp @@ -236,7 +236,7 @@ auto hchook = addHook(hooks_drawcell, 100, draw_snow) }) #endif -+ addHook(rvtour::hooks_build_rvtour, 161, [] (vector& v) { ++ addHook(pres::hooks_build_rvtour, 161, [] (vector& v) { v.push_back(tour::slide{ cap+"snowball visualization", 10, tour::LEGAL::NONE | tour::QUICKSKIP, "Non-Euclidean visualizations usually show some regular constructions. Could we visualize the geometries themselves? Let's distribute the snowballs randomly." diff --git a/rogueviz/staircase.cpp b/rogueviz/staircase.cpp index 26965a18..358a97c3 100644 --- a/rogueviz/staircase.cpp +++ b/rogueviz/staircase.cpp @@ -353,7 +353,7 @@ int phooks = addHook(hooks_args, 100, readArgs) if(staircase::on) { staircase::showMenu(); return true; } return false; }) - + addHook(rvtour::hooks_build_rvtour, 141, [] (vector& v) { + + addHook(pres::hooks_build_rvtour, 141, [] (vector& v) { using namespace tour; v.push_back( tour::slide{"unsorted/Spiral Staircase", 62, LEGAL::NONE | QUICKGEO, diff --git a/rogueviz/sunflower.cpp b/rogueviz/sunflower.cpp index a9b2e3b1..c3ae27a3 100644 --- a/rogueviz/sunflower.cpp +++ b/rogueviz/sunflower.cpp @@ -269,7 +269,7 @@ auto hook = 0 #endif + addHook(hooks_o_key, 80, o_key) + addHook(hooks_drawcell, 100, sunflower_cell) -+ addHook(rvtour::hooks_build_rvtour, 144, [] (vector& v) { ++ addHook(pres::hooks_build_rvtour, 144, [] (vector& v) { using namespace tour; v.push_back( tour::slide{"unsorted/sunflower spirals", 18, LEGAL::ANY | QUICKGEO, diff --git a/rogueviz/tree.cpp b/rogueviz/tree.cpp index 074cdb07..cc7e85f0 100644 --- a/rogueviz/tree.cpp +++ b/rogueviz/tree.cpp @@ -122,8 +122,8 @@ int readArgs() { } int ah = addHook(hooks_args, 120, readArgs) -+ addHook(rvtour::hooks_build_rvtour, 120, [] (vector& v) { - using namespace rvtour; ++ addHook(pres::hooks_build_rvtour, 120, [] (vector& v) { + using namespace pres; v.push_back( tour::slide{"hyperbolic geometry and data/Tree of Life", 61, LEGAL::UNLIMITED | QUICKGEO, "Hyperbolic geometry is much better than the Euclidean geometry at visualizing large trees and other hierarchical structures. " diff --git a/rogueviz/triangle.cpp b/rogueviz/triangle.cpp index 0e376d4d..a04c3a74 100644 --- a/rogueviz/triangle.cpp +++ b/rogueviz/triangle.cpp @@ -549,7 +549,7 @@ auto hchook = addHook(hooks_drawcell, 100, draw_ptriangle) return 0; }) -+ addHook(rvtour::hooks_build_rvtour, 166, [] (vector& v) { ++ addHook(pres::hooks_build_rvtour, 166, [] (vector& v) { using namespace tour; v.push_back(