@react-three/rapier 0.2.0 → 0.4.0

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

@@ -5,8 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 var useAsset = require('use-asset');
 var fiber = require('@react-three/fiber');
-var three = require('three');
 var rapier3dCompat = require('@dimforge/rapier3d-compat');
+var three = require('three');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -63,11 +63,11 @@ const scaleColliderArgs = (shape, args, scale) => {
   const scaleArray = [scale.x, scale.y, scale.z];
   return newArgs.map((arg, index) => scaleArray[index] * arg);
 };
-const createColliderFromOptions = (options, world, rigidBodyHandle, scale = {
+const createColliderFromOptions = (options, world, rigidBody, scale = {
   x: 1,
   y: 1,
   z: 1
-}) => {
+}, hasCollisionEvents = false) => {
   var _options$shape, _options$args, _options$restitution, _options$restitutionC, _options$friction, _options$frictionComb;
 
   const mass = (options === null || options === void 0 ? void 0 : options.mass) || 1;
@@ -85,7 +85,12 @@ const createColliderFromOptions = (options, world, rigidBodyHandle, scale = {
     y: ry,
     z: rz,
     w: 1
-  }).setRestitution((_options$restitution = options === null || options === void 0 ? void 0 : options.restitution) !== null && _options$restitution !== void 0 ? _options$restitution : 0).setRestitutionCombineRule((_options$restitutionC = options === null || options === void 0 ? void 0 : options.restitutionCombineRule) !== null && _options$restitutionC !== void 0 ? _options$restitutionC : rapier3dCompat.CoefficientCombineRule.Average).setFriction((_options$friction = options === null || options === void 0 ? void 0 : options.friction) !== null && _options$friction !== void 0 ? _options$friction : 0.7).setFrictionCombineRule((_options$frictionComb = options === null || options === void 0 ? void 0 : options.frictionCombineRule) !== null && _options$frictionComb !== void 0 ? _options$frictionComb : rapier3dCompat.CoefficientCombineRule.Average); // If any of the mass properties are specified, add mass properties
+  }).setRestitution((_options$restitution = options === null || options === void 0 ? void 0 : options.restitution) !== null && _options$restitution !== void 0 ? _options$restitution : 0).setRestitutionCombineRule((_options$restitutionC = options === null || options === void 0 ? void 0 : options.restitutionCombineRule) !== null && _options$restitutionC !== void 0 ? _options$restitutionC : rapier3dCompat.CoefficientCombineRule.Average).setFriction((_options$friction = options === null || options === void 0 ? void 0 : options.friction) !== null && _options$friction !== void 0 ? _options$friction : 0.7).setFrictionCombineRule((_options$frictionComb = options === null || options === void 0 ? void 0 : options.frictionCombineRule) !== null && _options$frictionComb !== void 0 ? _options$frictionComb : rapier3dCompat.CoefficientCombineRule.Average);
+
+  if (hasCollisionEvents) {
+    colliderDesc = colliderDesc.setActiveEvents(rapier3dCompat.ActiveEvents.COLLISION_EVENTS);
+  } // If any of the mass properties are specified, add mass properties
+
 
   if (options !== null && options !== void 0 && options.mass || options !== null && options !== void 0 && options.centerOfMass || options !== null && options !== void 0 && options.principalAngularInertia) {
     colliderDesc.setDensity(0);
@@ -105,10 +110,10 @@ const createColliderFromOptions = (options, world, rigidBodyHandle, scale = {
     });
   }
 
-  const collider = world.createCollider(colliderDesc, rigidBodyHandle);
+  const collider = world.createCollider(colliderDesc, rigidBody);
   return collider;
 };
-const createCollidersFromChildren = (object, rigidBody, type, world) => {
+const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisionEvents = false) => {
   const colliders = [];
   let desc;
   let offset = new three.Vector3();
@@ -181,7 +186,12 @@ const createCollidersFromChildren = (object, rigidBody, type, world) => {
         z: rz,
         w: rw
       });
-      const collider = world.createCollider(desc, rigidBody.handle);
+
+      if (hasCollisionEvents) {
+        desc.setActiveEvents(rapier3dCompat.ActiveEvents.COLLISION_EVENTS);
+      }
+
+      const collider = world.createCollider(desc, rigidBody);
       colliders.push(collider);
     }
   });
@@ -249,6 +259,31 @@ const createRigidBodyApi = ref => {
         w
       } = ref.current().rotation();
       return new three.Quaternion(x, y, z, w);
+    },
+
+    setNextKinematicRotation({
+      x,
+      y,
+      z
+    }) {
+      ref.current().setNextKinematicRotation({
+        x,
+        y,
+        z,
+        w: 1
+      });
+    },
+
+    setNextKinematicTranslation({
+      x,
+      y,
+      z
+    }) {
+      ref.current().setNextKinematicTranslation({
+        x,
+        y,
+        z
+      });
     }
 
   };
@@ -270,10 +305,10 @@ const createWorldApi = ref => {
     getCollider: handle => ref.current().getCollider(handle),
     getRigidBody: handle => ref.current().getRigidBody(handle),
     createRigidBody: desc => ref.current().createRigidBody(desc),
-    createCollider: (desc, rigidBodyHandle) => ref.current().createCollider(desc, rigidBodyHandle),
+    createCollider: (desc, rigidBody) => ref.current().createCollider(desc, rigidBody),
     removeRigidBody: rigidBody => ref.current().removeRigidBody(rigidBody),
     removeCollider: collider => ref.current().removeCollider(collider, true),
-    createImpulseJoint: (params, rigidBodyA, rigidBodyB) => ref.current().createImpulseJoint(params, rigidBodyA, rigidBodyB),
+    createImpulseJoint: (params, rigidBodyA, rigidBodyB) => ref.current().createImpulseJoint(params, rigidBodyA, rigidBodyB, true),
     removeImpulseJoint: joint => ref.current().removeImpulseJoint(joint, true),
     forEachCollider: callback => ref.current().forEachCollider(callback)
   };
@@ -316,9 +351,11 @@ const Physics = ({
     return worldRef.current;
   });
   const [colliderMeshes] = React.useState(() => new Map());
-  const [rigidBodyMeshes] = React.useState(() => new Map()); // Init world
+  const [rigidBodyMeshes] = React.useState(() => new Map());
+  const [rigidBodyEvents] = React.useState(() => new Map());
+  const [eventQueue] = React.useState(() => new rapier3dCompat.EventQueue(false)); // Init world
 
-  React.useLayoutEffect(() => {
+  React.useEffect(() => {
     const world = getWorldRef.current();
     return () => {
       if (world) {
@@ -336,10 +373,27 @@ const Physics = ({
     const now = performance.now();
     const delta = Math.min(100, now - time.current);
     world.timestep = delta / 1000;
-    world.step(); // Update meshes
+    world.step(eventQueue); // Update meshes
 
     rigidBodyMeshes.forEach((mesh, handle) => {
       const rigidBody = world.getRigidBody(handle);
+      const events = rigidBodyEvents.get(handle);
+
+      if (events !== null && events !== void 0 && events.onSleep || events !== null && events !== void 0 && events.onWake) {
+        if (rigidBody.isSleeping() && !mesh.userData.isSleeping) {
+          var _events$onSleep;
+
+          events === null || events === void 0 ? void 0 : (_events$onSleep = events.onSleep) === null || _events$onSleep === void 0 ? void 0 : _events$onSleep.call(events);
+        }
+
+        if (!rigidBody.isSleeping() && mesh.userData.isSleeping) {
+          var _events$onWake;
+
+          events === null || events === void 0 ? void 0 : (_events$onWake = events.onWake) === null || _events$onWake === void 0 ? void 0 : _events$onWake.call(events);
+        }
+
+        mesh.userData.isSleeping = rigidBody.isSleeping();
+      }
 
       if (!rigidBody || rigidBody.isSleeping() || rigidBody.isFixed() || !mesh.parent) {
         return;
@@ -367,6 +421,50 @@ const Physics = ({
       o.updateMatrix();
       mesh.position.setFromMatrixPosition(o.matrix);
       mesh.rotation.setFromRotationMatrix(o.matrix);
+    }); // Collision events
+
+    eventQueue.drainCollisionEvents((handle1, handle2, started) => {
+      var _collider1$parent, _collider2$parent;
+
+      const collider1 = world.getCollider(handle1);
+      const collider2 = world.getCollider(handle2);
+      const rigidBodyHandle1 = (_collider1$parent = collider1.parent()) === null || _collider1$parent === void 0 ? void 0 : _collider1$parent.handle;
+      const rigidBodyHandle2 = (_collider2$parent = collider2.parent()) === null || _collider2$parent === void 0 ? void 0 : _collider2$parent.handle;
+
+      if (!collider1 || !collider2 || !rigidBodyHandle1 || !rigidBodyHandle2) {
+        return;
+      }
+
+      const rigidBody1 = world.getRigidBody(rigidBodyHandle1);
+      const rigidBody2 = world.getRigidBody(rigidBodyHandle2);
+      const events1 = rigidBodyEvents.get(rigidBodyHandle1);
+      const events2 = rigidBodyEvents.get(rigidBodyHandle2);
+
+      if (started) {
+        world.contactPair(collider1, collider2, (manifold, flipped) => {
+          var _events1$onCollisionE, _events2$onCollisionE;
+
+          events1 === null || events1 === void 0 ? void 0 : (_events1$onCollisionE = events1.onCollisionEnter) === null || _events1$onCollisionE === void 0 ? void 0 : _events1$onCollisionE.call(events1, {
+            target: rigidBody2,
+            manifold,
+            flipped
+          });
+          events2 === null || events2 === void 0 ? void 0 : (_events2$onCollisionE = events2.onCollisionEnter) === null || _events2$onCollisionE === void 0 ? void 0 : _events2$onCollisionE.call(events2, {
+            target: rigidBody1,
+            manifold,
+            flipped
+          });
+        });
+      } else {
+        var _events1$onCollisionE2, _events2$onCollisionE2;
+
+        events1 === null || events1 === void 0 ? void 0 : (_events1$onCollisionE2 = events1.onCollisionExit) === null || _events1$onCollisionE2 === void 0 ? void 0 : _events1$onCollisionE2.call(events1, {
+          target: rigidBody2
+        });
+        events2 === null || events2 === void 0 ? void 0 : (_events2$onCollisionE2 = events2.onCollisionExit) === null || _events2$onCollisionE2 === void 0 ? void 0 : _events2$onCollisionE2.call(events2, {
+          target: rigidBody1
+        });
+      }
     });
     time.current = now;
   });
@@ -379,7 +477,8 @@ const Physics = ({
       gravity: _gravity
     },
     colliderMeshes,
-    rigidBodyMeshes
+    rigidBodyMeshes,
+    rigidBodyEvents
   }), []);
   return /*#__PURE__*/React__default["default"].createElement(RapierContext.Provider, {
     value: context
@@ -435,7 +534,8 @@ const useRigidBody = (options = {}) => {
     rapier,
     world,
     rigidBodyMeshes,
-    physicsOptions
+    physicsOptions,
+    rigidBodyEvents
   } = useRapier();
   const ref = React.useRef(); // Create rigidbody
 
@@ -456,7 +556,7 @@ const useRigidBody = (options = {}) => {
         z: avz
       }).setGravityScale(gravityScale).setCanSleep(canSleep).setCcdEnabled(ccdEnabled);
       const rigidBody = world.createRigidBody(desc);
-      rigidBodyRef.current = rigidBody;
+      rigidBodyRef.current = world.getRigidBody(rigidBody.handle);
     }
 
     return rigidBodyRef.current;
@@ -470,9 +570,11 @@ const useRigidBody = (options = {}) => {
 
     if (!ref.current) {
       ref.current = new three.Object3D();
-    } // Get intitial world transforms
+    } // isSleeping used for onSleep and onWake events
 
 
+    ref.current.userData.isSleeping = false; // Get intitial world transforms
+
     const worldPosition = ref.current.getWorldPosition(new three.Vector3());
     const worldRotation = ref.current.getWorldQuaternion(new three.Quaternion());
     const scale = ((_ref$current$parent = ref.current.parent) === null || _ref$current$parent === void 0 ? void 0 : _ref$current$parent.getWorldScale(new three.Vector3())) || {
@@ -489,6 +591,7 @@ const useRigidBody = (options = {}) => {
       y: worldPosition.y + y * scale.y,
       z: worldPosition.z + z * scale.z
     }, false);
+    console.log(rigidBody.isKinematic());
     const eulerAngles = new three.Euler(rx, ry, rz, 'XYZ');
     const rotation = new three.Quaternion().setFromEuler(eulerAngles).multiply(worldRotation);
     rigidBody.setRotation({
@@ -500,16 +603,31 @@ const useRigidBody = (options = {}) => {
     rigidBody.resetForces(false);
     rigidBody.resetTorques(false);
     const colliderSetting = (_ref = (_options$colliders = options === null || options === void 0 ? void 0 : options.colliders) !== null && _options$colliders !== void 0 ? _options$colliders : physicsOptions.colliders) !== null && _ref !== void 0 ? _ref : false;
-    const autoColliders = colliderSetting !== false ? createCollidersFromChildren(ref.current, rigidBody, colliderSetting, world) : [];
+    const hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
+    const autoColliders = colliderSetting !== false ? createCollidersFromChildren(ref.current, rigidBody, colliderSetting, world, hasCollisionEvents) : [];
     rigidBody.wakeUp();
     rigidBodyMeshes.set(rigidBody.handle, ref.current);
     return () => {
+      const actualBody = world.getRigidBody(rigidBody.handle);
+      world.removeRigidBody(actualBody);
       autoColliders.forEach(collider => world.removeCollider(collider));
-      world.removeRigidBody(rigidBody);
       rigidBodyRef.current = undefined;
       rigidBodyMeshes.delete(rigidBody.handle);
     };
-  }, []);
+  }, []); // Events
+
+  React.useEffect(() => {
+    const rigidBody = getRigidBodyRef.current();
+    rigidBodyEvents.set(rigidBody.handle, {
+      onCollisionEnter: options === null || options === void 0 ? void 0 : options.onCollisionEnter,
+      onCollisionExit: options === null || options === void 0 ? void 0 : options.onCollisionExit,
+      onSleep: options === null || options === void 0 ? void 0 : options.onSleep,
+      onWake: options === null || options === void 0 ? void 0 : options.onWake
+    });
+    return () => {
+      rigidBodyEvents.delete(rigidBody.handle);
+    };
+  }, [options.onCollisionEnter, options.onCollisionExit]);
   const api = React.useMemo(() => createRigidBodyApi(getRigidBodyRef), []);
   return [ref, api];
 };
@@ -521,7 +639,7 @@ const useCollider = (body, options = {}) => {
   const objectRef = React.useRef();
   const getColliderRef = React.useRef(() => {
     if (!colliderRef.current) {
-      colliderRef.current = createColliderFromOptions(options, world, body.handle);
+      colliderRef.current = createColliderFromOptions(options, world, world.getRigidBody(body.handle));
     }
 
     return colliderRef.current;
@@ -547,7 +665,7 @@ const useRigidBodyWithCollider = (rigidBodyOptions, colliderOptions) => {
     }
 
     const scale = ref.current.getWorldScale(new three.Vector3());
-    const collider = createColliderFromOptions(colliderOptions, world, rigidBody.handle, scale);
+    const collider = createColliderFromOptions(colliderOptions, world, world.getRigidBody(rigidBody.handle), scale);
     return () => {
       world.removeCollider(collider);
     };
@@ -703,7 +821,6 @@ const useImpulseJoint = (body1, body2, params) => {
     const joint = getJointRef.current();
     return () => {
       if (joint) {
-        console.log('remove joint', joint);
         world.removeImpulseJoint(joint);
         jointRef.current = undefined;
       }
@@ -823,7 +940,7 @@ const _excluded = ["children"],
       _excluded2 = ["children"];
 const RigidBodyContext = /*#__PURE__*/React.createContext(undefined);
 
-const useParentRigidBody = () => React.useContext(RigidBodyContext); // RigidBody
+const useRigidBodyContext = () => React.useContext(RigidBodyContext); // RigidBody
 
 
 const RigidBody = /*#__PURE__*/React.forwardRef((_ref, ref) => {
@@ -835,7 +952,7 @@ const RigidBody = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   const [object, rigidBody] = useRigidBody(props);
   React.useImperativeHandle(ref, () => rigidBody);
   return /*#__PURE__*/React__default["default"].createElement(RigidBodyContext.Provider, {
-    value: [object, rigidBody]
+    value: [object, rigidBody, !!(props.onCollisionEnter || props.onCollisionExit)]
   }, /*#__PURE__*/React__default["default"].createElement("object3D", {
     ref: object
   }, children));
@@ -850,11 +967,11 @@ const AnyCollider = _ref2 => {
   const {
     world
   } = useRapier();
-  const [, rigidBody] = useParentRigidBody();
+  const [, rigidBody, hasCollisionEvents] = useRigidBodyContext();
   const ref = React.useRef(null);
   React.useEffect(() => {
     const scale = ref.current.getWorldScale(new three.Vector3());
-    const collider = createColliderFromOptions(props, world, rigidBody.handle, scale);
+    const collider = createColliderFromOptions(props, world, world.getRigidBody(rigidBody.handle), scale, hasCollisionEvents);
     return () => {
       world.removeCollider(collider);
     };
@@ -911,20 +1028,20 @@ const ConvexHullCollider = props => {
 };
 
 const geometryFromCollider = collider => {
-  switch (collider.shapeType()) {
+  switch (collider.shape.type) {
     case rapier3dCompat.ShapeType.Cuboid:
       {
         const {
           x,
           y,
           z
-        } = collider.halfExtents();
+        } = collider.shape.halfExtents;
         return new three.BoxBufferGeometry(x * 2 + 0.01, y * 2 + 0.01, z * 2 + 0.01);
       }
 
     case rapier3dCompat.ShapeType.Ball:
       {
-        const r = collider.radius();
+        const r = collider.shape.radius;
         return new three.SphereBufferGeometry(r + +0.01, 8, 8);
       }
 
@@ -932,10 +1049,12 @@ const geometryFromCollider = collider => {
       {
         var _g$index;
 
-        const v = collider.vertices();
-        const i = collider.indices();
-        const g = new three.BufferGeometry();
-        g.setAttribute("position", new three.BufferAttribute(v, 3));
+        const v = collider.shape.vertices;
+        const i = collider.shape.indices;
+        const g = new three.BufferGeometry(); // Vertices are not always a float3darray (???), so we need to convert them
+
+        const safeVerts = Float32Array.from(v);
+        g.setAttribute("position", new three.BufferAttribute(safeVerts, 3));
         (_g$index = g.index) === null || _g$index === void 0 ? void 0 : _g$index.set(i);
         g.setDrawRange(0, g.attributes.position.array.length / 3 - 1);
         return g;
@@ -943,16 +1062,18 @@ const geometryFromCollider = collider => {
 
     case rapier3dCompat.ShapeType.ConvexPolyhedron:
       {
-        const cv = collider.vertices();
+        const cv = collider.shape.vertices; // Vertices are not always a float3darray (???), so we need to convert them
+
+        const safeVerts = Float32Array.from(cv);
         const cg = new three.BufferGeometry();
-        cg.setAttribute("position", new three.BufferAttribute(cv, 3));
+        cg.setAttribute("position", new three.BufferAttribute(safeVerts, 3));
         return cg;
       }
 
     case rapier3dCompat.ShapeType.Cylinder:
       {
-        const r = collider.radius();
-        const h = collider.halfHeight();
+        const r = collider.shape.radius;
+        const h = collider.shape.halfHeight;
         const g = new three.CylinderBufferGeometry(r, r, h);
         return g;
       }