mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-18 15:00:26 +00:00
Code Issues Releases Wiki Activity

solv:: lazy version of inv_exp

Browse Source
This commit is contained in:
Zeno Rogue 2019-07-31 12:19:39 +02:00
parent 8ba99c42a0
commit b898365d68
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hyper.h
View File

@ -5631,7 +5631,7 @@ namespace kite {
namespace solv { namespace solv {
extern transmatrix local_perspective; extern transmatrix local_perspective;
hrmap *new_map(); hrmap *new_map();
hyperpoint inverse_exp(hyperpoint h); hyperpoint inverse_exp(hyperpoint h, bool lazy);
transmatrix get_solmul(const transmatrix T, const transmatrix V); transmatrix get_solmul(const transmatrix T, const transmatrix V);
extern string solshader; extern string solshader;

2
hypgraph.cpp
View File

@ -320,7 +320,7 @@ void applymodel(hyperpoint H, hyperpoint& ret) {
} }
case mdSolPerspective: { case mdSolPerspective: {
auto S = solv::inverse_exp(H); auto S = solv::inverse_exp(H, false);
ld ratio = vid.xres / current_display->tanfov / current_display->radius / 2; ld ratio = vid.xres / current_display->tanfov / current_display->radius / 2;
ret[0] = S[0]/S[2] * ratio; ret[0] = S[0]/S[2] * ratio;
ret[1] = S[1]/S[2] * ratio; ret[1] = S[1]/S[2] * ratio;

19
sol.cpp
View File

@ -112,21 +112,26 @@ namespace solv {
return 0.5 - atan((0.5-x) / y) / M_PI; return 0.5 - atan((0.5-x) / y) / M_PI;
} }
pt inverse_exp(pt h) { pt inverse_exp(pt h, bool lazy) {
load_table(); load_table();
ld ix = h[0] >= 0. ? x_to_ix(h[0]) : -x_to_ix(-h[0]); ld ix = h[0] >= 0. ? x_to_ix(h[0]) : x_to_ix(-h[0]);
ld iy = h[1] >= 0. ? x_to_ix(h[1]) : -x_to_ix(-h[1]); ld iy = h[1] >= 0. ? x_to_ix(h[1]) : x_to_ix(-h[1]);
ld iz = tanh(h[2]); ld iz = tanh(h[2]);
if(ix < 0.) ix = -ix; if(h[2] < 0.) { iz = -iz; swap(ix, iy); }
if(iy < 0.) iy = -iy;
if(iz < 0.) { iz = -iz; ld s = ix; ix = iy; iy = s; }
ix *= PRECX-1; ix *= PRECX-1;
iy *= PRECY-1; iy *= PRECY-1;
iz *= PRECZ-1; iz *= PRECZ-1;
if(lazy) {
auto r = inverse_exp_table[(iz*PRECY+iy)*PRECX+ix];
hyperpoint res = C0;
for(int i=0; i<3; i++) res[i] = r[i];
return res;
}
if(ix >= PRECX-1) ix = PRECX-2; if(ix >= PRECX-1) ix = PRECX-2;
if(iy >= PRECX-1) iy = PRECX-2; if(iy >= PRECX-1) iy = PRECX-2;
if(iz >= PRECZ-1) iz = PRECZ-2; if(iz >= PRECZ-1) iz = PRECZ-2;
@ -135,7 +140,7 @@ namespace solv {
int ay = iy, by = ay+1; int ay = iy, by = ay+1;
int az = iz, bz = az+1; int az = iz, bz = az+1;
pt res; pt res = C0;
#define S0(x,y,z) inverse_exp_table[(z*PRECY+y)*PRECX+x][t] #define S0(x,y,z) inverse_exp_table[(z*PRECY+y)*PRECX+x][t]
#define S1(x,y) (S0(x,y,az) * (bz-iz) + S0(x,y,bz) * (iz-az)) #define S1(x,y) (S0(x,y,az) * (bz-iz) + S0(x,y,bz) * (iz-az))