@dcl/protocol 1.0.0-22309437617.commit-6617cff → 1.0.0-22560904528.commit-203bb4a

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

@@ -5,11 +5,13 @@ 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, 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.
  */
 export interface PBMeshRenderer {
   mesh?:
@@ -17,7 +19,6 @@ export interface PBMeshRenderer {
     | { $case: "sphere"; sphere: PBMeshRenderer_SphereMesh }
     | { $case: "cylinder"; cylinder: PBMeshRenderer_CylinderMesh }
     | { $case: "plane"; plane: PBMeshRenderer_PlaneMesh }
-    | { $case: "gltf"; gltf: PBMeshRenderer_GltfMesh }
     | undefined;
 }
 
@@ -47,14 +48,6 @@ 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 };
 }
@@ -74,9 +67,6 @@ 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;
   }
@@ -116,13 +106,6 @@ 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;
@@ -142,8 +125,6 @@ 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,
     };
   }
@@ -158,8 +139,6 @@ 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;
   }
 
@@ -181,9 +160,6 @@ 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;
   }
 }
@@ -461,79 +437,6 @@ 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

@@ -4,6 +4,9 @@ import {
   InputAction,
   inputActionFromJSON,
   inputActionToJSON,
+  InteractionType,
+  interactionTypeFromJSON,
+  interactionTypeToJSON,
   PointerEventType,
   pointerEventTypeFromJSON,
   pointerEventTypeToJSON,
@@ -76,14 +79,22 @@ export interface PBPointerEvents_Info {
     | boolean
     | undefined;
   /** range of interaction from the avatar's position (default 0) */
-  maxPlayerDistance?: number | undefined;
+  maxPlayerDistance?:
+    | number
+    | undefined;
+  /** resolution order when multiple events overlap, higher wins (default 0) */
+  priority?: number | undefined;
 }
 
 export interface PBPointerEvents_Entry {
   /** the kind of interaction to detect */
   eventType: PointerEventType;
   /** additional configuration for this detection */
-  eventInfo: PBPointerEvents_Info | undefined;
+  eventInfo:
+    | PBPointerEvents_Info
+    | undefined;
+  /** the type of interaction source (default 0 == CURSOR) */
+  interactionType?: InteractionType | undefined;
 }
 
 function createBasePBPointerEvents(): PBPointerEvents {
@@ -158,6 +169,7 @@ function createBasePBPointerEvents_Info(): PBPointerEvents_Info {
     showFeedback: undefined,
     showHighlight: undefined,
     maxPlayerDistance: undefined,
+    priority: undefined,
   };
 }
 
@@ -181,6 +193,9 @@ export namespace PBPointerEvents_Info {
     if (message.maxPlayerDistance !== undefined) {
       writer.uint32(53).float(message.maxPlayerDistance);
     }
+    if (message.priority !== undefined) {
+      writer.uint32(56).uint32(message.priority);
+    }
     return writer;
   }
 
@@ -233,6 +248,13 @@ export namespace PBPointerEvents_Info {
 
           message.maxPlayerDistance = reader.float();
           continue;
+        case 7:
+          if (tag !== 56) {
+            break;
+          }
+
+          message.priority = reader.uint32();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -250,6 +272,7 @@ export namespace PBPointerEvents_Info {
       showFeedback: isSet(object.showFeedback) ? Boolean(object.showFeedback) : undefined,
       showHighlight: isSet(object.showHighlight) ? Boolean(object.showHighlight) : undefined,
       maxPlayerDistance: isSet(object.maxPlayerDistance) ? Number(object.maxPlayerDistance) : undefined,
+      priority: isSet(object.priority) ? Number(object.priority) : undefined,
     };
   }
 
@@ -262,6 +285,7 @@ export namespace PBPointerEvents_Info {
     message.showFeedback !== undefined && (obj.showFeedback = message.showFeedback);
     message.showHighlight !== undefined && (obj.showHighlight = message.showHighlight);
     message.maxPlayerDistance !== undefined && (obj.maxPlayerDistance = message.maxPlayerDistance);
+    message.priority !== undefined && (obj.priority = Math.round(message.priority));
     return obj;
   }
 
@@ -277,12 +301,13 @@ export namespace PBPointerEvents_Info {
     message.showFeedback = object.showFeedback ?? undefined;
     message.showHighlight = object.showHighlight ?? undefined;
     message.maxPlayerDistance = object.maxPlayerDistance ?? undefined;
+    message.priority = object.priority ?? undefined;
     return message;
   }
 }
 
 function createBasePBPointerEvents_Entry(): PBPointerEvents_Entry {
-  return { eventType: 0, eventInfo: undefined };
+  return { eventType: 0, eventInfo: undefined, interactionType: undefined };
 }
 
 export namespace PBPointerEvents_Entry {
@@ -293,6 +318,9 @@ export namespace PBPointerEvents_Entry {
     if (message.eventInfo !== undefined) {
       PBPointerEvents_Info.encode(message.eventInfo, writer.uint32(18).fork()).ldelim();
     }
+    if (message.interactionType !== undefined) {
+      writer.uint32(24).int32(message.interactionType);
+    }
     return writer;
   }
 
@@ -317,6 +345,13 @@ export namespace PBPointerEvents_Entry {
 
           message.eventInfo = PBPointerEvents_Info.decode(reader, reader.uint32());
           continue;
+        case 3:
+          if (tag !== 24) {
+            break;
+          }
+
+          message.interactionType = reader.int32() as any;
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -330,6 +365,7 @@ export namespace PBPointerEvents_Entry {
     return {
       eventType: isSet(object.eventType) ? pointerEventTypeFromJSON(object.eventType) : 0,
       eventInfo: isSet(object.eventInfo) ? PBPointerEvents_Info.fromJSON(object.eventInfo) : undefined,
+      interactionType: isSet(object.interactionType) ? interactionTypeFromJSON(object.interactionType) : undefined,
     };
   }
 
@@ -338,6 +374,10 @@ export namespace PBPointerEvents_Entry {
     message.eventType !== undefined && (obj.eventType = pointerEventTypeToJSON(message.eventType));
     message.eventInfo !== undefined &&
       (obj.eventInfo = message.eventInfo ? PBPointerEvents_Info.toJSON(message.eventInfo) : undefined);
+    message.interactionType !== undefined &&
+      (obj.interactionType = message.interactionType !== undefined
+        ? interactionTypeToJSON(message.interactionType)
+        : undefined);
     return obj;
   }
 
@@ -353,6 +393,7 @@ export namespace PBPointerEvents_Entry {
     message.eventInfo = (object.eventInfo !== undefined && object.eventInfo !== null)
       ? PBPointerEvents_Info.fromPartial(object.eventInfo)
       : undefined;
+    message.interactionType = object.interactionType ?? undefined;
     return message;
   }
 }

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

@@ -47,41 +47,6 @@ 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
  *
@@ -116,15 +81,7 @@ export interface PBRaycast {
     | boolean
     | undefined;
   /** Collision mask, by default CL_POINTER | CL_PHYSICS */
-  collisionMask?:
-    | number
-    | undefined;
-  /** shape to cast, default ray */
-  shape?:
-    | RaycastShape
-    | undefined;
-  /** include hits with entities from other scenes */
-  includeWorld?: boolean | undefined;
+  collisionMask?: number | undefined;
 }
 
 function createBasePBRaycast(): PBRaycast {
@@ -136,8 +93,6 @@ function createBasePBRaycast(): PBRaycast {
     queryType: 0,
     continuous: undefined,
     collisionMask: undefined,
-    shape: undefined,
-    includeWorld: undefined,
   };
 }
 
@@ -175,12 +130,6 @@ 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;
   }
 
@@ -261,20 +210,6 @@ 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;
@@ -301,8 +236,6 @@ 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,
     };
   }
 
@@ -328,9 +261,6 @@ 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;
   }
 
@@ -382,8 +312,6 @@ 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;
   }
 }