@react-three/rapier 0.14.0 → 0.15.0

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

@@ -4,7 +4,6 @@ import React, { FC, ReactNode } from "react";
 import { Matrix4, Object3D, Vector3 } from "three";
 import { CollisionEnterHandler, CollisionExitHandler, ContactForceHandler, IntersectionEnterHandler, IntersectionExitHandler, RigidBodyAutoCollider, Vector3Array } from "../types";
 import { WorldApi } from "../utils/api";
-import { AttractorStateMap } from "./Attractor";
 export interface RigidBodyState {
     meshType: "instancedMesh" | "mesh";
     rigidBody: RigidBody;
@@ -54,11 +53,6 @@ export interface RapierContext {
      * @internal
      */
     colliderEvents: EventMap;
-    /**
-     * Used by the world to keep track of Attractor states
-     * @internal
-     */
-    attractorStates: AttractorStateMap;
     /**
      * Default options for rigid bodies and colliders
      * @internal
@@ -99,6 +93,10 @@ export interface RapierContext {
      * ```
      */
     step: (deltaTime: number) => void;
+    /**
+     * Is debug mode enabled
+     */
+    isDebug: boolean;
 }
 export declare const rapierContext: React.Context<RapierContext | undefined>;
 export declare type EventMapValue = {
@@ -171,6 +169,11 @@ export interface PhysicsProps {
      * @defaultValue "follow"
      */
     updateLoop?: "follow" | "independent";
+    /**
+     * Enable debug rendering of the physics world.
+     * @defaultValue false
+     */
+    debug?: boolean;
 }
 /**
  * The main physics component used to create a physics world.

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

@@ -4,15 +4,12 @@ export type { InstancedRigidBodiesProps, InstancedRigidBodyProps } from "./compo
 export type { CylinderColliderProps, BallColliderProps, CapsuleColliderProps, ConeColliderProps, ConvexHullColliderProps, CuboidColliderProps, HeightfieldColliderProps, RoundCuboidColliderProps, TrimeshColliderProps, ColliderOptionsRequiredArgs } from "./components/AnyCollider";
 export type { PhysicsProps, RapierContext, WorldStepCallback } from "./components/Physics";
 export type { MeshColliderProps } from "./components/MeshCollider";
-export type { AttractorProps, AttractorGravityType } from "./components/Attractor";
 export type { WorldApi } from "./utils/api";
 export { Physics } from "./components/Physics";
 export { RigidBody } from "./components/RigidBody";
 export { MeshCollider } from "./components/MeshCollider";
-export { Debug } from "./components/Debug";
 export { InstancedRigidBodies } from "./components/InstancedRigidBodies";
 export * from "./components/AnyCollider";
-export { Attractor } from "./components/Attractor";
 export * from "./hooks/joints";
 export { useRapier, useBeforePhysicsStep, useAfterPhysicsStep } from "./hooks/hooks";
 export * from "./utils/interaction-groups";

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

@@ -178,6 +178,61 @@ function useConst(initialValue) {
   return ref.current.value;
 }
 
+const useRaf = callback => {
+  const cb = React.useRef(callback);
+  const raf = React.useRef(0);
+  const lastFrame = React.useRef(0);
+  React.useEffect(() => {
+    cb.current = callback;
+  }, [callback]);
+  React.useEffect(() => {
+    const loop = () => {
+      const now = performance.now();
+      const delta = now - lastFrame.current;
+      raf.current = requestAnimationFrame(loop);
+      cb.current(delta / 1000);
+      lastFrame.current = now;
+    };
+
+    raf.current = requestAnimationFrame(loop);
+    return () => cancelAnimationFrame(raf.current);
+  }, []);
+};
+
+const UseFrameStepper = ({
+  onStep,
+  updatePriority
+}) => {
+  fiber.useFrame((_, dt) => {
+    onStep(dt);
+  }, updatePriority);
+  return null;
+};
+
+const RafStepper = ({
+  onStep
+}) => {
+  useRaf(dt => {
+    onStep(dt);
+  });
+  return null;
+};
+
+const FrameStepper = ({
+  onStep,
+  type,
+  updatePriority
+}) => {
+  return type === "independent" ? /*#__PURE__*/React__default["default"].createElement(RafStepper, {
+    onStep: onStep
+  }) : /*#__PURE__*/React__default["default"].createElement(UseFrameStepper, {
+    onStep: onStep,
+    updatePriority: updatePriority
+  });
+};
+
+var FrameStepper$1 = /*#__PURE__*/React.memo(FrameStepper);
+
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null) return {};
   var target = {};
@@ -606,146 +661,27 @@ const useChildColliderProps = (ref, options, ignoreMeshColliders = true) => {
   return colliderProps;
 };
 
-const calcForceByType = {
-  static: (s, m2, r, d, G) => s,
-  linear: (s, m2, r, d, G) => s * (d / r),
-  newtonian: (s, m2, r, d, G) => G * s * m2 / Math.pow(d, 2)
-};
-const applyAttractorForceOnRigidBody = (rigidBody, {
-  object,
-  strength,
-  range,
-  gravitationalConstant,
-  collisionGroups,
-  type
-}) => {
-  const rbPosition = rigidBody.translation();
-
-  _position.set(rbPosition.x, rbPosition.y, rbPosition.z);
-
-  const worldPosition = object.getWorldPosition(new three.Vector3());
-  const distance = worldPosition.distanceTo(_position);
-
-  if (distance < range) {
-    let force = calcForceByType[type](strength, rigidBody.mass(), range, distance, gravitationalConstant); // Prevent wild forces when Attractors collide
-
-    force = force === Infinity ? strength : force; // Naively test if the rigidBody contains a collider in one of the collision groups
-
-    let isRigidBodyInCollisionGroup = collisionGroups === undefined ? true : false;
-
-    if (collisionGroups !== undefined) {
-      for (let i = 0; i < rigidBody.numColliders(); i++) {
-        const collider = rigidBody.collider(i);
-        const colliderCollisionGroups = collider.collisionGroups();
-
-        if ((collisionGroups >> 16 & colliderCollisionGroups) != 0 && (colliderCollisionGroups >> 16 & collisionGroups) != 0) {
-          isRigidBodyInCollisionGroup = true;
-          break;
-        }
-      }
-    }
-
-    if (isRigidBodyInCollisionGroup) {
-      _vector3.set(0, 0, 0).subVectors(worldPosition, _position).normalize().multiplyScalar(force);
-
-      rigidBody.applyImpulse(_vector3, true);
-    }
-  }
-};
-const Attractor = /*#__PURE__*/React.memo(props => {
-  const {
-    position = [0, 0, 0],
-    strength = 1,
-    range = 10,
-    type = "static",
-    gravitationalConstant = 6.673e-11,
-    collisionGroups
-  } = props;
+const Debug = /*#__PURE__*/React.memo(() => {
   const {
-    attractorStates
+    world
   } = useRapier();
-  const object = React.useRef(null);
-  React.useEffect(() => {
-    var _object$current;
-
-    let uuid = ((_object$current = object.current) === null || _object$current === void 0 ? void 0 : _object$current.uuid) || "_";
-
-    if (object.current) {
-      attractorStates.set(uuid, {
-        object: object.current,
-        strength,
-        range,
-        type,
-        gravitationalConstant,
-        collisionGroups
-      });
-    }
-
-    return () => {
-      attractorStates.delete(uuid);
-    };
-  }, [props]);
-  return /*#__PURE__*/React__default["default"].createElement("object3D", {
-    ref: object,
-    position: position
+  const ref = React.useRef(null);
+  fiber.useFrame(() => {
+    const mesh = ref.current;
+    if (!mesh) return;
+    const buffers = world.debugRender();
+    mesh.geometry.setAttribute("position", new three.BufferAttribute(buffers.vertices, 3));
+    mesh.geometry.setAttribute("color", new three.BufferAttribute(buffers.colors, 4));
   });
+  return /*#__PURE__*/React__default["default"].createElement("group", null, /*#__PURE__*/React__default["default"].createElement("lineSegments", {
+    ref: ref,
+    frustumCulled: false
+  }, /*#__PURE__*/React__default["default"].createElement("lineBasicMaterial", {
+    color: 0xffffff,
+    vertexColors: true
+  }), /*#__PURE__*/React__default["default"].createElement("bufferGeometry", null)));
 });
 
-const useRaf = callback => {
-  const cb = React.useRef(callback);
-  const raf = React.useRef(0);
-  const lastFrame = React.useRef(0);
-  React.useEffect(() => {
-    cb.current = callback;
-  }, [callback]);
-  React.useEffect(() => {
-    const loop = () => {
-      const now = performance.now();
-      const delta = now - lastFrame.current;
-      raf.current = requestAnimationFrame(loop);
-      cb.current(delta / 1000);
-      lastFrame.current = now;
-    };
-
-    raf.current = requestAnimationFrame(loop);
-    return () => cancelAnimationFrame(raf.current);
-  }, []);
-};
-
-const UseFrameStepper = ({
-  onStep,
-  updatePriority
-}) => {
-  fiber.useFrame((_, dt) => {
-    onStep(dt);
-  }, updatePriority);
-  return null;
-};
-
-const RafStepper = ({
-  onStep
-}) => {
-  useRaf(dt => {
-    onStep(dt);
-  });
-  return null;
-};
-
-const FrameStepper = ({
-  onStep,
-  type,
-  updatePriority
-}) => {
-  return type === "independent" ? /*#__PURE__*/React__default["default"].createElement(RafStepper, {
-    onStep: onStep
-  }) : /*#__PURE__*/React__default["default"].createElement(UseFrameStepper, {
-    onStep: onStep,
-    updatePriority: updatePriority
-  });
-};
-
-var FrameStepper$1 = /*#__PURE__*/React.memo(FrameStepper);
-
 const rapierContext = /*#__PURE__*/React.createContext(undefined);
 
 const getCollisionPayloadFromSource = (target, other) => {
@@ -789,7 +725,8 @@ const Physics = ({
   paused: _paused = false,
   interpolate: _interpolate = true,
   updatePriority,
-  updateLoop: _updateLoop = "follow"
+  updateLoop: _updateLoop = "follow",
+  debug: _debug = false
 }) => {
   const rapier = useAsset.useAsset(importRapier);
   const {
@@ -809,7 +746,6 @@ const Physics = ({
   const rigidBodyEvents = useConst(() => new Map());
   const colliderEvents = useConst(() => new Map());
   const eventQueue = useConst(() => new rapier3dCompat.EventQueue(false));
-  const attractorStates = useConst(() => new Map());
   const beforeStepCallbacks = useConst(() => new Set());
   const afterStepCallbacks = useConst(() => new Set()); // Init world
 
@@ -878,13 +814,7 @@ const Physics = ({
     const clampedDelta = three.MathUtils.clamp(dt, 0, 0.2);
 
     const stepWorld = () => {
-      // Apply attractors
-      world.forEachRigidBody(body => {
-        attractorStates.forEach(attractorState => {
-          applyAttractorForceOnRigidBody(body, attractorState);
-        });
-      }); // Trigger beforeStep callbacks
-
+      // Trigger beforeStep callbacks
       beforeStepCallbacks.forEach(callback => {
         callback.current(api);
       });
@@ -1090,12 +1020,12 @@ const Physics = ({
     colliderStates,
     rigidBodyEvents,
     colliderEvents,
-    attractorStates,
     beforeStepCallbacks,
     afterStepCallbacks,
     isPaused: _paused,
+    isDebug: _debug,
     step
-  }), [_paused, step]);
+  }), [_paused, step, _debug, _colliders, _gravity]);
   const stepCallback = React.useCallback(delta => {
     if (!_paused) {
       step(delta);
@@ -1107,7 +1037,7 @@ const Physics = ({
     onStep: stepCallback,
     type: _updateLoop,
     updatePriority: updatePriority
-  }), children);
+  }), _debug && /*#__PURE__*/React__default["default"].createElement(Debug, null), children);
 };
 
 function _extends() {
@@ -1623,96 +1553,6 @@ const MeshCollider = /*#__PURE__*/React.memo(props => {
 });
 MeshCollider.displayName = "MeshCollider";
 
-function mapsEqual(map1, map2) {
-  var testVal;
-
-  if (map1.size !== map2.size) {
-    return false;
-  }
-
-  for (var [key, val] of map1) {
-    testVal = map2.get(key);
-
-    if (testVal !== val || testVal === undefined && !map2.has(key)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-const AttractorHelper = props => {
-  const {
-    scene
-  } = fiber.useThree();
-  const ref = React.useRef(null);
-  const normalsHelper = React.useRef();
-  const color = props.strength > 0 ? 0x0000ff : 0xff0000;
-  React.useEffect(() => {
-    if (ref.current) {
-      normalsHelper.current = new threeStdlib.VertexNormalsHelper(ref.current, props.range, color);
-      normalsHelper.current.frustumCulled = false;
-      scene.add(normalsHelper.current);
-    }
-
-    return () => {
-      if (normalsHelper.current) {
-        scene.remove(normalsHelper.current);
-      }
-    };
-  }, [props]);
-  fiber.useFrame(() => {
-    if (ref.current) {
-      var _normalsHelper$curren;
-
-      const worldPosition = props.object.getWorldPosition(_vector3);
-      ref.current.position.copy(worldPosition);
-      (_normalsHelper$curren = normalsHelper.current) === null || _normalsHelper$curren === void 0 ? void 0 : _normalsHelper$curren.update();
-    }
-  });
-  return /*#__PURE__*/React__default["default"].createElement("mesh", {
-    ref: ref,
-    position: props.object.position,
-    frustumCulled: false
-  }, /*#__PURE__*/React__default["default"].createElement("sphereGeometry", {
-    args: [0.2, 6, 6]
-  }), /*#__PURE__*/React__default["default"].createElement("meshBasicMaterial", {
-    color: color,
-    wireframe: true
-  }));
-};
-
-const Debug = /*#__PURE__*/React.memo(() => {
-  const {
-    world,
-    attractorStates
-  } = useRapier();
-  const ref = React.useRef(null);
-  const [attractors, setAttractors] = React.useState([]);
-  const currMap = React.useRef(new Map());
-  fiber.useFrame(() => {
-    const mesh = ref.current;
-    if (!mesh) return;
-    const buffers = world.debugRender();
-    mesh.geometry.setAttribute("position", new three.BufferAttribute(buffers.vertices, 3));
-    mesh.geometry.setAttribute("color", new three.BufferAttribute(buffers.colors, 4)); // Update attractors
-
-    if (!mapsEqual(currMap.current, attractorStates)) {
-      setAttractors([...attractorStates.values()]);
-      currMap.current = new Map(attractorStates);
-    }
-  });
-  return /*#__PURE__*/React__default["default"].createElement("group", null, /*#__PURE__*/React__default["default"].createElement("lineSegments", {
-    ref: ref,
-    frustumCulled: false
-  }, /*#__PURE__*/React__default["default"].createElement("lineBasicMaterial", {
-    color: 0xffffff,
-    vertexColors: true
-  }), /*#__PURE__*/React__default["default"].createElement("bufferGeometry", null)), attractors.map((attractor, i) => /*#__PURE__*/React__default["default"].createElement(AttractorHelper, _extends({
-    key: attractor.object.uuid
-  }, attractor))));
-});
-
 const _excluded = ["children", "instances", "colliderNodes", "position", "rotation", "quaternion", "scale"];
 const InstancedRigidBodies = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((props, ref) => {
   const object = React.useRef(null);
@@ -1941,14 +1781,12 @@ Object.defineProperty(exports, 'RapierRigidBody', {
   get: function () { return rapier3dCompat.RigidBody; }
 });
 exports.AnyCollider = AnyCollider;
-exports.Attractor = Attractor;
 exports.BallCollider = BallCollider;
 exports.CapsuleCollider = CapsuleCollider;
 exports.ConeCollider = ConeCollider;
 exports.ConvexHullCollider = ConvexHullCollider;
 exports.CuboidCollider = CuboidCollider;
 exports.CylinderCollider = CylinderCollider;
-exports.Debug = Debug;
 exports.HeightfieldCollider = HeightfieldCollider;
 exports.InstancedRigidBodies = InstancedRigidBodies;
 exports.MeshCollider = MeshCollider;