mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-12-24 09:00:34 +00:00
hybrid:: new value of 'next' for get_corner
This commit is contained in:
parent
11c4b7974f
commit
38099bd7cb
@ -1373,6 +1373,7 @@ EX namespace hybrid {
|
|||||||
#define PIU(x) hr::hybrid::in_underlying_geometry([&] { return (x); })
|
#define PIU(x) hr::hybrid::in_underlying_geometry([&] { return (x); })
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// next: 0 = i-th corner, 1 = next corner, 2 = center of the wall
|
||||||
EX hyperpoint get_corner(cell *c, int i, int next, ld z) {
|
EX hyperpoint get_corner(cell *c, int i, int next, ld z) {
|
||||||
ld lev = cgi.plevel * z / 2;
|
ld lev = cgi.plevel * z / 2;
|
||||||
if(WDIM == 2) {
|
if(WDIM == 2) {
|
||||||
@ -1392,12 +1393,20 @@ EX namespace hybrid {
|
|||||||
in_underlying_geometry([&] {
|
in_underlying_geometry([&] {
|
||||||
hyperpoint h1 = get_corner_position(c, i);
|
hyperpoint h1 = get_corner_position(c, i);
|
||||||
hyperpoint h2 = get_corner_position(c, i+1);
|
hyperpoint h2 = get_corner_position(c, i+1);
|
||||||
|
hyperpoint hm;
|
||||||
|
if(next == 2) {
|
||||||
|
hm = h1;
|
||||||
|
he = 0;
|
||||||
|
}
|
||||||
|
else {
|
||||||
hyperpoint hm = mid(h1, h2);
|
hyperpoint hm = mid(h1, h2);
|
||||||
tf = hdist0(hm)/2;
|
|
||||||
he = hdist(hm, h2)/2;
|
he = hdist(hm, h2)/2;
|
||||||
|
if(next) he = -he;
|
||||||
|
}
|
||||||
|
tf = hdist0(hm)/2;
|
||||||
alpha = atan2(hm[1], hm[0]);
|
alpha = atan2(hm[1], hm[0]);
|
||||||
});
|
});
|
||||||
return spin(alpha) * rots::uxpush(tf) * rots::uypush(next?he:-he) * rots::uzpush(lev) * C0;
|
return spin(alpha) * rots::uxpush(tf) * rots::uypush(he) * rots::uzpush(lev) * C0;
|
||||||
#else
|
#else
|
||||||
throw hr_exception();
|
throw hr_exception();
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user