@react-three/rapier 0.4.2 → 0.5.1

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

@@ -113,13 +113,23 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   const collider = world.createCollider(colliderDesc, rigidBody);
   return collider;
 };
-const createCollidersFromChildren = (object, rigidBody, options, world) => {
+
+const isChildOfMeshCollider = child => {
+  let flag = false;
+  child.traverseAncestors(a => {
+    if (a.userData.r3RapierType === "MeshCollider") flag = true;
+  });
+  return flag;
+};
+
+const createCollidersFromChildren = (object, rigidBody, options, world, ignoreMeshColliders = true) => {
   const hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
   const colliders = [];
   let desc;
   let offset = new three.Vector3();
   object.traverse(child => {
     if ("isMesh" in child) {
+      if (ignoreMeshColliders && isChildOfMeshCollider(child)) return;
       const {
         geometry
       } = child;
@@ -190,7 +200,8 @@ const createCollidersFromChildren = (object, rigidBody, options, world) => {
       if (hasCollisionEvents) desc.setActiveEvents(rapier3dCompat.ActiveEvents.COLLISION_EVENTS);
       if (Number.isFinite(options.friction)) desc.setFriction(options.friction);
       if (Number.isFinite(options.restitution)) desc.setRestitution(options.restitution);
-      const collider = world.createCollider(desc, rigidBody);
+      const actualRigidBody = world.getRigidBody(rigidBody === null || rigidBody === void 0 ? void 0 : rigidBody.handle);
+      const collider = world.createCollider(desc, actualRigidBody);
       colliders.push(collider);
     }
   });
@@ -207,47 +218,11 @@ const scaleVertices = (vertices, scale) => {
 
   return scaledVerts;
 };
-
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
-  }
-
-  return keys;
-}
-
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-    });
-  }
-
-  return target;
-}
+const quaternion = new three.Quaternion();
+const euler = new three.Euler();
+const vector3ToQuaternion = v => {
+  return quaternion.setFromEuler(euler.setFromVector3(v));
+};
 
 const createRigidBodyApi = ref => {
   return {
@@ -293,9 +268,19 @@ const createRigidBodyApi = ref => {
       return new three.Quaternion(x, y, z, w);
     },
 
-    setRotation: rotation => ref.current().setRotation(_objectSpread2(_objectSpread2({}, rotation), {}, {
-      w: 1
-    }), true),
+    setRotation: ({
+      x,
+      y,
+      z
+    }) => {
+      const q = vector3ToQuaternion(new three.Vector3(x, y, z));
+      ref.current().setRotation({
+        x: q.x,
+        y: q.y,
+        z: q.z,
+        w: q.w
+      }, true);
+    },
 
     linvel() {
       const {
@@ -318,12 +303,26 @@ const createRigidBodyApi = ref => {
     },
 
     setAngvel: velocity => ref.current().setAngvel(velocity, true),
-    setNextKinematicRotation: rotation => ref.current().setNextKinematicRotation(_objectSpread2(_objectSpread2({}, rotation), {}, {
-      w: 1
-    })),
+    setNextKinematicRotation: ({
+      x,
+      y,
+      z
+    }) => {
+      const q = vector3ToQuaternion(new three.Vector3(x, y, z));
+      ref.current().setNextKinematicRotation({
+        x: q.x,
+        y: q.y,
+        z: q.z,
+        w: q.w
+      });
+    },
     setNextKinematicTranslation: translation => ref.current().setNextKinematicTranslation(translation),
     resetForces: () => ref.current().resetForces(true),
-    resetTorques: () => ref.current().resetTorques(true)
+    resetTorques: () => ref.current().resetTorques(true),
+    lockRotations: locked => ref.current().lockRotations(locked, true),
+    lockTranslations: locked => ref.current().lockTranslations(locked, true),
+    setEnabledRotations: (x, y, z) => ref.current().setEnabledRotations(x, y, z, true),
+    setEnabledTranslations: (x, y, z) => ref.current().setEnabledTranslations(x, y, z, true)
   };
 }; // TODO: Flesh this out
 
@@ -348,7 +347,16 @@ const createWorldApi = ref => {
     removeCollider: collider => ref.current().removeCollider(collider, true),
     createImpulseJoint: (params, rigidBodyA, rigidBodyB) => ref.current().createImpulseJoint(params, rigidBodyA, rigidBodyB, true),
     removeImpulseJoint: joint => ref.current().removeImpulseJoint(joint, true),
-    forEachCollider: callback => ref.current().forEachCollider(callback)
+    forEachCollider: callback => ref.current().forEachCollider(callback),
+    setGravity: ({
+      x,
+      y,
+      z
+    }) => ref.current().gravity = {
+      x,
+      y,
+      z
+    }
   };
 }; // TODO: Broken currently, waiting for Rapier3D to fix
 
@@ -376,7 +384,8 @@ const importRapier = async () => {
 const Physics = ({
   colliders: _colliders = 'cuboid',
   gravity: _gravity = [0, -9.81, 0],
-  children
+  children,
+  timeStep: _timeStep = 'vary'
 }) => {
   const rapier = useAsset.useAsset(importRapier);
   const worldRef = React.useRef();
@@ -401,7 +410,15 @@ const Physics = ({
         worldRef.current = undefined;
       }
     };
-  }, []);
+  }, []); // Update gravity
+
+  React.useEffect(() => {
+    const world = worldRef.current;
+
+    if (world) {
+      world.gravity = vectorArrayToObject(_gravity);
+    }
+  }, [_gravity]);
   const time = React.useRef(performance.now());
   fiber.useFrame(context => {
     const world = worldRef.current;
@@ -410,7 +427,13 @@ const Physics = ({
 
     const now = performance.now();
     const delta = Math.min(100, now - time.current);
-    world.timestep = delta / 1000;
+
+    if (_timeStep === 'vary') {
+      world.timestep = delta / 1000;
+    } else {
+      world.timestep = _timeStep;
+    }
+
     world.step(eventQueue); // Update meshes
 
     rigidBodyMeshes.forEach((mesh, handle) => {
@@ -523,6 +546,47 @@ const Physics = ({
   }, children);
 };
 
+function _defineProperty(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
+  }
+
+  return keys;
+}
+
+function _objectSpread2(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+
+  return target;
+}
+
 const useRapier = () => {
   return React.useContext(RapierContext);
 };
@@ -539,7 +603,7 @@ const useRigidBody = (options = {}) => {
   const rigidBodyRef = React.useRef();
   const getRigidBodyRef = React.useRef(() => {
     if (!rigidBodyRef.current) {
-      var _options$linearVeloci, _options$angularVeloc, _options$gravityScale, _options$canSleep, _options$ccd;
+      var _options$linearVeloci, _options$angularVeloc, _options$gravityScale, _options$canSleep, _options$ccd, _options$enabledRotat, _options$enabledTrans;
 
       const type = rigidBodyTypeFromString((options === null || options === void 0 ? void 0 : options.type) || "dynamic");
       const [lvx, lvy, lvz] = (_options$linearVeloci = options === null || options === void 0 ? void 0 : options.linearVelocity) !== null && _options$linearVeloci !== void 0 ? _options$linearVeloci : [0, 0, 0];
@@ -547,11 +611,15 @@ const useRigidBody = (options = {}) => {
       const gravityScale = (_options$gravityScale = options === null || options === void 0 ? void 0 : options.gravityScale) !== null && _options$gravityScale !== void 0 ? _options$gravityScale : 1;
       const canSleep = (_options$canSleep = options === null || options === void 0 ? void 0 : options.canSleep) !== null && _options$canSleep !== void 0 ? _options$canSleep : true;
       const ccdEnabled = (_options$ccd = options === null || options === void 0 ? void 0 : options.ccd) !== null && _options$ccd !== void 0 ? _options$ccd : false;
+      const [erx, ery, erz] = (_options$enabledRotat = options === null || options === void 0 ? void 0 : options.enabledRotations) !== null && _options$enabledRotat !== void 0 ? _options$enabledRotat : [true, true, true];
+      const [etx, ety, etz] = (_options$enabledTrans = options === null || options === void 0 ? void 0 : options.enabledTranslations) !== null && _options$enabledTrans !== void 0 ? _options$enabledTrans : [true, true, true];
       const desc = new rapier.RigidBodyDesc(type).setLinvel(lvx, lvy, lvz).setAngvel({
         x: avx,
         y: avy,
         z: avz
-      }).setGravityScale(gravityScale).setCanSleep(canSleep).setCcdEnabled(ccdEnabled);
+      }).setGravityScale(gravityScale).setCanSleep(canSleep).setCcdEnabled(ccdEnabled).enabledRotations(erx, ery, erz).enabledTranslations(etx, ety, etz);
+      if (options.lockRotations) desc.lockRotations();
+      if (options.lockTranslations) desc.lockTranslations();
       const rigidBody = world.createRigidBody(desc);
       rigidBodyRef.current = world.getRigidBody(rigidBody.handle);
     }
@@ -599,7 +667,9 @@ 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, options, world) : [];
+    const autoColliders = colliderSetting !== false ? createCollidersFromChildren(ref.current, rigidBody, _objectSpread2(_objectSpread2({}, options), {}, {
+      colliders: colliderSetting
+    }), world) : [];
     rigidBodyMeshes.set(rigidBody.handle, ref.current);
     return () => {
       world.removeRigidBody(rigidBody);
@@ -646,142 +716,6 @@ const useCollider = (body, options = {}) => {
   }, []);
   const api = React.useMemo(() => createColliderApi(getColliderRef), []);
   return [objectRef, api];
-};
-const useRigidBodyWithCollider = (rigidBodyOptions, colliderOptions) => {
-  const {
-    world
-  } = useRapier();
-  const [ref, rigidBody] = useRigidBody(rigidBodyOptions);
-  React.useEffect(() => {
-    if (!colliderOptions) {
-      return;
-    }
-
-    const scale = ref.current.getWorldScale(new three.Vector3());
-    const collider = createColliderFromOptions(colliderOptions, world, world.getRigidBody(rigidBody.handle), scale);
-    return () => {
-      world.removeCollider(collider);
-    };
-  }, []);
-  return [ref, rigidBody];
-};
-const useCuboid = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _colliderOptions$args;
-
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "cuboid",
-    args: (_colliderOptions$args = colliderOptions.args) !== null && _colliderOptions$args !== void 0 ? _colliderOptions$args : [0.5, 0.5, 0.5]
-  }, colliderOptions));
-};
-const useBall = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _colliderOptions$args2;
-
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "ball",
-    args: (_colliderOptions$args2 = colliderOptions.args) !== null && _colliderOptions$args2 !== void 0 ? _colliderOptions$args2 : [0.5]
-  }, colliderOptions));
-};
-const useCapsule = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _colliderOptions$args3;
-
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "capsule",
-    args: (_colliderOptions$args3 = colliderOptions.args) !== null && _colliderOptions$args3 !== void 0 ? _colliderOptions$args3 : [0.5, 0.5]
-  }, colliderOptions));
-};
-const useHeightfield = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "heightfield"
-  }, colliderOptions));
-};
-/**
- * Create a trimesh collider and rigid body.
- * Note that Trimeshes don't have mass unless provided.
- * See https://rapier.rs/docs/user_guides/javascript/rigid_bodies#mass-properties
- * for available properties.
- */
-
-const useTrimesh = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "trimesh"
-  }, colliderOptions));
-};
-
-useTrimesh.fromMesh = (mesh, rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _mesh$geometry, _mesh$geometry$index;
-
-  return useTrimesh(rigidBodyOptions, _objectSpread2({
-    args: [mesh.geometry.attributes.position.array, ((_mesh$geometry = mesh.geometry) === null || _mesh$geometry === void 0 ? void 0 : (_mesh$geometry$index = _mesh$geometry.index) === null || _mesh$geometry$index === void 0 ? void 0 : _mesh$geometry$index.array) || []]
-  }, colliderOptions));
-};
-
-const usePolyline = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "polyline"
-  }, colliderOptions));
-};
-const useRoundCuboid = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundCuboid"
-  }, colliderOptions));
-};
-const useCylinder = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "cylinder"
-  }, colliderOptions));
-};
-const useRoundCylinder = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundCylinder"
-  }, colliderOptions));
-};
-const useCone = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "cone"
-  }, colliderOptions));
-};
-const useRoundCone = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundCone"
-  }, colliderOptions));
-};
-const useConvexHull = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "convexHull"
-  }, colliderOptions));
-};
-
-useConvexHull.fromMesh = (mesh, rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _mesh$geometry2, _mesh$geometry2$attri, _mesh$geometry2$attri2;
-
-  return useConvexHull(rigidBodyOptions, _objectSpread2({
-    args: [(mesh === null || mesh === void 0 ? void 0 : (_mesh$geometry2 = mesh.geometry) === null || _mesh$geometry2 === void 0 ? void 0 : (_mesh$geometry2$attri = _mesh$geometry2.attributes) === null || _mesh$geometry2$attri === void 0 ? void 0 : (_mesh$geometry2$attri2 = _mesh$geometry2$attri.position) === null || _mesh$geometry2$attri2 === void 0 ? void 0 : _mesh$geometry2$attri2.array) || []]
-  }, colliderOptions));
-};
-
-const useRoundConvexHull = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundConvexHull"
-  }, colliderOptions));
-};
-const useConvexMesh = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "convexMesh"
-  }, colliderOptions));
-};
-
-useConvexMesh.fromMesh = (mesh, rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _mesh$geometry3, _mesh$geometry3$attri, _mesh$geometry3$attri2, _mesh$geometry4, _mesh$geometry4$index;
-
-  return useConvexMesh(rigidBodyOptions, _objectSpread2({
-    args: [mesh === null || mesh === void 0 ? void 0 : (_mesh$geometry3 = mesh.geometry) === null || _mesh$geometry3 === void 0 ? void 0 : (_mesh$geometry3$attri = _mesh$geometry3.attributes) === null || _mesh$geometry3$attri === void 0 ? void 0 : (_mesh$geometry3$attri2 = _mesh$geometry3$attri.position) === null || _mesh$geometry3$attri2 === void 0 ? void 0 : _mesh$geometry3$attri2.array, ((_mesh$geometry4 = mesh.geometry) === null || _mesh$geometry4 === void 0 ? void 0 : (_mesh$geometry4$index = _mesh$geometry4.index) === null || _mesh$geometry4$index === void 0 ? void 0 : _mesh$geometry4$index.array) || []]
-  }, colliderOptions));
-};
-
-const useRoundConvexMesh = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "convexMesh"
-  }, colliderOptions));
 }; // Joints
 
 const useImpulseJoint = (body1, body2, params) => {
@@ -794,12 +728,6 @@ const useImpulseJoint = (body1, body2, params) => {
       let rb1;
       let rb2;
 
-      if ('handle' in body1 && 'handle' in body2) {
-        rb1 = world.getRigidBody(body1.handle);
-        rb2 = world.getRigidBody(body2.handle);
-        jointRef.current = world.createImpulseJoint(params, rb1, rb2);
-      }
-
       if ('current' in body1 && body1.current && 'current' in body2 && body2.current) {
         rb1 = world.getRigidBody(body1.current.handle);
         rb2 = world.getRigidBody(body2.current.handle);
@@ -945,17 +873,52 @@ 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, !!(props.onCollisionEnter || props.onCollisionExit)]
+    value: [object, rigidBody, !!(props.onCollisionEnter || props.onCollisionExit), props]
   }, /*#__PURE__*/React__default["default"].createElement("object3D", {
     ref: object
   }, children));
-}); // Colliders
+});
+const MeshCollider = ({
+  children,
+  type
+}) => {
+  const {
+    physicsOptions,
+    world
+  } = useRapier();
+  const object = React.useRef(null);
+  const [, rigidBody, hasCollisionEvents, rigidBodyOptions] = useRigidBodyContext();
+  React.useEffect(() => {
+    let autoColliders = [];
+
+    if (object.current) {
+      var _ref2;
+
+      const colliderSetting = (_ref2 = type !== null && type !== void 0 ? type : physicsOptions.colliders) !== null && _ref2 !== void 0 ? _ref2 : false;
+      autoColliders = colliderSetting !== false ? createCollidersFromChildren(object.current, rigidBody, _objectSpread2(_objectSpread2({}, rigidBodyOptions), {}, {
+        colliders: colliderSetting
+      }), world, false) : [];
+    }
+
+    return () => {
+      autoColliders.forEach(collider => {
+        world.removeCollider(collider);
+      });
+    };
+  }, []);
+  return /*#__PURE__*/React__default["default"].createElement("object3D", {
+    ref: object,
+    userData: {
+      r3RapierType: 'MeshCollider'
+    }
+  }, children);
+}; // Colliders
 
-const AnyCollider = _ref2 => {
+const AnyCollider = _ref3 => {
   let {
     children
-  } = _ref2,
-      props = _objectWithoutProperties(_ref2, _excluded2);
+  } = _ref3,
+      props = _objectWithoutProperties(_ref3, _excluded2);
 
   const {
     world
@@ -1155,31 +1118,16 @@ exports.CuboidCollider = CuboidCollider;
 exports.CylinderCollider = CylinderCollider;
 exports.Debug = Debug;
 exports.HeightfieldCollider = HeightfieldCollider;
+exports.MeshCollider = MeshCollider;
 exports.Physics = Physics;
 exports.RigidBody = RigidBody;
 exports.RoundCuboidCollider = RoundCuboidCollider;
 exports.TrimeshCollider = TrimeshCollider;
-exports.useBall = useBall;
-exports.useCapsule = useCapsule;
 exports.useCollider = useCollider;
-exports.useCone = useCone;
-exports.useConvexHull = useConvexHull;
-exports.useConvexMesh = useConvexMesh;
-exports.useCuboid = useCuboid;
-exports.useCylinder = useCylinder;
 exports.useFixedJoint = useFixedJoint;
-exports.useHeightfield = useHeightfield;
 exports.useImpulseJoint = useImpulseJoint;
-exports.usePolyline = usePolyline;
 exports.usePrismaticJoint = usePrismaticJoint;
 exports.useRapier = useRapier;
 exports.useRevoluteJoint = useRevoluteJoint;
 exports.useRigidBody = useRigidBody;
-exports.useRigidBodyWithCollider = useRigidBodyWithCollider;
-exports.useRoundCone = useRoundCone;
-exports.useRoundConvexHull = useRoundConvexHull;
-exports.useRoundConvexMesh = useRoundConvexMesh;
-exports.useRoundCuboid = useRoundCuboid;
-exports.useRoundCylinder = useRoundCylinder;
 exports.useSphericalJoint = useSphericalJoint;
-exports.useTrimesh = useTrimesh;