@dcl/ecs 7.29.1-35861881691.commit-e4e55e9 → 7.29.1-35901015152.commit-d1b7b96

package/dist-cjs/components/index.d.ts

@@ -5,6 +5,8 @@ import { AudioSourceComponentDefinitionExtended } from './extended/AudioSource';
 import { AudioAnalysisComponentDefinitionExtended } from './extended/AudioAnalysis';
 import type { AudioAnalysisView } from './extended/AudioAnalysis';
 import { MaterialComponentDefinitionExtended } from './extended/Material';
+import { AvatarEquippedDataComponentDefinitionExtended } from './extended/AvatarEquippedData';
+import { AvatarShapeComponentDefinitionExtended } from './extended/AvatarShape';
 import { MeshColliderComponentDefinitionExtended } from './extended/MeshCollider';
 import { MeshRendererComponentDefinitionExtended } from './extended/MeshRenderer';
 import { TweenComponentDefinitionExtended } from './extended/Tween';
@@ -33,6 +35,8 @@ export declare const AudioAnalysis: LwwComponentGetter<AudioAnalysisComponentDef
 export declare const AudioStream: (engine: Pick<IEngine, 'defineComponentFromSchema' | 'defineValueSetComponentFromSchema'>) => AudioStreamComponentDefinitionExtended;
 export declare const MeshRenderer: LwwComponentGetter<MeshRendererComponentDefinitionExtended>;
 export declare const MeshCollider: LwwComponentGetter<MeshColliderComponentDefinitionExtended>;
+export declare const AvatarShape: LwwComponentGetter<AvatarShapeComponentDefinitionExtended>;
+export declare const AvatarEquippedData: LwwComponentGetter<AvatarEquippedDataComponentDefinitionExtended>;
 export declare const Tween: LwwComponentGetter<TweenComponentDefinitionExtended>;
 export declare const VirtualCamera: LwwComponentGetter<VirtualCameraComponentDefinitionExtended>;
 export declare const InputModifier: LwwComponentGetter<InputModifierComponentDefinitionExtended>;

package/dist-cjs/components/index.js

@@ -17,11 +17,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MediaState = exports.NetworkParent = exports.NetworkEntity = exports.SyncComponents = exports.Tags = exports.Name = exports.TouchScreenControls = exports.ParticleSystem = exports.TriggerArea = exports.LightSource = exports.InputModifier = exports.VirtualCamera = exports.Tween = exports.MeshCollider = exports.MeshRenderer = exports.AudioStream = exports.AudioAnalysis = exports.AudioSource = exports.Animator = exports.Material = exports.Transform = void 0;
+exports.MediaState = exports.NetworkParent = exports.NetworkEntity = exports.SyncComponents = exports.Tags = exports.Name = exports.TouchScreenControls = exports.ParticleSystem = exports.TriggerArea = exports.LightSource = exports.InputModifier = exports.VirtualCamera = exports.Tween = exports.AvatarEquippedData = exports.AvatarShape = exports.MeshCollider = exports.MeshRenderer = exports.AudioStream = exports.AudioAnalysis = exports.AudioSource = exports.Animator = exports.Material = exports.Transform = void 0;
 const Animator_1 = require("./extended/Animator");
 const AudioSource_1 = require("./extended/AudioSource");
 const AudioAnalysis_1 = require("./extended/AudioAnalysis");
 const Material_1 = require("./extended/Material");
+const AvatarEquippedData_1 = require("./extended/AvatarEquippedData");
+const AvatarShape_1 = require("./extended/AvatarShape");
 const MeshCollider_1 = require("./extended/MeshCollider");
 const MeshRenderer_1 = require("./extended/MeshRenderer");
 const Tween_1 = require("./extended/Tween");
@@ -66,6 +68,12 @@ exports.MeshRenderer = MeshRenderer;
 const MeshCollider = (engine) => (0, MeshCollider_1.defineMeshColliderComponent)(engine);
 exports.MeshCollider = MeshCollider;
 /* @__PURE__ */
+const AvatarShape = (engine) => (0, AvatarShape_1.defineAvatarShapeComponent)(engine);
+exports.AvatarShape = AvatarShape;
+/* @__PURE__ */
+const AvatarEquippedData = (engine) => (0, AvatarEquippedData_1.defineAvatarEquippedDataComponent)(engine);
+exports.AvatarEquippedData = AvatarEquippedData;
+/* @__PURE__ */
 const Tween = (engine) => (0, Tween_1.defineTweenComponent)(engine);
 exports.Tween = Tween;
 /* @__PURE__ */

package/dist-cjs/components/types.d.ts

@@ -4,6 +4,8 @@ export type { AudioAnalysisComponentDefinitionExtended, AudioAnalysisView } from
 export type { AudioStreamComponentDefinitionExtended } from './extended/AudioStream';
 export type { MeshRendererComponentDefinitionExtended } from './extended/MeshRenderer';
 export type { MeshColliderComponentDefinitionExtended } from './extended/MeshCollider';
+export type { AvatarShapeComponentDefinitionExtended, AvatarShapeType } from './extended/AvatarShape';
+export type { AvatarEquippedDataComponentDefinitionExtended, AvatarEquippedDataType } from './extended/AvatarEquippedData';
 export type { TextureHelper, MaterialComponentDefinitionExtended, FlatTexture, ReadonlyFlatMaterial, ReadonlyFlatTexture, FlatMaterial } from './extended/Material';
 export type { TweenHelper, TweenComponentDefinitionExtended, SetMoveRotateScaleParams, MoveRotateScaleModeParams } from './extended/Tween';
 export type { CameraTransitionHelper, VirtualCameraComponentDefinitionExtended } from './extended/VirtualCamera';

package/dist-cjs/engine/input.js

@@ -83,22 +83,22 @@ function createInputSystem(engine) {
             const arrayCommands = Array.from(commands);
             for (let i = arrayCommands.length - 1; i >= 0; i--) {
                 const command = arrayCommands[i];
-                // Commands are kept sorted by timestamp, so this one and every one
-                // below it belongs to a frame that was already accounted for. Stopping
-                // on the button state instead would end this entity's whole loop over
-                // a button another entity had already reported this frame.
-                if (command.timestamp <= globalState.previousFrameMaxTimestamp) {
-                    break;
-                }
                 if (command.timestamp > maxTimestamp) {
                     maxTimestamp = command.timestamp;
                 }
-                globalState.thisFrameCommands.push(command);
+                if (command.timestamp > globalState.previousFrameMaxTimestamp) {
+                    globalState.thisFrameCommands.push(command);
+                }
                 if (command.state === 0 /* PointerEventType.PET_UP */ || command.state === 1 /* PointerEventType.PET_DOWN */) {
                     const prevCommand = globalState.buttonState.get(command.button);
                     if (!prevCommand || command.timestamp > prevCommand.timestamp) {
                         globalState.buttonState.set(command.button, command);
                     }
+                    else {
+                        // since we are iterating a descending array, we can early finish the
+                        // loop
+                        break;
+                    }
                 }
             }
         }

package/dist-cjs/engine/lww-element-set-component-definition.js

@@ -208,16 +208,12 @@ function createComponentDefinitionFromSchema(componentName, componentId, schema)
             return data.has(entity);
         },
         deleteFrom(entity, markAsDirty = true) {
-            // Presence, not truthiness: a component defined from a primitive schema can
-            // legitimately hold 0, false or an empty string, and deleting one must still
-            // return the value that was there.
-            const had = data.has(entity);
             const component = data.get(entity);
             if (data.delete(entity) && markAsDirty) {
                 dirtyIterator.add(entity);
             }
             lastSentData.delete(entity);
-            return had ? component : null;
+            return component || null;
         },
         entityDeleted(entity, markAsDirty) {
             if (data.delete(entity) && markAsDirty) {
@@ -226,20 +222,19 @@ function createComponentDefinitionFromSchema(componentName, componentId, schema)
             lastSentData.delete(entity);
         },
         getOrNull(entity) {
-            // Presence, not truthiness: a component defined from a primitive schema
-            // can legitimately hold 0, false or an empty string.
-            if (!data.has(entity))
-                return null;
-            return (0, readonly_1.deepReadonly)(data.get(entity));
+            const component = data.get(entity);
+            return component ? (0, readonly_1.deepReadonly)(component) : null;
         },
         get(entity) {
-            if (!data.has(entity)) {
+            const component = data.get(entity);
+            if (!component) {
                 throw new Error(`[getFrom] Component ${componentName} for entity #${entity} not found`);
             }
-            return (0, readonly_1.deepReadonly)(data.get(entity));
+            return (0, readonly_1.deepReadonly)(component);
         },
         create(entity, value) {
-            if (data.has(entity)) {
+            const component = data.get(entity);
+            if (component) {
                 throw new Error(`[create] Component ${componentName} for ${entity} already exists`);
             }
             const usedValue = value === undefined ? schema.create() : schema.extend ? schema.extend(value) : value;
@@ -255,22 +250,21 @@ function createComponentDefinitionFromSchema(componentName, componentId, schema)
             return usedValue;
         },
         getMutableOrNull(entity) {
-            // Presence, not truthiness, so a falsy primitive value is still mutable.
-            if (!data.has(entity)) {
+            const component = data.get(entity);
+            if (!component) {
                 return null;
             }
             dirtyIterator.add(entity);
-            return data.get(entity);
+            return component;
         },
         getOrCreateMutable(entity, value) {
-            // Presence, not truthiness: a stored 0/false/'' must not be treated as absent,
-            // which would send this through create() and throw "already exists".
-            if (!data.has(entity)) {
+            const component = data.get(entity);
+            if (!component) {
                 return this.create(entity, value);
             }
             else {
                 dirtyIterator.add(entity);
-                return data.get(entity);
+                return component;
             }
         },
         getMutable(entity) {

package/dist-cjs/engine/readonly.d.ts

@@ -16,7 +16,7 @@ export type DeepReadonlyObject<T> = {
 /**
  * @public
  */
-export type ReadonlyPrimitive = number | string | boolean;
+export type ReadonlyPrimitive = number | string | number[] | string[] | boolean | boolean[];
 /**
  * @public
  */

package/dist-cjs/engine/readonly.js

@@ -5,16 +5,6 @@ exports.deepReadonly = void 0;
  * @internal
  */
 function deepReadonly(val) {
-    // A component can be defined straight from a primitive or array schema, not
-    // only from a Map, which is why this is no longer constrained to an object.
-    // Spreading those threw the value away: a number came back as {}, an array
-    // as an object keyed by index.
-    if (val === null || typeof val !== 'object') {
-        return val;
-    }
-    if (Array.isArray(val)) {
-        return Object.freeze([...val]);
-    }
     return Object.freeze({ ...val });
 }
 exports.deepReadonly = deepReadonly;

package/dist-cjs/index.d.ts

@@ -16,7 +16,7 @@ export * from './systems/triggerArea';
 export * from './systems/physics';
 export * from './engine/entity';
 export * from './components/types';
-import { MaterialComponentDefinitionExtended, MeshColliderComponentDefinitionExtended, MeshRendererComponentDefinitionExtended, TransformComponentExtended, AnimatorComponentDefinitionExtended, AudioSourceComponentDefinitionExtended, AudioAnalysisComponentDefinitionExtended, AudioStreamComponentDefinitionExtended, ISyncComponents, TweenComponentDefinitionExtended, INetowrkEntity, INetowrkParent, VirtualCameraComponentDefinitionExtended, InputModifierComponentDefinitionExtended, LightSourceComponentDefinitionExtended, TriggerAreaComponentDefinitionExtended, ParticleSystemComponentDefinitionExtended, TouchScreenControlsComponentDefinitionExtended } from './components/types';
+import { MaterialComponentDefinitionExtended, MeshColliderComponentDefinitionExtended, MeshRendererComponentDefinitionExtended, AvatarShapeComponentDefinitionExtended, AvatarEquippedDataComponentDefinitionExtended, TransformComponentExtended, AnimatorComponentDefinitionExtended, AudioSourceComponentDefinitionExtended, AudioAnalysisComponentDefinitionExtended, AudioStreamComponentDefinitionExtended, ISyncComponents, TweenComponentDefinitionExtended, INetowrkEntity, INetowrkParent, VirtualCameraComponentDefinitionExtended, InputModifierComponentDefinitionExtended, LightSourceComponentDefinitionExtended, TriggerAreaComponentDefinitionExtended, ParticleSystemComponentDefinitionExtended, TouchScreenControlsComponentDefinitionExtended } from './components/types';
 import { NameComponent } from './components/manual/Name';
 import { TagsComponentDefinitionExtended } from './components/manual/Tags';
 export declare const Transform: TransformComponentExtended;
@@ -27,6 +27,8 @@ export declare const AudioStream: AudioStreamComponentDefinitionExtended;
 export declare const Material: MaterialComponentDefinitionExtended;
 export declare const MeshRenderer: MeshRendererComponentDefinitionExtended;
 export declare const MeshCollider: MeshColliderComponentDefinitionExtended;
+export declare const AvatarShape: AvatarShapeComponentDefinitionExtended;
+export declare const AvatarEquippedData: AvatarEquippedDataComponentDefinitionExtended;
 export declare const Name: NameComponent;
 export declare const Tags: TagsComponentDefinitionExtended;
 export declare const Tween: TweenComponentDefinitionExtended;

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/schemas/OneOf.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IOneOf = void 0;
-/** Reserved case index for a value whose case was never selected. */
-const NO_CASE = 0;
 const IOneOf = (specs) => {
     const specKeys = Object.keys(specs);
     const keyToIndex = specKeys.reduce((dict, key, index) => {
@@ -15,22 +13,12 @@ const IOneOf = (specs) => {
     }, {});
     return {
         serialize({ $case, value }, builder) {
-            // `create()` selects no case, so a field the scene never set arrives here
-            // with an undefined `$case`. Index 0 is free, cases start at 1.
-            if ($case === undefined) {
-                builder.writeUint8(NO_CASE);
-                return;
-            }
             const _value = keyToIndex[$case.toString()] + 1;
             builder.writeUint8(_value);
             specs[$case].serialize(value, builder);
         },
         deserialize(reader) {
-            const caseIndex = reader.readInt8();
-            if (caseIndex === NO_CASE) {
-                return {};
-            }
-            const $case = specKeys[caseIndex - 1];
+            const $case = specKeys[reader.readInt8() - 1];
             const value = specs[$case].deserialize(reader);
             return { $case, value };
         },

package/dist-cjs/systems/cyclicParentingChecker.js

@@ -42,22 +42,17 @@ const components = __importStar(require("../components"));
  */
 function cyclicParentingChecker(engine) {
     const Transform = components.Transform(engine);
-    // Reused by every walk: the checker is synchronous, so only one is ever in
-    // flight. A cycle anywhere above the entity has to end the walk, not only one
-    // the entity is part of, otherwise the ancestors repeat forever.
-    const visited = new Set();
     return () => {
         for (const entity of Transform.dirtyIterator()) {
-            visited.clear();
-            visited.add(entity);
             let transform = Transform.getOrNull(entity);
             while (transform && transform.parent) {
-                if (visited.has(transform.parent)) {
+                if (transform.parent === entity) {
                     console.error(`There is a cyclic parent with entity ${entity}`);
                     break;
                 }
-                visited.add(transform.parent);
-                transform = Transform.getOrNull(transform.parent);
+                else {
+                    transform = Transform.getOrNull(transform.parent);
+                }
             }
         }
     };

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

@@ -50,6 +50,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 +146,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,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);