From cafc265cc6add50ddc0eb58ae5114f6b017f3bdd Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Wed, 30 Dec 2020 18:49:12 +0100
Subject: [PATCH] vr:: controller ray now extend to the correct distance

---
 control.cpp   |  5 ++---
 graph.cpp     |  1 -
 mapeditor.cpp |  2 ++
 vr.cpp        | 20 +++++++++++++-------
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/control.cpp b/control.cpp
index 51f7a185..f38d4a6d 100644
--- a/control.cpp
+++ b/control.cpp
@@ -609,9 +609,8 @@ EX bool need_mouseh = false;
 EX void fix_mouseh() {
   if(0) ;
 #if CAP_VR
-  else if(vrhr::active() && which_pointer) {
-    vrhr::compute_point(which_pointer, mouseh, mouseover);
-    }
+  else if(vrhr::active() && which_pointer && !vrhr::in_menu())
+    vrhr::compute_point(which_pointer, mouseh, mouseover, vrhr::pointer_distance);
 #endif
   else if(!need_mouseh) ;
 #if CAP_RUG
diff --git a/graph.cpp b/graph.cpp
index 2357b89c..a5f0a678 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -4179,7 +4179,6 @@ EX bool should_draw_mouse_cursor() {
   if(!mousing || inHighQual) return false;
   if(outofmap(mouseh.h)) return false;
   if(rug::rugged && !rug::renderonce) return true;
-  if(vrhr::active()) return true;
   return false;
   }
 
diff --git a/mapeditor.cpp b/mapeditor.cpp
index c8301e6b..16c2e715 100644
--- a/mapeditor.cpp
+++ b/mapeditor.cpp
@@ -1584,6 +1584,8 @@ EX namespace mapeditor {
     }
   
   EX shiftpoint find_mouseh3() {
+    if(vrhr::active() && WDIM == 2)
+      return mouseh;
     if(front_config == eFront::sphere_camera)
       return in_front_dist(front_edit);
     ld step = 0.01;
diff --git a/vr.cpp b/vr.cpp
index 7bf261e8..bc91650d 100644
--- a/vr.cpp
+++ b/vr.cpp
@@ -150,6 +150,9 @@ transmatrix hmd_mv_for[3], hmd_pre_for[3];
 
 vrdata_t vrdata;
 
+/** how far is the object pointed to */
+EX ld pointer_distance;
+
 /** should we try to access VR */
 EX bool enabled = false;
 
@@ -339,13 +342,15 @@ void track_all() {
         hyperpoint h1 = sm * hmd_at * vrdata.pose_matrix[i] * sm * C0;
         hyperpoint h2 = sm * hmd_at * vrdata.pose_matrix[i] * sm * point31(0, 0, -0.01);
         ld p = ilerp(h1[2], h2[2], -ui_depth);
-        hyperpoint px = lerp(h1, h2, p);
+        hyperpoint pxo = lerp(h1, h2, p);
+        hyperpoint px = pxo;
         px[0] /= ui_size;
         px[1] /= -ui_size;
         px[0] += current_display->xsize/2;
         px[1] += current_display->ysize/2;
         mousex = px[0];
         mousey = px[1];
+        pointer_distance = hdist(pxo, h1);
         }
       
       if(hdist(vrdata.pose_matrix[i] * C0, vrdata.last_pose_matrix[i] * C0) > .05) {
@@ -460,7 +465,7 @@ eModel pmodel_3d_version() {
   return pmodel;
   }
 
-ld vr_distance(shiftpoint h, int id) {
+ld vr_distance(shiftpoint h, int id, ld& dist) {
   hyperpoint hscr;
   h.h = hmd_pre_for[2] * h.h;
   eModel md = pmodel_3d_version();
@@ -468,12 +473,13 @@ ld vr_distance(shiftpoint h, int id) {
   E4; hscr[3] = 1;
   hyperpoint hc = inverse(sm * hmd_at * vrdata.pose_matrix[id] * sm) * hmd_mv * hscr;
   if(hc[2] > 0.1) return 1e6; /* behind */
+  dist = -hc[2];
   return sqhypot_d(2, hc);
   }
 
 EX hyperpoint vr_direction;
 
-EX void compute_point(int id, shiftpoint& res, cell*& c) {
+EX void compute_point(int id, shiftpoint& res, cell*& c, ld& dist) {
 
   if(WDIM == 3) {
     E4;
@@ -498,14 +504,14 @@ EX void compute_point(int id, shiftpoint& res, cell*& c) {
   for(auto p: current_display->all_drawn_copies) {
     for(auto& V: p.second) {
       shiftpoint h = V * pointable();
-      ld d = vr_distance(h, id);
+      ld d = vr_distance(h, id, dist);
       if(d < best) best = d, c = p.first, T = V;
       }
     }
   
   auto rel = pointable();
   
-  T = minimize_point_value(T, [&] (const shiftmatrix& T1) { return vr_distance(T1*rel, id); });
+  T = minimize_point_value(T, [&] (const shiftmatrix& T1) { return vr_distance(T1*rel, id, dist); });
   
   res = T * rel;
   }  
@@ -1098,13 +1104,13 @@ EX void submit() {
         glBindTexture(GL_TEXTURE_2D, vrdata.device_models[i]->texture_id);
         glDrawArrays(GL_TRIANGLES, 0, isize(vrdata.device_models[i]->vertices));
 
-        if(1) {
+        if(i == which_pointer) {
           current_display->next_shader_flags = 0;
           current_display->set_all(0, 0);
           vector<glvertex> vex;
           vex.push_back(glhr::makevertex(0.01, 0, 0));
           vex.push_back(glhr::makevertex(-0.01, 0, 0));
-          vex.push_back(glhr::makevertex(0, 0, -10));
+          vex.push_back(glhr::makevertex(0, 0, -pointer_distance));
           glhr::current_vertices = nullptr;
           glhr::vertices(vex);
           glhr::color2(0xC0FFC0C0);