@react-three/rapier 0.16.0-canary.1 → 1.0.0-canary.2

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

@@ -1,9 +1,8 @@
 import type Rapier from "@dimforge/rapier3d-compat";
-import { Collider, ColliderHandle, RigidBody, RigidBodyHandle } from "@dimforge/rapier3d-compat";
+import { Collider, ColliderHandle, RigidBody, RigidBodyHandle, World } from "@dimforge/rapier3d-compat";
 import React, { FC, ReactNode } from "react";
 import { Matrix4, Object3D, Vector3 } from "three";
 import { CollisionEnterHandler, CollisionExitHandler, ContactForceHandler, IntersectionEnterHandler, IntersectionExitHandler, RigidBodyAutoCollider, Vector3Tuple } from "../types";
-import { WorldApi } from "../utils/api";
 export interface RigidBodyState {
     meshType: "instancedMesh" | "mesh";
     rigidBody: RigidBody;
@@ -18,7 +17,7 @@ export interface RigidBodyState {
     isSleeping: boolean;
 }
 export declare type RigidBodyStateMap = Map<RigidBody["handle"], RigidBodyState>;
-export declare type WorldStepCallback = (worldApi: WorldApi) => void;
+export declare type WorldStepCallback = (world: World) => void;
 export declare type WorldStepCallbackSet = Set<{
     current: WorldStepCallback;
 }>;
@@ -77,7 +76,7 @@ export interface RapierContext {
     /**
      * The Rapier physics world
      */
-    world: WorldApi;
+    world: World;
     /**
      * If the physics simulation is paused
      */

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

@@ -4,7 +4,6 @@ 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 { WorldApi } from "./utils/api";
 export { Physics } from "./components/Physics";
 export { RigidBody } from "./components/RigidBody";
 export { MeshCollider } from "./components/MeshCollider";

package/dist/declarations/src/utils/singleton-proxy.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Creates a proxy that will create a singleton instance of the given class
+ * when a property is accessed, and not before.
+ *
+ * @returns A proxy and a reset function, so that the instance can created again
+ */
+export declare const createSingletonProxy: <SingletonClass extends object, CreationFn extends () => SingletonClass = () => SingletonClass>(createInstance: CreationFn) => {
+    proxy: SingletonClass;
+    reset: () => void;
+};

package/dist/declarations/src/utils/utils-collider.d.ts

@@ -1,7 +1,6 @@
-import { Collider, RigidBody } from "@dimforge/rapier3d-compat";
+import { Collider, RigidBody, World } from "@dimforge/rapier3d-compat";
 import { BufferGeometry, Object3D, Vector3 } from "three";
 import { ColliderProps, RigidBodyProps } from "..";
-import { WorldApi } from "./api";
 import { ColliderState, ColliderStateMap, EventMap } from "../components/Physics";
 import { ColliderShape, RigidBodyAutoCollider } from "../types";
 export declare const scaleColliderArgs: (shape: ColliderShape, args: (number | ArrayLike<number> | {
@@ -13,7 +12,7 @@ export declare const scaleColliderArgs: (shape: ColliderShape, args: (number | A
     y: number;
     z: number;
 })[];
-export declare const createColliderFromOptions: (options: ColliderProps, world: WorldApi, scale: Vector3, getRigidBody?: () => RigidBody) => Collider;
+export declare const createColliderFromOptions: (options: ColliderProps, world: World, scale: Vector3, getRigidBody?: () => RigidBody) => Collider;
 declare type ImmutableColliderOptions = (keyof ColliderProps)[];
 export declare const immutableColliderOptions: ImmutableColliderOptions;
 export declare const setColliderOptions: (collider: Collider, options: ColliderProps, states: ColliderStateMap) => void;

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

@@ -72,40 +72,6 @@ function _objectSpread2(target) {
   return target;
 }
 
-const createWorldApi = getWorld => {
-  return {
-    raw: () => getWorld(),
-    getCollider: handle => getWorld().getCollider(handle),
-    getRigidBody: handle => getWorld().getRigidBody(handle),
-    createRigidBody: desc => getWorld().createRigidBody(desc),
-    createCollider: (desc, rigidBody) => getWorld().createCollider(desc, rigidBody),
-    removeRigidBody: rigidBody => {
-      if (!getWorld().bodies.contains(rigidBody.handle)) return;
-      getWorld().removeRigidBody(rigidBody);
-    },
-    removeCollider: (collider, wakeUp = true) => {
-      if (!getWorld().colliders.contains(collider.handle)) return;
-      getWorld().removeCollider(collider, wakeUp);
-    },
-    createImpulseJoint: (params, rigidBodyA, rigidBodyB, wakeUp = true) => getWorld().createImpulseJoint(params, rigidBodyA, rigidBodyB, wakeUp),
-    removeImpulseJoint: (joint, wakeUp = true) => {
-      if (!getWorld().impulseJoints.contains(joint.handle)) return;
-      getWorld().removeImpulseJoint(joint, wakeUp);
-    },
-    forEachCollider: callback => getWorld().forEachCollider(callback),
-    setGravity: ({
-      x,
-      y,
-      z
-    }) => getWorld().gravity = {
-      x,
-      y,
-      z
-    },
-    debugRender: () => getWorld().debugRender()
-  };
-};
-
 const _quaternion = new three.Quaternion();
 new three.Euler();
 const _vector3 = new three.Vector3();
@@ -684,30 +650,37 @@ const Debug = /*#__PURE__*/React.memo(() => {
 });
 
 /**
- * Initiate an instance and return a safe getter
+ * Creates a proxy that will create a singleton instance of the given class
+ * when a property is accessed, and not before.
+ *
+ * @returns A proxy and a reset function, so that the instance can created again
  */
+const createSingletonProxy = createInstance => {
+  let instance;
+  const handler = {
+    get(target, prop) {
+      if (!instance) {
+        instance = createInstance();
+      }
 
-const useImperativeInstance = (createFn, destroyFn, dependencyList) => {
-  const ref = React.useRef();
-  const getInstance = React.useCallback(() => {
-    if (!ref.current) {
-      ref.current = createFn();
+      return Reflect.get(instance, prop);
     }
 
-    return ref.current;
-  }, dependencyList);
-  React.useEffect(() => {
-    // Save the destroy function and instance
-    const instance = getInstance();
+  };
+  const proxy = new Proxy({}, handler);
 
-    const destroy = () => destroyFn(instance);
+  const reset = () => {
+    instance = undefined;
+  };
+  /**
+   * Return the proxy and a reset function
+   */
 
-    return () => {
-      destroy();
-      ref.current = undefined;
-    };
-  }, [getInstance]);
-  return getInstance;
+
+  return {
+    proxy,
+    reset
+  };
 };
 
 const rapierContext = /*#__PURE__*/React.createContext(undefined);
@@ -759,38 +732,42 @@ const Physics = ({
   const rapier = useAsset.useAsset(importRapier);
   const {
     invalidate
-  } = fiber.useThree(); // Init World
-
-  const getWorld = useImperativeInstance(() => {
-    return new rapier.World(vectorArrayToVector3(_gravity));
-  }, world => {
-    world.free();
-  }, []);
+  } = fiber.useThree();
   const rigidBodyStates = useConst(() => new Map());
   const colliderStates = useConst(() => new Map());
   const rigidBodyEvents = useConst(() => new Map());
   const colliderEvents = useConst(() => new Map());
   const eventQueue = useConst(() => new rapier3dCompat.EventQueue(false));
   const beforeStepCallbacks = useConst(() => new Set());
-  const afterStepCallbacks = useConst(() => new Set()); // Update gravity
+  const afterStepCallbacks = useConst(() => new Set());
+  /**
+   * Initiate the world
+   * This creates a singleton proxy, so that the world is only created when
+   * something within it is accessed.
+   */
 
+  const {
+    proxy: worldProxy,
+    reset: resetWorldProxy
+  } = useConst(() => createSingletonProxy(() => new rapier.World(vectorArrayToVector3(_gravity))));
   React.useEffect(() => {
-    const world = getWorld();
+    return () => {
+      worldProxy.free();
+      resetWorldProxy();
+    };
+  }, []); // Update gravity
 
-    if (world) {
-      world.gravity = vectorArrayToVector3(_gravity);
-    }
+  React.useEffect(() => {
+    worldProxy.gravity = vectorArrayToVector3(_gravity);
   }, [_gravity]);
-  const api = React.useMemo(() => createWorldApi(getWorld), []);
   const getSourceFromColliderHandle = React.useCallback(handle => {
     var _collider$parent;
 
-    const world = getWorld();
-    const collider = world.getCollider(handle);
+    const collider = worldProxy.getCollider(handle);
     const colEvents = colliderEvents.get(handle);
     const colliderState = colliderStates.get(handle);
     const rigidBodyHandle = collider === null || collider === void 0 ? void 0 : (_collider$parent = collider.parent()) === null || _collider$parent === void 0 ? void 0 : _collider$parent.handle;
-    const rigidBody = rigidBodyHandle !== undefined ? world.getRigidBody(rigidBodyHandle) : undefined;
+    const rigidBody = rigidBodyHandle !== undefined ? worldProxy.getRigidBody(rigidBodyHandle) : undefined;
     const rbEvents = rigidBody && rigidBodyHandle !== undefined ? rigidBodyEvents.get(rigidBodyHandle) : undefined;
     const rigidBodyState = rigidBodyHandle !== undefined ? rigidBodyStates.get(rigidBodyHandle) : undefined;
     const source = {
@@ -812,7 +789,7 @@ const Physics = ({
     accumulator: 0
   });
   const step = React.useCallback(dt => {
-    const world = getWorld();
+    const world = worldProxy;
     /* Check if the timestep is supposed to be variable. We'll do this here
       once so we don't have to string-check every frame. */
 
@@ -827,12 +804,12 @@ const Physics = ({
     const stepWorld = () => {
       // Trigger beforeStep callbacks
       beforeStepCallbacks.forEach(callback => {
-        callback.current(api);
+        callback.current(worldProxy);
       });
       world.step(eventQueue); // Trigger afterStep callbacks
 
       afterStepCallbacks.forEach(callback => {
-        callback.current(api);
+        callback.current(worldProxy);
       });
     };
 
@@ -1022,7 +999,7 @@ const Physics = ({
   }, [_paused, _timeStep, _interpolate]);
   const context = React.useMemo(() => ({
     rapier,
-    world: api,
+    world: worldProxy,
     physicsOptions: {
       colliders: _colliders,
       gravity: _gravity
@@ -1068,6 +1045,33 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
+/**
+ * Initiate an instance and return a safe getter
+ */
+
+const useImperativeInstance = (createFn, destroyFn, dependencyList) => {
+  const ref = React.useRef();
+  const getInstance = React.useCallback(() => {
+    if (!ref.current) {
+      ref.current = createFn();
+    }
+
+    return ref.current;
+  }, dependencyList);
+  React.useEffect(() => {
+    // Save the destroy function and instance
+    const instance = getInstance();
+
+    const destroy = () => destroyFn(instance);
+
+    return () => {
+      destroy();
+      ref.current = undefined;
+    };
+  }, [getInstance]);
+  return getInstance;
+};
+
 /**
  * Takes an object resembling a Vector3 and returs a Three.Vector3
  * @category Math helpers
@@ -1167,7 +1171,7 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((prop
     colliderRef.current = collider;
     return collider;
   }, collider => {
-    world.removeCollider(collider);
+    world.removeCollider(collider, true);
   }, [...immutablePropArray, rigidBodyContext]);
   React.useEffect(() => {
     const collider = getInstance();
@@ -1669,7 +1673,7 @@ const useImpulseJoint = (body1, body2, params) => {
   const jointRef = React.useRef();
   useImperativeInstance(() => {
     if (body1.current && body2.current) {
-      const newJoint = world.createImpulseJoint(params, body1.current, body2.current);
+      const newJoint = world.createImpulseJoint(params, body1.current, body2.current, true);
       jointRef.current = newJoint; // console.log(body1.current, body2.current, newJoint);
 
       return newJoint;
@@ -1677,7 +1681,7 @@ const useImpulseJoint = (body1, body2, params) => {
   }, joint => {
     if (joint) {
       jointRef.current = undefined;
-      world.removeImpulseJoint(joint);
+      world.removeImpulseJoint(joint, true);
     }
   }, []);
   return jointRef;

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

@@ -72,40 +72,6 @@ function _objectSpread2(target) {
   return target;
 }
 
-const createWorldApi = getWorld => {
-  return {
-    raw: () => getWorld(),
-    getCollider: handle => getWorld().getCollider(handle),
-    getRigidBody: handle => getWorld().getRigidBody(handle),
-    createRigidBody: desc => getWorld().createRigidBody(desc),
-    createCollider: (desc, rigidBody) => getWorld().createCollider(desc, rigidBody),
-    removeRigidBody: rigidBody => {
-      if (!getWorld().bodies.contains(rigidBody.handle)) return;
-      getWorld().removeRigidBody(rigidBody);
-    },
-    removeCollider: (collider, wakeUp = true) => {
-      if (!getWorld().colliders.contains(collider.handle)) return;
-      getWorld().removeCollider(collider, wakeUp);
-    },
-    createImpulseJoint: (params, rigidBodyA, rigidBodyB, wakeUp = true) => getWorld().createImpulseJoint(params, rigidBodyA, rigidBodyB, wakeUp),
-    removeImpulseJoint: (joint, wakeUp = true) => {
-      if (!getWorld().impulseJoints.contains(joint.handle)) return;
-      getWorld().removeImpulseJoint(joint, wakeUp);
-    },
-    forEachCollider: callback => getWorld().forEachCollider(callback),
-    setGravity: ({
-      x,
-      y,
-      z
-    }) => getWorld().gravity = {
-      x,
-      y,
-      z
-    },
-    debugRender: () => getWorld().debugRender()
-  };
-};
-
 const _quaternion = new three.Quaternion();
 new three.Euler();
 const _vector3 = new three.Vector3();
@@ -684,30 +650,37 @@ const Debug = /*#__PURE__*/React.memo(() => {
 });
 
 /**
- * Initiate an instance and return a safe getter
+ * Creates a proxy that will create a singleton instance of the given class
+ * when a property is accessed, and not before.
+ *
+ * @returns A proxy and a reset function, so that the instance can created again
  */
+const createSingletonProxy = createInstance => {
+  let instance;
+  const handler = {
+    get(target, prop) {
+      if (!instance) {
+        instance = createInstance();
+      }
 
-const useImperativeInstance = (createFn, destroyFn, dependencyList) => {
-  const ref = React.useRef();
-  const getInstance = React.useCallback(() => {
-    if (!ref.current) {
-      ref.current = createFn();
+      return Reflect.get(instance, prop);
     }
 
-    return ref.current;
-  }, dependencyList);
-  React.useEffect(() => {
-    // Save the destroy function and instance
-    const instance = getInstance();
+  };
+  const proxy = new Proxy({}, handler);
 
-    const destroy = () => destroyFn(instance);
+  const reset = () => {
+    instance = undefined;
+  };
+  /**
+   * Return the proxy and a reset function
+   */
 
-    return () => {
-      destroy();
-      ref.current = undefined;
-    };
-  }, [getInstance]);
-  return getInstance;
+
+  return {
+    proxy,
+    reset
+  };
 };
 
 const rapierContext = /*#__PURE__*/React.createContext(undefined);
@@ -759,38 +732,42 @@ const Physics = ({
   const rapier = useAsset.useAsset(importRapier);
   const {
     invalidate
-  } = fiber.useThree(); // Init World
-
-  const getWorld = useImperativeInstance(() => {
-    return new rapier.World(vectorArrayToVector3(_gravity));
-  }, world => {
-    world.free();
-  }, []);
+  } = fiber.useThree();
   const rigidBodyStates = useConst(() => new Map());
   const colliderStates = useConst(() => new Map());
   const rigidBodyEvents = useConst(() => new Map());
   const colliderEvents = useConst(() => new Map());
   const eventQueue = useConst(() => new rapier3dCompat.EventQueue(false));
   const beforeStepCallbacks = useConst(() => new Set());
-  const afterStepCallbacks = useConst(() => new Set()); // Update gravity
+  const afterStepCallbacks = useConst(() => new Set());
+  /**
+   * Initiate the world
+   * This creates a singleton proxy, so that the world is only created when
+   * something within it is accessed.
+   */
 
+  const {
+    proxy: worldProxy,
+    reset: resetWorldProxy
+  } = useConst(() => createSingletonProxy(() => new rapier.World(vectorArrayToVector3(_gravity))));
   React.useEffect(() => {
-    const world = getWorld();
+    return () => {
+      worldProxy.free();
+      resetWorldProxy();
+    };
+  }, []); // Update gravity
 
-    if (world) {
-      world.gravity = vectorArrayToVector3(_gravity);
-    }
+  React.useEffect(() => {
+    worldProxy.gravity = vectorArrayToVector3(_gravity);
   }, [_gravity]);
-  const api = React.useMemo(() => createWorldApi(getWorld), []);
   const getSourceFromColliderHandle = React.useCallback(handle => {
     var _collider$parent;
 
-    const world = getWorld();
-    const collider = world.getCollider(handle);
+    const collider = worldProxy.getCollider(handle);
     const colEvents = colliderEvents.get(handle);
     const colliderState = colliderStates.get(handle);
     const rigidBodyHandle = collider === null || collider === void 0 ? void 0 : (_collider$parent = collider.parent()) === null || _collider$parent === void 0 ? void 0 : _collider$parent.handle;
-    const rigidBody = rigidBodyHandle !== undefined ? world.getRigidBody(rigidBodyHandle) : undefined;
+    const rigidBody = rigidBodyHandle !== undefined ? worldProxy.getRigidBody(rigidBodyHandle) : undefined;
     const rbEvents = rigidBody && rigidBodyHandle !== undefined ? rigidBodyEvents.get(rigidBodyHandle) : undefined;
     const rigidBodyState = rigidBodyHandle !== undefined ? rigidBodyStates.get(rigidBodyHandle) : undefined;
     const source = {
@@ -812,7 +789,7 @@ const Physics = ({
     accumulator: 0
   });
   const step = React.useCallback(dt => {
-    const world = getWorld();
+    const world = worldProxy;
     /* Check if the timestep is supposed to be variable. We'll do this here
       once so we don't have to string-check every frame. */
 
@@ -827,12 +804,12 @@ const Physics = ({
     const stepWorld = () => {
       // Trigger beforeStep callbacks
       beforeStepCallbacks.forEach(callback => {
-        callback.current(api);
+        callback.current(worldProxy);
       });
       world.step(eventQueue); // Trigger afterStep callbacks
 
       afterStepCallbacks.forEach(callback => {
-        callback.current(api);
+        callback.current(worldProxy);
       });
     };
 
@@ -1022,7 +999,7 @@ const Physics = ({
   }, [_paused, _timeStep, _interpolate]);
   const context = React.useMemo(() => ({
     rapier,
-    world: api,
+    world: worldProxy,
     physicsOptions: {
       colliders: _colliders,
       gravity: _gravity
@@ -1068,6 +1045,33 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
+/**
+ * Initiate an instance and return a safe getter
+ */
+
+const useImperativeInstance = (createFn, destroyFn, dependencyList) => {
+  const ref = React.useRef();
+  const getInstance = React.useCallback(() => {
+    if (!ref.current) {
+      ref.current = createFn();
+    }
+
+    return ref.current;
+  }, dependencyList);
+  React.useEffect(() => {
+    // Save the destroy function and instance
+    const instance = getInstance();
+
+    const destroy = () => destroyFn(instance);
+
+    return () => {
+      destroy();
+      ref.current = undefined;
+    };
+  }, [getInstance]);
+  return getInstance;
+};
+
 /**
  * Takes an object resembling a Vector3 and returs a Three.Vector3
  * @category Math helpers
@@ -1167,7 +1171,7 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((prop
     colliderRef.current = collider;
     return collider;
   }, collider => {
-    world.removeCollider(collider);
+    world.removeCollider(collider, true);
   }, [...immutablePropArray, rigidBodyContext]);
   React.useEffect(() => {
     const collider = getInstance();
@@ -1669,7 +1673,7 @@ const useImpulseJoint = (body1, body2, params) => {
   const jointRef = React.useRef();
   useImperativeInstance(() => {
     if (body1.current && body2.current) {
-      const newJoint = world.createImpulseJoint(params, body1.current, body2.current);
+      const newJoint = world.createImpulseJoint(params, body1.current, body2.current, true);
       jointRef.current = newJoint; // console.log(body1.current, body2.current, newJoint);
 
       return newJoint;
@@ -1677,7 +1681,7 @@ const useImpulseJoint = (body1, body2, params) => {
   }, joint => {
     if (joint) {
       jointRef.current = undefined;
-      world.removeImpulseJoint(joint);
+      world.removeImpulseJoint(joint, true);
     }
   }, []);
   return jointRef;

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

@@ -1,7 +1,7 @@
 import { ActiveEvents, ColliderDesc, EventQueue, RigidBodyDesc } from '@dimforge/rapier3d-compat';
 export { CoefficientCombineRule, Collider as RapierCollider, RigidBody as RapierRigidBody } from '@dimforge/rapier3d-compat';
 import { useFrame, useThree } from '@react-three/fiber';
-import React, { useRef, useEffect, memo, useMemo, useContext, useState, useCallback, createContext, forwardRef, Fragment } from 'react';
+import React, { useRef, useEffect, memo, useMemo, useContext, useState, createContext, useCallback, forwardRef, Fragment } from 'react';
 import { Quaternion, Euler, Vector3, Object3D, Matrix4, BufferAttribute, MathUtils, DynamicDrawUsage } from 'three';
 import { useAsset } from 'use-asset';
 import { mergeVertices } from 'three-stdlib';
@@ -47,40 +47,6 @@ function _objectSpread2(target) {
   return target;
 }
 
-const createWorldApi = getWorld => {
-  return {
-    raw: () => getWorld(),
-    getCollider: handle => getWorld().getCollider(handle),
-    getRigidBody: handle => getWorld().getRigidBody(handle),
-    createRigidBody: desc => getWorld().createRigidBody(desc),
-    createCollider: (desc, rigidBody) => getWorld().createCollider(desc, rigidBody),
-    removeRigidBody: rigidBody => {
-      if (!getWorld().bodies.contains(rigidBody.handle)) return;
-      getWorld().removeRigidBody(rigidBody);
-    },
-    removeCollider: (collider, wakeUp = true) => {
-      if (!getWorld().colliders.contains(collider.handle)) return;
-      getWorld().removeCollider(collider, wakeUp);
-    },
-    createImpulseJoint: (params, rigidBodyA, rigidBodyB, wakeUp = true) => getWorld().createImpulseJoint(params, rigidBodyA, rigidBodyB, wakeUp),
-    removeImpulseJoint: (joint, wakeUp = true) => {
-      if (!getWorld().impulseJoints.contains(joint.handle)) return;
-      getWorld().removeImpulseJoint(joint, wakeUp);
-    },
-    forEachCollider: callback => getWorld().forEachCollider(callback),
-    setGravity: ({
-      x,
-      y,
-      z
-    }) => getWorld().gravity = {
-      x,
-      y,
-      z
-    },
-    debugRender: () => getWorld().debugRender()
-  };
-};
-
 const _quaternion = new Quaternion();
 new Euler();
 const _vector3 = new Vector3();
@@ -659,30 +625,37 @@ const Debug = /*#__PURE__*/memo(() => {
 });
 
 /**
- * Initiate an instance and return a safe getter
+ * Creates a proxy that will create a singleton instance of the given class
+ * when a property is accessed, and not before.
+ *
+ * @returns A proxy and a reset function, so that the instance can created again
  */
+const createSingletonProxy = createInstance => {
+  let instance;
+  const handler = {
+    get(target, prop) {
+      if (!instance) {
+        instance = createInstance();
+      }
 
-const useImperativeInstance = (createFn, destroyFn, dependencyList) => {
-  const ref = useRef();
-  const getInstance = useCallback(() => {
-    if (!ref.current) {
-      ref.current = createFn();
+      return Reflect.get(instance, prop);
     }
 
-    return ref.current;
-  }, dependencyList);
-  useEffect(() => {
-    // Save the destroy function and instance
-    const instance = getInstance();
+  };
+  const proxy = new Proxy({}, handler);
 
-    const destroy = () => destroyFn(instance);
+  const reset = () => {
+    instance = undefined;
+  };
+  /**
+   * Return the proxy and a reset function
+   */
 
-    return () => {
-      destroy();
-      ref.current = undefined;
-    };
-  }, [getInstance]);
-  return getInstance;
+
+  return {
+    proxy,
+    reset
+  };
 };
 
 const rapierContext = /*#__PURE__*/createContext(undefined);
@@ -734,38 +707,42 @@ const Physics = ({
   const rapier = useAsset(importRapier);
   const {
     invalidate
-  } = useThree(); // Init World
-
-  const getWorld = useImperativeInstance(() => {
-    return new rapier.World(vectorArrayToVector3(_gravity));
-  }, world => {
-    world.free();
-  }, []);
+  } = useThree();
   const rigidBodyStates = useConst(() => new Map());
   const colliderStates = useConst(() => new Map());
   const rigidBodyEvents = useConst(() => new Map());
   const colliderEvents = useConst(() => new Map());
   const eventQueue = useConst(() => new EventQueue(false));
   const beforeStepCallbacks = useConst(() => new Set());
-  const afterStepCallbacks = useConst(() => new Set()); // Update gravity
+  const afterStepCallbacks = useConst(() => new Set());
+  /**
+   * Initiate the world
+   * This creates a singleton proxy, so that the world is only created when
+   * something within it is accessed.
+   */
 
+  const {
+    proxy: worldProxy,
+    reset: resetWorldProxy
+  } = useConst(() => createSingletonProxy(() => new rapier.World(vectorArrayToVector3(_gravity))));
   useEffect(() => {
-    const world = getWorld();
+    return () => {
+      worldProxy.free();
+      resetWorldProxy();
+    };
+  }, []); // Update gravity
 
-    if (world) {
-      world.gravity = vectorArrayToVector3(_gravity);
-    }
+  useEffect(() => {
+    worldProxy.gravity = vectorArrayToVector3(_gravity);
   }, [_gravity]);
-  const api = useMemo(() => createWorldApi(getWorld), []);
   const getSourceFromColliderHandle = useCallback(handle => {
     var _collider$parent;
 
-    const world = getWorld();
-    const collider = world.getCollider(handle);
+    const collider = worldProxy.getCollider(handle);
     const colEvents = colliderEvents.get(handle);
     const colliderState = colliderStates.get(handle);
     const rigidBodyHandle = collider === null || collider === void 0 ? void 0 : (_collider$parent = collider.parent()) === null || _collider$parent === void 0 ? void 0 : _collider$parent.handle;
-    const rigidBody = rigidBodyHandle !== undefined ? world.getRigidBody(rigidBodyHandle) : undefined;
+    const rigidBody = rigidBodyHandle !== undefined ? worldProxy.getRigidBody(rigidBodyHandle) : undefined;
     const rbEvents = rigidBody && rigidBodyHandle !== undefined ? rigidBodyEvents.get(rigidBodyHandle) : undefined;
     const rigidBodyState = rigidBodyHandle !== undefined ? rigidBodyStates.get(rigidBodyHandle) : undefined;
     const source = {
@@ -787,7 +764,7 @@ const Physics = ({
     accumulator: 0
   });
   const step = useCallback(dt => {
-    const world = getWorld();
+    const world = worldProxy;
     /* Check if the timestep is supposed to be variable. We'll do this here
       once so we don't have to string-check every frame. */
 
@@ -802,12 +779,12 @@ const Physics = ({
     const stepWorld = () => {
       // Trigger beforeStep callbacks
       beforeStepCallbacks.forEach(callback => {
-        callback.current(api);
+        callback.current(worldProxy);
       });
       world.step(eventQueue); // Trigger afterStep callbacks
 
       afterStepCallbacks.forEach(callback => {
-        callback.current(api);
+        callback.current(worldProxy);
       });
     };
 
@@ -997,7 +974,7 @@ const Physics = ({
   }, [_paused, _timeStep, _interpolate]);
   const context = useMemo(() => ({
     rapier,
-    world: api,
+    world: worldProxy,
     physicsOptions: {
       colliders: _colliders,
       gravity: _gravity
@@ -1043,6 +1020,33 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
+/**
+ * Initiate an instance and return a safe getter
+ */
+
+const useImperativeInstance = (createFn, destroyFn, dependencyList) => {
+  const ref = useRef();
+  const getInstance = useCallback(() => {
+    if (!ref.current) {
+      ref.current = createFn();
+    }
+
+    return ref.current;
+  }, dependencyList);
+  useEffect(() => {
+    // Save the destroy function and instance
+    const instance = getInstance();
+
+    const destroy = () => destroyFn(instance);
+
+    return () => {
+      destroy();
+      ref.current = undefined;
+    };
+  }, [getInstance]);
+  return getInstance;
+};
+
 /**
  * Takes an object resembling a Vector3 and returs a Three.Vector3
  * @category Math helpers
@@ -1142,7 +1146,7 @@ const AnyCollider = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((props, forwarded
     colliderRef.current = collider;
     return collider;
   }, collider => {
-    world.removeCollider(collider);
+    world.removeCollider(collider, true);
   }, [...immutablePropArray, rigidBodyContext]);
   useEffect(() => {
     const collider = getInstance();
@@ -1644,7 +1648,7 @@ const useImpulseJoint = (body1, body2, params) => {
   const jointRef = useRef();
   useImperativeInstance(() => {
     if (body1.current && body2.current) {
-      const newJoint = world.createImpulseJoint(params, body1.current, body2.current);
+      const newJoint = world.createImpulseJoint(params, body1.current, body2.current, true);
       jointRef.current = newJoint; // console.log(body1.current, body2.current, newJoint);
 
       return newJoint;
@@ -1652,7 +1656,7 @@ const useImpulseJoint = (body1, body2, params) => {
   }, joint => {
     if (joint) {
       jointRef.current = undefined;
-      world.removeImpulseJoint(joint);
+      world.removeImpulseJoint(joint, true);
     }
   }, []);
   return jointRef;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/rapier",
-  "version": "0.16.0-canary.1",
+  "version": "1.0.0-canary.2",
   "source": "src/index.ts",
   "main": "dist/react-three-rapier.cjs.js",
   "module": "dist/react-three-rapier.esm.js",
@@ -8,9 +8,7 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "ts": "tsc -w"
-  },
+  "scripts": {},
   "devDependencies": {
     "@react-three/drei": "9.45.0",
     "@react-three/fiber": "8.9.1",

package/dist/declarations/src/utils/api.d.ts

@@ -1,17 +0,0 @@
-import { Collider, ColliderDesc, DebugRenderBuffers, ImpulseJoint, JointData, RigidBody, RigidBodyDesc, World } from "@dimforge/rapier3d-compat";
-import { Vector3 } from "three";
-export interface WorldApi {
-    raw(): World;
-    getCollider(handle: number): Collider | undefined;
-    getRigidBody(handle: number): RigidBody | undefined;
-    createRigidBody(desc: RigidBodyDesc): RigidBody;
-    createCollider(desc: ColliderDesc, parent?: RigidBody): Collider;
-    removeRigidBody(rigidBody: RigidBody): void;
-    removeCollider(collider: Collider, wakeUp?: boolean): void;
-    createImpulseJoint(params: JointData, rigidBodyA: RigidBody, rigidBodyB: RigidBody, wakeUp?: boolean): ImpulseJoint;
-    removeImpulseJoint(joint: ImpulseJoint, wakeUp?: boolean): void;
-    forEachCollider(callback: (collider: Collider) => void): void;
-    setGravity(gravity: Vector3): void;
-    debugRender(): DebugRenderBuffers;
-}
-export declare const createWorldApi: (getWorld: () => World) => WorldApi;