@react-three/rapier 0.6.3 → 0.6.6

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

@@ -7,4 +7,4 @@ export interface InstancedRigidBodiesProps extends Omit<RigidBodyProps, "positio
     rotations?: Vector3Array[];
     scales?: Vector3Array[];
 }
-export declare const InstancedRigidBodies: React.ForwardRefExoticComponent<InstancedRigidBodiesProps & React.RefAttributes<InstancedRigidBodyApi>>;
+export declare const InstancedRigidBodies: React.ForwardRefExoticComponent<Pick<InstancedRigidBodiesProps, "type" | "canSleep" | "linearDamping" | "angularDamping" | "linearVelocity" | "angularVelocity" | "gravityScale" | "ccd" | "colliders" | "friction" | "restitution" | "onSleep" | "onWake" | "lockRotations" | "lockTranslations" | "enabledRotations" | "enabledTranslations" | "children" | "quaternion" | "attach" | "args" | "key" | "onUpdate" | "up" | "scale" | "matrix" | "layers" | "dispose" | "id" | "uuid" | "name" | "parent" | "modelViewMatrix" | "normalMatrix" | "matrixWorld" | "matrixAutoUpdate" | "matrixWorldNeedsUpdate" | "visible" | "castShadow" | "receiveShadow" | "frustumCulled" | "renderOrder" | "animations" | "userData" | "customDepthMaterial" | "customDistanceMaterial" | "isObject3D" | "onBeforeRender" | "onAfterRender" | "applyMatrix4" | "applyQuaternion" | "setRotationFromAxisAngle" | "setRotationFromEuler" | "setRotationFromMatrix" | "setRotationFromQuaternion" | "rotateOnAxis" | "rotateOnWorldAxis" | "rotateX" | "rotateY" | "rotateZ" | "translateOnAxis" | "translateX" | "translateY" | "translateZ" | "localToWorld" | "worldToLocal" | "lookAt" | "add" | "remove" | "removeFromParent" | "clear" | "getObjectById" | "getObjectByName" | "getObjectByProperty" | "getWorldPosition" | "getWorldQuaternion" | "getWorldScale" | "getWorldDirection" | "raycast" | "traverse" | "traverseVisible" | "traverseAncestors" | "updateMatrix" | "updateMatrixWorld" | "updateWorldMatrix" | "toJSON" | "clone" | "copy" | "addEventListener" | "hasEventListener" | "removeEventListener" | "dispatchEvent" | "onClick" | "onContextMenu" | "onDoubleClick" | "onPointerUp" | "onPointerDown" | "onPointerOver" | "onPointerOut" | "onPointerEnter" | "onPointerLeave" | "onPointerMove" | "onPointerMissed" | "onPointerCancel" | "onWheel" | "positions" | "rotations" | "scales"> & React.RefAttributes<InstancedRigidBodyApi>>;

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

@@ -19,6 +19,7 @@ export interface RapierContext {
         colliders: RigidBodyAutoCollider;
     };
     rigidBodyEvents: EventMap;
+    isPaused: boolean;
 }
 export declare const RapierContext: React.Context<RapierContext | undefined>;
 declare type EventMap = Map<ColliderHandle | RigidBodyHandle, {
@@ -51,20 +52,21 @@ interface RapierWorldProps {
      * Setting this to a number (eg. 1/60) will run the
      * simulation at that framerate.
      *
-     * "vary" will run the simulation at a delta-value based
-     * on the users current framerate. This ensures simulations
-     * run at the same percieved speed at all framerates, but
-     * can also lead to instability.
+     * @defaultValue 1/60
+     */
+    timeStep?: number;
+    /**
+     * Maximum number of fixed steps to take per function call.
      *
-     * @defaultValue "vary"
+     * @defaultValue 10
      */
-    timeStep?: number | "vary";
+    maxSubSteps?: number;
     /**
      * Pause the physics simulation
      *
      * @defaultValue false
      */
-    paused: boolean;
+    paused?: boolean;
 }
 export declare const Physics: FC<RapierWorldProps>;
 export {};

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

@@ -1,6 +1,7 @@
 import React, { MutableRefObject, RefObject } from "react";
 import { ReactNode } from "react";
 import { Object3D } from "three";
+import { Object3DProps } from "@react-three/fiber";
 import { InstancedRigidBodyApi } from "./api";
 import { InstancedRigidBodiesProps } from "./InstancedRigidBodies";
 import { RigidBodyApi, UseRigidBodyOptions } from "./types";
@@ -16,7 +17,7 @@ export declare const useRigidBodyContext: () => {
     hasCollisionEvents: boolean;
     options: UseRigidBodyOptions | InstancedRigidBodiesProps;
 };
-export interface RigidBodyProps extends UseRigidBodyOptions {
+export interface RigidBodyProps extends UseRigidBodyOptions, Omit<Object3DProps, 'type' | 'position' | 'rotation'> {
     children?: ReactNode;
 }
-export declare const RigidBody: React.ForwardRefExoticComponent<RigidBodyProps & React.RefAttributes<import("./api").RigidBodyApi>>;
+export declare const RigidBody: React.ForwardRefExoticComponent<Pick<RigidBodyProps, "type" | "canSleep" | "linearDamping" | "angularDamping" | "linearVelocity" | "angularVelocity" | "gravityScale" | "ccd" | "position" | "rotation" | "colliders" | "friction" | "restitution" | "onCollisionEnter" | "onCollisionExit" | "onSleep" | "onWake" | "lockRotations" | "lockTranslations" | "enabledRotations" | "enabledTranslations" | "children" | "quaternion" | "attach" | "args" | "key" | "onUpdate" | "up" | "scale" | "matrix" | "layers" | "dispose" | "id" | "uuid" | "name" | "parent" | "modelViewMatrix" | "normalMatrix" | "matrixWorld" | "matrixAutoUpdate" | "matrixWorldNeedsUpdate" | "visible" | "castShadow" | "receiveShadow" | "frustumCulled" | "renderOrder" | "animations" | "userData" | "customDepthMaterial" | "customDistanceMaterial" | "isObject3D" | "onBeforeRender" | "onAfterRender" | "applyMatrix4" | "applyQuaternion" | "setRotationFromAxisAngle" | "setRotationFromEuler" | "setRotationFromMatrix" | "setRotationFromQuaternion" | "rotateOnAxis" | "rotateOnWorldAxis" | "rotateX" | "rotateY" | "rotateZ" | "translateOnAxis" | "translateX" | "translateY" | "translateZ" | "localToWorld" | "worldToLocal" | "lookAt" | "add" | "remove" | "removeFromParent" | "clear" | "getObjectById" | "getObjectByName" | "getObjectByProperty" | "getWorldPosition" | "getWorldQuaternion" | "getWorldScale" | "getWorldDirection" | "raycast" | "traverse" | "traverseVisible" | "traverseAncestors" | "updateMatrix" | "updateMatrixWorld" | "updateWorldMatrix" | "toJSON" | "clone" | "copy" | "addEventListener" | "hasEventListener" | "removeEventListener" | "dispatchEvent" | "onClick" | "onContextMenu" | "onDoubleClick" | "onPointerUp" | "onPointerDown" | "onPointerOver" | "onPointerOut" | "onPointerEnter" | "onPointerLeave" | "onPointerMove" | "onPointerMissed" | "onPointerCancel" | "onWheel"> & React.RefAttributes<import("./api").RigidBodyApi>>;

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

@@ -7,6 +7,7 @@ var React = require('react');
 var useAsset = require('use-asset');
 var fiber = require('@react-three/fiber');
 var three = require('three');
+var BufferGeometryUtils = require('three/examples/jsm/utils/BufferGeometryUtils');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -244,7 +245,9 @@ const colliderDescFromGeometry = (geometry, colliders, scale, hasCollisionEvents
       {
         var _g$index;
 
-        const _g = geometry.clone().scale(scale.x, scale.y, scale.z);
+        const clonedGeometry = geometry.index ? geometry.clone() : BufferGeometryUtils.mergeVertices(geometry);
+
+        const _g = clonedGeometry.scale(scale.x, scale.y, scale.z);
 
         desc = rapier3dCompat.ColliderDesc.trimesh(_g.attributes.position.array, (_g$index = _g.index) === null || _g$index === void 0 ? void 0 : _g$index.array);
       }
@@ -469,10 +472,15 @@ const Physics = ({
   colliders: _colliders = "cuboid",
   gravity: _gravity = [0, -9.81, 0],
   children,
-  timeStep: _timeStep = "vary",
+  timeStep: _timeStep = 1 / 60,
+  maxSubSteps: _maxSubSteps = 10,
   paused: _paused = false
 }) => {
   const rapier = useAsset.useAsset(importRapier);
+  const [isPaused, setIsPaused] = React.useState(_paused);
+  React.useEffect(() => {
+    setIsPaused(_paused);
+  }, [_paused]);
   const worldRef = React.useRef();
   const getWorldRef = React.useRef(() => {
     if (!worldRef.current) {
@@ -492,7 +500,6 @@ const Physics = ({
     return () => {
       if (world) {
         world.free();
-        worldRef.current = undefined;
       }
     };
   }, []); // Update gravity
@@ -504,22 +511,46 @@ const Physics = ({
       world.gravity = vectorArrayToVector3(_gravity);
     }
   }, [_gravity]);
-  const time = React.useRef(performance.now());
-  fiber.useFrame(context => {
+  const [steppingState] = React.useState({
+    time: 0,
+    lastTime: 0,
+    accumulator: 0
+  });
+  fiber.useFrame((_, delta) => {
     const world = worldRef.current;
-    if (!world) return; // Set timestep to current delta, to allow for variable frame rates
-    // We cap the delta at 100, so that the physics simulation doesn't get wild
-
-    const now = performance.now();
-    const delta = Math.min(100, now - time.current);
-
-    if (_timeStep === "vary") {
-      world.timestep = delta / 1000;
-    } else {
-      world.timestep = _timeStep;
+    if (!world) return;
+    world.timestep = _timeStep;
+    /**
+     * Fixed timeStep simulation progression
+     * @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 timeStepMs = _timeStep * 1000;
+    const timeSinceLast = nowTime - steppingState.lastTime;
+    steppingState.lastTime = nowTime;
+    steppingState.accumulator += timeSinceLast;
+
+    if (!_paused) {
+      let subSteps = 0;
+
+      while (steppingState.accumulator >= timeStepMs && subSteps < _maxSubSteps) {
+        // Collect previous state
+        world.bodies.forEach(b => {
+          previousTranslations[b.handle] = {
+            rotation: rapierQuaternionToQuaternion(b.rotation()).normalize(),
+            translation: rapierVector3ToVector3(b.translation())
+          };
+        });
+        world.step(eventQueue);
+        subSteps++;
+        steppingState.accumulator -= timeStepMs;
+      }
     }
 
-    if (!_paused) world.step(eventQueue); // Update meshes
+    const interpolationAlpha = steppingState.accumulator % timeStepMs / timeStepMs; // Update meshes
 
     rigidBodyStates.forEach((state, handle) => {
       const rigidBody = world.getRigidBody(handle);
@@ -545,7 +576,12 @@ const Physics = ({
         return;
       }
 
-      state.setMatrix(_matrix4.compose(rapierVector3ToVector3(rigidBody.translation()), rapierQuaternionToQuaternion(rigidBody.rotation()), state.worldScale).premultiply(state.invertedMatrixWorld));
+      let oldState = previousTranslations[rigidBody.handle];
+      let newTranslation = rapierVector3ToVector3(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;
+      state.setMatrix(_matrix4.compose(interpolatedTranslation, interpolatedRotation, state.worldScale).premultiply(state.invertedMatrixWorld));
 
       if (state.mesh instanceof three.InstancedMesh) {
         state.mesh.instanceMatrix.needsUpdate = true;
@@ -595,7 +631,6 @@ const Physics = ({
         });
       }
     });
-    time.current = now;
   });
   const api = React.useMemo(() => createWorldApi(getWorldRef), []);
   const context = React.useMemo(() => ({
@@ -607,13 +642,32 @@ const Physics = ({
     },
     colliderMeshes,
     rigidBodyStates,
-    rigidBodyEvents
-  }), []);
+    rigidBodyEvents,
+    isPaused
+  }), [isPaused]);
   return /*#__PURE__*/React__default["default"].createElement(RapierContext.Provider, {
     value: context
   }, children);
 };
 
+function _extends() {
+  _extends = Object.assign || function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+
+    return target;
+  };
+
+  return _extends.apply(this, arguments);
+}
+
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null) return {};
   var target = {};
@@ -880,7 +934,8 @@ const usePrismaticJoint = (body1, body2, [body1Anchor, body2Anchor, axis]) => {
   return useImpulseJoint(body1, body2, rapier.JointData.prismatic(vectorArrayToVector3(body1Anchor), vectorArrayToVector3(body2Anchor), vectorArrayToVector3(axis)));
 };
 
-const _excluded$1 = ["children"];
+const _excluded$1 = ["children"],
+      _excluded2 = ["type", "position", "rotation"];
 const RigidBodyContext = /*#__PURE__*/React.createContext(undefined);
 const useRigidBodyContext = () => React.useContext(RigidBodyContext); // RigidBody
 
@@ -891,6 +946,9 @@ const RigidBody = /*#__PURE__*/React.forwardRef((_ref, ref) => {
       props = _objectWithoutProperties(_ref, _excluded$1);
 
   const [object, api] = useRigidBody(props);
+
+  const objectProps = _objectWithoutProperties(props, _excluded2);
+
   React.useImperativeHandle(ref, () => api);
   return /*#__PURE__*/React__default["default"].createElement(RigidBodyContext.Provider, {
     value: {
@@ -899,9 +957,9 @@ const RigidBody = /*#__PURE__*/React.forwardRef((_ref, ref) => {
       hasCollisionEvents: !!(props.onCollisionEnter || props.onCollisionExit),
       options: props
     }
-  }, /*#__PURE__*/React__default["default"].createElement("object3D", {
+  }, /*#__PURE__*/React__default["default"].createElement("object3D", _extends({
     ref: object
-  }, children));
+  }, objectProps), children));
 });
 
 const MeshCollider = ({
@@ -1191,24 +1249,6 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
   }, props.children));
 });
 
-function _extends() {
-  _extends = Object.assign || function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-
-    return target;
-  };
-
-  return _extends.apply(this, arguments);
-}
-
 const _excluded = ["children"];
 
 const AnyCollider = _ref => {

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

@@ -7,6 +7,7 @@ var React = require('react');
 var useAsset = require('use-asset');
 var fiber = require('@react-three/fiber');
 var three = require('three');
+var BufferGeometryUtils = require('three/examples/jsm/utils/BufferGeometryUtils');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -244,7 +245,9 @@ const colliderDescFromGeometry = (geometry, colliders, scale, hasCollisionEvents
       {
         var _g$index;
 
-        const _g = geometry.clone().scale(scale.x, scale.y, scale.z);
+        const clonedGeometry = geometry.index ? geometry.clone() : BufferGeometryUtils.mergeVertices(geometry);
+
+        const _g = clonedGeometry.scale(scale.x, scale.y, scale.z);
 
         desc = rapier3dCompat.ColliderDesc.trimesh(_g.attributes.position.array, (_g$index = _g.index) === null || _g$index === void 0 ? void 0 : _g$index.array);
       }
@@ -469,10 +472,15 @@ const Physics = ({
   colliders: _colliders = "cuboid",
   gravity: _gravity = [0, -9.81, 0],
   children,
-  timeStep: _timeStep = "vary",
+  timeStep: _timeStep = 1 / 60,
+  maxSubSteps: _maxSubSteps = 10,
   paused: _paused = false
 }) => {
   const rapier = useAsset.useAsset(importRapier);
+  const [isPaused, setIsPaused] = React.useState(_paused);
+  React.useEffect(() => {
+    setIsPaused(_paused);
+  }, [_paused]);
   const worldRef = React.useRef();
   const getWorldRef = React.useRef(() => {
     if (!worldRef.current) {
@@ -492,7 +500,6 @@ const Physics = ({
     return () => {
       if (world) {
         world.free();
-        worldRef.current = undefined;
       }
     };
   }, []); // Update gravity
@@ -504,22 +511,46 @@ const Physics = ({
       world.gravity = vectorArrayToVector3(_gravity);
     }
   }, [_gravity]);
-  const time = React.useRef(performance.now());
-  fiber.useFrame(context => {
+  const [steppingState] = React.useState({
+    time: 0,
+    lastTime: 0,
+    accumulator: 0
+  });
+  fiber.useFrame((_, delta) => {
     const world = worldRef.current;
-    if (!world) return; // Set timestep to current delta, to allow for variable frame rates
-    // We cap the delta at 100, so that the physics simulation doesn't get wild
-
-    const now = performance.now();
-    const delta = Math.min(100, now - time.current);
-
-    if (_timeStep === "vary") {
-      world.timestep = delta / 1000;
-    } else {
-      world.timestep = _timeStep;
+    if (!world) return;
+    world.timestep = _timeStep;
+    /**
+     * Fixed timeStep simulation progression
+     * @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 timeStepMs = _timeStep * 1000;
+    const timeSinceLast = nowTime - steppingState.lastTime;
+    steppingState.lastTime = nowTime;
+    steppingState.accumulator += timeSinceLast;
+
+    if (!_paused) {
+      let subSteps = 0;
+
+      while (steppingState.accumulator >= timeStepMs && subSteps < _maxSubSteps) {
+        // Collect previous state
+        world.bodies.forEach(b => {
+          previousTranslations[b.handle] = {
+            rotation: rapierQuaternionToQuaternion(b.rotation()).normalize(),
+            translation: rapierVector3ToVector3(b.translation())
+          };
+        });
+        world.step(eventQueue);
+        subSteps++;
+        steppingState.accumulator -= timeStepMs;
+      }
     }
 
-    if (!_paused) world.step(eventQueue); // Update meshes
+    const interpolationAlpha = steppingState.accumulator % timeStepMs / timeStepMs; // Update meshes
 
     rigidBodyStates.forEach((state, handle) => {
       const rigidBody = world.getRigidBody(handle);
@@ -545,7 +576,12 @@ const Physics = ({
         return;
       }
 
-      state.setMatrix(_matrix4.compose(rapierVector3ToVector3(rigidBody.translation()), rapierQuaternionToQuaternion(rigidBody.rotation()), state.worldScale).premultiply(state.invertedMatrixWorld));
+      let oldState = previousTranslations[rigidBody.handle];
+      let newTranslation = rapierVector3ToVector3(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;
+      state.setMatrix(_matrix4.compose(interpolatedTranslation, interpolatedRotation, state.worldScale).premultiply(state.invertedMatrixWorld));
 
       if (state.mesh instanceof three.InstancedMesh) {
         state.mesh.instanceMatrix.needsUpdate = true;
@@ -595,7 +631,6 @@ const Physics = ({
         });
       }
     });
-    time.current = now;
   });
   const api = React.useMemo(() => createWorldApi(getWorldRef), []);
   const context = React.useMemo(() => ({
@@ -607,13 +642,32 @@ const Physics = ({
     },
     colliderMeshes,
     rigidBodyStates,
-    rigidBodyEvents
-  }), []);
+    rigidBodyEvents,
+    isPaused
+  }), [isPaused]);
   return /*#__PURE__*/React__default["default"].createElement(RapierContext.Provider, {
     value: context
   }, children);
 };
 
+function _extends() {
+  _extends = Object.assign || function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+
+    return target;
+  };
+
+  return _extends.apply(this, arguments);
+}
+
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null) return {};
   var target = {};
@@ -880,7 +934,8 @@ const usePrismaticJoint = (body1, body2, [body1Anchor, body2Anchor, axis]) => {
   return useImpulseJoint(body1, body2, rapier.JointData.prismatic(vectorArrayToVector3(body1Anchor), vectorArrayToVector3(body2Anchor), vectorArrayToVector3(axis)));
 };
 
-const _excluded$1 = ["children"];
+const _excluded$1 = ["children"],
+      _excluded2 = ["type", "position", "rotation"];
 const RigidBodyContext = /*#__PURE__*/React.createContext(undefined);
 const useRigidBodyContext = () => React.useContext(RigidBodyContext); // RigidBody
 
@@ -891,6 +946,9 @@ const RigidBody = /*#__PURE__*/React.forwardRef((_ref, ref) => {
       props = _objectWithoutProperties(_ref, _excluded$1);
 
   const [object, api] = useRigidBody(props);
+
+  const objectProps = _objectWithoutProperties(props, _excluded2);
+
   React.useImperativeHandle(ref, () => api);
   return /*#__PURE__*/React__default["default"].createElement(RigidBodyContext.Provider, {
     value: {
@@ -899,9 +957,9 @@ const RigidBody = /*#__PURE__*/React.forwardRef((_ref, ref) => {
       hasCollisionEvents: !!(props.onCollisionEnter || props.onCollisionExit),
       options: props
     }
-  }, /*#__PURE__*/React__default["default"].createElement("object3D", {
+  }, /*#__PURE__*/React__default["default"].createElement("object3D", _extends({
     ref: object
-  }, children));
+  }, objectProps), children));
 });
 
 const MeshCollider = ({
@@ -1191,24 +1249,6 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
   }, props.children));
 });
 
-function _extends() {
-  _extends = Object.assign || function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-
-    return target;
-  };
-
-  return _extends.apply(this, arguments);
-}
-
 const _excluded = ["children"];
 
 const AnyCollider = _ref => {

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

@@ -1,9 +1,10 @@
 import { ColliderDesc, ActiveEvents, RigidBodyDesc, CoefficientCombineRule, EventQueue, ShapeType } from '@dimforge/rapier3d-compat';
 export { CoefficientCombineRule, Collider as RapierCollider, RigidBody as RapierRigidBody } from '@dimforge/rapier3d-compat';
-import React, { useRef, useState, useEffect, useMemo, createContext, useContext, forwardRef, useImperativeHandle, memo, useLayoutEffect } from 'react';
+import React, { useState, useEffect, useRef, useMemo, createContext, useContext, forwardRef, useImperativeHandle, memo, useLayoutEffect } from 'react';
 import { useAsset } from 'use-asset';
 import { useFrame } from '@react-three/fiber';
 import { Quaternion, Euler, Vector3, Object3D, Matrix4, InstancedMesh, CylinderBufferGeometry, BufferGeometry, BufferAttribute, SphereBufferGeometry, BoxBufferGeometry, DynamicDrawUsage } from 'three';
+import { mergeVertices } from 'three/examples/jsm/utils/BufferGeometryUtils';
 
 const _quaternion = new Quaternion();
 const _euler = new Euler();
@@ -219,7 +220,9 @@ const colliderDescFromGeometry = (geometry, colliders, scale, hasCollisionEvents
       {
         var _g$index;
 
-        const _g = geometry.clone().scale(scale.x, scale.y, scale.z);
+        const clonedGeometry = geometry.index ? geometry.clone() : mergeVertices(geometry);
+
+        const _g = clonedGeometry.scale(scale.x, scale.y, scale.z);
 
         desc = ColliderDesc.trimesh(_g.attributes.position.array, (_g$index = _g.index) === null || _g$index === void 0 ? void 0 : _g$index.array);
       }
@@ -444,10 +447,15 @@ const Physics = ({
   colliders: _colliders = "cuboid",
   gravity: _gravity = [0, -9.81, 0],
   children,
-  timeStep: _timeStep = "vary",
+  timeStep: _timeStep = 1 / 60,
+  maxSubSteps: _maxSubSteps = 10,
   paused: _paused = false
 }) => {
   const rapier = useAsset(importRapier);
+  const [isPaused, setIsPaused] = useState(_paused);
+  useEffect(() => {
+    setIsPaused(_paused);
+  }, [_paused]);
   const worldRef = useRef();
   const getWorldRef = useRef(() => {
     if (!worldRef.current) {
@@ -467,7 +475,6 @@ const Physics = ({
     return () => {
       if (world) {
         world.free();
-        worldRef.current = undefined;
       }
     };
   }, []); // Update gravity
@@ -479,22 +486,46 @@ const Physics = ({
       world.gravity = vectorArrayToVector3(_gravity);
     }
   }, [_gravity]);
-  const time = useRef(performance.now());
-  useFrame(context => {
+  const [steppingState] = useState({
+    time: 0,
+    lastTime: 0,
+    accumulator: 0
+  });
+  useFrame((_, delta) => {
     const world = worldRef.current;
-    if (!world) return; // Set timestep to current delta, to allow for variable frame rates
-    // We cap the delta at 100, so that the physics simulation doesn't get wild
-
-    const now = performance.now();
-    const delta = Math.min(100, now - time.current);
-
-    if (_timeStep === "vary") {
-      world.timestep = delta / 1000;
-    } else {
-      world.timestep = _timeStep;
+    if (!world) return;
+    world.timestep = _timeStep;
+    /**
+     * Fixed timeStep simulation progression
+     * @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 timeStepMs = _timeStep * 1000;
+    const timeSinceLast = nowTime - steppingState.lastTime;
+    steppingState.lastTime = nowTime;
+    steppingState.accumulator += timeSinceLast;
+
+    if (!_paused) {
+      let subSteps = 0;
+
+      while (steppingState.accumulator >= timeStepMs && subSteps < _maxSubSteps) {
+        // Collect previous state
+        world.bodies.forEach(b => {
+          previousTranslations[b.handle] = {
+            rotation: rapierQuaternionToQuaternion(b.rotation()).normalize(),
+            translation: rapierVector3ToVector3(b.translation())
+          };
+        });
+        world.step(eventQueue);
+        subSteps++;
+        steppingState.accumulator -= timeStepMs;
+      }
     }
 
-    if (!_paused) world.step(eventQueue); // Update meshes
+    const interpolationAlpha = steppingState.accumulator % timeStepMs / timeStepMs; // Update meshes
 
     rigidBodyStates.forEach((state, handle) => {
       const rigidBody = world.getRigidBody(handle);
@@ -520,7 +551,12 @@ const Physics = ({
         return;
       }
 
-      state.setMatrix(_matrix4.compose(rapierVector3ToVector3(rigidBody.translation()), rapierQuaternionToQuaternion(rigidBody.rotation()), state.worldScale).premultiply(state.invertedMatrixWorld));
+      let oldState = previousTranslations[rigidBody.handle];
+      let newTranslation = rapierVector3ToVector3(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;
+      state.setMatrix(_matrix4.compose(interpolatedTranslation, interpolatedRotation, state.worldScale).premultiply(state.invertedMatrixWorld));
 
       if (state.mesh instanceof InstancedMesh) {
         state.mesh.instanceMatrix.needsUpdate = true;
@@ -570,7 +606,6 @@ const Physics = ({
         });
       }
     });
-    time.current = now;
   });
   const api = useMemo(() => createWorldApi(getWorldRef), []);
   const context = useMemo(() => ({
@@ -582,13 +617,32 @@ const Physics = ({
     },
     colliderMeshes,
     rigidBodyStates,
-    rigidBodyEvents
-  }), []);
+    rigidBodyEvents,
+    isPaused
+  }), [isPaused]);
   return /*#__PURE__*/React.createElement(RapierContext.Provider, {
     value: context
   }, children);
 };
 
+function _extends() {
+  _extends = Object.assign || function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+
+    return target;
+  };
+
+  return _extends.apply(this, arguments);
+}
+
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null) return {};
   var target = {};
@@ -855,7 +909,8 @@ const usePrismaticJoint = (body1, body2, [body1Anchor, body2Anchor, axis]) => {
   return useImpulseJoint(body1, body2, rapier.JointData.prismatic(vectorArrayToVector3(body1Anchor), vectorArrayToVector3(body2Anchor), vectorArrayToVector3(axis)));
 };
 
-const _excluded$1 = ["children"];
+const _excluded$1 = ["children"],
+      _excluded2 = ["type", "position", "rotation"];
 const RigidBodyContext = /*#__PURE__*/createContext(undefined);
 const useRigidBodyContext = () => useContext(RigidBodyContext); // RigidBody
 
@@ -866,6 +921,9 @@ const RigidBody = /*#__PURE__*/forwardRef((_ref, ref) => {
       props = _objectWithoutProperties(_ref, _excluded$1);
 
   const [object, api] = useRigidBody(props);
+
+  const objectProps = _objectWithoutProperties(props, _excluded2);
+
   useImperativeHandle(ref, () => api);
   return /*#__PURE__*/React.createElement(RigidBodyContext.Provider, {
     value: {
@@ -874,9 +932,9 @@ const RigidBody = /*#__PURE__*/forwardRef((_ref, ref) => {
       hasCollisionEvents: !!(props.onCollisionEnter || props.onCollisionExit),
       options: props
     }
-  }, /*#__PURE__*/React.createElement("object3D", {
+  }, /*#__PURE__*/React.createElement("object3D", _extends({
     ref: object
-  }, children));
+  }, objectProps), children));
 });
 
 const MeshCollider = ({
@@ -1166,24 +1224,6 @@ const InstancedRigidBodies = /*#__PURE__*/forwardRef((props, ref) => {
   }, props.children));
 });
 
-function _extends() {
-  _extends = Object.assign || function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-
-    return target;
-  };
-
-  return _extends.apply(this, arguments);
-}
-
 const _excluded = ["children"];
 
 const AnyCollider = _ref => {

package/package.json

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

package/readme.md

@@ -251,6 +251,7 @@ In order, but also not necessarily:
 - [x] Collision events
 - [x] Colliders outside RigidBodies
 - [x] InstancedMesh support
+- [x] Timestep improvements for determinism
 - [ ] Normalize and improve collision events (add events to single Colliders, InstancedRigidBodies, etc)
 - [ ] Docs
 - [ ] CodeSandbox examples