@dcl/ecs 7.0.6-3807227301.commit-1045452 → 7.0.6-3808797047.commit-ee7ea04

package/dist/systems/events.d.ts

@@ -5,9 +5,10 @@ import { Entity } from '../engine/entity';
 import { IInputSystem } from '../engine/input';
 export declare type EventSystemCallback = (event: PBPointerEventsResult_PointerCommand) => void;
 export declare type EventSystemOptions = {
-    button?: InputAction;
+    button: InputAction;
     hoverText?: string;
     maxDistance?: number;
+    showFeedback?: boolean;
 };
 export declare type PointerEventsSystem = ReturnType<typeof createPointerEventSystem>;
 export declare function createPointerEventSystem(engine: IEngine, inputSystem: IInputSystem): {
@@ -36,7 +37,7 @@ export declare function createPointerEventSystem(engine: IEngine, inputSystem: I
      * @param cb - Function to execute when onPointerDown fires
      * @param opts - Opts to trigger Feedback and Button
      */
-    onClick(entity: Entity, cb: EventSystemCallback, opts?: EventSystemOptions): void;
+    onClick(entity: Entity, cb: EventSystemCallback, opts?: Partial<EventSystemOptions>): void;
     /**
      * @public
      * Execute callback when the user press the InputButton pointing at the entity
@@ -44,7 +45,7 @@ export declare function createPointerEventSystem(engine: IEngine, inputSystem: I
      * @param cb - Function to execute when click fires
      * @param opts - Opts to trigger Feedback and Button
      */
-    onPointerDown(entity: Entity, cb: EventSystemCallback, opts?: EventSystemOptions): void;
+    onPointerDown(entity: Entity, cb: EventSystemCallback, opts?: Partial<EventSystemOptions>): void;
     /**
      * @public
      * Execute callback when the user releases the InputButton pointing at the entity
@@ -52,5 +53,5 @@ export declare function createPointerEventSystem(engine: IEngine, inputSystem: I
      * @param cb - Function to execute when click fires
      * @param opts - Opts to trigger Feedback and Button
      */
-    onPointerUp(entity: Entity, cb: EventSystemCallback, opts?: EventSystemOptions): void;
+    onPointerUp(entity: Entity, cb: EventSystemCallback, opts?: Partial<EventSystemOptions>): void;
 };

package/dist/systems/events.js

@@ -1,7 +1,7 @@
 import * as components from '../components';
 import { checkNotThenable } from '../runtime/invariant';
 export function createPointerEventSystem(engine, inputSystem) {
-    const PointerHoverFeedback = components.PointerHoverFeedback(engine);
+    const PointerEvents = components.PointerEvents(engine);
     let EventType;
     (function (EventType) {
         EventType[EventType["Click"] = 0] = "Click";
@@ -10,31 +10,28 @@ export function createPointerEventSystem(engine, inputSystem) {
     })(EventType || (EventType = {}));
     const getDefaultOpts = (opts = {}) => ({
         button: 3 /* InputAction.IA_ANY */,
-        hoverText: 'Interact',
-        maxDistance: 100,
         ...opts
     });
     const eventsMap = new Map();
     function getEvent(entity) {
         return (eventsMap.get(entity) || eventsMap.set(entity, new Map()).get(entity));
     }
-    function setHoverFeedback(entity, type, opts) {
-        if (opts.hoverText) {
-            const pointerEvent = PointerHoverFeedback.getMutableOrNull(entity) ||
-                PointerHoverFeedback.create(entity);
+    function setPointerEvent(entity, type, opts) {
+        if (opts.hoverText || opts.showFeedback) {
+            const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity);
             pointerEvent.pointerEvents.push({
                 eventType: type,
                 eventInfo: {
                     button: opts.button,
-                    showFeedback: true,
+                    showFeedback: opts.showFeedback,
                     hoverText: opts.hoverText,
                     maxDistance: opts.maxDistance
                 }
             });
         }
     }
-    function removeHoverFeedback(entity, type, button) {
-        const pointerEvent = PointerHoverFeedback.getMutableOrNull(entity);
+    function removePointerEvent(entity, type, button) {
+        const pointerEvent = PointerEvents.getMutableOrNull(entity);
         if (!pointerEvent)
             return;
         pointerEvent.pointerEvents = pointerEvent.pointerEvents.filter((pointer) => !(pointer.eventInfo?.button === button && pointer.eventType === type));
@@ -49,7 +46,7 @@ export function createPointerEventSystem(engine, inputSystem) {
         const event = getEvent(entity);
         const pointerEvent = event.get(type);
         if (pointerEvent?.opts.hoverText) {
-            removeHoverFeedback(entity, getPointerEvent(type), pointerEvent.opts.button);
+            removePointerEvent(entity, getPointerEvent(type), pointerEvent.opts.button);
         }
         event.delete(type);
     }
@@ -113,7 +110,7 @@ export function createPointerEventSystem(engine, inputSystem) {
             removeEvent(entity, EventType.Click);
             // Set new event
             getEvent(entity).set(EventType.Click, { cb, opts: options });
-            setHoverFeedback(entity, 1 /* PointerEventType.PET_DOWN */, options);
+            setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
         },
         /**
          * @public
@@ -126,7 +123,7 @@ export function createPointerEventSystem(engine, inputSystem) {
             const options = getDefaultOpts(opts);
             removeEvent(entity, EventType.Down);
             getEvent(entity).set(EventType.Down, { cb, opts: options });
-            setHoverFeedback(entity, 1 /* PointerEventType.PET_DOWN */, options);
+            setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
         },
         /**
          * @public
@@ -139,7 +136,7 @@ export function createPointerEventSystem(engine, inputSystem) {
             const options = getDefaultOpts(opts);
             removeEvent(entity, EventType.Up);
             getEvent(entity).set(EventType.Up, { cb, opts: options });
-            setHoverFeedback(entity, 0 /* PointerEventType.PET_UP */, options);
+            setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options);
         }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/ecs",
-  "version": "7.0.6-3807227301.commit-1045452",
+  "version": "7.0.6-3808797047.commit-ee7ea04",
   "description": "Decentraland ECS",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
@@ -27,13 +27,19 @@
     "ts-proto": "^1.112.0"
   },
   "dependencies": {
-    "@dcl/crdt": "7.0.6-3807227301.commit-1045452",
+    "@dcl/crdt": "7.0.6-3808797047.commit-ee7ea04",
     "@dcl/js-runtime": "file:../js-runtime",
-    "@dcl/protocol": "^1.0.0-3766287015.commit-7d88411"
+    "@dcl/protocol": "^1.0.0-3808528053.commit-d66d462"
   },
   "files": [
     "dist",
     "etc"
   ],
-  "commit": "104545291581dd38595dbfc46135d0f573d306ff"
+  "typedoc": {
+    "entryPoint": "./src/index.ts",
+    "readmeFile": "./README.md",
+    "displayName": "ECS",
+    "tsconfig": "./tsconfig.json"
+  },
+  "commit": "ee7ea0434ecbd9e92db737237a67cd02af989b73"
 }

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

@@ -1,8 +0,0 @@
-import { ISchema } from '../../schemas/ISchema';
-import { PBPointerHoverFeedback } from './pb/decentraland/sdk/components/pointer_hover_feedback.gen';
-/**
- *
- */
-export declare const PointerHoverFeedbackSchema: ISchema<PBPointerHoverFeedback> & {
-    COMPONENT_ID: number;
-};

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

@@ -1,19 +0,0 @@
-import { PBPointerHoverFeedback } from './pb/decentraland/sdk/components/pointer_hover_feedback.gen';
-/**
- *
- */
-export const PointerHoverFeedbackSchema = {
-    COMPONENT_ID: 1062,
-    serialize(value, builder) {
-        const writer = PBPointerHoverFeedback.encode(value);
-        const buffer = new Uint8Array(writer.finish(), 0, writer.len);
-        builder.writeBuffer(buffer, false);
-    },
-    deserialize(reader) {
-        return PBPointerHoverFeedback.decode(reader.buffer(), reader.remainingBytes());
-    },
-    create() {
-        // TODO: this is a hack.
-        return PBPointerHoverFeedback.decode(new Uint8Array());
-    }
-};

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

@@ -1,46 +0,0 @@
-import { InputAction } from './common/input_action.gen';
-import _m0 from 'protobufjs/minimal';
-export declare const enum PointerEventType {
-    PET_UP = 0,
-    PET_DOWN = 1,
-    PET_HOVER_ENTER = 2,
-    PET_HOVER_LEAVE = 3
-}
-export interface PBPointerHoverFeedback {
-    pointerEvents: PBPointerHoverFeedback_Entry[];
-}
-export interface PBPointerHoverFeedback_Info {
-    /** default=InputAction.ANY */
-    button?: InputAction | undefined;
-    /** default='Interact' */
-    hoverText?: string | undefined;
-    /** default=10 */
-    maxDistance?: number | undefined;
-    /** default=true */
-    showFeedback?: boolean | undefined;
-}
-export interface PBPointerHoverFeedback_Entry {
-    eventType: PointerEventType;
-    eventInfo: PBPointerHoverFeedback_Info | undefined;
-}
-/**
- * Internal
- */
-export declare const PBPointerHoverFeedback: {
-    encode(message: PBPointerHoverFeedback, writer?: _m0.Writer): _m0.Writer;
-    decode(input: _m0.Reader | Uint8Array, length?: number): PBPointerHoverFeedback;
-};
-/**
- * Internal
- */
-export declare const PBPointerHoverFeedback_Info: {
-    encode(message: PBPointerHoverFeedback_Info, writer?: _m0.Writer): _m0.Writer;
-    decode(input: _m0.Reader | Uint8Array, length?: number): PBPointerHoverFeedback_Info;
-};
-/**
- * Internal
- */
-export declare const PBPointerHoverFeedback_Entry: {
-    encode(message: PBPointerHoverFeedback_Entry, writer?: _m0.Writer): _m0.Writer;
-    decode(input: _m0.Reader | Uint8Array, length?: number): PBPointerHoverFeedback_Entry;
-};