@dcl/sdk 7.0.0-2957285950.commit-2a77ef6 → 7.0.0-2979266925.commit-497e30d

package/dist/ecs7/proto-definitions/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/dist/ecs7/proto-definitions/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/sdk",
-  "version": "7.0.0-2957285950.commit-2a77ef6",
+  "version": "7.0.0-2979266925.commit-497e30d",
   "description": "",
   "main": "dist/src/index.js",
   "typings": "dist/index.d.ts",
@@ -27,8 +27,8 @@
     "src/cli/**/*.js"
   ],
   "dependencies": {
-    "@dcl/amd": "6.11.5-2957285950.commit-2a77ef6",
-    "@dcl/build-ecs": "6.11.5-2957285950.commit-2a77ef6",
+    "@dcl/amd": "6.11.7-2979266925.commit-497e30d",
+    "@dcl/build-ecs": "6.11.7-2979266925.commit-497e30d",
     "@dcl/kernel": "1.0.0-2638443584.commit-696a74b",
     "@dcl/posix": "^1.0.4",
     "@dcl/schemas": "4.8.0",
@@ -38,5 +38,5 @@
     "ignore": "^5.1.8"
   },
   "minCliVersion": "3.10.2",
-  "commit": "2a77ef6f1a5048b8d1b138ce6de416489221e9e2"
+  "commit": "497e30ddbfeed9474b3f924d811fada9acade2d6"
 }

package/types/ecs7/index.d.ts

@@ -229,6 +229,8 @@ declare namespace Components {
     /** @public */
     const Material: ComponentDefinition<ISchema<PBMaterial>, PBMaterial>;
     /** @public */
+    const MeshCollider: ComponentDefinition<ISchema<PBMeshCollider>, PBMeshCollider>;
+    /** @public */
     const MeshRenderer: ComponentDefinition<ISchema<PBMeshRenderer>, Partial<PBMeshRenderer>>;
     /** @public */
     const NFTShape: ComponentDefinition<ISchema<PBNFTShape>, PBNFTShape>;
@@ -407,14 +409,36 @@ declare interface CreateByteBufferOptions {
 /** @public */
 declare const CylinderShape: ComponentDefinition<ISchema<PBCylinderShape>, PBCylinderShape>;
 
+/**
+ * @public
+ */
+declare type DeepReadonly<T> = T extends ReadonlyPrimitive ? T : T extends Map<infer K, infer V> ? DeepReadonlyMap<K, V> : T extends Set<infer M> ? DeepReadonlySet<M> : DeepReadonlyObject<T>;
+
 /**
  * Make each field readonly deeply
  * @public
  */
-declare type DeepReadonly<T> = {
-    readonly [P in keyof T]: DeepReadonly<T[P]>;
+declare type DeepReadonly_2<T> = {
+    readonly [P in keyof T]: DeepReadonly_2<T[P]>;
+};
+
+/**
+ * @public
+ */
+declare type DeepReadonlyMap<K, V> = ReadonlyMap<DeepReadonly<K>, DeepReadonly<V>>;
+
+/**
+ * @public
+ */
+declare type DeepReadonlyObject<T> = {
+    readonly [K in keyof T]: DeepReadonly<T[K]>;
 };
 
+/**
+ * @public
+ */
+declare type DeepReadonlySet<T> = ReadonlySet<DeepReadonly<T>>;
+
 declare function defineSdkComponents(engine: PreEngine): {
     Transform: ComponentDefinition<ISchema<TransformType>, Partial<TransformType>>;
     MeshRenderer: ComponentDefinition<ISchema<PBMeshRenderer>, Partial<PBMeshRenderer>>;
@@ -430,6 +454,7 @@ declare function defineSdkComponents(engine: PreEngine): {
     CylinderShape: ComponentDefinition<ISchema<PBCylinderShape>, PBCylinderShape>;
     GLTFShape: ComponentDefinition<ISchema<PBGLTFShape>, PBGLTFShape>;
     Material: ComponentDefinition<ISchema<PBMaterial>, PBMaterial>;
+    MeshCollider: ComponentDefinition<ISchema<PBMeshCollider>, PBMeshCollider>;
     NFTShape: ComponentDefinition<ISchema<PBNFTShape>, PBNFTShape>;
     OnPointerDown: ComponentDefinition<ISchema<PBOnPointerDown>, PBOnPointerDown>;
     OnPointerDownResult: ComponentDefinition<ISchema<PBOnPointerDownResult>, PBOnPointerDownResult>;
@@ -566,7 +591,7 @@ declare type IEngine = {
      *
      * ```
      */
-    defineComponent<T extends Spec, ConstructorType = Partial<Result<T>>>(spec: Spec, componentId: number, constructorDefault?: Partial<Result<T>>): ComponentDefinition<ISchema<Result<T>>, ConstructorType>;
+    defineComponent<T extends Spec, ConstructorType = Partial<Result<T>>>(spec: T, componentId: number, constructorDefault?: Partial<Result<T>>): ComponentDefinition<ISchema<Result<T>>, ConstructorType>;
     /**
      * Define a component and add it to the engine.
      * @param spec An object with schema fields
@@ -601,7 +626,7 @@ declare type IEngine = {
      * }
      * ```
      */
-    getEntitiesWith<T extends [ComponentDefinition, ...ComponentDefinition[]]>(...components: T): Iterable<[Entity, ...DeepReadonly<ComponentSchema<T>>]>;
+    getEntitiesWith<T extends [ComponentDefinition, ...ComponentDefinition[]]>(...components: T): Iterable<[Entity, ...ReadonlyComponentSchema<T>]>;
     baseComponents: SdkComponents;
 };
 
@@ -697,7 +722,7 @@ declare namespace Matrix {
         _isIdentity3x2Dirty: boolean;
         _m: Matrix4x4;
     };
-    type ReadonlyMatrix = DeepReadonly<MutableMatrix>;
+    type ReadonlyMatrix = DeepReadonly_2<MutableMatrix>;
     /**
      * Gets the internal data of the matrix
      */
@@ -1380,6 +1405,9 @@ declare namespace Matrix {
     function toggleProjectionMatrixHandInPlace(self: MutableMatrix): void;
 }
 
+/** @public */
+declare const MeshCollider: ComponentDefinition<ISchema<PBMeshCollider>, PBMeshCollider>;
+
 /** @public */
 declare const MeshRenderer: ComponentDefinition<ISchema<PBMeshRenderer>, Partial<PBMeshRenderer>>;
 
@@ -1462,17 +1490,30 @@ declare interface PBAvatarModifierArea {
 
 declare interface PBAvatarShape {
     id: string;
+    /** default = NPC */
     name?: string | undefined;
+    /** default = urn:decentraland:off-chain:base-avatars:BaseFemale */
     bodyShape?: string | undefined;
+    /** default = Color3(R = 0.6f, G = 0.462f, B = 0.356f) */
     skinColor?: Color3 | undefined;
+    /** default = Color3(R = 0.283f, G = 0.142f, B = 0f) */
     hairColor?: Color3 | undefined;
+    /** default = Color3(R = 0.6f, G = 0.462f, B = 0.356f) */
     eyeColor?: Color3 | undefined;
-    wearables: string[];
     expressionTriggerId?: string | undefined;
+    /** default = timestamp */
     expressionTriggerTimestamp?: number | undefined;
-    stickerTriggerId?: string | undefined;
-    stickerTriggerTimestamp?: number | undefined;
     talking?: boolean | undefined;
+    /**
+     * 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"]
+     */
+    wearables: string[];
 }
 
 declare interface PBBillboard {
@@ -1569,6 +1610,31 @@ declare interface PBMaterial_Texture {
     filterMode?: FilterMode | undefined;
 }
 
+declare interface PBMeshCollider {
+    /** default = ColliderLayer.Physics | ColliderLayer.Pointer */
+    collisionMask?: number | undefined;
+    box: PBMeshCollider_BoxMesh | undefined;
+    sphere: PBMeshCollider_SphereMesh | undefined;
+    cylinder: PBMeshCollider_CylinderMesh | undefined;
+    plane: PBMeshCollider_PlaneMesh | undefined;
+}
+
+declare interface PBMeshCollider_BoxMesh {
+}
+
+declare interface PBMeshCollider_CylinderMesh {
+    /** default=1.0 */
+    radiusTop?: number | undefined;
+    /** default=1.0 */
+    radiusBottom?: number | undefined;
+}
+
+declare interface PBMeshCollider_PlaneMesh {
+}
+
+declare interface PBMeshCollider_SphereMesh {
+}
+
 declare interface PBMeshRenderer {
     box: PBMeshRenderer_BoxMesh | undefined;
     sphere: PBMeshRenderer_SphereMesh | undefined;
@@ -1736,7 +1802,7 @@ declare namespace Plane {
          */
         d: number;
     };
-    type ReadonlyPlane = DeepReadonly<MutablePlane>;
+    type ReadonlyPlane = DeepReadonly_2<MutablePlane>;
     /**
      * Creates a Plane object according to the given floats a, b, c, d and the plane equation : ax + by + cz + d = 0
      * @param a - a component of the plane
@@ -1856,7 +1922,7 @@ declare function preEngine(): {
     removeSystem: (selector: string | Update) => boolean;
     defineComponent: <T extends Spec, ConstructorType = Partial<Result<T>>>(spec: T, componentId: number, constructorDefault?: ConstructorType | undefined) => ComponentDefinition<ISchema<Result<T>>, ConstructorType>;
     defineComponentFromSchema: <T_1 extends ISchema<any>, ConstructorType_1 = EcsResult<T_1>>(spec: T_1, componentId: number, constructorDefault?: ConstructorType_1 | undefined) => ComponentDefinition<T_1, ConstructorType_1>;
-    getEntitiesWith: <T_2 extends [ComponentDefinition<ISchema<any>, any>, ...ComponentDefinition<ISchema<any>, any>[]]>(...components: T_2) => Iterable<[Entity, ...DeepReadonly<ComponentSchema<T_2>>]>;
+    getEntitiesWith: <T_2 extends [ComponentDefinition<ISchema<any>, any>, ...ComponentDefinition<ISchema<any>, any>[]]>(...components: T_2) => Iterable<[Entity, ...ReadonlyComponentSchema<T_2>]>;
     getComponent: <T_3 extends ISchema<any>>(componentId: number) => ComponentDefinition<T_3, EcsResult<T_3>>;
     removeComponentDefinition: (componentId: number) => void;
 };
@@ -1877,7 +1943,7 @@ declare namespace Quaternion {
     /**
      * @public
      */
-    export type ReadonlyQuaternion = DeepReadonly<MutableQuaternion>;
+    export type ReadonlyQuaternion = DeepReadonly_2<MutableQuaternion>;
     /**
      * Creates a new Quaternion from the given floats
      * @param x - defines the first component (0 by default)
@@ -2031,6 +2097,18 @@ declare namespace Quaternion {
  */
 declare const RAD2DEG: number;
 
+/**
+ * @public
+ */
+declare type ReadonlyComponentSchema<T extends [ComponentDefinition, ...ComponentDefinition[]]> = {
+    [K in keyof T]: T[K] extends ComponentDefinition ? ReturnType<T[K]['get']> : never;
+};
+
+/**
+ * @public
+ */
+declare type ReadonlyPrimitive = number | string | number[] | string[] | boolean | boolean[];
+
 declare type ReceiveMessage = {
     type: WireMessage.Enum;
     entity: Entity;
@@ -2195,7 +2273,7 @@ declare namespace Vector3 {
     /**
      * @public
      */
-    export type ReadonlyVector3 = DeepReadonly<MutableVector3>;
+    export type ReadonlyVector3 = DeepReadonly_2<MutableVector3>;
     /**
      * Creates a new Vector3 object from the given x, y, z (floats) coordinates.
      * @param x - defines the first coordinates (on X axis)