mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-08 15:09:54 +00:00
Code Issues Releases Wiki Activity

twisted E2xR now reacts to nilwidth

Browse Source
This commit is contained in:
Zeno Rogue 2024-06-18 10:46:19 +02:00
parent d49e2e3992
commit ea7b665fd5
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
geom-exp.cpp
View File

@ -715,7 +715,10 @@ EX void menuitem_nilwidth(key_type key) {
dialog::addSelItem(XLAT("Nil width"), fts(nilv::nilwidth), key); dialog::addSelItem(XLAT("Nil width"), fts(nilv::nilwidth), key);
dialog::add_action([] { dialog::add_action([] {
dialog::editNumber(nilv::nilwidth, 0.01, 2, 0.1, 1, XLAT("Nil width"), ""); dialog::editNumber(nilv::nilwidth, 0.01, 2, 0.1, 1, XLAT("Nil width"), "");
dialog::get_ne().reaction = ray::reset_raycaster; dialog::get_ne().reaction = [] {
ray::reset_raycaster();
twist::clear_twisted_matrices();
};
dialog::bound_low(0.01); dialog::bound_low(0.01);
}); });
} }
@ -1033,9 +1036,10 @@ EX void showEuclideanMenu() {
dialog::get_ne().reaction = ray::reset_raycaster; dialog::get_ne().reaction = ray::reset_raycaster;
}); });
} }
else if(mhybrid) { else if(mtwisted) {
dialog::addSelItem(XLAT("number of levels"), its(hybrid::csteps / cgi.single_step), 'L'); dialog::addSelItem(XLAT("number of levels"), its(hybrid::csteps / cgi.single_step), 'L');
dialog::add_action(hybrid::configure_period); dialog::add_action(hybrid::configure_period);
if(nil) menuitem_nilwidth('v');
} }
else if(bt::in()) { else if(bt::in()) {
menuitem_binary_width('v'); menuitem_binary_width('v');

19
nonisotropic.cpp
View File

@ -1328,8 +1328,8 @@ EX namespace hybrid {
transmatrix lT = twist::lift_matrix(uT); transmatrix lT = twist::lift_matrix(uT);
transmatrix lU = twist::lift_matrix(uU); transmatrix lU = twist::lift_matrix(uU);
transmatrix lT1 = twist::lift_matrix(uT1); transmatrix lT1 = twist::lift_matrix(uT1);
if(!orig_height.count(cw0.at)) orig_height[cw0.at] = (lT*C0) [2]; if(!orig_height.count(cw0.at)) orig_height[cw0.at] = (lT*C0) [2] / nilv::nilwidth / nilv::nilwidth;
ld diff = (lT * lU * iso_inverse(lT1) * C0)[2] - orig_height[cw0.at]; ld diff = (lT * lU * iso_inverse(lT1) * C0)[2] / nilv::nilwidth / nilv::nilwidth - orig_height[cw0.at];
if(!orig_height.count(cw0.peek())) orig_height[cw0.peek()] = -diff; if(!orig_height.count(cw0.peek())) orig_height[cw0.peek()] = -diff;
diff += orig_height[cw0.peek()]; diff += orig_height[cw0.peek()];
if(abs(frac(diff / cgi.plevel + 0.5) - 0.5) > 1e-6) throw hr_exception("not an integer in get_shift"); if(abs(frac(diff / cgi.plevel + 0.5) - 0.5) > 1e-6) throw hr_exception("not an integer in get_shift");
@ -2352,19 +2352,19 @@ EX namespace twist {
#if MAXMDIM >= 4 #if MAXMDIM >= 4
EX transmatrix uxpush(ld x) { EX transmatrix uxpush(ld x) {
if(sl2) return xpush(x); if(sl2) return xpush(x);
if(nil) return xpush(x*2); if(nil) return xpush(x*2*nilv::nilwidth);
return cspin(1, 3, x) * cspin(0, 2, x); return cspin(1, 3, x) * cspin(0, 2, x);
} }
EX transmatrix uypush(ld y) { EX transmatrix uypush(ld y) {
if(sl2) return ypush(y); if(sl2) return ypush(y);
if(nil) return ypush(y*2); if(nil) return ypush(y*2*nilv::nilwidth);
return cspin(0, 3, -y) * cspin(1, 2, y); return cspin(0, 3, -y) * cspin(1, 2, y);
} }
EX transmatrix uzpush(ld z) { EX transmatrix uzpush(ld z) {
if(sl2) return zpush(z); if(sl2) return zpush(z);
if(nil) return zpush(z) * spin(-2*z); if(nil) return zpush(z*nilv::nilwidth*nilv::nilwidth) * spin(-2*z);
return cspin(3, 2, -z) * cspin(0, 1, -z); return cspin(3, 2, -z) * cspin(0, 1, -z);
} }
@ -2447,6 +2447,15 @@ EX namespace twist {
} }
}; };
EX void clear_twisted_matrices() {
saved_matrices_ray.clear();
for(auto& m: allmaps) {
auto m1 = dynamic_cast<hrmap_twisted*> (m);
if(m1) m1->saved_matrices.clear();
}
}
/** reinterpret the given point of rotspace as a rotation matrix in the underlying geometry (note: this is the inverse) /** reinterpret the given point of rotspace as a rotation matrix in the underlying geometry (note: this is the inverse)
* note: you should already be in underlying geometry */ * note: you should already be in underlying geometry */
EX transmatrix qtm(hyperpoint h) { EX transmatrix qtm(hyperpoint h) {