@dcl/ecs 7.9.4-16839103320.commit-8a3e6ef → 7.9.4

package/dist-cjs/systems/events.js

@@ -45,9 +45,6 @@ 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 = {}));
     const eventsMap = new Map();
     function getEvent(entity) {
@@ -82,148 +79,77 @@ function createPointerEventsSystem(engine, inputSystem) {
         else if (eventType === EventType.HoverEnter) {
             return 2 /* PointerEventType.PET_HOVER_ENTER */;
         }
-        else if (eventType === EventType.Drag) {
-            return 5 /* PointerEventType.PET_DRAG */;
-        }
-        else if (eventType === EventType.DragLocked) {
-            return 4 /* PointerEventType.PET_DRAG_LOCKED */;
-        }
-        else if (eventType === EventType.DragEnd) {
-            return 6 /* PointerEventType.PET_DRAG_END */;
-        }
         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 === 5 /* PointerEventType.PET_DRAG */) {
-            return EventType.Drag;
-        }
-        else if (pet === 4 /* PointerEventType.PET_DRAG_LOCKED */) {
-            return EventType.DragLocked;
-        }
-        else if (pet === 6 /* PointerEventType.PET_DRAG_END */) {
-            return EventType.DragEnd;
-        }
-        else {
-            return EventType.Down;
-        }
-    }
     function removeEvent(entity, type) {
         const event = getEvent(entity);
-        const pointerEventList = event.get(type);
-        if (pointerEventList === undefined) {
-            return;
-        }
-        for (const button of pointerEventList.keys()) {
-            removePointerEvent(entity, getPointerEvent(type), button);
+        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');
+            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');
                 }
-                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');
-                }
-            }
-            // 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) {
+                    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);
+    };
+    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);
     };
     return {
         removeOnClick(entity) {
@@ -241,23 +167,19 @@ 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(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);
         },
-        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)
+        onPointerDown,
+        onPointerUp,
+        onPointerHoverEnter,
+        onPointerHoverLeave
     };
 }
 exports.createPointerEventsSystem = createPointerEventsSystem;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dcl/ecs",
   "description": "Decentraland ECS",
-  "version": "7.9.4-16839103320.commit-8a3e6ef",
+  "version": "7.9.4",
   "author": "DCL",
   "bugs": "https://github.com/decentraland/ecs/issues",
   "files": [
@@ -33,5 +33,5 @@
   },
   "types": "./dist/index.d.ts",
   "typings": "./dist/index.d.ts",
-  "commit": "8a3e6ef63a8f6295d57e1fef67cdaad0d52e7d47"
+  "commit": "0b187027d4df0f3dff46a492b0fc62fb2397a459"
 }

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;

package/dist/components/extended/AvatarEquippedData.js

@@ -1,15 +0,0 @@
-import { AvatarEquippedDataSchema } from '../generated/AvatarEquippedData.gen';
-export function defineAvatarEquippedDataComponent(engine) {
-    const patchedSchema = { ...AvatarEquippedDataSchema };
-    const origSerialize = patchedSchema.serialize;
-    patchedSchema.serialize = (value, builder) => {
-        if (value.forceRender === undefined) {
-            origSerialize({ forceRender: [], ...value }, builder);
-        }
-        else {
-            origSerialize(value, builder);
-        }
-    };
-    const theComponent = engine.defineComponentFromSchema('core::AvatarEquippedData', patchedSchema);
-    return theComponent;
-}

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

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

package/dist/components/extended/AvatarShape.js

@@ -1,15 +0,0 @@
-import { AvatarShapeSchema } from '../generated/AvatarShape.gen';
-export function defineAvatarShapeComponent(engine) {
-    const patchedSchema = { ...AvatarShapeSchema };
-    const origSerialize = patchedSchema.serialize;
-    patchedSchema.serialize = (value, builder) => {
-        if (value.forceRender === undefined) {
-            origSerialize({ forceRender: [], ...value }, builder);
-        }
-        else {
-            origSerialize(value, builder);
-        }
-    };
-    const theComponent = engine.defineComponentFromSchema('core::AvatarShape', patchedSchema);
-    return theComponent;
-}

package/dist/components/generated/CameraLayer.gen.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/components/generated/CameraLayers.gen.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/components/generated/CameraLayers.gen.js

@@ -1,25 +0,0 @@
-import { PBCameraLayers } from './pb/decentraland/sdk/components/camera_layers.gen';
-/**
- * @internal
- */
-export const CameraLayersSchema = {
-    COMPONENT_ID: 1208,
-    serialize(value, builder) {
-        const writer = PBCameraLayers.encode(value);
-        const buffer = new Uint8Array(writer.finish(), 0, writer.len);
-        builder.writeBuffer(buffer, false);
-    },
-    deserialize(reader) {
-        return PBCameraLayers.decode(reader.buffer(), reader.remainingBytes());
-    },
-    create() {
-        // TODO: this is a hack.
-        return PBCameraLayers.decode(new Uint8Array());
-    },
-    jsonSchema: {
-        type: "object",
-        properties: {},
-        serializationType: "protocol-buffer",
-        protocolBuffer: "PBCameraLayers"
-    }
-};

package/dist/components/generated/GlobalLight.gen.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/components/generated/GlobalLight.gen.js

@@ -1,25 +0,0 @@
-import { PBGlobalLight } from './pb/decentraland/sdk/components/global_light.gen';
-/**
- * @internal
- */
-export const GlobalLightSchema = {
-    COMPONENT_ID: 1206,
-    serialize(value, builder) {
-        const writer = PBGlobalLight.encode(value);
-        const buffer = new Uint8Array(writer.finish(), 0, writer.len);
-        builder.writeBuffer(buffer, false);
-    },
-    deserialize(reader) {
-        return PBGlobalLight.decode(reader.buffer(), reader.remainingBytes());
-    },
-    create() {
-        // TODO: this is a hack.
-        return PBGlobalLight.decode(new Uint8Array());
-    },
-    jsonSchema: {
-        type: "object",
-        properties: {},
-        serializationType: "protocol-buffer",
-        protocolBuffer: "PBGlobalLight"
-    }
-};

package/dist/components/generated/GltfNode.gen.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/components/generated/GltfNode.gen.js

@@ -1,25 +0,0 @@
-import { PBGltfNode } from './pb/decentraland/sdk/components/gltf_node.gen';
-/**
- * @internal
- */
-export const GltfNodeSchema = {
-    COMPONENT_ID: 1200,
-    serialize(value, builder) {
-        const writer = PBGltfNode.encode(value);
-        const buffer = new Uint8Array(writer.finish(), 0, writer.len);
-        builder.writeBuffer(buffer, false);
-    },
-    deserialize(reader) {
-        return PBGltfNode.decode(reader.buffer(), reader.remainingBytes());
-    },
-    create() {
-        // TODO: this is a hack.
-        return PBGltfNode.decode(new Uint8Array());
-    },
-    jsonSchema: {
-        type: "object",
-        properties: {},
-        serializationType: "protocol-buffer",
-        protocolBuffer: "PBGltfNode"
-    }
-};

package/dist/components/generated/GltfNodeState.gen.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/components/generated/GltfNodeState.gen.js

@@ -1,25 +0,0 @@
-import { PBGltfNodeState } from './pb/decentraland/sdk/components/gltf_node_state.gen';
-/**
- * @internal
- */
-export const GltfNodeStateSchema = {
-    COMPONENT_ID: 1201,
-    serialize(value, builder) {
-        const writer = PBGltfNodeState.encode(value);
-        const buffer = new Uint8Array(writer.finish(), 0, writer.len);
-        builder.writeBuffer(buffer, false);
-    },
-    deserialize(reader) {
-        return PBGltfNodeState.decode(reader.buffer(), reader.remainingBytes());
-    },
-    create() {
-        // TODO: this is a hack.
-        return PBGltfNodeState.decode(new Uint8Array());
-    },
-    jsonSchema: {
-        type: "object",
-        properties: {},
-        serializationType: "protocol-buffer",
-        protocolBuffer: "PBGltfNodeState"
-    }
-};

package/dist/components/generated/TextureCamera.gen.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/components/generated/TextureCamera.gen.js

@@ -1,25 +0,0 @@
-import { PBTextureCamera } from './pb/decentraland/sdk/components/texture_camera.gen';
-/**
- * @internal
- */
-export const TextureCameraSchema = {
-    COMPONENT_ID: 1207,
-    serialize(value, builder) {
-        const writer = PBTextureCamera.encode(value);
-        const buffer = new Uint8Array(writer.finish(), 0, writer.len);
-        builder.writeBuffer(buffer, false);
-    },
-    deserialize(reader) {
-        return PBTextureCamera.decode(reader.buffer(), reader.remainingBytes());
-    },
-    create() {
-        // TODO: this is a hack.
-        return PBTextureCamera.decode(new Uint8Array());
-    },
-    jsonSchema: {
-        type: "object",
-        properties: {},
-        serializationType: "protocol-buffer",
-        protocolBuffer: "PBTextureCamera"
-    }
-};

package/dist/components/generated/UiCanvas.gen.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/components/generated/UiCanvas.gen.js

@@ -1,25 +0,0 @@
-import { PBUiCanvas } from './pb/decentraland/sdk/components/ui_canvas.gen';
-/**
- * @internal
- */
-export const UiCanvasSchema = {
-    COMPONENT_ID: 1203,
-    serialize(value, builder) {
-        const writer = PBUiCanvas.encode(value);
-        const buffer = new Uint8Array(writer.finish(), 0, writer.len);
-        builder.writeBuffer(buffer, false);
-    },
-    deserialize(reader) {
-        return PBUiCanvas.decode(reader.buffer(), reader.remainingBytes());
-    },
-    create() {
-        // TODO: this is a hack.
-        return PBUiCanvas.decode(new Uint8Array());
-    },
-    jsonSchema: {
-        type: "object",
-        properties: {},
-        serializationType: "protocol-buffer",
-        protocolBuffer: "PBUiCanvas"
-    }
-};

package/dist/components/generated/UiScrollResult.gen.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/components/generated/UiScrollResult.gen.js

@@ -1,25 +0,0 @@
-import { PBUiScrollResult } from './pb/decentraland/sdk/components/ui_scroll_result.gen';
-/**
- * @internal
- */
-export const UiScrollResultSchema = {
-    COMPONENT_ID: 1202,
-    serialize(value, builder) {
-        const writer = PBUiScrollResult.encode(value);
-        const buffer = new Uint8Array(writer.finish(), 0, writer.len);
-        builder.writeBuffer(buffer, false);
-    },
-    deserialize(reader) {
-        return PBUiScrollResult.decode(reader.buffer(), reader.remainingBytes());
-    },
-    create() {
-        // TODO: this is a hack.
-        return PBUiScrollResult.decode(new Uint8Array());
-    },
-    jsonSchema: {
-        type: "object",
-        properties: {},
-        serializationType: "protocol-buffer",
-        protocolBuffer: "PBUiScrollResult"
-    }
-};

package/dist/components/generated/pb/decentraland/sdk/components/camera_layer.gen.d.ts

@@ -1,30 +0,0 @@
-import _m0 from "protobufjs/minimal";
-import { Color3 } from "../../common/colors.gen";
-/**
- * @public
- */
-export interface PBCameraLayer {
-    /**
-     * layer to which these settings apply. must be > 0
-     * Layer 0 is the default "real world" layer viewed by the player and cannot be modified.
-     */
-    layer: number;
-    /** should the sun light affect this layer? default false */
-    directionalLight?: boolean | undefined;
-    /** should this layer show player avatars? default false */
-    showAvatars?: boolean | undefined;
-    /** should this layer show the sky? default false */
-    showSkybox?: boolean | undefined;
-    /** should this layer show distance fog? default false */
-    showFog?: boolean | undefined;
-    /** ambient light overrides for this layer. default -> use same as main camera */
-    ambientColorOverride?: Color3 | undefined;
-    ambientBrightnessOverride?: number | undefined;
-}
-/**
- * @public
- */
-export declare namespace PBCameraLayer {
-    function encode(message: PBCameraLayer, writer?: _m0.Writer): _m0.Writer;
-    function decode(input: _m0.Reader | Uint8Array, length?: number): PBCameraLayer;
-}