diff --git a/config.cpp b/config.cpp index cdcdb176..b8e60a27 100644 --- a/config.cpp +++ b/config.cpp @@ -1809,6 +1809,9 @@ unordered_map params = { {"mobius", vid.skiprope}, {"a", anims::a}, {"b", anims::b}, + {"sang", conformal::spiral_angle}, + {"spiralx", conformal::spiral_x}, + {"spiraly", conformal::spiral_y}, }; } diff --git a/conformal.cpp b/conformal.cpp index 310c2f0d..c6727535 100644 --- a/conformal.cpp +++ b/conformal.cpp @@ -820,7 +820,7 @@ namespace conformal { dialog::add_action([](){ 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::editNumber(spiral_y, -20, 20, 1, 10, XLAT("spiral period: y"), ""); }); @@ -1093,6 +1093,11 @@ namespace conformal { PHASEFROM(2); 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")) { PHASEFROM(2); shift_arg_formula(vid.skiprope); diff --git a/hyper.h b/hyper.h index 43901ddc..52e6bb40 100644 --- a/hyper.h +++ b/hyper.h @@ -1286,6 +1286,7 @@ namespace conformal { extern bool model_straight; extern ld model_transition; extern ld top_z; + extern ld spiral_angle, spiral_x, spiral_y; // screen coordinates to logical coordinates: apply_orientation(x,y) // logical coordinates back to screen coordinates: apply_orientation(y,x)