@react-three/rapier 0.4.0 → 0.4.3

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

@@ -88,7 +88,8 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   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 Vector3();
@@ -110,7 +111,7 @@ const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisio
       } = new Quaternion().setFromEuler(child.rotation);
       const scale = child.getWorldScale(new Vector3());
 
-      switch (type) {
+      switch (options.colliders) {
         case "cuboid":
           {
             geometry.computeBoundingBox();
@@ -161,11 +162,9 @@ const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisio
         z: rz,
         w: rw
       });
-
-      if (hasCollisionEvents) {
-        desc.setActiveEvents(ActiveEvents.COLLISION_EVENTS);
-      }
-
+      if (hasCollisionEvents) desc.setActiveEvents(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);
     }
@@ -184,7 +183,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(),
@@ -193,30 +232,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,
@@ -226,6 +256,8 @@ const createRigidBodyApi = ref => {
       return new Vector3(x, y, z);
     },
 
+    setTranslation: translation => ref.current().setTranslation(translation, true),
+
     rotation() {
       const {
         x,
@@ -236,31 +268,37 @@ const createRigidBodyApi = ref => {
       return new Quaternion(x, y, z, w);
     },
 
-    setNextKinematicRotation({
-      x,
-      y,
-      z
-    }) {
-      ref.current().setNextKinematicRotation({
+    setRotation: rotation => ref.current().setRotation(_objectSpread2(_objectSpread2({}, rotation), {}, {
+      w: 1
+    }), true),
+
+    linvel() {
+      const {
         x,
         y,
-        z,
-        w: 1
-      });
+        z
+      } = ref.current().linvel();
+      return new Vector3(x, y, z);
     },
 
-    setNextKinematicTranslation({
-      x,
-      y,
-      z
-    }) {
-      ref.current().setNextKinematicTranslation({
+    setLinvel: velocity => ref.current().setLinvel(velocity, true),
+
+    angvel() {
+      const {
         x,
         y,
         z
-      });
-    }
+      } = ref.current().angvel();
+      return new 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
 
@@ -460,47 +498,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 useContext(RapierContext);
 };
@@ -566,7 +563,6 @@ const useRigidBody = (options = {}) => {
       y: worldPosition.y + y * scale.y,
       z: worldPosition.z + z * scale.z
     }, false);
-    console.log(rigidBody.isKinematic());
     const eulerAngles = new Euler(rx, ry, rz, 'XYZ');
     const rotation = new Quaternion().setFromEuler(eulerAngles).multiply(worldRotation);
     rigidBody.setRotation({
@@ -578,13 +574,12 @@ 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, _objectSpread2(_objectSpread2({}, options), {}, {
+      colliders: colliderSetting
+    }), world) : [];
     rigidBodyMeshes.set(rigidBody.handle, ref.current);
     return () => {
-      const actualBody = world.getRigidBody(rigidBody.handle);
-      world.removeRigidBody(actualBody);
+      world.removeRigidBody(rigidBody);
       autoColliders.forEach(collider => world.removeCollider(collider));
       rigidBodyRef.current = undefined;
       rigidBodyMeshes.delete(rigidBody.handle);
@@ -633,7 +628,9 @@ const useRigidBodyWithCollider = (rigidBodyOptions, colliderOptions) => {
   const {
     world
   } = useRapier();
-  const [ref, rigidBody] = useRigidBody(rigidBodyOptions);
+  const [ref, rigidBody] = useRigidBody(_objectSpread2(_objectSpread2({}, rigidBodyOptions), {}, {
+    colliders: false
+  }));
   useEffect(() => {
     if (!colliderOptions) {
       return;
@@ -946,7 +943,7 @@ const AnyCollider = _ref2 => {
   const ref = useRef(null);
   useEffect(() => {
     const scale = ref.current.getWorldScale(new Vector3());
-    const collider = createColliderFromOptions(props, world, world.getRigidBody(rigidBody.handle), scale, hasCollisionEvents);
+    const collider = createColliderFromOptions(props, world, rigidBody.raw(), scale, hasCollisionEvents);
     return () => {
       world.removeCollider(collider);
     };

package/package.json

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

package/readme.md

@@ -5,18 +5,24 @@
 ## Usage
 
 ```tsx
-import { Box } from "@react-three/drei";
+import { Box, Torus } from "@react-three/drei";
 import { Canvas } from "@react-three/fiber";
 import { Physics, RigidBody } from "@react-three/rapier";
 
 const App = () => {
   return (
     <Canvas>
-      <Physics>
-        <RigidBody>
-          <Box />
-        </RigidBody>
-      </Physics>
+      <Suspense>
+        <Physics>
+          <RigidBody colliders={"hull"} restitution={2}>
+            <Torus />
+          </RigidBody>
+
+          <RigidBody position={[0, -2, 0]} type="kinematicPosition">
+            <Box args={[20, 0.5, 20]} />
+          </RigidBody>
+        </Physics>
+      </Suspense>
     </Canvas>
   );
 };