@react-three/rapier 0.7.7 → 0.8.0

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

@@ -1,13 +1,5 @@
 import { FC } from "react";
 interface DebugProps {
-    /**
-     * The color of the wireframe representing an active collider that is affected by forces and not sleeping.
-     */
-    color?: string;
-    /**
-     * The color of the wireframe representing a static (fixed or kinematic) or sleeping collider.
-     */
-    sleepColor?: string;
 }
 export declare const Debug: FC<DebugProps>;
 export {};

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

@@ -1,4 +1,4 @@
-import { Collider, ColliderDesc, ImpulseJoint, JointData, RigidBody, RigidBodyDesc, World } from "@dimforge/rapier3d-compat";
+import { Collider, ColliderDesc, DebugRenderBuffers, ImpulseJoint, JointData, RigidBody, RigidBodyDesc, World } from "@dimforge/rapier3d-compat";
 import { Quaternion, Vector3 } from "three";
 import { RefGetter } from "./types";
 declare type Vector3Object = {
@@ -160,6 +160,7 @@ export interface WorldApi {
     removeImpulseJoint(joint: ImpulseJoint, wakeUp?: boolean): void;
     forEachCollider(callback: (collider: Collider) => void): void;
     setGravity(gravity: Vector3): void;
+    debugRender(): DebugRenderBuffers;
 }
 export declare const createWorldApi: (ref: RefGetter<World>) => WorldApi;
 export declare const createJointApi: (ref: RefGetter<ImpulseJoint>) => {

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

@@ -287,6 +287,10 @@ export interface UseRigidBodyOptions extends ColliderProps {
      * Passed down to the object3d representing this collider.
      */
     userData?: Object3DProps["userData"];
+    /**
+     * Include invisible objects on the collider creation estimation.
+     */
+    includeInvisible?: boolean;
 }
 export declare type SphericalJointParams = [
     body1Anchor: Vector3Array,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var rapier3dCompat = require('@dimforge/rapier3d-compat');
-var React = require('react');
+var React$1 = require('react');
 var useAsset = require('use-asset');
 var fiber = require('@react-three/fiber');
 var three = require('three');
@@ -29,7 +29,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var React__default = /*#__PURE__*/_interopDefault(React);
+var React__default = /*#__PURE__*/_interopDefault(React$1);
 
 const _quaternion = new three.Quaternion();
 new three.Euler();
@@ -220,7 +220,8 @@ const createWorldApi = ref => {
       x,
       y,
       z
-    }
+    },
+    debugRender: () => ref.current().debugRender()
   };
 }; // TODO: Broken currently, waiting for Rapier3D to fix
 
@@ -237,7 +238,7 @@ const createJointApi = ref => {
   };
 };
 
-const RapierContext = /*#__PURE__*/React.createContext(undefined);
+const RapierContext = /*#__PURE__*/React$1.createContext(undefined);
 
 const importRapier = async () => {
   let r = await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('@dimforge/rapier3d-compat')); });
@@ -254,8 +255,8 @@ const Physics = ({
   updatePriority
 }) => {
   const rapier = useAsset.useAsset(importRapier);
-  const worldRef = React.useRef();
-  const getWorldRef = React.useRef(() => {
+  const worldRef = React$1.useRef();
+  const getWorldRef = React$1.useRef(() => {
     if (!worldRef.current) {
       const world = new rapier.World(vectorArrayToVector3(_gravity));
       worldRef.current = world;
@@ -263,13 +264,13 @@ const Physics = ({
 
     return worldRef.current;
   });
-  const [rigidBodyStates] = React.useState(() => new Map());
-  const [colliderStates] = React.useState(() => new Map());
-  const [rigidBodyEvents] = React.useState(() => new Map());
-  const [colliderEvents] = React.useState(() => new Map());
-  const [eventQueue] = React.useState(() => new rapier3dCompat.EventQueue(false)); // Init world
+  const [rigidBodyStates] = React$1.useState(() => new Map());
+  const [colliderStates] = React$1.useState(() => new Map());
+  const [rigidBodyEvents] = React$1.useState(() => new Map());
+  const [colliderEvents] = React$1.useState(() => new Map());
+  const [eventQueue] = React$1.useState(() => new rapier3dCompat.EventQueue(false)); // Init world
 
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     const world = getWorldRef.current();
     return () => {
       if (world) {
@@ -279,14 +280,14 @@ const Physics = ({
     };
   }, []); // Update gravity
 
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     const world = worldRef.current;
 
     if (world) {
       world.gravity = vectorArrayToVector3(_gravity);
     }
   }, [_gravity]);
-  const [steppingState] = React.useState({
+  const [steppingState] = React$1.useState({
     accumulator: 0
   });
   /* Check if the timestep is supposed to be variable. We'll do this here
@@ -496,8 +497,8 @@ const Physics = ({
       }
     });
   }, updatePriority);
-  const api = React.useMemo(() => createWorldApi(getWorldRef), []);
-  const context = React.useMemo(() => ({
+  const api = React$1.useMemo(() => createWorldApi(getWorldRef), []);
+  const context = React$1.useMemo(() => ({
     rapier,
     world: api,
     physicsOptions: {
@@ -698,10 +699,10 @@ const setRigidBodyOptions = (rigidBody, options, states, updateTranslations = tr
 };
 const useUpdateRigidBodyOptions = (rigidBodyRef, props, states, updateTranslations = true) => {
   // TODO: Improve this, split each prop into its own effect
-  const mutablePropsAsFlatArray = React.useMemo(() => mutableRigidBodyOptionKeys.flatMap(key => {
+  const mutablePropsAsFlatArray = React$1.useMemo(() => mutableRigidBodyOptionKeys.flatMap(key => {
     return vectorToTuple(props[key]);
   }), [props]);
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     if (Array.isArray(rigidBodyRef.current)) {
       for (const rigidBody of rigidBodyRef.current) {
         setRigidBodyOptions(rigidBody, props, states, updateTranslations);
@@ -728,7 +729,7 @@ const useRigidBodyEvents = (rigidBodyRef, props, events) => {
     onIntersectionEnter,
     onIntersectionExit
   };
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     if (Array.isArray(rigidBodyRef.current)) {
       for (const rigidBody of rigidBodyRef.current) {
         events.set(rigidBody.handle, eventHandlers);
@@ -871,10 +872,10 @@ const setColliderOptions = (collider, options, states) => {
 };
 const useUpdateColliderOptions = (collidersRef, props, states) => {
   // TODO: Improve this, split each prop into its own effect
-  const mutablePropsAsFlatArray = React.useMemo(() => mutableColliderOptionKeys.flatMap(key => {
+  const mutablePropsAsFlatArray = React$1.useMemo(() => mutableColliderOptionKeys.flatMap(key => {
     return vectorToTuple(props[key]);
   }), [props]);
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     collidersRef.current.forEach(collider => {
       setColliderOptions(collider, props, states);
     });
@@ -910,7 +911,8 @@ const createColliderPropsFromChildren = ({
   const colliderProps = [];
   object.updateWorldMatrix(true, false);
   const invertedParentMatrixWorld = object.matrixWorld.clone().invert();
-  object.traverseVisible(child => {
+
+  const colliderFromChild = child => {
     if ("isMesh" in child) {
       if (_ignoreMeshColliders && isChildOfMeshCollider(child)) return;
       const worldScale = child.getWorldScale(_scale);
@@ -935,7 +937,14 @@ const createColliderPropsFromChildren = ({
         scale: [worldScale.x, worldScale.y, worldScale.z]
       }));
     }
-  });
+  };
+
+  if (options.includeInvisible) {
+    object.traverse(colliderFromChild);
+  } else {
+    object.traverseVisible(colliderFromChild);
+  }
+
   return colliderProps;
 };
 const getColliderArgsFromGeometry = (geometry, colliders) => {
@@ -999,7 +1008,7 @@ const useColliderEvents = (collidersRef, props, events) => {
     onIntersectionEnter,
     onIntersectionExit
   } = props;
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     var _collidersRef$current;
 
     (_collidersRef$current = collidersRef.current) === null || _collidersRef$current === void 0 ? void 0 : _collidersRef$current.forEach(collider => {
@@ -1023,11 +1032,11 @@ const useColliderEvents = (collidersRef, props, events) => {
 };
 
 const useRapier = () => {
-  return React.useContext(RapierContext);
+  return React$1.useContext(RapierContext);
 };
 const useChildColliderProps = (ref, options, ignoreMeshColliders = true) => {
-  const [colliderProps, setColliderProps] = React.useState([]);
-  React.useEffect(() => {
+  const [colliderProps, setColliderProps] = React$1.useState([]);
+  React$1.useEffect(() => {
     const object = ref.current;
 
     if (object && options.colliders !== false) {
@@ -1047,16 +1056,16 @@ const useRigidBody = (options = {}) => {
     physicsOptions,
     rigidBodyEvents
   } = useRapier();
-  const ref = React.useRef();
-  const mergedOptions = React.useMemo(() => {
+  const ref = React$1.useRef();
+  const mergedOptions = React$1.useMemo(() => {
     return _objectSpread2(_objectSpread2(_objectSpread2({}, physicsOptions), options), {}, {
       children: undefined
     });
   }, [physicsOptions, options]);
   const childColliderProps = useChildColliderProps(ref, mergedOptions); // Create rigidbody
 
-  const rigidBodyRef = React.useRef();
-  const getRigidBodyRef = React.useRef(() => {
+  const rigidBodyRef = React$1.useRef();
+  const getRigidBodyRef = React$1.useRef(() => {
     if (!rigidBodyRef.current) {
       const desc = rigidBodyDescFromOptions(options);
       const rigidBody = world.createRigidBody(desc);
@@ -1066,7 +1075,7 @@ const useRigidBody = (options = {}) => {
     return rigidBodyRef.current;
   }); // Setup
 
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     const rigidBody = getRigidBodyRef.current();
     rigidBodyRef.current = rigidBody;
 
@@ -1088,7 +1097,7 @@ const useRigidBody = (options = {}) => {
   }, []);
   useUpdateRigidBodyOptions(rigidBodyRef, mergedOptions, rigidBodyStates);
   useRigidBodyEvents(rigidBodyRef, mergedOptions, rigidBodyEvents);
-  const api = React.useMemo(() => createRigidBodyApi(getRigidBodyRef), []);
+  const api = React$1.useMemo(() => createRigidBodyApi(getRigidBodyRef), []);
   return [ref, api, childColliderProps];
 }; // Joints
 
@@ -1096,8 +1105,8 @@ const useImpulseJoint = (body1, body2, params) => {
   const {
     world
   } = useRapier();
-  const jointRef = React.useRef();
-  const getJointRef = React.useRef(() => {
+  const jointRef = React$1.useRef();
+  const getJointRef = React$1.useRef(() => {
     if (!jointRef.current) {
       let rb1;
       let rb2;
@@ -1112,7 +1121,7 @@ const useImpulseJoint = (body1, body2, params) => {
 
     return jointRef.current;
   });
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     const joint = getJointRef.current();
     return () => {
       if (joint) {
@@ -1121,7 +1130,7 @@ const useImpulseJoint = (body1, body2, params) => {
       }
     };
   }, []);
-  const api = React.useMemo(() => createJointApi(getJointRef), []);
+  const api = React$1.useMemo(() => createJointApi(getJointRef), []);
   return api;
 };
 /**
@@ -1180,7 +1189,7 @@ const usePrismaticJoint = (body1, body2, [body1Anchor, body2Anchor, axis]) => {
 };
 
 // Colliders
-const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React__default["default"].forwardRef((props, forwardedRef) => {
+const AnyCollider = /*#__PURE__*/React$1.memo( /*#__PURE__*/React__default["default"].forwardRef((props, forwardedRef) => {
   const {
     children,
     position,
@@ -1194,8 +1203,8 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React__default["defaul
     colliderStates
   } = useRapier();
   const rigidBodyContext = useRigidBodyContext();
-  const ref = React.useRef(null);
-  const collidersRef = React.useMemo(() => {
+  const ref = React$1.useRef(null);
+  const collidersRef = React$1.useMemo(() => {
     if (forwardedRef !== null) {
       return forwardedRef;
     }
@@ -1204,7 +1213,7 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React__default["defaul
     result.current = [];
     return result;
   }, []);
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     const object = ref.current;
     const worldScale = object.getWorldScale(new three.Vector3());
     const colliders = []; // If this is an InstancedRigidBody api
@@ -1236,7 +1245,7 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React__default["defaul
       });
     };
   }, []);
-  const mergedProps = React.useMemo(() => {
+  const mergedProps = React$1.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);
@@ -1305,9 +1314,9 @@ const ConvexHullCollider = /*#__PURE__*/React__default["default"].forwardRef((pr
 });
 
 const _excluded$1 = ["children", "type", "position", "rotation", "scale", "quaternion"];
-const RigidBodyContext = /*#__PURE__*/React.createContext(undefined);
-const useRigidBodyContext = () => React.useContext(RigidBodyContext);
-const RigidBody = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((props, ref) => {
+const RigidBodyContext = /*#__PURE__*/React$1.createContext(undefined);
+const useRigidBodyContext = () => React$1.useContext(RigidBodyContext);
+const RigidBody = /*#__PURE__*/React$1.memo( /*#__PURE__*/React$1.forwardRef((props, ref) => {
   const {
     children,
     type,
@@ -1319,8 +1328,8 @@ const RigidBody = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((props,
         objectProps = _objectWithoutProperties(props, _excluded$1);
 
   const [object, api, childColliderProps] = useRigidBody(props);
-  React.useImperativeHandle(ref, () => api);
-  const contextValue = React.useMemo(() => ({
+  React$1.useImperativeHandle(ref, () => api);
+  const contextValue = React$1.useMemo(() => ({
     ref: object,
     api,
     options: props
@@ -1348,11 +1357,11 @@ const MeshCollider = props => {
     physicsOptions,
     world
   } = useRapier();
-  const object = React.useRef(null);
+  const object = React$1.useRef(null);
   const {
     options
   } = useRigidBodyContext();
-  const mergedOptions = React.useMemo(() => {
+  const mergedOptions = React$1.useMemo(() => {
     return _objectSpread2(_objectSpread2(_objectSpread2({}, physicsOptions), options), {}, {
       children: undefined,
       colliders: type
@@ -1369,189 +1378,35 @@ const MeshCollider = props => {
   }, colliderProps))));
 };
 
-const geometryFromCollider = collider => {
-  switch (collider.shape.type) {
-    case rapier3dCompat.ShapeType.Cuboid:
-      {
-        const {
-          x,
-          y,
-          z
-        } = collider.shape.halfExtents;
-        return new three.BoxGeometry(x * 2 + 0.01, y * 2 + 0.01, z * 2 + 0.01);
-      }
-
-    case rapier3dCompat.ShapeType.RoundCuboid:
-      {
-        const {
-          x,
-          y,
-          z
-        } = collider.shape.halfExtents;
-        const radius = collider.shape.borderRadius;
-        return new threeStdlib.RoundedBoxGeometry(x * 2 + radius * 2, y * 2 + radius * 2, z * 2 + radius * 2, 8, radius);
-      }
-
-    case rapier3dCompat.ShapeType.Ball:
-      {
-        const r = collider.shape.radius;
-        return new three.SphereGeometry(r + +0.01, 8, 8);
-      }
-
-    case rapier3dCompat.ShapeType.TriMesh:
-      {
-        var _g$index;
-
-        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;
-      }
-
-    case rapier3dCompat.ShapeType.ConvexPolyhedron:
-      {
-        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(safeVerts, 3));
-        return cg;
-      }
-
-    case rapier3dCompat.ShapeType.Cylinder:
-      {
-        const r = collider.shape.radius;
-        const h = collider.shape.halfHeight;
-        const g = new three.CylinderGeometry(r, r, h * 2);
-        return g;
-      }
-
-    case rapier3dCompat.ShapeType.Capsule:
-      {
-        const r = collider.shape.radius;
-        const h = collider.shape.halfHeight;
-        const g = new three.CapsuleGeometry(r, h * 2, 4, 8);
-        return g;
-      }
-
-    case rapier3dCompat.ShapeType.Cone:
-      {
-        const r = collider.shape.radius;
-        const h = collider.shape.halfHeight;
-        const g = new three.ConeGeometry(r, h * 2, 16);
-        return g;
-      }
-
-    case rapier3dCompat.ShapeType.HeightField:
-      {
-        const rows = collider.shape.nrows;
-        const cols = collider.shape.ncols;
-        const heights = collider.shape.heights;
-        const scale = collider.shape.scale;
-        const g = new three.PlaneGeometry(scale.x, scale.z, cols, rows);
-        const verts = g.attributes.position.array;
-        verts.forEach((v, index) => verts[index * 3 + 2] = heights[index] * scale.y);
-        g.scale(1, -1, 1);
-        g.rotateX(-Math.PI / 2);
-        g.rotateY(-Math.PI / 2);
-        return g;
-      }
-  }
-
-  return new three.BoxGeometry(1, 1, 1);
-};
-
-const DebugShape = /*#__PURE__*/React.memo(({
-  colliderHandle,
-  color,
-  sleepColor
-}) => {
-  const {
-    world
-  } = useRapier();
-  const ref = React.useRef(null);
-  const [material] = React.useState(new three.MeshBasicMaterial({
-    color,
-    wireframe: true
-  }));
-  fiber.useFrame(() => {
-    const collider = world.getCollider(colliderHandle);
-
-    if (ref.current && collider) {
-      const {
-        x: rx,
-        y: ry,
-        z: rz,
-        w: rw
-      } = collider.rotation();
-      const {
-        x,
-        y,
-        z
-      } = collider.translation();
-      const parent = collider.parent();
-
-      if (parent !== null && parent !== void 0 && parent.isSleeping() || parent !== null && parent !== void 0 && parent.isFixed() || parent !== null && parent !== void 0 && parent.isKinematic()) {
-        material.color = new three.Color(sleepColor);
-      } else {
-        material.color = new three.Color(color);
-      }
-
-      ref.current.position.set(x, y, z);
-      ref.current.rotation.setFromQuaternion(new three.Quaternion(rx, ry, rz, rw));
-    }
-  });
-  const geometry = React.useMemo(() => {
-    const collider = world.getCollider(colliderHandle);
-    return geometryFromCollider(collider);
-  }, [colliderHandle]);
-  return /*#__PURE__*/React__default["default"].createElement("mesh", {
-    ref: ref,
-    material: material
-  }, /*#__PURE__*/React__default["default"].createElement("primitive", {
-    object: geometry,
-    attach: "geometry"
-  }));
-});
-const Debug = ({
-  color: _color = "red",
-  sleepColor: _sleepColor = "blue"
-}) => {
+const Debug = () => {
   const {
     world
   } = useRapier();
-  const [colliders, setColliders] = React.useState([]);
-  React.useRef({});
-
+  const ref = React$1.useRef(null);
   fiber.useFrame(() => {
-    const newColliders = [];
-    world.forEachCollider(collider => {
-      newColliders.push(collider.handle);
-    });
-    setColliders(newColliders);
+    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, colliders.map(handle => /*#__PURE__*/React__default["default"].createElement(DebugShape, {
-    key: handle,
-    colliderHandle: handle,
-    color: _color,
-    sleepColor: _sleepColor
-  })));
+  return /*#__PURE__*/React.createElement("lineSegments", {
+    ref: ref
+  }, /*#__PURE__*/React.createElement("lineBasicMaterial", {
+    color: 0xffffff,
+    vertexColors: true
+  }), /*#__PURE__*/React.createElement("bufferGeometry", null));
 };
 
 const _excluded = ["positions", "rotations", "children"];
-const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
+const InstancedRigidBodies = /*#__PURE__*/React$1.forwardRef((props, ref) => {
   const {
     world,
     rigidBodyStates,
     physicsOptions,
     rigidBodyEvents
   } = useRapier();
-  const object = React.useRef(null);
+  const object = React$1.useRef(null);
 
   const {
     positions,
@@ -1560,20 +1415,20 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
   } = props,
         options = _objectWithoutProperties(props, _excluded);
 
-  const instancesRef = React.useRef([]);
-  const rigidBodyRefs = React.useRef([]);
-  const instancesRefGetter = React.useRef(() => {
+  const instancesRef = React$1.useRef([]);
+  const rigidBodyRefs = React$1.useRef([]);
+  const instancesRefGetter = React$1.useRef(() => {
     if (!instancesRef.current) {
       instancesRef.current = [];
     }
 
     return instancesRef.current;
   });
-  const mergedOptions = React.useMemo(() => {
+  const mergedOptions = React$1.useMemo(() => {
     return _objectSpread2(_objectSpread2({}, physicsOptions), options);
   }, [physicsOptions, options]);
   const childColliderProps = useChildColliderProps(object, mergedOptions);
-  React.useLayoutEffect(() => {
+  React$1.useLayoutEffect(() => {
     object.current.updateWorldMatrix(true, false);
     const instances = instancesRefGetter.current();
     const invertedWorld = object.current.matrixWorld.clone().invert();
@@ -1634,11 +1489,11 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
       instancesRef.current = [];
     };
   }, []);
-  const api = React.useMemo(() => createInstancedRigidBodiesApi(instancesRefGetter), []);
-  React.useImperativeHandle(ref, () => api);
+  const api = React$1.useMemo(() => createInstancedRigidBodiesApi(instancesRefGetter), []);
+  React$1.useImperativeHandle(ref, () => api);
   useUpdateRigidBodyOptions(rigidBodyRefs, mergedOptions, rigidBodyStates, false);
   useRigidBodyEvents(rigidBodyRefs, mergedOptions, rigidBodyEvents);
-  const contextValue = React.useMemo(() => {
+  const contextValue = React$1.useMemo(() => {
     return {
       ref: object,
       api,