@dcl/protocol 1.0.0-33630043685.commit-f096a09 → 1.0.0-33674022401.commit-882d4ee

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

@@ -150,6 +150,7 @@ export interface PBMeshCollider {
     | { $case: "sphere"; sphere: PBMeshCollider_SphereMesh }
     | { $case: "cylinder"; cylinder: PBMeshCollider_CylinderMesh }
     | { $case: "plane"; plane: PBMeshCollider_PlaneMesh }
+    | { $case: "gltf"; gltf: PBMeshCollider_GltfMesh }
     | undefined;
 }
 
@@ -175,6 +176,14 @@ export interface PBMeshCollider_PlaneMesh {
 export interface PBMeshCollider_SphereMesh {
 }
 
+/** A collider constructed from a Gltf Mesh. */
+export interface PBMeshCollider_GltfMesh {
+  /** the GLTF file path as listed in the scene's manifest. */
+  gltfSrc: string;
+  /** the name of the mesh asset */
+  name: string;
+}
+
 function createBasePBMeshCollider(): PBMeshCollider {
   return { collisionMask: undefined, mesh: undefined };
 }
@@ -197,6 +206,9 @@ export namespace PBMeshCollider {
       case "plane":
         PBMeshCollider_PlaneMesh.encode(message.mesh.plane, writer.uint32(42).fork()).ldelim();
         break;
+      case "gltf":
+        PBMeshCollider_GltfMesh.encode(message.mesh.gltf, writer.uint32(50).fork()).ldelim();
+        break;
     }
     return writer;
   }
@@ -243,6 +255,13 @@ export namespace PBMeshCollider {
 
           message.mesh = { $case: "plane", plane: PBMeshCollider_PlaneMesh.decode(reader, reader.uint32()) };
           continue;
+        case 6:
+          if (tag !== 50) {
+            break;
+          }
+
+          message.mesh = { $case: "gltf", gltf: PBMeshCollider_GltfMesh.decode(reader, reader.uint32()) };
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -263,6 +282,8 @@ export namespace PBMeshCollider {
         ? { $case: "cylinder", cylinder: PBMeshCollider_CylinderMesh.fromJSON(object.cylinder) }
         : isSet(object.plane)
         ? { $case: "plane", plane: PBMeshCollider_PlaneMesh.fromJSON(object.plane) }
+        : isSet(object.gltf)
+        ? { $case: "gltf", gltf: PBMeshCollider_GltfMesh.fromJSON(object.gltf) }
         : undefined,
     };
   }
@@ -278,6 +299,8 @@ export namespace PBMeshCollider {
       (obj.cylinder = message.mesh?.cylinder ? PBMeshCollider_CylinderMesh.toJSON(message.mesh?.cylinder) : undefined);
     message.mesh?.$case === "plane" &&
       (obj.plane = message.mesh?.plane ? PBMeshCollider_PlaneMesh.toJSON(message.mesh?.plane) : undefined);
+    message.mesh?.$case === "gltf" &&
+      (obj.gltf = message.mesh?.gltf ? PBMeshCollider_GltfMesh.toJSON(message.mesh?.gltf) : undefined);
     return obj;
   }
 
@@ -300,6 +323,9 @@ export namespace PBMeshCollider {
     if (object.mesh?.$case === "plane" && object.mesh?.plane !== undefined && object.mesh?.plane !== null) {
       message.mesh = { $case: "plane", plane: PBMeshCollider_PlaneMesh.fromPartial(object.mesh.plane) };
     }
+    if (object.mesh?.$case === "gltf" && object.mesh?.gltf !== undefined && object.mesh?.gltf !== null) {
+      message.mesh = { $case: "gltf", gltf: PBMeshCollider_GltfMesh.fromPartial(object.mesh.gltf) };
+    }
     return message;
   }
 }
@@ -519,6 +545,79 @@ export namespace PBMeshCollider_SphereMesh {
   }
 }
 
+function createBasePBMeshCollider_GltfMesh(): PBMeshCollider_GltfMesh {
+  return { gltfSrc: "", name: "" };
+}
+
+export namespace PBMeshCollider_GltfMesh {
+  export function encode(message: PBMeshCollider_GltfMesh, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.gltfSrc !== "") {
+      writer.uint32(10).string(message.gltfSrc);
+    }
+    if (message.name !== "") {
+      writer.uint32(18).string(message.name);
+    }
+    return writer;
+  }
+
+  export function decode(input: _m0.Reader | Uint8Array, length?: number): PBMeshCollider_GltfMesh {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBasePBMeshCollider_GltfMesh();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.gltfSrc = reader.string();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.name = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  }
+
+  export function fromJSON(object: any): PBMeshCollider_GltfMesh {
+    return {
+      gltfSrc: isSet(object.gltfSrc) ? String(object.gltfSrc) : "",
+      name: isSet(object.name) ? String(object.name) : "",
+    };
+  }
+
+  export function toJSON(message: PBMeshCollider_GltfMesh): unknown {
+    const obj: any = {};
+    message.gltfSrc !== undefined && (obj.gltfSrc = message.gltfSrc);
+    message.name !== undefined && (obj.name = message.name);
+    return obj;
+  }
+
+  export function create<I extends Exact<DeepPartial<PBMeshCollider_GltfMesh>, I>>(base?: I): PBMeshCollider_GltfMesh {
+    return PBMeshCollider_GltfMesh.fromPartial(base ?? {});
+  }
+
+  export function fromPartial<I extends Exact<DeepPartial<PBMeshCollider_GltfMesh>, I>>(
+    object: I,
+  ): PBMeshCollider_GltfMesh {
+    const message = createBasePBMeshCollider_GltfMesh();
+    message.gltfSrc = object.gltfSrc ?? "";
+    message.name = object.name ?? "";
+    return message;
+  }
+}
+
 type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 
 export type DeepPartial<T> = T extends Builtin ? T

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

@@ -5,13 +5,11 @@ export const protobufPackage = "decentraland.sdk.components";
 
 /**
  * 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.
  */
 export interface PBMeshRenderer {
   mesh?:
@@ -19,6 +17,7 @@ export interface PBMeshRenderer {
     | { $case: "sphere"; sphere: PBMeshRenderer_SphereMesh }
     | { $case: "cylinder"; cylinder: PBMeshRenderer_CylinderMesh }
     | { $case: "plane"; plane: PBMeshRenderer_PlaneMesh }
+    | { $case: "gltf"; gltf: PBMeshRenderer_GltfMesh }
     | undefined;
 }
 
@@ -48,6 +47,14 @@ export interface PBMeshRenderer_PlaneMesh {
 export interface PBMeshRenderer_SphereMesh {
 }
 
+/** A mesh from a Gltf. */
+export interface PBMeshRenderer_GltfMesh {
+  /** the GLTF file path as listed in the scene's manifest. */
+  gltfSrc: string;
+  /** the name of the mesh asset */
+  name: string;
+}
+
 function createBasePBMeshRenderer(): PBMeshRenderer {
   return { mesh: undefined };
 }
@@ -67,6 +74,9 @@ export namespace PBMeshRenderer {
       case "plane":
         PBMeshRenderer_PlaneMesh.encode(message.mesh.plane, writer.uint32(34).fork()).ldelim();
         break;
+      case "gltf":
+        PBMeshRenderer_GltfMesh.encode(message.mesh.gltf, writer.uint32(42).fork()).ldelim();
+        break;
     }
     return writer;
   }
@@ -106,6 +116,13 @@ export namespace PBMeshRenderer {
 
           message.mesh = { $case: "plane", plane: PBMeshRenderer_PlaneMesh.decode(reader, reader.uint32()) };
           continue;
+        case 5:
+          if (tag !== 42) {
+            break;
+          }
+
+          message.mesh = { $case: "gltf", gltf: PBMeshRenderer_GltfMesh.decode(reader, reader.uint32()) };
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -125,6 +142,8 @@ export namespace PBMeshRenderer {
         ? { $case: "cylinder", cylinder: PBMeshRenderer_CylinderMesh.fromJSON(object.cylinder) }
         : isSet(object.plane)
         ? { $case: "plane", plane: PBMeshRenderer_PlaneMesh.fromJSON(object.plane) }
+        : isSet(object.gltf)
+        ? { $case: "gltf", gltf: PBMeshRenderer_GltfMesh.fromJSON(object.gltf) }
         : undefined,
     };
   }
@@ -139,6 +158,8 @@ export namespace PBMeshRenderer {
       (obj.cylinder = message.mesh?.cylinder ? PBMeshRenderer_CylinderMesh.toJSON(message.mesh?.cylinder) : undefined);
     message.mesh?.$case === "plane" &&
       (obj.plane = message.mesh?.plane ? PBMeshRenderer_PlaneMesh.toJSON(message.mesh?.plane) : undefined);
+    message.mesh?.$case === "gltf" &&
+      (obj.gltf = message.mesh?.gltf ? PBMeshRenderer_GltfMesh.toJSON(message.mesh?.gltf) : undefined);
     return obj;
   }
 
@@ -160,6 +181,9 @@ export namespace PBMeshRenderer {
     if (object.mesh?.$case === "plane" && object.mesh?.plane !== undefined && object.mesh?.plane !== null) {
       message.mesh = { $case: "plane", plane: PBMeshRenderer_PlaneMesh.fromPartial(object.mesh.plane) };
     }
+    if (object.mesh?.$case === "gltf" && object.mesh?.gltf !== undefined && object.mesh?.gltf !== null) {
+      message.mesh = { $case: "gltf", gltf: PBMeshRenderer_GltfMesh.fromPartial(object.mesh.gltf) };
+    }
     return message;
   }
 }
@@ -437,6 +461,79 @@ export namespace PBMeshRenderer_SphereMesh {
   }
 }
 
+function createBasePBMeshRenderer_GltfMesh(): PBMeshRenderer_GltfMesh {
+  return { gltfSrc: "", name: "" };
+}
+
+export namespace PBMeshRenderer_GltfMesh {
+  export function encode(message: PBMeshRenderer_GltfMesh, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.gltfSrc !== "") {
+      writer.uint32(10).string(message.gltfSrc);
+    }
+    if (message.name !== "") {
+      writer.uint32(18).string(message.name);
+    }
+    return writer;
+  }
+
+  export function decode(input: _m0.Reader | Uint8Array, length?: number): PBMeshRenderer_GltfMesh {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBasePBMeshRenderer_GltfMesh();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.gltfSrc = reader.string();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.name = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  }
+
+  export function fromJSON(object: any): PBMeshRenderer_GltfMesh {
+    return {
+      gltfSrc: isSet(object.gltfSrc) ? String(object.gltfSrc) : "",
+      name: isSet(object.name) ? String(object.name) : "",
+    };
+  }
+
+  export function toJSON(message: PBMeshRenderer_GltfMesh): unknown {
+    const obj: any = {};
+    message.gltfSrc !== undefined && (obj.gltfSrc = message.gltfSrc);
+    message.name !== undefined && (obj.name = message.name);
+    return obj;
+  }
+
+  export function create<I extends Exact<DeepPartial<PBMeshRenderer_GltfMesh>, I>>(base?: I): PBMeshRenderer_GltfMesh {
+    return PBMeshRenderer_GltfMesh.fromPartial(base ?? {});
+  }
+
+  export function fromPartial<I extends Exact<DeepPartial<PBMeshRenderer_GltfMesh>, I>>(
+    object: I,
+  ): PBMeshRenderer_GltfMesh {
+    const message = createBasePBMeshRenderer_GltfMesh();
+    message.gltfSrc = object.gltfSrc ?? "";
+    message.name = object.name ?? "";
+    return message;
+  }
+}
+
 type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 
 export type DeepPartial<T> = T extends Builtin ? T

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

@@ -33,27 +33,24 @@ export const protobufPackage = "decentraland.sdk.components";
  * --------------
  * PointerEvents can enforce interaction range using two independent distance checks:
  *
- * - Player distance (`max_distance`): distance from the avatar/player position to the target entity.
- * - Camera distance (`max_camera_distance`): distance from the active camera to the target entity.
- *
- * `max_player_distance` is deprecated: it is an alias for `max_distance` (both are player distance).
- * If both are present, the larger of the two is used as the player distance threshold.
+ * - Camera distance (`max_distance`): distance from the active camera to the target entity.
+ * - Player distance (`max_player_distance`): distance from the avatar/player position to the target entity.
  *
  * How the interaction checks are combined:
  *
  * 1) Only `max_distance` is present
- *    - The interaction is allowed only if the player distance is <= `max_distance`.
+ *    - The interaction is allowed only if the camera distance is <= `max_distance`.
  *
- * 2) Only `max_camera_distance` is present
- *    - The interaction is allowed only if the camera distance is <= `max_camera_distance`.
+ * 2) Only `max_player_distance` is present
+ *    - The interaction is allowed only if the player distance is <= `max_player_distance`.
  *
- * 3) Both `max_distance` and `max_camera_distance` are present
+ * 3) Both `max_distance` and `max_player_distance` are present
  *    - The interaction is allowed if ANY of the checks passes (OR logic):
- *      (player distance <= `max_distance`) OR (camera distance <= `max_camera_distance`).
+ *      (camera distance <= `max_distance`) OR (player distance <= `max_player_distance`).
  *
- * 4) Neither `max_distance` nor `max_camera_distance` is present
+ * 4) Neither `max_distance` nor `max_player_distance` is present
  *    - The system behaves as if `max_distance` were set to its default value (10),
- *      i.e., it uses the player distance check with a threshold of 10.
+ *      i.e., it uses the camera distance check with a threshold of 10.
  */
 export interface PBPointerEvents {
   /** the list of relevant events to detect */
@@ -69,7 +66,7 @@ export interface PBPointerEvents_Info {
   hoverText?:
     | string
     | undefined;
-  /** range of interaction from the avatar's position (default 10) */
+  /** range of interaction (default 10) */
   maxDistance?:
     | number
     | undefined;
@@ -81,16 +78,12 @@ export interface PBPointerEvents_Info {
   showHighlight?:
     | boolean
     | undefined;
-  /** @deprecated use `max_distance` instead (same semantics) */
+  /** range of interaction from the avatar's position (default 0) */
   maxPlayerDistance?:
     | number
     | undefined;
   /** resolution order when multiple events overlap, higher wins (default 0) */
-  priority?:
-    | number
-    | undefined;
-  /** range of interaction from the active camera's position (default none) */
-  maxCameraDistance?: number | undefined;
+  priority?: number | undefined;
 }
 
 export interface PBPointerEvents_Entry {
@@ -177,7 +170,6 @@ function createBasePBPointerEvents_Info(): PBPointerEvents_Info {
     showHighlight: undefined,
     maxPlayerDistance: undefined,
     priority: undefined,
-    maxCameraDistance: undefined,
   };
 }
 
@@ -204,9 +196,6 @@ export namespace PBPointerEvents_Info {
     if (message.priority !== undefined) {
       writer.uint32(56).uint32(message.priority);
     }
-    if (message.maxCameraDistance !== undefined) {
-      writer.uint32(69).float(message.maxCameraDistance);
-    }
     return writer;
   }
 
@@ -266,13 +255,6 @@ export namespace PBPointerEvents_Info {
 
           message.priority = reader.uint32();
           continue;
-        case 8:
-          if (tag !== 69) {
-            break;
-          }
-
-          message.maxCameraDistance = reader.float();
-          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -291,7 +273,6 @@ export namespace PBPointerEvents_Info {
       showHighlight: isSet(object.showHighlight) ? Boolean(object.showHighlight) : undefined,
       maxPlayerDistance: isSet(object.maxPlayerDistance) ? Number(object.maxPlayerDistance) : undefined,
       priority: isSet(object.priority) ? Number(object.priority) : undefined,
-      maxCameraDistance: isSet(object.maxCameraDistance) ? Number(object.maxCameraDistance) : undefined,
     };
   }
 
@@ -305,7 +286,6 @@ export namespace PBPointerEvents_Info {
     message.showHighlight !== undefined && (obj.showHighlight = message.showHighlight);
     message.maxPlayerDistance !== undefined && (obj.maxPlayerDistance = message.maxPlayerDistance);
     message.priority !== undefined && (obj.priority = Math.round(message.priority));
-    message.maxCameraDistance !== undefined && (obj.maxCameraDistance = message.maxCameraDistance);
     return obj;
   }
 
@@ -322,7 +302,6 @@ export namespace PBPointerEvents_Info {
     message.showHighlight = object.showHighlight ?? undefined;
     message.maxPlayerDistance = object.maxPlayerDistance ?? undefined;
     message.priority = object.priority ?? undefined;
-    message.maxCameraDistance = object.maxCameraDistance ?? undefined;
     return message;
   }
 }

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

@@ -47,6 +47,41 @@ export function raycastQueryTypeToJSON(object: RaycastQueryType): string {
   }
 }
 
+export enum RaycastShape {
+  /** RS_RAY - cast a point, get collisions along a ray */
+  RS_RAY = 0,
+  /** RS_AVATAR - cast the avatar collider shape, get collisions from sweeping the shape */
+  RS_AVATAR = 1,
+  UNRECOGNIZED = -1,
+}
+
+export function raycastShapeFromJSON(object: any): RaycastShape {
+  switch (object) {
+    case 0:
+    case "RS_RAY":
+      return RaycastShape.RS_RAY;
+    case 1:
+    case "RS_AVATAR":
+      return RaycastShape.RS_AVATAR;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return RaycastShape.UNRECOGNIZED;
+  }
+}
+
+export function raycastShapeToJSON(object: RaycastShape): string {
+  switch (object) {
+    case RaycastShape.RS_RAY:
+      return "RS_RAY";
+    case RaycastShape.RS_AVATAR:
+      return "RS_AVATAR";
+    case RaycastShape.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
 /**
  * The PBRaycast component and PBRaycastResult are defined in https://adr.decentraland.org/adr/ADR-200
  *
@@ -81,7 +116,15 @@ export interface PBRaycast {
     | boolean
     | undefined;
   /** Collision mask, by default CL_POINTER | CL_PHYSICS */
-  collisionMask?: number | undefined;
+  collisionMask?:
+    | number
+    | undefined;
+  /** shape to cast, default ray */
+  shape?:
+    | RaycastShape
+    | undefined;
+  /** include hits with entities from other scenes */
+  includeWorld?: boolean | undefined;
 }
 
 function createBasePBRaycast(): PBRaycast {
@@ -93,6 +136,8 @@ function createBasePBRaycast(): PBRaycast {
     queryType: 0,
     continuous: undefined,
     collisionMask: undefined,
+    shape: undefined,
+    includeWorld: undefined,
   };
 }
 
@@ -130,6 +175,12 @@ export namespace PBRaycast {
     if (message.collisionMask !== undefined) {
       writer.uint32(72).uint32(message.collisionMask);
     }
+    if (message.shape !== undefined) {
+      writer.uint32(88).int32(message.shape);
+    }
+    if (message.includeWorld !== undefined) {
+      writer.uint32(96).bool(message.includeWorld);
+    }
     return writer;
   }
 
@@ -210,6 +261,20 @@ export namespace PBRaycast {
 
           message.collisionMask = reader.uint32();
           continue;
+        case 11:
+          if (tag !== 88) {
+            break;
+          }
+
+          message.shape = reader.int32() as any;
+          continue;
+        case 12:
+          if (tag !== 96) {
+            break;
+          }
+
+          message.includeWorld = reader.bool();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -236,6 +301,8 @@ export namespace PBRaycast {
       queryType: isSet(object.queryType) ? raycastQueryTypeFromJSON(object.queryType) : 0,
       continuous: isSet(object.continuous) ? Boolean(object.continuous) : undefined,
       collisionMask: isSet(object.collisionMask) ? Number(object.collisionMask) : undefined,
+      shape: isSet(object.shape) ? raycastShapeFromJSON(object.shape) : undefined,
+      includeWorld: isSet(object.includeWorld) ? Boolean(object.includeWorld) : undefined,
     };
   }
 
@@ -261,6 +328,9 @@ export namespace PBRaycast {
     message.queryType !== undefined && (obj.queryType = raycastQueryTypeToJSON(message.queryType));
     message.continuous !== undefined && (obj.continuous = message.continuous);
     message.collisionMask !== undefined && (obj.collisionMask = Math.round(message.collisionMask));
+    message.shape !== undefined &&
+      (obj.shape = message.shape !== undefined ? raycastShapeToJSON(message.shape) : undefined);
+    message.includeWorld !== undefined && (obj.includeWorld = message.includeWorld);
     return obj;
   }
 
@@ -312,6 +382,8 @@ export namespace PBRaycast {
     message.queryType = object.queryType ?? 0;
     message.continuous = object.continuous ?? undefined;
     message.collisionMask = object.collisionMask ?? undefined;
+    message.shape = object.shape ?? undefined;
+    message.includeWorld = object.includeWorld ?? undefined;
     return message;
   }
 }