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

rug::gethyper in perspective mode

Browse Source
This commit is contained in:
Zeno Rogue 2017-12-27 13:09:58 +01:00
parent 685e0d3068
commit 0db0a77dcf
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
rug.cpp
View File

@ -959,9 +959,11 @@ void drawRugScene() {
glDepthFunc(GL_LESS); glDepthFunc(GL_LESS);
if(rug_perspective) { if(rug_perspective) {
ld vnear = .05; ld vnear = .001;
ld vfar = 10; ld vfar = 1000;
ld sca = vnear / 2 / vid.xres; ld sca = vnear / 2 / vid.xres;
xview = -.5;
yview = -.5 * vid.yres / vid.xres;
glFrustum(-sca * vid.xres, sca * vid.xres, -sca * vid.yres, sca * vid.yres, vnear, vfar); glFrustum(-sca * vid.xres, sca * vid.xres, -sca * vid.yres, sca * vid.yres, vnear, vfar);
} }
else { else {
@ -1127,6 +1129,19 @@ void actDraw() {
int besti; int besti;
void getco_pers(rugpoint *r, hyperpoint& p, bool& error) {
int sp;
getco(r, p, sp);
if(rug_perspective) {
if(p[2] >= 0)
error = true;
else {
p[0] /= p[2];
p[1] /= p[2];
}
}
}
hyperpoint gethyper(ld x, ld y) { hyperpoint gethyper(ld x, ld y) {
double mx = ((x*2 / vid.xres)-1) * xview; double mx = ((x*2 / vid.xres)-1) * xview;
double my = (1-(y*2 / vid.yres)) * yview; double my = (1-(y*2 / vid.yres)) * yview;
@ -1140,12 +1155,18 @@ hyperpoint gethyper(ld x, ld y) {
auto r0 = triangles[i].m[0]; auto r0 = triangles[i].m[0];
auto r1 = triangles[i].m[1]; auto r1 = triangles[i].m[1];
auto r2 = triangles[i].m[2]; auto r2 = triangles[i].m[2];
double dx1 = r1->getglue()->flat[0] - r0->getglue()->flat[0]; hyperpoint p0, p1, p2;
double dy1 = r1->getglue()->flat[1] - r0->getglue()->flat[1]; bool error = false;
double dx2 = r2->getglue()->flat[0] - r0->getglue()->flat[0]; getco_pers(r0, p0, error);
double dy2 = r2->getglue()->flat[1] - r0->getglue()->flat[1]; getco_pers(r1, p1, error);
double dxm = mx - r0->getglue()->flat[0]; getco_pers(r2, p2, error);
double dym = my - r0->getglue()->flat[1]; if(error) continue;
double dx1 = p1[0] - p0[0];
double dy1 = p1[1] - p0[1];
double dx2 = p2[0] - p0[0];
double dy2 = p2[1] - p0[1];
double dxm = mx - p0[0];
double dym = my - p0[1];
// A (dx1,dy1) = (1,0) // A (dx1,dy1) = (1,0)
// B (dx2,dy2) = (0,1) // B (dx2,dy2) = (0,1)
double det = dx1*dy2 - dy1*dx2; double det = dx1*dy2 - dy1*dx2;
@ -1153,7 +1174,7 @@ hyperpoint gethyper(ld x, ld y) {
double ty = -(dxm * dy1 - dym * dx1); double ty = -(dxm * dy1 - dym * dx1);
tx /= det; ty /= det; tx /= det; ty /= det;
if(tx >= 0 && ty >= 0 && tx+ty <= 1) { if(tx >= 0 && ty >= 0 && tx+ty <= 1) {
double rz1 = r0->flat[2] * (1-tx-ty) + r1->flat[2] * tx + r2->flat[2] * ty; double rz1 = p0[2] * (1-tx-ty) + p1[2] * tx + p2[2] * ty;
rz1 = -rz1; rz1 = -rz1;
if(rz1 < bdist) { if(rz1 < bdist) {
bdist = rz1; bdist = rz1;