From e38eea1859c8433c299a1e960229adeb8955e1ea Mon Sep 17 00:00:00 2001
From: Leon van Kammen <leonvankammen@gmail.com>
Date: Wed, 29 Nov 2023 19:39:31 +0100
Subject: [PATCH] improved collisions for floor

---
 example/aframe/sandbox/index.html |  5 ++---
 src/3rd/js/aframe/index.js        | 12 +++++++++---
 src/3rd/js/aframe/xrf-get.js      |  8 ++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/example/aframe/sandbox/index.html b/example/aframe/sandbox/index.html
index e2d0c36..ebaf27b 100644
--- a/example/aframe/sandbox/index.html
+++ b/example/aframe/sandbox/index.html
@@ -33,17 +33,16 @@
     <a-scene renderer="colorManagement: true; highRefreshRate:true" light="defaultLightsEnabled: false">
       <a-entity id="player">
         <a-entity camera="fov:90" position="0 1.6 0" wasd-controls look-controls id="camera"></a-entity>
-        <a-entity id="left-hand"  laser-controls="hand: left" raycaster="objects:.ray" blink-controls="cameraRig:#player; teleportOrigin: #camera; collisionEntities: #floor">
+        <a-entity id="left-hand"  laser-controls="hand: left" raycaster="objects:.ray" blink-controls="cameraRig:#player; teleportOrigin: #camera; collisionEntities: .floor">
           <a-entity rotation="-35 0 0" position="0 0.1 0" id="navigator"> 
             <a-entity id="back" xrf-button="label: <; width:0.05; action: history.back()"    position="-0.025 0 0" class="ray"></a-entity>
             <a-entity id="next" xrf-button="label: >; width:0.05; action: history.forward()" position=" 0.025 0 0" class="ray"></a-entity>
           </a-entity>
         </a-entity>
-        <a-entity id="right-hand" laser-controls="hand: right" raycaster="objects:.ray" blink-controls="cameraRig:#player; teleportOrigin: #camera; collisionEntities: #floor"></a-entity>
+        <a-entity id="right-hand" laser-controls="hand: right" raycaster="objects:.ray" blink-controls="cameraRig:#player; teleportOrigin: #camera; collisionEntities: .floor"></a-entity>
       </a-entity>
 
       <a-entity id="home"  xrf="index.glb"></a-entity>
-      <a-plane  id="floor" position="0 0 0" rotation="-90 0 0" width="1000" height="1000" material="visible:false"></a-plane>
     </a-scene>
 
     <script>
diff --git a/src/3rd/js/aframe/index.js b/src/3rd/js/aframe/index.js
index 3566c17..0f6b61a 100644
--- a/src/3rd/js/aframe/index.js
+++ b/src/3rd/js/aframe/index.js
@@ -33,9 +33,15 @@ window.AFRAME.registerComponent('xrf', {
           // *TODO* this does not really belong here perhaps
           let blinkControls = document.querySelector('[blink-controls]')
           if( blinkControls ){
-            blinkControls = blinkControls.components['blink-controls']
-            blinkControls.defaultCollisionMeshes = xrf.getCollisionMeshes()
-            blinkControls.update()
+            let els = xrf.getCollisionMeshes()
+            els.map( (mesh) => {
+              mesh.material.visible = false
+              let el = document.createElement("a-entity")
+              el.setAttribute("xrf-get", `name: ${mesh.name};reparent:true` )
+              el.setAttribute("class","floor ray")
+              $('a-scene').appendChild(el)
+            })
+            blinkControls = blinkControls.components['blink-controls'].queryCollisionEntities()
           }
         })
 
diff --git a/src/3rd/js/aframe/xrf-get.js b/src/3rd/js/aframe/xrf-get.js
index 797cf2c..9245673 100644
--- a/src/3rd/js/aframe/xrf-get.js
+++ b/src/3rd/js/aframe/xrf-get.js
@@ -14,7 +14,7 @@ window.AFRAME.registerComponent('xrf-get', {
 
       setTimeout( () => {
 
-        if( !this.mesh && this.el.className == "ray" ){
+        if( !this.mesh && this.el.className.match(/ray/) ){
           let scene = AFRAME.XRF.scene 
           let mesh = this.mesh = scene.getObjectByName(meshname);
           if (!mesh){
@@ -41,12 +41,12 @@ window.AFRAME.registerComponent('xrf-get', {
           }
           this.el.setObject3D('mesh',mesh)
           if( !this.el.id ) this.el.setAttribute("id",`xrf-${mesh.name}`)
-        }
-      },500)
+        }else console.warn("xrf-get ignore: "+JSON.stringify(this.data))
+      }, evt && evt.timeout ? evt.timeout: 500)
 
     })
 
-    this.el.emit("update")
+    this.el.emit("update",{timeout:0})
 
   }