@dcl/protocol 1.0.0-10955038136.commit-7fe9554 → 1.0.0-11502421172.commit-b32f4af

package/out-ts/decentraland/sdk/components/ui_transform.gen.ts

@@ -1,5 +1,6 @@
 /* eslint-disable */
 import _m0 from "protobufjs/minimal";
+import { Vector2 } from "../../common/vectors.gen";
 
 export const protobufPackage = "decentraland.sdk.components";
 
@@ -471,6 +472,55 @@ export function pointerFilterModeToJSON(object: PointerFilterMode): string {
   }
 }
 
+export enum ShowScrollBar {
+  SSB_BOTH = 0,
+  SSB_ONLY_VERTICAL = 1,
+  SSB_ONLY_HORIZONTAL = 2,
+  SSB_HIDDEN = 3,
+  UNRECOGNIZED = -1,
+}
+
+export function showScrollBarFromJSON(object: any): ShowScrollBar {
+  switch (object) {
+    case 0:
+    case "SSB_BOTH":
+      return ShowScrollBar.SSB_BOTH;
+    case 1:
+    case "SSB_ONLY_VERTICAL":
+      return ShowScrollBar.SSB_ONLY_VERTICAL;
+    case 2:
+    case "SSB_ONLY_HORIZONTAL":
+      return ShowScrollBar.SSB_ONLY_HORIZONTAL;
+    case 3:
+    case "SSB_HIDDEN":
+      return ShowScrollBar.SSB_HIDDEN;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return ShowScrollBar.UNRECOGNIZED;
+  }
+}
+
+export function showScrollBarToJSON(object: ShowScrollBar): string {
+  switch (object) {
+    case ShowScrollBar.SSB_BOTH:
+      return "SSB_BOTH";
+    case ShowScrollBar.SSB_ONLY_VERTICAL:
+      return "SSB_ONLY_VERTICAL";
+    case ShowScrollBar.SSB_ONLY_HORIZONTAL:
+      return "SSB_ONLY_HORIZONTAL";
+    case ShowScrollBar.SSB_HIDDEN:
+      return "SSB_HIDDEN";
+    case ShowScrollBar.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
+export interface ScrollPositionValue {
+  value?: { $case: "position"; position: Vector2 } | { $case: "reference"; reference: string } | undefined;
+}
+
 export interface PBUiTransform {
   parent: number;
   rightOf: number;
@@ -561,7 +611,106 @@ export interface PBUiTransform {
   paddingBottomUnit: YGUnit;
   paddingBottom: number;
   /** default: PointerFilterMode.PFM_NONE */
-  pointerFilter?: PointerFilterMode | undefined;
+  pointerFilter?:
+    | PointerFilterMode
+    | undefined;
+  /** default: 1 */
+  opacity?:
+    | number
+    | undefined;
+  /** default empty */
+  elementId?:
+    | string
+    | undefined;
+  /** default position=(0,0) */
+  scrollPosition?:
+    | ScrollPositionValue
+    | undefined;
+  /** default ShowScrollBar.SSB_BOTH */
+  scrollVisible?: ShowScrollBar | undefined;
+}
+
+function createBaseScrollPositionValue(): ScrollPositionValue {
+  return { value: undefined };
+}
+
+export namespace ScrollPositionValue {
+  export function encode(message: ScrollPositionValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    switch (message.value?.$case) {
+      case "position":
+        Vector2.encode(message.value.position, writer.uint32(10).fork()).ldelim();
+        break;
+      case "reference":
+        writer.uint32(18).string(message.value.reference);
+        break;
+    }
+    return writer;
+  }
+
+  export function decode(input: _m0.Reader | Uint8Array, length?: number): ScrollPositionValue {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseScrollPositionValue();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.value = { $case: "position", position: Vector2.decode(reader, reader.uint32()) };
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.value = { $case: "reference", reference: reader.string() };
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  }
+
+  export function fromJSON(object: any): ScrollPositionValue {
+    return {
+      value: isSet(object.position)
+        ? { $case: "position", position: Vector2.fromJSON(object.position) }
+        : isSet(object.reference)
+        ? { $case: "reference", reference: String(object.reference) }
+        : undefined,
+    };
+  }
+
+  export function toJSON(message: ScrollPositionValue): unknown {
+    const obj: any = {};
+    message.value?.$case === "position" &&
+      (obj.position = message.value?.position ? Vector2.toJSON(message.value?.position) : undefined);
+    message.value?.$case === "reference" && (obj.reference = message.value?.reference);
+    return obj;
+  }
+
+  export function create<I extends Exact<DeepPartial<ScrollPositionValue>, I>>(base?: I): ScrollPositionValue {
+    return ScrollPositionValue.fromPartial(base ?? {});
+  }
+
+  export function fromPartial<I extends Exact<DeepPartial<ScrollPositionValue>, I>>(object: I): ScrollPositionValue {
+    const message = createBaseScrollPositionValue();
+    if (object.value?.$case === "position" && object.value?.position !== undefined && object.value?.position !== null) {
+      message.value = { $case: "position", position: Vector2.fromPartial(object.value.position) };
+    }
+    if (
+      object.value?.$case === "reference" && object.value?.reference !== undefined && object.value?.reference !== null
+    ) {
+      message.value = { $case: "reference", reference: object.value.reference };
+    }
+    return message;
+  }
 }
 
 function createBasePBUiTransform(): PBUiTransform {
@@ -618,6 +767,10 @@ function createBasePBUiTransform(): PBUiTransform {
     paddingBottomUnit: 0,
     paddingBottom: 0,
     pointerFilter: undefined,
+    opacity: undefined,
+    elementId: undefined,
+    scrollPosition: undefined,
+    scrollVisible: undefined,
   };
 }
 
@@ -779,6 +932,18 @@ export namespace PBUiTransform {
     if (message.pointerFilter !== undefined) {
       writer.uint32(416).int32(message.pointerFilter);
     }
+    if (message.opacity !== undefined) {
+      writer.uint32(429).float(message.opacity);
+    }
+    if (message.elementId !== undefined) {
+      writer.uint32(434).string(message.elementId);
+    }
+    if (message.scrollPosition !== undefined) {
+      ScrollPositionValue.encode(message.scrollPosition, writer.uint32(442).fork()).ldelim();
+    }
+    if (message.scrollVisible !== undefined) {
+      writer.uint32(448).int32(message.scrollVisible);
+    }
     return writer;
   }
 
@@ -1153,6 +1318,34 @@ export namespace PBUiTransform {
 
           message.pointerFilter = reader.int32() as any;
           continue;
+        case 53:
+          if (tag !== 429) {
+            break;
+          }
+
+          message.opacity = reader.float();
+          continue;
+        case 54:
+          if (tag !== 434) {
+            break;
+          }
+
+          message.elementId = reader.string();
+          continue;
+        case 55:
+          if (tag !== 442) {
+            break;
+          }
+
+          message.scrollPosition = ScrollPositionValue.decode(reader, reader.uint32());
+          continue;
+        case 56:
+          if (tag !== 448) {
+            break;
+          }
+
+          message.scrollVisible = reader.int32() as any;
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1216,6 +1409,10 @@ export namespace PBUiTransform {
       paddingBottomUnit: isSet(object.paddingBottomUnit) ? yGUnitFromJSON(object.paddingBottomUnit) : 0,
       paddingBottom: isSet(object.paddingBottom) ? Number(object.paddingBottom) : 0,
       pointerFilter: isSet(object.pointerFilter) ? pointerFilterModeFromJSON(object.pointerFilter) : undefined,
+      opacity: isSet(object.opacity) ? Number(object.opacity) : undefined,
+      elementId: isSet(object.elementId) ? String(object.elementId) : undefined,
+      scrollPosition: isSet(object.scrollPosition) ? ScrollPositionValue.fromJSON(object.scrollPosition) : undefined,
+      scrollVisible: isSet(object.scrollVisible) ? showScrollBarFromJSON(object.scrollVisible) : undefined,
     };
   }
 
@@ -1279,6 +1476,14 @@ export namespace PBUiTransform {
       (obj.pointerFilter = message.pointerFilter !== undefined
         ? pointerFilterModeToJSON(message.pointerFilter)
         : undefined);
+    message.opacity !== undefined && (obj.opacity = message.opacity);
+    message.elementId !== undefined && (obj.elementId = message.elementId);
+    message.scrollPosition !== undefined &&
+      (obj.scrollPosition = message.scrollPosition ? ScrollPositionValue.toJSON(message.scrollPosition) : undefined);
+    message.scrollVisible !== undefined &&
+      (obj.scrollVisible = message.scrollVisible !== undefined
+        ? showScrollBarToJSON(message.scrollVisible)
+        : undefined);
     return obj;
   }
 
@@ -1340,6 +1545,12 @@ export namespace PBUiTransform {
     message.paddingBottomUnit = object.paddingBottomUnit ?? 0;
     message.paddingBottom = object.paddingBottom ?? 0;
     message.pointerFilter = object.pointerFilter ?? undefined;
+    message.opacity = object.opacity ?? undefined;
+    message.elementId = object.elementId ?? undefined;
+    message.scrollPosition = (object.scrollPosition !== undefined && object.scrollPosition !== null)
+      ? ScrollPositionValue.fromPartial(object.scrollPosition)
+      : undefined;
+    message.scrollVisible = object.scrollVisible ?? undefined;
     return message;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/protocol",
-  "version": "1.0.0-10955038136.commit-7fe9554",
+  "version": "1.0.0-11502421172.commit-b32f4af",
   "description": "",
   "repository": "decentraland/protocol.git",
   "homepage": "https://github.com/decentraland/protocol#readme",
@@ -29,5 +29,5 @@
     "out-js",
     "public"
   ],
-  "commit": "7fe9554c85dfb6f4927c207c439f22f513a2ce3d"
+  "commit": "b32f4af64dc3cdf63df93d7e8a92403ddd586d3f"
 }

package/proto/decentraland/common/texture.proto

@@ -31,10 +31,17 @@ message VideoTexture {
   optional TextureFilterMode filter_mode = 3; // default = FilterMode.Bilinear
 }
 
+message UiCanvasTexture {
+  uint32 ui_canvas_entity = 1;
+  optional TextureWrapMode wrap_mode = 2; // default = TextureWrapMode.Clamp
+  optional TextureFilterMode filter_mode = 3; // default = FilterMode.Bilinear
+}
+
 message TextureUnion {
   oneof tex {
     Texture texture = 1; // default = null
     AvatarTexture avatar_texture = 2; // default = null
     VideoTexture video_texture = 3; // default = null
+    UiCanvasTexture ui_texture = 4;
   }
-}
+}

package/proto/decentraland/sdk/components/avatar_modifier_area.proto

@@ -23,6 +23,8 @@ message PBAvatarModifierArea {
   decentraland.common.Vector3 area = 1;      // the 3D size of the region
   repeated string exclude_ids = 2;           // user IDs that can enter and remain unaffected
   repeated AvatarModifierType modifiers = 3; // list of modifiers to apply
+  optional AvatarMovementSettings movement_settings = 4;
+  optional bool use_collider_range = 5;      // if true, the player will be considered inside the area when they are within 0.3m of the area. default true
 }
 
 // AvatarModifierType is an effect that should be applied to avatars inside the region.
@@ -30,3 +32,22 @@ enum AvatarModifierType {
   AMT_HIDE_AVATARS = 0;      // avatars are invisible
   AMT_DISABLE_PASSPORTS = 1; // selecting (e.g. clicking) an avatar will not bring up their profile.
 }
+
+message AvatarMovementSettings {
+  optional AvatarControlType control_mode = 1;
+  // if not explicitly set, the following properties default to user's preference settings
+  optional float run_speed = 2;              // speed the player moves at, in m/s
+  optional float friction = 3;               // how fast the player gets up to speed or comes to rest. higher = more responsive
+  optional float gravity = 4;                // how fast the player accelerates vertically when not on a solid surface, in m/s. should normally be negative
+  optional float jump_height = 5;            // how high the player can jump, in meters. should normally be positive. gravity must have the same sign for jumping to be possible
+  optional float max_fall_speed = 6;         // max fall speed in m/s. should normally be negative
+  optional float turn_speed = 7;             // speed the player turns in tank mode, in radians/s
+  optional float walk_speed = 8;             // speed the player walks at, in m/s
+  optional bool allow_weighted_movement = 9; // whether to allow player to move at a slower speed (e.g. with a walk-key or when using a gamepad/joystick). defaults to true  
+}
+
+enum AvatarControlType {
+  CCT_NONE = 0;     // avatar cannot move
+  CCT_RELATIVE = 1; // avatar moves relative to the camera origin
+  CCT_TANK = 2;     // avatar moves like a tank: left/right rotate the player, forward/backward advance/retreat the player
+}

package/proto/decentraland/sdk/components/camera_mode_area.proto

@@ -9,7 +9,7 @@ import "decentraland/sdk/components/common/id.proto";
 option (common.ecs_component_id) = 1071;
 
 // The CameraModeArea component can be attached to an Entity to define a region of space where 
-// the player's camera mode (1st-person or 3rd-person) is overridden.
+// the player's camera mode (1st-person, 3rd-person or cinematic) is overridden.
 //
 // The Entity's Transform position determines the center-point of the region, while its size is 
 // given as a vector in the `area` property below. The Transform rotation is applied, but the scale 
@@ -19,7 +19,26 @@ option (common.ecs_component_id) = 1071;
 //
 // Note that, while commonly used to delineate a 2D area in a scene (hence the name), the region
 // is actually a 3D volume.
+//
+// When mode is set to CtCinematic, the cinematic_settings field must also be provided.
 message PBCameraModeArea {
-  decentraland.common.Vector3 area = 1; // the 3D size of the region
-  common.CameraType mode = 2;           // the camera mode to enforce
+  decentraland.common.Vector3 area = 1;                       // the 3D size of the region
+  common.CameraType mode = 2;                                 // the camera mode to enforce
+  optional CinematicSettings cinematic_settings = 3;
+  optional bool use_collider_range = 4;                       // if true, the player will be considered inside the area when they are within 0.3m of the area. default true
+}
+
+message CinematicSettings {
+  uint32 camera_entity = 1;           // Entity that defines the cinematic camera transform.
+                                      // Position -> camera's position
+                                      // Rotation -> camera's direction
+                                      // scale.z -> zoom level
+                                      // scale.x and scale.y -> unused
+  optional bool allow_manual_rotation = 2; // whether the user can move the camera's rotation. default false
+  optional float yaw_range = 3;       // how far the camera can rotate around the y-axis / look left/right, in radians. default unrestricted
+  optional float pitch_range = 4;     // how far the camera can rotate around the x-axis / look up-down, in radians. default unrestricted
+                                      // note: cameras can never look up/down further than Vec3::Y
+  optional float roll_range = 5;      // how far the camera can rotate around the z-axis / tilt, in radians. default unrestricted
+  optional float zoom_min = 6;        // minimum zoom level. must be greater than 0. defaults to the input zoom level
+  optional float zoom_max = 7;        // maximum zoom level. must be greater than 0. defaults to the input zoom level
 }

package/proto/decentraland/sdk/components/global_light.proto

@@ -0,0 +1,22 @@
+syntax = "proto3";
+package decentraland.sdk.components;
+
+import "decentraland/common/colors.proto";
+import "decentraland/common/vectors.proto";
+
+import "decentraland/sdk/components/common/id.proto";
+option (common.ecs_component_id) = 1206;
+
+// defines the global scene light settings. must be added to the scene root.
+// to control sunlight color, intensity, shadows etc, you can also add a PBLight to the scene root.
+message PBGlobalLight {
+  // the direction the directional light shines in.
+  // default depends on time of day and explorer implementation
+  optional decentraland.common.Vector3 direction = 1;
+  // ambient light color
+  // default: White
+  optional decentraland.common.Color3 ambient_color = 2;
+  // ambient light intensity. the explorer default ambient brightness is multiplied by this non-physical quantity.
+  // default 1
+  optional float ambient_brightness = 3;
+}

package/proto/decentraland/sdk/components/gltf_container_loading_state.proto

@@ -10,4 +10,17 @@ import "decentraland/sdk/components/common/loading_state.proto";
 // the current state of the GltfContainer of an entity.
 message PBGltfContainerLoadingState {
   common.LoadingState current_state = 1;
+  repeated string node_paths = 2; // all node paths in the gltf, which can be used with a GltfNode to inspect and modify the gltf contents
+  repeated string mesh_names = 3; // all meshes in the gltf. unnamed meshes will be auto-assigned a name of the form `MeshX` or `MeshX/PrimitiveY`
+                                  // where X is the mesh index and Y is the primitive index (and there is more than 1 primitive). note this may 
+                                  // conflict with manually named meshes - to avoid any issues make sure all your meshes are explicitly named.
+  repeated string material_names = 4; // all materials in the gltf. unnamed materials will be auto-assigned a name of the form `MaterialX` where
+                                      // X is the material index. note this may conflict with manually named materials - to avoid any issues make
+                                      // sure all your materials are explicitly named.
+  repeated string skin_names = 5; // all mesh skins in the gltf. unnamed skins will be auto-assigned a name of the form `SkinX` where
+                                  // X is the skin index. note this may conflict with manually named skins - to avoid any issues make sure all 
+                                  // your skins are explicitly named.
+  repeated string animation_names = 6; // all animations in the gltf. unnamed animations will be auto-assigned a name of the form `AnimationX` where
+                                       // X is the animation index. note this may conflict with manually named anims - to avoid any issues make sure all 
+                                       // your animations are explicitly named.
 }

package/proto/decentraland/sdk/components/gltf_node.proto

@@ -0,0 +1,42 @@
+syntax = "proto3";
+package decentraland.sdk.components;
+
+import "decentraland/sdk/components/common/id.proto";
+option (common.ecs_component_id) = 1200;
+
+// a GltfNode links a scene entity with a node from within a gltf, allowing the scene to inspect it or modify it.
+// This component must be added to a direct child of an entity with a PBGltfContainer component, or
+// to a direct child of another entity with a GltfNode component, and the referenced gltf node must be a descendent of the gltf node
+// in the parent.
+// The name must match the path of one of the nodes within the Gltf. These are available on the GltfContainerLoadingState component.
+// 
+// The renderer will attach a PBGltfNodeState to the entity describing the state. Once the state is `GNS_READY`, 
+// - the `Transform` will be updated to match the position of the node within the gltf (relative to the gltf root, or the parent node),
+// - a `MeshRenderer` with a GltfMesh mesh type will be added (if the gltf node has a mesh).
+// - a `MeshCollider` with a GltfMesh mesh type will be added (if the gltf node has a collider).
+// - a `Material` component including a GltfMaterial reference will be added (if the gltf node has a material).
+//
+// After creation, if an animation moves the node, the `Transform` will be updated.
+//
+// From the scene, you can modify various components to alter the gltf node:
+// - modifying the `Transform` position/rotation/scale will move the node. The position is interpreted relative to the gltf root (or parent node), 
+//   regardless of any intermediate gltf node hierarchy.
+//   If an animation is playing, the animation takes priority and the scene entity's position will be updated to match the animation.
+// - `Visibility` can be added to hide or show the node and it's children in the gltf hierarchy.
+// - `MeshRenderer` can be added/modified/removed to create/modify/remove a mesh on the node.
+// - `MeshCollider` can be added/modified/removed to create/modify/remove a collider on the node.
+// - `Material` can be added or modified to change the material properties. If the gltf node has a material, the original material will be
+//   used as a base, and any gltf features (e.g. occlusion maps) from the gtlf spec that the renderer supports but that are not exposed in the 
+//   PBMaterial will be maintained.
+//
+// The scene can add additional entities as children to the gltf node, but structural modifications of the gltf are not possible: 
+// - changing the scene hierarchy will not change the gltf node hierarchy. Moving the entity out of the gltf will sever the link and
+//   change the state to `GNS_FAILED`.
+// - deleting the scene entity will not delete the gltf node.
+//
+// Removing the GltfNode will revert any changes to the original gltf. If the GltfNode component is removed and the mesh/collider/material 
+// are not removed, this will result in a duplication of these components as the previously-linked entity will retain it's components and 
+// the gltf node will also be displayed.
+message PBGltfNode {
+  string path = 1; // the path of the target node in the Gltf.
+}

package/proto/decentraland/sdk/components/gltf_node_state.proto

@@ -0,0 +1,20 @@
+syntax = "proto3";
+package decentraland.sdk.components;
+
+import "decentraland/sdk/components/common/id.proto";
+option (common.ecs_component_id) = 1201;
+
+// See the details of the GltfNode component for more information.
+
+// The state of a linked gltf node.
+// If the state is GNSV_FAILED, the renderer may describe the failure in the error string.
+message PBGltfNodeState {
+    GltfNodeStateValue state = 1;
+    optional string error = 2;
+}
+
+enum GltfNodeStateValue {
+    GNSV_PENDING = 0;
+    GNSV_FAILED = 1;
+    GNSV_READY = 2;
+}

package/proto/decentraland/sdk/components/light.proto

@@ -0,0 +1,42 @@
+syntax = "proto3";
+package decentraland.sdk.components;
+
+import "decentraland/common/colors.proto";
+
+import "decentraland/sdk/components/common/id.proto";
+option (common.ecs_component_id) = 1204;
+
+// defines a light source.
+// the world has a default directional light (like sunlight) which can be overridden by adding the light component to the scene root.
+// a PBGlobalLight component can also be added to the root to control the directional light direction.
+// point lights (lightbulbs) or spotlights can be created by attaching the light component to non-root entities.
+message PBLight {
+  // whether the light is on
+  // default true
+  optional bool enabled = 1;
+  // light brightness in lux (lumens/m^2). 
+  // 
+  // for global directional light, this applies as a constant value at all surfaces and distances (though the effect on the surface still depends on incidence angle).
+  // the default global light illuminance varies from 400 (sunrise/sunset) to 10,000 (midday).
+  // for typical values, see https://en.wikipedia.org/wiki/Lux#Illuminance
+  //
+  // for point and spot lights, this is the lumens/m^2 at 1m distance from the light. to transform from raw lumens, 
+  // divide lumens by ~12 (4*pi).
+  // e.g. a 100w household bulb with 1200 lumens would have an illuminance of ~100.
+  // a lighthouse bulb with 200,000 lumens would have an illuminance of ~15,000 (ignoring beam reflections)
+  // 
+  // default 
+  // for point/spotlights: 10,000
+  // for global directional light: depends on explorer implementation. may vary on light direction, time of day, etc
+  optional float illuminance = 2;
+  // whether the light should cast shadows.
+  // note: even when set to true the engine may not display shadows, or may only show shadows for a limited number 
+  // of lights depending on the implementation, platform, and user settings.
+  // default
+  // for point/spotlights: false / off
+  // for global directional light: true / on
+  optional bool shadows = 3;
+  // light color
+  // default White
+  optional decentraland.common.Color3 color = 4;
+}

package/proto/decentraland/sdk/components/material.proto

@@ -22,6 +22,7 @@ message PBMaterial {
     optional float alpha_test = 2; // default = 0.5. range value: from 0 to 1
     optional bool cast_shadows = 3; // default =  true
     optional decentraland.common.Color4 diffuse_color = 4; // default = white;
+    optional decentraland.common.TextureUnion alpha_texture = 5; // default = null
   }
 
   message PbrMaterial {
@@ -29,7 +30,7 @@ message PBMaterial {
   
     optional float alpha_test = 2; // default = 0.5. range value: from 0 to 1
     optional bool cast_shadows = 3; // default =  true
-  
+    // @deprecated Alpha textures are no longer supported on PBRMaterial and UnlitMaterial.alphaTexture should be used instead.
     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
@@ -53,5 +54,16 @@ message PBMaterial {
     UnlitMaterial unlit = 1;
     PbrMaterial pbr = 2;
   }
+
+  message GltfMaterial {
+    string gltf_src = 1;
+    string name = 2;
+  }
   
+  // A gltf material that may provide additional features not supported by the PbMaterial fields.
+  // If both gltf and material fields are provided, the gltf will be used only for extended features not 
+  // supported by the PbMaterial.
+  // If this is provided and the `material` field is not provided, the renderer will update the material
+  // field with data that reflects the gltf material once it is loaded.
+  optional GltfMaterial gltf = 3;
 }

package/proto/decentraland/sdk/components/mesh_collider.proto

@@ -30,6 +30,12 @@ message PBMeshCollider {
   // SphereMesh is a sphere shape that contains the Entity.
   message SphereMesh {}
 
+  // A collider constructed from a Gltf Mesh.
+  message GltfMesh {
+    string gltf_src = 1; // the GLTF file path as listed in the scene's manifest.
+    string name = 2; // the name of the mesh asset
+  }
+
   optional uint32 collision_mask = 1; // enabled ColliderLayers (default CL_POINTER | CL_PHYSICS)
 
   oneof mesh {
@@ -37,6 +43,7 @@ message PBMeshCollider {
     SphereMesh sphere = 3;
     CylinderMesh cylinder = 4;
     PlaneMesh plane = 5;
+    GltfMesh gltf = 6;
   }
 }
 
@@ -59,4 +66,4 @@ enum ColliderLayer {
   CL_CUSTOM6 = 8192;
   CL_CUSTOM7 = 16384;
   CL_CUSTOM8 = 32768;
-}
+}

package/proto/decentraland/sdk/components/mesh_renderer.proto

@@ -5,13 +5,11 @@ import "decentraland/sdk/components/common/id.proto";
 option (common.ecs_component_id) = 1018;
 
 // The MeshRenderer component renders a basic geometric shape for an Entity. It can be a cube, a 
-// plane, a sphere or a cylinder.
+// plane, a sphere, a cylinder, or a Gltf mesh.
 //
 // The cube and plane variants can include a UV texture mapping, so specific areas of a material 
 // texture are rendered on different faces of the shape. They are serialized as a sequence of 2D
 // `float` coordinates, one for each corner of each side of each face.
-//
-// More complex shapes require the use of a `GltfContainer` component.
 message PBMeshRenderer {
     
     // BoxMesh renders a prism shape.
@@ -34,10 +32,17 @@ message PBMeshRenderer {
     message SphereMesh {
     }
 
+    // A mesh from a Gltf.
+    message GltfMesh {
+        string gltf_src = 1; // the GLTF file path as listed in the scene's manifest.
+        string name = 2;  // the name of the mesh asset
+    }
+
     oneof mesh {
         BoxMesh box = 1;
         SphereMesh sphere = 2;
         CylinderMesh cylinder = 3;
         PlaneMesh plane = 4;
+        GltfMesh gltf = 5;
     }
 }

package/proto/decentraland/sdk/components/spotlight.proto

@@ -0,0 +1,21 @@
+syntax = "proto3";
+package decentraland.sdk.components;
+
+import "decentraland/sdk/components/common/id.proto";
+option (common.ecs_component_id) = 1205;
+
+// defines a spotlight.
+// spotlights are point lights that emit light only in a cone around the transform's forward direction.
+// add this component together with the PBLight component to transform a point light into a spotlight.
+// note that spotlights do not model any internal reflections / focus, they only restrict the area of effect.
+// so for e.g. a torch beam, the bulb illuminance should be multiplied by the solid angle. 
+// a typical torch with a beam width of 15 degrees would use outer angle of 0.15 (7.5 degrees in radians),
+// and an illuminance approximately equal to the bulb's lumens, e.g. 1200.
+message PBSpotlight {
+  // the cone radius in radians. distance away from forward in which the light is visible. 
+  // for a torch a value around 0.15 is appropriate.    
+  float angle = 1;
+  // optional angle at which the light is brightest. should be <= outer angle. 
+  // if specified, the light will fall off smoothly between `inner_angle` and `angle`.
+  optional float inner_angle = 2;
+}

package/proto/decentraland/sdk/components/ui_canvas.proto

@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+import "decentraland/sdk/components/common/id.proto";
+package decentraland.sdk.components;
+
+option (common.ecs_component_id) = 1203;
+
+import "decentraland/common/colors.proto";
+
+// The UiCanvas component can be attached to a ui root entity to specify properties of the ui texture.
+message PBUiCanvas {
+  uint32 width = 1;
+  uint32 height = 2;
+
+  optional decentraland.common.Color4 color = 3; // default = (0.0, 0.0, 0.0, 0.0) / transparent
+}