@dcl/protocol 1.0.0-19966879226.commit-64a5330 → 1.0.0-20302100396.commit-b2ab885

package/out-ts/decentraland/kernel/comms/rfc4/comms.gen.ts

@@ -17,6 +17,7 @@ export interface Packet {
     | { $case: "playerEmote"; playerEmote: PlayerEmote }
     | { $case: "sceneEmote"; sceneEmote: SceneEmote }
     | { $case: "movementCompressed"; movementCompressed: MovementCompressed }
+    | { $case: "lookAtPosition"; lookAtPosition: LookAtPosition }
     | undefined;
   protocolVersion: number;
 }
@@ -59,6 +60,11 @@ export interface Movement {
   /** interpolation */
   isInstant: boolean;
   isEmoting: boolean;
+  /** head-sync (enabled flags + world-space yaw and pitch angles, in degrees) */
+  headIkYawEnabled: boolean;
+  headIkPitchEnabled: boolean;
+  headYaw: number;
+  headPitch: number;
 }
 
 export interface MovementCompressed {
@@ -66,12 +72,50 @@ export interface MovementCompressed {
   temporalData: number;
   /** bit-compressed: position + velocity */
   movementData: number;
+  /** bit-compressed: enabled flags + yaw + pitch */
+  headSyncData: number;
 }
 
 export interface PlayerEmote {
   incrementalId: number;
   urn: string;
   timestamp: number;
+  /** true means the emote has been stopped in the sender's client */
+  isStopping?:
+    | boolean
+    | undefined;
+  /** true when it is not the first time the looping animation plays */
+  isRepeating?:
+    | boolean
+    | undefined;
+  /** identifies an interaction univocaly, established when the start animation is triggered */
+  interactionId?:
+    | number
+    | undefined;
+  /** -1 means it does not use an outcome animation */
+  socialEmoteOutcome?:
+    | number
+    | undefined;
+  /** to a social emote started by other user */
+  isReacting?:
+    | boolean
+    | undefined;
+  /** wallet address of the user that initiated social emote */
+  socialEmoteInitiator?:
+    | string
+    | undefined;
+  /** wallet address of the user whose avatar is the target of a directed emote */
+  targetAvatar?: string | undefined;
+}
+
+/** Message sent to force an avatar to look at a position */
+export interface LookAtPosition {
+  timestamp: number;
+  /** world position */
+  positionX: number;
+  positionY: number;
+  positionZ: number;
+  targetAvatarWalletAddress: string;
 }
 
 export interface SceneEmote {
@@ -181,6 +225,9 @@ export namespace Packet {
       case "movementCompressed":
         MovementCompressed.encode(message.message.movementCompressed, writer.uint32(98).fork()).ldelim();
         break;
+      case "lookAtPosition":
+        LookAtPosition.encode(message.message.lookAtPosition, writer.uint32(106).fork()).ldelim();
+        break;
     }
     if (message.protocolVersion !== 0) {
       writer.uint32(88).uint32(message.protocolVersion);
@@ -281,6 +328,13 @@ export namespace Packet {
             movementCompressed: MovementCompressed.decode(reader, reader.uint32()),
           };
           continue;
+        case 13:
+          if (tag !== 106) {
+            break;
+          }
+
+          message.message = { $case: "lookAtPosition", lookAtPosition: LookAtPosition.decode(reader, reader.uint32()) };
+          continue;
         case 11:
           if (tag !== 88) {
             break;
@@ -321,6 +375,8 @@ export namespace Packet {
         ? { $case: "sceneEmote", sceneEmote: SceneEmote.fromJSON(object.sceneEmote) }
         : isSet(object.movementCompressed)
         ? { $case: "movementCompressed", movementCompressed: MovementCompressed.fromJSON(object.movementCompressed) }
+        : isSet(object.lookAtPosition)
+        ? { $case: "lookAtPosition", lookAtPosition: LookAtPosition.fromJSON(object.lookAtPosition) }
         : undefined,
       protocolVersion: isSet(object.protocolVersion) ? Number(object.protocolVersion) : 0,
     };
@@ -358,6 +414,10 @@ export namespace Packet {
       (obj.movementCompressed = message.message?.movementCompressed
         ? MovementCompressed.toJSON(message.message?.movementCompressed)
         : undefined);
+    message.message?.$case === "lookAtPosition" &&
+      (obj.lookAtPosition = message.message?.lookAtPosition
+        ? LookAtPosition.toJSON(message.message?.lookAtPosition)
+        : undefined);
     message.protocolVersion !== undefined && (obj.protocolVersion = Math.round(message.protocolVersion));
     return obj;
   }
@@ -445,6 +505,16 @@ export namespace Packet {
         movementCompressed: MovementCompressed.fromPartial(object.message.movementCompressed),
       };
     }
+    if (
+      object.message?.$case === "lookAtPosition" &&
+      object.message?.lookAtPosition !== undefined &&
+      object.message?.lookAtPosition !== null
+    ) {
+      message.message = {
+        $case: "lookAtPosition",
+        lookAtPosition: LookAtPosition.fromPartial(object.message.lookAtPosition),
+      };
+    }
     message.protocolVersion = object.protocolVersion ?? 0;
     return message;
   }
@@ -619,6 +689,10 @@ function createBaseMovement(): Movement {
     rotationY: 0,
     isInstant: false,
     isEmoting: false,
+    headIkYawEnabled: false,
+    headIkPitchEnabled: false,
+    headYaw: 0,
+    headPitch: 0,
   };
 }
 
@@ -678,6 +752,18 @@ export namespace Movement {
     if (message.isEmoting === true) {
       writer.uint32(144).bool(message.isEmoting);
     }
+    if (message.headIkYawEnabled === true) {
+      writer.uint32(152).bool(message.headIkYawEnabled);
+    }
+    if (message.headIkPitchEnabled === true) {
+      writer.uint32(160).bool(message.headIkPitchEnabled);
+    }
+    if (message.headYaw !== 0) {
+      writer.uint32(173).float(message.headYaw);
+    }
+    if (message.headPitch !== 0) {
+      writer.uint32(181).float(message.headPitch);
+    }
     return writer;
   }
 
@@ -814,6 +900,34 @@ export namespace Movement {
 
           message.isEmoting = reader.bool();
           continue;
+        case 19:
+          if (tag !== 152) {
+            break;
+          }
+
+          message.headIkYawEnabled = reader.bool();
+          continue;
+        case 20:
+          if (tag !== 160) {
+            break;
+          }
+
+          message.headIkPitchEnabled = reader.bool();
+          continue;
+        case 21:
+          if (tag !== 173) {
+            break;
+          }
+
+          message.headYaw = reader.float();
+          continue;
+        case 22:
+          if (tag !== 181) {
+            break;
+          }
+
+          message.headPitch = reader.float();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -843,6 +957,10 @@ export namespace Movement {
       rotationY: isSet(object.rotationY) ? Number(object.rotationY) : 0,
       isInstant: isSet(object.isInstant) ? Boolean(object.isInstant) : false,
       isEmoting: isSet(object.isEmoting) ? Boolean(object.isEmoting) : false,
+      headIkYawEnabled: isSet(object.headIkYawEnabled) ? Boolean(object.headIkYawEnabled) : false,
+      headIkPitchEnabled: isSet(object.headIkPitchEnabled) ? Boolean(object.headIkPitchEnabled) : false,
+      headYaw: isSet(object.headYaw) ? Number(object.headYaw) : 0,
+      headPitch: isSet(object.headPitch) ? Number(object.headPitch) : 0,
     };
   }
 
@@ -866,6 +984,10 @@ export namespace Movement {
     message.rotationY !== undefined && (obj.rotationY = message.rotationY);
     message.isInstant !== undefined && (obj.isInstant = message.isInstant);
     message.isEmoting !== undefined && (obj.isEmoting = message.isEmoting);
+    message.headIkYawEnabled !== undefined && (obj.headIkYawEnabled = message.headIkYawEnabled);
+    message.headIkPitchEnabled !== undefined && (obj.headIkPitchEnabled = message.headIkPitchEnabled);
+    message.headYaw !== undefined && (obj.headYaw = message.headYaw);
+    message.headPitch !== undefined && (obj.headPitch = message.headPitch);
     return obj;
   }
 
@@ -893,12 +1015,16 @@ export namespace Movement {
     message.rotationY = object.rotationY ?? 0;
     message.isInstant = object.isInstant ?? false;
     message.isEmoting = object.isEmoting ?? false;
+    message.headIkYawEnabled = object.headIkYawEnabled ?? false;
+    message.headIkPitchEnabled = object.headIkPitchEnabled ?? false;
+    message.headYaw = object.headYaw ?? 0;
+    message.headPitch = object.headPitch ?? 0;
     return message;
   }
 }
 
 function createBaseMovementCompressed(): MovementCompressed {
-  return { temporalData: 0, movementData: 0 };
+  return { temporalData: 0, movementData: 0, headSyncData: 0 };
 }
 
 export namespace MovementCompressed {
@@ -909,6 +1035,9 @@ export namespace MovementCompressed {
     if (message.movementData !== 0) {
       writer.uint32(16).int64(message.movementData);
     }
+    if (message.headSyncData !== 0) {
+      writer.uint32(24).int32(message.headSyncData);
+    }
     return writer;
   }
 
@@ -933,6 +1062,13 @@ export namespace MovementCompressed {
 
           message.movementData = longToNumber(reader.int64() as Long);
           continue;
+        case 3:
+          if (tag !== 24) {
+            break;
+          }
+
+          message.headSyncData = reader.int32();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -946,6 +1082,7 @@ export namespace MovementCompressed {
     return {
       temporalData: isSet(object.temporalData) ? Number(object.temporalData) : 0,
       movementData: isSet(object.movementData) ? Number(object.movementData) : 0,
+      headSyncData: isSet(object.headSyncData) ? Number(object.headSyncData) : 0,
     };
   }
 
@@ -953,6 +1090,7 @@ export namespace MovementCompressed {
     const obj: any = {};
     message.temporalData !== undefined && (obj.temporalData = Math.round(message.temporalData));
     message.movementData !== undefined && (obj.movementData = Math.round(message.movementData));
+    message.headSyncData !== undefined && (obj.headSyncData = Math.round(message.headSyncData));
     return obj;
   }
 
@@ -964,12 +1102,24 @@ export namespace MovementCompressed {
     const message = createBaseMovementCompressed();
     message.temporalData = object.temporalData ?? 0;
     message.movementData = object.movementData ?? 0;
+    message.headSyncData = object.headSyncData ?? 0;
     return message;
   }
 }
 
 function createBasePlayerEmote(): PlayerEmote {
-  return { incrementalId: 0, urn: "", timestamp: 0 };
+  return {
+    incrementalId: 0,
+    urn: "",
+    timestamp: 0,
+    isStopping: undefined,
+    isRepeating: undefined,
+    interactionId: undefined,
+    socialEmoteOutcome: undefined,
+    isReacting: undefined,
+    socialEmoteInitiator: undefined,
+    targetAvatar: undefined,
+  };
 }
 
 export namespace PlayerEmote {
@@ -983,6 +1133,27 @@ export namespace PlayerEmote {
     if (message.timestamp !== 0) {
       writer.uint32(29).float(message.timestamp);
     }
+    if (message.isStopping !== undefined) {
+      writer.uint32(32).bool(message.isStopping);
+    }
+    if (message.isRepeating !== undefined) {
+      writer.uint32(40).bool(message.isRepeating);
+    }
+    if (message.interactionId !== undefined) {
+      writer.uint32(48).int32(message.interactionId);
+    }
+    if (message.socialEmoteOutcome !== undefined) {
+      writer.uint32(56).int32(message.socialEmoteOutcome);
+    }
+    if (message.isReacting !== undefined) {
+      writer.uint32(64).bool(message.isReacting);
+    }
+    if (message.socialEmoteInitiator !== undefined) {
+      writer.uint32(74).string(message.socialEmoteInitiator);
+    }
+    if (message.targetAvatar !== undefined) {
+      writer.uint32(82).string(message.targetAvatar);
+    }
     return writer;
   }
 
@@ -1014,6 +1185,55 @@ export namespace PlayerEmote {
 
           message.timestamp = reader.float();
           continue;
+        case 4:
+          if (tag !== 32) {
+            break;
+          }
+
+          message.isStopping = reader.bool();
+          continue;
+        case 5:
+          if (tag !== 40) {
+            break;
+          }
+
+          message.isRepeating = reader.bool();
+          continue;
+        case 6:
+          if (tag !== 48) {
+            break;
+          }
+
+          message.interactionId = reader.int32();
+          continue;
+        case 7:
+          if (tag !== 56) {
+            break;
+          }
+
+          message.socialEmoteOutcome = reader.int32();
+          continue;
+        case 8:
+          if (tag !== 64) {
+            break;
+          }
+
+          message.isReacting = reader.bool();
+          continue;
+        case 9:
+          if (tag !== 74) {
+            break;
+          }
+
+          message.socialEmoteInitiator = reader.string();
+          continue;
+        case 10:
+          if (tag !== 82) {
+            break;
+          }
+
+          message.targetAvatar = reader.string();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1028,6 +1248,13 @@ export namespace PlayerEmote {
       incrementalId: isSet(object.incrementalId) ? Number(object.incrementalId) : 0,
       urn: isSet(object.urn) ? String(object.urn) : "",
       timestamp: isSet(object.timestamp) ? Number(object.timestamp) : 0,
+      isStopping: isSet(object.isStopping) ? Boolean(object.isStopping) : undefined,
+      isRepeating: isSet(object.isRepeating) ? Boolean(object.isRepeating) : undefined,
+      interactionId: isSet(object.interactionId) ? Number(object.interactionId) : undefined,
+      socialEmoteOutcome: isSet(object.socialEmoteOutcome) ? Number(object.socialEmoteOutcome) : undefined,
+      isReacting: isSet(object.isReacting) ? Boolean(object.isReacting) : undefined,
+      socialEmoteInitiator: isSet(object.socialEmoteInitiator) ? String(object.socialEmoteInitiator) : undefined,
+      targetAvatar: isSet(object.targetAvatar) ? String(object.targetAvatar) : undefined,
     };
   }
 
@@ -1036,6 +1263,13 @@ export namespace PlayerEmote {
     message.incrementalId !== undefined && (obj.incrementalId = Math.round(message.incrementalId));
     message.urn !== undefined && (obj.urn = message.urn);
     message.timestamp !== undefined && (obj.timestamp = message.timestamp);
+    message.isStopping !== undefined && (obj.isStopping = message.isStopping);
+    message.isRepeating !== undefined && (obj.isRepeating = message.isRepeating);
+    message.interactionId !== undefined && (obj.interactionId = Math.round(message.interactionId));
+    message.socialEmoteOutcome !== undefined && (obj.socialEmoteOutcome = Math.round(message.socialEmoteOutcome));
+    message.isReacting !== undefined && (obj.isReacting = message.isReacting);
+    message.socialEmoteInitiator !== undefined && (obj.socialEmoteInitiator = message.socialEmoteInitiator);
+    message.targetAvatar !== undefined && (obj.targetAvatar = message.targetAvatar);
     return obj;
   }
 
@@ -1048,6 +1282,126 @@ export namespace PlayerEmote {
     message.incrementalId = object.incrementalId ?? 0;
     message.urn = object.urn ?? "";
     message.timestamp = object.timestamp ?? 0;
+    message.isStopping = object.isStopping ?? undefined;
+    message.isRepeating = object.isRepeating ?? undefined;
+    message.interactionId = object.interactionId ?? undefined;
+    message.socialEmoteOutcome = object.socialEmoteOutcome ?? undefined;
+    message.isReacting = object.isReacting ?? undefined;
+    message.socialEmoteInitiator = object.socialEmoteInitiator ?? undefined;
+    message.targetAvatar = object.targetAvatar ?? undefined;
+    return message;
+  }
+}
+
+function createBaseLookAtPosition(): LookAtPosition {
+  return { timestamp: 0, positionX: 0, positionY: 0, positionZ: 0, targetAvatarWalletAddress: "" };
+}
+
+export namespace LookAtPosition {
+  export function encode(message: LookAtPosition, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.timestamp !== 0) {
+      writer.uint32(13).float(message.timestamp);
+    }
+    if (message.positionX !== 0) {
+      writer.uint32(21).float(message.positionX);
+    }
+    if (message.positionY !== 0) {
+      writer.uint32(29).float(message.positionY);
+    }
+    if (message.positionZ !== 0) {
+      writer.uint32(37).float(message.positionZ);
+    }
+    if (message.targetAvatarWalletAddress !== "") {
+      writer.uint32(42).string(message.targetAvatarWalletAddress);
+    }
+    return writer;
+  }
+
+  export function decode(input: _m0.Reader | Uint8Array, length?: number): LookAtPosition {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseLookAtPosition();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 13) {
+            break;
+          }
+
+          message.timestamp = reader.float();
+          continue;
+        case 2:
+          if (tag !== 21) {
+            break;
+          }
+
+          message.positionX = reader.float();
+          continue;
+        case 3:
+          if (tag !== 29) {
+            break;
+          }
+
+          message.positionY = reader.float();
+          continue;
+        case 4:
+          if (tag !== 37) {
+            break;
+          }
+
+          message.positionZ = reader.float();
+          continue;
+        case 5:
+          if (tag !== 42) {
+            break;
+          }
+
+          message.targetAvatarWalletAddress = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  }
+
+  export function fromJSON(object: any): LookAtPosition {
+    return {
+      timestamp: isSet(object.timestamp) ? Number(object.timestamp) : 0,
+      positionX: isSet(object.positionX) ? Number(object.positionX) : 0,
+      positionY: isSet(object.positionY) ? Number(object.positionY) : 0,
+      positionZ: isSet(object.positionZ) ? Number(object.positionZ) : 0,
+      targetAvatarWalletAddress: isSet(object.targetAvatarWalletAddress)
+        ? String(object.targetAvatarWalletAddress)
+        : "",
+    };
+  }
+
+  export function toJSON(message: LookAtPosition): unknown {
+    const obj: any = {};
+    message.timestamp !== undefined && (obj.timestamp = message.timestamp);
+    message.positionX !== undefined && (obj.positionX = message.positionX);
+    message.positionY !== undefined && (obj.positionY = message.positionY);
+    message.positionZ !== undefined && (obj.positionZ = message.positionZ);
+    message.targetAvatarWalletAddress !== undefined &&
+      (obj.targetAvatarWalletAddress = message.targetAvatarWalletAddress);
+    return obj;
+  }
+
+  export function create<I extends Exact<DeepPartial<LookAtPosition>, I>>(base?: I): LookAtPosition {
+    return LookAtPosition.fromPartial(base ?? {});
+  }
+
+  export function fromPartial<I extends Exact<DeepPartial<LookAtPosition>, I>>(object: I): LookAtPosition {
+    const message = createBaseLookAtPosition();
+    message.timestamp = object.timestamp ?? 0;
+    message.positionX = object.positionX ?? 0;
+    message.positionY = object.positionY ?? 0;
+    message.positionZ = object.positionZ ?? 0;
+    message.targetAvatarWalletAddress = object.targetAvatarWalletAddress ?? "";
     return message;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/protocol",
-  "version": "1.0.0-19966879226.commit-64a5330",
+  "version": "1.0.0-20302100396.commit-b2ab885",
   "description": "",
   "repository": "decentraland/protocol.git",
   "homepage": "https://github.com/decentraland/protocol#readme",
@@ -30,5 +30,5 @@
     "out-js",
     "public"
   ],
-  "commit": "64a533052b58414f60a1b2ba599cf2207f331d6b"
+  "commit": "b2ab885e610f54d772904f91b44e72188b697c2e"
 }

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 {