@react-three/rapier 0.7.2 → 0.7.4

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

@@ -15,7 +15,7 @@ export interface RigidBodyState {
     scale: Vector3;
     isSleeping: boolean;
 }
-export declare type RigidBodyStateMap = Map<RigidBody['handle'], RigidBodyState>;
+export declare type RigidBodyStateMap = Map<RigidBody["handle"], RigidBodyState>;
 export interface ColliderState {
     collider: Collider;
     object: Object3D;
@@ -25,7 +25,7 @@ export interface ColliderState {
      */
     worldParent: Object3D;
 }
-export declare type ColliderStateMap = Map<Collider['handle'], ColliderState>;
+export declare type ColliderStateMap = Map<Collider["handle"], ColliderState>;
 export interface RapierContext {
     rapier: typeof Rapier;
     world: WorldApi;

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

@@ -1,8 +1,8 @@
 export * from "./types";
 export type { RigidBodyApi, WorldApi, InstancedRigidBodyApi } from "./api";
-export type { RigidBodyProps } from './RigidBody';
-export type { InstancedRigidBodiesProps } from './InstancedRigidBodies';
-export type { CylinderColliderProps, BallColliderProps, CapsuleColliderProps, ConeColliderProps, ConvexHullColliderProps, CuboidColliderProps, HeightfieldColliderProps, RoundCuboidColliderProps, TrimeshColliderProps } from './AnyCollider';
+export type { RigidBodyProps } from "./RigidBody";
+export type { InstancedRigidBodiesProps } from "./InstancedRigidBodies";
+export type { CylinderColliderProps, BallColliderProps, CapsuleColliderProps, ConeColliderProps, ConvexHullColliderProps, CuboidColliderProps, HeightfieldColliderProps, RoundCuboidColliderProps, TrimeshColliderProps } from "./AnyCollider";
 export { Physics } from "./Physics";
 export { RigidBody } from "./RigidBody";
 export { MeshCollider } from "./MeshCollider";

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

@@ -118,19 +118,19 @@ export interface UseColliderOptions<ColliderArgs extends Array<unknown>> {
     /**
      * The position of this collider relative to the rigid body
      */
-    position?: Object3DProps['position'];
+    position?: Object3DProps["position"];
     /**
      * The rotation of this collider relative to the rigid body
      */
-    rotation?: Object3DProps['rotation'];
+    rotation?: Object3DProps["rotation"];
     /**
      * The rotation, as a Quaternion, of this collider relative to the rigid body
      */
-    quaternion?: Object3DProps['quaternion'];
+    quaternion?: Object3DProps["quaternion"];
     /**
      * The scale of this collider relative to the rigid body
      */
-    scale?: Object3DProps['scale'];
+    scale?: Object3DProps["scale"];
     /**
      * Callback when this collider collides with another collider.
      */
@@ -219,11 +219,11 @@ export interface UseRigidBodyOptions extends ColliderProps {
     /**
      * Initial position of the RigidBody
      */
-    position?: Object3DProps['position'];
+    position?: Object3DProps["position"];
     /**
      * Initial rotation of the RigidBody
      */
-    rotation?: Object3DProps['rotation'];
+    rotation?: Object3DProps["rotation"];
     /**
      * Automatically generate colliders based on meshes inside this
      * rigid body.
@@ -250,8 +250,8 @@ export interface UseRigidBodyOptions extends ColliderProps {
      */
     collisionGroups?: InteractionGroups;
     /**
-    * The default solver groups bitmask for all colliders in this rigid body.
-    * Can be customized per-collider.
+     * The default solver groups bitmask for all colliders in this rigid body.
+     * Can be customized per-collider.
      */
     solverGroups?: InteractionGroups;
     onSleep?(): void;
@@ -275,7 +275,7 @@ export interface UseRigidBodyOptions extends ColliderProps {
     /**
      * Passed down to the object3d representing this collider.
      */
-    userData?: Object3DProps['userData'];
+    userData?: Object3DProps["userData"];
 }
 export declare type SphericalJointParams = [
     body1Anchor: Vector3Array,

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

@@ -7,7 +7,6 @@ var React = require('react');
 var useAsset = require('use-asset');
 var fiber = require('@react-three/fiber');
 var three = require('three');
-var MathUtils = require('three/src/math/MathUtils');
 var threeStdlib = require('three-stdlib');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -277,9 +276,9 @@ const Physics = ({
     /**
      * Fixed timeStep simulation progression
      * @see https://gafferongames.com/post/fix_your_timestep/
-    */
+     */
 
-    const clampedDelta = MathUtils.clamp(dt, 0, 0.2);
+    const clampedDelta = three.MathUtils.clamp(dt, 0, 0.2);
 
     if (timeStepVariable) {
       world.timestep = clampedDelta;
@@ -781,12 +780,22 @@ const setColliderOptions = (collider, options, states) => {
 
     _matrix4.copy(state.object.matrixWorld).premultiply(state.worldParent.matrixWorld.clone().invert()).decompose(_position, _rotation, _scale);
 
-    collider.setTranslationWrtParent({
-      x: _position.x * parentWorldScale.x,
-      y: _position.y * parentWorldScale.y,
-      z: _position.z * parentWorldScale.z
-    });
-    collider.setRotationWrtParent(_rotation);
+    if (collider.parent()) {
+      collider.setTranslationWrtParent({
+        x: _position.x * parentWorldScale.x,
+        y: _position.y * parentWorldScale.y,
+        z: _position.z * parentWorldScale.z
+      });
+      collider.setRotationWrtParent(_rotation);
+    } else {
+      collider.setTranslation({
+        x: _position.x * parentWorldScale.x,
+        y: _position.y * parentWorldScale.y,
+        z: _position.z * parentWorldScale.z
+      });
+      collider.setRotation(_rotation);
+    }
+
     mutableColliderOptionKeys.forEach(key => {
       if (key in options) {
         mutableColliderOptions[key](collider, options[key]);
@@ -1148,8 +1157,11 @@ const AnyCollider = /*#__PURE__*/React.memo(props => {
       });
     };
   }, []);
-  useUpdateColliderOptions(collidersRef, props, colliderStates);
-  useColliderEvents(collidersRef, props, colliderEvents);
+  const mergedProps = React.useMemo(() => {
+    return _objectSpread2(_objectSpread2({}, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options), props);
+  }, [props, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options]);
+  useUpdateColliderOptions(collidersRef, mergedProps, colliderStates);
+  useColliderEvents(collidersRef, mergedProps, colliderEvents);
   return /*#__PURE__*/React__default["default"].createElement("object3D", {
     position: position,
     rotation: rotation,

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

@@ -7,7 +7,6 @@ var React = require('react');
 var useAsset = require('use-asset');
 var fiber = require('@react-three/fiber');
 var three = require('three');
-var MathUtils = require('three/src/math/MathUtils');
 var threeStdlib = require('three-stdlib');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -277,9 +276,9 @@ const Physics = ({
     /**
      * Fixed timeStep simulation progression
      * @see https://gafferongames.com/post/fix_your_timestep/
-    */
+     */
 
-    const clampedDelta = MathUtils.clamp(dt, 0, 0.2);
+    const clampedDelta = three.MathUtils.clamp(dt, 0, 0.2);
 
     if (timeStepVariable) {
       world.timestep = clampedDelta;
@@ -781,12 +780,22 @@ const setColliderOptions = (collider, options, states) => {
 
     _matrix4.copy(state.object.matrixWorld).premultiply(state.worldParent.matrixWorld.clone().invert()).decompose(_position, _rotation, _scale);
 
-    collider.setTranslationWrtParent({
-      x: _position.x * parentWorldScale.x,
-      y: _position.y * parentWorldScale.y,
-      z: _position.z * parentWorldScale.z
-    });
-    collider.setRotationWrtParent(_rotation);
+    if (collider.parent()) {
+      collider.setTranslationWrtParent({
+        x: _position.x * parentWorldScale.x,
+        y: _position.y * parentWorldScale.y,
+        z: _position.z * parentWorldScale.z
+      });
+      collider.setRotationWrtParent(_rotation);
+    } else {
+      collider.setTranslation({
+        x: _position.x * parentWorldScale.x,
+        y: _position.y * parentWorldScale.y,
+        z: _position.z * parentWorldScale.z
+      });
+      collider.setRotation(_rotation);
+    }
+
     mutableColliderOptionKeys.forEach(key => {
       if (key in options) {
         mutableColliderOptions[key](collider, options[key]);
@@ -1148,8 +1157,11 @@ const AnyCollider = /*#__PURE__*/React.memo(props => {
       });
     };
   }, []);
-  useUpdateColliderOptions(collidersRef, props, colliderStates);
-  useColliderEvents(collidersRef, props, colliderEvents);
+  const mergedProps = React.useMemo(() => {
+    return _objectSpread2(_objectSpread2({}, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options), props);
+  }, [props, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options]);
+  useUpdateColliderOptions(collidersRef, mergedProps, colliderStates);
+  useColliderEvents(collidersRef, mergedProps, colliderEvents);
   return /*#__PURE__*/React__default["default"].createElement("object3D", {
     position: position,
     rotation: rotation,

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

@@ -3,8 +3,7 @@ export { CoefficientCombineRule, Collider as RapierCollider, RigidBody as Rapier
 import React, { useState, useEffect, useRef, useMemo, createContext, useContext, memo, forwardRef, useImperativeHandle, useLayoutEffect } from 'react';
 import { useAsset } from 'use-asset';
 import { useFrame } from '@react-three/fiber';
-import { Quaternion, Euler, Vector3, Object3D, Matrix4, InstancedMesh, MeshBasicMaterial, Color, PlaneGeometry, ConeBufferGeometry, CapsuleBufferGeometry, CylinderBufferGeometry, BufferGeometry, BufferAttribute, SphereBufferGeometry, BoxBufferGeometry, DynamicDrawUsage } from 'three';
-import { clamp } from 'three/src/math/MathUtils';
+import { Quaternion, Euler, Vector3, Object3D, Matrix4, MathUtils, InstancedMesh, MeshBasicMaterial, Color, PlaneGeometry, ConeBufferGeometry, CapsuleBufferGeometry, CylinderBufferGeometry, BufferGeometry, BufferAttribute, SphereBufferGeometry, BoxBufferGeometry, DynamicDrawUsage } from 'three';
 import { mergeVertices, RoundedBoxGeometry } from 'three-stdlib';
 
 const _quaternion = new Quaternion();
@@ -252,9 +251,9 @@ const Physics = ({
     /**
      * Fixed timeStep simulation progression
      * @see https://gafferongames.com/post/fix_your_timestep/
-    */
+     */
 
-    const clampedDelta = clamp(dt, 0, 0.2);
+    const clampedDelta = MathUtils.clamp(dt, 0, 0.2);
 
     if (timeStepVariable) {
       world.timestep = clampedDelta;
@@ -756,12 +755,22 @@ const setColliderOptions = (collider, options, states) => {
 
     _matrix4.copy(state.object.matrixWorld).premultiply(state.worldParent.matrixWorld.clone().invert()).decompose(_position, _rotation, _scale);
 
-    collider.setTranslationWrtParent({
-      x: _position.x * parentWorldScale.x,
-      y: _position.y * parentWorldScale.y,
-      z: _position.z * parentWorldScale.z
-    });
-    collider.setRotationWrtParent(_rotation);
+    if (collider.parent()) {
+      collider.setTranslationWrtParent({
+        x: _position.x * parentWorldScale.x,
+        y: _position.y * parentWorldScale.y,
+        z: _position.z * parentWorldScale.z
+      });
+      collider.setRotationWrtParent(_rotation);
+    } else {
+      collider.setTranslation({
+        x: _position.x * parentWorldScale.x,
+        y: _position.y * parentWorldScale.y,
+        z: _position.z * parentWorldScale.z
+      });
+      collider.setRotation(_rotation);
+    }
+
     mutableColliderOptionKeys.forEach(key => {
       if (key in options) {
         mutableColliderOptions[key](collider, options[key]);
@@ -1123,8 +1132,11 @@ const AnyCollider = /*#__PURE__*/memo(props => {
       });
     };
   }, []);
-  useUpdateColliderOptions(collidersRef, props, colliderStates);
-  useColliderEvents(collidersRef, props, colliderEvents);
+  const mergedProps = useMemo(() => {
+    return _objectSpread2(_objectSpread2({}, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options), props);
+  }, [props, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options]);
+  useUpdateColliderOptions(collidersRef, mergedProps, colliderStates);
+  useColliderEvents(collidersRef, mergedProps, colliderEvents);
   return /*#__PURE__*/React.createElement("object3D", {
     position: position,
     rotation: rotation,

package/package.json

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

package/readme.md

@@ -141,7 +141,7 @@ const Scene = () => {
     instancedApi.at(40).applyImpulse({ x: 0, y: 10, z: 0 });
 
     // Or update all instances as if they were in an array
-    instancedApi.forEach(api => {
+    instancedApi.forEach((api) => {
       api.applyImpulse({ x: 0, y: 10, z: 0 });
     });
   }, []);
@@ -239,10 +239,10 @@ You may also subscribe to collision events on individual Colliders:
 
 ```tsx
 <CuboidCollider
-  onCollisionEnter={payload => {
+  onCollisionEnter={(payload) => {
     /* ... */
   }}
-  onCollisionExit={payload => {
+  onCollisionExit={(payload) => {
     /* ... */
   }}
 />