From 28d334c6605cdc0e01565102ec1b0c3fbf7158e0 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Fri, 25 Jun 2021 13:53:23 +0200 Subject: [PATCH] using addHook_rvslides and addHook_slideshows in various rogueviz demos --- rogueviz/banachtarski.cpp | 2 +- rogueviz/collatz.cpp | 2 +- rogueviz/fifteen.cpp | 2 +- rogueviz/flocking.cpp | 2 +- rogueviz/grigorchuk.cpp | 5 ++--- rogueviz/heatx.cpp | 2 +- rogueviz/highdim-demo.cpp | 4 +++- rogueviz/hypcity.cpp | 2 +- rogueviz/hyperbolic-analogs.cpp | 2 +- rogueviz/impossible-ring.cpp | 2 +- rogueviz/inner-maps.cpp | 2 +- rogueviz/noniso-honeycombs.cpp | 6 ++++-- rogueviz/notknot.cpp | 2 +- rogueviz/pentagonal.cpp | 2 +- rogueviz/planets.cpp | 2 +- rogueviz/playing-with-impossibility.cpp | 2 +- rogueviz/presentation.cpp | 2 +- rogueviz/qtm.cpp | 2 +- rogueviz/random-walk.cpp | 2 +- rogueviz/rogueviz-all.cpp | 2 ++ rogueviz/sag.cpp | 2 +- rogueviz/snow.cpp | 2 +- rogueviz/staircase.cpp | 2 +- rogueviz/sunflower.cpp | 2 +- rogueviz/tree.cpp | 2 +- rogueviz/triangle.cpp | 2 +- 26 files changed, 33 insertions(+), 28 deletions(-) diff --git a/rogueviz/banachtarski.cpp b/rogueviz/banachtarski.cpp index 5860f8fb..31e9da08 100644 --- a/rogueviz/banachtarski.cpp +++ b/rogueviz/banachtarski.cpp @@ -558,7 +558,7 @@ int readArgs() { auto hook = addHook(hooks_args, 100, readArgs) + addHook(hooks_initgame, 100, bantar) + addHook(hooks_frame, 100, bantar_stats) - + addHook(pres::hooks_build_rvtour, 140, [] (string s, vector& v) { + + addHook_rvslides(140, [] (string s, vector& v) { if(s != "mixed") return; using namespace pres; v.push_back( diff --git a/rogueviz/collatz.cpp b/rogueviz/collatz.cpp index f12d95a1..b2031bcb 100644 --- a/rogueviz/collatz.cpp +++ b/rogueviz/collatz.cpp @@ -324,7 +324,7 @@ int readArgs() { } int ah = addHook(hooks_args, 100, readArgs) + - addHook(pres::hooks_build_rvtour, 42, [] (string s, vector& v) { + addHook_rvslides(42, [] (string s, vector& v) { if(s != "data") return; using namespace tour; v.push_back( diff --git a/rogueviz/fifteen.cpp b/rogueviz/fifteen.cpp index 908f62aa..948bc8b8 100644 --- a/rogueviz/fifteen.cpp +++ b/rogueviz/fifteen.cpp @@ -444,7 +444,7 @@ auto fifteen_hook = param_b(show_dots, "fifteen_dots"); param_b(show_triangles, "fifteen_tris"); }) -+ addHook(tour::ss::hooks_extra_slideshows, 120, [] (tour::ss::slideshow_callback cb) { ++ addHook_slideshows(120, [] (tour::ss::slideshow_callback cb) { using namespace rogueviz::pres; static vector fifteen_slides; diff --git a/rogueviz/flocking.cpp b/rogueviz/flocking.cpp index 3148c627..b49bf592 100644 --- a/rogueviz/flocking.cpp +++ b/rogueviz/flocking.cpp @@ -593,7 +593,7 @@ bool drawVertex(const shiftmatrix &V, cell *c, shmup::monster *m) { } auto hooks = addHook(hooks_args, 100, readArgs) - + addHook(rogueviz::pres::hooks_build_rvtour, 187, [] (string s, vector& v) { + + addHook_rvslides(187, [] (string s, vector& v) { if(s != "mixed") return; using namespace tour; string cap = "flocking simulation/"; diff --git a/rogueviz/grigorchuk.cpp b/rogueviz/grigorchuk.cpp index ddc7f121..0b520007 100644 --- a/rogueviz/grigorchuk.cpp +++ b/rogueviz/grigorchuk.cpp @@ -494,9 +494,8 @@ auto hook = addHook(hooks_args, 100, readArgsG) dialog::addBoolItem_action(XLAT("Grigorchuk labels"), grigorchuk::view_labels, 'M'); } }) - + addHook(hooks_initialize, 100, create_grigorchuk_geometry) - - + addHook(rogueviz::pres::hooks_build_rvtour, 140, [] (string s, vector& v) { + + addHook(hooks_initialize, 100, create_grigorchuk_geometry) + + addHook_rvslides(140, [] (string s, vector& v) { if(s != "mixed") return; using namespace rogueviz::pres; v.push_back(tour::slide{ diff --git a/rogueviz/heatx.cpp b/rogueviz/heatx.cpp index 2884e635..902c7682 100644 --- a/rogueviz/heatx.cpp +++ b/rogueviz/heatx.cpp @@ -185,7 +185,7 @@ auto heathook = arg::add3("-heatx", enable) param_i(simulation_range, "heat_range") ->editable(0, 100000, 1000, "heat simulation range", "number of cells to consider", 'r'); }) - + addHook(rogueviz::pres::hooks_build_rvtour, 180, [] (string s, vector& v) { + + addHook_rvslides(180, [] (string s, vector& v) { if(s != "mixed") return; heat_slide(v, "squares", "A simple heat simulation. In each turn, the temperature changes towards the average of temperatures of adjacent cells.\n\n" diff --git a/rogueviz/highdim-demo.cpp b/rogueviz/highdim-demo.cpp index 9073ed32..50bc1473 100644 --- a/rogueviz/highdim-demo.cpp +++ b/rogueviz/highdim-demo.cpp @@ -447,6 +447,7 @@ void house(int sides, int shape = 10) { start_game(); } +#if CAP_RVSLIDES tour::slide *gen_high_demo() { high_slides.clear(); using namespace tour; @@ -643,9 +644,10 @@ tour::slide *gen_high_demo() { pres::add_end(v); return &high_slides[0]; } +#endif auto highdim_hooks = - addHook(tour::ss::hooks_extra_slideshows, 120, [] (tour::ss::slideshow_callback cb) { + addHook_slideshows(120, [] (tour::ss::slideshow_callback cb) { if(high_slides.empty()) gen_high_demo(); diff --git a/rogueviz/hypcity.cpp b/rogueviz/hypcity.cpp index 65d42f0f..37d4a5cc 100644 --- a/rogueviz/hypcity.cpp +++ b/rogueviz/hypcity.cpp @@ -100,7 +100,7 @@ void enable() { } auto hypcity_ah = arg::add3("-hypcity", enable) -+ addHook(tour::ss::hooks_extra_slideshows, 120, [] (tour::ss::slideshow_callback cb) { ++ addHook_slideshows(120, [] (tour::ss::slideshow_callback cb) { using namespace rogueviz::pres; static vector hypcity_slides; diff --git a/rogueviz/hyperbolic-analogs.cpp b/rogueviz/hyperbolic-analogs.cpp index ce4423d8..761f9175 100644 --- a/rogueviz/hyperbolic-analogs.cpp +++ b/rogueviz/hyperbolic-analogs.cpp @@ -418,7 +418,7 @@ auto msc = arg::add3("-analogs", enable) param_b(textured, "analogs_texture") ->editable("draw Earth", 'T'); }) - + addHook(rogueviz::pres::hooks_build_rvtour, 131, [] (string s, vector& v) { + + addHook_rvslides(131, [] (string s, vector& v) { if(s != "mixed") return; using namespace tour; diff --git a/rogueviz/impossible-ring.cpp b/rogueviz/impossible-ring.cpp index 5d88a346..19c0c8d2 100644 --- a/rogueviz/impossible-ring.cpp +++ b/rogueviz/impossible-ring.cpp @@ -274,7 +274,7 @@ auto hchook = param_f(cylball, "cylball"); }) -+ addHook(pres::hooks_build_rvtour, 167, [] (string s, vector& v) { ++ addHook_rvslides(167, [] (string s, vector& v) { if(s != "noniso") return; using namespace tour; v.push_back( diff --git a/rogueviz/inner-maps.cpp b/rogueviz/inner-maps.cpp index b7b82634..524533a4 100644 --- a/rogueviz/inner-maps.cpp +++ b/rogueviz/inner-maps.cpp @@ -274,7 +274,7 @@ auto hook = arg::add3("-inner-map", enable) 'i') ->set_reaction(need_redo); }) - + addHook(rogueviz::pres::hooks_build_rvtour, 52, [] (string s, vector& v) { + + addHook_rvslides(52, [] (string s, vector& v) { if(s != "projections") return; using namespace tour; diff --git a/rogueviz/noniso-honeycombs.cpp b/rogueviz/noniso-honeycombs.cpp index b064100c..097fef95 100644 --- a/rogueviz/noniso-honeycombs.cpp +++ b/rogueviz/noniso-honeycombs.cpp @@ -147,6 +147,7 @@ void honey(string s, vector& v) { } +#if CAP_RVSLIDES vector noniso_slides; tour::slide *gen_noniso_demo() { noniso_slides.clear(); @@ -168,9 +169,10 @@ tour::slide *gen_noniso_demo() { pres::add_end(noniso_slides); return &noniso_slides[0]; } +#endif -auto hooks = addHook(pres::hooks_build_rvtour, 163, honey) - + addHook(tour::ss::hooks_extra_slideshows, 120, [] (tour::ss::slideshow_callback cb) { +auto hooks = addHook_rvslides(163, honey) + + addHook_slideshows(120, [] (tour::ss::slideshow_callback cb) { if(noniso_slides.empty()) gen_noniso_demo(); diff --git a/rogueviz/notknot.cpp b/rogueviz/notknot.cpp index bf98853a..7b0de8f5 100644 --- a/rogueviz/notknot.cpp +++ b/rogueviz/notknot.cpp @@ -1482,7 +1482,7 @@ auto shot_hooks = addHook(hooks_initialize, 100, create_notknot) param_i(loop_any, "nk_loopany"); }) #ifndef NOTKNOT - + addHook(rogueviz::pres::hooks_build_rvtour, 180, [] (string s, vector& v) { + + addHook_rvslides(180, [] (string s, vector& v) { if(s != "mixed") return; v.push_back(tour::slide{ "weird portals", 10, tour::LEGAL::NONE | tour::QUICKSKIP, diff --git a/rogueviz/pentagonal.cpp b/rogueviz/pentagonal.cpp index b7eb7f7c..52699cde 100644 --- a/rogueviz/pentagonal.cpp +++ b/rogueviz/pentagonal.cpp @@ -319,7 +319,7 @@ void enable_hooks() { auto xhook = arg::add3("-snub", [] { run_snub(arg::shift_argi(), 3); }) + arg::add3("-snub4", [] { run_snub(arg::shift_argi(), 4); }) -+ addHook(pres::hooks_build_rvtour, 143, [] (string s, vector& v) { ++ addHook_rvslides(143, [] (string s, vector& v) { if(s != "mixed") return; using namespace tour; v.push_back( diff --git a/rogueviz/planets.cpp b/rogueviz/planets.cpp index cf9f6edb..4e0ad571 100644 --- a/rogueviz/planets.cpp +++ b/rogueviz/planets.cpp @@ -511,7 +511,7 @@ auto msc = param_f(prec, "moon_precision") ->editable(0, 30, .5, "precision", "larger values are less precise", 'p'); }) - + addHook(rogueviz::pres::hooks_build_rvtour, 51, [] (string s, vector& v) { + + addHook_rvslides(51, [] (string s, vector& v) { if(s != "projections") return; using namespace tour; diff --git a/rogueviz/playing-with-impossibility.cpp b/rogueviz/playing-with-impossibility.cpp index 9f88d806..93dd03eb 100644 --- a/rogueviz/playing-with-impossibility.cpp +++ b/rogueviz/playing-with-impossibility.cpp @@ -1131,7 +1131,7 @@ slide dmv_slides[] = { int phooks = 0 + - addHook(tour::ss::hooks_extra_slideshows, 100, [] (tour::ss::slideshow_callback cb) { + addHook_slides(tour::ss::hooks_extra_slideshows, 100, [] (tour::ss::slideshow_callback cb) { cb(XLAT("Playing with Impossibility"), &dmv_slides[0], 'p'); }); diff --git a/rogueviz/presentation.cpp b/rogueviz/presentation.cpp index d6fa4ae1..aeef6e30 100644 --- a/rogueviz/presentation.cpp +++ b/rogueviz/presentation.cpp @@ -387,7 +387,7 @@ int pres_hooks = dialog::add_action_push(choose_presentation); } }) + - addHook(tour::ss::hooks_extra_slideshows, 300, [] (tour::ss::slideshow_callback cb) { + addHook_slideshows(300, [] (tour::ss::slideshow_callback cb) { if(rogueviz::pres::rvslides_data.empty()) pres::gen_rvtour_data(); cb(XLAT("non-Euclidean geometry in data analysis"), &pres::rvslides_data[0], 'd'); diff --git a/rogueviz/qtm.cpp b/rogueviz/qtm.cpp index d702c967..c389e446 100644 --- a/rogueviz/qtm.cpp +++ b/rogueviz/qtm.cpp @@ -192,7 +192,7 @@ int args() { auto hooks = addHook(hooks_args, 100, args) - + addHook(rogueviz::pres::hooks_build_rvtour, 180, [] (string s, vector& v) { + + addHook_rvslides(180, [] (string s, vector& v) { if(s != "mixed") return; using namespace tour; for(int m: {1,2}) { diff --git a/rogueviz/random-walk.cpp b/rogueviz/random-walk.cpp index 46e13ffa..e4b4c983 100644 --- a/rogueviz/random-walk.cpp +++ b/rogueviz/random-walk.cpp @@ -192,7 +192,7 @@ void enable() { auto msc = addHook(hooks_args, 100, args) -+ addHook(pres::hooks_build_rvtour, 180, [] (string s, vector& v) { ++ addHook_rvslides(180, [] (string s, vector& v) { if(s != "mixed") return; v.push_back(tour::slide{ cap+"random walk visualization", 10, tour::LEGAL::NONE | tour::QUICKSKIP, diff --git a/rogueviz/rogueviz-all.cpp b/rogueviz/rogueviz-all.cpp index 962860f8..35448921 100644 --- a/rogueviz/rogueviz-all.cpp +++ b/rogueviz/rogueviz-all.cpp @@ -50,7 +50,9 @@ #include "ascending-descending.cpp" #include "balls.cpp" #include "pentaroll.cpp" +#if CAP_RVSLIDES #include "playing-with-impossibility.cpp" +#endif #include "highdim-demo.cpp" //#endif diff --git a/rogueviz/sag.cpp b/rogueviz/sag.cpp index b254b47d..363e8105 100644 --- a/rogueviz/sag.cpp +++ b/rogueviz/sag.cpp @@ -617,7 +617,7 @@ string cname() { } int ah = addHook(hooks_args, 100, readArgs) - + addHook(pres::hooks_build_rvtour, 120, [] (string s, vector& v) { + + addHook_rvslides(120, [] (string s, vector& v) { if(s != "data") return; using namespace pres; string sagf = "SAG/"; diff --git a/rogueviz/snow.cpp b/rogueviz/snow.cpp index bf10e870..c9f09199 100644 --- a/rogueviz/snow.cpp +++ b/rogueviz/snow.cpp @@ -234,7 +234,7 @@ auto hchook = addHook(hooks_drawcell, 100, draw_snow) }) #endif -+ addHook(pres::hooks_build_rvtour, 161, [] (string s, vector& v) { ++ addHook_rvslides(161, [] (string s, vector& v) { if(s != "noniso") return; v.push_back(tour::slide{ cap+"snowball visualization", 10, tour::LEGAL::NONE | tour::QUICKSKIP, diff --git a/rogueviz/staircase.cpp b/rogueviz/staircase.cpp index 30585cd9..8e2e5b52 100644 --- a/rogueviz/staircase.cpp +++ b/rogueviz/staircase.cpp @@ -234,7 +234,7 @@ void enable() { } int phooks = arg::add3("-stair", enable) - + addHook(pres::hooks_build_rvtour, 141, [] (string s, vector& v) { + + addHook_rvslides(141, [] (string s, vector& v) { if(s != "mixed") return; using namespace tour; v.push_back( diff --git a/rogueviz/sunflower.cpp b/rogueviz/sunflower.cpp index 2f9e4cdd..7dd5da76 100644 --- a/rogueviz/sunflower.cpp +++ b/rogueviz/sunflower.cpp @@ -267,7 +267,7 @@ auto hook = 0 #if CAP_COMMANDLINE + addHook(hooks_args, 100, readArgs) #endif -+ addHook(pres::hooks_build_rvtour, 144, [] (string s, vector& v) { ++ addHook_rvslides(144, [] (string s, vector& v) { if(s != "mixed") return; using namespace tour; v.push_back( diff --git a/rogueviz/tree.cpp b/rogueviz/tree.cpp index eefd841f..ac6c783d 100644 --- a/rogueviz/tree.cpp +++ b/rogueviz/tree.cpp @@ -106,7 +106,7 @@ namespace tree { } int ah = arg::add3("-tree", [] { tree::read(arg::shift_args()); }) -+ addHook(pres::hooks_build_rvtour, 120, [] (string s, vector& v) { ++ addHook_rvslides(120, [] (string s, vector& v) { if(s != "data") return; using namespace pres; v.push_back( diff --git a/rogueviz/triangle.cpp b/rogueviz/triangle.cpp index f538ca48..fac15c65 100644 --- a/rogueviz/triangle.cpp +++ b/rogueviz/triangle.cpp @@ -549,7 +549,7 @@ auto hchook = addHook(hooks_drawcell, 100, draw_ptriangle) return 0; }) -+ addHook(pres::hooks_build_rvtour, 166, [] (string s, vector& v) { ++ addHook_rvslides(166, [] (string s, vector& v) { using namespace tour; if(s != "noniso") return;