mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-07-29 22:02:50 +00:00
Code Issues Releases Wiki Activity

rogueviz::ascending-descending:: rv_hook used

Browse Source
This commit is contained in:
Zeno Rogue 2021-03-31 11:03:58 +02:00
parent 6ed4b564ef
commit c9b59877eb
2 changed files with 31 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
rogueviz/ascending-descending.cpp
View File

@ -4,10 +4,10 @@ namespace hr {
namespace ply { namespace ply {
bool in, animated;
using namespace rogueviz::objmodels; using namespace rogueviz::objmodels;
bool animated;
hyperpoint A = point31(9.7, -38.1, 10.116); hyperpoint A = point31(9.7, -38.1, 10.116);
hyperpoint B = point31(17.3, -38.1, 10.95); hyperpoint B = point31(17.3, -38.1, 10.95);
hyperpoint C = point31(17.3, -46.1, 11.75); hyperpoint C = point31(17.3, -46.1, 11.75);
@ -207,8 +207,6 @@ model staircase("rogueviz/nil/", "aco.obj", nilize);
bool draw_ply() { bool draw_ply() {
if(!in) return false;
if(nil) prepare_nilform(); if(nil) prepare_nilform();
staircase.render(ggmatrix(currentmap->gamestart())); staircase.render(ggmatrix(currentmap->gamestart()));
@ -246,50 +244,35 @@ void show() {
} }
void o_key(o_funcs& v) { void o_key(o_funcs& v) {
if(in) v.push_back(named_dialog("Ascending & Descending", show)); v.push_back(named_dialog("Ascending & Descending", show));
} }
auto plyhook = addHook(hooks_frame, 100, draw_ply) void enable() {
rogueviz::rv_hook(hooks_frame, 100, draw_ply);
+ addHook(anims::hooks_anim, 100, [] { rogueviz::rv_hook(hooks_o_key, 80, o_key);
if(!in || !animated) return; rogueviz::rv_hook(anims::hooks_anim, 100, [] {
usecache = false; if(!animated) return;
ld t = ticks * 1. / anims::period; usecache = false;
t = t - floor(t); ld t = ticks * 1. / anims::period;
t *= 1000; t = t - floor(t);
t *= 1000;
centerover = currentmap->gamestart();
set_view( centerover = currentmap->gamestart();
interpolate_at(route, t), set_view(
interpolate_at(forwards, t), interpolate_at(route, t),
interpolate_at(overroute, t) interpolate_at(forwards, t),
); interpolate_at(overroute, t)
);
anims::moved();
}) anims::moved();
});
}
+ addHook(hooks_o_key, 80, o_key) auto plyhook =
arg::add3("-asd", enable) +
#if CAP_COMMANDLINE addHook(hooks_configfile, 100, [] {
+ addHook(hooks_args, 100, [] { param_b(animated, "ad_animated");
using namespace arg; });
if(0) ;
else if(argis("-asd")) {
in = true;
}
else if(argis("-asd-prec")) {
shift(); prec = argi();
}
else if(argis("-asd-anim")) {
in = true;
animated = true;
}
else return 1;
return 0;
})
#endif
;
} }
} }

5
rogueviz/playing-with-impossibility.cpp
View File

@ -43,7 +43,8 @@ namespace pentaroll {
} }
namespace ply { namespace ply {
extern bool animated, in; extern bool animated;
void enable();
extern rogueviz::objmodels::model staircase; extern rogueviz::objmodels::model staircase;
} }
@ -392,7 +393,7 @@ void ply_slide(tour::presmode mode, eGeometry geom, eModel md, bool anim) {
if(mode == pmStart) { if(mode == pmStart) {
set_geometry(geom); set_geometry(geom);
start_game(); start_game();
tour::slide_backup(ply::in, true); ply::enable();
tour::slide_backup(anims::period, 40000.); tour::slide_backup(anims::period, 40000.);
tour::slide_backup(mapeditor::drawplayer, false); tour::slide_backup(mapeditor::drawplayer, false);
tour::slide_backup(pconf.rotational_nil, 0.); tour::slide_backup(pconf.rotational_nil, 0.);