Update ground plane collider transform & spatial cursor raycast logic

Author: Steve-KX-RL

src/gui/threejsScene.js

@@ -149,9 +149,9 @@ import { ViewFrustum, frustumVertexShader, frustumFragmentShader, MAX_VIEW_FRUST
     function addGroundPlaneCollider() {
         const sceneSizeInMeters = 100; // not actually infinite, but relative to any area target this should cover it
         const geometry = new THREE.PlaneGeometry( 1000 * sceneSizeInMeters, 1000 * sceneSizeInMeters);
+        geometry.rotateX(Math.PI/2); // directly set the geometry's rotation to get the desired visual rotation & raycast direction. Otherwise setting mesh's rotation & run updateWorldMatrix(true, false) looks correct, but has wrong raycast direction
         const material = new THREE.MeshBasicMaterial( {color: 0x88ffff, side: THREE.DoubleSide} );
         const plane = new THREE.Mesh( geometry, material );
-        plane.rotateX(Math.PI/2);
         plane.visible = false;
         addToScene(plane, {occluded: true});
         plane.name = 'groundPlaneCollider';

src/spatialCursor/index.js

@@ -651,15 +651,17 @@ import * as THREE from '../../thirdPartyCode/three/three.module.js';
         }
     }
 
-    function getRaycastCoordinates(screenX, screenY) {
+    function getRaycastCoordinates(screenX, screenY, includeGroundPlane = false) {
         let worldIntersectPoint = null;
         let objectsToCheck = [];
         if (cachedOcclusionObject) {
             objectsToCheck.push(cachedOcclusionObject);
         }
-        // if (realityEditor.gui.threejsScene.getGroundPlaneCollider()) {
-        //     objectsToCheck.push(realityEditor.gui.threejsScene.getGroundPlaneCollider());
-        // }
+        if (includeGroundPlane) {
+            let groundPlane = realityEditor.gui.threejsScene.getGroundPlaneCollider();
+            groundPlane.updateWorldMatrix(true, false);
+            objectsToCheck.push(groundPlane);
+        }
         if (cachedWorldObject && objectsToCheck.length > 0) {
             // by default, three.js raycast returns coordinates in the top-level scene coordinate system
             let raycastIntersects = realityEditor.gui.threejsScene.getRaycastIntersects(screenX, screenY, objectsToCheck);