@dcl/protocol 1.0.0-3373991894.commit-8aa3a49 → 1.0.0-3482040729.commit-4f0f6b5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/protocol",
-  "version": "1.0.0-3373991894.commit-8aa3a49",
+  "version": "1.0.0-3482040729.commit-4f0f6b5",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -25,5 +25,5 @@
     "out-ts",
     "public"
   ],
-  "commit": "8aa3a491bace6dc3d3a973f9841718fd4092f9ba"
+  "commit": "4f0f6b5847d92dd94211fee9f253e1816b7f7f64"
 }

package/proto/decentraland/sdk/components/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/proto/decentraland/sdk/components/ui_transform.proto

@@ -7,9 +7,8 @@ import "decentraland/sdk/components/common/id.proto";
 option (common.ecs_component_id) = 1050;
 
 enum YGPositionType {
-  YGPT_STATIC = 0;
-  YGPT_RELATIVE = 1;
-  YGPT_ABSOLUTE = 2;
+  YGPT_RELATIVE = 0;
+  YGPT_ABSOLUTE = 1;
 }
 
 enum YGAlign {
@@ -30,16 +29,10 @@ enum YGUnit {
   YGU_AUTO = 3;
 }
 
-enum YGDirection {
-  YGD_INHERIT = 0;
-  YGD_LTR = 1;
-  YGD_RTL = 2;
-}
-
 enum YGFlexDirection {
-  YGFD_COLUMN = 0;
-  YGFD_COLUMN_REVERSE = 1;
-  YGFD_ROW = 2;
+  YGFD_ROW = 0;
+  YGFD_COLUMN = 1;
+  YGFD_COLUMN_REVERSE = 2;
   YGFD_ROW_REVERSE = 3;
 }
 
@@ -82,82 +75,67 @@ enum YGEdge {
 }
 
 message PBUiTransform {
-  int32 parent = 79;
-  int32 right_of = 80;
+  int32 parent = 1;
+  int32 right_of = 2;
 
-  YGPositionType position_type = 1;
+  optional YGAlign align_content = 3; // default: YGAlign.YGA_FLEX_START
+  optional YGAlign align_items = 4; // default: YGAlign.YGA_STRETCH
+  optional YGWrap flex_wrap = 5; // default: YGWrap.YGW_WRAP
+  optional float flex_shrink = 6; // default: 1
 
-  YGAlign align_content = 2;
-  YGAlign align_items = 3;
-  YGAlign align_self = 4;
-  YGFlexDirection flex_direction = 5;
-  YGWrap flex_wrap = 6;
-  YGJustify justify_content = 7;
+  YGPositionType position_type = 7; // YGPositionType.YGPT_RELATIVE
 
-  YGOverflow overflow = 8;
-  YGDisplay display = 9;
-  YGDirection direction = 10;
+  YGAlign align_self = 8; // YGAlign.YGA_AUTO
+  YGFlexDirection flex_direction = 9; // YGFlexDirection.YGFD_ROW
+  YGJustify justify_content = 10; // YGJustify.YGJ_FLEX_START
 
-  float flex = 11;
+  YGOverflow overflow = 11; // YGOverflow.YGO_VISIBLE
+  YGDisplay display = 12; // YGDisplay.YGD_FLEX
 
-  YGUnit flex_basis_unit = 13;
+  YGUnit flex_basis_unit = 13; // YGUnit.YGU_UNDEFINED
   float flex_basis = 14;
 
   float flex_grow = 15;
-  float flex_shrink = 16;
-
-  YGUnit width_unit = 17;
-  float width = 18;
-  YGUnit height_unit = 19;
-  float height = 20;
-
-  YGUnit min_width_unit = 21;
-  float min_width = 22;
-  YGUnit min_height_unit = 23;
-  float min_height = 24;
-
-  YGUnit max_width_unit = 31;
-  float max_width = 32;
-  YGUnit max_height_unit = 33;
-  float max_height = 34;
-
-  // non-standard
-  reserved 40; // float aspect_ratio = 40;
-
-  YGUnit position_left_unit = 41;
-  float position_left = 42;
-  YGUnit position_top_unit = 43;
-  float position_top = 44;
-  YGUnit position_right_unit = 45;
-  float position_right = 46;
-  YGUnit position_bottom_unit = 47;
-  float position_bottom = 48;
-
-  // margin
-  YGUnit margin_left_unit = 51;
-  float margin_left = 52;
-  YGUnit margin_top_unit = 53;
-  float margin_top = 54;
-  YGUnit margin_right_unit = 55;
-  float margin_right = 56;
-  YGUnit margin_bottom_unit = 57;
-  float margin_bottom = 58;
-
-  YGUnit padding_left_unit = 61;
-  float padding_left = 62;
-  YGUnit padding_top_unit = 63;
-  float padding_top = 64;
-  YGUnit padding_right_unit = 65;
-  float padding_right = 66;
-  YGUnit padding_bottom_unit = 67;
-  float padding_bottom = 68;
-
-  reserved 71; // YGUnit border_left_unit = 71;
-  float border_left = 72;
-  reserved 73; // YGUnit border_top_unit = 73;
-  float border_top = 74;
-  reserved 75; // YGUnit border_right_unit = 75;
-  float border_right = 76;
-  reserved 77; // YGUnit border_bottom_unit = 77;
-  float border_bottom = 78;
+
+  YGUnit width_unit = 16; // YGUnit.YGU_UNDEFINED
+  float width = 17;
+  YGUnit height_unit = 18; // YGUnit.YGU_UNDEFINED
+  float height = 19;
+
+  YGUnit min_width_unit = 20; // YGUnit.YGU_UNDEFINED
+  float min_width = 21;
+  YGUnit min_height_unit = 22; // YGUnit.YGU_UNDEFINED
+  float min_height = 23;
+
+  YGUnit max_width_unit = 24; // YGUnit.YGU_UNDEFINED
+  float max_width = 25;
+  YGUnit max_height_unit = 26; // YGUnit.YGU_UNDEFINED
+  float max_height = 27;
+
+  YGUnit position_left_unit = 28; // YGUnit.YGU_UNDEFINED
+  float position_left = 29;
+  YGUnit position_top_unit = 30; // YGUnit.YGU_UNDEFINED
+  float position_top = 31;
+  YGUnit position_right_unit = 32; // YGUnit.YGU_UNDEFINED
+  float position_right = 33;
+  YGUnit position_bottom_unit = 34; // YGUnit.YGU_UNDEFINED
+  float position_bottom = 35;
+
+  YGUnit margin_left_unit = 36; // YGUnit.YGU_UNDEFINED
+  float margin_left = 37;
+  YGUnit margin_top_unit = 38; // YGUnit.YGU_UNDEFINED
+  float margin_top = 39;
+  YGUnit margin_right_unit = 40; // YGUnit.YGU_UNDEFINED
+  float margin_right = 41;
+  YGUnit margin_bottom_unit = 42; // YGUnit.YGU_UNDEFINED
+  float margin_bottom = 43;
+
+  YGUnit padding_left_unit = 44; // YGUnit.YGU_UNDEFINED
+  float padding_left = 45;
+  YGUnit padding_top_unit = 46; // YGUnit.YGU_UNDEFINED
+  float padding_top = 47;
+  YGUnit padding_right_unit = 48; // YGUnit.YGU_UNDEFINED
+  float padding_right = 49;
+  YGUnit padding_bottom_unit = 50; // YGUnit.YGU_UNDEFINED
+  float padding_bottom = 51;
 }