mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00
Code Issues Releases Wiki Activity

sn:: changed table presentation to Poincare

Browse Source
This commit is contained in:
Zeno Rogue 2020-01-15 18:07:54 +01:00
parent 9ab5c7d98f
commit 549aa5bdb1
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
devmods/solv-table.cpp
View File

@ -140,21 +140,28 @@ ptlow operator -(ptlow a, ptlow b) { return mlow(a[0]-b[0], a[1]-b[1], a[2]-b[2]
ptlow operator *(ptlow a, ld x) { return mlow(a[0]*x, a[1]*x, a[2]*x); } ptlow operator *(ptlow a, ld x) { return mlow(a[0]*x, a[1]*x, a[2]*x); }
ptlow can(hyperpoint x) { ptlow can(hyperpoint x) {
// azimuthal equidistant to Klein // azimuthal equidistant to Poincare
ld r = sqrt(x[0] * x[0] + x[1] * x[1] + x[2] * x[2]); ld r = sqrt(x[0] * x[0] + x[1] * x[1] + x[2] * x[2]);
if(r == 0) return mlow(0,0,0); if(r == 0) return mlow(0,0,0);
ld make_r = tanh(r); ld make_r = sinh(r) / (1 + cosh(r));
ld d = make_r / r; ld d = make_r / r;
return mlow(x[0]*d, x[1]*d, x[2]*d); return mlow(x[0]*d, x[1]*d, x[2]*d);
} }
hyperpoint uncan(ptlow x) { hyperpoint uncan(ptlow x) {
ld r = sqrt(x[0] * x[0] + x[1] * x[1] + x[2] * x[2]); // Poincare to azimuthal equidistant
if(r == 0) return atxyz(0,0,0);
ld make_r = atanh(r); ld hr = x[0] * x[0] + x[1] * x[1] + x[2] * x[2];
if(r == 1) make_r = 30; if(hr == 0) return atxyz(0,0,0);
ld d = make_r / r;
return atxyz(x[0]*d, x[1]*d, x[2]*d); ld hz = (1 + hr) / (1 - hr);
// println(hlog, "hz = ", hz);
ld d = (hz+1) * acosh(hz) / sinh(acosh(hz));
// println(hlog, "d = ", hz);
// println(hlog, "returning: ", point3(x[0] * d, x[1] * d, x[2] * d));
return point3(x[0] * d, x[1] * d, x[2] * d);
} }
hyperpoint uncan_info(ptlow x) { hyperpoint uncan_info(ptlow x) {

7
nonisotropic.cpp
View File

@ -509,8 +509,11 @@ EX namespace sn {
if(!just_direction) { if(!just_direction) {
ld r = hypot_d(3, res); ld r = hypot_d(3, res);
if(r == 0.) return res; if(r == 0) return point3(0,0,0);
return res * atanh(r) / r; ld make_r = atanh(r);
if(r == 1) make_r = 30;
ld d = make_r / r;
return point3(res[0]*d, res[1]*d, res[2]*d);
} }
return res; return res;