mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-06-14 17:29:57 +00:00
Code Issues Releases Wiki Activity

vrhr:: controllers are now shown on the desktop screen

Browse Source
This commit is contained in:
Zeno Rogue 2021-05-29 00:12:27 +02:00
parent 44ecbccb89
commit 176f6a542c
1 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
vr.cpp
View File

@ -39,6 +39,8 @@ EX eHeadset hsm = eHeadset::reference;
EX eEyes eyes = eEyes::equidistant; EX eEyes eyes = eEyes::equidistant;
EX eCompScreen cscr = eCompScreen::eyes; EX eCompScreen cscr = eCompScreen::eyes;
EX bool controllers_on_desktop = true;
EX cell *forward_cell; EX cell *forward_cell;
EX ld vraim_x, vraim_y, vrgo_x, vrgo_y; EX ld vraim_x, vraim_y, vrgo_x, vrgo_y;
@ -1107,13 +1109,17 @@ EX void render() {
} }
if(cscr == eCompScreen::eyes) draw_eyes();
if(cscr == eCompScreen::reference) { if(cscr == eCompScreen::reference) {
state = 3; state = 3;
drawqueue(); drawqueue();
} }
if(cscr == eCompScreen::eyes && !controllers_on_desktop) draw_eyes();
render_controllers();
if(cscr == eCompScreen::eyes && controllers_on_desktop) draw_eyes();
state = 1; state = 1;
} }
@ -1430,24 +1436,47 @@ void addconfig() {
auto hookc = addHook(hooks_configfile, 100, addconfig); auto hookc = addHook(hooks_configfile, 100, addconfig);
#endif #endif
EX void submit() { EX bool rec;
EX void render_controllers() {
if(!state) return; if(!state) return;
dynamicval<bool> rc(rec, true);
for(int i=0; i<(int)vr::k_unMaxTrackedDeviceCount; i++) for(int i=0; i<(int)vr::k_unMaxTrackedDeviceCount; i++)
if(vrdata.device_models[i]) { if(vrdata.device_models[i]) {
resetbuffer rb; resetbuffer rb;
if(!state) return;
state = 2; state = 2;
dynamicval<eModel> m(pmodel, mdPerspective); dynamicval<eModel> m(pmodel, mdPerspective);
dynamicval<ld> ms(sightranges[geometry], 100); dynamicval<ld> ms(sightranges[geometry], 100);
for(int e=0; e<3; e++) {
if(e < 2) {
vr_eye_settings ey;
ey.use(e);
}
else {
state = 1;
rb.reset();
calcparam();
current_display->set_viewport(0);
calcparam();
reset_projection();
current_display->set_all(0, 0);
if(cscr != eCompScreen::single || !controllers_on_desktop) goto next_model;
state = 4;
}
for(int e=0; e<2; e++) {
vr_eye_settings ey;
ey.use(e);
E4; E4;
hmd_mvp = vrdata.proj[e] * inverse(vrdata.eyepos[e]) * sm * hmd_at * vrdata.pose_matrix[i] * sm * Id; hmd_mvp = sm * hmd_at * vrdata.pose_matrix[i] * sm * Id;
if(e < 2)
hmd_mvp = vrdata.proj[e] * inverse(vrdata.eyepos[e]) * hmd_mvp;
else
hmd_mv = hmd_mvp;
hmd_pre = Id; hmd_pre = Id;
reset_projection(); reset_projection();
@ -1479,17 +1508,15 @@ EX void submit() {
} }
} }
state = 1;
rb.reset(); next_model: ;
calcparam(); }
current_display->set_viewport(0); }
calcparam();
reset_projection(); EX void submit() {
current_display->set_all(0, 0);
} if(!state) return;
for(int i=0; i<2; i++) { for(int i=0; i<2; i++) {
auto eye = vr::EVREye(i); auto eye = vr::EVREye(i);
auto& ey = vrdata.eyes[i]; auto& ey = vrdata.eyes[i];