@dcl/sdk 7.0.0-3445306719.commit-c9822af → 7.0.0-3469489430.commit-9c7979a

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

@@ -17,26 +17,40 @@ enum MaterialTransparencyMode {
 }
 
 message PBMaterial {
-  optional decentraland.common.TextureUnion texture = 1; // default = null
+  message UnlitMaterial {
+    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
+  }
+
+  message PbrMaterial {
+    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 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;
+    optional decentraland.common.Color3 reflectivity_color = 9; // default = white;
+  
+    optional MaterialTransparencyMode transparency_mode = 10; // default = TransparencyMode.Auto
+  
+    optional float metallic = 11; // default = 0.5
+    optional float roughness = 12; // default = 0.5
+    optional float glossiness = 13; // default = 1
+  
+    optional float specular_intensity = 14; // default = 1
+    optional float emissive_intensity = 15; // default = 2
+    optional float direct_intensity = 16; // default = 1
+  }
+
+  oneof material {
+    UnlitMaterial unlit = 1;
+    PbrMaterial pbr = 2;
+  }
   
-  optional float alpha_test = 2; // default = 0.5. range value: from 0 to 1
-  optional bool cast_shadows = 3; // default =  true
-
-  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;
-  optional decentraland.common.Color3 reflectivity_color = 9; // default = white;
-
-  optional MaterialTransparencyMode transparency_mode = 10; // default = TransparencyMode.Auto
-
-  optional float metallic = 11; // default = 0.5
-  optional float roughness = 12; // default = 0.5
-  optional float glossiness = 13; // default = 1
-
-  optional float specular_intensity = 14; // default = 1
-  optional float emissive_intensity = 15; // default = 2
-  optional float direct_intensity = 16; // default = 1
 }

package/dist/playground/snippets/billboard.ts

@@ -2,10 +2,15 @@ function createPlaneTexture(x: number, y: number, z: number): Entity {
   const meshEntity = engine.addEntity()
 
   Material.create(meshEntity, {
-    texture: {
-      tex: {
-        $case: 'texture',
-        texture: { src: 'models/polaroid2.png' }
+    material: {
+      $case: 'pbr',
+      pbr: {
+        texture: {
+          tex: {
+            $case: 'texture',
+            texture: { src: 'models/polaroid2.png' }
+          }
+        }
       }
     }
   })

package/dist/playground/snippets/material.ts

@@ -6,27 +6,42 @@ function createSphere(x: number, y: number, z: number): Entity {
 }
 
 Material.create(createSphere(15, 1, 15), {
-  albedoColor: { r: 0, g: 0, b: 1 },
-  reflectivityColor: { r: 0.5, g: 0.5, b: 0.5 },
-  metallic: 0.8,
-  roughness: 0.1
+  material: {
+    $case: 'pbr',
+    pbr: {
+      albedoColor: { r: 0, g: 0, b: 1 },
+      reflectivityColor: { r: 0.5, g: 0.5, b: 0.5 },
+      metallic: 0.8,
+      roughness: 0.1
+    }
+  }
 })
 
 Material.create(createSphere(13, 1, 15), {
-  albedoColor: { r: 1, g: 1, b: 0 },
-  reflectivityColor: { r: 0.5, g: 0.5, b: 0.5 },
-  metallic: 0.1,
-  roughness: 0.8,
+  material: {
+    $case: 'pbr',
+    pbr: {
+      albedoColor: { r: 1, g: 1, b: 0 },
+      reflectivityColor: { r: 0.5, g: 0.5, b: 0.5 },
+      metallic: 0.1,
+      roughness: 0.8,
 
-  alphaTest: 0.2,
-  transparencyMode: MaterialTransparencyMode.MTM_ALPHA_TEST
+      alphaTest: 0.2,
+      transparencyMode: MaterialTransparencyMode.MTM_ALPHA_TEST
+    }
+  }
 })
 
 Material.create(createSphere(11, 1, 15), {
-  albedoColor: { r: 0, g: 0, b: 1 },
-  reflectivityColor: { r: 0.5, g: 0.5, b: 0.5 },
-  metallic: 0.1,
-  roughness: 0.1
+  material: {
+    $case: 'pbr',
+    pbr: {
+      albedoColor: { r: 0, g: 0, b: 1 },
+      reflectivityColor: { r: 0.5, g: 0.5, b: 0.5 },
+      metallic: 0.1,
+      roughness: 0.1
+    }
+  }
 })
 
 // add textures

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/sdk",
-  "version": "7.0.0-3445306719.commit-c9822af",
+  "version": "7.0.0-3469489430.commit-9c7979a",
   "description": "",
   "main": "dist/src/index.js",
   "typings": "dist/index.d.ts",
@@ -23,13 +23,13 @@
     "artifacts"
   ],
   "dependencies": {
-    "@dcl/amd": "7.0.0-3445306719.commit-c9822af",
-    "@dcl/build-ecs": "7.0.0-3445306719.commit-c9822af",
-    "@dcl/js-runtime": "7.0.0-3445306719.commit-c9822af",
+    "@dcl/amd": "7.0.0-3469489430.commit-9c7979a",
+    "@dcl/build-ecs": "7.0.0-3469489430.commit-9c7979a",
+    "@dcl/js-runtime": "7.0.0-3469489430.commit-9c7979a",
     "@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": "c9822af9da632ef2e1ae4ba4c97745e7ac0cc332"
+  "commit": "9c7979a6ebc1a914467f9eb81622189bf1f5ff1e"
 }

package/types/ecs7/index.d.ts

@@ -2739,6 +2739,16 @@ declare interface PBGltfContainer {
 }
 
 declare interface PBMaterial {
+    material?: {
+        $case: 'unlit';
+        unlit: PBMaterial_UnlitMaterial;
+    } | {
+        $case: 'pbr';
+        pbr: PBMaterial_PbrMaterial;
+    };
+}
+
+declare interface PBMaterial_PbrMaterial {
     /** default = null */
     texture?: TextureUnion | undefined;
     /** default = 0.5. range value: from 0 to 1 */
@@ -2773,6 +2783,15 @@ declare interface PBMaterial {
     directIntensity?: number | undefined;
 }
 
+declare interface PBMaterial_UnlitMaterial {
+    /** default = null */
+    texture?: TextureUnion | undefined;
+    /** default = 0.5. range value: from 0 to 1 */
+    alphaTest?: number | undefined;
+    /** default =  true */
+    castShadows?: boolean | undefined;
+}
+
 declare interface PBMeshCollider {
     /** default = ColliderLayer.Physics | ColliderLayer.Pointer */
     collisionMask?: number | undefined;