added some missing MAXMDIM guards

This commit is contained in:
Zeno Rogue 2020-05-31 17:21:16 +02:00
parent b4687213c3
commit a8a0805b6f
6 changed files with 27 additions and 1 deletions

View File

@ -3993,3 +3993,16 @@ bugfixes:
- fixed incorrect farlands generation in quotient geometries
- fixed incorrect wall shape in some geometries (e.g. Euclidean)
- fixed a bug in 16-cell
2020-05-31 16:47 Update 11.3o:
- new commands for tes files: cscale, repeat
- texture mode now compatible with tes files
- more detailed explanation if the polygon does not end
- in texture mode, relabeled "zoom/scale" to correct "scale/rotate"
- parser: edge_angles function
- fake curvature: not works in 2D; improved net showing; new options
- Nil: fixed the raycaster, and a freeze when changing the 'width' parameter
- fixed a crash when changing wall quality in some geometries
- when selecting singlecolor/randomcolor pattern in 3D, you can now specify the wall probability

View File

@ -1180,6 +1180,7 @@ EX int cyldist(gp::loc a, gp::loc b) {
EX void generate() {
#if MAXMDIM >= 4
if(fake::in()) {
fake::generate();
return;
@ -1250,6 +1251,7 @@ EX void generate() {
}
reg3::make_vertices_only();
#endif
}

View File

@ -289,6 +289,7 @@ EX ld compute_around(bool setup) {
EX void generate() {
FPIU( cgi.require_basics() );
#if MAXMDIM >= 4
auto &ucgi = *underlying_cgip;
cgi.loop = ucgi.loop;
@ -306,6 +307,7 @@ EX void generate() {
compute_around(true);
reg3::compute_ultra();
#endif
}
int get_middle() {

View File

@ -778,6 +778,7 @@ EX void showEuclideanMenu() {
}
#endif
#if MAXMDIM >= 4
if(cgflags & qULTRA) {
dialog::addBoolItem(XLAT("truncate ultra-vertices with mirrors"), reg3::ultra_mirror_on, 'Z');
dialog::add_action([] {
@ -785,6 +786,7 @@ EX void showEuclideanMenu() {
ray::reset_raycaster();
});
}
#endif
if(prod) {
dialog::addSelItem(XLAT("Z-level height factor"), fts(vid.plevel_factor), 'Z');
@ -1089,9 +1091,11 @@ int read_geom_args() {
cheat();
shift(); currfp.qpaths.push_back(args());
}
#if MAXMDIM >= 4
else if(argis("-truncate-ultra")) {
shift(); reg3::ultra_mirror_on = argi();
}
#endif
else if(argis("-d:quotient"))
launch_dialog(showQuotientConfig);
#endif

View File

@ -282,6 +282,7 @@ void virtualRebase_cell(cell*& base, T& at, const U& check) {
base = newbase;
at = best_at;
}
#if MAXMDIM >= 4
if(reg3::ultra_mirror_in()) {
again:
for(auto& v: cgi.ultra_mirrors) {
@ -294,6 +295,7 @@ void virtualRebase_cell(cell*& base, T& at, const U& check) {
}
}
}
#endif
}
template<class T, class U>

View File

@ -997,7 +997,10 @@ EX ld spherity(const transmatrix& V) {
}
EX bool confusingGeometry() {
return quotient || elliptic || reg3::ultra_mirror_in() || (fake::in() && fake::multiple);
#if MAXMDIM
if(reg3::ultra_mirror_in()) return true;
#endif
return quotient || elliptic || (fake::in() && fake::multiple);
}
EX ld master_to_c7_angle() {