@react-three/rapier 1.0.0-canary.2 → 1.0.0

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

@@ -115,6 +115,43 @@ export interface PhysicsProps {
      * @defaultValue [0, -9.81, 0]
      */
     gravity?: Vector3Tuple;
+    /**
+     * The maximum velocity iterations the velocity-based constraint solver can make to attempt
+     * to remove the energy introduced by constraint stabilization.
+     *
+     * @defaultValue 1
+     */
+    maxStabilizationIterations?: number;
+    /**
+     * The maximum velocity iterations the velocity-based friction constraint solver can make.
+     *
+     * The greater this value is, the most realistic friction will be.
+     * However a greater number of iterations is more computationally intensive.
+     *
+     * @defaultValue 8
+     */
+    maxVelocityFrictionIterations?: number;
+    /**
+     * The maximum velocity iterations the velocity-based force constraint solver can make.
+     *
+     * The greater this value is, the most rigid and realistic the physics simulation will be.
+     * However a greater number of iterations is more computationally intensive.
+     *
+     * @defaultValue 4
+     */
+    maxVelocityIterations?: number;
+    /**
+     * The maximal distance separating two objects that will generate predictive contacts
+     *
+     * @defaultValue 0.002
+     *
+     */
+    predictionDistance?: number;
+    /**
+     * The Error Reduction Parameter in between 0 and 1, is the proportion of the positional error to be corrected at each time step
+     * @defaultValue 0.8
+     */
+    erp?: number;
     /**
      * Set the base automatic colliders for this physics world
      * All Meshes inside RigidBodies will generate a collider

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

@@ -718,17 +718,23 @@ const importRapier = async () => {
  * The main physics component used to create a physics world.
  * @category Components
  */
-const Physics = ({
-  colliders: _colliders = "cuboid",
-  gravity: _gravity = [0, -9.81, 0],
-  children,
-  timeStep: _timeStep = 1 / 60,
-  paused: _paused = false,
-  interpolate: _interpolate = true,
-  updatePriority,
-  updateLoop: _updateLoop = "follow",
-  debug: _debug = false
-}) => {
+const Physics = props => {
+  const {
+    colliders = "cuboid",
+    children,
+    timeStep = 1 / 60,
+    paused = false,
+    interpolate = true,
+    updatePriority,
+    updateLoop = "follow",
+    debug = false,
+    gravity = [0, -9.81, 0],
+    maxStabilizationIterations = 1,
+    maxVelocityFrictionIterations = 8,
+    maxVelocityIterations = 4,
+    predictionDistance = 0.002,
+    erp = 0.8
+  } = props;
   const rapier = useAsset.useAsset(importRapier);
   const {
     invalidate
@@ -749,17 +755,22 @@ const Physics = ({
   const {
     proxy: worldProxy,
     reset: resetWorldProxy
-  } = useConst(() => createSingletonProxy(() => new rapier.World(vectorArrayToVector3(_gravity))));
+  } = useConst(() => createSingletonProxy(() => new rapier.World(vectorArrayToVector3(gravity))));
   React.useEffect(() => {
     return () => {
       worldProxy.free();
       resetWorldProxy();
     };
-  }, []); // Update gravity
+  }, []); // Update mutable props
 
   React.useEffect(() => {
-    worldProxy.gravity = vectorArrayToVector3(_gravity);
-  }, [_gravity]);
+    worldProxy.gravity = vectorArrayToVector3(gravity);
+    worldProxy.integrationParameters.maxStabilizationIterations = maxStabilizationIterations;
+    worldProxy.integrationParameters.maxVelocityFrictionIterations = maxVelocityFrictionIterations;
+    worldProxy.integrationParameters.maxVelocityIterations = maxVelocityIterations;
+    worldProxy.integrationParameters.predictionDistance = predictionDistance;
+    worldProxy.integrationParameters.erp = erp;
+  }, [worldProxy, ...gravity, maxStabilizationIterations, maxVelocityIterations, maxVelocityFrictionIterations, predictionDistance, erp]);
   const getSourceFromColliderHandle = React.useCallback(handle => {
     var _collider$parent;
 
@@ -793,7 +804,7 @@ const Physics = ({
     /* Check if the timestep is supposed to be variable. We'll do this here
       once so we don't have to string-check every frame. */
 
-    const timeStepVariable = _timeStep === "vary";
+    const timeStepVariable = timeStep === "vary";
     /**
      * Fixed timeStep simulation progression
      * @see https://gafferongames.com/post/fix_your_timestep/
@@ -817,15 +828,15 @@ const Physics = ({
       world.timestep = clampedDelta;
       stepWorld();
     } else {
-      world.timestep = _timeStep; // don't step time forwards if paused
+      world.timestep = timeStep; // don't step time forwards if paused
       // Increase accumulator
 
       steppingState.accumulator += clampedDelta;
 
-      while (steppingState.accumulator >= _timeStep) {
+      while (steppingState.accumulator >= timeStep) {
         // Set up previous state
         // needed for accurate interpolations if the world steps more than once
-        if (_interpolate) {
+        if (interpolate) {
           steppingState.previousState = {};
           world.forEachRigidBody(body => {
             steppingState.previousState[body.handle] = {
@@ -836,11 +847,11 @@ const Physics = ({
         }
 
         stepWorld();
-        steppingState.accumulator -= _timeStep;
+        steppingState.accumulator -= timeStep;
       }
     }
 
-    const interpolationAlpha = timeStepVariable || !_interpolate || _paused ? 1 : steppingState.accumulator / _timeStep; // Update meshes
+    const interpolationAlpha = timeStepVariable || !interpolate || paused ? 1 : steppingState.accumulator / timeStep; // Update meshes
 
     rigidBodyStates.forEach((state, handle) => {
       const rigidBody = world.getRigidBody(handle);
@@ -996,13 +1007,13 @@ const Physics = ({
     world.forEachActiveRigidBody(() => {
       invalidate();
     });
-  }, [_paused, _timeStep, _interpolate]);
+  }, [paused, timeStep, interpolate]);
   const context = React.useMemo(() => ({
     rapier,
     world: worldProxy,
     physicsOptions: {
-      colliders: _colliders,
-      gravity: _gravity
+      colliders,
+      gravity
     },
     rigidBodyStates,
     colliderStates,
@@ -1010,22 +1021,22 @@ const Physics = ({
     colliderEvents,
     beforeStepCallbacks,
     afterStepCallbacks,
-    isPaused: _paused,
-    isDebug: _debug,
+    isPaused: paused,
+    isDebug: debug,
     step
-  }), [_paused, step, _debug, _colliders, _gravity]);
+  }), [paused, step, debug, colliders, gravity]);
   const stepCallback = React.useCallback(delta => {
-    if (!_paused) {
+    if (!paused) {
       step(delta);
     }
-  }, [_paused, step]);
+  }, [paused, step]);
   return /*#__PURE__*/React__default["default"].createElement(rapierContext.Provider, {
     value: context
   }, /*#__PURE__*/React__default["default"].createElement(FrameStepper$1, {
     onStep: stepCallback,
-    type: _updateLoop,
+    type: updateLoop,
     updatePriority: updatePriority
-  }), _debug && /*#__PURE__*/React__default["default"].createElement(Debug, null), children);
+  }), debug && /*#__PURE__*/React__default["default"].createElement(Debug, null), children);
 };
 
 function _extends() {
@@ -1171,7 +1182,9 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((prop
     colliderRef.current = collider;
     return collider;
   }, collider => {
-    world.removeCollider(collider, true);
+    if (world.getCollider(collider.handle)) {
+      world.removeCollider(collider, true);
+    }
   }, [...immutablePropArray, rigidBodyContext]);
   React.useEffect(() => {
     const collider = getInstance();
@@ -1507,7 +1520,9 @@ const RigidBody = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((props,
     rigidBodyRef.current = rigidBody;
     return rigidBody;
   }, rigidBody => {
-    world.removeRigidBody(rigidBody);
+    if (world.getRigidBody(rigidBody.handle)) {
+      world.removeRigidBody(rigidBody);
+    }
   }, immutablePropArray); // Only provide a object state after the ref has been set
 
   React.useEffect(() => {
@@ -1674,14 +1689,16 @@ const useImpulseJoint = (body1, body2, params) => {
   useImperativeInstance(() => {
     if (body1.current && body2.current) {
       const newJoint = world.createImpulseJoint(params, body1.current, body2.current, true);
-      jointRef.current = newJoint; // console.log(body1.current, body2.current, newJoint);
-
+      jointRef.current = newJoint;
       return newJoint;
     }
   }, joint => {
     if (joint) {
       jointRef.current = undefined;
-      world.removeImpulseJoint(joint, true);
+
+      if (world.getImpulseJoint(joint.handle)) {
+        world.removeImpulseJoint(joint, true);
+      }
     }
   }, []);
   return jointRef;

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

@@ -718,17 +718,23 @@ const importRapier = async () => {
  * The main physics component used to create a physics world.
  * @category Components
  */
-const Physics = ({
-  colliders: _colliders = "cuboid",
-  gravity: _gravity = [0, -9.81, 0],
-  children,
-  timeStep: _timeStep = 1 / 60,
-  paused: _paused = false,
-  interpolate: _interpolate = true,
-  updatePriority,
-  updateLoop: _updateLoop = "follow",
-  debug: _debug = false
-}) => {
+const Physics = props => {
+  const {
+    colliders = "cuboid",
+    children,
+    timeStep = 1 / 60,
+    paused = false,
+    interpolate = true,
+    updatePriority,
+    updateLoop = "follow",
+    debug = false,
+    gravity = [0, -9.81, 0],
+    maxStabilizationIterations = 1,
+    maxVelocityFrictionIterations = 8,
+    maxVelocityIterations = 4,
+    predictionDistance = 0.002,
+    erp = 0.8
+  } = props;
   const rapier = useAsset.useAsset(importRapier);
   const {
     invalidate
@@ -749,17 +755,22 @@ const Physics = ({
   const {
     proxy: worldProxy,
     reset: resetWorldProxy
-  } = useConst(() => createSingletonProxy(() => new rapier.World(vectorArrayToVector3(_gravity))));
+  } = useConst(() => createSingletonProxy(() => new rapier.World(vectorArrayToVector3(gravity))));
   React.useEffect(() => {
     return () => {
       worldProxy.free();
       resetWorldProxy();
     };
-  }, []); // Update gravity
+  }, []); // Update mutable props
 
   React.useEffect(() => {
-    worldProxy.gravity = vectorArrayToVector3(_gravity);
-  }, [_gravity]);
+    worldProxy.gravity = vectorArrayToVector3(gravity);
+    worldProxy.integrationParameters.maxStabilizationIterations = maxStabilizationIterations;
+    worldProxy.integrationParameters.maxVelocityFrictionIterations = maxVelocityFrictionIterations;
+    worldProxy.integrationParameters.maxVelocityIterations = maxVelocityIterations;
+    worldProxy.integrationParameters.predictionDistance = predictionDistance;
+    worldProxy.integrationParameters.erp = erp;
+  }, [worldProxy, ...gravity, maxStabilizationIterations, maxVelocityIterations, maxVelocityFrictionIterations, predictionDistance, erp]);
   const getSourceFromColliderHandle = React.useCallback(handle => {
     var _collider$parent;
 
@@ -793,7 +804,7 @@ const Physics = ({
     /* Check if the timestep is supposed to be variable. We'll do this here
       once so we don't have to string-check every frame. */
 
-    const timeStepVariable = _timeStep === "vary";
+    const timeStepVariable = timeStep === "vary";
     /**
      * Fixed timeStep simulation progression
      * @see https://gafferongames.com/post/fix_your_timestep/
@@ -817,15 +828,15 @@ const Physics = ({
       world.timestep = clampedDelta;
       stepWorld();
     } else {
-      world.timestep = _timeStep; // don't step time forwards if paused
+      world.timestep = timeStep; // don't step time forwards if paused
       // Increase accumulator
 
       steppingState.accumulator += clampedDelta;
 
-      while (steppingState.accumulator >= _timeStep) {
+      while (steppingState.accumulator >= timeStep) {
         // Set up previous state
         // needed for accurate interpolations if the world steps more than once
-        if (_interpolate) {
+        if (interpolate) {
           steppingState.previousState = {};
           world.forEachRigidBody(body => {
             steppingState.previousState[body.handle] = {
@@ -836,11 +847,11 @@ const Physics = ({
         }
 
         stepWorld();
-        steppingState.accumulator -= _timeStep;
+        steppingState.accumulator -= timeStep;
       }
     }
 
-    const interpolationAlpha = timeStepVariable || !_interpolate || _paused ? 1 : steppingState.accumulator / _timeStep; // Update meshes
+    const interpolationAlpha = timeStepVariable || !interpolate || paused ? 1 : steppingState.accumulator / timeStep; // Update meshes
 
     rigidBodyStates.forEach((state, handle) => {
       const rigidBody = world.getRigidBody(handle);
@@ -996,13 +1007,13 @@ const Physics = ({
     world.forEachActiveRigidBody(() => {
       invalidate();
     });
-  }, [_paused, _timeStep, _interpolate]);
+  }, [paused, timeStep, interpolate]);
   const context = React.useMemo(() => ({
     rapier,
     world: worldProxy,
     physicsOptions: {
-      colliders: _colliders,
-      gravity: _gravity
+      colliders,
+      gravity
     },
     rigidBodyStates,
     colliderStates,
@@ -1010,22 +1021,22 @@ const Physics = ({
     colliderEvents,
     beforeStepCallbacks,
     afterStepCallbacks,
-    isPaused: _paused,
-    isDebug: _debug,
+    isPaused: paused,
+    isDebug: debug,
     step
-  }), [_paused, step, _debug, _colliders, _gravity]);
+  }), [paused, step, debug, colliders, gravity]);
   const stepCallback = React.useCallback(delta => {
-    if (!_paused) {
+    if (!paused) {
       step(delta);
     }
-  }, [_paused, step]);
+  }, [paused, step]);
   return /*#__PURE__*/React__default["default"].createElement(rapierContext.Provider, {
     value: context
   }, /*#__PURE__*/React__default["default"].createElement(FrameStepper$1, {
     onStep: stepCallback,
-    type: _updateLoop,
+    type: updateLoop,
     updatePriority: updatePriority
-  }), _debug && /*#__PURE__*/React__default["default"].createElement(Debug, null), children);
+  }), debug && /*#__PURE__*/React__default["default"].createElement(Debug, null), children);
 };
 
 function _extends() {
@@ -1171,7 +1182,9 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((prop
     colliderRef.current = collider;
     return collider;
   }, collider => {
-    world.removeCollider(collider, true);
+    if (world.getCollider(collider.handle)) {
+      world.removeCollider(collider, true);
+    }
   }, [...immutablePropArray, rigidBodyContext]);
   React.useEffect(() => {
     const collider = getInstance();
@@ -1507,7 +1520,9 @@ const RigidBody = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((props,
     rigidBodyRef.current = rigidBody;
     return rigidBody;
   }, rigidBody => {
-    world.removeRigidBody(rigidBody);
+    if (world.getRigidBody(rigidBody.handle)) {
+      world.removeRigidBody(rigidBody);
+    }
   }, immutablePropArray); // Only provide a object state after the ref has been set
 
   React.useEffect(() => {
@@ -1674,14 +1689,16 @@ const useImpulseJoint = (body1, body2, params) => {
   useImperativeInstance(() => {
     if (body1.current && body2.current) {
       const newJoint = world.createImpulseJoint(params, body1.current, body2.current, true);
-      jointRef.current = newJoint; // console.log(body1.current, body2.current, newJoint);
-
+      jointRef.current = newJoint;
       return newJoint;
     }
   }, joint => {
     if (joint) {
       jointRef.current = undefined;
-      world.removeImpulseJoint(joint, true);
+
+      if (world.getImpulseJoint(joint.handle)) {
+        world.removeImpulseJoint(joint, true);
+      }
     }
   }, []);
   return jointRef;

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

@@ -693,17 +693,23 @@ const importRapier = async () => {
  * The main physics component used to create a physics world.
  * @category Components
  */
-const Physics = ({
-  colliders: _colliders = "cuboid",
-  gravity: _gravity = [0, -9.81, 0],
-  children,
-  timeStep: _timeStep = 1 / 60,
-  paused: _paused = false,
-  interpolate: _interpolate = true,
-  updatePriority,
-  updateLoop: _updateLoop = "follow",
-  debug: _debug = false
-}) => {
+const Physics = props => {
+  const {
+    colliders = "cuboid",
+    children,
+    timeStep = 1 / 60,
+    paused = false,
+    interpolate = true,
+    updatePriority,
+    updateLoop = "follow",
+    debug = false,
+    gravity = [0, -9.81, 0],
+    maxStabilizationIterations = 1,
+    maxVelocityFrictionIterations = 8,
+    maxVelocityIterations = 4,
+    predictionDistance = 0.002,
+    erp = 0.8
+  } = props;
   const rapier = useAsset(importRapier);
   const {
     invalidate
@@ -724,17 +730,22 @@ const Physics = ({
   const {
     proxy: worldProxy,
     reset: resetWorldProxy
-  } = useConst(() => createSingletonProxy(() => new rapier.World(vectorArrayToVector3(_gravity))));
+  } = useConst(() => createSingletonProxy(() => new rapier.World(vectorArrayToVector3(gravity))));
   useEffect(() => {
     return () => {
       worldProxy.free();
       resetWorldProxy();
     };
-  }, []); // Update gravity
+  }, []); // Update mutable props
 
   useEffect(() => {
-    worldProxy.gravity = vectorArrayToVector3(_gravity);
-  }, [_gravity]);
+    worldProxy.gravity = vectorArrayToVector3(gravity);
+    worldProxy.integrationParameters.maxStabilizationIterations = maxStabilizationIterations;
+    worldProxy.integrationParameters.maxVelocityFrictionIterations = maxVelocityFrictionIterations;
+    worldProxy.integrationParameters.maxVelocityIterations = maxVelocityIterations;
+    worldProxy.integrationParameters.predictionDistance = predictionDistance;
+    worldProxy.integrationParameters.erp = erp;
+  }, [worldProxy, ...gravity, maxStabilizationIterations, maxVelocityIterations, maxVelocityFrictionIterations, predictionDistance, erp]);
   const getSourceFromColliderHandle = useCallback(handle => {
     var _collider$parent;
 
@@ -768,7 +779,7 @@ const Physics = ({
     /* Check if the timestep is supposed to be variable. We'll do this here
       once so we don't have to string-check every frame. */
 
-    const timeStepVariable = _timeStep === "vary";
+    const timeStepVariable = timeStep === "vary";
     /**
      * Fixed timeStep simulation progression
      * @see https://gafferongames.com/post/fix_your_timestep/
@@ -792,15 +803,15 @@ const Physics = ({
       world.timestep = clampedDelta;
       stepWorld();
     } else {
-      world.timestep = _timeStep; // don't step time forwards if paused
+      world.timestep = timeStep; // don't step time forwards if paused
       // Increase accumulator
 
       steppingState.accumulator += clampedDelta;
 
-      while (steppingState.accumulator >= _timeStep) {
+      while (steppingState.accumulator >= timeStep) {
         // Set up previous state
         // needed for accurate interpolations if the world steps more than once
-        if (_interpolate) {
+        if (interpolate) {
           steppingState.previousState = {};
           world.forEachRigidBody(body => {
             steppingState.previousState[body.handle] = {
@@ -811,11 +822,11 @@ const Physics = ({
         }
 
         stepWorld();
-        steppingState.accumulator -= _timeStep;
+        steppingState.accumulator -= timeStep;
       }
     }
 
-    const interpolationAlpha = timeStepVariable || !_interpolate || _paused ? 1 : steppingState.accumulator / _timeStep; // Update meshes
+    const interpolationAlpha = timeStepVariable || !interpolate || paused ? 1 : steppingState.accumulator / timeStep; // Update meshes
 
     rigidBodyStates.forEach((state, handle) => {
       const rigidBody = world.getRigidBody(handle);
@@ -971,13 +982,13 @@ const Physics = ({
     world.forEachActiveRigidBody(() => {
       invalidate();
     });
-  }, [_paused, _timeStep, _interpolate]);
+  }, [paused, timeStep, interpolate]);
   const context = useMemo(() => ({
     rapier,
     world: worldProxy,
     physicsOptions: {
-      colliders: _colliders,
-      gravity: _gravity
+      colliders,
+      gravity
     },
     rigidBodyStates,
     colliderStates,
@@ -985,22 +996,22 @@ const Physics = ({
     colliderEvents,
     beforeStepCallbacks,
     afterStepCallbacks,
-    isPaused: _paused,
-    isDebug: _debug,
+    isPaused: paused,
+    isDebug: debug,
     step
-  }), [_paused, step, _debug, _colliders, _gravity]);
+  }), [paused, step, debug, colliders, gravity]);
   const stepCallback = useCallback(delta => {
-    if (!_paused) {
+    if (!paused) {
       step(delta);
     }
-  }, [_paused, step]);
+  }, [paused, step]);
   return /*#__PURE__*/React.createElement(rapierContext.Provider, {
     value: context
   }, /*#__PURE__*/React.createElement(FrameStepper$1, {
     onStep: stepCallback,
-    type: _updateLoop,
+    type: updateLoop,
     updatePriority: updatePriority
-  }), _debug && /*#__PURE__*/React.createElement(Debug, null), children);
+  }), debug && /*#__PURE__*/React.createElement(Debug, null), children);
 };
 
 function _extends() {
@@ -1146,7 +1157,9 @@ const AnyCollider = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((props, forwarded
     colliderRef.current = collider;
     return collider;
   }, collider => {
-    world.removeCollider(collider, true);
+    if (world.getCollider(collider.handle)) {
+      world.removeCollider(collider, true);
+    }
   }, [...immutablePropArray, rigidBodyContext]);
   useEffect(() => {
     const collider = getInstance();
@@ -1482,7 +1495,9 @@ const RigidBody = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((props, forwardedRe
     rigidBodyRef.current = rigidBody;
     return rigidBody;
   }, rigidBody => {
-    world.removeRigidBody(rigidBody);
+    if (world.getRigidBody(rigidBody.handle)) {
+      world.removeRigidBody(rigidBody);
+    }
   }, immutablePropArray); // Only provide a object state after the ref has been set
 
   useEffect(() => {
@@ -1649,14 +1664,16 @@ const useImpulseJoint = (body1, body2, params) => {
   useImperativeInstance(() => {
     if (body1.current && body2.current) {
       const newJoint = world.createImpulseJoint(params, body1.current, body2.current, true);
-      jointRef.current = newJoint; // console.log(body1.current, body2.current, newJoint);
-
+      jointRef.current = newJoint;
       return newJoint;
     }
   }, joint => {
     if (joint) {
       jointRef.current = undefined;
-      world.removeImpulseJoint(joint, true);
+
+      if (world.getImpulseJoint(joint.handle)) {
+        world.removeImpulseJoint(joint, true);
+      }
     }
   }, []);
   return jointRef;

package/package.json

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