From a5f65fdf03cbcb3cb90ede1589c5f0de8adf130b Mon Sep 17 00:00:00 2001
From: Leon van Kammen <leonvankammen@gmail.com>
Date: Sat, 14 Oct 2023 22:07:12 +0200
Subject: [PATCH] gazer bugfix

---
 dist/xrfragment.aframe.js            | 22 ++++------------------
 dist/xrfragment.three.js             |  7 -------
 dist/xrfragment.three.module.js      |  7 -------
 src/3rd/js/aframe/xrf-gaze.js        | 15 ++++-----------
 src/3rd/js/three/InteractiveGroup.js |  7 -------
 5 files changed, 8 insertions(+), 50 deletions(-)

diff --git a/dist/xrfragment.aframe.js b/dist/xrfragment.aframe.js
index c4a6dd6..3224cf2 100644
--- a/dist/xrfragment.aframe.js
+++ b/dist/xrfragment.aframe.js
@@ -941,13 +941,6 @@ xrf.InteractiveGroup = function(THREE,renderer,camera){
       const raycaster = new Raycaster();
       const tempMatrix = new Matrix4();
 
-      function nocollide(){
-        if( nocollide.tid ) return  // ratelimit
-        _event.type = "nocollide"
-        scope.objects.map( (c) => c.dispatchEvent(_event) )
-        nocollide.tid = setTimeout( () => nocollide.tid = null, 10 )
-      }
-
       // Pointer Events
 
       const element = renderer.domElement;
@@ -2174,15 +2167,16 @@ AFRAME.registerComponent('xrf-gaze',{
         material="color: #BBBBBB; shader: flat">
       </a-entity>`
     }else{
-      cam.innerHTML = ''
+      //if( document.querySelector('[cursor]') ) 
+      //  document.querySelector('[cursor]').setAttribute("visible",false)
     }
   }, 
   init:function(data){
     this.immersive = false;
     let enabled    = () => AFRAME.utils.device.isMobile()
-    let setVisible = () => this.el.setAttribute('visible', enabled() )
+    let setVisible = () => document.querySelector('[cursor]').setAttribute('visible', enabled() )
     this.setGazer(enabled())
-    setVisible();
+    if( enabled() ) setVisible();
 
     document.querySelector("a-scene").addEventListener('exit-vr', () => {
       this.immersive = false;
@@ -2203,14 +2197,6 @@ AFRAME.registerComponent('xrf-gaze',{
     }
     this.el.addEventListener("mouseenter", highlightMesh(true) )
     this.el.addEventListener("mouseleave", highlightMesh(false ) )
-
-    //this.el.addEventListener('click',function(evt){
-    //  document.querySelector('a-scene').querySelector('#player').setAttribute('position',{
-    //    x:this.getAttribute('position').x,
-    //    y:this.getAttribute('position').y,
-    //    z:this.getAttribute('position').z
-    //  });
-    //});
   }
 });
 window.AFRAME.registerComponent('xrf-get', {
diff --git a/dist/xrfragment.three.js b/dist/xrfragment.three.js
index ba3a382..ac09f3f 100644
--- a/dist/xrfragment.three.js
+++ b/dist/xrfragment.three.js
@@ -941,13 +941,6 @@ xrf.InteractiveGroup = function(THREE,renderer,camera){
       const raycaster = new Raycaster();
       const tempMatrix = new Matrix4();
 
-      function nocollide(){
-        if( nocollide.tid ) return  // ratelimit
-        _event.type = "nocollide"
-        scope.objects.map( (c) => c.dispatchEvent(_event) )
-        nocollide.tid = setTimeout( () => nocollide.tid = null, 10 )
-      }
-
       // Pointer Events
 
       const element = renderer.domElement;
diff --git a/dist/xrfragment.three.module.js b/dist/xrfragment.three.module.js
index c4d9923..13e782a 100644
--- a/dist/xrfragment.three.module.js
+++ b/dist/xrfragment.three.module.js
@@ -941,13 +941,6 @@ xrf.InteractiveGroup = function(THREE,renderer,camera){
       const raycaster = new Raycaster();
       const tempMatrix = new Matrix4();
 
-      function nocollide(){
-        if( nocollide.tid ) return  // ratelimit
-        _event.type = "nocollide"
-        scope.objects.map( (c) => c.dispatchEvent(_event) )
-        nocollide.tid = setTimeout( () => nocollide.tid = null, 10 )
-      }
-
       // Pointer Events
 
       const element = renderer.domElement;
diff --git a/src/3rd/js/aframe/xrf-gaze.js b/src/3rd/js/aframe/xrf-gaze.js
index 151eeb9..ef03ef7 100644
--- a/src/3rd/js/aframe/xrf-gaze.js
+++ b/src/3rd/js/aframe/xrf-gaze.js
@@ -19,15 +19,16 @@ AFRAME.registerComponent('xrf-gaze',{
         material="color: #BBBBBB; shader: flat">
       </a-entity>`
     }else{
-      cam.innerHTML = ''
+      //if( document.querySelector('[cursor]') ) 
+      //  document.querySelector('[cursor]').setAttribute("visible",false)
     }
   }, 
   init:function(data){
     this.immersive = false;
     let enabled    = () => AFRAME.utils.device.isMobile()
-    let setVisible = () => this.el.setAttribute('visible', enabled() )
+    let setVisible = () => document.querySelector('[cursor]').setAttribute('visible', enabled() )
     this.setGazer(enabled())
-    setVisible();
+    if( enabled() ) setVisible();
 
     document.querySelector("a-scene").addEventListener('exit-vr', () => {
       this.immersive = false;
@@ -48,13 +49,5 @@ AFRAME.registerComponent('xrf-gaze',{
     }
     this.el.addEventListener("mouseenter", highlightMesh(true) )
     this.el.addEventListener("mouseleave", highlightMesh(false ) )
-
-    //this.el.addEventListener('click',function(evt){
-    //  document.querySelector('a-scene').querySelector('#player').setAttribute('position',{
-    //    x:this.getAttribute('position').x,
-    //    y:this.getAttribute('position').y,
-    //    z:this.getAttribute('position').z
-    //  });
-    //});
   }
 });
diff --git a/src/3rd/js/three/InteractiveGroup.js b/src/3rd/js/three/InteractiveGroup.js
index 23b0260..af6f922 100644
--- a/src/3rd/js/three/InteractiveGroup.js
+++ b/src/3rd/js/three/InteractiveGroup.js
@@ -30,13 +30,6 @@ xrf.InteractiveGroup = function(THREE,renderer,camera){
       const raycaster = new Raycaster();
       const tempMatrix = new Matrix4();
 
-      function nocollide(){
-        if( nocollide.tid ) return  // ratelimit
-        _event.type = "nocollide"
-        scope.objects.map( (c) => c.dispatchEvent(_event) )
-        nocollide.tid = setTimeout( () => nocollide.tid = null, 10 )
-      }
-
       // Pointer Events
 
       const element = renderer.domElement;