1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-14 13:57:38 +00:00

rvtour:: finished changing rvtour to pres

This commit is contained in:
Zeno Rogue
2020-09-13 06:32:18 +02:00
parent 1937659a03
commit 910775a25d
13 changed files with 19 additions and 19 deletions

View File

@@ -558,8 +558,8 @@ int readArgs() {
auto hook = addHook(hooks_args, 100, readArgs) auto hook = addHook(hooks_args, 100, readArgs)
+ addHook(hooks_initgame, 100, bantar) + addHook(hooks_initgame, 100, bantar)
+ addHook(hooks_frame, 100, bantar_stats) + addHook(hooks_frame, 100, bantar_stats)
+ addHook(rvtour::hooks_build_rvtour, 140, [] (vector<tour::slide>& v) { + addHook(pres::hooks_build_rvtour, 140, [] (vector<tour::slide>& v) {
using namespace rvtour; using namespace pres;
v.push_back( v.push_back(
tour::slide{"unsorted/Banach-Tarski-like", 62, LEGAL::NONE, tour::slide{"unsorted/Banach-Tarski-like", 62, LEGAL::NONE,
"Banach-Tarski-like decomposition. Break a hyperbolic plane into two hyperbolic planes.\n\n" "Banach-Tarski-like decomposition. Break a hyperbolic plane into two hyperbolic planes.\n\n"

View File

@@ -313,7 +313,7 @@ int readArgs() {
} }
int ah = addHook(hooks_args, 100, readArgs) + int ah = addHook(hooks_args, 100, readArgs) +
addHook(rvtour::hooks_build_rvtour, 142, [] (vector<tour::slide>& v) { addHook(pres::hooks_build_rvtour, 142, [] (vector<tour::slide>& v) {
using namespace tour; using namespace tour;
v.push_back( v.push_back(
tour::slide{"unsorted/Collatz conjecture", 51, LEGAL::UNLIMITED | QUICKGEO, 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" "Press '5' for a spiral rendering of the Collatz conjecture visualization.\n\n"
"Note that this, and many other RogueViz visualizations, have " "Note that this, and many other RogueViz visualizations, have "
"Euclidean versions (press ESC).\n", "Euclidean versions (press ESC).\n",
rvtour::roguevizslide('d', [] () { pres::roguevizslide('d', [] () {
rogueviz::dftcolor = 0x206020FF; rogueviz::dftcolor = 0x206020FF;
int fac = euclid ? 2 : 1; int fac = euclid ? 2 : 1;

View File

@@ -496,8 +496,8 @@ auto hook = addHook(hooks_args, 100, readArgsG)
}) })
+ addHook(hooks_initialize, 100, create_grigorchuk_geometry) + addHook(hooks_initialize, 100, create_grigorchuk_geometry)
+ addHook(rogueviz::rvtour::hooks_build_rvtour, 140, [] (vector<tour::slide>& v) { + addHook(rogueviz::pres::hooks_build_rvtour, 140, [] (vector<tour::slide>& v) {
using namespace rogueviz::rvtour; using namespace rogueviz::pres;
v.push_back(tour::slide{ v.push_back(tour::slide{
"unsorted/Grigorchuk group", 10, tour::LEGAL::NONE, "unsorted/Grigorchuk group", 10, tour::LEGAL::NONE,

View File

@@ -290,7 +290,7 @@ auto hchook = addHook(hooks_drawcell, 100, draw_ptriangle)
+ addHook(hooks_o_key, 80, o_key) + addHook(hooks_o_key, 80, o_key)
+ addHook(rvtour::hooks_build_rvtour, 167, [] (vector<tour::slide>& v) { + addHook(pres::hooks_build_rvtour, 167, [] (vector<tour::slide>& v) {
using namespace tour; using namespace tour;
v.push_back( v.push_back(
tour::slide{"non-isotropic geometries/Impossible architecture in Nil/impossible ring", 18, LEGAL::NONE | QUICKGEO, tour::slide{"non-isotropic geometries/Impossible architecture in Nil/impossible ring", 18, LEGAL::NONE | QUICKGEO,

View File

@@ -161,7 +161,7 @@ void start_noniso(vector<tour::slide>& v) {
}); });
} }
auto hooks = addHook(rvtour::hooks_build_rvtour, 163, honey) auto hooks = addHook(pres::hooks_build_rvtour, 163, honey)
+ addHook(rvtour::hooks_build_rvtour, 160, start_noniso); + addHook(pres::hooks_build_rvtour, 160, start_noniso);
} } } }

View File

@@ -347,7 +347,7 @@ auto xhook = addHook(hooks_args, 100, readArgs)
+ addHook(hooks_handleKey, 0, handleKey) + addHook(hooks_handleKey, 0, handleKey)
+ addHook(hooks_prestats, 0, frame) + addHook(hooks_prestats, 0, frame)
+ addHook(hooks_clearmemory, 40, [] () { snubon = false; } ) + addHook(hooks_clearmemory, 40, [] () { snubon = false; } )
+ addHook(rvtour::hooks_build_rvtour, 142, [] (vector<tour::slide>& v) { + addHook(pres::hooks_build_rvtour, 142, [] (vector<tour::slide>& v) {
using namespace tour; using namespace tour;
v.push_back( v.push_back(
tour::slide{"unsorted/Pentagonal Exploration", 62, LEGAL::NONE | QUICKGEO, tour::slide{"unsorted/Pentagonal Exploration", 62, LEGAL::NONE | QUICKGEO,

View File

@@ -208,7 +208,7 @@ auto msc =
walkers.clear(); walkers.clear();
total_time = 0; total_time = 0;
}) })
+ addHook(rvtour::hooks_build_rvtour, 180, [] (vector<tour::slide>& v) { + addHook(pres::hooks_build_rvtour, 180, [] (vector<tour::slide>& v) {
v.push_back(tour::slide{ v.push_back(tour::slide{
cap+"random walk visualization", 10, tour::LEGAL::NONE | tour::QUICKSKIP, cap+"random walk visualization", 10, tour::LEGAL::NONE | tour::QUICKSKIP,
"Here we see random walk in various geometries.\n" "Here we see random walk in various geometries.\n"

View File

@@ -560,8 +560,8 @@ int ah = addHook(hooks_args, 100, readArgs)
dialog::addSelItem(XLAT("SAG mode"), sag::sagmodes[sag::sagmode], 'm'); dialog::addSelItem(XLAT("SAG mode"), sag::sagmodes[sag::sagmode], 'm');
dialog::add_action([] { sag::sagmode = sag::eSagmode( (1+sag::sagmode) % 3 ); }); dialog::add_action([] { sag::sagmode = sag::eSagmode( (1+sag::sagmode) % 3 ); });
}) })
+ addHook(rvtour::hooks_build_rvtour, 120, [] (vector<tour::slide>& v) { + addHook(pres::hooks_build_rvtour, 120, [] (vector<tour::slide>& v) {
using namespace rvtour; using namespace pres;
string sagf = "hyperbolic geometry and data/SAG/"; string sagf = "hyperbolic geometry and data/SAG/";
v.push_back( v.push_back(
slide{sagf+"Roguelikes", 63, LEGAL::UNLIMITED | QUICKGEO, slide{sagf+"Roguelikes", 63, LEGAL::UNLIMITED | QUICKGEO,

View File

@@ -236,7 +236,7 @@ auto hchook = addHook(hooks_drawcell, 100, draw_snow)
}) })
#endif #endif
+ addHook(rvtour::hooks_build_rvtour, 161, [] (vector<tour::slide>& v) { + addHook(pres::hooks_build_rvtour, 161, [] (vector<tour::slide>& v) {
v.push_back(tour::slide{ v.push_back(tour::slide{
cap+"snowball visualization", 10, tour::LEGAL::NONE | tour::QUICKSKIP, 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." "Non-Euclidean visualizations usually show some regular constructions. Could we visualize the geometries themselves? Let's distribute the snowballs randomly."

View File

@@ -353,7 +353,7 @@ int phooks = addHook(hooks_args, 100, readArgs)
if(staircase::on) { staircase::showMenu(); return true; } if(staircase::on) { staircase::showMenu(); return true; }
return false; return false;
}) })
+ addHook(rvtour::hooks_build_rvtour, 141, [] (vector<tour::slide>& v) { + addHook(pres::hooks_build_rvtour, 141, [] (vector<tour::slide>& v) {
using namespace tour; using namespace tour;
v.push_back( v.push_back(
tour::slide{"unsorted/Spiral Staircase", 62, LEGAL::NONE | QUICKGEO, tour::slide{"unsorted/Spiral Staircase", 62, LEGAL::NONE | QUICKGEO,

View File

@@ -269,7 +269,7 @@ auto hook = 0
#endif #endif
+ addHook(hooks_o_key, 80, o_key) + addHook(hooks_o_key, 80, o_key)
+ addHook(hooks_drawcell, 100, sunflower_cell) + addHook(hooks_drawcell, 100, sunflower_cell)
+ addHook(rvtour::hooks_build_rvtour, 144, [] (vector<tour::slide>& v) { + addHook(pres::hooks_build_rvtour, 144, [] (vector<tour::slide>& v) {
using namespace tour; using namespace tour;
v.push_back( v.push_back(
tour::slide{"unsorted/sunflower spirals", 18, LEGAL::ANY | QUICKGEO, tour::slide{"unsorted/sunflower spirals", 18, LEGAL::ANY | QUICKGEO,

View File

@@ -122,8 +122,8 @@ int readArgs() {
} }
int ah = addHook(hooks_args, 120, readArgs) int ah = addHook(hooks_args, 120, readArgs)
+ addHook(rvtour::hooks_build_rvtour, 120, [] (vector<tour::slide>& v) { + addHook(pres::hooks_build_rvtour, 120, [] (vector<tour::slide>& v) {
using namespace rvtour; using namespace pres;
v.push_back( v.push_back(
tour::slide{"hyperbolic geometry and data/Tree of Life", 61, LEGAL::UNLIMITED | QUICKGEO, 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. " "Hyperbolic geometry is much better than the Euclidean geometry at visualizing large trees and other hierarchical structures. "

View File

@@ -549,7 +549,7 @@ auto hchook = addHook(hooks_drawcell, 100, draw_ptriangle)
return 0; return 0;
}) })
+ addHook(rvtour::hooks_build_rvtour, 166, [] (vector<tour::slide>& v) { + addHook(pres::hooks_build_rvtour, 166, [] (vector<tour::slide>& v) {
using namespace tour; using namespace tour;
v.push_back( v.push_back(