Skip to content

Commit

Permalink
fix update
Browse files Browse the repository at this point in the history
  • Loading branch information
leanmendoza committed Dec 19, 2024
1 parent 759139d commit e5e030c
Show file tree
Hide file tree
Showing 21 changed files with 435 additions and 194 deletions.
394 changes: 303 additions & 91 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bugs": "https://github.com/decentraland/js-sdk-toolchain/issues",
"dependencies": {
"@actions/core": "^1.10.0",
"@dcl/protocol": "1.0.0-11858567019.commit-f8ad8ea",
"@dcl/protocol": "1.0.0-12415236132.commit-53e881e",
"@dcl/quickjs-emscripten": "^0.21.0-3680274614.commit-1808aa1",
"@dcl/ts-proto": "1.153.0",
"@types/fs-extra": "^9.0.12",
Expand Down
29 changes: 29 additions & 0 deletions packages/@dcl/playground-assets/etc/playground-assets.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -3126,6 +3126,9 @@ export interface PBTween {
} | {
$case: "scale";
scale: Scale;
} | {
$case: "textureMove";
textureMove: TextureMove;
} | undefined;
playing?: boolean | undefined;
}
Expand Down Expand Up @@ -3412,6 +3415,7 @@ export interface PBUiTransform {
// (undocumented)
width: number;
widthUnit: YGUnit;
zIndex?: number | undefined;
}

// @public (undocumented)
Expand Down Expand Up @@ -4256,6 +4260,30 @@ export interface TextureHelper {
// @public
export type TextureMode = 'nine-slices' | 'center' | 'stretch';

// @public (undocumented)
export interface TextureMove {
// (undocumented)
end: PBVector2 | undefined;
movementType?: TextureMovementType | undefined;
// (undocumented)
start: PBVector2 | undefined;
}

// @public (undocumented)
export namespace TextureMove {
// (undocumented)
export function decode(input: _m0.Reader | Uint8Array, length?: number): TextureMove;
// (undocumented)
export function encode(message: TextureMove, writer?: _m0.Writer): _m0.Writer;
}

// @public (undocumented)
export const enum TextureMovementType {
TMT_OFFSET = 0,
// (undocumented)
TMT_TILING = 1
}

// @public (undocumented)
export interface TextureUnion {
// (undocumented)
Expand Down Expand Up @@ -4581,6 +4609,7 @@ export interface UiTransformProps {
scrollPosition?: PBVector2 | string;
scrollVisible?: ScrollVisibleType;
width?: PositionUnit | 'auto';
zIndex?: number;
}

// @public (undocumented)
Expand Down
7 changes: 5 additions & 2 deletions packages/@dcl/react-ecs/src/components/uiTransform/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ const defaultUiTransform: PBUiTransform = {
widthUnit: YGUnit.YGU_AUTO,
heightUnit: YGUnit.YGU_UNDEFINED,
pointerFilter: PointerFilterMode.PFM_NONE,
opacity: 1
opacity: 1,
zIndex: 0
}

/**
Expand All @@ -99,6 +100,7 @@ export function parseUiTransform(props: UiTransformProps = {}): PBUiTransform {
alignItems,
alignContent,
flexWrap,
zIndex,
...otherProps
} = props

Expand Down Expand Up @@ -126,6 +128,7 @@ export function parseUiTransform(props: UiTransformProps = {}): PBUiTransform {
...(alignItems && getAlign('alignItems', alignItems)),
...(flexWrap && getFlexWrap(flexWrap)),
...(scrollPosition && getScrollPosition(scrollPosition)),
...(scrollVisible && getScrollVisible(scrollVisible))
...(scrollVisible && getScrollVisible(scrollVisible)),
...(zIndex && { zIndex })
}
}
2 changes: 2 additions & 0 deletions packages/@dcl/react-ecs/src/components/uiTransform/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,6 @@ export interface UiTransformProps {
scrollPosition?: Vector2 | string
/** default ShowScrollBar.SSB_BOTH */
scrollVisible?: ScrollVisibleType
/** default 0 */
zIndex?: number
}
20 changes: 10 additions & 10 deletions packages/@dcl/sdk-commands/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/@dcl/sdk-commands/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@dcl/inspector": "file:../inspector",
"@dcl/linker-dapp": "^0.14.2",
"@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be",
"@dcl/protocol": "1.0.0-11858567019.commit-f8ad8ea",
"@dcl/protocol": "1.0.0-12415236132.commit-53e881e",
"@dcl/quests-client": "^1.0.3",
"@dcl/quests-manager": "^0.1.4",
"@dcl/rpc": "^1.1.1",
Expand Down Expand Up @@ -58,7 +58,7 @@
"license": "Apache-2.0",
"minCliVersion": "3.14.1",
"overrides": {
"@dcl/protocol": "1.0.0-11858567019.commit-f8ad8ea"
"@dcl/protocol": "1.0.0-12415236132.commit-53e881e"
},
"repository": {
"url": "git+https://github.com/decentraland/js-sdk-toolchain",
Expand Down
3 changes: 2 additions & 1 deletion test/ecs/components/UiComponent.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ describe('UiTransform component', () => {
opacity: 1.0,
scrollPosition: undefined,
scrollVisible: undefined,
elementId: undefined
elementId: undefined,
zIndex: undefined
})
})
})
10 changes: 5 additions & 5 deletions test/snapshots/development-bundles/static-scene.test.ts.crdt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SCENE_COMPILED_JS_SIZE_PROD=453.4k bytes
SCENE_COMPILED_JS_SIZE_PROD=492.6k bytes
THE BUNDLE HAS SOURCEMAPS
(start empty vm 0.21.0-3680274614.commit-1808aa1)
OPCODES ~= 0k
Expand All @@ -10,9 +10,9 @@ EVAL test/snapshots/development-bundles/static-scene.test.js
REQUIRE: ~system/Testing
REQUIRE: ~system/EngineApi
REQUIRE: ~system/EngineApi
OPCODES ~= 54k
MALLOC_COUNT = 13673
ALIVE_OBJS_DELTA ~= 2.70k
OPCODES ~= 57k
MALLOC_COUNT = 14515
ALIVE_OBJS_DELTA ~= 2.88k
CALL onStart()
main.crdt: PUT_COMPONENT e=0x200 c=1 t=0 data={"position":{"x":5.880000114440918,"y":2.7916901111602783,"z":7.380000114440918},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1,"y":1,"z":1},"parent":0}
main.crdt: PUT_COMPONENT e=0x202 c=1 t=0 data={"position":{"x":4,"y":0.800000011920929,"z":8},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1,"y":1,"z":1},"parent":0}
Expand Down Expand Up @@ -56,4 +56,4 @@ CALL onUpdate(0.1)
OPCODES ~= 3k
MALLOC_COUNT = -5
ALIVE_OBJS_DELTA ~= 0.00k
MEMORY_USAGE_COUNT ~= 1194.77k bytes
MEMORY_USAGE_COUNT ~= 1265.12k bytes
13 changes: 5 additions & 8 deletions test/snapshots/development-bundles/testing-fw.test.ts.crdt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SCENE_COMPILED_JS_SIZE_PROD=453.9k bytes
SCENE_COMPILED_JS_SIZE_PROD=493k bytes
THE BUNDLE HAS SOURCEMAPS
(start empty vm 0.21.0-3680274614.commit-1808aa1)
OPCODES ~= 0k
Expand All @@ -10,9 +10,9 @@ EVAL test/snapshots/development-bundles/testing-fw.test.js
REQUIRE: ~system/Testing
REQUIRE: ~system/EngineApi
REQUIRE: ~system/EngineApi
OPCODES ~= 63k
MALLOC_COUNT = 14194
ALIVE_OBJS_DELTA ~= 2.85k
OPCODES ~= 66k
MALLOC_COUNT = 15030
ALIVE_OBJS_DELTA ~= 3.03k
CALL onStart()
LOG: ["Adding one to position.y=0"]
Renderer: PUT_COMPONENT e=0x0 c=1 t=1 data={"position":{"x":1,"y":0,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":9,"y":9,"z":9},"parent":0}
Expand All @@ -30,7 +30,6 @@ CALL onUpdate(0.1)
LOG: ["🧪 Running test two way communication"]
LOG: ["✅ RootEntity has a transform"]
LOG: ["✅ RootEntity has the correct scale"]
LOG: ["⏱️ yield"]
Scene: PUT_COMPONENT e=0x0 c=1 t=3 data={"position":{"x":1,"y":1,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":9,"y":9,"z":9},"parent":0}
Scene: PUT_COMPONENT e=0x200 c=1 t=1 data={"position":{"x":0,"y":0,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1,"y":1,"z":1},"parent":0}
LOG: ["Adding one to position.y=1"]
Expand All @@ -39,15 +38,13 @@ CALL onUpdate(0.1)
MALLOC_COUNT = 51
ALIVE_OBJS_DELTA ~= 0.01k
CALL onUpdate(0.1)
LOG: ["⏱️ yield"]
Scene: DELETE_COMPONENT e=0x200 c=1 t=2 data=null
Scene: DELETE_COMPONENT e=0x0 c=1 t=5 data=null
Scene: DELETE_ENTITY e=0x200
OPCODES ~= 8k
MALLOC_COUNT = -46
ALIVE_OBJS_DELTA ~= -0.02k
CALL onUpdate(0.1)
LOG: ["⏱️ yield"]
Scene: PUT_COMPONENT e=0x0 c=1 t=6 data={"position":{"x":0,"y":0,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1,"y":1,"z":1},"parent":0}
LOG: ["Adding one to position.y=0"]
Renderer: PUT_COMPONENT e=0x0 c=1 t=7 data={"position":{"x":1,"y":0,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1,"y":1,"z":1},"parent":0}
Expand All @@ -64,4 +61,4 @@ CALL onUpdate(0.1)
OPCODES ~= 5k
MALLOC_COUNT = -40
ALIVE_OBJS_DELTA ~= -0.01k
MEMORY_USAGE_COUNT ~= 1203.39k bytes
MEMORY_USAGE_COUNT ~= 1273.09k bytes
13 changes: 5 additions & 8 deletions test/snapshots/development-bundles/two-way-crdt.test.ts.crdt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SCENE_COMPILED_JS_SIZE_PROD=454k bytes
SCENE_COMPILED_JS_SIZE_PROD=493k bytes
THE BUNDLE HAS SOURCEMAPS
(start empty vm 0.21.0-3680274614.commit-1808aa1)
OPCODES ~= 0k
Expand All @@ -10,9 +10,9 @@ EVAL test/snapshots/development-bundles/two-way-crdt.test.js
REQUIRE: ~system/Testing
REQUIRE: ~system/EngineApi
REQUIRE: ~system/EngineApi
OPCODES ~= 63k
MALLOC_COUNT = 14194
ALIVE_OBJS_DELTA ~= 2.85k
OPCODES ~= 66k
MALLOC_COUNT = 15030
ALIVE_OBJS_DELTA ~= 3.03k
CALL onStart()
LOG: ["Adding one to position.y=0"]
Renderer: PUT_COMPONENT e=0x0 c=1 t=1 data={"position":{"x":1,"y":0,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":9,"y":9,"z":9},"parent":0}
Expand All @@ -30,7 +30,6 @@ CALL onUpdate(0.1)
LOG: ["🧪 Running test two way communication"]
LOG: ["✅ RootEntity has a transform"]
LOG: ["✅ RootEntity has the correct scale"]
LOG: ["⏱️ yield"]
Scene: PUT_COMPONENT e=0x0 c=1 t=3 data={"position":{"x":1,"y":1,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":9,"y":9,"z":9},"parent":0}
Scene: PUT_COMPONENT e=0x200 c=1 t=1 data={"position":{"x":0,"y":0,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1,"y":1,"z":1},"parent":0}
LOG: ["Adding one to position.y=1"]
Expand All @@ -39,15 +38,13 @@ CALL onUpdate(0.1)
MALLOC_COUNT = 51
ALIVE_OBJS_DELTA ~= 0.01k
CALL onUpdate(0.1)
LOG: ["⏱️ yield"]
Scene: DELETE_COMPONENT e=0x200 c=1 t=2 data=null
Scene: DELETE_COMPONENT e=0x0 c=1 t=5 data=null
Scene: DELETE_ENTITY e=0x200
OPCODES ~= 8k
MALLOC_COUNT = -46
ALIVE_OBJS_DELTA ~= -0.02k
CALL onUpdate(0.1)
LOG: ["⏱️ yield"]
Scene: PUT_COMPONENT e=0x0 c=1 t=6 data={"position":{"x":0,"y":0,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1,"y":1,"z":1},"parent":0}
LOG: ["Adding one to position.y=0"]
Renderer: PUT_COMPONENT e=0x0 c=1 t=7 data={"position":{"x":1,"y":0,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1,"y":1,"z":1},"parent":0}
Expand All @@ -64,4 +61,4 @@ CALL onUpdate(0.1)
OPCODES ~= 5k
MALLOC_COUNT = -40
ALIVE_OBJS_DELTA ~= -0.01k
MEMORY_USAGE_COUNT ~= 1203.39k bytes
MEMORY_USAGE_COUNT ~= 1273.10k bytes
4 changes: 2 additions & 2 deletions test/snapshots/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions test/snapshots/production-bundles/append-value-crdt.ts.crdt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SCENE_COMPILED_JS_SIZE_PROD=198.1k bytes
SCENE_COMPILED_JS_SIZE_PROD=216.1k bytes
(start empty vm 0.21.0-3680274614.commit-1808aa1)
OPCODES ~= 0k
MALLOC_COUNT = 1005
Expand All @@ -8,9 +8,9 @@ EVAL test/snapshots/production-bundles/append-value-crdt.js
REQUIRE: long
REQUIRE: ~system/EngineApi
REQUIRE: ~system/EngineApi
OPCODES ~= 65k
MALLOC_COUNT = 12723
ALIVE_OBJS_DELTA ~= 2.84k
OPCODES ~= 69k
MALLOC_COUNT = 13502
ALIVE_OBJS_DELTA ~= 3.02k
CALL onStart()
Renderer: APPEND_VALUE e=0x200 c=1063 t=0 data={"button":0,"hit":{"position":{"x":1,"y":2,"z":3},"globalOrigin":{"x":1,"y":2,"z":3},"direction":{"x":1,"y":2,"z":3},"normalHit":{"x":1,"y":2,"z":3},"length":10,"meshName":"mesh","entityId":512},"state":1,"timestamp":1,"analog":5,"tickNumber":0}
OPCODES ~= 8k
Expand Down Expand Up @@ -55,4 +55,4 @@ CALL onUpdate(0.1)
OPCODES ~= 14k
MALLOC_COUNT = 31
ALIVE_OBJS_DELTA ~= 0.01k
MEMORY_USAGE_COUNT ~= 899.73k bytes
MEMORY_USAGE_COUNT ~= 952.04k bytes
10 changes: 5 additions & 5 deletions test/snapshots/production-bundles/billboard.ts.crdt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SCENE_COMPILED_JS_SIZE_PROD=231.2k bytes
SCENE_COMPILED_JS_SIZE_PROD=249.2k bytes
(start empty vm 0.21.0-3680274614.commit-1808aa1)
OPCODES ~= 0k
MALLOC_COUNT = 1005
Expand All @@ -8,9 +8,9 @@ EVAL test/snapshots/production-bundles/billboard.js
REQUIRE: long
REQUIRE: ~system/EngineApi
REQUIRE: ~system/EngineApi
OPCODES ~= 66k
MALLOC_COUNT = 14836
ALIVE_OBJS_DELTA ~= 3.24k
OPCODES ~= 70k
MALLOC_COUNT = 15620
ALIVE_OBJS_DELTA ~= 3.42k
CALL onStart()
OPCODES ~= 0k
MALLOC_COUNT = 4
Expand Down Expand Up @@ -77,4 +77,4 @@ CALL onUpdate(0.1)
OPCODES ~= 10k
MALLOC_COUNT = 0
ALIVE_OBJS_DELTA ~= 0.00k
MEMORY_USAGE_COUNT ~= 1042.09k bytes
MEMORY_USAGE_COUNT ~= 1104.79k bytes
Loading

0 comments on commit e5e030c

Please sign in to comment.