@react-three/rapier 0.6.7 → 0.6.9

package/dist/react-three-rapier.cjs.prod.js

@@ -8,6 +8,7 @@ var useAsset = require('use-asset');
 var fiber = require('@react-three/fiber');
 var three = require('three');
 var BufferGeometryUtils = require('three/examples/jsm/utils/BufferGeometryUtils');
+var MathUtils = require('three/src/math/MathUtils');
 var threeStdlib = require('three-stdlib');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -49,7 +50,7 @@ const rapierVector3ToVector3 = ({
   x,
   y,
   z
-}) => _vector3.set(x, y, z).clone();
+}) => _vector3.set(x, y, z);
 const rapierQuaternionToQuaternion = ({
   x,
   y,
@@ -95,6 +96,12 @@ const scaleColliderArgs = (shape, args, scale) => {
   const scaleArray = [scale.x, scale.y, scale.z, scale.x, scale.x];
   return newArgs.map((arg, index) => scaleArray[index] * arg);
 };
+
+const applyColliderOptions = (collider, options) => {
+  if (options.collisionGroups !== undefined) collider.setCollisionGroups(options.collisionGroups);
+  if (options.solverGroups !== undefined) collider.setSolverGroups(options.solverGroups);
+};
+
 const createColliderFromOptions = ({
   options,
   world,
@@ -122,10 +129,6 @@ const createColliderFromOptions = ({
     w: qRotation.w
   }).setRestitution((_options$restitution = options === null || options === void 0 ? void 0 : options.restitution) !== null && _options$restitution !== void 0 ? _options$restitution : 0).setRestitutionCombineRule((_options$restitutionC = options === null || options === void 0 ? void 0 : options.restitutionCombineRule) !== null && _options$restitutionC !== void 0 ? _options$restitutionC : rapier3dCompat.CoefficientCombineRule.Average).setFriction((_options$friction = options === null || options === void 0 ? void 0 : options.friction) !== null && _options$friction !== void 0 ? _options$friction : 0.7).setFrictionCombineRule((_options$frictionComb = options === null || options === void 0 ? void 0 : options.frictionCombineRule) !== null && _options$frictionComb !== void 0 ? _options$frictionComb : rapier3dCompat.CoefficientCombineRule.Average);
 
-  if (colliderShape === "heightfield") {
-    console.log(colliderDesc);
-  }
-
   if (hasCollisionEvents) {
     colliderDesc = colliderDesc.setActiveEvents(rapier3dCompat.ActiveEvents.COLLISION_EVENTS);
   } // If any of the mass properties are specified, add mass properties
@@ -152,6 +155,7 @@ const createColliderFromOptions = ({
   }
 
   const collider = world.createCollider(colliderDesc, rigidBody);
+  applyColliderOptions(collider, options);
   return collider;
 };
 
@@ -172,7 +176,6 @@ const createCollidersFromChildren = ({
 }) => {
   const hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
   const colliders = [];
-  new three.Vector3();
   object.traverseVisible(child => {
     if ("isMesh" in child) {
       if (_ignoreMeshColliders && isChildOfMeshCollider(child)) return;
@@ -218,6 +221,7 @@ const createCollidersFromChildren = ({
       });
       const actualRigidBody = rigidBody ? world.getRigidBody(rigidBody.handle) : undefined;
       const collider = world.createCollider(desc, actualRigidBody);
+      applyColliderOptions(collider, options);
       colliders.push(collider);
     }
   });
@@ -328,12 +332,7 @@ const createRigidBodyApi = ref => {
     addTorque: torque => ref.current().addTorque(torque, true),
 
     translation() {
-      const {
-        x,
-        y,
-        z
-      } = ref.current().translation();
-      return new three.Vector3(x, y, z);
+      return rapierVector3ToVector3(ref.current().translation());
     },
 
     setTranslation: translation => ref.current().setTranslation(translation, true),
@@ -348,18 +347,8 @@ const createRigidBodyApi = ref => {
       return new three.Quaternion(x, y, z, w);
     },
 
-    setRotation: ({
-      x,
-      y,
-      z
-    }) => {
-      const q = vector3ToQuaternion(new three.Vector3(x, y, z));
-      ref.current().setRotation({
-        x: q.x,
-        y: q.y,
-        z: q.z,
-        w: q.w
-      }, true);
+    setRotation: rotation => {
+      ref.current().setRotation(rotation, true);
     },
 
     linvel() {
@@ -395,18 +384,8 @@ const createRigidBodyApi = ref => {
     },
 
     setAngularDamping: factor => ref.current().setAngularDamping(factor),
-    setNextKinematicRotation: ({
-      x,
-      y,
-      z
-    }) => {
-      const q = vector3ToQuaternion(new three.Vector3(x, y, z));
-      ref.current().setNextKinematicRotation({
-        x: q.x,
-        y: q.y,
-        z: q.z,
-        w: q.w
-      });
+    setNextKinematicRotation: rotation => {
+      ref.current().setNextKinematicRotation(rotation);
     },
     setNextKinematicTranslation: translation => ref.current().setNextKinematicTranslation(translation),
     resetForces: () => ref.current().resetForces(true),
@@ -480,7 +459,8 @@ const Physics = ({
   children,
   timeStep: _timeStep = 1 / 60,
   maxSubSteps: _maxSubSteps = 10,
-  paused: _paused = false
+  paused: _paused = false,
+  updatePriority
 }) => {
   const rapier = useAsset.useAsset(importRapier);
   const [isPaused, setIsPaused] = React.useState(_paused);
@@ -496,9 +476,9 @@ const Physics = ({
 
     return worldRef.current;
   });
-  const [colliderMeshes] = React.useState(() => new Map());
   const [rigidBodyStates] = React.useState(() => new Map());
   const [rigidBodyEvents] = React.useState(() => new Map());
+  const [colliderEvents] = React.useState(() => new Map());
   const [eventQueue] = React.useState(() => new rapier3dCompat.EventQueue(false)); // Init world
 
   React.useEffect(() => {
@@ -528,12 +508,12 @@ const Physics = ({
     world.timestep = _timeStep;
     /**
      * Fixed timeStep simulation progression
-     * @see https://gafferongames.com/post/fix_your_timestep/ 
+     * @see https://gafferongames.com/post/fix_your_timestep/
     */
 
     let previousTranslations = {}; // don't step time forwards if paused
 
-    const nowTime = steppingState.time += _paused ? 0 : delta * 1000;
+    const nowTime = steppingState.time += _paused ? 0 : MathUtils.clamp(delta, 0, 1) * 1000;
     const timeStepMs = _timeStep * 1000;
     const timeSinceLast = nowTime - steppingState.lastTime;
     steppingState.lastTime = nowTime;
@@ -583,7 +563,7 @@ const Physics = ({
       }
 
       let oldState = previousTranslations[rigidBody.handle];
-      let newTranslation = rapierVector3ToVector3(rigidBody.translation());
+      let newTranslation = rigidBody.translation();
       let newRotation = rapierQuaternionToQuaternion(rigidBody.rotation());
       let interpolatedTranslation = oldState ? oldState.translation.lerp(newTranslation, 1) : newTranslation;
       let interpolatedRotation = oldState ? oldState.rotation.slerp(newRotation, interpolationAlpha) : newRotation;
@@ -602,42 +582,71 @@ const Physics = ({
       const rigidBodyHandle1 = (_collider1$parent = collider1.parent()) === null || _collider1$parent === void 0 ? void 0 : _collider1$parent.handle;
       const rigidBodyHandle2 = (_collider2$parent = collider2.parent()) === null || _collider2$parent === void 0 ? void 0 : _collider2$parent.handle;
 
-      if (!collider1 || !collider2 || !rigidBodyHandle1 || !rigidBodyHandle2) {
+      if (!collider1 || !collider2 || rigidBodyHandle1 === undefined || rigidBodyHandle2 === undefined) {
         return;
       }
 
       const rigidBody1 = world.getRigidBody(rigidBodyHandle1);
       const rigidBody2 = world.getRigidBody(rigidBodyHandle2);
-      const events1 = rigidBodyEvents.get(rigidBodyHandle1);
-      const events2 = rigidBodyEvents.get(rigidBodyHandle2);
+      const rigidBody1Events = rigidBodyEvents.get(rigidBodyHandle1);
+      const rigidBoyd2Events = rigidBodyEvents.get(rigidBodyHandle2);
+      const collider1Events = colliderEvents.get(collider1.handle);
+      const collider2Events = colliderEvents.get(collider2.handle);
 
       if (started) {
         world.contactPair(collider1, collider2, (manifold, flipped) => {
-          var _events1$onCollisionE, _events2$onCollisionE;
+          var _rigidBody1Events$onC, _rigidBoyd2Events$onC, _collider1Events$onCo, _collider2Events$onCo;
+
+          /* RigidBody events */
+          rigidBody1Events === null || rigidBody1Events === void 0 ? void 0 : (_rigidBody1Events$onC = rigidBody1Events.onCollisionEnter) === null || _rigidBody1Events$onC === void 0 ? void 0 : _rigidBody1Events$onC.call(rigidBody1Events, {
+            target: rigidBody2,
+            collider: collider2,
+            manifold,
+            flipped
+          });
+          rigidBoyd2Events === null || rigidBoyd2Events === void 0 ? void 0 : (_rigidBoyd2Events$onC = rigidBoyd2Events.onCollisionEnter) === null || _rigidBoyd2Events$onC === void 0 ? void 0 : _rigidBoyd2Events$onC.call(rigidBoyd2Events, {
+            target: rigidBody1,
+            collider: collider1,
+            manifold,
+            flipped
+          });
+          /* Collider events */
 
-          events1 === null || events1 === void 0 ? void 0 : (_events1$onCollisionE = events1.onCollisionEnter) === null || _events1$onCollisionE === void 0 ? void 0 : _events1$onCollisionE.call(events1, {
+          collider1Events === null || collider1Events === void 0 ? void 0 : (_collider1Events$onCo = collider1Events.onCollisionEnter) === null || _collider1Events$onCo === void 0 ? void 0 : _collider1Events$onCo.call(collider1Events, {
             target: rigidBody2,
+            collider: collider2,
             manifold,
             flipped
           });
-          events2 === null || events2 === void 0 ? void 0 : (_events2$onCollisionE = events2.onCollisionEnter) === null || _events2$onCollisionE === void 0 ? void 0 : _events2$onCollisionE.call(events2, {
+          collider2Events === null || collider2Events === void 0 ? void 0 : (_collider2Events$onCo = collider2Events.onCollisionEnter) === null || _collider2Events$onCo === void 0 ? void 0 : _collider2Events$onCo.call(collider2Events, {
             target: rigidBody1,
+            collider: collider1,
             manifold,
             flipped
           });
         });
       } else {
-        var _events1$onCollisionE2, _events2$onCollisionE2;
+        var _rigidBody1Events$onC2, _rigidBoyd2Events$onC2, _collider1Events$onCo2, _collider2Events$onCo2;
 
-        events1 === null || events1 === void 0 ? void 0 : (_events1$onCollisionE2 = events1.onCollisionExit) === null || _events1$onCollisionE2 === void 0 ? void 0 : _events1$onCollisionE2.call(events1, {
-          target: rigidBody2
+        rigidBody1Events === null || rigidBody1Events === void 0 ? void 0 : (_rigidBody1Events$onC2 = rigidBody1Events.onCollisionExit) === null || _rigidBody1Events$onC2 === void 0 ? void 0 : _rigidBody1Events$onC2.call(rigidBody1Events, {
+          target: rigidBody2,
+          collider: collider2
+        });
+        rigidBoyd2Events === null || rigidBoyd2Events === void 0 ? void 0 : (_rigidBoyd2Events$onC2 = rigidBoyd2Events.onCollisionExit) === null || _rigidBoyd2Events$onC2 === void 0 ? void 0 : _rigidBoyd2Events$onC2.call(rigidBoyd2Events, {
+          target: rigidBody1,
+          collider: collider1
         });
-        events2 === null || events2 === void 0 ? void 0 : (_events2$onCollisionE2 = events2.onCollisionExit) === null || _events2$onCollisionE2 === void 0 ? void 0 : _events2$onCollisionE2.call(events2, {
-          target: rigidBody1
+        collider1Events === null || collider1Events === void 0 ? void 0 : (_collider1Events$onCo2 = collider1Events.onCollisionExit) === null || _collider1Events$onCo2 === void 0 ? void 0 : _collider1Events$onCo2.call(collider1Events, {
+          target: rigidBody2,
+          collider: collider2
+        });
+        collider2Events === null || collider2Events === void 0 ? void 0 : (_collider2Events$onCo2 = collider2Events.onCollisionExit) === null || _collider2Events$onCo2 === void 0 ? void 0 : _collider2Events$onCo2.call(collider2Events, {
+          target: rigidBody1,
+          collider: collider1
         });
       }
     });
-  });
+  }, updatePriority);
   const api = React.useMemo(() => createWorldApi(getWorldRef), []);
   const context = React.useMemo(() => ({
     rapier,
@@ -646,9 +655,9 @@ const Physics = ({
       colliders: _colliders,
       gravity: _gravity
     },
-    colliderMeshes,
     rigidBodyStates,
     rigidBodyEvents,
+    colliderEvents,
     isPaused
   }), [isPaused]);
   return /*#__PURE__*/React__default["default"].createElement(RapierContext.Provider, {
@@ -1314,22 +1323,26 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
   }, props.children));
 });
 
-const _excluded = ["children"];
+const _excluded = ["children", "onCollisionEnter", "onCollisionExit"];
 
 const AnyCollider = _ref => {
   let {
-    children
+    children,
+    onCollisionEnter,
+    onCollisionExit
   } = _ref,
       props = _objectWithoutProperties(_ref, _excluded);
 
   const {
-    world
+    world,
+    colliderEvents
   } = useRapier();
   const rigidBodyContext = useRigidBodyContext();
   const ref = React.useRef(null);
   React.useEffect(() => {
     const scale = ref.current.getWorldScale(new three.Vector3());
-    const colliders = []; // If this is an InstancedRigidBody api
+    const colliders = [];
+    const hasCollisionEvents = (rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.hasCollisionEvents) || !!onCollisionEnter || !!onCollisionExit; // If this is an InstancedRigidBody api
 
     if (rigidBodyContext && "at" in rigidBodyContext.api) {
       rigidBodyContext.api.forEach((body, index) => {
@@ -1342,26 +1355,41 @@ const AnyCollider = _ref => {
         }
 
         colliders.push(createColliderFromOptions({
-          options: props,
+          options: _objectSpread2({
+            solverGroups: rigidBodyContext.options.solverGroups,
+            collisionGroups: rigidBodyContext.options.collisionGroups
+          }, props),
           world,
           rigidBody: body.raw(),
           scale: instanceScale,
-          hasCollisionEvents: rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.hasCollisionEvents
+          hasCollisionEvents
         }));
       });
     } else {
       colliders.push(createColliderFromOptions({
-        options: props,
+        options: _objectSpread2({
+          solverGroups: (rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options.solverGroups) || props.solverGroups,
+          collisionGroups: (rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options.collisionGroups) || props.collisionGroups
+        }, props),
         world,
         // Initiate with a rigidbody, or undefined, because colliders can exist without a rigid body
         rigidBody: rigidBodyContext && "raw" in rigidBodyContext.api ? rigidBodyContext.api.raw() : undefined,
         scale,
-        hasCollisionEvents: rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.hasCollisionEvents
+        hasCollisionEvents
       }));
     }
+    /* Register collision events. */
 
+
+    colliders.forEach(collider => colliderEvents.set(collider.handle, {
+      onCollisionEnter,
+      onCollisionExit
+    }));
     return () => {
-      colliders.forEach(collider => world.removeCollider(collider));
+      colliders.forEach(collider => {
+        colliderEvents.delete(collider.handle);
+        world.removeCollider(collider);
+      });
     };
   }, []);
   return /*#__PURE__*/React__default["default"].createElement("object3D", {
@@ -1415,6 +1443,42 @@ const ConvexHullCollider = props => {
   }));
 };
 
+/**
+ * Calculates an InteractionGroup bitmask for use in the `collisionGroups` or `solverGroups`
+ * properties of RigidBody or Collider components. The first argument represents a list of
+ * groups the entity is in (expressed as numbers from 0 to 15). The second argument is a list
+ * of groups that will be filtered against. When it is omitted, all groups are filtered against.
+ *
+ * @example
+ * A RigidBody that is member of group 0 and will collide with everything from groups 0 and 1:
+ *
+ * ```tsx
+ * <RigidBody collisionGroups={interactionGroups([0], [0, 1])} />
+ * ```
+ *
+ * A RigidBody that is member of groups 0 and 1 and will collide with everything else:
+ *
+ * ```tsx
+ * <RigidBody collisionGroups={interactionGroups([0, 1])} />
+ * ```
+ *
+ * A RigidBody that is member of groups 0 and 1 and will not collide with anything:
+ *
+ * ```tsx
+ * <RigidBody collisionGroups={interactionGroups([0, 1], [])} />
+ * ```
+ *
+ * Please note that Rapier needs interaction filters to evaluate to true between _both_ colliding
+ * entities for collision events to trigger.
+ *
+ * @param memberships Groups the collider is a member of. (Values can range from 0 to 15.)
+ * @param filters Groups the interaction group should filter against. (Values can range from 0 to 15.)
+ * @returns An InteractionGroup bitmask.
+ */
+const interactionGroups = (memberships, filters) => (bitmask(memberships) << 16) + (filters !== undefined ? bitmask(filters) : 0b1111111111111111);
+
+const bitmask = groups => [groups].flat().reduce((acc, layer) => acc | 1 << layer, 0);
+
 Object.defineProperty(exports, 'CoefficientCombineRule', {
   enumerable: true,
   get: function () { return rapier3dCompat.CoefficientCombineRule; }
@@ -1441,6 +1505,7 @@ exports.Physics = Physics;
 exports.RigidBody = RigidBody;
 exports.RoundCuboidCollider = RoundCuboidCollider;
 exports.TrimeshCollider = TrimeshCollider;
+exports.interactionGroups = interactionGroups;
 exports.useFixedJoint = useFixedJoint;
 exports.useImpulseJoint = useImpulseJoint;
 exports.usePrismaticJoint = usePrismaticJoint;