Added support for shapeCast and merged raycastFirst and raycastAll into raycast

examples/src/examples/animation/locomotion.example.mjs

@@ -324,7 +324,7 @@ assetListLoader.load(() => {
         const cameraEntity = app.root.findByName('Camera');
         const near = cameraEntity.camera.screenToWorld(event.x, event.y, cameraEntity.camera.nearClip);
         const far = cameraEntity.camera.screenToWorld(event.x, event.y, cameraEntity.camera.farClip);
-        const result = app.systems.rigidbody.raycastFirst(far, near);
+        const result = app.systems.rigidbody.raycast(far, near)[0];
         if (result) {
             targetPosition = new pc.Vec3(result.point.x, 0, result.point.z);
             characterEntity.anim.setInteger('speed', data.get('jogToggle') ? 2 : 1);

examples/src/examples/physics/raycast.example.mjs

@@ -167,7 +167,7 @@ assetListLoader.load(() => {
         // Render the ray used in the raycast
         app.drawLine(start, end, white);
 
-        const result = app.systems.rigidbody.raycastFirst(start, end);
+        const result = app.systems.rigidbody.raycast(start, end)[0];
         if (result) {
             result.entity.render.material = red;
 
@@ -183,7 +183,7 @@ assetListLoader.load(() => {
         // Render the ray used in the raycast
         app.drawLine(start, end, white);
 
-        const results = app.systems.rigidbody.raycastAll(start, end);
+        const results = app.systems.rigidbody.raycast(start, end, { findAll: true });
         results.forEach(function (result) {
             result.entity.render.material = red;
 
@@ -217,8 +217,8 @@ assetListLoader.load(() => {
         app.root.addChild(text);
     };
 
-    createText(assets.font, 'raycastFirst', 0.5, 3.75, 0, 0);
-    createText(assets.font, 'raycastAll', 0.5, -0.25, 0, 0);
+    createText(assets.font, 'raycast', 0.5, 3.75, 0, 0);
+    createText(assets.font, 'raycast (with findAll)', 0.5, -0.25, 0, 0);
 });
 
 export { app };

scripts/camera/first-person-camera.js

@@ -715,7 +715,7 @@
             const start = this.entity.getPosition();
             const end = tmpV1.copy(start).add(Vec3.DOWN);
             end.y -= 0.1;
-            this._grounded = !!this._rigidbody.system.raycastFirst(start, end);
+            this._grounded = !!this._rigidbody.system.raycast(start, end)[0];
         }
 
         /**

src/deprecated/deprecated.js

@@ -58,7 +58,7 @@ import {
     BODYTYPE_DYNAMIC, BODYTYPE_KINEMATIC, BODYTYPE_STATIC
 } from '../framework/components/rigid-body/constants.js';
 import { RigidBodyComponent } from '../framework/components/rigid-body/component.js';
-import { RigidBodyComponentSystem } from '../framework/components/rigid-body/system.js';
+import { RigidBodyComponentSystem, HitResult } from '../framework/components/rigid-body/system.js';
 import { LitShader } from '../scene/shader-lib/programs/lit-shader.js';
 import { Geometry } from '../scene/geometry/geometry.js';
 
@@ -771,6 +771,7 @@ Object.defineProperty(MouseEvent.prototype, 'wheel', {
 
 // FRAMEWORK
 
+export const RaycastResult = HitResult;
 export const RIGIDBODY_TYPE_STATIC = BODYTYPE_STATIC;
 export const RIGIDBODY_TYPE_DYNAMIC = BODYTYPE_DYNAMIC;
 export const RIGIDBODY_TYPE_KINEMATIC = BODYTYPE_KINEMATIC;
@@ -891,3 +892,13 @@ RigidBodyComponentSystem.prototype.setGravity = function () {
         this.gravity.set(arguments[0], arguments[1], arguments[2]);
     }
 };
+
+RigidBodyComponentSystem.prototype.raycastFirst = function (start, end, options) {
+    Debug.deprecated('pc.RigidBodyComponentSystem#raycastFirst is deprecated. Use pc.RigidBodyComponentSystem#raycast instead.');
+    return this.raycast(start, end, options)[0] ?? null;
+};
+
+RigidBodyComponentSystem.prototype.raycastAll = function (start, end, options = {}) {
+    Debug.deprecated('pc.RigidBodyComponentSystem#raycastAll is deprecated. Use pc.RigidBodyComponentSystem#raycast with findAll option instead.');
+    return this.raycast(start, end, Object.assign(options, { findAll: true }));
+};

src/framework/components/camera/component.js

@@ -946,9 +946,10 @@ class CameraComponent extends Component {
      * const end = entity.camera.screenToWorld(clickX, clickY, entity.camera.farClip);
      *
      * // Use the ray coordinates to perform a raycast
-     * app.systems.rigidbody.raycastFirst(start, end, function (result) {
+     * const result = app.systems.rigidbody.raycast(start, end)[0];
+     * if (result) {
      *     console.log("Entity " + result.entity.name + " was selected");
-     * });
+     * }
      * @returns {import('../../../core/math/vec3.js').Vec3} The world space coordinate.
      */
     screenToWorld(screenx, screeny, cameraz, worldCoord) {