mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-29 19:40:35 +00:00
Code Issues Releases Wiki Activity

cl parameters and param entries for spiralx and spiraly

Browse Source
This commit is contained in:
Zeno Rogue 2018-11-10 17:23:43 +01:00
parent 90468c0daf
commit 048bd4ab36
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.cpp
View File

@ -1809,6 +1809,9 @@ unordered_map<string, ld&> params = {
{"mobius", vid.skiprope}, {"mobius", vid.skiprope},
{"a", anims::a}, {"a", anims::a},
{"b", anims::b}, {"b", anims::b},
{"sang", conformal::spiral_angle},
{"spiralx", conformal::spiral_x},
{"spiraly", conformal::spiral_y},
}; };
} }

7
conformal.cpp
View File

@ -820,7 +820,7 @@ namespace conformal {
dialog::add_action([](){ dialog::add_action([](){
dialog::editNumber(spiral_x, -20, 20, 1, 10, XLAT("spiral period: x"), ""); dialog::editNumber(spiral_x, -20, 20, 1, 10, XLAT("spiral period: x"), "");
}); });
dialog::addSelItem(XLAT("spiral period: y"), fts(spiral_x), 'y'); dialog::addSelItem(XLAT("spiral period: y"), fts(spiral_y), 'y');
dialog::add_action([](){ dialog::add_action([](){
dialog::editNumber(spiral_y, -20, 20, 1, 10, XLAT("spiral period: y"), ""); dialog::editNumber(spiral_y, -20, 20, 1, 10, XLAT("spiral period: y"), "");
}); });
@ -1093,6 +1093,11 @@ namespace conformal {
PHASEFROM(2); PHASEFROM(2);
shift_arg_formula(conformal::spiral_angle); shift_arg_formula(conformal::spiral_angle);
} }
else if(argis("-sxy")) {
PHASEFROM(2);
shift_arg_formula(conformal::spiral_x);
shift_arg_formula(conformal::spiral_y);
}
else if(argis("-mob")) { else if(argis("-mob")) {
PHASEFROM(2); PHASEFROM(2);
shift_arg_formula(vid.skiprope); shift_arg_formula(vid.skiprope);

1
hyper.h
View File

@ -1286,6 +1286,7 @@ namespace conformal {
extern bool model_straight; extern bool model_straight;
extern ld model_transition; extern ld model_transition;
extern ld top_z; extern ld top_z;
extern ld spiral_angle, spiral_x, spiral_y;
// screen coordinates to logical coordinates: apply_orientation(x,y) // screen coordinates to logical coordinates: apply_orientation(x,y)
// logical coordinates back to screen coordinates: apply_orientation(y,x) // logical coordinates back to screen coordinates: apply_orientation(y,x)