@dcl/protocol 1.0.0-2959077731.commit-a10e494 → 1.0.0-3015628754.commit-7713e2e

package/ecs/components/AvatarShape.proto

@@ -6,15 +6,22 @@ import "common/Color3.proto";
 
 message PBAvatarShape {
   string id = 1;
-  optional string name = 2;
-  optional string body_shape = 3;
-  optional Color3 skin_color = 4;
-  optional Color3 hair_color = 5;
-  optional Color3 eye_color = 6;
-  repeated string wearables = 7;
-  optional string expression_trigger_id = 8;
-  optional int64 expression_trigger_timestamp = 9;
-  optional string sticker_trigger_id = 10;
-  optional int64 sticker_trigger_timestamp = 11;
-  optional bool talking = 12;
+  optional string name = 2; // default = NPC
+  optional string body_shape = 3; // default = urn:decentraland:off-chain:base-avatars:BaseFemale
+  optional Color3 skin_color = 4; // default = Color3(R = 0.6f, G = 0.462f, B = 0.356f)
+  optional Color3 hair_color = 5; // default = Color3(R = 0.283f, G = 0.142f, B = 0f)
+  optional Color3 eye_color = 6; // default = Color3(R = 0.6f, G = 0.462f, B = 0.356f)
+  optional string expression_trigger_id = 7;
+  optional int64 expression_trigger_timestamp = 8; // default = timestamp
+  optional bool talking = 9;
+  /**
+   * default = ["urn:decentraland:off-chain:base-avatars:f_eyes_00", 
+   *  "urn:decentraland:off-chain:base-avatars:f_eyebrows_00",
+   *  "urn:decentraland:off-chain:base-avatars:f_mouth_00" 
+   *  "urn:decentraland:off-chain:base-avatars:standard_hair", 
+   *  "urn:decentraland:off-chain:base-avatars:f_simple_yellow_tshirt", 
+   *  "urn:decentraland:off-chain:base-avatars:f_brown_trousers", 
+   *  "urn:decentraland:off-chain:base-avatars:bun_shoes"]
+   */
+  repeated string wearables = 10;
 }

package/ecs/components/MeshCollider.proto

@@ -0,0 +1,35 @@
+syntax = "proto3";
+
+import "common/id.proto";
+option (ecs_component_id) = 1019;
+
+enum ColliderLayer {
+    None = 0;
+    Pointer = 1;
+    Physics = 2;
+}
+
+message PBMeshCollider {    
+    message BoxMesh {
+    }
+
+    message CylinderMesh {
+        optional float radius_top = 1; // default=1.0
+        optional float radius_bottom = 2; // default=1.0
+    }
+
+    message PlaneMesh {
+    }
+
+    message SphereMesh {
+    }
+
+    optional int32 collision_mask = 1; // default = ColliderLayer.Physics | ColliderLayer.Pointer
+    
+    oneof mesh {
+        BoxMesh box = 2;
+        SphereMesh sphere = 3;
+        CylinderMesh cylinder = 4;
+        PlaneMesh plane = 5;
+    }
+}

package/ecs/components/PointerEvents.proto

@@ -0,0 +1,28 @@
+syntax = "proto3";
+
+import "common/id.proto";
+option (ecs_component_id) = 1062;
+import "common/ActionButton.proto";
+
+enum PointerEventType {
+  UP = 0;
+  DOWN = 1;
+  HOVER_ENTER = 2;
+  HOVER_LEAVE = 3;
+}
+
+message PBPointerEvents {
+  message Info {
+    optional ActionButton button = 1; // default=ActionButton.ANY
+    optional string hover_text = 2; // default='Interact'
+    optional float max_distance = 3; // default=10
+    optional bool show_feedback = 4; // default=true
+  }
+
+  message Entry {
+    PointerEventType eventType = 1;
+    Info eventInfo = 2;
+  }
+
+  repeated Entry pointerEvents = 1;
+}

package/ecs/components/PointerEventsResult.proto

@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+import "common/id.proto";
+import "RaycastResult.proto";
+import "PointerEvents.proto";
+option (ecs_component_id) = 1063;
+import "common/ActionButton.proto";
+
+// the renderer will set this component to the root entity once per frame with all the events
+message PBPointerEventsResult {
+  // a list of the last N pointer commands (from the engine)
+  repeated PointerCommand commands = 1;
+
+  // this message represents a pointer event, used both for UP and DOWN actions
+  message PointerCommand {
+    ActionButton button = 1; // identifier of the input
+    RaycastHit hit = 2;
+    PointerEventType state = 4;
+    int32 timestamp = 5; // could be a Lamport timestamp
+    optional float analog = 6; // if the input is analog then we store it here
+  }
+}

package/ecs/components/RaycastResult.proto

@@ -0,0 +1,23 @@
+syntax = "proto3";
+
+import "common/id.proto";
+option (ecs_component_id) = 1064;
+import "common/Vector3.proto";
+
+message PBRaycastResult {
+  int32 timestamp = 1;
+  Vector3 origin = 2;
+  Vector3 direction = 3;
+  repeated RaycastHit hits = 4;
+}
+
+// Position will be relative to the scene  
+message RaycastHit {
+  Vector3 position = 1;
+  Vector3 origin = 2;
+  Vector3 direction = 3;
+  Vector3 normal_hit = 4;
+  float length = 5;
+  optional string mesh_name = 6;
+  optional int64 entity_id = 7;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/protocol",
-  "version": "1.0.0-2959077731.commit-a10e494",
+  "version": "1.0.0-3015628754.commit-7713e2e",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -18,5 +18,5 @@
     "ecs",
     "bff"
   ],
-  "commit": "a10e494213acb02f71f3e6215d7163a71d999588"
+  "commit": "7713e2e945f66805e16aeac2955f6878b52ddfee"
 }