@dcl/protocol 1.0.0-23295977779.commit-76299d9 → 1.0.0-23344929225.commit-4bea499

package/out-ts/decentraland/sdk/components/common/input_action.gen.ts

@@ -17,6 +17,7 @@ export enum InputAction {
   IA_ACTION_4 = 11,
   IA_ACTION_5 = 12,
   IA_ACTION_6 = 13,
+  IA_MODIFIER = 14,
   UNRECOGNIZED = -1,
 }
 
@@ -64,6 +65,9 @@ export function inputActionFromJSON(object: any): InputAction {
     case 13:
     case "IA_ACTION_6":
       return InputAction.IA_ACTION_6;
+    case 14:
+    case "IA_MODIFIER":
+      return InputAction.IA_MODIFIER;
     case -1:
     case "UNRECOGNIZED":
     default:
@@ -101,6 +105,8 @@ export function inputActionToJSON(object: InputAction): string {
       return "IA_ACTION_5";
     case InputAction.IA_ACTION_6:
       return "IA_ACTION_6";
+    case InputAction.IA_MODIFIER:
+      return "IA_MODIFIER";
     case InputAction.UNRECOGNIZED:
     default:
       return "UNRECOGNIZED";
@@ -113,6 +119,8 @@ export enum PointerEventType {
   PET_DOWN = 1,
   PET_HOVER_ENTER = 2,
   PET_HOVER_LEAVE = 3,
+  PET_PROXIMITY_ENTER = 4,
+  PET_PROXIMITY_LEAVE = 5,
   UNRECOGNIZED = -1,
 }
 
@@ -130,6 +138,12 @@ export function pointerEventTypeFromJSON(object: any): PointerEventType {
     case 3:
     case "PET_HOVER_LEAVE":
       return PointerEventType.PET_HOVER_LEAVE;
+    case 4:
+    case "PET_PROXIMITY_ENTER":
+      return PointerEventType.PET_PROXIMITY_ENTER;
+    case 5:
+    case "PET_PROXIMITY_LEAVE":
+      return PointerEventType.PET_PROXIMITY_LEAVE;
     case -1:
     case "UNRECOGNIZED":
     default:
@@ -147,8 +161,45 @@ export function pointerEventTypeToJSON(object: PointerEventType): string {
       return "PET_HOVER_ENTER";
     case PointerEventType.PET_HOVER_LEAVE:
       return "PET_HOVER_LEAVE";
+    case PointerEventType.PET_PROXIMITY_ENTER:
+      return "PET_PROXIMITY_ENTER";
+    case PointerEventType.PET_PROXIMITY_LEAVE:
+      return "PET_PROXIMITY_LEAVE";
     case PointerEventType.UNRECOGNIZED:
     default:
       return "UNRECOGNIZED";
   }
 }
+
+export enum InteractionType {
+  CURSOR = 0,
+  PROXIMITY = 1,
+  UNRECOGNIZED = -1,
+}
+
+export function interactionTypeFromJSON(object: any): InteractionType {
+  switch (object) {
+    case 0:
+    case "CURSOR":
+      return InteractionType.CURSOR;
+    case 1:
+    case "PROXIMITY":
+      return InteractionType.PROXIMITY;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return InteractionType.UNRECOGNIZED;
+  }
+}
+
+export function interactionTypeToJSON(object: InteractionType): string {
+  switch (object) {
+    case InteractionType.CURSOR:
+      return "CURSOR";
+    case InteractionType.PROXIMITY:
+      return "PROXIMITY";
+    case InteractionType.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/protocol",
-  "version": "1.0.0-23295977779.commit-76299d9",
+  "version": "1.0.0-23344929225.commit-4bea499",
   "description": "",
   "repository": "decentraland/protocol.git",
   "homepage": "https://github.com/decentraland/protocol#readme",
@@ -13,7 +13,7 @@
     "test": "./scripts/check-proto-compabitility.sh"
   },
   "devDependencies": {
-    "@protobuf-ts/protoc": "^2.8.1",
+    "@protobuf-ts/protoc": "^2.11.0",
     "proto-compatibility-tool": "^1.1.2-20220925163655.commit-25bd040",
     "typescript": "^5.0.4"
   },
@@ -30,5 +30,5 @@
     "out-js",
     "public"
   ],
-  "commit": "76299d9922947ead7641ab645ba820dbf8afd79a"
+  "commit": "4bea499c15fc2c872c761aa983a790d846f1ec9f"
 }

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;
 }
@@ -73,18 +74,42 @@ message Movement {
       GLIDING = 2;
       CLOSING_PROP = 3;
   }
+  // point-at
+  float point_at_x = 25;
+  float point_at_y = 26;
+  float point_at_z = 27;
+  bool is_pointing_at = 28;
 }
 
 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
+  int32 point_at_data = 4; // bit-compressed: flag + point coordinates
 }
 
 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 {
@@ -117,6 +142,10 @@ message ProfileResponse {
 message Chat {
   string message = 1;
   double timestamp = 2;
+
+  // Extension: optional forwarded_from to identify the original sender when
+  // messages are forwarded through an SFU
+  optional string forwarded_from = 3;
 }
 
 message Scene {

package/proto/decentraland/sdk/components/audio_analysis.proto

@@ -0,0 +1,44 @@
+syntax = "proto3";
+package decentraland.sdk.components;
+
+import "decentraland/sdk/components/common/id.proto";
+option (common.ecs_component_id) = 1212;
+
+enum PBAudioAnalysisMode {
+    MODE_RAW = 0;
+    MODE_LOGARITHMIC = 1;
+}
+
+message PBAudioAnalysis {
+
+    // Parameters section
+    PBAudioAnalysisMode mode = 1;
+
+    // Used only when mode == MODE_LOGARITHMIC
+    optional float amplitude_gain = 100;
+    optional float bands_gain = 101;
+    // End when mode == MODE_LOGARITHMIC
+
+    // End Parameters section
+
+    // Result section
+    float amplitude = 200;
+
+    // Protobuf doesn't support fixed arrays -> 8 band fields
+    float band_0 = 201;
+    float band_1 = 202;
+    float band_2 = 203;
+    float band_3 = 204;
+    float band_4 = 205;
+    float band_5 = 206;
+    float band_6 = 207;
+    float band_7 = 208;
+
+    // End Result section
+
+    // Future fields
+    // float spectral_centroid = 13;
+    // float spectral_flux = 14;
+    // bool onset = 15;
+    // float bpm = 16;
+}

package/proto/decentraland/sdk/components/avatar_locomotion_settings.proto

@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+package decentraland.sdk.components;
+
+import "decentraland/sdk/components/common/id.proto";
+
+option (common.ecs_component_id) = 1211;
+
+// The PBAvatarLocomotionSettings component allows scenes to modify locomotion settings defining things such
+// as the avatar movement speed, jump height etc.
+message PBAvatarLocomotionSettings {
+  optional float walk_speed = 1;            // Maximum speed when walking (in meters per second)
+  optional float jog_speed = 2;             // Maximum speed when jogging (in meters per second)
+  optional float run_speed = 3;             // Maximum speed when running (in meters per second)
+  optional float jump_height = 4;           // Height of a regular jump (in meters)
+  optional float run_jump_height = 5;       // Height of a jump while running (in meters)
+  optional float hard_landing_cooldown = 6; // Cooldown time after a hard landing before the avatar can move again (in seconds)
+  optional float double_jump_height = 7;    // Height of the double jump (in meters)
+  optional float gliding_speed = 8;         // Maximum speed when gliding (in meters per second)
+  optional float gliding_falling_speed = 9; // Maximum falling speed when gliding (in meters per second)
+}

package/proto/decentraland/sdk/components/common/input_action.proto

@@ -17,6 +17,7 @@ enum InputAction {
   IA_ACTION_4 = 11;
   IA_ACTION_5 = 12;
   IA_ACTION_6 = 13;
+  IA_MODIFIER = 14;
 }
 
 // PointerEventType is a kind of interaction that can be detected.
@@ -25,4 +26,11 @@ enum PointerEventType {
   PET_DOWN = 1;
   PET_HOVER_ENTER = 2;
   PET_HOVER_LEAVE = 3;
+  PET_PROXIMITY_ENTER = 4;
+  PET_PROXIMITY_LEAVE = 5;
+}
+
+enum InteractionType {
+  CURSOR = 0;
+  PROXIMITY = 1;
 }

package/proto/decentraland/sdk/components/light_source.proto

@@ -25,4 +25,4 @@ message PBLightSource {
     optional float inner_angle = 9;   // default = 21.8. Inner angle can't be higher than outer angle, otherwise will default to same value. Min value is 0. Max value is 179.
     optional float outer_angle = 10;  // default = 30. Outer angle can't be lower than inner angle, otherwise will inner angle will be set to same value. Max value is 179.
   }
-}
+}

package/proto/decentraland/sdk/components/pointer_events.proto

@@ -51,11 +51,13 @@ message PBPointerEvents {
     optional bool show_feedback = 4;        // enable or disable hover text and highlight (default true)
     optional bool show_highlight = 5;       // enable or disable hover highlight (default true)
     optional float max_player_distance = 6; // range of interaction from the avatar's position (default 0)
+    optional uint32 priority = 7;           // resolution order when multiple events overlap, higher wins (default 0)
   }
 
   message Entry {
     common.PointerEventType event_type = 1; // the kind of interaction to detect
     Info event_info = 2;             // additional configuration for this detection
+    optional common.InteractionType interaction_type = 3; // the type of interaction source (default 0 == CURSOR)
   }
 
   repeated Entry pointer_events = 1; // the list of relevant events to detect

package/proto/decentraland/sdk/components/virtual_camera.proto

@@ -10,7 +10,9 @@ option (common.ecs_component_id) = 1076;
 // an 'instant' transition (like using speed/time = 0)
 // * The lookAtEntity defines to which entity the Camera has to look at constantly (independent from 
 // the holding entity transform).
+// * The fov defines the Field of View of the virtual camera
 message PBVirtualCamera {
   optional common.CameraTransition default_transition = 1;
   optional uint32 look_at_entity = 2;
+  optional float fov = 3; // default: 60
 }