@dcl/ecs 7.27.1-33533891406.commit-6a98834 → 7.27.1-33669021544.commit-a6216ed

package/dist-cjs/index.js

@@ -26,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NetworkParent = exports.NetworkEntity = exports.SyncComponents = exports.TouchScreenControls = exports.ParticleSystem = exports.TriggerArea = exports.LightSource = exports.InputModifier = exports.VirtualCamera = exports.Tween = exports.Tags = exports.Name = exports.MeshCollider = exports.MeshRenderer = exports.Material = exports.AudioStream = exports.AudioAnalysis = exports.AudioSource = exports.Animator = exports.Transform = exports.components = exports.cyclicParentingChecker = void 0;
+exports.NetworkParent = exports.NetworkEntity = exports.SyncComponents = exports.TouchScreenControls = exports.ParticleSystem = exports.TriggerArea = exports.LightSource = exports.InputModifier = exports.VirtualCamera = exports.Tween = exports.Tags = exports.Name = exports.AvatarEquippedData = exports.AvatarShape = exports.MeshCollider = exports.MeshRenderer = exports.Material = exports.AudioStream = exports.AudioAnalysis = exports.AudioSource = exports.Animator = exports.Transform = exports.components = exports.cyclicParentingChecker = void 0;
 // The order of the following imports matters. Please do not auto-sort
 __exportStar(require("./engine"), exports);
 __exportStar(require("./schemas"), exports);
@@ -60,6 +60,9 @@ exports.AudioStream = components.AudioStream(initialization_1.engine);
 exports.Material = components.Material(initialization_1.engine);
 exports.MeshRenderer = components.MeshRenderer(initialization_1.engine);
 exports.MeshCollider = components.MeshCollider(initialization_1.engine);
+exports.AvatarShape = components.AvatarShape(initialization_1.engine);
+exports.AvatarEquippedData = 
+/* @__PURE__*/ components.AvatarEquippedData(initialization_1.engine);
 exports.Name = components.Name(initialization_1.engine);
 exports.Tags = components.Tags(initialization_1.engine);
 exports.Tween = components.Tween(initialization_1.engine);

package/dist-cjs/systems/events.d.ts

@@ -16,10 +16,8 @@ export type EventSystemOptions = {
     maxDistance?: number;
     showFeedback?: boolean;
     showHighlight?: boolean;
-    /** @deprecated use `maxDistance` instead (same semantics: distance from the player) */
     maxPlayerDistance?: number;
     priority?: number;
-    maxCameraDistance?: number;
 };
 export declare const getDefaultOpts: (opts?: Partial<EventSystemOptions>) => EventSystemOptions;
 /**
@@ -50,6 +48,24 @@ export interface PointerEventsSystem {
      * @param entity - Entity where the callback was attached
      */
     removeOnPointerHoverLeave(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onPointerDrag event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnPointerDrag(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onPointerDragLocked event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnPointerDragLocked(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onPointerDragEnd event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnPointerDragEnd(entity: Entity): void;
     /**
      * @public
      * Remove the callback for onProximityDown event
@@ -128,6 +144,36 @@ export interface PointerEventsSystem {
         entity: Entity;
         opts?: Partial<EventSystemOptions>;
     }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Execute callback while the user holds the button pressed and moves the pointer, having pressed it on the entity
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute on every drag update
+     */
+    onPointerDrag(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Same as onPointerDrag, but the cursor is locked in place for the duration of the drag
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute on every drag update
+     */
+    onPointerDragLocked(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Execute callback when the user releases the button after a drag that started on the entity
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute when the drag ends
+     */
+    onPointerDragEnd(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
     /**
      * @public
      * Execute callback when the user presses the proximity button on the entity

package/dist-cjs/systems/events.js

@@ -47,6 +47,9 @@ function createPointerEventsSystem(engine, inputSystem) {
         EventType[EventType["HoverLeave"] = 4] = "HoverLeave";
         EventType[EventType["ProximityEnter"] = 5] = "ProximityEnter";
         EventType[EventType["ProximityLeave"] = 6] = "ProximityLeave";
+        EventType[EventType["Drag"] = 7] = "Drag";
+        EventType[EventType["DragLocked"] = 8] = "DragLocked";
+        EventType[EventType["DragEnd"] = 9] = "DragEnd";
     })(EventType || (EventType = {}));
     const eventsMap = new Map();
     function getEvent(entity) {
@@ -63,8 +66,7 @@ function createPointerEventsSystem(engine, inputSystem) {
                 hoverText: opts.hoverText,
                 maxDistance: opts.maxDistance,
                 maxPlayerDistance: opts.maxPlayerDistance,
-                priority: opts.priority,
-                maxCameraDistance: opts.maxCameraDistance
+                priority: opts.priority
             },
             interactionType: interactionType ?? 0 /* InteractionType.CURSOR */
         });
@@ -93,6 +95,15 @@ function createPointerEventsSystem(engine, inputSystem) {
         else if (eventType === EventType.ProximityLeave) {
             return 5 /* PointerEventType.PET_PROXIMITY_LEAVE */;
         }
+        else if (eventType === EventType.Drag) {
+            return 7 /* PointerEventType.PET_DRAG */;
+        }
+        else if (eventType === EventType.DragLocked) {
+            return 6 /* PointerEventType.PET_DRAG_LOCKED */;
+        }
+        else if (eventType === EventType.DragEnd) {
+            return 8 /* PointerEventType.PET_DRAG_END */;
+        }
         return 1 /* PointerEventType.PET_DOWN */;
     }
     function removeEvent(entity, type, interactionType = 0 /* InteractionType.CURSOR */) {
@@ -120,7 +131,10 @@ function createPointerEventsSystem(engine, inputSystem) {
                     eventType === EventType.HoverEnter ||
                     eventType === EventType.HoverLeave ||
                     eventType === EventType.ProximityEnter ||
-                    eventType === EventType.ProximityLeave) {
+                    eventType === EventType.ProximityLeave ||
+                    eventType === EventType.Drag ||
+                    eventType === EventType.DragLocked ||
+                    eventType === EventType.DragEnd) {
                     const command = inputSystem.getInputCommand(opts.button, getPointerEvent(eventType), entity);
                     if (command) {
                         (0, invariant_1.checkNotThenable)(cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
@@ -167,6 +181,30 @@ function createPointerEventsSystem(engine, inputSystem) {
         getEvent(entity).set(EventType.HoverLeave, { cb, opts: options });
         setPointerEvent(entity, 3 /* PointerEventType.PET_HOVER_LEAVE */, options);
     };
+    const onPointerDrag = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.Drag);
+        getEvent(entity).set(EventType.Drag, { cb, opts: options });
+        setPointerEvent(entity, 7 /* PointerEventType.PET_DRAG */, options);
+    };
+    const onPointerDragLocked = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.DragLocked);
+        getEvent(entity).set(EventType.DragLocked, { cb, opts: options });
+        setPointerEvent(entity, 6 /* PointerEventType.PET_DRAG_LOCKED */, options);
+    };
+    const onPointerDragEnd = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.DragEnd);
+        getEvent(entity).set(EventType.DragEnd, { cb, opts: options });
+        setPointerEvent(entity, 8 /* PointerEventType.PET_DRAG_END */, options);
+    };
     const onProximityDown = (...args) => {
         const [data, cb] = args;
         const { entity, opts } = data;
@@ -215,6 +253,15 @@ function createPointerEventsSystem(engine, inputSystem) {
         removeOnPointerHoverLeave(entity) {
             removeEvent(entity, EventType.HoverLeave);
         },
+        removeOnPointerDrag(entity) {
+            removeEvent(entity, EventType.Drag);
+        },
+        removeOnPointerDragLocked(entity) {
+            removeEvent(entity, EventType.DragLocked);
+        },
+        removeOnPointerDragEnd(entity) {
+            removeEvent(entity, EventType.DragEnd);
+        },
         removeOnProximityDown(entity) {
             removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
         },
@@ -240,6 +287,9 @@ function createPointerEventsSystem(engine, inputSystem) {
         onPointerUp,
         onPointerHoverEnter,
         onPointerHoverLeave,
+        onPointerDrag,
+        onPointerDragLocked,
+        onPointerDragEnd,
         onProximityDown,
         onProximityUp,
         onProximityEnter,

package/dist-cjs/systems/raycast.d.ts

@@ -1,4 +1,4 @@
-import { RaycastQueryType, PBRaycastResult } from '../components';
+import { RaycastQueryType, RaycastShape, PBRaycastResult } from '../components';
 import { DeepReadonlyObject, Entity } from '../engine';
 import { Vector3 } from '../components/generated/pb/decentraland/common/vectors.gen';
 /**
@@ -14,6 +14,10 @@ export type RaycastSystemOptions = {
     queryType: RaycastQueryType;
     continuous?: boolean | undefined;
     collisionMask?: number | undefined;
+    /** shape to sweep along the ray, default RS_RAY (a point) */
+    shape?: RaycastShape | undefined;
+    /** include colliders from other scenes, default false */
+    includeWorld?: boolean | undefined;
 };
 export type LocalDirectionRaycastSystemOptions = {
     direction?: Vector3;

package/dist-cjs/systems/raycast.js

@@ -38,7 +38,9 @@ function createRaycastSystem(engine) {
         queryType: 0 /* RaycastQueryType.RQT_HIT_FIRST */,
         continuous: false,
         originOffset: { x: 0, y: 0, z: 0 },
-        collisionMask: 2 /* ColliderLayer.CL_PHYSICS */
+        collisionMask: 2 /* ColliderLayer.CL_PHYSICS */,
+        shape: 0 /* RaycastShape.RS_RAY */,
+        includeWorld: false
     };
     const getLocalDirectionRaycastDefaultOptions = (options = {}) => ({
         ...defaultOptions,
@@ -84,6 +86,8 @@ function createRaycastSystem(engine) {
             raycast.direction = raycastValue.directionRawValue;
             raycast.continuous = raycastValue.continuous;
             raycast.queryType = raycastValue.queryType;
+            raycast.shape = raycastValue.shape;
+            raycast.includeWorld = raycastValue.includeWorld;
             entitiesCallbackResultMap.set(entity, { callback: callback });
         };
         nextTickRaycasts.push(onNextTick);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dcl/ecs",
   "description": "Decentraland ECS",
-  "version": "7.27.1-33533891406.commit-6a98834",
+  "version": "7.27.1-33669021544.commit-a6216ed",
   "author": "DCL",
   "bugs": "https://github.com/decentraland/ecs/issues",
   "files": [
@@ -34,5 +34,5 @@
   "dependencies": {},
   "types": "./dist/index.d.ts",
   "typings": "./dist/index.d.ts",
-  "commit": "6a98834aabecc30298841a3d9d306fcd57af585c"
+  "commit": "a6216ed019b3e94bc687847a82d433d07c6e3e9d"
 }