@dcl/protocol 1.0.0-22583117520.commit-28394c4 → 1.0.0-22584214067.commit-276e5b7

package/out-ts/decentraland/social_service/v2/social_service_v2.gen.ts

@@ -2,7 +2,6 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
 import { Empty } from "../../../google/protobuf/empty.gen";
-import { Color3 } from "../../common/colors.gen";
 import {
   ConflictingError,
   ForbiddenError,
@@ -289,7 +288,6 @@ export interface FriendProfile {
   name: string;
   hasClaimedName: boolean;
   profilePictureUrl: string;
-  nameColor?: Color3 | undefined;
 }
 
 export interface BlockedUserProfile {
@@ -298,7 +296,6 @@ export interface BlockedUserProfile {
   hasClaimedName: boolean;
   profilePictureUrl: string;
   blockedAt?: number | undefined;
-  nameColor?: Color3 | undefined;
 }
 
 export interface Pagination {
@@ -930,7 +927,7 @@ export namespace User {
 }
 
 function createBaseFriendProfile(): FriendProfile {
-  return { address: "", name: "", hasClaimedName: false, profilePictureUrl: "", nameColor: undefined };
+  return { address: "", name: "", hasClaimedName: false, profilePictureUrl: "" };
 }
 
 export namespace FriendProfile {
@@ -947,9 +944,6 @@ export namespace FriendProfile {
     if (message.profilePictureUrl !== "") {
       writer.uint32(34).string(message.profilePictureUrl);
     }
-    if (message.nameColor !== undefined) {
-      Color3.encode(message.nameColor, writer.uint32(42).fork()).ldelim();
-    }
     return writer;
   }
 
@@ -988,13 +982,6 @@ export namespace FriendProfile {
 
           message.profilePictureUrl = reader.string();
           continue;
-        case 5:
-          if (tag !== 42) {
-            break;
-          }
-
-          message.nameColor = Color3.decode(reader, reader.uint32());
-          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1010,7 +997,6 @@ export namespace FriendProfile {
       name: isSet(object.name) ? String(object.name) : "",
       hasClaimedName: isSet(object.hasClaimedName) ? Boolean(object.hasClaimedName) : false,
       profilePictureUrl: isSet(object.profilePictureUrl) ? String(object.profilePictureUrl) : "",
-      nameColor: isSet(object.nameColor) ? Color3.fromJSON(object.nameColor) : undefined,
     };
   }
 
@@ -1020,8 +1006,6 @@ export namespace FriendProfile {
     message.name !== undefined && (obj.name = message.name);
     message.hasClaimedName !== undefined && (obj.hasClaimedName = message.hasClaimedName);
     message.profilePictureUrl !== undefined && (obj.profilePictureUrl = message.profilePictureUrl);
-    message.nameColor !== undefined &&
-      (obj.nameColor = message.nameColor ? Color3.toJSON(message.nameColor) : undefined);
     return obj;
   }
 
@@ -1035,22 +1019,12 @@ export namespace FriendProfile {
     message.name = object.name ?? "";
     message.hasClaimedName = object.hasClaimedName ?? false;
     message.profilePictureUrl = object.profilePictureUrl ?? "";
-    message.nameColor = (object.nameColor !== undefined && object.nameColor !== null)
-      ? Color3.fromPartial(object.nameColor)
-      : undefined;
     return message;
   }
 }
 
 function createBaseBlockedUserProfile(): BlockedUserProfile {
-  return {
-    address: "",
-    name: "",
-    hasClaimedName: false,
-    profilePictureUrl: "",
-    blockedAt: undefined,
-    nameColor: undefined,
-  };
+  return { address: "", name: "", hasClaimedName: false, profilePictureUrl: "", blockedAt: undefined };
 }
 
 export namespace BlockedUserProfile {
@@ -1070,9 +1044,6 @@ export namespace BlockedUserProfile {
     if (message.blockedAt !== undefined) {
       writer.uint32(40).int64(message.blockedAt);
     }
-    if (message.nameColor !== undefined) {
-      Color3.encode(message.nameColor, writer.uint32(50).fork()).ldelim();
-    }
     return writer;
   }
 
@@ -1118,13 +1089,6 @@ export namespace BlockedUserProfile {
 
           message.blockedAt = longToNumber(reader.int64() as Long);
           continue;
-        case 6:
-          if (tag !== 50) {
-            break;
-          }
-
-          message.nameColor = Color3.decode(reader, reader.uint32());
-          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1141,7 +1105,6 @@ export namespace BlockedUserProfile {
       hasClaimedName: isSet(object.hasClaimedName) ? Boolean(object.hasClaimedName) : false,
       profilePictureUrl: isSet(object.profilePictureUrl) ? String(object.profilePictureUrl) : "",
       blockedAt: isSet(object.blockedAt) ? Number(object.blockedAt) : undefined,
-      nameColor: isSet(object.nameColor) ? Color3.fromJSON(object.nameColor) : undefined,
     };
   }
 
@@ -1152,8 +1115,6 @@ export namespace BlockedUserProfile {
     message.hasClaimedName !== undefined && (obj.hasClaimedName = message.hasClaimedName);
     message.profilePictureUrl !== undefined && (obj.profilePictureUrl = message.profilePictureUrl);
     message.blockedAt !== undefined && (obj.blockedAt = Math.round(message.blockedAt));
-    message.nameColor !== undefined &&
-      (obj.nameColor = message.nameColor ? Color3.toJSON(message.nameColor) : undefined);
     return obj;
   }
 
@@ -1168,9 +1129,6 @@ export namespace BlockedUserProfile {
     message.hasClaimedName = object.hasClaimedName ?? false;
     message.profilePictureUrl = object.profilePictureUrl ?? "";
     message.blockedAt = object.blockedAt ?? undefined;
-    message.nameColor = (object.nameColor !== undefined && object.nameColor !== null)
-      ? Color3.fromPartial(object.nameColor)
-      : undefined;
     return message;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/protocol",
-  "version": "1.0.0-22583117520.commit-28394c4",
+  "version": "1.0.0-22584214067.commit-276e5b7",
   "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": "28394c4111791b8e925ba5fd87ce1ceb08f27115"
+  "commit": "276e5b77b63cfe7cb7b22c643e1a3321412e60b5"
 }

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;
 }
@@ -51,26 +52,58 @@ message Movement {
   float movement_blend_value = 8;
   float slide_blend_value = 9;
   bool is_grounded = 10;
-  bool is_jumping = 11;
+  bool is_jumping = 11; // deprecated
+  int32 jump_count = 24;
   bool is_long_jump = 12;
   bool is_long_fall = 13;
   bool is_falling = 14;
   bool is_stunned = 15;
+  GlideState glide_state = 23;
   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;
+  enum GlideState {
+      PROP_CLOSED = 0;
+      OPENING_PROP = 1;
+      GLIDING = 2;
+      CLOSING_PROP = 3;
+  }
 }
 
 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 {
@@ -103,6 +136,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/input_modifier.proto

@@ -12,6 +12,8 @@ message PBInputModifier {
         optional bool disable_run = 4;
         optional bool disable_jump = 5;
         optional bool disable_emote = 6;
+        optional bool disable_double_jump = 7;
+        optional bool disable_gliding = 8;
     }
 
     oneof mode {

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/tween.proto

@@ -19,6 +19,8 @@ message PBTween {
     RotateContinuous rotate_continuous = 9;
     MoveContinuous move_continuous = 10;
     TextureMoveContinuous texture_move_continuous = 11;
+    MoveRotateScale move_rotate_scale = 12;
+    MoveRotateScaleContinuous move_rotate_scale_continuous = 13;
   }
 
   optional bool playing = 6; // default true (pause or running)
@@ -41,6 +43,15 @@ message Scale {
   decentraland.common.Vector3 end = 2;
 }
 
+message MoveRotateScale {
+  decentraland.common.Vector3 position_start = 1;
+  decentraland.common.Vector3 position_end = 2;
+  decentraland.common.Quaternion rotation_start = 3;
+  decentraland.common.Quaternion rotation_end = 4;
+  decentraland.common.Vector3 scale_start = 5;
+  decentraland.common.Vector3 scale_end = 6;
+}
+
 // This tween mode allows to move the texture of a PbrMaterial or UnlitMaterial.
 // You can also specify the movement type (offset or tiling)
 message TextureMove {
@@ -59,6 +70,13 @@ message MoveContinuous {
   float speed = 2;
 }
 
+message MoveRotateScaleContinuous {
+  decentraland.common.Vector3 position_direction = 1;
+  decentraland.common.Quaternion rotation_direction = 2;
+  decentraland.common.Vector3 scale_direction = 3;
+  float speed = 4;
+}
+
 message TextureMoveContinuous {
   decentraland.common.Vector2 direction = 1;
   float speed = 2;

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
 }

package/proto/decentraland/social_service/v2/social_service_v2.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 package decentraland.social_service.v2;
 
 import "google/protobuf/empty.proto";
-import "decentraland/common/colors.proto";
 import "decentraland/social_service/errors.proto";
 
 // Types
@@ -13,7 +12,6 @@ message FriendProfile {
   string name = 2;
   bool has_claimed_name = 3;
   string profile_picture_url = 4;
-  optional decentraland.common.Color3 name_color = 5;
 }
 
 message BlockedUserProfile {
@@ -22,7 +20,6 @@ message BlockedUserProfile {
   bool has_claimed_name = 3;
   string profile_picture_url = 4;
   optional int64 blocked_at = 5;
-  optional decentraland.common.Color3 name_color = 6;
 }
 
 message Pagination {

package/proto/decentraland/sdk/components/physics_combined_force.proto

@@ -1,21 +0,0 @@
-syntax = "proto3";
-
-package decentraland.sdk.components;
-
-import "decentraland/common/vectors.proto";
-import "decentraland/sdk/components/common/id.proto";
-
-option (common.ecs_component_id) = 1216;
-
-/**
- * This component applies a continuous physics force.
-
- * @remarks Low-level component. Use Physics.applyForceToPlayer()/.removeForceToPlayer() instead.
- * Direct manipulation will conflict with the force accumulation registry.
- * Summary component: stores the accumulated result of all active forces registered by the scene in the current frame.
-
- * State-like component: the force is applied every physics tick while the component is present on the entity.
-*/
-message PBPhysicsCombinedForce {
-    decentraland.common.Vector3 vector = 1; // Includes force direction and magnitude
-}

package/proto/decentraland/sdk/components/physics_combined_impulse.proto

@@ -1,23 +0,0 @@
-syntax = "proto3";
-
-package decentraland.sdk.components;
-
-import "decentraland/common/vectors.proto";
-import "decentraland/sdk/components/common/id.proto";
-
-option (common.ecs_component_id) = 1215;
-
-/**
- * This component applies a one-shot physics summary impulse.
- 
- * @remarks Low-level component. Use Physics.applyImpulseToPlayer() instead.
- * Direct manipulation will conflict with the force accumulation registry.
- * Summary component: stores the accumulated result of all impulses registered by the scene in the current frame.
- 
- * Event-like component: each new impulse must increment the eventID to ensure delivery via CRDT, even if the direction is identical to the previous one.
- * Renderer processes impulse with the unique ID only once. Increase eventID of the component to apply another impulse.
-*/
-message PBPhysicsCombinedImpulse {
-    decentraland.common.Vector3 vector = 1; // Includes impulse direction and magnitude
-    uint32 event_id = 2; // Monotonic counter to distinguish different impulses.
-}