@dcl/sdk 7.0.0-3314293671.commit-655be93 → 7.0.0-3328933314.commit-597ac43

package/dist/ecs7/proto-definitions/material.proto

@@ -3,23 +3,11 @@ syntax = "proto3";
 package decentraland.sdk.components;
 
 import "decentraland/common/colors.proto";
+import "decentraland/common/texture.proto";
 import "decentraland/sdk/components/common/id.proto";
 
 option (common.ecs_component_id) = 1017;
 
-enum TextureWrapMode {
-  TWM_REPEAT = 0;
-  TWM_CLAMP = 1;
-  TWM_MIRROR = 2;
-  TWM_MIRROR_ONCE = 3;
-}
-
-enum TextureFilterMode {
-  TFM_POINT = 0;
-  TFM_BILINEAR = 1;
-  TFM_TRILINEAR = 2;
-}
-
 enum MaterialTransparencyMode {
   MTM_OPAQUE = 0;
   MTM_ALPHA_TEST = 1;
@@ -29,19 +17,14 @@ enum MaterialTransparencyMode {
 }
 
 message PBMaterial {
-  message Texture {
-    string src = 1;
-    optional TextureWrapMode wrap_mode = 2; // default = TextureWrapMode.Clamp
-    optional TextureFilterMode filter_mode = 3; // default = FilterMode.Bilinear
-  }
-
-  optional Texture texture = 1; // default = null
+  optional decentraland.common.TextureUnion texture = 1; // default = null
+  
   optional float alpha_test = 2; // default = 0.5. range value: from 0 to 1
   optional bool cast_shadows = 3; // default =  true
 
-  optional Texture alpha_texture = 4; // default = null
-  optional Texture emissive_texture = 5; // default = null
-  optional Texture bump_texture = 6; // default = null
+  optional decentraland.common.TextureUnion alpha_texture = 4; // default = null
+  optional decentraland.common.TextureUnion emissive_texture = 5; // default = null
+  optional decentraland.common.TextureUnion bump_texture = 6; // default = null
 
   optional decentraland.common.Color3 albedo_color = 7; // default = white;
   optional decentraland.common.Color3 emissive_color = 8; // default = black;

package/dist/ecs7/proto-definitions/pointer_events_result.proto

@@ -4,7 +4,7 @@ package decentraland.sdk.components;
 
 import "decentraland/sdk/components/common/id.proto";
 import "decentraland/sdk/components/common/input_action.proto";
-import "decentraland/sdk/components/pointer_events.proto";
+import "decentraland/sdk/components/pointer_hover_feedback.proto";
 import "decentraland/sdk/components/raycast_result.proto";
 
 option (common.ecs_component_id) = 1063;

package/dist/ecs7/proto-definitions/{pointer_events.proto → pointer_hover_feedback.proto}

@@ -2,8 +2,8 @@
 
 package decentraland.sdk.components;
 
-import "decentraland/sdk/components/common/input_action.proto";
 import "decentraland/sdk/components/common/id.proto";
+import "decentraland/sdk/components/common/input_action.proto";
 
 option (common.ecs_component_id) = 1062;
 
@@ -14,7 +14,7 @@ enum PointerEventType {
   PET_HOVER_LEAVE = 3;
 }
 
-message PBPointerEvents {
+message PBPointerHoverFeedback {
   message Info {
     optional common.InputAction button = 1; // default=InputAction.ANY
     optional string hover_text = 2; // default='Interact'

package/dist/playground/snippets/billboard.ts

@@ -2,7 +2,10 @@ function createPlaneTexture(x: number, y: number, z: number): Entity {
   const meshEntity = engine.addEntity()
 
   Material.create(meshEntity, {
-    texture: { src: 'models/polaroid2.png' }
+    texture: {
+      texture: { src: 'models/polaroid2.png' },
+      avatarTexture: undefined
+    }
   })
   Transform.create(meshEntity, {
     position: { x, y, z },

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

@@ -5,7 +5,7 @@ function createCube(x: number, y: number, z: number, spawner = true): Entity {
   MeshRenderer.create(meshEntity, { box: { uvs: [] } })
   MeshCollider.create(meshEntity, { box: {} })
   if (spawner) {
-    PointerEvents.create(meshEntity, {
+    PointerHoverFeedback.create(meshEntity, {
       pointerEvents: [
         {
           eventType: PointerEventType.PET_DOWN,
@@ -39,7 +39,7 @@ function circularSystem(dt: number) {
 }
 
 function spawnerSystem() {
-  const clickedCubes = engine.getEntitiesWith(PointerEvents)
+  const clickedCubes = engine.getEntitiesWith(PointerHoverFeedback)
   for (const [entity] of clickedCubes) {
     if (Input.wasJustClicked(InputAction.IA_PRIMARY, entity)) {
       createCube(

package/dist/playground/snippets/pointer-events.ts

@@ -3,13 +3,13 @@ function createCube(
   x: number,
   y: number,
   z: number,
-  pointerEvents: PBPointerEvents_Entry[]
+  pointerEvents: PBPointerHoverFeedback_Entry[]
 ): Entity {
   const meshEntity = engine.addEntity()
   Transform.create(meshEntity, { position: { x, y, z } })
   MeshRenderer.create(meshEntity, { box: { uvs: [] } })
   MeshCollider.create(meshEntity, { box: {} })
-  PointerEvents.create(meshEntity, { pointerEvents })
+  PointerHoverFeedback.create(meshEntity, { pointerEvents })
   return meshEntity
 }
 

package/dist/playground/snippets/raycast-hit-many.ts

@@ -8,7 +8,7 @@ function createCube(x: number, y: number, z: number) {
 
   // This should be removed and keep working ok!
   // TODO: see physics layers
-  PointerEvents.create(cubeEntity)
+  PointerHoverFeedback.create(cubeEntity)
   return cubeEntity
 }
 

package/dist/playground/snippets/raycast-hit-oscilator.ts

@@ -24,7 +24,7 @@ function createCube(x: number, y: number, z: number) {
 
   // This should be removed and keep working ok!
   // TODO: see physics layers
-  PointerEvents.create(cubeEntity)
+  PointerHoverFeedback.create(cubeEntity)
   return cubeEntity
 }
 

package/dist/playground/snippets/raycast-hit.ts

@@ -8,7 +8,7 @@ function createCube(x: number, y: number, z: number) {
 
   // This should be removed and keep working ok!
   // TODO: see physics layers
-  PointerEvents.create(cubeEntity)
+  PointerHoverFeedback.create(cubeEntity)
   return cubeEntity
 }
 

package/dist/playground/snippets/ui.tsx

@@ -78,7 +78,7 @@ function createCube(x: number, y: number, z: number, spawner = true): Entity {
   MeshRenderer.create(meshEntity, { box: { uvs: [] } })
   MeshCollider.create(meshEntity, { box: {} })
   if (spawner) {
-    PointerEvents.create(meshEntity, {
+    PointerHoverFeedback.create(meshEntity, {
       pointerEvents: [
         {
           eventType: PointerEventType.PET_DOWN,
@@ -112,7 +112,7 @@ function circularSystem(dt: number) {
 }
 
 function spawnerSystem() {
-  const clickedCubes = engine.getEntitiesWith(PointerEvents)
+  const clickedCubes = engine.getEntitiesWith(PointerHoverFeedback)
   for (const [entity] of clickedCubes) {
     if (Input.wasJustClicked(InputAction.IA_PRIMARY, entity)) {
       counter++

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/sdk",
-  "version": "7.0.0-3314293671.commit-655be93",
+  "version": "7.0.0-3328933314.commit-597ac43",
   "description": "",
   "main": "dist/src/index.js",
   "typings": "dist/index.d.ts",
@@ -23,12 +23,12 @@
     "artifacts"
   ],
   "dependencies": {
-    "@dcl/amd": "6.11.10-3314293671.commit-655be93",
-    "@dcl/build-ecs": "6.11.10-3314293671.commit-655be93",
+    "@dcl/amd": "6.11.10-3328933314.commit-597ac43",
+    "@dcl/build-ecs": "6.11.10-3328933314.commit-597ac43",
     "@dcl/kernel": "1.0.0-2994874542.commit-c3ae489",
     "@dcl/posix": "^1.0.4",
     "@dcl/unity-renderer": "^1.0.40531-20220621125654.commit-472137e"
   },
   "minCliVersion": "3.10.2",
-  "commit": "655be932f87c7f8889b190e5705e6237b749c53b"
+  "commit": "597ac43ec24f75271586e818f2f00fb6db63b820"
 }

package/types/dcl/decentraland-ecs.api.json

@@ -41825,7 +41825,7 @@
             {
               "kind": "Property",
               "canonicalReference": "@dcl/legacy-ecs!Shape#isPointerBlocker:member",
-              "docComment": "/**\n * Set to true to turn on the PointerEvents blocking for the entity.\n */\n",
+              "docComment": "/**\n * Set to true to turn on the PointerHoverFeedback blocking for the entity.\n */\n",
               "excerptTokens": [
                 {
                   "kind": "Content",
@@ -61729,4 +61729,4 @@
       ]
     }
   ]
-}
+}

package/types/ecs7/index.d.ts

@@ -30,6 +30,14 @@ declare const enum AvatarModifierType {
 /** @public */
 declare const AvatarShape: ComponentDefinition<ISchema<PBAvatarShape>, PBAvatarShape>;
 
+declare interface AvatarTexture {
+    userId: string;
+    /** default = TextureWrapMode.Clamp */
+    wrapMode?: TextureWrapMode | undefined;
+    /** default = FilterMode.Bilinear */
+    filterMode?: TextureFilterMode | undefined;
+}
+
 /** @public */
 declare const Billboard: ComponentDefinition<ISchema<PBBillboard>, PBBillboard>;
 
@@ -937,10 +945,10 @@ declare namespace Components {
     /** @public */
     const NftShape: ComponentDefinition<ISchema<PBNftShape>, PBNftShape>;
     /** @public */
-    const PointerEvents: ComponentDefinition<ISchema<PBPointerEvents>, PBPointerEvents>;
-    /** @public */
     const PointerEventsResult: ComponentDefinition<ISchema<PBPointerEventsResult>, PBPointerEventsResult>;
     /** @public */
+    const PointerHoverFeedback: ComponentDefinition<ISchema<PBPointerHoverFeedback>, PBPointerHoverFeedback>;
+    /** @public */
     const PointerLock: ComponentDefinition<ISchema<PBPointerLock>, PBPointerLock>;
     /** @public */
     const Raycast: ComponentDefinition<ISchema<PBRaycast>, PBRaycast>;
@@ -1163,8 +1171,8 @@ declare function defineSdkComponents(engine: PreEngine): {
     GltfContainer: ComponentDefinition<ISchema<PBGltfContainer>, PBGltfContainer>;
     Material: ComponentDefinition<ISchema<PBMaterial>, PBMaterial>;
     NftShape: ComponentDefinition<ISchema<PBNftShape>, PBNftShape>;
-    PointerEvents: ComponentDefinition<ISchema<PBPointerEvents>, PBPointerEvents>;
     PointerEventsResult: ComponentDefinition<ISchema<PBPointerEventsResult>, PBPointerEventsResult>;
+    PointerHoverFeedback: ComponentDefinition<ISchema<PBPointerHoverFeedback>, PBPointerHoverFeedback>;
     PointerLock: ComponentDefinition<ISchema<PBPointerLock>, PBPointerLock>;
     Raycast: ComponentDefinition<ISchema<PBRaycast>, PBRaycast>;
     RaycastResult: ComponentDefinition<ISchema<PBRaycastResult>, PBRaycastResult>;
@@ -2668,17 +2676,17 @@ declare interface PBGltfContainer {
 
 declare interface PBMaterial {
     /** default = null */
-    texture?: PBMaterial_Texture | undefined;
+    texture?: TextureUnion | undefined;
     /** default = 0.5. range value: from 0 to 1 */
     alphaTest?: number | undefined;
     /** default =  true */
     castShadows?: boolean | undefined;
     /** default = null */
-    alphaTexture?: PBMaterial_Texture | undefined;
+    alphaTexture?: TextureUnion | undefined;
     /** default = null */
-    emissiveTexture?: PBMaterial_Texture | undefined;
+    emissiveTexture?: TextureUnion | undefined;
     /** default = null */
-    bumpTexture?: PBMaterial_Texture | undefined;
+    bumpTexture?: TextureUnion | undefined;
     /** default = white; */
     albedoColor?: Color3_2 | undefined;
     /** default = black; */
@@ -2701,14 +2709,6 @@ declare interface PBMaterial {
     directIntensity?: number | undefined;
 }
 
-declare interface PBMaterial_Texture {
-    src: string;
-    /** default = TextureWrapMode.Clamp */
-    wrapMode?: TextureWrapMode | undefined;
-    /** default = FilterMode.Bilinear */
-    filterMode?: TextureFilterMode | undefined;
-}
-
 declare interface PBMeshCollider {
     /** default = ColliderLayer.Physics | ColliderLayer.Pointer */
     collisionMask?: number | undefined;
@@ -2767,26 +2767,6 @@ declare interface PBNftShape {
     color?: Color3_2 | undefined;
 }
 
-declare interface PBPointerEvents {
-    pointerEvents: PBPointerEvents_Entry[];
-}
-
-declare interface PBPointerEvents_Entry {
-    eventType: PointerEventType;
-    eventInfo: PBPointerEvents_Info | undefined;
-}
-
-declare interface PBPointerEvents_Info {
-    /** default=InputAction.ANY */
-    button?: InputAction | undefined;
-    /** default='Interact' */
-    hoverText?: string | undefined;
-    /** default=10 */
-    maxDistance?: number | undefined;
-    /** default=true */
-    showFeedback?: boolean | undefined;
-}
-
 /** the renderer will set this component to the root entity once per frame with all the events */
 declare interface PBPointerEventsResult {
     /** a list of the last N pointer commands (from the engine) */
@@ -2805,6 +2785,26 @@ declare interface PBPointerEventsResult_PointerCommand {
     analog?: number | undefined;
 }
 
+declare interface PBPointerHoverFeedback {
+    pointerEvents: PBPointerHoverFeedback_Entry[];
+}
+
+declare interface PBPointerHoverFeedback_Entry {
+    eventType: PointerEventType;
+    eventInfo: PBPointerHoverFeedback_Info | undefined;
+}
+
+declare interface PBPointerHoverFeedback_Info {
+    /** default=InputAction.ANY */
+    button?: InputAction | undefined;
+    /** default='Interact' */
+    hoverText?: string | undefined;
+    /** default=10 */
+    maxDistance?: number | undefined;
+    /** default=true */
+    showFeedback?: boolean | undefined;
+}
+
 declare interface PBPointerLock {
     isPointerLocked: boolean;
 }
@@ -3057,9 +3057,6 @@ declare namespace Plane {
     function signedDistanceTo(plane: ReadonlyPlane, point: Vector3.ReadonlyVector3): number;
 }
 
-/** @public */
-declare const PointerEvents: ComponentDefinition<ISchema<PBPointerEvents>, PBPointerEvents>;
-
 /** @public */
 declare const PointerEventsResult: ComponentDefinition<ISchema<PBPointerEventsResult>, PBPointerEventsResult>;
 
@@ -3070,6 +3067,9 @@ declare const enum PointerEventType {
     PET_HOVER_LEAVE = 3
 }
 
+/** @public */
+declare const PointerHoverFeedback: ComponentDefinition<ISchema<PBPointerHoverFeedback>, PBPointerHoverFeedback>;
+
 /** @public */
 declare const PointerLock: ComponentDefinition<ISchema<PBPointerLock>, PBPointerLock>;
 
@@ -3662,12 +3662,27 @@ declare const enum TextAlignMode {
 /** @public */
 declare const TextShape: ComponentDefinition<ISchema<PBTextShape>, PBTextShape>;
 
+declare interface Texture {
+    src: string;
+    /** default = TextureWrapMode.Clamp */
+    wrapMode?: TextureWrapMode | undefined;
+    /** default = FilterMode.Bilinear */
+    filterMode?: TextureFilterMode | undefined;
+}
+
 declare const enum TextureFilterMode {
     TFM_POINT = 0,
     TFM_BILINEAR = 1,
     TFM_TRILINEAR = 2
 }
 
+declare interface TextureUnion {
+    /** default = null */
+    texture: Texture | undefined;
+    /** default = null */
+    avatarTexture: AvatarTexture | undefined;
+}
+
 declare const enum TextureWrapMode {
     TWM_REPEAT = 0,
     TWM_CLAMP = 1,