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

vr:: pointing now works in truesim

Browse Source
This commit is contained in:
Zeno Rogue 2020-12-31 16:36:04 +01:00
parent ca2154e034
commit 5ec9f06383
1 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
vr.cpp
View File

@ -479,15 +479,60 @@ EX transmatrix screen_to_controller(int id) {
return inverse(sm * hmd_at * vrdata.pose_matrix[id] * sm) * hmd_mv; return inverse(sm * hmd_at * vrdata.pose_matrix[id] * sm) * hmd_mv;
} }
ld vr_distance(shiftpoint h, int id, ld& dist) { hyperpoint perceived_location(shiftpoint h, int id, bool& bad) {
if(eyes == eEyes::truesim) {
hyperpoint eye_at[2], tangent[2];
bad = false;
for(int i=0; i<2; i++) {
shiftpoint h1 = h;
h1.h = hmd_pre_for[i] * h1.h;
eModel md = pmodel_3d_version();
hyperpoint hscr;
apply_other_model(h1, hscr, md);
E4;
hscr[3] = 1;
eye_at[i] = vrdata.eyepos[i] * C0;
tangent[i] = vrdata.eyepos[i] * sm * hmd_mv_for[i] * (hscr - C0);
}
// eye_at[0] + tangent[0] * a == eye_at[1] + tangent[1] * b
// (in coordinates 0,2; in nonisotropic geometries, [1] may be different)
E4;
auto t10 = tangent[1][0];
auto t12 = tangent[1][2];
auto t00 = tangent[0][0];
auto t02 = tangent[0][2];
ld a = (t10 * eye_at[0][2] - t12 * eye_at[0][0] - t10 * eye_at[1][2] + t12 * eye_at[1][0]) / (t00 * t12 - t02 * t10);
ld b = (t00 * eye_at[1][2] - t02 * eye_at[1][0] - t00 * eye_at[0][2] + t02 * eye_at[0][0]) / (t10 * t02 - t12 * t00);
hyperpoint hit0 = eye_at[0] + tangent[0] * a;
hyperpoint hit1 = eye_at[1] + tangent[1] * b;
// we should have hit0 == hit1, except coordinate [1]
return (hit0 + hit1) / 2;
}
else {
hyperpoint hscr; hyperpoint hscr;
h.h = hmd_pre_for[2] * h.h; h.h = hmd_pre_for[2] * h.h;
eModel md = pmodel_3d_version(); eModel md = pmodel_3d_version();
apply_other_model(h, hscr, md); apply_other_model(h, hscr, md);
if(in_vr_sphere && get_side(hscr) == (sphereflipped() ? -1 : 1)) return 1e5; bad = in_vr_sphere && get_side(hscr) == (sphereflipped() ? -1 : 1);
E4; hscr[3] = 1; hscr[3] = 1;
hyperpoint hc = screen_to_controller(id) * hscr; return hscr;
}
}
ld vr_distance(const shiftpoint& h, int id, ld& dist) {
bool bad;
hyperpoint hscr = perceived_location(h, id, bad);
if(bad) return 1e5;
E4; hyperpoint hc = screen_to_controller(id) * hscr;
if(WDIM == 2) { if(WDIM == 2) {
if(hc[2] > 0.1) return 1e6; /* behind */ if(hc[2] > 0.1) return 1e6; /* behind */
dist = -hc[2]; dist = -hc[2];