@dcl/protocol 1.0.0-9682449435.commit-1b32d83 → 1.0.0-9959547690.commit-67e81c4

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

@@ -65,19 +65,7 @@ export interface PBUiText {
     | number
     | undefined;
   /** wrap text when the border is reached (default: TW_WRAP) */
-  textWrap?:
-    | TextWrap
-    | undefined;
-  /** width of the outline (default: 0) */
-  outlineWidth?:
-    | number
-    | undefined;
-  /** RGBA color of the outline (default: opaque black) */
-  outlineColor?:
-    | Color4
-    | undefined;
-  /** wrap text when the border is reached (default false) */
-  textWrapping?: boolean | undefined;
+  textWrap?: TextWrap | undefined;
 }
 
 function createBasePBUiText(): PBUiText {
@@ -88,9 +76,6 @@ function createBasePBUiText(): PBUiText {
     font: undefined,
     fontSize: undefined,
     textWrap: undefined,
-    outlineWidth: undefined,
-    outlineColor: undefined,
-    textWrapping: undefined,
   };
 }
 
@@ -114,15 +99,6 @@ export namespace PBUiText {
     if (message.textWrap !== undefined) {
       writer.uint32(48).int32(message.textWrap);
     }
-    if (message.outlineWidth !== undefined) {
-      writer.uint32(61).float(message.outlineWidth);
-    }
-    if (message.outlineColor !== undefined) {
-      Color4.encode(message.outlineColor, writer.uint32(66).fork()).ldelim();
-    }
-    if (message.textWrapping !== undefined) {
-      writer.uint32(72).bool(message.textWrapping);
-    }
     return writer;
   }
 
@@ -175,27 +151,6 @@ export namespace PBUiText {
 
           message.textWrap = reader.int32() as any;
           continue;
-        case 7:
-          if (tag !== 61) {
-            break;
-          }
-
-          message.outlineWidth = reader.float();
-          continue;
-        case 8:
-          if (tag !== 66) {
-            break;
-          }
-
-          message.outlineColor = Color4.decode(reader, reader.uint32());
-          continue;
-        case 9:
-          if (tag !== 72) {
-            break;
-          }
-
-          message.textWrapping = reader.bool();
-          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -213,9 +168,6 @@ export namespace PBUiText {
       font: isSet(object.font) ? fontFromJSON(object.font) : undefined,
       fontSize: isSet(object.fontSize) ? Number(object.fontSize) : undefined,
       textWrap: isSet(object.textWrap) ? textWrapFromJSON(object.textWrap) : undefined,
-      outlineWidth: isSet(object.outlineWidth) ? Number(object.outlineWidth) : undefined,
-      outlineColor: isSet(object.outlineColor) ? Color4.fromJSON(object.outlineColor) : undefined,
-      textWrapping: isSet(object.textWrapping) ? Boolean(object.textWrapping) : undefined,
     };
   }
 
@@ -229,10 +181,6 @@ export namespace PBUiText {
     message.fontSize !== undefined && (obj.fontSize = Math.round(message.fontSize));
     message.textWrap !== undefined &&
       (obj.textWrap = message.textWrap !== undefined ? textWrapToJSON(message.textWrap) : undefined);
-    message.outlineWidth !== undefined && (obj.outlineWidth = message.outlineWidth);
-    message.outlineColor !== undefined &&
-      (obj.outlineColor = message.outlineColor ? Color4.toJSON(message.outlineColor) : undefined);
-    message.textWrapping !== undefined && (obj.textWrapping = message.textWrapping);
     return obj;
   }
 
@@ -250,11 +198,6 @@ export namespace PBUiText {
     message.font = object.font ?? undefined;
     message.fontSize = object.fontSize ?? undefined;
     message.textWrap = object.textWrap ?? undefined;
-    message.outlineWidth = object.outlineWidth ?? undefined;
-    message.outlineColor = (object.outlineColor !== undefined && object.outlineColor !== null)
-      ? Color4.fromPartial(object.outlineColor)
-      : undefined;
-    message.textWrapping = object.textWrapping ?? undefined;
     return message;
   }
 }

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

@@ -1,6 +1,5 @@
 /* eslint-disable */
 import _m0 from "protobufjs/minimal";
-import { Vector2 } from "../../common/vectors.gen";
 
 export const protobufPackage = "decentraland.sdk.components";
 
@@ -472,55 +471,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;
@@ -611,106 +561,7 @@ export interface PBUiTransform {
   paddingBottomUnit: YGUnit;
   paddingBottom: number;
   /** default: PointerFilterMode.PFM_NONE */
-  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;
-  }
+  pointerFilter?: PointerFilterMode | undefined;
 }
 
 function createBasePBUiTransform(): PBUiTransform {
@@ -767,10 +618,6 @@ function createBasePBUiTransform(): PBUiTransform {
     paddingBottomUnit: 0,
     paddingBottom: 0,
     pointerFilter: undefined,
-    opacity: undefined,
-    elementId: undefined,
-    scrollPosition: undefined,
-    scrollVisible: undefined,
   };
 }
 
@@ -932,18 +779,6 @@ 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;
   }
 
@@ -1318,34 +1153,6 @@ 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;
@@ -1409,10 +1216,6 @@ 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,
     };
   }
 
@@ -1476,14 +1279,6 @@ 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;
   }
 
@@ -1545,12 +1340,6 @@ 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-9682449435.commit-1b32d83",
+  "version": "1.0.0-9959547690.commit-67e81c4",
   "description": "",
   "repository": "decentraland/protocol.git",
   "homepage": "https://github.com/decentraland/protocol#readme",
@@ -29,5 +29,5 @@
     "out-js",
     "public"
   ],
-  "commit": "1b32d83e5f7925205ce01e0fe06f227fa76353e8"
+  "commit": "67e81c4dc659b9d40ab9d8ea6a0993ff42aa22c3"
 }

package/proto/decentraland/sdk/components/avatar_attach.proto

@@ -21,7 +21,8 @@ message PBAvatarAttach {
 
 // AvatarAnchorPointType determines the part of the avatar's body that anchors the Entity.
 enum AvatarAnchorPointType {
-AAPT_POSITION = 0;
+  // @deprecated consider parenting to `engine.PlayerEntity`, this will attach to player position with an arbitrary offset
+  AAPT_POSITION = 0;
   AAPT_NAME_TAG = 1;
   AAPT_HEAD = 4;
   AAPT_NECK = 5;

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/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/ui_text.proto

@@ -23,8 +23,4 @@ message PBUiText {
   optional common.Font font = 4;                 // font for the text (default: sans-serif)
   optional int32 font_size = 5;                  // size of the text (default: 10)
   optional TextWrap text_wrap = 6;               // wrap text when the border is reached (default: TW_WRAP)
-  
-  optional float outline_width = 7;              // width of the outline (default: 0)
-  optional decentraland.common.Color4 outline_color = 8; // RGBA color of the outline (default: opaque black)
-  optional bool text_wrapping = 9;               // wrap text when the border is reached (default false)
 }

package/proto/decentraland/sdk/components/ui_transform.proto

@@ -3,7 +3,6 @@ syntax = "proto3";
 package decentraland.sdk.components;
 
 import "decentraland/sdk/components/common/id.proto";
-import "decentraland/common/vectors.proto";
 
 option (common.ecs_component_id) = 1050;
 
@@ -80,20 +79,6 @@ enum PointerFilterMode {
   PFM_BLOCK = 1;
 }
 
-enum ShowScrollBar {
-  SSB_BOTH = 0;
-  SSB_ONLY_VERTICAL = 1;
-  SSB_ONLY_HORIZONTAL = 2;
-  SSB_HIDDEN = 3;
-}
-
-message ScrollPositionValue {
-  oneof value {
-    decentraland.common.Vector2 position = 1;
-    string reference = 2;
-  }
-}
-
 message PBUiTransform {
   int32 parent = 1;
   int32 right_of = 2;
@@ -160,10 +145,4 @@ message PBUiTransform {
   float padding_bottom = 51;
   
   optional PointerFilterMode pointer_filter = 52; // default: PointerFilterMode.PFM_NONE
-  optional float opacity = 53; // default: 1
-
-  optional string element_id = 54; // default empty
-
-  optional ScrollPositionValue scroll_position = 55; // default position=(0,0)
-  optional ShowScrollBar scroll_visible = 56; // default ShowScrollBar.SSB_BOTH
 }

package/proto/decentraland/sdk/components/ui_scroll_result.proto

@@ -1,12 +0,0 @@
-syntax = "proto3";
-
-package decentraland.sdk.components;
-
-import "decentraland/sdk/components/common/id.proto";
-import "decentraland/common/vectors.proto";
-
-option (common.ecs_component_id) = 1097;
-
-message PBUiScrollResult {
-  decentraland.common.Vector2 value = 1;
-}