@dcl/protocol 1.0.0-21441285601.commit-d8a2d5b → 1.0.0-21456739795.commit-eae3f8b

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

@@ -25,6 +25,29 @@ export const protobufPackage = "decentraland.sdk.components";
  *
  * It also supports simple visual feedback when interactions occur, by showing floating text.
  * More sophisticated feedback requires the use of other components.
+ *
+ * Distance rules
+ * --------------
+ * PointerEvents can enforce interaction range using two independent distance checks:
+ *
+ * - 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 camera distance is <= `max_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_player_distance` are present
+ *    - The interaction is allowed if ANY of the checks passes (OR logic):
+ *      (camera distance <= `max_distance`) OR (player distance <= `max_player_distance`).
+ *
+ * 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 camera distance check with a threshold of 10.
  */
 export interface PBPointerEvents {
   /** the list of relevant events to detect */
@@ -49,7 +72,11 @@ export interface PBPointerEvents_Info {
     | boolean
     | undefined;
   /** enable or disable hover highlight (default true) */
-  showHighlight?: boolean | undefined;
+  showHighlight?:
+    | boolean
+    | undefined;
+  /** range of interaction from the avatar's position (default 0) */
+  maxPlayerDistance?: number | undefined;
 }
 
 export interface PBPointerEvents_Entry {
@@ -130,6 +157,7 @@ function createBasePBPointerEvents_Info(): PBPointerEvents_Info {
     maxDistance: undefined,
     showFeedback: undefined,
     showHighlight: undefined,
+    maxPlayerDistance: undefined,
   };
 }
 
@@ -150,6 +178,9 @@ export namespace PBPointerEvents_Info {
     if (message.showHighlight !== undefined) {
       writer.uint32(40).bool(message.showHighlight);
     }
+    if (message.maxPlayerDistance !== undefined) {
+      writer.uint32(53).float(message.maxPlayerDistance);
+    }
     return writer;
   }
 
@@ -195,6 +226,13 @@ export namespace PBPointerEvents_Info {
 
           message.showHighlight = reader.bool();
           continue;
+        case 6:
+          if (tag !== 53) {
+            break;
+          }
+
+          message.maxPlayerDistance = reader.float();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -211,6 +249,7 @@ export namespace PBPointerEvents_Info {
       maxDistance: isSet(object.maxDistance) ? Number(object.maxDistance) : undefined,
       showFeedback: isSet(object.showFeedback) ? Boolean(object.showFeedback) : undefined,
       showHighlight: isSet(object.showHighlight) ? Boolean(object.showHighlight) : undefined,
+      maxPlayerDistance: isSet(object.maxPlayerDistance) ? Number(object.maxPlayerDistance) : undefined,
     };
   }
 
@@ -222,6 +261,7 @@ export namespace PBPointerEvents_Info {
     message.maxDistance !== undefined && (obj.maxDistance = message.maxDistance);
     message.showFeedback !== undefined && (obj.showFeedback = message.showFeedback);
     message.showHighlight !== undefined && (obj.showHighlight = message.showHighlight);
+    message.maxPlayerDistance !== undefined && (obj.maxPlayerDistance = message.maxPlayerDistance);
     return obj;
   }
 
@@ -236,6 +276,7 @@ export namespace PBPointerEvents_Info {
     message.maxDistance = object.maxDistance ?? undefined;
     message.showFeedback = object.showFeedback ?? undefined;
     message.showHighlight = object.showHighlight ?? undefined;
+    message.maxPlayerDistance = object.maxPlayerDistance ?? undefined;
     return message;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/protocol",
-  "version": "1.0.0-21441285601.commit-d8a2d5b",
+  "version": "1.0.0-21456739795.commit-eae3f8b",
   "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.11.0",
+    "@protobuf-ts/protoc": "^2.8.1",
     "proto-compatibility-tool": "^1.1.2-20220925163655.commit-25bd040",
     "typescript": "^5.0.4"
   },
@@ -30,5 +30,5 @@
     "out-js",
     "public"
   ],
-  "commit": "d8a2d5b681d7a9799cbc0d1d92305452f74c9ea7"
+  "commit": "eae3f8bdca1cca51c2af5ff5a66c72e2e2a0cfbb"
 }

package/proto/decentraland/kernel/comms/rfc4/comms.proto

@@ -18,7 +18,6 @@ message Packet {
     PlayerEmote player_emote = 9;
     SceneEmote scene_emote = 10;
     MovementCompressed movement_compressed = 12;
-	LookAtPosition look_at_position = 13;
   }
   uint32 protocol_version = 11;
 }
@@ -56,46 +55,20 @@ message Movement {
   bool is_long_jump = 12;
   bool is_long_fall = 13;
   bool is_falling = 14;
+
   bool is_stunned = 15;
+  
   float rotation_y = 16;
-  // 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 {
@@ -128,10 +101,6 @@ 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/common/input_action.proto

@@ -17,7 +17,6 @@ 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.

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

@@ -20,6 +20,29 @@ option (common.ecs_component_id) = 1062;
 //
 // It also supports simple visual feedback when interactions occur, by showing floating text.
 // More sophisticated feedback requires the use of other components.
+//
+// Distance rules
+// --------------
+// PointerEvents can enforce interaction range using two independent distance checks:
+//
+// - 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 camera distance is <= `max_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_player_distance` are present
+//    - The interaction is allowed if ANY of the checks passes (OR logic):
+//      (camera distance <= `max_distance`) OR (player distance <= `max_player_distance`).
+//
+// 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 camera distance check with a threshold of 10.
 message PBPointerEvents {
   message Info {
     optional common.InputAction button = 1; // key/button in use (default IA_ANY)
@@ -27,6 +50,7 @@ message PBPointerEvents {
     optional float max_distance = 3;        // range of interaction (default 10)
     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)
   }
 
   message Entry {

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

@@ -10,9 +10,7 @@ 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
 }

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

@@ -1,44 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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)
-}