@dcl/sdk 7.0.0-3349175623.commit-522e724 → 7.0.0-3380949689.commit-663e9f5

package/dist/playground/snippets/cube-spawner.ts

@@ -1,24 +1,10 @@
 // Cube factory
-function createCube(x: number, y: number, z: number, spawner = true): Entity {
+function createCube(x: number, y: number, z: number): Entity {
   const meshEntity = engine.addEntity()
   Transform.create(meshEntity, { position: { x, y, z } })
   MeshRenderer.create(meshEntity, { mesh: { $case: 'box', box: { uvs: [] } } })
   MeshCollider.create(meshEntity, { mesh: { $case: 'box', box: {} } })
-  if (spawner) {
-    PointerHoverFeedback.create(meshEntity, {
-      pointerEvents: [
-        {
-          eventType: PointerEventType.PET_DOWN,
-          eventInfo: {
-            button: InputAction.IA_PRIMARY,
-            hoverText: 'Press E to spawn',
-            maxDistance: 100,
-            showFeedback: true
-          }
-        }
-      ]
-    })
-  }
+
   return meshEntity
 }
 
@@ -38,23 +24,16 @@ function circularSystem(dt: number) {
   }
 }
 
-function spawnerSystem() {
-  const clickedCubes = engine.getEntitiesWith(PointerHoverFeedback)
-  for (const [entity] of clickedCubes) {
-    if (Input.wasJustClicked(InputAction.IA_PRIMARY, entity)) {
-      createCube(
-        1 + Math.random() * 8,
-        Math.random() * 8,
-        1 + Math.random() * 8,
-        false
-      )
-    }
-  }
-}
-
 // Init
-createCube(8, 1, 8)
+const initEntity = createCube(8, 1, 8)
+EventsSystem.onPointerDown(
+  initEntity,
+  () => {
+    createCube(1 + Math.random() * 8, Math.random() * 8, 1 + Math.random() * 8)
+  },
+  { button: InputAction.IA_PRIMARY, hoverText: 'Press E to spawn' }
+)
+
 engine.addSystem(circularSystem)
-engine.addSystem(spawnerSystem)
 
 

package/dist/playground/snippets/ui.tsx

@@ -114,7 +114,13 @@ function circularSystem(dt: number) {
 function spawnerSystem() {
   const clickedCubes = engine.getEntitiesWith(PointerHoverFeedback)
   for (const [entity] of clickedCubes) {
-    if (Input.wasJustClicked(InputAction.IA_PRIMARY, entity)) {
+    if (
+      Input.isTriggered(
+        InputAction.IA_PRIMARY,
+        PointerEventType.PET_DOWN,
+        entity
+      )
+    ) {
       counter++
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/sdk",
-  "version": "7.0.0-3349175623.commit-522e724",
+  "version": "7.0.0-3380949689.commit-663e9f5",
   "description": "",
   "main": "dist/src/index.js",
   "typings": "dist/index.d.ts",
@@ -23,12 +23,12 @@
     "artifacts"
   ],
   "dependencies": {
-    "@dcl/amd": "6.11.11-3349175623.commit-522e724",
-    "@dcl/build-ecs": "6.11.11-3349175623.commit-522e724",
+    "@dcl/amd": "6.11.11-3380949689.commit-663e9f5",
+    "@dcl/build-ecs": "6.11.11-3380949689.commit-663e9f5",
     "@dcl/kernel": "^1.0.0-3339209749.commit-fa9e5d7",
     "@dcl/posix": "^1.0.4",
     "@dcl/unity-renderer": "^1.0.59980-20221027151836.commit-cc26142"
   },
   "minCliVersion": "3.12.3",
-  "commit": "522e724ec65aef9e7986069e9e65acb51e1a21be"
+  "commit": "663e9f55b50e559eb3e2ba7d2f4168623bcc6d92"
 }

package/types/ecs7/index.d.ts

@@ -1218,42 +1218,37 @@ declare const entitySymbol: unique symbol;
  */
 declare const error: (message: string | Error, data?: any) => void;
 
+declare type EventsSystem = typeof EventsSystem;
+
 declare namespace EventsSystem {
     export type Callback = (event: PBPointerEventsResult_PointerCommand) => void | Promise<void>;
     export type Options = {
         button?: InputAction;
         hoverText?: string;
+        maxDistance?: number;
     };
     /**
-     * Remove the callback for onClick event
-     * @param entity Entity where the callback was attached
-     */
-    export function removeOnClick(entity: Entity): void;
-    /**
+     * @public
      * Remove the callback for onPointerDown event
      * @param entity Entity where the callback was attached
      */
     export function removeOnPointerDown(entity: Entity): void;
     /**
+     * @public
      * Remove the callback for onPointerUp event
      * @param entity Entity where the callback was attached
      */
     export function removeOnPointerUp(entity: Entity): void;
     /**
-     * Execute callback when the user clicks the entity.
-     * @param entity Entity to attach the callback
-     * @param cb Function to execute when onPointerDown fires
-     * @param opts Opts to trigger Feedback and Button
-     */
-    export function onClick(entity: Entity, cb: Callback, opts?: Options): void;
-    /**
-     * Execute callback when the user a the entity
+     * @public
+     * Execute callback when the user press the InputButton pointing at the entity
      * @param entity Entity to attach the callback
      * @param cb Function to execute when click fires
      * @param opts Opts to trigger Feedback and Button
      */
     export function onPointerDown(entity: Entity, cb: Callback, opts?: Options): void;
     /**
+     * @public
      * Execute callback when the user releases the InputButton pointing at the entity
      * @param entity Entity to attach the callback
      * @param cb Function to execute when click fires
@@ -1430,40 +1425,24 @@ declare function IEnum<T>(type: ISchema<any>): ISchema<T>;
  */
 declare type IInput = {
     /**
-     * Check if a click was emmited in the current tick for the input action.
-     * This is defined when an UP event is triggered with a previously DOWN state.
-     * @param inputAction - the input action to query
-     * @param entity - the entity to query, ignore for global events.
-     * @returns true if the entity was clicked in the last tick-update
-     */
-    wasJustClicked: (inputAction: InputAction, entity?: Entity) => boolean;
-    /**
-     * Check if a pointer event has been emited in the last tick-update.
+     * @public
+     * Check if a pointer event has been emitted in the last tick-update.
      * @param inputAction - the input action to query
      * @param pointerEventType - the pointer event type to query
      * @param entity - the entity to query, ignore for global
-     * @returns
+     * @returns boolean
      */
-    wasInputJustActive: (inputAction: InputAction, pointerEventType: PointerEventType, entity?: Entity) => boolean;
+    isTriggered: (inputAction: InputAction, pointerEventType: PointerEventType, entity?: Entity) => boolean;
     /**
-     * Check if an input action is in DOWN state.
-     * @param inputAction - the input action to query
-     * @returns true if the input action is being pressed
-     */
-    isActionDown: (inputAction: InputAction) => boolean;
-    /**
-     * Get the click info if a click was emmited in the current tick for the input action.
-     * This is defined when an UP event is triggered with a previously DOWN state.
+     * @public
+     * Check if an input action is currently being pressed.
      * @param inputAction - the input action to query
-     * @param entity - the entity to query, ignore for global events.
-     * @returns the click info or undefined if there is no command in the last tick-update
+     * @returns boolean
      */
-    getClick: (inputAction: InputAction, entity?: Entity) => {
-        up: PBPointerEventsResult_PointerCommand;
-        down: PBPointerEventsResult_PointerCommand;
-    } | null;
+    isPressed: (inputAction: InputAction) => boolean;
     /**
-     * Get the input command info if a pointer event has been emited in the last tick-update.
+     * @public
+     * Get the input command info if a pointer event has been emitted in the last tick-update.
      * @param inputAction - the input action to query
      * @param pointerEventType - the pointer event type to query
      * @param entity - the entity to query, ignore for global
@@ -1525,25 +1504,6 @@ declare type ISchema<T = any> = {
  */
 declare const log: (...a: any[]) => void;
 
-/**
- * @public
- * Make the collision mask with some collider layers
- * @param layers a array layers to be assigned
- * @returns collisionMask to be used in the MeshCollider field
- * @example
- * ```ts
- * // Physics and Pointer are the defaults
- * MeshCollider.create(entity, {
- *  collisionMask: makeCollisionMask(
- *    ColliderLayer.Physics,
- *    ColliderLayer.Pointer
- *   ),
- *  box: {}
- * })
- * ```
- */
-declare function makeCollisionMask(...layers: ColliderLayer[]): number;
-
 /** @public */
 declare const Material: ComponentDefinition<ISchema<PBMaterial>, PBMaterial>;
 

package/types/rpc-modules/EngineApi/index.d.ts

@@ -149,12 +149,24 @@ declare module "~system/EngineApi" {
         positionChanged?: PositionChangedPayload | undefined;
         rotationChanged?: RotationChangedPayload | undefined;
     }
+    export interface CrdtSendToRendererRequest {
+        data: Uint8Array;
+    }
+    export interface CrdtSendToResponse {
+    }
+    export interface CrdtMessageFromRendererRequest {
+    }
+    export interface CrdtMessageFromRendererResponse {
+        data: Uint8Array[];
+    }
 
 // ########### BLOCK 
 
-    // importtype { ManyEntityAction, SendBatchResponse, SubscribeRequest, SubscribeResponse, UnsubscribeRequest, UnsubscribeResponse } from "proto/decentraland/kernel/apis/engine_api.gen";
+    // importtype { ManyEntityAction, SendBatchResponse, SubscribeRequest, SubscribeResponse, UnsubscribeRequest, UnsubscribeResponse, CrdtSendToRendererRequest, CrdtSendToResponse, CrdtMessageFromRendererRequest, CrdtMessageFromRendererResponse } from "proto/decentraland/kernel/apis/engine_api.gen";
     export function sendBatch(body: ManyEntityAction): Promise<SendBatchResponse>;
     export function subscribe(body: SubscribeRequest): Promise<SubscribeResponse>;
     export function unsubscribe(body: UnsubscribeRequest): Promise<UnsubscribeResponse>;
+    export function crdtSendToRenderer(body: CrdtSendToRendererRequest): Promise<CrdtSendToResponse>;
+    export function crdtGetMessageFromRenderer(body: CrdtMessageFromRendererRequest): Promise<CrdtMessageFromRendererResponse>;
 
 }

package/types/tsconfig.ecs7.json

@@ -29,7 +29,6 @@
       "rpc-modules/EngineApi",
       "rpc-modules/EnvironmentApi",
       "rpc-modules/EthereumController",
-      "rpc-modules/ExperimentalApi",
       "rpc-modules/ParcelIdentity",
       "rpc-modules/Permissions",
       "rpc-modules/Players",

package/types/rpc-modules/ExperimentalApi/index.d.ts

@@ -1,20 +0,0 @@
-declare module "~system/ExperimentalApi" {
-
-    export interface SendToRendererRequest {
-        data: Uint8Array;
-    }
-    export interface SendToResponse {
-    }
-    export interface MessageFromRendererRequest {
-    }
-    export interface MessageFromRendererResponse {
-        data: Uint8Array[];
-    }
-
-// ########### BLOCK 
-
-    // importtype { SendToRendererRequest, SendToResponse, MessageFromRendererRequest, MessageFromRendererResponse } from "proto/decentraland/kernel/apis/experimental_api.gen";
-    export function sendToRenderer(body: SendToRendererRequest): Promise<SendToResponse>;
-    export function messageFromRenderer(body: MessageFromRendererRequest): Promise<MessageFromRendererResponse>;
-
-}