@react-three/rapier 0.13.2 → 0.14.0-rc.1

package/dist/declarations/src/components/Attractor.d.ts

@@ -12,13 +12,13 @@ export interface AttractorProps {
      * The strength of the attractor.
      * Positive values attract, negative values repel.
      *
-     * @default 1
+     * @defaultValue 1
      */
     strength?: number;
     /**
      * The range of the attractor. Will not affect objects outside of this range.
      *
-     * @default 10
+     * @defaultValue 10
      * @min 0
      */
     range?: number;
@@ -27,12 +27,12 @@ export interface AttractorProps {
      * - static: The gravity is constant and does not change over time.
      * - linear: The gravity is linearly interpolated the closer the object is to the attractor.
      * - newtonian: The gravity is calculated using the newtonian gravity formula.
-     * @default "static"
+     * @defaultValue "static"
      */
     type?: AttractorGravityType;
     /**
      * The mass of the attractor. Used when type is `newtonian`.
-     * @default 6.673e-11
+     * @defaultValue 6.673e-11
      */
     gravitationalConstant?: number;
     /**

package/dist/declarations/src/components/Physics.d.ts

@@ -140,18 +140,11 @@ export interface PhysicsProps {
      * @defaultValue false
      */
     paused?: boolean;
-    /**
-     * The update priority at which the physics simulation should run.
-     *
-     * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#taking-over-the-render-loop
-     * @defaultValue undefined
-     */
-    updatePriority?: number;
     /**
      * Interpolate the world transform using the frame delta times.
      * Has no effect if timeStep is set to "vary".
      *
-     * @default true
+     * @defaultValue true
      **/
     interpolate?: boolean;
 }

package/dist/declarations/src/types.d.ts

@@ -228,31 +228,41 @@ export interface RigidBodyOptions extends ColliderProps {
      * Specify the type of this rigid body
      */
     type?: RigidBodyTypeString;
-    /** Whether or not this body can sleep.
-     * default: true
+    /**
+     * Whether or not this body can sleep.
+     * @defaultValue true
      */
     canSleep?: boolean;
     /** The linear damping coefficient of this rigid-body.*/
     linearDamping?: number;
     /** The angular damping coefficient of this rigid-body.*/
     angularDamping?: number;
-    /** The initial linear velocity of this body.
-     * default: zero velocity
+    /**
+     * The initial linear velocity of this body.
+     * @defaultValue [0,0,0]
      */
     linearVelocity?: Vector3Array;
-    /** The initial angular velocity of this body.
-     * Default: zero velocity.
+    /**
+     * The initial angular velocity of this body.
+     * @defaultValue [0,0,0]
      */
     angularVelocity?: Vector3Array;
     /**
      * The scaling factor applied to the gravity affecting the rigid-body.
-     * Default: 1.0
+     * @defaultValue 1.0
      */
     gravityScale?: number;
+    /**
+     * The dominance group of this RigidBody. If a rigid body has a higher domiance group,
+     * on collision it will be immune to forces originating from the other bodies.
+     * https://rapier.rs/docs/user_guides/javascript/rigid_bodies#dominance
+     * Default: 0
+     */
+    dominanceGroup?: number;
     /**
      * Whether or not Continous Collision Detection is enabled for this rigid-body.
      * https://rapier.rs/docs/user_guides/javascript/rigid_bodies#continuous-collision-detection
-     * @default false
+     * @defaultValue false
      */
     ccd?: boolean;
     /**
@@ -308,7 +318,7 @@ export interface RigidBodyOptions extends ColliderProps {
      */
     enabledRotations?: Boolean3Array;
     /**
-     * Allow rotation of this rigid-body only along specific axes.
+     * Allow translation of this rigid-body only along specific axes.
      */
     enabledTranslations?: Boolean3Array;
     /**

package/dist/declarations/src/utils/utils-collider.d.ts

@@ -31,5 +31,51 @@ export declare const getColliderArgsFromGeometry: (geometry: BufferGeometry, col
     args: unknown[];
     offset: Vector3;
 };
-export declare const useColliderEvents: (getCollider: () => Collider, props: ColliderProps, events: EventMap) => void;
+export declare const getActiveCollisionEventsFromProps: (props?: ColliderProps) => {
+    collision: boolean;
+    contactForce: boolean;
+};
+export declare const useColliderEvents: (getCollider: () => Collider, props: ColliderProps, events: EventMap, activeEvents?: {
+    collision?: boolean;
+    contactForce?: boolean;
+}) => void;
+export declare const cleanRigidBodyPropsForCollider: (props?: RigidBodyProps) => {
+    linearVelocity?: import("..").Vector3Array | undefined;
+    angularVelocity?: import("..").Vector3Array | undefined;
+    dominanceGroup?: number | undefined;
+    position?: import("@react-three/fiber").Vector3 | undefined;
+    rotation?: import("@react-three/fiber").Euler | undefined;
+    colliders?: RigidBodyAutoCollider | undefined;
+    friction?: number | undefined;
+    restitution?: number | undefined;
+    collisionGroups?: number | undefined;
+    solverGroups?: number | undefined;
+    onSleep?(): void;
+    onWake?(): void;
+    lockRotations?: boolean | undefined;
+    lockTranslations?: boolean | undefined;
+    enabledRotations?: import("..").Boolean3Array | undefined;
+    enabledTranslations?: import("..").Boolean3Array | undefined;
+    userData?: {
+        [key: string]: any;
+    } | undefined;
+    includeInvisible?: boolean | undefined;
+    transformState?: ((state: import("../components/Physics").RigidBodyState) => import("../components/Physics").RigidBodyState) | undefined;
+    name?: string | undefined;
+    shape?: ColliderShape | undefined;
+    args?: any;
+    principalAngularInertia?: import("..").Vector3Array | undefined;
+    restitutionCombineRule?: import("@dimforge/rapier3d-compat").CoefficientCombineRule | undefined;
+    frictionCombineRule?: import("@dimforge/rapier3d-compat").CoefficientCombineRule | undefined;
+    quaternion?: import("@react-three/fiber").Quaternion | undefined;
+    scale?: import("@react-three/fiber").Vector3 | undefined;
+    density?: number | undefined;
+    massProperties?: {
+        mass: number;
+        centerOfMass: import("@dimforge/rapier3d-compat").Vector;
+        principalAngularInertia: import("@dimforge/rapier3d-compat").Vector;
+        angularInertiaLocalFrame: import("@dimforge/rapier3d-compat").Rotation;
+    } | undefined;
+    sensor?: boolean | undefined;
+};
 export {};

package/dist/declarations/src/utils/utils-physics.d.ts

@@ -0,0 +1 @@
+export declare const useRaf: (callback: (dt: number) => void) => void;

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

@@ -178,6 +178,62 @@ function useConst(initialValue) {
   return ref.current.value;
 }
 
+const useRaf = callback => {
+  const cb = React.useRef(callback);
+  const raf = React.useRef(0);
+  const lastFrame = React.useRef(0);
+  React.useEffect(() => {
+    cb.current = callback;
+  }, [callback]);
+  React.useEffect(() => {
+    const loop = () => {
+      const now = performance.now();
+      const delta = now - lastFrame.current;
+      raf.current = requestAnimationFrame(loop);
+      cb.current(delta / 1000);
+      lastFrame.current = now;
+    };
+
+    raf.current = requestAnimationFrame(loop);
+    return () => cancelAnimationFrame(raf.current);
+  }, []);
+};
+
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
+  }
+
+  return target;
+}
+
+function _objectWithoutProperties(source, excluded) {
+  if (source == null) return {};
+  var target = _objectWithoutPropertiesLoose(source, excluded);
+  var key, i;
+
+  if (Object.getOwnPropertySymbols) {
+    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+
+    for (i = 0; i < sourceSymbolKeys.length; i++) {
+      key = sourceSymbolKeys[i];
+      if (excluded.indexOf(key) >= 0) continue;
+      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+      target[key] = source[key];
+    }
+  }
+
+  return target;
+}
+
+const _excluded$2 = ["mass", "linearDamping", "angularDamping", "type", "onCollisionEnter", "onCollisionExit", "onIntersectionEnter", "onIntersectionExit", "onContactForce", "children", "canSleep", "ccd", "gravityScale"];
 const scaleColliderArgs = (shape, args, scale) => {
   const newArgs = args.slice(); // Heightfield uses a vector
 
@@ -344,7 +400,7 @@ const createColliderPropsFromChildren = ({
   ignoreMeshColliders: _ignoreMeshColliders = true,
   options
 }) => {
-  const colliderProps = [];
+  const childColliderProps = [];
   object.updateWorldMatrix(true, false);
   const invertedParentMatrixWorld = object.matrixWorld.clone().invert();
 
@@ -365,13 +421,16 @@ const createColliderPropsFromChildren = ({
         args,
         offset
       } = getColliderArgsFromGeometry(geometry, options.colliders || "cuboid");
-      colliderProps.push(_objectSpread2(_objectSpread2({}, options), {}, {
+
+      const colliderProps = _objectSpread2(_objectSpread2({}, cleanRigidBodyPropsForCollider(options)), {}, {
         args: args,
         shape: shape,
         rotation: [rotationEuler.x, rotationEuler.y, rotationEuler.z],
         position: [_position.x + offset.x * worldScale.x, _position.y + offset.y * worldScale.y, _position.z + offset.z * worldScale.z],
         scale: [worldScale.x, worldScale.y, worldScale.z]
-      }));
+      });
+
+      childColliderProps.push(colliderProps);
     }
   };
 
@@ -381,7 +440,7 @@ const createColliderPropsFromChildren = ({
     object.traverseVisible(colliderFromChild);
   }
 
-  return colliderProps;
+  return childColliderProps;
 };
 const getColliderArgsFromGeometry = (geometry, colliders) => {
   switch (colliders) {
@@ -437,7 +496,17 @@ const getColliderArgsFromGeometry = (geometry, colliders) => {
     offset: new three.Vector3()
   };
 };
-const useColliderEvents = (getCollider, props, events) => {
+const getActiveCollisionEventsFromProps = props => {
+  return {
+    collision: !!(props !== null && props !== void 0 && props.onCollisionEnter || props !== null && props !== void 0 && props.onCollisionExit || props !== null && props !== void 0 && props.onIntersectionEnter || props !== null && props !== void 0 && props.onIntersectionExit),
+    contactForce: !!(props !== null && props !== void 0 && props.onContactForce)
+  };
+};
+const useColliderEvents = (getCollider, props, events,
+/**
+ * The RigidBody can pass down active events to the collider without attaching the event listners
+ */
+activeEvents = {}) => {
   const {
     onCollisionEnter,
     onCollisionExit,
@@ -449,8 +518,12 @@ const useColliderEvents = (getCollider, props, events) => {
     const collider = getCollider();
 
     if (collider) {
-      const hasCollisionEvent = !!(onCollisionEnter || onCollisionExit || onIntersectionEnter || onIntersectionExit);
-      const hasContactForceEvent = !!onContactForce;
+      const {
+        collision: collisionEventsActive,
+        contactForce: contactForceEventsActive
+      } = getActiveCollisionEventsFromProps(props);
+      const hasCollisionEvent = collisionEventsActive || activeEvents.collision;
+      const hasContactForceEvent = contactForceEventsActive || activeEvents.contactForce;
 
       if (hasCollisionEvent && hasContactForceEvent) {
         collider.setActiveEvents(rapier3dCompat.ActiveEvents.COLLISION_EVENTS | rapier3dCompat.ActiveEvents.CONTACT_FORCE_EVENTS);
@@ -474,7 +547,12 @@ const useColliderEvents = (getCollider, props, events) => {
         events.delete(collider.handle);
       }
     };
-  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
+  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce, activeEvents]);
+};
+const cleanRigidBodyPropsForCollider = (props = {}) => {
+  const rest = _objectWithoutProperties(props, _excluded$2);
+
+  return rest;
 };
 
 const useMutableCallback = fn => {
@@ -675,10 +753,12 @@ const Physics = ({
   children,
   timeStep: _timeStep = 1 / 60,
   paused: _paused = false,
-  updatePriority,
   interpolate: _interpolate = true
 }) => {
   const rapier = useAsset.useAsset(importRapier);
+  const {
+    invalidate
+  } = fiber.useThree();
   const worldRef = React.useRef();
   const getWorldRef = React.useRef(() => {
     if (!worldRef.current) {
@@ -959,10 +1039,13 @@ const Physics = ({
         maxForceMagnitude: event.maxForceMagnitude()
       }));
     });
+    world.forEachActiveRigidBody(body => {
+      invalidate();
+    });
   }, [_paused, _timeStep, _interpolate]);
-  fiber.useFrame((_, dt) => {
+  useRaf(dt => {
     if (!_paused) step(dt);
-  }, updatePriority);
+  });
   const context = React.useMemo(() => ({
     rapier,
     world: api,
@@ -1002,40 +1085,6 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0) continue;
-    target[key] = source[key];
-  }
-
-  return target;
-}
-
-function _objectWithoutProperties(source, excluded) {
-  if (source == null) return {};
-  var target = _objectWithoutPropertiesLoose(source, excluded);
-  var key, i;
-
-  if (Object.getOwnPropertySymbols) {
-    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-
-    for (i = 0; i < sourceSymbolKeys.length; i++) {
-      key = sourceSymbolKeys[i];
-      if (excluded.indexOf(key) >= 0) continue;
-      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-      target[key] = source[key];
-    }
-  }
-
-  return target;
-}
-
 /**
  * Initiate an instance and return a safe getter
  */
@@ -1148,10 +1197,10 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((prop
   }, []);
   React.useImperativeHandle(forwardedRef, () => getInstance());
   const mergedProps = React.useMemo(() => {
-    return _objectSpread2(_objectSpread2({}, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options), props);
+    return _objectSpread2(_objectSpread2({}, cleanRigidBodyPropsForCollider(rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options)), props);
   }, [props, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options]);
   useUpdateColliderOptions(getInstance, mergedProps, colliderStates);
-  useColliderEvents(getInstance, mergedProps, colliderEvents);
+  useColliderEvents(getInstance, mergedProps, colliderEvents, getActiveCollisionEventsFromProps(rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options));
   return /*#__PURE__*/React__default["default"].createElement("object3D", {
     position: position,
     rotation: rotation,
@@ -1312,6 +1361,9 @@ const mutableRigidBodyOptions = {
   angularDamping: (rb, value) => {
     rb.setAngularDamping(value);
   },
+  dominanceGroup: (rb, value) => {
+    rb.setDominanceGroup(value);
+  },
   enabledRotations: (rb, [x, y, z]) => {
     rb.setEnabledRotations(x, y, z, true);
   },
@@ -1396,7 +1448,8 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     onCollisionEnter,
     onCollisionExit,
     onIntersectionEnter,
-    onIntersectionExit
+    onIntersectionExit,
+    onContactForce
   } = props;
   const eventHandlers = {
     onWake,
@@ -1404,7 +1457,8 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     onCollisionEnter,
     onCollisionExit,
     onIntersectionEnter,
-    onIntersectionExit
+    onIntersectionExit,
+    onContactForce
   };
   React.useEffect(() => {
     const rigidBody = getRigidBody();
@@ -1412,7 +1466,7 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     return () => {
       events.delete(rigidBody.handle);
     };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
 };
 
 const _excluded$1 = ["children", "type", "position", "rotation", "scale", "quaternion", "transformState"];

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

@@ -178,6 +178,62 @@ function useConst(initialValue) {
   return ref.current.value;
 }
 
+const useRaf = callback => {
+  const cb = React.useRef(callback);
+  const raf = React.useRef(0);
+  const lastFrame = React.useRef(0);
+  React.useEffect(() => {
+    cb.current = callback;
+  }, [callback]);
+  React.useEffect(() => {
+    const loop = () => {
+      const now = performance.now();
+      const delta = now - lastFrame.current;
+      raf.current = requestAnimationFrame(loop);
+      cb.current(delta / 1000);
+      lastFrame.current = now;
+    };
+
+    raf.current = requestAnimationFrame(loop);
+    return () => cancelAnimationFrame(raf.current);
+  }, []);
+};
+
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
+  }
+
+  return target;
+}
+
+function _objectWithoutProperties(source, excluded) {
+  if (source == null) return {};
+  var target = _objectWithoutPropertiesLoose(source, excluded);
+  var key, i;
+
+  if (Object.getOwnPropertySymbols) {
+    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+
+    for (i = 0; i < sourceSymbolKeys.length; i++) {
+      key = sourceSymbolKeys[i];
+      if (excluded.indexOf(key) >= 0) continue;
+      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+      target[key] = source[key];
+    }
+  }
+
+  return target;
+}
+
+const _excluded$2 = ["mass", "linearDamping", "angularDamping", "type", "onCollisionEnter", "onCollisionExit", "onIntersectionEnter", "onIntersectionExit", "onContactForce", "children", "canSleep", "ccd", "gravityScale"];
 const scaleColliderArgs = (shape, args, scale) => {
   const newArgs = args.slice(); // Heightfield uses a vector
 
@@ -344,7 +400,7 @@ const createColliderPropsFromChildren = ({
   ignoreMeshColliders: _ignoreMeshColliders = true,
   options
 }) => {
-  const colliderProps = [];
+  const childColliderProps = [];
   object.updateWorldMatrix(true, false);
   const invertedParentMatrixWorld = object.matrixWorld.clone().invert();
 
@@ -365,13 +421,16 @@ const createColliderPropsFromChildren = ({
         args,
         offset
       } = getColliderArgsFromGeometry(geometry, options.colliders || "cuboid");
-      colliderProps.push(_objectSpread2(_objectSpread2({}, options), {}, {
+
+      const colliderProps = _objectSpread2(_objectSpread2({}, cleanRigidBodyPropsForCollider(options)), {}, {
         args: args,
         shape: shape,
         rotation: [rotationEuler.x, rotationEuler.y, rotationEuler.z],
         position: [_position.x + offset.x * worldScale.x, _position.y + offset.y * worldScale.y, _position.z + offset.z * worldScale.z],
         scale: [worldScale.x, worldScale.y, worldScale.z]
-      }));
+      });
+
+      childColliderProps.push(colliderProps);
     }
   };
 
@@ -381,7 +440,7 @@ const createColliderPropsFromChildren = ({
     object.traverseVisible(colliderFromChild);
   }
 
-  return colliderProps;
+  return childColliderProps;
 };
 const getColliderArgsFromGeometry = (geometry, colliders) => {
   switch (colliders) {
@@ -437,7 +496,17 @@ const getColliderArgsFromGeometry = (geometry, colliders) => {
     offset: new three.Vector3()
   };
 };
-const useColliderEvents = (getCollider, props, events) => {
+const getActiveCollisionEventsFromProps = props => {
+  return {
+    collision: !!(props !== null && props !== void 0 && props.onCollisionEnter || props !== null && props !== void 0 && props.onCollisionExit || props !== null && props !== void 0 && props.onIntersectionEnter || props !== null && props !== void 0 && props.onIntersectionExit),
+    contactForce: !!(props !== null && props !== void 0 && props.onContactForce)
+  };
+};
+const useColliderEvents = (getCollider, props, events,
+/**
+ * The RigidBody can pass down active events to the collider without attaching the event listners
+ */
+activeEvents = {}) => {
   const {
     onCollisionEnter,
     onCollisionExit,
@@ -449,8 +518,12 @@ const useColliderEvents = (getCollider, props, events) => {
     const collider = getCollider();
 
     if (collider) {
-      const hasCollisionEvent = !!(onCollisionEnter || onCollisionExit || onIntersectionEnter || onIntersectionExit);
-      const hasContactForceEvent = !!onContactForce;
+      const {
+        collision: collisionEventsActive,
+        contactForce: contactForceEventsActive
+      } = getActiveCollisionEventsFromProps(props);
+      const hasCollisionEvent = collisionEventsActive || activeEvents.collision;
+      const hasContactForceEvent = contactForceEventsActive || activeEvents.contactForce;
 
       if (hasCollisionEvent && hasContactForceEvent) {
         collider.setActiveEvents(rapier3dCompat.ActiveEvents.COLLISION_EVENTS | rapier3dCompat.ActiveEvents.CONTACT_FORCE_EVENTS);
@@ -474,7 +547,12 @@ const useColliderEvents = (getCollider, props, events) => {
         events.delete(collider.handle);
       }
     };
-  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
+  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce, activeEvents]);
+};
+const cleanRigidBodyPropsForCollider = (props = {}) => {
+  const rest = _objectWithoutProperties(props, _excluded$2);
+
+  return rest;
 };
 
 const useMutableCallback = fn => {
@@ -675,10 +753,12 @@ const Physics = ({
   children,
   timeStep: _timeStep = 1 / 60,
   paused: _paused = false,
-  updatePriority,
   interpolate: _interpolate = true
 }) => {
   const rapier = useAsset.useAsset(importRapier);
+  const {
+    invalidate
+  } = fiber.useThree();
   const worldRef = React.useRef();
   const getWorldRef = React.useRef(() => {
     if (!worldRef.current) {
@@ -959,10 +1039,13 @@ const Physics = ({
         maxForceMagnitude: event.maxForceMagnitude()
       }));
     });
+    world.forEachActiveRigidBody(body => {
+      invalidate();
+    });
   }, [_paused, _timeStep, _interpolate]);
-  fiber.useFrame((_, dt) => {
+  useRaf(dt => {
     if (!_paused) step(dt);
-  }, updatePriority);
+  });
   const context = React.useMemo(() => ({
     rapier,
     world: api,
@@ -1002,40 +1085,6 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0) continue;
-    target[key] = source[key];
-  }
-
-  return target;
-}
-
-function _objectWithoutProperties(source, excluded) {
-  if (source == null) return {};
-  var target = _objectWithoutPropertiesLoose(source, excluded);
-  var key, i;
-
-  if (Object.getOwnPropertySymbols) {
-    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-
-    for (i = 0; i < sourceSymbolKeys.length; i++) {
-      key = sourceSymbolKeys[i];
-      if (excluded.indexOf(key) >= 0) continue;
-      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-      target[key] = source[key];
-    }
-  }
-
-  return target;
-}
-
 /**
  * Initiate an instance and return a safe getter
  */
@@ -1148,10 +1197,10 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((prop
   }, []);
   React.useImperativeHandle(forwardedRef, () => getInstance());
   const mergedProps = React.useMemo(() => {
-    return _objectSpread2(_objectSpread2({}, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options), props);
+    return _objectSpread2(_objectSpread2({}, cleanRigidBodyPropsForCollider(rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options)), props);
   }, [props, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options]);
   useUpdateColliderOptions(getInstance, mergedProps, colliderStates);
-  useColliderEvents(getInstance, mergedProps, colliderEvents);
+  useColliderEvents(getInstance, mergedProps, colliderEvents, getActiveCollisionEventsFromProps(rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options));
   return /*#__PURE__*/React__default["default"].createElement("object3D", {
     position: position,
     rotation: rotation,
@@ -1312,6 +1361,9 @@ const mutableRigidBodyOptions = {
   angularDamping: (rb, value) => {
     rb.setAngularDamping(value);
   },
+  dominanceGroup: (rb, value) => {
+    rb.setDominanceGroup(value);
+  },
   enabledRotations: (rb, [x, y, z]) => {
     rb.setEnabledRotations(x, y, z, true);
   },
@@ -1396,7 +1448,8 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     onCollisionEnter,
     onCollisionExit,
     onIntersectionEnter,
-    onIntersectionExit
+    onIntersectionExit,
+    onContactForce
   } = props;
   const eventHandlers = {
     onWake,
@@ -1404,7 +1457,8 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     onCollisionEnter,
     onCollisionExit,
     onIntersectionEnter,
-    onIntersectionExit
+    onIntersectionExit,
+    onContactForce
   };
   React.useEffect(() => {
     const rigidBody = getRigidBody();
@@ -1412,7 +1466,7 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     return () => {
       events.delete(rigidBody.handle);
     };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
 };
 
 const _excluded$1 = ["children", "type", "position", "rotation", "scale", "quaternion", "transformState"];

package/dist/react-three-rapier.esm.js

@@ -1,7 +1,7 @@
 import { ActiveEvents, ColliderDesc, EventQueue, RigidBodyDesc } from '@dimforge/rapier3d-compat';
 export { CoefficientCombineRule, Collider as RapierCollider, RigidBody as RapierRigidBody } from '@dimforge/rapier3d-compat';
-import { useFrame, useThree } from '@react-three/fiber';
-import React, { useRef, useMemo, useEffect, useContext, useState, memo, createContext, useCallback, forwardRef, useImperativeHandle, Fragment } from 'react';
+import { useThree, useFrame } from '@react-three/fiber';
+import React, { useRef, useEffect, useMemo, useContext, useState, memo, createContext, useCallback, forwardRef, useImperativeHandle, Fragment } from 'react';
 import { Quaternion, Euler, Vector3, Object3D, Matrix4, MathUtils, BufferAttribute, DynamicDrawUsage } from 'three';
 import { useAsset } from 'use-asset';
 import { mergeVertices, VertexNormalsHelper } from 'three-stdlib';
@@ -153,6 +153,62 @@ function useConst(initialValue) {
   return ref.current.value;
 }
 
+const useRaf = callback => {
+  const cb = useRef(callback);
+  const raf = useRef(0);
+  const lastFrame = useRef(0);
+  useEffect(() => {
+    cb.current = callback;
+  }, [callback]);
+  useEffect(() => {
+    const loop = () => {
+      const now = performance.now();
+      const delta = now - lastFrame.current;
+      raf.current = requestAnimationFrame(loop);
+      cb.current(delta / 1000);
+      lastFrame.current = now;
+    };
+
+    raf.current = requestAnimationFrame(loop);
+    return () => cancelAnimationFrame(raf.current);
+  }, []);
+};
+
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
+  }
+
+  return target;
+}
+
+function _objectWithoutProperties(source, excluded) {
+  if (source == null) return {};
+  var target = _objectWithoutPropertiesLoose(source, excluded);
+  var key, i;
+
+  if (Object.getOwnPropertySymbols) {
+    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+
+    for (i = 0; i < sourceSymbolKeys.length; i++) {
+      key = sourceSymbolKeys[i];
+      if (excluded.indexOf(key) >= 0) continue;
+      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+      target[key] = source[key];
+    }
+  }
+
+  return target;
+}
+
+const _excluded$2 = ["mass", "linearDamping", "angularDamping", "type", "onCollisionEnter", "onCollisionExit", "onIntersectionEnter", "onIntersectionExit", "onContactForce", "children", "canSleep", "ccd", "gravityScale"];
 const scaleColliderArgs = (shape, args, scale) => {
   const newArgs = args.slice(); // Heightfield uses a vector
 
@@ -319,7 +375,7 @@ const createColliderPropsFromChildren = ({
   ignoreMeshColliders: _ignoreMeshColliders = true,
   options
 }) => {
-  const colliderProps = [];
+  const childColliderProps = [];
   object.updateWorldMatrix(true, false);
   const invertedParentMatrixWorld = object.matrixWorld.clone().invert();
 
@@ -340,13 +396,16 @@ const createColliderPropsFromChildren = ({
         args,
         offset
       } = getColliderArgsFromGeometry(geometry, options.colliders || "cuboid");
-      colliderProps.push(_objectSpread2(_objectSpread2({}, options), {}, {
+
+      const colliderProps = _objectSpread2(_objectSpread2({}, cleanRigidBodyPropsForCollider(options)), {}, {
         args: args,
         shape: shape,
         rotation: [rotationEuler.x, rotationEuler.y, rotationEuler.z],
         position: [_position.x + offset.x * worldScale.x, _position.y + offset.y * worldScale.y, _position.z + offset.z * worldScale.z],
         scale: [worldScale.x, worldScale.y, worldScale.z]
-      }));
+      });
+
+      childColliderProps.push(colliderProps);
     }
   };
 
@@ -356,7 +415,7 @@ const createColliderPropsFromChildren = ({
     object.traverseVisible(colliderFromChild);
   }
 
-  return colliderProps;
+  return childColliderProps;
 };
 const getColliderArgsFromGeometry = (geometry, colliders) => {
   switch (colliders) {
@@ -412,7 +471,17 @@ const getColliderArgsFromGeometry = (geometry, colliders) => {
     offset: new Vector3()
   };
 };
-const useColliderEvents = (getCollider, props, events) => {
+const getActiveCollisionEventsFromProps = props => {
+  return {
+    collision: !!(props !== null && props !== void 0 && props.onCollisionEnter || props !== null && props !== void 0 && props.onCollisionExit || props !== null && props !== void 0 && props.onIntersectionEnter || props !== null && props !== void 0 && props.onIntersectionExit),
+    contactForce: !!(props !== null && props !== void 0 && props.onContactForce)
+  };
+};
+const useColliderEvents = (getCollider, props, events,
+/**
+ * The RigidBody can pass down active events to the collider without attaching the event listners
+ */
+activeEvents = {}) => {
   const {
     onCollisionEnter,
     onCollisionExit,
@@ -424,8 +493,12 @@ const useColliderEvents = (getCollider, props, events) => {
     const collider = getCollider();
 
     if (collider) {
-      const hasCollisionEvent = !!(onCollisionEnter || onCollisionExit || onIntersectionEnter || onIntersectionExit);
-      const hasContactForceEvent = !!onContactForce;
+      const {
+        collision: collisionEventsActive,
+        contactForce: contactForceEventsActive
+      } = getActiveCollisionEventsFromProps(props);
+      const hasCollisionEvent = collisionEventsActive || activeEvents.collision;
+      const hasContactForceEvent = contactForceEventsActive || activeEvents.contactForce;
 
       if (hasCollisionEvent && hasContactForceEvent) {
         collider.setActiveEvents(ActiveEvents.COLLISION_EVENTS | ActiveEvents.CONTACT_FORCE_EVENTS);
@@ -449,7 +522,12 @@ const useColliderEvents = (getCollider, props, events) => {
         events.delete(collider.handle);
       }
     };
-  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
+  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce, activeEvents]);
+};
+const cleanRigidBodyPropsForCollider = (props = {}) => {
+  const rest = _objectWithoutProperties(props, _excluded$2);
+
+  return rest;
 };
 
 const useMutableCallback = fn => {
@@ -650,10 +728,12 @@ const Physics = ({
   children,
   timeStep: _timeStep = 1 / 60,
   paused: _paused = false,
-  updatePriority,
   interpolate: _interpolate = true
 }) => {
   const rapier = useAsset(importRapier);
+  const {
+    invalidate
+  } = useThree();
   const worldRef = useRef();
   const getWorldRef = useRef(() => {
     if (!worldRef.current) {
@@ -934,10 +1014,13 @@ const Physics = ({
         maxForceMagnitude: event.maxForceMagnitude()
       }));
     });
+    world.forEachActiveRigidBody(body => {
+      invalidate();
+    });
   }, [_paused, _timeStep, _interpolate]);
-  useFrame((_, dt) => {
+  useRaf(dt => {
     if (!_paused) step(dt);
-  }, updatePriority);
+  });
   const context = useMemo(() => ({
     rapier,
     world: api,
@@ -977,40 +1060,6 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0) continue;
-    target[key] = source[key];
-  }
-
-  return target;
-}
-
-function _objectWithoutProperties(source, excluded) {
-  if (source == null) return {};
-  var target = _objectWithoutPropertiesLoose(source, excluded);
-  var key, i;
-
-  if (Object.getOwnPropertySymbols) {
-    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-
-    for (i = 0; i < sourceSymbolKeys.length; i++) {
-      key = sourceSymbolKeys[i];
-      if (excluded.indexOf(key) >= 0) continue;
-      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-      target[key] = source[key];
-    }
-  }
-
-  return target;
-}
-
 /**
  * Initiate an instance and return a safe getter
  */
@@ -1123,10 +1172,10 @@ const AnyCollider = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((props, forwarded
   }, []);
   useImperativeHandle(forwardedRef, () => getInstance());
   const mergedProps = useMemo(() => {
-    return _objectSpread2(_objectSpread2({}, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options), props);
+    return _objectSpread2(_objectSpread2({}, cleanRigidBodyPropsForCollider(rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options)), props);
   }, [props, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options]);
   useUpdateColliderOptions(getInstance, mergedProps, colliderStates);
-  useColliderEvents(getInstance, mergedProps, colliderEvents);
+  useColliderEvents(getInstance, mergedProps, colliderEvents, getActiveCollisionEventsFromProps(rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options));
   return /*#__PURE__*/React.createElement("object3D", {
     position: position,
     rotation: rotation,
@@ -1287,6 +1336,9 @@ const mutableRigidBodyOptions = {
   angularDamping: (rb, value) => {
     rb.setAngularDamping(value);
   },
+  dominanceGroup: (rb, value) => {
+    rb.setDominanceGroup(value);
+  },
   enabledRotations: (rb, [x, y, z]) => {
     rb.setEnabledRotations(x, y, z, true);
   },
@@ -1371,7 +1423,8 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     onCollisionEnter,
     onCollisionExit,
     onIntersectionEnter,
-    onIntersectionExit
+    onIntersectionExit,
+    onContactForce
   } = props;
   const eventHandlers = {
     onWake,
@@ -1379,7 +1432,8 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     onCollisionEnter,
     onCollisionExit,
     onIntersectionEnter,
-    onIntersectionExit
+    onIntersectionExit,
+    onContactForce
   };
   useEffect(() => {
     const rigidBody = getRigidBody();
@@ -1387,7 +1441,7 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     return () => {
       events.delete(rigidBody.handle);
     };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
 };
 
 const _excluded$1 = ["children", "type", "position", "rotation", "scale", "quaternion", "transformState"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/rapier",
-  "version": "0.13.2",
+  "version": "0.14.0-rc.1",
   "source": "src/index.ts",
   "main": "dist/react-three-rapier.cjs.js",
   "module": "dist/react-three-rapier.esm.js",

package/readme.md

@@ -84,6 +84,7 @@ For full API outline and documentation, see 🧩 [API Docs](https://pmndrs.githu
   - [🖼 Joints Example](#-joints-example)
 - [Advanced hooks usage](#advanced-hooks-usage)
   - [Manual stepping](#manual-stepping)
+  - [On-demand rendering](#on-demand-rendering)
 
 ---
 
@@ -131,7 +132,7 @@ Supported values:
 
 - `"cuboid"`, creates a CuboidCollider based on the bounding box of the mesh
 - `"ball"`, creates a SphereCollider based on the bounding sphere of the mesh
-- `"trimesh"`, creates a TrimeshCollider based on the mesh's geometry -- note trimeshes are massless by default (https://rapier.rs/docs/user_guides/javascript/common_mistakes#rigid-body-isnt-affected-by-gravity)
+- `"trimesh"`, creates a TrimeshCollider based on the mesh's geometry
 - `"hull"`, creates a ConvexHullCollider based on the mesh's geometry
 - `false`, disables auto-generation
 
@@ -758,7 +759,7 @@ const JointedThing = () => {
     [
       [0, 0, 0], // Position of the joint in bodyA's local space    
       [0, 0, 0], // Position of the joint in bodyB's local space
-      [0, 0, 0], // Axis of the joint, expressed in the local-space of the rigid-bodies it is attached to.
+      [0, 1, 0], // Axis of the joint, expressed in the local-space of the rigid-bodies it is attached to. Cannot be [0,0,0].
     ]);
 
   useEffect(() => {
@@ -793,7 +794,7 @@ const JointedThing = () => {
     [
       [0, 0, 0], // Position of the joint in bodyA's local space    
       [0, 0, 0], // Position of the joint in bodyB's local space
-      [0, 0, 0], // Axis of the joint, expressed in the local-space of the rigid-bodies it is attached to.
+      [0, 1, 0], // Axis of the joint, expressed in the local-space of the rigid-bodies it is attached to. Cannot be [0,0,0].
     ]);
 
   return (
@@ -834,4 +835,7 @@ You can manually step the physics simulation by calling the `step` method from t
 const { step } = useRapier();
 
 step(1 / 60);
-```
+```
+
+### On-demand rendering
+`@react-three/rapier` runs the physics simulation independently from the render loop, and will tell `@react-three/fiber` to render if the scene has active (non-sleeping) RigidBodies. This allows you to use the `<Canvas frameloop="demand" />` (https://docs.pmnd.rs/react-three-fiber/advanced/scaling-performance#on-demand-rendering) strategy to only render the scene when needed.