mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-12-24 17:10:36 +00:00
better a/b anim pars
This commit is contained in:
parent
78cd26f456
commit
d381caba1f
@ -1368,6 +1368,7 @@ EX void apply() {
|
||||
#endif
|
||||
|
||||
apply_animated_parameters();
|
||||
last_anim_vars = anim_vars;
|
||||
calcparam();
|
||||
}
|
||||
|
||||
@ -1514,7 +1515,7 @@ void animator(string caption, ld& param, char key) {
|
||||
});
|
||||
}
|
||||
|
||||
EX ld a, b;
|
||||
EX array<ld, 10> anim_vars, last_anim_vars;
|
||||
|
||||
ld animation_period;
|
||||
|
||||
@ -1670,14 +1671,14 @@ EX void show() {
|
||||
}
|
||||
#endif
|
||||
|
||||
dialog::addSelItem(XLAT("animate parameters"), fts(a), 'a');
|
||||
dialog::addSelItem(XLAT("animate parameters"), fts(anim_vars[0]), 'a');
|
||||
dialog::add_action([] () {
|
||||
dialog::editNumber(a, -100, 100, 1, 0, XLAT("animate parameters"), "");
|
||||
dialog::editNumber(anim_vars[0], -100, 100, 1, 0, XLAT("animate parameters"), "");
|
||||
});
|
||||
|
||||
dialog::addSelItem(XLAT("animate parameters"), fts(b), 'b');
|
||||
dialog::addSelItem(XLAT("animate parameters"), fts(anim_vars[1]), 'b');
|
||||
dialog::add_action([] () {
|
||||
dialog::editNumber(b, -100, 100, 1, 0, XLAT("animate parameters"), "");
|
||||
dialog::editNumber(anim_vars[1], -100, 100, 1, 0, XLAT("animate parameters"), "");
|
||||
});
|
||||
|
||||
dialog::addBoolItem(XLAT("history mode"), (history::on || history::includeHistory), 'h');
|
||||
@ -1785,8 +1786,10 @@ auto animhook = addHook(hooks_frame, 100, display_animation)
|
||||
-> editable({{"none", ""}, {"translation", ""}, {"rotation", ""}, {"circle", ""}, {"parabolic", ""}, {"translation+rotation", ""}}, "movement animation", 'a')
|
||||
-> set_reaction(ma_reaction);
|
||||
|
||||
param_f(anims::a, "a", 0);
|
||||
param_f(anims::b, "b", 0);
|
||||
param_f(anims::anim_vars[0], "a", 0);
|
||||
param_f(anims::anim_vars[1], "b", 0);
|
||||
param_f(anims::anim_vars[2], "c", 0);
|
||||
param_f(anims::anim_vars[3], "d", 0);
|
||||
#endif
|
||||
});
|
||||
|
||||
|
4
util.cpp
4
util.cpp
@ -397,6 +397,10 @@ cld exp_parser::parse(int prio) {
|
||||
else if(number == "mousey") res = mousey;
|
||||
else if(number == "turncount") res = turncount;
|
||||
else if(number == "framecount") res = frameid;
|
||||
else if(number == "last_a") res = anims::last_anim_vars[0];
|
||||
else if(number == "last_b") res = anims::last_anim_vars[1];
|
||||
else if(number == "last_c") res = anims::last_anim_vars[2];
|
||||
else if(number == "last_d") res = anims::last_anim_vars[3];
|
||||
else if(number == "illegal_moves") res = illegal_moves;
|
||||
else if(number == "mousexs") {
|
||||
if(!inHighQual) bmousexs = (1. * mousex - current_display->xcenter) / current_display->radius;
|
||||
|
Loading…
Reference in New Issue
Block a user