@react-three/rapier 0.3.1 → 0.4.2

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

@@ -63,7 +63,7 @@ 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
@@ -110,10 +110,11 @@ 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, hasCollisionEvents = false) => {
+const createCollidersFromChildren = (object, rigidBody, options, world) => {
+  const hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
   const colliders = [];
   let desc;
   let offset = new three.Vector3();
@@ -135,7 +136,7 @@ const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisio
       } = new three.Quaternion().setFromEuler(child.rotation);
       const scale = child.getWorldScale(new three.Vector3());
 
-      switch (type) {
+      switch (options.colliders) {
         case "cuboid":
           {
             geometry.computeBoundingBox();
@@ -186,12 +187,10 @@ const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisio
         z: rz,
         w: rw
       });
-
-      if (hasCollisionEvents) {
-        desc.setActiveEvents(rapier3dCompat.ActiveEvents.COLLISION_EVENTS);
-      }
-
-      const collider = world.createCollider(desc, rigidBody.handle);
+      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);
       colliders.push(collider);
     }
   });
@@ -209,7 +208,47 @@ const scaleVertices = (vertices, scale) => {
   return scaledVerts;
 };
 
-// TODO: Flesh this out
+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 createRigidBodyApi = ref => {
   return {
     raw: () => ref.current(),
@@ -218,30 +257,21 @@ const createRigidBodyApi = ref => {
       return ref.current().handle;
     },
 
-    applyImpulse({
-      x,
-      y,
-      z
-    }) {
-      ref.current().applyImpulse({
-        x,
-        y,
-        z
-      }, true);
+    mass: () => ref.current().mass(),
+
+    applyImpulse(impulseVector) {
+      ref.current().applyImpulse(impulseVector, true);
     },
 
-    applyTorqueImpulse({
-      x,
-      y,
-      z
-    }) {
-      ref.current().applyTorqueImpulse({
-        x,
-        y,
-        z
-      }, true);
+    applyTorqueImpulse(torqueVector) {
+      ref.current().applyTorqueImpulse(torqueVector, true);
     },
 
+    applyImpulseAtPoint: (impulseVector, impulsePoint) => ref.current().applyImpulseAtPoint(impulseVector, impulsePoint, true),
+    addForce: force => ref.current().addForce(force, true),
+    addForceAtPoint: (force, point) => ref.current().addForceAtPoint(force, point, true),
+    addTorque: torque => ref.current().addTorque(torque, true),
+
     translation() {
       const {
         x,
@@ -251,6 +281,8 @@ const createRigidBodyApi = ref => {
       return new three.Vector3(x, y, z);
     },
 
+    setTranslation: translation => ref.current().setTranslation(translation, true),
+
     rotation() {
       const {
         x,
@@ -259,8 +291,39 @@ const createRigidBodyApi = ref => {
         w
       } = ref.current().rotation();
       return new three.Quaternion(x, y, z, w);
-    }
+    },
+
+    setRotation: rotation => ref.current().setRotation(_objectSpread2(_objectSpread2({}, rotation), {}, {
+      w: 1
+    }), true),
+
+    linvel() {
+      const {
+        x,
+        y,
+        z
+      } = ref.current().linvel();
+      return new three.Vector3(x, y, z);
+    },
 
+    setLinvel: velocity => ref.current().setLinvel(velocity, true),
+
+    angvel() {
+      const {
+        x,
+        y,
+        z
+      } = ref.current().angvel();
+      return new three.Vector3(x, y, z);
+    },
+
+    setAngvel: velocity => ref.current().setAngvel(velocity, true),
+    setNextKinematicRotation: rotation => ref.current().setNextKinematicRotation(_objectSpread2(_objectSpread2({}, rotation), {}, {
+      w: 1
+    })),
+    setNextKinematicTranslation: translation => ref.current().setNextKinematicTranslation(translation),
+    resetForces: () => ref.current().resetForces(true),
+    resetTorques: () => ref.current().resetTorques(true)
   };
 }; // TODO: Flesh this out
 
@@ -280,10 +343,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)
   };
@@ -330,7 +393,7 @@ const Physics = ({
   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) {
@@ -399,10 +462,12 @@ const Physics = ({
     }); // 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();
-      const rigidBodyHandle2 = collider2.parent();
+      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;
@@ -414,7 +479,7 @@ const Physics = ({
       const events2 = rigidBodyEvents.get(rigidBodyHandle2);
 
       if (started) {
-        world.contactPair(handle1, handle2, (manifold, flipped) => {
+        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, {
@@ -458,47 +523,6 @@ 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);
 };
@@ -529,7 +553,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;
@@ -575,13 +599,11 @@ 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 hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
-    const autoColliders = colliderSetting !== false ? createCollidersFromChildren(ref.current, rigidBody, colliderSetting, world, hasCollisionEvents) : [];
-    rigidBody.wakeUp();
+    const autoColliders = colliderSetting !== false ? createCollidersFromChildren(ref.current, rigidBody, options, world) : [];
     rigidBodyMeshes.set(rigidBody.handle, ref.current);
     return () => {
-      autoColliders.forEach(collider => world.removeCollider(collider));
       world.removeRigidBody(rigidBody);
+      autoColliders.forEach(collider => world.removeCollider(collider));
       rigidBodyRef.current = undefined;
       rigidBodyMeshes.delete(rigidBody.handle);
     };
@@ -610,7 +632,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;
@@ -636,7 +658,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);
     };
@@ -792,7 +814,6 @@ const useImpulseJoint = (body1, body2, params) => {
     const joint = getJointRef.current();
     return () => {
       if (joint) {
-        console.log('remove joint', joint);
         world.removeImpulseJoint(joint);
         jointRef.current = undefined;
       }
@@ -943,7 +964,7 @@ const AnyCollider = _ref2 => {
   const ref = React.useRef(null);
   React.useEffect(() => {
     const scale = ref.current.getWorldScale(new three.Vector3());
-    const collider = createColliderFromOptions(props, world, rigidBody.handle, scale, hasCollisionEvents);
+    const collider = createColliderFromOptions(props, world, rigidBody.raw(), scale, hasCollisionEvents);
     return () => {
       world.removeCollider(collider);
     };
@@ -1000,20 +1021,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);
       }
 
@@ -1021,10 +1042,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;
@@ -1032,16 +1055,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;
       }