@dcl/protocol 1.0.0-9466805132.commit-365e0bb → 1.0.0-9682449435.commit-1b32d83

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

@@ -40,6 +40,48 @@ export function avatarModifierTypeToJSON(object: AvatarModifierType): string {
   }
 }
 
+export enum AvatarControlType {
+  /** CCT_NONE - avatar cannot move */
+  CCT_NONE = 0,
+  /** CCT_RELATIVE - avatar moves relative to the camera origin */
+  CCT_RELATIVE = 1,
+  /** CCT_TANK - avatar moves like a tank: left/right rotate the player, forward/backward advance/retreat the player */
+  CCT_TANK = 2,
+  UNRECOGNIZED = -1,
+}
+
+export function avatarControlTypeFromJSON(object: any): AvatarControlType {
+  switch (object) {
+    case 0:
+    case "CCT_NONE":
+      return AvatarControlType.CCT_NONE;
+    case 1:
+    case "CCT_RELATIVE":
+      return AvatarControlType.CCT_RELATIVE;
+    case 2:
+    case "CCT_TANK":
+      return AvatarControlType.CCT_TANK;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return AvatarControlType.UNRECOGNIZED;
+  }
+}
+
+export function avatarControlTypeToJSON(object: AvatarControlType): string {
+  switch (object) {
+    case AvatarControlType.CCT_NONE:
+      return "CCT_NONE";
+    case AvatarControlType.CCT_RELATIVE:
+      return "CCT_RELATIVE";
+    case AvatarControlType.CCT_TANK:
+      return "CCT_TANK";
+    case AvatarControlType.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
 /**
  * The AvatarModifierArea component can be attached to an Entity to define a region of space where
  * avatar behavior changes.
@@ -63,10 +105,51 @@ export interface PBAvatarModifierArea {
   excludeIds: string[];
   /** list of modifiers to apply */
   modifiers: AvatarModifierType[];
+  movementSettings?:
+    | AvatarMovementSettings
+    | undefined;
+  /** if true, the player will be considered inside the area when they are within 0.3m of the area. default true */
+  useColliderRange?: boolean | undefined;
+}
+
+export interface AvatarMovementSettings {
+  controlMode?:
+    | AvatarControlType
+    | undefined;
+  /** if not explicitly set, the following properties default to user's preference settings */
+  runSpeed?:
+    | number
+    | undefined;
+  /** how fast the player gets up to speed or comes to rest. higher = more responsive */
+  friction?:
+    | number
+    | undefined;
+  /** how fast the player accelerates vertically when not on a solid surface, in m/s. should normally be negative */
+  gravity?:
+    | number
+    | undefined;
+  /** how high the player can jump, in meters. should normally be positive. gravity must have the same sign for jumping to be possible */
+  jumpHeight?:
+    | number
+    | undefined;
+  /** max fall speed in m/s. should normally be negative */
+  maxFallSpeed?:
+    | number
+    | undefined;
+  /** speed the player turns in tank mode, in radians/s */
+  turnSpeed?:
+    | number
+    | undefined;
+  /** speed the player walks at, in m/s */
+  walkSpeed?:
+    | number
+    | undefined;
+  /** 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 */
+  allowWeightedMovement?: boolean | undefined;
 }
 
 function createBasePBAvatarModifierArea(): PBAvatarModifierArea {
-  return { area: undefined, excludeIds: [], modifiers: [] };
+  return { area: undefined, excludeIds: [], modifiers: [], movementSettings: undefined, useColliderRange: undefined };
 }
 
 export namespace PBAvatarModifierArea {
@@ -82,6 +165,12 @@ export namespace PBAvatarModifierArea {
       writer.int32(v);
     }
     writer.ldelim();
+    if (message.movementSettings !== undefined) {
+      AvatarMovementSettings.encode(message.movementSettings, writer.uint32(34).fork()).ldelim();
+    }
+    if (message.useColliderRange !== undefined) {
+      writer.uint32(40).bool(message.useColliderRange);
+    }
     return writer;
   }
 
@@ -123,6 +212,20 @@ export namespace PBAvatarModifierArea {
           }
 
           break;
+        case 4:
+          if (tag !== 34) {
+            break;
+          }
+
+          message.movementSettings = AvatarMovementSettings.decode(reader, reader.uint32());
+          continue;
+        case 5:
+          if (tag !== 40) {
+            break;
+          }
+
+          message.useColliderRange = reader.bool();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -139,6 +242,10 @@ export namespace PBAvatarModifierArea {
       modifiers: Array.isArray(object?.modifiers)
         ? object.modifiers.map((e: any) => avatarModifierTypeFromJSON(e))
         : [],
+      movementSettings: isSet(object.movementSettings)
+        ? AvatarMovementSettings.fromJSON(object.movementSettings)
+        : undefined,
+      useColliderRange: isSet(object.useColliderRange) ? Boolean(object.useColliderRange) : undefined,
     };
   }
 
@@ -155,6 +262,11 @@ export namespace PBAvatarModifierArea {
     } else {
       obj.modifiers = [];
     }
+    message.movementSettings !== undefined &&
+      (obj.movementSettings = message.movementSettings
+        ? AvatarMovementSettings.toJSON(message.movementSettings)
+        : undefined);
+    message.useColliderRange !== undefined && (obj.useColliderRange = message.useColliderRange);
     return obj;
   }
 
@@ -167,6 +279,185 @@ export namespace PBAvatarModifierArea {
     message.area = (object.area !== undefined && object.area !== null) ? Vector3.fromPartial(object.area) : undefined;
     message.excludeIds = object.excludeIds?.map((e) => e) || [];
     message.modifiers = object.modifiers?.map((e) => e) || [];
+    message.movementSettings = (object.movementSettings !== undefined && object.movementSettings !== null)
+      ? AvatarMovementSettings.fromPartial(object.movementSettings)
+      : undefined;
+    message.useColliderRange = object.useColliderRange ?? undefined;
+    return message;
+  }
+}
+
+function createBaseAvatarMovementSettings(): AvatarMovementSettings {
+  return {
+    controlMode: undefined,
+    runSpeed: undefined,
+    friction: undefined,
+    gravity: undefined,
+    jumpHeight: undefined,
+    maxFallSpeed: undefined,
+    turnSpeed: undefined,
+    walkSpeed: undefined,
+    allowWeightedMovement: undefined,
+  };
+}
+
+export namespace AvatarMovementSettings {
+  export function encode(message: AvatarMovementSettings, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.controlMode !== undefined) {
+      writer.uint32(8).int32(message.controlMode);
+    }
+    if (message.runSpeed !== undefined) {
+      writer.uint32(21).float(message.runSpeed);
+    }
+    if (message.friction !== undefined) {
+      writer.uint32(29).float(message.friction);
+    }
+    if (message.gravity !== undefined) {
+      writer.uint32(37).float(message.gravity);
+    }
+    if (message.jumpHeight !== undefined) {
+      writer.uint32(45).float(message.jumpHeight);
+    }
+    if (message.maxFallSpeed !== undefined) {
+      writer.uint32(53).float(message.maxFallSpeed);
+    }
+    if (message.turnSpeed !== undefined) {
+      writer.uint32(61).float(message.turnSpeed);
+    }
+    if (message.walkSpeed !== undefined) {
+      writer.uint32(69).float(message.walkSpeed);
+    }
+    if (message.allowWeightedMovement !== undefined) {
+      writer.uint32(72).bool(message.allowWeightedMovement);
+    }
+    return writer;
+  }
+
+  export function decode(input: _m0.Reader | Uint8Array, length?: number): AvatarMovementSettings {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseAvatarMovementSettings();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 8) {
+            break;
+          }
+
+          message.controlMode = reader.int32() as any;
+          continue;
+        case 2:
+          if (tag !== 21) {
+            break;
+          }
+
+          message.runSpeed = reader.float();
+          continue;
+        case 3:
+          if (tag !== 29) {
+            break;
+          }
+
+          message.friction = reader.float();
+          continue;
+        case 4:
+          if (tag !== 37) {
+            break;
+          }
+
+          message.gravity = reader.float();
+          continue;
+        case 5:
+          if (tag !== 45) {
+            break;
+          }
+
+          message.jumpHeight = reader.float();
+          continue;
+        case 6:
+          if (tag !== 53) {
+            break;
+          }
+
+          message.maxFallSpeed = reader.float();
+          continue;
+        case 7:
+          if (tag !== 61) {
+            break;
+          }
+
+          message.turnSpeed = reader.float();
+          continue;
+        case 8:
+          if (tag !== 69) {
+            break;
+          }
+
+          message.walkSpeed = reader.float();
+          continue;
+        case 9:
+          if (tag !== 72) {
+            break;
+          }
+
+          message.allowWeightedMovement = reader.bool();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  }
+
+  export function fromJSON(object: any): AvatarMovementSettings {
+    return {
+      controlMode: isSet(object.controlMode) ? avatarControlTypeFromJSON(object.controlMode) : undefined,
+      runSpeed: isSet(object.runSpeed) ? Number(object.runSpeed) : undefined,
+      friction: isSet(object.friction) ? Number(object.friction) : undefined,
+      gravity: isSet(object.gravity) ? Number(object.gravity) : undefined,
+      jumpHeight: isSet(object.jumpHeight) ? Number(object.jumpHeight) : undefined,
+      maxFallSpeed: isSet(object.maxFallSpeed) ? Number(object.maxFallSpeed) : undefined,
+      turnSpeed: isSet(object.turnSpeed) ? Number(object.turnSpeed) : undefined,
+      walkSpeed: isSet(object.walkSpeed) ? Number(object.walkSpeed) : undefined,
+      allowWeightedMovement: isSet(object.allowWeightedMovement) ? Boolean(object.allowWeightedMovement) : undefined,
+    };
+  }
+
+  export function toJSON(message: AvatarMovementSettings): unknown {
+    const obj: any = {};
+    message.controlMode !== undefined &&
+      (obj.controlMode = message.controlMode !== undefined ? avatarControlTypeToJSON(message.controlMode) : undefined);
+    message.runSpeed !== undefined && (obj.runSpeed = message.runSpeed);
+    message.friction !== undefined && (obj.friction = message.friction);
+    message.gravity !== undefined && (obj.gravity = message.gravity);
+    message.jumpHeight !== undefined && (obj.jumpHeight = message.jumpHeight);
+    message.maxFallSpeed !== undefined && (obj.maxFallSpeed = message.maxFallSpeed);
+    message.turnSpeed !== undefined && (obj.turnSpeed = message.turnSpeed);
+    message.walkSpeed !== undefined && (obj.walkSpeed = message.walkSpeed);
+    message.allowWeightedMovement !== undefined && (obj.allowWeightedMovement = message.allowWeightedMovement);
+    return obj;
+  }
+
+  export function create<I extends Exact<DeepPartial<AvatarMovementSettings>, I>>(base?: I): AvatarMovementSettings {
+    return AvatarMovementSettings.fromPartial(base ?? {});
+  }
+
+  export function fromPartial<I extends Exact<DeepPartial<AvatarMovementSettings>, I>>(
+    object: I,
+  ): AvatarMovementSettings {
+    const message = createBaseAvatarMovementSettings();
+    message.controlMode = object.controlMode ?? undefined;
+    message.runSpeed = object.runSpeed ?? undefined;
+    message.friction = object.friction ?? undefined;
+    message.gravity = object.gravity ?? undefined;
+    message.jumpHeight = object.jumpHeight ?? undefined;
+    message.maxFallSpeed = object.maxFallSpeed ?? undefined;
+    message.turnSpeed = object.turnSpeed ?? undefined;
+    message.walkSpeed = object.walkSpeed ?? undefined;
+    message.allowWeightedMovement = object.allowWeightedMovement ?? undefined;
     return message;
   }
 }

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

@@ -7,7 +7,7 @@ export const protobufPackage = "decentraland.sdk.components";
 
 /**
  * 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
@@ -17,6 +17,8 @@ export const protobufPackage = "decentraland.sdk.components";
  *
  * 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.
  */
 export interface PBCameraModeArea {
   /** the 3D size of the region */
@@ -25,10 +27,47 @@ export interface PBCameraModeArea {
     | undefined;
   /** the camera mode to enforce */
   mode: CameraType;
+  cinematicSettings?:
+    | CinematicSettings
+    | undefined;
+  /** if true, the player will be considered inside the area when they are within 0.3m of the area. default true */
+  useColliderRange?: boolean | undefined;
+}
+
+export interface CinematicSettings {
+  /** Entity that defines the cinematic camera transform. */
+  cameraEntity: number;
+  /**
+   * Position -> camera's position
+   * Rotation -> camera's direction
+   * scale.z -> zoom level
+   * scale.x and scale.y -> unused
+   */
+  allowManualRotation?:
+    | boolean
+    | undefined;
+  /** how far the camera can rotate around the y-axis / look left/right, in radians. default unrestricted */
+  yawRange?:
+    | number
+    | undefined;
+  /** how far the camera can rotate around the x-axis / look up-down, in radians. default unrestricted */
+  pitchRange?:
+    | number
+    | undefined;
+  /** note: cameras can never look up/down further than Vec3::Y */
+  rollRange?:
+    | number
+    | undefined;
+  /** minimum zoom level. must be greater than 0. defaults to the input zoom level */
+  zoomMin?:
+    | number
+    | undefined;
+  /** maximum zoom level. must be greater than 0. defaults to the input zoom level */
+  zoomMax?: number | undefined;
 }
 
 function createBasePBCameraModeArea(): PBCameraModeArea {
-  return { area: undefined, mode: 0 };
+  return { area: undefined, mode: 0, cinematicSettings: undefined, useColliderRange: undefined };
 }
 
 export namespace PBCameraModeArea {
@@ -39,6 +78,12 @@ export namespace PBCameraModeArea {
     if (message.mode !== 0) {
       writer.uint32(16).int32(message.mode);
     }
+    if (message.cinematicSettings !== undefined) {
+      CinematicSettings.encode(message.cinematicSettings, writer.uint32(26).fork()).ldelim();
+    }
+    if (message.useColliderRange !== undefined) {
+      writer.uint32(32).bool(message.useColliderRange);
+    }
     return writer;
   }
 
@@ -63,6 +108,20 @@ export namespace PBCameraModeArea {
 
           message.mode = reader.int32() as any;
           continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+
+          message.cinematicSettings = CinematicSettings.decode(reader, reader.uint32());
+          continue;
+        case 4:
+          if (tag !== 32) {
+            break;
+          }
+
+          message.useColliderRange = reader.bool();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -76,6 +135,10 @@ export namespace PBCameraModeArea {
     return {
       area: isSet(object.area) ? Vector3.fromJSON(object.area) : undefined,
       mode: isSet(object.mode) ? cameraTypeFromJSON(object.mode) : 0,
+      cinematicSettings: isSet(object.cinematicSettings)
+        ? CinematicSettings.fromJSON(object.cinematicSettings)
+        : undefined,
+      useColliderRange: isSet(object.useColliderRange) ? Boolean(object.useColliderRange) : undefined,
     };
   }
 
@@ -83,6 +146,11 @@ export namespace PBCameraModeArea {
     const obj: any = {};
     message.area !== undefined && (obj.area = message.area ? Vector3.toJSON(message.area) : undefined);
     message.mode !== undefined && (obj.mode = cameraTypeToJSON(message.mode));
+    message.cinematicSettings !== undefined &&
+      (obj.cinematicSettings = message.cinematicSettings
+        ? CinematicSettings.toJSON(message.cinematicSettings)
+        : undefined);
+    message.useColliderRange !== undefined && (obj.useColliderRange = message.useColliderRange);
     return obj;
   }
 
@@ -94,6 +162,154 @@ export namespace PBCameraModeArea {
     const message = createBasePBCameraModeArea();
     message.area = (object.area !== undefined && object.area !== null) ? Vector3.fromPartial(object.area) : undefined;
     message.mode = object.mode ?? 0;
+    message.cinematicSettings = (object.cinematicSettings !== undefined && object.cinematicSettings !== null)
+      ? CinematicSettings.fromPartial(object.cinematicSettings)
+      : undefined;
+    message.useColliderRange = object.useColliderRange ?? undefined;
+    return message;
+  }
+}
+
+function createBaseCinematicSettings(): CinematicSettings {
+  return {
+    cameraEntity: 0,
+    allowManualRotation: undefined,
+    yawRange: undefined,
+    pitchRange: undefined,
+    rollRange: undefined,
+    zoomMin: undefined,
+    zoomMax: undefined,
+  };
+}
+
+export namespace CinematicSettings {
+  export function encode(message: CinematicSettings, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.cameraEntity !== 0) {
+      writer.uint32(8).uint32(message.cameraEntity);
+    }
+    if (message.allowManualRotation !== undefined) {
+      writer.uint32(16).bool(message.allowManualRotation);
+    }
+    if (message.yawRange !== undefined) {
+      writer.uint32(29).float(message.yawRange);
+    }
+    if (message.pitchRange !== undefined) {
+      writer.uint32(37).float(message.pitchRange);
+    }
+    if (message.rollRange !== undefined) {
+      writer.uint32(45).float(message.rollRange);
+    }
+    if (message.zoomMin !== undefined) {
+      writer.uint32(53).float(message.zoomMin);
+    }
+    if (message.zoomMax !== undefined) {
+      writer.uint32(61).float(message.zoomMax);
+    }
+    return writer;
+  }
+
+  export function decode(input: _m0.Reader | Uint8Array, length?: number): CinematicSettings {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseCinematicSettings();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 8) {
+            break;
+          }
+
+          message.cameraEntity = reader.uint32();
+          continue;
+        case 2:
+          if (tag !== 16) {
+            break;
+          }
+
+          message.allowManualRotation = reader.bool();
+          continue;
+        case 3:
+          if (tag !== 29) {
+            break;
+          }
+
+          message.yawRange = reader.float();
+          continue;
+        case 4:
+          if (tag !== 37) {
+            break;
+          }
+
+          message.pitchRange = reader.float();
+          continue;
+        case 5:
+          if (tag !== 45) {
+            break;
+          }
+
+          message.rollRange = reader.float();
+          continue;
+        case 6:
+          if (tag !== 53) {
+            break;
+          }
+
+          message.zoomMin = reader.float();
+          continue;
+        case 7:
+          if (tag !== 61) {
+            break;
+          }
+
+          message.zoomMax = reader.float();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  }
+
+  export function fromJSON(object: any): CinematicSettings {
+    return {
+      cameraEntity: isSet(object.cameraEntity) ? Number(object.cameraEntity) : 0,
+      allowManualRotation: isSet(object.allowManualRotation) ? Boolean(object.allowManualRotation) : undefined,
+      yawRange: isSet(object.yawRange) ? Number(object.yawRange) : undefined,
+      pitchRange: isSet(object.pitchRange) ? Number(object.pitchRange) : undefined,
+      rollRange: isSet(object.rollRange) ? Number(object.rollRange) : undefined,
+      zoomMin: isSet(object.zoomMin) ? Number(object.zoomMin) : undefined,
+      zoomMax: isSet(object.zoomMax) ? Number(object.zoomMax) : undefined,
+    };
+  }
+
+  export function toJSON(message: CinematicSettings): unknown {
+    const obj: any = {};
+    message.cameraEntity !== undefined && (obj.cameraEntity = Math.round(message.cameraEntity));
+    message.allowManualRotation !== undefined && (obj.allowManualRotation = message.allowManualRotation);
+    message.yawRange !== undefined && (obj.yawRange = message.yawRange);
+    message.pitchRange !== undefined && (obj.pitchRange = message.pitchRange);
+    message.rollRange !== undefined && (obj.rollRange = message.rollRange);
+    message.zoomMin !== undefined && (obj.zoomMin = message.zoomMin);
+    message.zoomMax !== undefined && (obj.zoomMax = message.zoomMax);
+    return obj;
+  }
+
+  export function create<I extends Exact<DeepPartial<CinematicSettings>, I>>(base?: I): CinematicSettings {
+    return CinematicSettings.fromPartial(base ?? {});
+  }
+
+  export function fromPartial<I extends Exact<DeepPartial<CinematicSettings>, I>>(object: I): CinematicSettings {
+    const message = createBaseCinematicSettings();
+    message.cameraEntity = object.cameraEntity ?? 0;
+    message.allowManualRotation = object.allowManualRotation ?? undefined;
+    message.yawRange = object.yawRange ?? undefined;
+    message.pitchRange = object.pitchRange ?? undefined;
+    message.rollRange = object.rollRange ?? undefined;
+    message.zoomMin = object.zoomMin ?? undefined;
+    message.zoomMax = object.zoomMax ?? undefined;
     return message;
   }
 }