@dcl/protocol 1.0.0-22309435573.commit-a48721e → 1.0.0-22483842997.commit-1c3d55b

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

@@ -1,7 +1,6 @@
 /* eslint-disable */
 import _m0 from "protobufjs/minimal";
 import { Color4 } from "../../common/colors.gen";
-import { Vector2 } from "../../common/vectors.gen";
 
 export const protobufPackage = "decentraland.sdk.components";
 
@@ -473,55 +472,6 @@ 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;
@@ -666,105 +616,10 @@ export interface PBUiTransform {
   opacity?:
     | number
     | undefined;
-  /** reference for scroll_position. default empty */
-  elementId?:
-    | string
-    | undefined;
-  /** default position=(0,0) */
-  scrollPosition?:
-    | ScrollPositionValue
-    | undefined;
-  /** default ShowScrollBar.SSB_BOTH */
-  scrollVisible?:
-    | ShowScrollBar
-    | undefined;
   /** default: 0 — controls render stacking order. Higher values appear in front of lower values. */
   zIndex?: number | 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 {
   return {
     parent: 0,
@@ -840,9 +695,6 @@ function createBasePBUiTransform(): PBUiTransform {
     borderLeftColor: undefined,
     borderRightColor: undefined,
     opacity: undefined,
-    elementId: undefined,
-    scrollPosition: undefined,
-    scrollVisible: undefined,
     zIndex: undefined,
   };
 }
@@ -1068,15 +920,6 @@ export namespace PBUiTransform {
     if (message.opacity !== undefined) {
       writer.uint32(589).float(message.opacity);
     }
-    if (message.elementId !== undefined) {
-      writer.uint32(594).string(message.elementId);
-    }
-    if (message.scrollPosition !== undefined) {
-      ScrollPositionValue.encode(message.scrollPosition, writer.uint32(602).fork()).ldelim();
-    }
-    if (message.scrollVisible !== undefined) {
-      writer.uint32(608).int32(message.scrollVisible);
-    }
     if (message.zIndex !== undefined) {
       writer.uint32(616).int32(message.zIndex);
     }
@@ -1601,27 +1444,6 @@ export namespace PBUiTransform {
 
           message.opacity = reader.float();
           continue;
-        case 74:
-          if (tag !== 594) {
-            break;
-          }
-
-          message.elementId = reader.string();
-          continue;
-        case 75:
-          if (tag !== 602) {
-            break;
-          }
-
-          message.scrollPosition = ScrollPositionValue.decode(reader, reader.uint32());
-          continue;
-        case 76:
-          if (tag !== 608) {
-            break;
-          }
-
-          message.scrollVisible = reader.int32() as any;
-          continue;
         case 77:
           if (tag !== 616) {
             break;
@@ -1727,9 +1549,6 @@ export namespace PBUiTransform {
       borderLeftColor: isSet(object.borderLeftColor) ? Color4.fromJSON(object.borderLeftColor) : undefined,
       borderRightColor: isSet(object.borderRightColor) ? Color4.fromJSON(object.borderRightColor) : 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,
       zIndex: isSet(object.zIndex) ? Number(object.zIndex) : undefined,
     };
   }
@@ -1843,13 +1662,6 @@ export namespace PBUiTransform {
     message.borderRightColor !== undefined &&
       (obj.borderRightColor = message.borderRightColor ? Color4.toJSON(message.borderRightColor) : 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);
     message.zIndex !== undefined && (obj.zIndex = Math.round(message.zIndex));
     return obj;
   }
@@ -1941,11 +1753,6 @@ export namespace PBUiTransform {
       ? Color4.fromPartial(object.borderRightColor)
       : 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;
     message.zIndex = object.zIndex ?? undefined;
     return message;
   }

package/package.json

@@ -1,11 +1,8 @@
 {
   "name": "@dcl/protocol",
-  "version": "1.0.0-22309435573.commit-a48721e",
+  "version": "1.0.0-22483842997.commit-1c3d55b",
   "description": "",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/decentraland/protocol.git"
-  },
+  "repository": "decentraland/protocol.git",
   "homepage": "https://github.com/decentraland/protocol#readme",
   "bugs": "https://github.com/decentraland/protocol/issues",
   "keywords": [],
@@ -16,7 +13,7 @@
     "test": "./scripts/check-proto-compabitility.sh"
   },
   "devDependencies": {
-    "@protobuf-ts/protoc": "^2.8.1",
+    "@protobuf-ts/protoc": "^2.11.0",
     "proto-compatibility-tool": "^1.1.2-20220925163655.commit-25bd040",
     "typescript": "^5.0.4"
   },
@@ -33,5 +30,5 @@
     "out-js",
     "public"
   ],
-  "commit": "a48721efb9b676efd0c27f6e06db6d699f5c9f10"
+  "commit": "1c3d55b3b8d342af220eb1d7fc7e1ed3ebe25161"
 }

package/proto/decentraland/common/texture.proto

@@ -36,17 +36,10 @@ 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/kernel/apis/restricted_actions.proto

@@ -54,19 +54,6 @@ message MovePlayerToResponse {
 
 message TeleportToResponse { }
 
-message SetUiFocusRequest {
-  string element_id = 1;
-}
-
-message ClearUiFocusRequest { }
-
-message GetUiFocusRequest { }
-
-message UiFocusResponse { 
-  // the element that is/was focussed
-  optional string element_id = 1;
-}
-
 message CopyToClipboardRequest {
   string text = 1;
 }
@@ -101,15 +88,6 @@ service RestrictedActionsService {
   // TriggerSceneEmote will trigger an scene emote file in this current user
   rpc TriggerSceneEmote(TriggerSceneEmoteRequest) returns (SuccessResponse) {}
 
-  // Sets the focus to a specific UI element
-  rpc SetUiFocus(SetUiFocusRequest) returns (UiFocusResponse) {}
-
-  // Clears the focus from any currently focused textentry or dropdown
-  rpc ClearUiFocus(SetUiFocusRequest) returns (UiFocusResponse) {}
-
-  // Returns the element_id of any currently focused textentry or dropdown
-  rpc GetUiFocus(GetUiFocusRequest) returns (UiFocusResponse) {}
-
   // CopyToClipboard copies the provided text into the clipboard
   rpc CopyToClipboard(CopyToClipboardRequest) returns (EmptyResponse) {}
 }

package/proto/decentraland/kernel/comms/rfc4/comms.proto

@@ -18,6 +18,7 @@ message Packet {
     PlayerEmote player_emote = 9;
     SceneEmote scene_emote = 10;
     MovementCompressed movement_compressed = 12;
+	LookAtPosition look_at_position = 13;
   }
   uint32 protocol_version = 11;
 }
@@ -60,17 +61,41 @@ message Movement {
   // interpolation
   bool is_instant = 17;
   bool is_emoting = 18;
+  // head-sync (enabled flags + world-space yaw and pitch angles, in degrees)
+  bool head_ik_yaw_enabled = 19;
+  bool head_ik_pitch_enabled = 20;
+  float head_yaw = 21;
+  float head_pitch = 22;
 }
 
 message MovementCompressed {
   int32 temporal_data = 1; // bit-compressed: timestamp + animations 
   int64 movement_data = 2; // bit-compressed: position + velocity 
+  int32 head_sync_data = 3; // bit-compressed: enabled flags + yaw + pitch
 }
 
 message PlayerEmote {
   uint32 incremental_id = 1;
   string urn = 2;
   float timestamp = 3;
+  optional bool is_stopping = 4; // true means the emote has been stopped in the sender's client
+  optional bool is_repeating = 5; // true when it is not the first time the looping animation plays
+  optional int32 interaction_id = 6; // identifies an interaction univocaly, established when the start animation is triggered
+  optional int32 social_emote_outcome = 7; // -1 means it does not use an outcome animation
+  optional bool is_reacting = 8; // to a social emote started by other user
+  optional string social_emote_initiator = 9; // wallet address of the user that initiated social emote
+  optional string target_avatar = 10; // wallet address of the user whose avatar is the target of a directed emote
+}
+
+// Message sent to force an avatar to look at a position
+message LookAtPosition
+{
+  float timestamp = 1;
+  // world position
+  float position_x = 2;
+  float position_y = 3;
+  float position_z = 4;
+  string target_avatar_wallet_address = 5;
 }
 
 message SceneEmote {
@@ -103,6 +128,10 @@ message ProfileResponse {
 message Chat {
   string message = 1;
   double timestamp = 2;
+
+  // Extension: optional forwarded_from to identify the original sender when
+  // messages are forwarded through an SFU
+  optional string forwarded_from = 3;
 }
 
 message Scene {

package/proto/decentraland/sdk/components/audio_analysis.proto

@@ -0,0 +1,44 @@
+syntax = "proto3";
+package decentraland.sdk.components;
+
+import "decentraland/sdk/components/common/id.proto";
+option (common.ecs_component_id) = 1212;
+
+enum PBAudioAnalysisMode {
+    MODE_RAW = 0;
+    MODE_LOGARITHMIC = 1;
+}
+
+message PBAudioAnalysis {
+
+    // Parameters section
+    PBAudioAnalysisMode mode = 1;
+
+    // Used only when mode == MODE_LOGARITHMIC
+    optional float amplitude_gain = 100;
+    optional float bands_gain = 101;
+    // End when mode == MODE_LOGARITHMIC
+
+    // End Parameters section
+
+    // Result section
+    float amplitude = 200;
+
+    // Protobuf doesn't support fixed arrays -> 8 band fields
+    float band_0 = 201;
+    float band_1 = 202;
+    float band_2 = 203;
+    float band_3 = 204;
+    float band_4 = 205;
+    float band_5 = 206;
+    float band_6 = 207;
+    float band_7 = 208;
+
+    // End Result section
+
+    // Future fields
+    // float spectral_centroid = 13;
+    // float spectral_flux = 14;
+    // bool onset = 15;
+    // float bpm = 16;
+}

package/proto/decentraland/sdk/components/avatar_equipped_data.proto

@@ -10,5 +10,4 @@ option (common.ecs_component_id) = 1091;
 message PBAvatarEquippedData {
   repeated string wearable_urns = 1;
   repeated string emote_urns = 2;
-  repeated string force_render = 3; // slots that will render even if hidden
-}
+}

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

@@ -23,8 +23,6 @@ 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.
@@ -32,22 +30,3 @@ 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/avatar_shape.proto

@@ -40,6 +40,5 @@ message PBAvatarShape {
   repeated string emotes = 11; // available emotes (default empty)
 
   optional bool show_only_wearables = 12; // hides the skin + hair + facial features (default: false)
-  repeated string force_render = 13; // slots that will render even if hidden
 }
 

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, 3rd-person or cinematic) is overridden.
+// the player's camera mode (1st-person or 3rd-person) 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,26 +19,7 @@ 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
-  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
+  decentraland.common.Vector3 area = 1; // the 3D size of the region
+  common.CameraType mode = 2;           // the camera mode to enforce
 }

package/proto/decentraland/sdk/components/common/input_action.proto

@@ -26,7 +26,11 @@ enum PointerEventType {
   PET_DOWN = 1;
   PET_HOVER_ENTER = 2;
   PET_HOVER_LEAVE = 3;
-  PET_DRAG_LOCKED = 4;
-  PET_DRAG = 5;
-  PET_DRAG_END = 6;
+  PET_PROXIMITY_ENTER = 4;
+  PET_PROXIMITY_LEAVE = 5;
+}
+
+enum InteractionType {
+  CURSOR = 0;
+  PROXIMITY = 1;
 }

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

@@ -10,17 +10,4 @@ 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/light_source.proto

@@ -25,4 +25,4 @@ message PBLightSource {
     optional float inner_angle = 9;   // default = 21.8. Inner angle can't be higher than outer angle, otherwise will default to same value. Min value is 0. Max value is 179.
     optional float outer_angle = 10;  // default = 30. Outer angle can't be lower than inner angle, otherwise will inner angle will be set to same value. Max value is 179.
   }
-}
+}

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

@@ -54,16 +54,4 @@ 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,12 +30,6 @@ 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 {
@@ -43,7 +37,6 @@ message PBMeshCollider {
     SphereMesh sphere = 3;
     CylinderMesh cylinder = 4;
     PlaneMesh plane = 5;
-    GltfMesh gltf = 6;
   }
 }
 

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

@@ -5,11 +5,13 @@ 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, a cylinder, or a Gltf mesh.
+// plane, a sphere or a cylinder.
 //
 // 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.
@@ -32,17 +34,10 @@ 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/pointer_events.proto

@@ -51,11 +51,13 @@ message PBPointerEvents {
     optional bool show_feedback = 4;        // enable or disable hover text and highlight (default true)
     optional bool show_highlight = 5;       // enable or disable hover highlight (default true)
     optional float max_player_distance = 6; // range of interaction from the avatar's position (default 0)
+    optional uint32 priority = 7;           // resolution order when multiple events overlap, higher wins (default 0)
   }
 
   message Entry {
     common.PointerEventType event_type = 1; // the kind of interaction to detect
     Info event_info = 2;             // additional configuration for this detection
+    optional common.InteractionType interaction_type = 3; // the type of interaction source (default 0 == CURSOR)
   }
 
   repeated Entry pointer_events = 1; // the list of relevant events to detect