mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-09-04 19:47:54 +00:00
Code Issues Releases Wiki Activity

vr:: vr_distance correct in 2.5D

Browse Source
This commit is contained in:
Zeno Rogue
2020-12-30 15:22:20 +01:00
parent 9895da1483
commit 4b3b7fead0
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vr.cpp
View File

@@ -418,9 +418,17 @@ EX ld absolute_unit_in_meters = 3;
/** what point and cell is the controller number id pointing to */ /** what point and cell is the controller number id pointing to */
eModel pmodel_3d_version() {
if(pmodel == mdGeodesic) return mdEquidistant;
if(pmodel == mdPerspective) return nonisotropic ? mdHorocyclic : mdEquidistant;
return pmodel;
}
ld vr_distance(shiftpoint h, int id) { ld vr_distance(shiftpoint h, int id) {
hyperpoint hscr; hyperpoint hscr;
applymodel(h, hscr); h.h = hmd_pre_for[2] * h.h;
eModel md = pmodel_3d_version();
apply_other_model(h, hscr, md);
E4; hscr[3] = 1; E4; hscr[3] = 1;
hyperpoint hc = inverse(sm * hmd_at * vrdata.pose_matrix[id] * sm) * hmd_mv * hscr; hyperpoint hc = inverse(sm * hmd_at * vrdata.pose_matrix[id] * sm) * hmd_mv * hscr;
if(hc[2] > 0.1) return 1e6; /* behind */ if(hc[2] > 0.1) return 1e6; /* behind */
@@ -428,7 +436,6 @@ ld vr_distance(shiftpoint h, int id) {
} }
EX void compute_point(int id, shiftpoint& res, cell*& c) { EX void compute_point(int id, shiftpoint& res, cell*& c) {
println(hlog, "computing point");
gen_mv(); gen_mv();
c = nullptr; c = nullptr;
ld best = 1e9; ld best = 1e9;