@dcl/sdk 7.0.0-2637795719.commit-7dd5361 → 7.0.0-2652177259.commit-d1b36b1

package/dist/ecs7/proto-definitions/AvatarAttach.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+import "common/id.proto";
+option (ecs_component_id) = 1073;
+
+message PBAvatarAttach {
+  string avatar_id = 1;
+  int32 anchor_point_id = 2;
+}

package/dist/ecs7/proto-definitions/AvatarModifierArea.proto

@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+import "common/id.proto";
+option (ecs_component_id) = 1070;
+import "common/Vector3.proto";
+
+message PBAvatarModifierArea {
+  Vector3 area = 1;
+  repeated string exclude_ids = 2;
+  repeated Modifier modifiers = 3;
+  enum Modifier {
+    HIDE_AVATARS = 0;
+    DISABLE_PASSPORTS = 1;
+  }
+}

package/dist/ecs7/proto-definitions/AvatarShape.proto

@@ -0,0 +1,20 @@
+syntax = "proto3";
+
+import "common/id.proto";
+option (ecs_component_id) = 1080;
+import "common/Color3.proto";
+
+message PBAvatarShape {
+  string id = 1;
+  string name = 2;
+  string body_shape = 3;
+  Color3 skin_color = 4;
+  Color3 hair_color = 5;
+  Color3 eye_color = 6;
+  repeated string wearables = 7;
+  string expression_trigger_id = 8;
+  int64 expression_trigger_timestamp = 9;
+  string sticker_trigger_id = 10;
+  int64 sticker_trigger_timestamp = 11;
+  bool talking = 12;
+}

package/dist/ecs7/proto-definitions/Billboard.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+import "common/id.proto";
+option (ecs_component_id) = 1090;
+
+message PBBillboard {
+  bool x = 1;
+  bool y = 2;
+  bool z = 3;
+}

package/dist/ecs7/proto-definitions/BoxShape.proto

@@ -3,10 +3,9 @@ syntax = "proto3";
 import "common/id.proto";
 option (ecs_component_id) = 1013;
 
-message PBBoxShape {
+message PBBoxShape {  
   bool with_collisions = 1;
   bool is_pointer_blocker = 2;
-  // TODO: should visible be another component? that maybe affects all the entities
   bool visible = 3;
   repeated float uvs = 4;
 }

package/dist/ecs7/proto-definitions/CameraModeArea.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+import "common/id.proto";
+option (ecs_component_id) = 1071;
+import "common/Vector3.proto";
+
+message PBCameraModeArea {
+  Vector3 area = 1;
+  CameraMode mode = 2;
+  enum CameraMode {
+    FIRST_PERSON = 0;
+    THIRD_PERSON = 1;
+  }
+}

package/dist/ecs7/proto-definitions/CylinderShape.proto

@@ -3,10 +3,9 @@
 import "common/id.proto";
 option (ecs_component_id) = 1016;
 
-message PBCylinderShape {
+message PBCylinderShape {  
   bool with_collisions = 1;
   bool is_pointer_blocker = 2;
-  // TODO: should visible be another component? that maybe affects all the entities
   bool visible = 3;
   float radius_top = 4;
   float radius_bottom = 5;

package/dist/ecs7/proto-definitions/NFTShape.proto

@@ -8,7 +8,6 @@ import "common/Color3.proto";
 message PBNFTShape {
   bool with_collisions = 1;
   bool is_pointer_blocker = 2;
-  // TODO: should visible be another component? that maybe affects all the entities
   bool visible = 3;
   string src = 4;
   string asset_id = 5;

package/dist/ecs7/proto-definitions/PlaneShape.proto

@@ -3,11 +3,9 @@
 import "common/id.proto";
 option (ecs_component_id) = 1014;
 
-message PBPlaneShape {
+message PBPlaneShape {  
   bool with_collisions = 1;
   bool is_pointer_blocker = 2;
-  // TODO: should visible be another component? that maybe affects all the entities
   bool visible = 3;
-  // TODO: this could be better serialized as u00 v00 u01 v01 u10 v10 u11 v11 for speed
   repeated float uvs = 4;
 }

package/dist/ecs7/proto-definitions/README.md

@@ -29,4 +29,4 @@ The definition must be the minimal proto code, and it shouldn't have a specific
 For example, in the unity-renderer repo, it'll be necessary to add the `csharp_namespace` option but it's the responsibility of this particular implementation. This code option doesn't define how the component is.
 
 # Test component
-If you write a proto and then push, CI will fail because the tests will fail. All the components need to be tested. `@dcl/ecs/test/components` has some examples!
+If you write a proto and then push, CI will fail because the tests will fail. All the components need to be tested. `@dcl/ecs/test/components` has some examples!

package/dist/ecs7/proto-definitions/SphereShape.proto

@@ -3,7 +3,7 @@
 import "common/id.proto";
 option (ecs_component_id) = 1015;
 
-message PBSphereShape {
+message PBSphereShape {  
   bool with_collisions = 1;
   bool is_pointer_blocker = 2;
   bool visible = 3;

package/dist/ecs7/proto-definitions/TextShape.proto

@@ -7,13 +7,11 @@ import "common/Color3.proto";
 
 message PBTextShape {
   string text = 1;
-
-  // this should be removed
   bool visible = 2;
   string font = 3;
   float opacity = 4;
-  float font_size = 5;
-  bool font_auto_size = 6;
+  float font_Size = 5;
+  bool font_autoSize = 6;
   string h_text_align = 7;
   string v_text_align = 8;
   float width = 9;
@@ -26,10 +24,10 @@ message PBTextShape {
   int32 line_count = 16;
   bool text_wrapping = 17;
   float shadow_blur = 18;
-  float shadow_offset_x = 19;
-  float shadow_offset_y = 20;
+  float shadow_offsetX = 19;
+  float shadow_offsetY = 20;
   float outline_width = 21;
   Color3 shadow_color = 22;
   Color3 outline_color = 23;
   Color3 text_color = 24;
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/sdk",
-  "version": "7.0.0-2637795719.commit-7dd5361",
+  "version": "7.0.0-2652177259.commit-d1b36b1",
   "description": "",
   "main": "dist/src/index.js",
   "typings": "dist/index.d.ts",
@@ -27,9 +27,9 @@
     "src/cli/**/*.js"
   ],
   "dependencies": {
-    "@dcl/amd": "6.11.4-2637795719.commit-7dd5361",
-    "@dcl/build-ecs": "6.11.4-2637795719.commit-7dd5361",
-    "@dcl/kernel": "^1.0.0-2625011593.commit-d45c691",
+    "@dcl/amd": "6.11.4-2652177259.commit-d1b36b1",
+    "@dcl/build-ecs": "6.11.4-2652177259.commit-d1b36b1",
+    "@dcl/kernel": "1.0.0-2638443584.commit-696a74b",
     "@dcl/posix": "^1.0.4",
     "@dcl/schemas": "4.8.0",
     "@dcl/unity-renderer": "^1.0.40531-20220621125654.commit-472137e",
@@ -38,5 +38,5 @@
     "ignore": "^5.1.8"
   },
   "minCliVersion": "3.10.2",
-  "commit": "7dd5361a5785cfaa4ccde3a930af9a4f27705d03"
+  "commit": "d1b36b16a1e1832ac4837d9edb7bd65daf3a4e29"
 }

package/src/cli/mock-catalyst/index.js

@@ -153,18 +153,23 @@ var serveFolders = function (app, baseFolders) {
             });
         }
     });
-    app.get('/content/entities/scene', function (req, res) {
-        if (!req.query.pointer) {
-            res.json([]);
-            return;
+    function pointerRequestHandler(pointers) {
+        if (!pointers) {
+            return [];
         }
-        var requestedPointers = new Set(req.query.pointer && typeof req.query.pointer === 'string'
-            ? [req.query.pointer]
-            : req.query.pointer);
+        var requestedPointers = new Set(pointers && typeof pointers === 'string'
+            ? [pointers]
+            : pointers);
         var resultEntities = (0, setupUtils_1.getSceneJson)({
             baseFolders: baseFolders,
             pointers: Array.from(requestedPointers)
         });
-        res.json(resultEntities).end();
+        return resultEntities;
+    }
+    app.get('/content/entities/scene', function (req, res) {
+        return res.json(pointerRequestHandler(req.query.pointer)).end();
+    });
+    app.post('/content/entities/active', function (req, res) {
+        return res.json(pointerRequestHandler(req.body.pointers)).end();
     });
 };

package/src/setupProxy.js

@@ -46,6 +46,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 var path = require("path");
 var fs = require("fs");
+var express = require("express");
 var setupUtils_1 = require("./cli/setupUtils");
 var mock_catalyst_1 = require("./cli/mock-catalyst");
 var wearables_1 = require("./cli/wearables");
@@ -99,6 +100,7 @@ var setupProxy = function (dcl, app) {
             baseWearableFolders = wearables;
         }
     }
+    app.use(express.json());
     try {
         (0, mock_catalyst_1.mockCatalyst)(app, __spreadArray(__spreadArray([], baseSceneFolders, true), baseWearableFolders, true));
     }

package/types/ecs7/index.d.ts

@@ -198,7 +198,12 @@ declare function defineSdkComponents(engine: Pick<IEngine, 'defineComponent'>):
     Animator: ComponentDefinition<EcsType<PBAnimator>>;
     AudioSource: ComponentDefinition<EcsType<PBAudioSource>>;
     AudioStream: ComponentDefinition<EcsType<PBAudioStream>>;
+    AvatarAttach: ComponentDefinition<EcsType<PBAvatarAttach>>;
+    AvatarModifierArea: ComponentDefinition<EcsType<PBAvatarModifierArea>>;
+    AvatarShape: ComponentDefinition<EcsType<PBAvatarShape>>;
+    Billboard: ComponentDefinition<EcsType<PBBillboard>>;
     BoxShape: ComponentDefinition<EcsType<PBBoxShape>>;
+    CameraModeArea: ComponentDefinition<EcsType<PBCameraModeArea>>;
     CylinderShape: ComponentDefinition<EcsType<PBCylinderShape>>;
     GLTFShape: ComponentDefinition<EcsType<PBGLTFShape>>;
     NFTShape: ComponentDefinition<EcsType<PBNFTShape>>;
@@ -1148,18 +1153,65 @@ declare interface PBAudioStream {
     url: string;
 }
 
+declare interface PBAvatarAttach {
+    avatarId: string;
+    anchorPointId: number;
+}
+
+declare interface PBAvatarModifierArea {
+    area: Vector3_2 | undefined;
+    excludeIds: string[];
+    modifiers: PBAvatarModifierArea_Modifier[];
+}
+
+declare enum PBAvatarModifierArea_Modifier {
+    HIDE_AVATARS = 0,
+    DISABLE_PASSPORTS = 1,
+    UNRECOGNIZED = -1
+}
+
+declare interface PBAvatarShape {
+    id: string;
+    name: string;
+    bodyShape: string;
+    skinColor: Color3 | undefined;
+    hairColor: Color3 | undefined;
+    eyeColor: Color3 | undefined;
+    wearables: string[];
+    expressionTriggerId: string;
+    expressionTriggerTimestamp: number;
+    stickerTriggerId: string;
+    stickerTriggerTimestamp: number;
+    talking: boolean;
+}
+
+declare interface PBBillboard {
+    x: boolean;
+    y: boolean;
+    z: boolean;
+}
+
 declare interface PBBoxShape {
     withCollisions: boolean;
     isPointerBlocker: boolean;
-    /** TODO: should visible be another component? that maybe affects all the entities */
     visible: boolean;
     uvs: number[];
 }
 
+declare interface PBCameraModeArea {
+    area: Vector3_2 | undefined;
+    mode: PBCameraModeArea_CameraMode;
+}
+
+declare enum PBCameraModeArea_CameraMode {
+    FIRST_PERSON = 0,
+    THIRD_PERSON = 1,
+    UNRECOGNIZED = -1
+}
+
 declare interface PBCylinderShape {
     withCollisions: boolean;
     isPointerBlocker: boolean;
-    /** TODO: should visible be another component? that maybe affects all the entities */
     visible: boolean;
     radiusTop: number;
     radiusBottom: number;
@@ -1175,7 +1227,6 @@ declare interface PBGLTFShape {
 declare interface PBNFTShape {
     withCollisions: boolean;
     isPointerBlocker: boolean;
-    /** TODO: should visible be another component? that maybe affects all the entities */
     visible: boolean;
     src: string;
     assetId: string;
@@ -1222,9 +1273,7 @@ declare interface PBOnPointerUpResult {
 declare interface PBPlaneShape {
     withCollisions: boolean;
     isPointerBlocker: boolean;
-    /** TODO: should visible be another component? that maybe affects all the entities */
     visible: boolean;
-    /** TODO: this could be better serialized as u00 v00 u01 v01 u10 v10 u11 v11 for speed */
     uvs: number[];
 }
 
@@ -1236,7 +1285,6 @@ declare interface PBSphereShape {
 
 declare interface PBTextShape {
     text: string;
-    /** this should be removed */
     visible: boolean;
     font: string;
     opacity: number;