@dcl/sdk 7.0.0-2536237172.commit-c1aae82 → 7.0.0-2536766001.commit-8116fe1

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

@@ -3,9 +3,10 @@ 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/CylinderShape.proto

@@ -3,9 +3,10 @@
 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/GLTFShape.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+import "common/id.proto";
+option (ecs_component_id) = 1041;
+
+message PBGLTFShape {
+  bool with_collisions = 1;
+  bool is_pointer_blocker = 2;
+  bool visible = 3;
+  string src = 4;
+}

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

@@ -8,6 +8,7 @@ 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,9 +3,11 @@
 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/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,11 +7,13 @@ 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_autoSize = 6;
+  float font_size = 5;
+  bool font_auto_size = 6;
   string h_text_align = 7;
   string v_text_align = 8;
   float width = 9;
@@ -24,10 +26,10 @@ message PBTextShape {
   int32 line_count = 16;
   bool text_wrapping = 17;
   float shadow_blur = 18;
-  float shadow_offsetX = 19;
-  float shadow_offsetY = 20;
+  float shadow_offset_x = 19;
+  float shadow_offset_y = 20;
   float outline_width = 21;
   Color3 shadow_color = 22;
   Color3 outline_color = 23;
   Color3 text_color = 24;
-}
+}

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

@@ -0,0 +1,159 @@
+syntax = "proto3";
+
+import "common/id.proto";
+option (ecs_component_id) = 1050;
+
+enum YGPositionType {
+  YGPositionTypeStatic = 0;
+  YGPositionTypeRelative = 1;
+  YGPositionTypeAbsolute = 2;
+}
+
+enum YGAlign {
+  YGAlignAuto = 0;
+  YGAlignFlexStart = 1;
+  YGAlignCenter = 2;
+  YGAlignFlexEnd = 3;
+  YGAlignStretch = 4;
+  YGAlignBaseline = 5;
+  YGAlignSpaceBetween = 6;
+  YGAlignSpaceAround = 7;
+}
+
+enum YGUnit {
+  YGUnitUndefined = 0;
+  YGUnitPoint = 1;
+  YGUnitPercent = 2;
+  YGUnitAuto = 3;
+}
+
+enum YGDirection {
+  YGDirectionInherit = 0;
+  YGDirectionLTR = 1;
+  YGDirectionRTL = 2;
+}
+
+enum YGFlexDirection {
+  YGFlexDirectionColumn = 0;
+  YGFlexDirectionColumnReverse = 1;
+  YGFlexDirectionRow = 2;
+  YGFlexDirectionRowReverse = 3;
+}
+
+enum YGWrap {
+  YGWrapNoWrap = 0;
+  YGWrapWrap = 1;
+  YGWrapWrapReverse = 2;
+}
+
+enum YGJustify {
+  YGJustifyFlexStart = 0;
+  YGJustifyCenter = 1;
+  YGJustifyFlexEnd = 2;
+  YGJustifySpaceBetween = 3;
+  YGJustifySpaceAround = 4;
+  YGJustifySpaceEvenly = 5;
+}
+
+enum YGOverflow {
+  YGOverflowVisible = 0;
+  YGOverflowHidden = 1;
+  YGOverflowScroll = 2;
+}
+
+enum YGDisplay {
+  YGDisplayFlex = 0;
+  YGDisplayNone = 1;
+}
+
+enum YGEdge {
+  YGEdgeLeft = 0;
+  YGEdgeTop = 1;
+  YGEdgeRight = 2;
+  YGEdgeBottom = 3;
+  YGEdgeStart = 4;
+  YGEdgeEnd = 5;
+  YGEdgeHorizontal = 6;
+  YGEdgeVertical = 7;
+  YGEdgeAll = 8;
+}
+
+message PBUiTransform {
+  YGPositionType position_type = 1;
+
+  YGAlign align_content = 2;
+  YGAlign align_items = 3;
+  YGAlign align_self = 4;
+  YGFlexDirection flex_direction = 5;
+  YGWrap flex_wrap = 6;
+  YGJustify justify_content = 7;
+
+  YGOverflow overflow = 8;
+  YGDisplay display = 9;
+  YGDirection direction = 10;
+
+  float flex = 11;
+
+  YGUnit flex_basis_unit = 13;
+  float flex_basis = 14;
+
+  float flex_grow = 15;
+  float flex_shrink = 16;
+
+  YGUnit width_unit = 17;
+  float width = 18;
+  YGUnit height_unit = 19;
+  float height = 20;
+
+  YGUnit min_width_unit = 21;
+  float min_width = 22;
+  YGUnit min_height_unit = 23;
+  float min_height = 24;
+
+  YGUnit max_width_unit = 31;
+  float max_width = 32;
+  YGUnit max_height_unit = 33;
+  float max_height = 34;
+
+  // non-standard
+  reserved 40; // float aspect_ratio = 40;
+
+  YGUnit position_left_unit = 41;
+  float position_left = 42;
+  YGUnit position_top_unit = 43;
+  float position_top = 44;
+  YGUnit position_right_unit = 45;
+  float position_right = 46;
+  YGUnit position_bottom_unit = 47;
+  float position_bottom = 48;
+
+  // margin
+  YGUnit margin_left_unit = 51;
+  float margin_left = 52;
+  YGUnit margin_top_unit = 53;
+  float margin_top = 54;
+  YGUnit margin_right_unit = 55;
+  float margin_right = 56;
+  YGUnit margin_bottom_unit = 57;
+  float margin_bottom = 58;
+
+  YGUnit padding_left_unit = 61;
+  float padding_left = 62;
+  YGUnit padding_top_unit = 63;
+  float padding_top = 64;
+  YGUnit padding_right_unit = 65;
+  float padding_right = 66;
+  YGUnit padding_bottom_unit = 67;
+  float padding_bottom = 68;
+
+  reserved 71; // YGUnit border_left_unit = 71;
+  float border_left = 72;
+  reserved 73; // YGUnit border_top_unit = 73;
+  float border_top = 74;
+  reserved 75; // YGUnit border_right_unit = 75;
+  float border_right = 76;
+  reserved 77; // YGUnit border_bottom_unit = 77;
+  float border_bottom = 78;
+}
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/sdk",
-  "version": "7.0.0-2536237172.commit-c1aae82",
+  "version": "7.0.0-2536766001.commit-8116fe1",
   "description": "",
   "main": "dist/src/index.js",
   "typings": "dist/index.d.ts",
@@ -27,16 +27,16 @@
     "src/cli/**/*.js"
   ],
   "dependencies": {
-    "@dcl/amd": "6.11.2-2536237172.commit-c1aae82",
-    "@dcl/build-ecs": "6.11.2-2536237172.commit-c1aae82",
-    "@dcl/kernel": "^1.0.0-2392404250.commit-1b886c4",
+    "@dcl/amd": "6.11.2-2536766001.commit-8116fe1",
+    "@dcl/build-ecs": "6.11.2-2536766001.commit-8116fe1",
+    "@dcl/kernel": "^1.0.0-2529763428.commit-f5a0321",
     "@dcl/posix": "^1.0.4",
     "@dcl/schemas": "4.8.0",
-    "@dcl/unity-renderer": "^1.0.35874-20220512094007.commit-bfb5052",
+    "@dcl/unity-renderer": "^1.0.40531-20220621125654.commit-472137e",
     "glob": "^7.1.7",
     "http-proxy-middleware": "^2.0.3",
     "ignore": "^5.1.8"
   },
   "minCliVersion": "3.10.2",
-  "commit": "c1aae82afc48709387dc4692df3f47095a115587"
+  "commit": "8116fe1593238900e3eb334ad835ef19b65892ea"
 }

package/types/ecs7/index.d.ts

@@ -22,9 +22,9 @@ declare type ComponentDefinition<T extends EcsType = EcsType<any>> = {
     has(entity: Entity): boolean;
     getFrom(entity: Entity): DeepReadonly<ComponentType<T>>;
     getOrNull(entity: Entity): DeepReadonly<ComponentType<T>> | null;
-    create(entity: Entity, val: ComponentType<T>): ComponentType<T>;
+    create(entity: Entity, val?: ComponentType<T>): ComponentType<T>;
     mutable(entity: Entity): ComponentType<T>;
-    createOrReplace(entity: Entity, val: ComponentType<T>): ComponentType<T>;
+    createOrReplace(entity: Entity, val?: ComponentType<T>): ComponentType<T>;
     deleteFrom(entity: Entity): ComponentType<T> | null;
     upsertFromBinary(entity: Entity, data: ByteBuffer): ComponentType<T> | null;
     updateFromBinary(entity: Entity, data: ByteBuffer): ComponentType<T> | null;
@@ -189,10 +189,12 @@ declare function defineSdkComponents(engine: Pick<IEngine, 'defineComponent'>):
     AudioStream: ComponentDefinition<EcsType<PBAudioStream>>;
     BoxShape: ComponentDefinition<EcsType<PBBoxShape>>;
     CylinderShape: ComponentDefinition<EcsType<PBCylinderShape>>;
+    GLTFShape: ComponentDefinition<EcsType<PBGLTFShape>>;
     NFTShape: ComponentDefinition<EcsType<PBNFTShape>>;
     PlaneShape: ComponentDefinition<EcsType<PBPlaneShape>>;
     SphereShape: ComponentDefinition<EcsType<PBSphereShape>>;
     TextShape: ComponentDefinition<EcsType<PBTextShape>>;
+    UiTransform: ComponentDefinition<EcsType<PBUiTransform>>;
     Transform: ComponentDefinition<EcsType<Transform>>;
 };
 
@@ -226,6 +228,7 @@ declare const EcsString: EcsType<string>;
 declare type EcsType<T = any> = {
     serialize(value: T, builder: ByteBuffer): void;
     deserialize(reader: ByteBuffer): T;
+    create(): T;
 };
 
 /**
@@ -1114,6 +1117,7 @@ declare interface PBAudioStream {
 declare interface PBBoxShape {
     withCollisions: boolean;
     isPointerBlocker: boolean;
+    /** TODO: should visible be another component? that maybe affects all the entities */
     visible: boolean;
     uvs: number[];
 }
@@ -1121,14 +1125,23 @@ declare interface PBBoxShape {
 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;
 }
 
+declare interface PBGLTFShape {
+    withCollisions: boolean;
+    isPointerBlocker: boolean;
+    visible: boolean;
+    src: string;
+}
+
 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;
@@ -1139,7 +1152,9 @@ declare interface PBNFTShape {
 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[];
 }
 
@@ -1151,6 +1166,7 @@ declare interface PBSphereShape {
 
 declare interface PBTextShape {
     text: string;
+    /** this should be removed */
     visible: boolean;
     font: string;
     opacity: number;
@@ -1176,6 +1192,65 @@ declare interface PBTextShape {
     textColor: Color3 | undefined;
 }
 
+declare interface PBUiTransform {
+    positionType: YGPositionType;
+    alignContent: YGAlign;
+    alignItems: YGAlign;
+    alignSelf: YGAlign;
+    flexDirection: YGFlexDirection;
+    flexWrap: YGWrap;
+    justifyContent: YGJustify;
+    overflow: YGOverflow;
+    display: YGDisplay;
+    direction: YGDirection;
+    flex: number;
+    flexBasisUnit: YGUnit;
+    flexBasis: number;
+    flexGrow: number;
+    flexShrink: number;
+    widthUnit: YGUnit;
+    width: number;
+    heightUnit: YGUnit;
+    height: number;
+    minWidthUnit: YGUnit;
+    minWidth: number;
+    minHeightUnit: YGUnit;
+    minHeight: number;
+    maxWidthUnit: YGUnit;
+    maxWidth: number;
+    maxHeightUnit: YGUnit;
+    maxHeight: number;
+    positionLeftUnit: YGUnit;
+    positionLeft: number;
+    positionTopUnit: YGUnit;
+    positionTop: number;
+    positionRightUnit: YGUnit;
+    positionRight: number;
+    positionBottomUnit: YGUnit;
+    positionBottom: number;
+    /** margin */
+    marginLeftUnit: YGUnit;
+    marginLeft: number;
+    marginTopUnit: YGUnit;
+    marginTop: number;
+    marginRightUnit: YGUnit;
+    marginRight: number;
+    marginBottomUnit: YGUnit;
+    marginBottom: number;
+    paddingLeftUnit: YGUnit;
+    paddingLeft: number;
+    paddingTopUnit: YGUnit;
+    paddingTop: number;
+    paddingRightUnit: YGUnit;
+    paddingRight: number;
+    paddingBottomUnit: YGUnit;
+    paddingBottom: number;
+    borderLeft: number;
+    borderTop: number;
+    borderRight: number;
+    borderBottom: number;
+}
+
 /**
  * Represens a plane by the equation ax + by + cz + d = 0
  * @public
@@ -1744,4 +1819,76 @@ declare namespace Vector3 {
     export function Left(): MutableVector3;
 }
 
+declare enum YGAlign {
+    YGAlignAuto = 0,
+    YGAlignFlexStart = 1,
+    YGAlignCenter = 2,
+    YGAlignFlexEnd = 3,
+    YGAlignStretch = 4,
+    YGAlignBaseline = 5,
+    YGAlignSpaceBetween = 6,
+    YGAlignSpaceAround = 7,
+    UNRECOGNIZED = -1
+}
+
+declare enum YGDirection {
+    YGDirectionInherit = 0,
+    YGDirectionLTR = 1,
+    YGDirectionRTL = 2,
+    UNRECOGNIZED = -1
+}
+
+declare enum YGDisplay {
+    YGDisplayFlex = 0,
+    YGDisplayNone = 1,
+    UNRECOGNIZED = -1
+}
+
+declare enum YGFlexDirection {
+    YGFlexDirectionColumn = 0,
+    YGFlexDirectionColumnReverse = 1,
+    YGFlexDirectionRow = 2,
+    YGFlexDirectionRowReverse = 3,
+    UNRECOGNIZED = -1
+}
+
+declare enum YGJustify {
+    YGJustifyFlexStart = 0,
+    YGJustifyCenter = 1,
+    YGJustifyFlexEnd = 2,
+    YGJustifySpaceBetween = 3,
+    YGJustifySpaceAround = 4,
+    YGJustifySpaceEvenly = 5,
+    UNRECOGNIZED = -1
+}
+
+declare enum YGOverflow {
+    YGOverflowVisible = 0,
+    YGOverflowHidden = 1,
+    YGOverflowScroll = 2,
+    UNRECOGNIZED = -1
+}
+
+declare enum YGPositionType {
+    YGPositionTypeStatic = 0,
+    YGPositionTypeRelative = 1,
+    YGPositionTypeAbsolute = 2,
+    UNRECOGNIZED = -1
+}
+
+declare enum YGUnit {
+    YGUnitUndefined = 0,
+    YGUnitPoint = 1,
+    YGUnitPercent = 2,
+    YGUnitAuto = 3,
+    UNRECOGNIZED = -1
+}
+
+declare enum YGWrap {
+    YGWrapNoWrap = 0,
+    YGWrapWrap = 1,
+    YGWrapWrapReverse = 2,
+    UNRECOGNIZED = -1
+}
+