@dcl/sdk 7.0.0-3324163949.commit-e6d499f → 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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/sdk",
-  "version": "7.0.0-3324163949.commit-e6d499f",
+  "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-3324163949.commit-e6d499f",
-    "@dcl/build-ecs": "6.11.10-3324163949.commit-e6d499f",
+    "@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": "e6d499fae9c437583660dc74d2f7230efd3902cd"
+  "commit": "597ac43ec24f75271586e818f2f00fb6db63b820"
 }

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>;
 
@@ -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;
@@ -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,