mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-03 04:39:17 +00:00
Code Issues Releases Wiki Activity

reorganized pconf/rconf config

Browse Source
This commit is contained in:
Zeno Rogue 2021-02-01 12:03:55 +01:00
parent b921a5a81b
commit 184fb2bf9e
2 changed files with 50 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.cpp
View File

@ -597,6 +597,8 @@ EX void initConfig() {
param_enum(vid.graphglyph, "graphglyph", "graphical items/kills", 1) param_enum(vid.graphglyph, "graphglyph", "graphical items/kills", 1)
-> editable({{"letters", ""}, {"auto", ""}, {"images", ""}}, "inventory/kill mode", 'd'); -> editable({{"letters", ""}, {"auto", ""}, {"images", ""}}, "inventory/kill mode", 'd');
param_f(vid.binary_width, "bwidth", "binary-tiling-width", 1);
addsaver(vid.particles, "extra effects", 1); addsaver(vid.particles, "extra effects", 1);
param_i(vid.framelimit, "frame limit", 75); param_i(vid.framelimit, "frame limit", 75);
addsaver(vid.xres, "xres"); addsaver(vid.xres, "xres");

87
models.cpp
View File

@ -1021,63 +1021,54 @@ EX namespace models {
addsaver(models::rotation_xz, "conformal rotation_xz"); addsaver(models::rotation_xz, "conformal rotation_xz");
addsaver(models::rotation_xy2, "conformal rotation_2"); addsaver(models::rotation_xy2, "conformal rotation_2");
addsaver(models::do_rotate, "conformal rotation mode", 1); addsaver(models::do_rotate, "conformal rotation mode", 1);
param_f(pconf.model_orientation, "mori", "model orientation", 0);
param_f(pconf.model_orientation_yz, "mori_yz", "model orientation-yz", 0);
param_f(pconf.top_z, "topz", 5);
param_f(pconf.model_transition, "mtrans", "model transition", 1);
param_f(pconf.halfplane_scale, "hp", "halfplane scale", 1);
param_f(pconf.rotational_nil, "rotnil", 1);
param_f(pconf.clip_min, "clipmin", "clip-min", -1); auto add_all = [&] (projection_configuration& p, string pp, string sp) {
param_f(pconf.clip_max, "clipmax", "clip-max", +1); bool rug = pp != "";
param_f(p.model_orientation, pp+"mori", sp+"model orientation", 0);
param_f(p.model_orientation_yz, pp+"mori_yz", sp+"model orientation-yz", 0);
param_f(p.top_z, sp+"topz", 5);
param_f(p.model_transition, pp+"mtrans", sp+"model transition", 1);
param_f(p.halfplane_scale, pp+"hp", sp+"halfplane scale", 1);
param_f(p.rotational_nil, sp+"rotnil", 1);
param_f(pconf.euclid_to_sphere, "ets", "euclid to sphere projection", 1.5); param_f(p.clip_min, pp+"clipmin", sp+"clip-min", rug ? -100 : -1);
param_f(pconf.twopoint_param, "twopoint", "twopoint parameter", 1); param_f(p.clip_max, pp+"clipmax", sp+"clip-max", rug ? +10 : +1);
param_f(pconf.fisheye_param, "fisheye", "fisheye parameter", 1);
param_f(pconf.stretch, "stretch", 1);
param_f(vid.binary_width, "bwidth", "binary-tiling-width", 1); param_f(p.euclid_to_sphere, pp+"ets", sp+"euclid to sphere projection", 1.5);
param_f(pconf.collignon_parameter, "collignon", "collignon-parameter", 1); param_f(p.twopoint_param, pp+"twopoint", sp+"twopoint parameter", 1);
param_f(p.fisheye_param, pp+"fisheye", sp+"fisheye parameter", 1);
param_f(p.stretch, pp+"stretch", 1);
param_f(pconf.aitoff_parameter, "aitoff"); param_f(p.collignon_parameter, pp+"collignon", sp+"collignon-parameter", 1);
param_f(pconf.miller_parameter, "miller");
param_f(pconf.loximuthal_parameter, "loximuthal");
param_f(pconf.winkel_parameter, "winkel");
addsaver(pconf.collignon_reflected, "collignon-reflect", false); param_f(p.aitoff_parameter, sp+"aitoff");
addsaver(pconf.show_hyperboloid_flat, "hyperboloid-flat", true); param_f(p.miller_parameter, sp+"miller");
param_f(p.loximuthal_parameter, sp+"loximuthal");
param_f(p.winkel_parameter, sp+"winkel");
param_f(pconf.skiprope, "mobius", 0); param_b(p.collignon_reflected, sp+"collignon-reflect", false);
addsaver(pconf.formula, "formula"); param_b(p.show_hyperboloid_flat, sp+"hyperboloid-flat", true);
addsaverenum(pconf.basic_model, "basic model");
addsaver(pconf.use_atan, "use_atan");
addsaver(pconf.spiral_angle, "sang"); param_f(p.skiprope, sp+"mobius", 0);
addsaver(pconf.spiral_x, "spiralx"); addsaver(p.formula, sp+"formula");
addsaver(pconf.spiral_y, "spiraly"); addsaverenum(p.basic_model, sp+"basic model");
addsaver(p.use_atan, sp+"use_atan");
param_f(pconf.scale, "scale", 1); addsaver(p.spiral_angle, sp+"sang");
param_f(pconf.xposition, "xposition", 0); addsaver(p.spiral_x, sp+"spiralx");
param_f(pconf.yposition, "yposition", 0); addsaver(p.spiral_y, sp+"spiraly");
param_f(pconf.alpha, "projection", 1);
param_f(pconf.ballangle, "ballangle", "ball angle", 20);
param_f(pconf.camera_angle, "cameraangle", "camera angle", 0);
addsaver(pconf.ballproj, "ballproj", 1);
auto& rconf = vid.rug_config; param_f(p.scale, sp+"scale", 1);
addsaverenum(rconf.model, "rug-projection", mdEquidistant); param_f(p.xposition, sp+"xposition", 0);
addsaver(rconf.scale, "rug-projection-scale", 1); param_f(p.yposition, sp+"yposition", 0);
addsaver(rconf.alpha, "rug-projection-alpha", 1); param_f(p.alpha, sp+"projection", 1);
addsaver(rconf.clip_min, "rug-projection-clip-min", -100); param_f(p.ballangle, pp+"ballangle", sp+"ball angle", 20);
addsaver(rconf.clip_max, "rug-projection-clip-max", +10); param_f(p.camera_angle, pp+"cameraangle", sp+"camera angle", 0);
addsaver(rconf.stretch, "rug-projection-stretch", 1); addsaver(p.ballproj, sp+"ballproj", 1);
addsaver(rconf.halfplane_scale, "rug-projection-halfplane scale", 1); };
addsaver(rconf.collignon_parameter, "rug-collignon-parameter", 1);
addsaver(rconf.collignon_reflected, "rug-collignon-reflect", false); add_all(pconf, "", "");
addsaver(rconf.euclid_to_sphere, "rug-euclid to sphere projection", 1.5); add_all(vid.rug_config, "rug_", "rug-");
param_f(rconf.twopoint_param, "rtwopoint", "rug-twopoint parameter", 1);
param_f(rconf.fisheye_param, "rfisheye", "rug-fisheye parameter", 1);
addsaver(rconf.model_transition, "rug-model transition", 1);
} }
auto hookArg = addHook(hooks_args, 100, readArgs) + addHook(hooks_config, 100, add_model_config); auto hookArg = addHook(hooks_args, 100, readArgs) + addHook(hooks_config, 100, add_model_config);