@dcl/ecs 7.29.1-35862852104.commit-1f44e80 → 7.29.1-35901015152.commit-d1b7b96

package/dist-cjs/systems/events.js

@@ -47,21 +47,14 @@ 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) {
         return eventsMap.get(entity) || eventsMap.set(entity, new Map()).get(entity);
     }
-    // A cursor handler and a proximity handler are separate registrations that
-    // produce separate PointerEvents entries, so they need separate slots here
-    // too. Keying on the event type alone made onProximityDown evict whatever
-    // onPointerDown had left.
-    function eventKey(type, interactionType) {
-        return `${type}:${interactionType}`;
-    }
-    function setEvent(entity, type, cb, opts, interactionType = 0 /* InteractionType.CURSOR */) {
-        getEvent(entity).set(eventKey(type, interactionType), { cb, opts, eventType: type });
-    }
     function setPointerEvent(entity, type, opts, interactionType = 0 /* InteractionType.CURSOR */) {
         const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity);
         pointerEvent.pointerEvents.push({
@@ -79,27 +72,13 @@ function createPointerEventsSystem(engine, inputSystem) {
             interactionType: interactionType ?? 0 /* InteractionType.CURSOR */
         });
     }
-    function removePointerEvent(entity, type, opts, interactionType = 0 /* InteractionType.CURSOR */) {
+    function removePointerEvent(entity, type, button, interactionType = 0 /* InteractionType.CURSOR */) {
         const pointerEvent = PointerEvents.getMutableOrNull(entity);
         if (!pointerEvent)
             return;
-        const sameSlot = (pointer) => pointer.eventType === type && pointer.interactionType === interactionType;
-        // onClick and onPointerDown both describe themselves as PET_DOWN, so the event
-        // type and button alone do not say which registration an entry belongs to. Match
-        // everything the entry was built from, or removing one handler can take the
-        // other's descriptor and leave the renderer advertising the wrong interaction.
-        const index = pointerEvent.pointerEvents.findIndex((pointer) => sameSlot(pointer) &&
-            pointer.eventInfo?.button === opts.button &&
-            pointer.eventInfo?.hoverText === opts.hoverText &&
-            pointer.eventInfo?.showFeedback === opts.showFeedback &&
-            pointer.eventInfo?.showHighlight === opts.showHighlight &&
-            pointer.eventInfo?.maxDistance === opts.maxDistance &&
-            pointer.eventInfo?.maxPlayerDistance === opts.maxPlayerDistance &&
-            pointer.eventInfo?.priority === opts.priority &&
-            pointer.eventInfo?.maxCameraDistance === opts.maxCameraDistance);
-        if (index === -1)
-            return;
-        pointerEvent.pointerEvents.splice(index, 1);
+        pointerEvent.pointerEvents = pointerEvent.pointerEvents.filter((pointer) => !(pointer.eventInfo?.button === button &&
+            pointer.eventType === type &&
+            pointer.interactionType === interactionType));
     }
     function getPointerEvent(eventType) {
         if (eventType === EventType.Up) {
@@ -117,20 +96,24 @@ 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 */) {
         const event = getEvent(entity);
-        const key = eventKey(type, interactionType);
-        const pointerEvent = event.get(key);
-        // Every registration adds an entry, not only the ones carrying a hoverText,
-        // so every removal has to take one away. Gating on hoverText left the
-        // renderer showing an interaction whose callback was already gone, and made
-        // re-registering grow the component by one entry each time.
-        if (pointerEvent) {
-            removePointerEvent(entity, getPointerEvent(type), pointerEvent.opts, interactionType);
+        const pointerEvent = event.get(type);
+        if (pointerEvent?.opts.hoverText) {
+            removePointerEvent(entity, getPointerEvent(type), pointerEvent.opts.button);
         }
-        event.delete(key);
+        event.delete(type);
     }
     engine.addSystem(function PointerEventSystem() {
         for (const [entity, event] of eventsMap) {
@@ -138,7 +121,7 @@ function createPointerEventsSystem(engine, inputSystem) {
                 eventsMap.delete(entity);
                 continue;
             }
-            for (const [, { cb, opts, eventType }] of event) {
+            for (const [eventType, { cb, opts }] of event) {
                 if (eventType === EventType.Click) {
                     const command = inputSystem.getClick(opts.button, entity);
                     if (command)
@@ -149,7 +132,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');
@@ -166,7 +152,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.Down);
-        setEvent(entity, EventType.Down, cb, options);
+        getEvent(entity).set(EventType.Down, { cb, opts: options });
         setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
     };
     const onPointerUp = (...args) => {
@@ -177,7 +163,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.Up);
-        setEvent(entity, EventType.Up, cb, options);
+        getEvent(entity).set(EventType.Up, { cb, opts: options });
         setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options);
     };
     const onPointerHoverEnter = (...args) => {
@@ -185,7 +171,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.HoverEnter);
-        setEvent(entity, EventType.HoverEnter, cb, options);
+        getEvent(entity).set(EventType.HoverEnter, { cb, opts: options });
         setPointerEvent(entity, 2 /* PointerEventType.PET_HOVER_ENTER */, options);
     };
     const onPointerHoverLeave = (...args) => {
@@ -193,15 +179,39 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.HoverLeave);
-        setEvent(entity, EventType.HoverLeave, cb, options);
+        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;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
-        setEvent(entity, EventType.Down, cb, options, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.Down, { cb, opts: options });
         setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options, 1 /* InteractionType.PROXIMITY */);
     };
     const onProximityUp = (...args) => {
@@ -209,7 +219,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.Up, 1 /* InteractionType.PROXIMITY */);
-        setEvent(entity, EventType.Up, cb, options, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.Up, { cb, opts: options });
         setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options, 1 /* InteractionType.PROXIMITY */);
     };
     const onProximityEnter = (...args) => {
@@ -217,7 +227,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.ProximityEnter, 1 /* InteractionType.PROXIMITY */);
-        setEvent(entity, EventType.ProximityEnter, cb, options, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.ProximityEnter, { cb, opts: options });
         setPointerEvent(entity, 4 /* PointerEventType.PET_PROXIMITY_ENTER */, options, 1 /* InteractionType.PROXIMITY */);
     };
     const onProximityLeave = (...args) => {
@@ -225,7 +235,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.ProximityLeave, 1 /* InteractionType.PROXIMITY */);
-        setEvent(entity, EventType.ProximityLeave, cb, options, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.ProximityLeave, { cb, opts: options });
         setPointerEvent(entity, 5 /* PointerEventType.PET_PROXIMITY_LEAVE */, options, 1 /* InteractionType.PROXIMITY */);
     };
     return {
@@ -244,6 +254,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 */);
         },
@@ -262,13 +281,16 @@ function createPointerEventsSystem(engine, inputSystem) {
             // Clear previous event with over feedback included
             removeEvent(entity, EventType.Click);
             // Set new event
-            setEvent(entity, EventType.Click, cb, options);
+            getEvent(entity).set(EventType.Click, { cb, opts: options });
             setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
         },
         onPointerDown,
         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.29.1-35862852104.commit-1f44e80",
+  "version": "7.29.1-35901015152.commit-d1b7b96",
   "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": "1f44e80aec8fa365230f39956a8f6526011c6bd5"
+  "commit": "d1b7b964cd184465c1b65118e47b5dc6be68a184"
 }

package/dist/components/manual/CreatedBy.d.ts

@@ -1,9 +0,0 @@
-import { IEngine, LastWriteWinElementSetComponentDefinition } from '../../engine/types';
-export interface ICreatedByType {
-    address: string;
-}
-export type ICreatedBy = LastWriteWinElementSetComponentDefinition<ICreatedByType>;
-declare function defineCreatedBy(engine: Pick<IEngine, 'defineComponent'>): import("../../engine/types").MapComponentDefinition<import("../..").MapResult<{
-    address: import("../../schemas").ISchema<string>;
-}>>;
-export default defineCreatedBy;

package/dist/components/manual/CreatedBy.js

@@ -1,8 +0,0 @@
-import { Schemas } from '../../schemas';
-function defineCreatedBy(engine) {
-    const CreatedBy = engine.defineComponent('core-schema::Created-By', {
-        address: Schemas.String
-    });
-    return CreatedBy;
-}
-export default defineCreatedBy;

package/dist/serialization/crdt/authoritativePutComponent.d.ts

@@ -1,15 +0,0 @@
-import { Entity } from '../../engine/entity';
-import { ByteBuffer } from '../ByteBuffer';
-import { AuthoritativePutComponentMessage } from './types';
-/**
- * @public
- */
-export declare namespace AuthoritativePutComponentOperation {
-    const MESSAGE_HEADER_LENGTH = 16;
-    /**
-     * Call this function for an optimal writing data passing the ByteBuffer
-     *  already allocated
-     */
-    function write(entity: Entity, timestamp: number, componentId: number, data: Uint8Array, buf: ByteBuffer): void;
-    function read(buf: ByteBuffer): AuthoritativePutComponentMessage | null;
-}

package/dist/serialization/crdt/authoritativePutComponent.js

@@ -1,47 +0,0 @@
-import { CrdtMessageProtocol } from './crdtMessageProtocol';
-import { CrdtMessageType, CRDT_MESSAGE_HEADER_LENGTH } from './types';
-/**
- * @public
- */
-export var AuthoritativePutComponentOperation;
-(function (AuthoritativePutComponentOperation) {
-    AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH = 16;
-    /**
-     * Call this function for an optimal writing data passing the ByteBuffer
-     *  already allocated
-     */
-    function write(entity, timestamp, componentId, data, buf) {
-        // reserve the beginning
-        const startMessageOffset = buf.incrementWriteOffset(CRDT_MESSAGE_HEADER_LENGTH + AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH);
-        // write body
-        buf.writeBuffer(data, false);
-        const messageLength = buf.currentWriteOffset() - startMessageOffset;
-        // Write CrdtMessage header
-        buf.setUint32(startMessageOffset, messageLength);
-        buf.setUint32(startMessageOffset + 4, CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT);
-        // Write ComponentOperation header
-        buf.setUint32(startMessageOffset + 8, entity);
-        buf.setUint32(startMessageOffset + 12, componentId);
-        buf.setUint32(startMessageOffset + 16, timestamp);
-        const newLocal = messageLength - AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH - CRDT_MESSAGE_HEADER_LENGTH;
-        buf.setUint32(startMessageOffset + 20, newLocal);
-    }
-    AuthoritativePutComponentOperation.write = write;
-    function read(buf) {
-        const header = CrdtMessageProtocol.readHeader(buf);
-        if (!header) {
-            return null;
-        }
-        if (header.type !== CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT) {
-            throw new Error('AuthoritativePutComponentOperation tried to read another message type.');
-        }
-        return {
-            ...header,
-            entityId: buf.readUint32(),
-            componentId: buf.readUint32(),
-            timestamp: buf.readUint32(),
-            data: buf.readBuffer()
-        };
-    }
-    AuthoritativePutComponentOperation.read = read;
-})(AuthoritativePutComponentOperation || (AuthoritativePutComponentOperation = {}));

package/dist-cjs/components/manual/CreatedBy.d.ts

@@ -1,9 +0,0 @@
-import { IEngine, LastWriteWinElementSetComponentDefinition } from '../../engine/types';
-export interface ICreatedByType {
-    address: string;
-}
-export type ICreatedBy = LastWriteWinElementSetComponentDefinition<ICreatedByType>;
-declare function defineCreatedBy(engine: Pick<IEngine, 'defineComponent'>): import("../../engine/types").MapComponentDefinition<import("../..").MapResult<{
-    address: import("../../schemas").ISchema<string>;
-}>>;
-export default defineCreatedBy;

package/dist-cjs/components/manual/CreatedBy.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const schemas_1 = require("../../schemas");
-function defineCreatedBy(engine) {
-    const CreatedBy = engine.defineComponent('core-schema::Created-By', {
-        address: schemas_1.Schemas.String
-    });
-    return CreatedBy;
-}
-exports.default = defineCreatedBy;

package/dist-cjs/serialization/crdt/authoritativePutComponent.d.ts

@@ -1,15 +0,0 @@
-import { Entity } from '../../engine/entity';
-import { ByteBuffer } from '../ByteBuffer';
-import { AuthoritativePutComponentMessage } from './types';
-/**
- * @public
- */
-export declare namespace AuthoritativePutComponentOperation {
-    const MESSAGE_HEADER_LENGTH = 16;
-    /**
-     * Call this function for an optimal writing data passing the ByteBuffer
-     *  already allocated
-     */
-    function write(entity: Entity, timestamp: number, componentId: number, data: Uint8Array, buf: ByteBuffer): void;
-    function read(buf: ByteBuffer): AuthoritativePutComponentMessage | null;
-}

package/dist-cjs/serialization/crdt/authoritativePutComponent.js

@@ -1,50 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuthoritativePutComponentOperation = void 0;
-const crdtMessageProtocol_1 = require("./crdtMessageProtocol");
-const types_1 = require("./types");
-/**
- * @public
- */
-var AuthoritativePutComponentOperation;
-(function (AuthoritativePutComponentOperation) {
-    AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH = 16;
-    /**
-     * Call this function for an optimal writing data passing the ByteBuffer
-     *  already allocated
-     */
-    function write(entity, timestamp, componentId, data, buf) {
-        // reserve the beginning
-        const startMessageOffset = buf.incrementWriteOffset(types_1.CRDT_MESSAGE_HEADER_LENGTH + AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH);
-        // write body
-        buf.writeBuffer(data, false);
-        const messageLength = buf.currentWriteOffset() - startMessageOffset;
-        // Write CrdtMessage header
-        buf.setUint32(startMessageOffset, messageLength);
-        buf.setUint32(startMessageOffset + 4, types_1.CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT);
-        // Write ComponentOperation header
-        buf.setUint32(startMessageOffset + 8, entity);
-        buf.setUint32(startMessageOffset + 12, componentId);
-        buf.setUint32(startMessageOffset + 16, timestamp);
-        const newLocal = messageLength - AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH - types_1.CRDT_MESSAGE_HEADER_LENGTH;
-        buf.setUint32(startMessageOffset + 20, newLocal);
-    }
-    AuthoritativePutComponentOperation.write = write;
-    function read(buf) {
-        const header = crdtMessageProtocol_1.CrdtMessageProtocol.readHeader(buf);
-        if (!header) {
-            return null;
-        }
-        if (header.type !== types_1.CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT) {
-            throw new Error('AuthoritativePutComponentOperation tried to read another message type.');
-        }
-        return {
-            ...header,
-            entityId: buf.readUint32(),
-            componentId: buf.readUint32(),
-            timestamp: buf.readUint32(),
-            data: buf.readBuffer()
-        };
-    }
-    AuthoritativePutComponentOperation.read = read;
-})(AuthoritativePutComponentOperation = exports.AuthoritativePutComponentOperation || (exports.AuthoritativePutComponentOperation = {}));