@dcl/ecs 7.25.1-30828532396.commit-0c215c3 → 7.25.1-30863706897.commit-bc71402

package/dist-cjs/engine/input.js

@@ -213,18 +213,12 @@ function createInputSystem(engine) {
     function isPressed(inputAction) {
         return globalState.buttonState.get(inputAction)?.state === 1 /* PointerEventType.PET_DOWN */;
     }
-    function* getInputCommands() {
-        for (let i = globalState.thisFrameCommands.length - 1; i >= 0; i--) {
-            yield globalState.thisFrameCommands[i];
-        }
-    }
     return {
         isPressed,
         getClick,
         getInputCommand,
         isClicked,
-        isTriggered,
-        getInputCommands
+        isTriggered
     };
 }
 exports.createInputSystem = createInputSystem;

package/dist-cjs/index.d.ts

@@ -4,7 +4,6 @@ export * from './runtime/globals';
 export * from './runtime/initialization';
 export * from './runtime/types';
 export * from './runtime/helpers';
-export * from './runtime/globals';
 export { cyclicParentingChecker } from './systems/cyclicParentingChecker';
 export * from './systems/events';
 export * from './systems/raycast';
@@ -16,12 +15,13 @@ export * from './systems/triggerArea';
 export * from './systems/physics';
 export * from './engine/entity';
 export * from './components/types';
-import { MaterialComponentDefinitionExtended, MeshColliderComponentDefinitionExtended, MeshRendererComponentDefinitionExtended, TransformComponentExtended, AnimatorComponentDefinitionExtended, AudioSourceComponentDefinitionExtended, AudioStreamComponentDefinitionExtended, ISyncComponents, TweenComponentDefinitionExtended, INetowrkEntity, INetowrkParent, VirtualCameraComponentDefinitionExtended, InputModifierComponentDefinitionExtended, LightSourceComponentDefinitionExtended, TriggerAreaComponentDefinitionExtended, ParticleSystemComponentDefinitionExtended } 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 { NameComponent } from './components/manual/Name';
 import { TagsComponentDefinitionExtended } from './components/manual/Tags';
 export declare const Transform: TransformComponentExtended;
 export declare const Animator: AnimatorComponentDefinitionExtended;
 export declare const AudioSource: AudioSourceComponentDefinitionExtended;
+export declare const AudioAnalysis: AudioAnalysisComponentDefinitionExtended;
 export declare const AudioStream: AudioStreamComponentDefinitionExtended;
 export declare const Material: MaterialComponentDefinitionExtended;
 export declare const MeshRenderer: MeshRendererComponentDefinitionExtended;
@@ -34,6 +34,7 @@ export declare const InputModifier: InputModifierComponentDefinitionExtended;
 export declare const LightSource: LightSourceComponentDefinitionExtended;
 export declare const TriggerArea: TriggerAreaComponentDefinitionExtended;
 export declare const ParticleSystem: ParticleSystemComponentDefinitionExtended;
+export declare const TouchScreenControls: TouchScreenControlsComponentDefinitionExtended;
 /**
  * @alpha
  * This is going to be used for sync components through a server.

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.ParticleSystem = exports.TriggerArea = exports.LightSource = exports.InputModifier = exports.VirtualCamera = exports.Tween = exports.Tags = exports.Name = exports.MeshCollider = exports.MeshRenderer = exports.Material = exports.AudioStream = 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.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);
@@ -34,7 +34,6 @@ __exportStar(require("./runtime/globals"), exports);
 __exportStar(require("./runtime/initialization"), exports);
 __exportStar(require("./runtime/types"), exports);
 __exportStar(require("./runtime/helpers"), exports);
-__exportStar(require("./runtime/globals"), exports);
 var cyclicParentingChecker_1 = require("./systems/cyclicParentingChecker");
 Object.defineProperty(exports, "cyclicParentingChecker", { enumerable: true, get: function () { return cyclicParentingChecker_1.cyclicParentingChecker; } });
 __exportStar(require("./systems/events"), exports);
@@ -55,6 +54,7 @@ const initialization_1 = require("./runtime/initialization");
 exports.Transform = components.Transform(initialization_1.engine);
 exports.Animator = components.Animator(initialization_1.engine);
 exports.AudioSource = components.AudioSource(initialization_1.engine);
+exports.AudioAnalysis = components.AudioAnalysis(initialization_1.engine);
 exports.AudioStream = components.AudioStream(initialization_1.engine);
 exports.Material = components.Material(initialization_1.engine);
 exports.MeshRenderer = components.MeshRenderer(initialization_1.engine);
@@ -68,6 +68,8 @@ exports.LightSource = components.LightSource(initialization_1.engine);
 exports.TriggerArea = components.TriggerArea(initialization_1.engine);
 exports.ParticleSystem = 
 /* @__PURE__*/ components.ParticleSystem(initialization_1.engine);
+exports.TouchScreenControls = 
+/* @__PURE__*/ components.TouchScreenControls(initialization_1.engine);
 /**
  * @alpha
  * This is going to be used for sync components through a server.

package/dist-cjs/runtime/globals.d.ts

@@ -1,6 +1,5 @@
 /**
- * Utilities for standardized globalThis access.
- * @public
+ * Internal utilities for standardized globalThis access.
  */
 /**
  * Type-safe globalThis property access.

package/dist-cjs/runtime/globals.js

@@ -1,7 +1,6 @@
 "use strict";
 /**
- * Utilities for standardized globalThis access.
- * @public
+ * Internal utilities for standardized globalThis access.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setGlobalPolyfill = exports.getGlobal = void 0;

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

@@ -19,12 +19,6 @@ export type EventSystemOptions = {
     maxPlayerDistance?: number;
     priority?: number;
 };
-/**
- * @public
- */
-export type EventSystemOptionsCallback = EventSystemOptions & {
-    cb: EventSystemCallback;
-};
 export declare const getDefaultOpts: (opts?: Partial<EventSystemOptions>) => EventSystemOptions;
 /**
  * @public
@@ -54,24 +48,6 @@ 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
@@ -96,19 +72,11 @@ export interface PointerEventsSystem {
      * @param entity - Entity where the callback was attached
      */
     removeOnProximityLeave(entity: Entity): void;
-    /**
-     * @public
-     * Execute callbacks when the user presses one of the InputButtons pointing at the entity
-     * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
-     */
-    onPointerDown(pointerData: {
-        entity: Entity;
-        optsList: EventSystemOptionsCallback[];
-    }): void;
     /**
      * @public
      * Execute callback when the user press the InputButton pointing at the entity
      * @param pointerData - Entity to attach the callback, Opts to trigger Feedback and Button
+     * @param cb - Function to execute when click fires
      */
     onPointerDown(pointerData: {
         entity: Entity;
@@ -121,15 +89,6 @@ export interface PointerEventsSystem {
      * @param opts - Opts to trigger Feedback and Button
      */
     onPointerDown(entity: Entity, cb: EventSystemCallback, opts?: Partial<EventSystemOptions>): void;
-    /**
-     * @public
-     * Execute callbacks when the user releases one of the InputButtons pointing at the entity
-     * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
-     */
-    onPointerUp(pointerData: {
-        entity: Entity;
-        optsList: EventSystemOptionsCallback[];
-    }): void;
     /**
      * @public
      * Execute callback when the user releases the InputButton pointing at the entity
@@ -167,64 +126,6 @@ export interface PointerEventsSystem {
         entity: Entity;
         opts?: Partial<EventSystemOptions>;
     }, cb: EventSystemCallback): void;
-    /**
-     * @public
-     * Execute callbacks when the user drags the pointer from inside the entity
-     * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
-     */
-    onPointerDrag(pointerData: {
-        entity: Entity;
-        optsList: EventSystemOptionsCallback[];
-    }): void;
-    /**
-     * @public
-     * Execute callback when the user clicks and drags the pointer from inside the entity
-     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
-     * @param cb - Function to execute when click fires
-     */
-    onPointerDrag(pointerData: {
-        entity: Entity;
-        opts?: Partial<EventSystemOptions>;
-    }, cb: EventSystemCallback): void;
-    /**
-     * @public
-     * Execute callbacks when the user drags the pointer from inside the entity, locking the cursor in place.
-     * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
-     */
-    onPointerDragLocked(pointerData: {
-        entity: Entity;
-        optsList: EventSystemOptionsCallback[];
-    }): void;
-    /**
-     * @public
-     * Execute callback when the user clicks and drags the pointer from inside the entity,
-     * locking the cursor in place
-     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
-     * @param cb - Function to execute when click fires
-     */
-    onPointerDragLocked(pointerData: {
-        entity: Entity;
-        opts?: Partial<EventSystemOptions>;
-    }, cb: EventSystemCallback): void;
-    /**
-     * @public
-     * Execute callbacks when the user releases a button after a drag
-     * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
-     */
-    onPointerDragEnd(pointerData: {
-        entity: Entity;
-        optsList: EventSystemOptionsCallback[];
-    }): void;
-    /**
-     * @public
-     * Execute callback when the user releases the button after a drag
-     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
-     * @param cb - Function to execute when click fires
-     */
-    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

@@ -45,11 +45,8 @@ function createPointerEventsSystem(engine, inputSystem) {
         EventType[EventType["Up"] = 2] = "Up";
         EventType[EventType["HoverEnter"] = 3] = "HoverEnter";
         EventType[EventType["HoverLeave"] = 4] = "HoverLeave";
-        EventType[EventType["Drag"] = 5] = "Drag";
-        EventType[EventType["DragLocked"] = 6] = "DragLocked";
-        EventType[EventType["DragEnd"] = 7] = "DragEnd";
-        EventType[EventType["ProximityEnter"] = 8] = "ProximityEnter";
-        EventType[EventType["ProximityLeave"] = 9] = "ProximityLeave";
+        EventType[EventType["ProximityEnter"] = 5] = "ProximityEnter";
+        EventType[EventType["ProximityLeave"] = 6] = "ProximityLeave";
     })(EventType || (EventType = {}));
     const eventsMap = new Map();
     function getEvent(entity) {
@@ -59,7 +56,6 @@ function createPointerEventsSystem(engine, inputSystem) {
         const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity);
         pointerEvent.pointerEvents.push({
             eventType: type,
-            interactionType,
             eventInfo: {
                 button: opts.button,
                 showFeedback: opts.showFeedback,
@@ -68,7 +64,8 @@ function createPointerEventsSystem(engine, inputSystem) {
                 maxDistance: opts.maxDistance,
                 maxPlayerDistance: opts.maxPlayerDistance,
                 priority: opts.priority
-            }
+            },
+            interactionType: interactionType ?? 0 /* InteractionType.CURSOR */
         });
     }
     function removePointerEvent(entity, type, button, interactionType = 0 /* InteractionType.CURSOR */) {
@@ -89,15 +86,6 @@ function createPointerEventsSystem(engine, inputSystem) {
         else if (eventType === EventType.HoverEnter) {
             return 2 /* PointerEventType.PET_HOVER_ENTER */;
         }
-        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 */;
-        }
         else if (eventType === EventType.ProximityEnter) {
             return 4 /* PointerEventType.PET_PROXIMITY_ENTER */;
         }
@@ -106,157 +94,109 @@ function createPointerEventsSystem(engine, inputSystem) {
         }
         return 1 /* PointerEventType.PET_DOWN */;
     }
-    function getEventType(pet) {
-        if (pet === 0 /* PointerEventType.PET_UP */) {
-            return EventType.Up;
-        }
-        else if (pet === 2 /* PointerEventType.PET_HOVER_ENTER */) {
-            return EventType.HoverEnter;
-        }
-        else if (pet === 3 /* PointerEventType.PET_HOVER_LEAVE */) {
-            return EventType.HoverLeave;
-        }
-        else if (pet === 7 /* PointerEventType.PET_DRAG */) {
-            return EventType.Drag;
-        }
-        else if (pet === 6 /* PointerEventType.PET_DRAG_LOCKED */) {
-            return EventType.DragLocked;
-        }
-        else if (pet === 8 /* PointerEventType.PET_DRAG_END */) {
-            return EventType.DragEnd;
-        }
-        else if (pet === 4 /* PointerEventType.PET_PROXIMITY_ENTER */) {
-            return EventType.ProximityEnter;
-        }
-        else if (pet === 5 /* PointerEventType.PET_PROXIMITY_LEAVE */) {
-            return EventType.ProximityLeave;
-        }
-        else {
-            return EventType.Down;
-        }
-    }
     function removeEvent(entity, type, interactionType = 0 /* InteractionType.CURSOR */) {
         const event = getEvent(entity);
-        const pointerEventList = event.get(type);
-        if (pointerEventList === undefined) {
-            return;
-        }
-        for (const button of pointerEventList.keys()) {
-            removePointerEvent(entity, getPointerEvent(type), button, interactionType);
+        const pointerEvent = event.get(type);
+        if (pointerEvent?.opts.hoverText) {
+            removePointerEvent(entity, getPointerEvent(type), pointerEvent.opts.button);
         }
         event.delete(type);
     }
     engine.addSystem(function EventSystem() {
-        if (eventsMap.size === 0) {
-            return;
-        }
-        for (const entity of eventsMap.keys()) {
+        for (const [entity, event] of eventsMap) {
             if (engine.getEntityState(entity) === entity_1.EntityState.Removed) {
                 eventsMap.delete(entity);
-            }
-        }
-        for (const command of inputSystem.getInputCommands()) {
-            const entity = command.hit?.entityId;
-            if (entity === undefined) {
                 continue;
             }
-            const entityMap = eventsMap.get(entity);
-            if (entityMap === undefined) {
-                continue;
-            }
-            const typeMap = entityMap.get(getEventType(command.state));
-            if (typeMap) {
-                const data = typeMap.get(command.button);
-                if (data) {
-                    (0, invariant_1.checkNotThenable)(data.cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
-                }
-                const anyData = typeMap.get(3 /* InputAction.IA_ANY */);
-                if (anyData) {
-                    (0, invariant_1.checkNotThenable)(anyData.cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
+            for (const [eventType, { cb, opts }] of event) {
+                if (eventType === EventType.Click) {
+                    const command = inputSystem.getClick(opts.button, entity);
+                    if (command)
+                        (0, invariant_1.checkNotThenable)(cb(command.up), 'Click event returned a thenable. Only synchronous functions are allowed');
                 }
-            }
-            // check clicks separately
-            if (command.state === 0 /* PointerEventType.PET_UP */) {
-                const clickMap = entityMap.get(EventType.Click);
-                if (clickMap) {
-                    const data = clickMap.get(command.button);
-                    if (data && inputSystem.getClick(command.button, entity)) {
-                        (0, invariant_1.checkNotThenable)(data.cb(command), 'Click event returned a thenable. Only synchronous functions are allowed');
-                    }
-                    const anyData = clickMap.get(3 /* InputAction.IA_ANY */);
-                    if (anyData && inputSystem.getClick(command.button, entity)) {
-                        (0, invariant_1.checkNotThenable)(anyData.cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
+                if (eventType === EventType.Down ||
+                    eventType === EventType.Up ||
+                    eventType === EventType.HoverEnter ||
+                    eventType === EventType.HoverLeave ||
+                    eventType === EventType.ProximityEnter ||
+                    eventType === EventType.ProximityLeave) {
+                    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');
                     }
                 }
             }
         }
     });
-    // return a function with the correct event type.
-    // we use onPointerDown as the "archetype" for the returned function, but it fits with
-    // all the onPointer* declarations
-    const onPointerFunction = (ty) => {
-        return (arg0, arg1, arg2) => {
-            let entity;
-            let optsList;
-            if (typeof arg0 === 'number') {
-                // called as onPointerDown(entity: Entity, cb: EventSystemCallback, opts?: Partial<EventSystemOptions>): void
-                entity = arg0;
-                const cb = arg1;
-                const opts = arg2;
-                optsList = [{ cb, ...(0, exports.getDefaultOpts)(opts) }];
-            }
-            else if (typeof arg1 === 'function') {
-                // called as onPointerDown(pointerData: { entity: Entity; opts?: Partial<EventSystemOptions> }, cb: EventSystemCallback): void
-                const { entity: e, opts } = arg0;
-                const cb = arg1;
-                entity = e;
-                optsList = [{ cb, ...(0, exports.getDefaultOpts)(opts) }];
-            }
-            else {
-                // called as onPointerDown(pointerData: { entity: Entity; optsList: EventSystemOptionsCallback[] }): void
-                const { entity: e, optsList: o } = arg0;
-                entity = e;
-                optsList = o;
-            }
-            const previous = getEvent(entity).get(ty) ?? new Map();
-            const callbacks = new Map();
-            for (const opts of optsList) {
-                const prevOpts = previous.get(opts.button);
-                if (prevOpts !== undefined) {
-                    if (prevOpts.hoverText !== opts.hoverText ||
-                        prevOpts.maxDistance !== opts.maxDistance ||
-                        prevOpts.showFeedback !== opts.showFeedback ||
-                        prevOpts.showHighlight !== opts.showHighlight) {
-                        removePointerEvent(entity, getPointerEvent(ty), opts.button);
-                        setPointerEvent(entity, getPointerEvent(ty), opts);
-                    }
-                }
-                else {
-                    setPointerEvent(entity, getPointerEvent(ty), opts);
-                }
-                callbacks.set(opts.button, opts);
-            }
-            for (const button of previous.keys()) {
-                if (!callbacks.has(button)) {
-                    removePointerEvent(entity, getPointerEvent(ty), button);
-                }
-            }
-            getEvent(entity).set(ty, callbacks);
-        };
+    const onPointerDown = (...args) => {
+        const [data, cb, maybeOpts] = args;
+        if (typeof data === 'number') {
+            return onPointerDown({ entity: data, opts: maybeOpts ?? {} }, cb);
+        }
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.Down);
+        getEvent(entity).set(EventType.Down, { cb, opts: options });
+        setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
     };
-    // proximity events mirror the cursor setters but tag the PointerEvents entry
-    // with InteractionType.PROXIMITY so the renderer sources them from the avatar's
-    // position rather than the cursor ray (single-callback shape, as upstream).
-    const onProximityFunction = (ty, pet) => {
-        return (pointerData, cb) => {
-            const { entity, opts } = pointerData;
-            const options = (0, exports.getDefaultOpts)(opts);
-            removeEvent(entity, ty, 1 /* InteractionType.PROXIMITY */);
-            const callbacks = getEvent(entity).get(ty) ?? new Map();
-            callbacks.set(options.button, { cb, ...options });
-            getEvent(entity).set(ty, callbacks);
-            setPointerEvent(entity, pet, options, 1 /* InteractionType.PROXIMITY */);
-        };
+    const onPointerUp = (...args) => {
+        const [data, cb, maybeOpts] = args;
+        if (typeof data === 'number') {
+            return onPointerUp({ entity: data, opts: maybeOpts ?? {} }, cb);
+        }
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.Up);
+        getEvent(entity).set(EventType.Up, { cb, opts: options });
+        setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options);
+    };
+    const onPointerHoverEnter = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.HoverEnter);
+        getEvent(entity).set(EventType.HoverEnter, { cb, opts: options });
+        setPointerEvent(entity, 2 /* PointerEventType.PET_HOVER_ENTER */, options);
+    };
+    const onPointerHoverLeave = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.HoverLeave);
+        getEvent(entity).set(EventType.HoverLeave, { cb, opts: options });
+        setPointerEvent(entity, 3 /* PointerEventType.PET_HOVER_LEAVE */, 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 */);
+        getEvent(entity).set(EventType.Down, { cb, opts: options });
+        setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options, 1 /* InteractionType.PROXIMITY */);
+    };
+    const onProximityUp = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.Up, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.Up, { cb, opts: options });
+        setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options, 1 /* InteractionType.PROXIMITY */);
+    };
+    const onProximityEnter = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.ProximityEnter, 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) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.ProximityLeave, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.ProximityLeave, { cb, opts: options });
+        setPointerEvent(entity, 5 /* PointerEventType.PET_PROXIMITY_LEAVE */, options, 1 /* InteractionType.PROXIMITY */);
     };
     return {
         removeOnClick(entity) {
@@ -274,23 +214,6 @@ 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);
-        },
-        onClick: onPointerFunction(EventType.Click),
-        onPointerDown: onPointerFunction(EventType.Down),
-        onPointerUp: onPointerFunction(EventType.Up),
-        onPointerHoverEnter: onPointerFunction(EventType.HoverEnter),
-        onPointerHoverLeave: onPointerFunction(EventType.HoverLeave),
-        onPointerDrag: onPointerFunction(EventType.Drag),
-        onPointerDragLocked: onPointerFunction(EventType.DragLocked),
-        onPointerDragEnd: onPointerFunction(EventType.DragEnd),
         removeOnProximityDown(entity) {
             removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
         },
@@ -303,10 +226,23 @@ function createPointerEventsSystem(engine, inputSystem) {
         removeOnProximityLeave(entity) {
             removeEvent(entity, EventType.ProximityLeave, 1 /* InteractionType.PROXIMITY */);
         },
-        onProximityDown: onProximityFunction(EventType.Down, 1 /* PointerEventType.PET_DOWN */),
-        onProximityUp: onProximityFunction(EventType.Up, 0 /* PointerEventType.PET_UP */),
-        onProximityEnter: onProximityFunction(EventType.ProximityEnter, 4 /* PointerEventType.PET_PROXIMITY_ENTER */),
-        onProximityLeave: onProximityFunction(EventType.ProximityLeave, 5 /* PointerEventType.PET_PROXIMITY_LEAVE */)
+        onClick(value, cb) {
+            const { entity } = value;
+            const options = (0, exports.getDefaultOpts)(value.opts);
+            // Clear previous event with over feedback included
+            removeEvent(entity, EventType.Click);
+            // Set new event
+            getEvent(entity).set(EventType.Click, { cb, opts: options });
+            setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
+        },
+        onPointerDown,
+        onPointerUp,
+        onPointerHoverEnter,
+        onPointerHoverLeave,
+        onProximityDown,
+        onProximityUp,
+        onProximityEnter,
+        onProximityLeave
     };
 }
 exports.createPointerEventsSystem = createPointerEventsSystem;

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

@@ -1,4 +1,4 @@
-import { RaycastQueryType, RaycastShape, PBRaycastResult } from '../components';
+import { RaycastQueryType, PBRaycastResult } from '../components';
 import { DeepReadonlyObject, Entity } from '../engine';
 import { Vector3 } from '../components/generated/pb/decentraland/common/vectors.gen';
 /**
@@ -14,8 +14,6 @@ export type RaycastSystemOptions = {
     queryType: RaycastQueryType;
     continuous?: boolean | undefined;
     collisionMask?: number | undefined;
-    shape?: RaycastShape | undefined;
-    includeWorld?: boolean | undefined;
 };
 export type LocalDirectionRaycastSystemOptions = {
     direction?: Vector3;

package/dist-cjs/systems/raycast.js

@@ -84,8 +84,6 @@ 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.25.1-30828532396.commit-0c215c3",
+  "version": "7.25.1-30863706897.commit-bc71402",
   "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": "0c215c3495851aa943d616f3d4f7cfad5a32285e"
+  "commit": "bc71402cb794a96a08f023e52706c6d9c2616b59"
 }

package/dist/components/extended/AvatarEquippedData.d.ts

@@ -1,10 +0,0 @@
-import { IEngine, LastWriteWinElementSetComponentDefinition } from '../../engine';
-import { PBAvatarEquippedData } from '../generated/pb/decentraland/sdk/components/avatar_equipped_data.gen';
-/**
- * @public
- */
-export type AvatarEquippedDataComponentDefinitionExtended = LastWriteWinElementSetComponentDefinition<AvatarEquippedDataType>;
-export type AvatarEquippedDataType = Omit<PBAvatarEquippedData, 'forceRender'> & {
-    forceRender?: string[] | undefined;
-};
-export declare function defineAvatarEquippedDataComponent(engine: Pick<IEngine, 'defineComponentFromSchema'>): AvatarEquippedDataComponentDefinitionExtended;