Skip to content

Commit 718e522

Browse files
decentraland-botRocioCMstevenwritescodenicoechezanearnshaw
committed
sync: merge main into auth-server (#1392)
* feat: locomotion settings (#1389) * feat: locomotion settings (#1238) * set locomotion settings protocol branch and rebuilt * serialization tests * fix: update @dcl/protocol version * feat: add AudioAnalysis and AvatarLocomotionSettings components to playground-assets API * fix: export empty object in ReactEcs namespace to resolve documentation warning * fix: update snapshot files --------- Co-authored-by: Rocío Mena <rociocmena@gmail.com> * feat: add IA_MODIFIER input action support (#1390) Co-authored-by: Steven Williams <stevenwritescode@gmail.com> * fix: --no-client no longer breaks file-watch hot reload (#1391) * feat: add AudioAnalysis component (#1393) * feat: add AudioAnalysis component definition and tests Port the AudioAnalysis extended component from the experimental branch. The protocol already includes audio_analysis.proto on main — this adds the SDK-side extended component with readIntoView/tryReadIntoView helpers, createAudioAnalysis/createOrReplaceAudioAnalysis convenience methods, and serialization tests. * fix: update playground-assets API review file for AudioAnalysis Add AudioAnalysisComponentDefinitionExtended interface and AudioAnalysisView type to the API surface definition. * rebuild snapshots * rebuild * fix: ignoredDeprecations version * fix: identation * fix: regenerate playground-assets * fix: typescript version for tests --------- Co-authored-by: nearnshaw <earnshaw.nico@gmail.com> Co-authored-by: Nicolas Earnshaw <nearnshaw@decentraland.org> Co-authored-by: Gabriel Diaz <gabrieldiaz31@gmail.com> * build * Update packages/@dcl/playground-assets/etc/playground-assets.api.md Signed-off-by: Gabriel Díaz <git@subsme.slmail.me> * Update snapshots --------- Signed-off-by: Gabriel Díaz <git@subsme.slmail.me> Co-authored-by: Rocío Mena <rociocmena@gmail.com> Co-authored-by: Rocío <69587750+RocioCM@users.noreply.github.com> Co-authored-by: Steven Williams <stevenwritescode@gmail.com> Co-authored-by: Nicolas Echezarreta <nicoecheza@gmail.com> Co-authored-by: nearnshaw <earnshaw.nico@gmail.com> Co-authored-by: Nicolas Earnshaw <nearnshaw@decentraland.org> Co-authored-by: Gabriel Diaz <gabrieldiaz31@gmail.com> Co-authored-by: Gabriel Díaz <git@subsme.slmail.me>
1 parent 8e67b6b commit 718e522

14 files changed

Lines changed: 198 additions & 4 deletions

File tree

‎packages/@dcl/playground-assets/etc/playground-assets.api.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@ export const AvatarEmoteCommand: GrowOnlyValueSetComponentDefinition<PBAvatarEmo
210210
// @public (undocumented)
211211
export const AvatarEquippedData: LastWriteWinElementSetComponentDefinition<PBAvatarEquippedData>;
212212

213+
// @public (undocumented)
214+
export const AvatarLocomotionSettings: LastWriteWinElementSetComponentDefinition<PBAvatarLocomotionSettings>;
215+
213216
// @public (undocumented)
214217
export const AvatarModifierArea: LastWriteWinElementSetComponentDefinition<PBAvatarModifierArea>;
215218

@@ -724,6 +727,7 @@ export const componentDefinitionByName: {
724727
"core::AvatarBase": LwwComponentGetter<LastWriteWinElementSetComponentDefinition<PBAvatarBase>>;
725728
"core::AvatarEmoteCommand": GSetComponentGetter<GrowOnlyValueSetComponentDefinition<PBAvatarEmoteCommand>>;
726729
"core::AvatarEquippedData": LwwComponentGetter<LastWriteWinElementSetComponentDefinition<PBAvatarEquippedData>>;
730+
"core::AvatarLocomotionSettings": LwwComponentGetter<LastWriteWinElementSetComponentDefinition<PBAvatarLocomotionSettings>>;
727731
"core::AvatarModifierArea": LwwComponentGetter<LastWriteWinElementSetComponentDefinition<PBAvatarModifierArea>>;
728732
"core::AvatarShape": LwwComponentGetter<LastWriteWinElementSetComponentDefinition<PBAvatarShape>>;
729733
"core::Billboard": LwwComponentGetter<LastWriteWinElementSetComponentDefinition<PBBillboard>>;
@@ -2604,6 +2608,24 @@ export namespace PBAvatarEquippedData {
26042608
export function encode(message: PBAvatarEquippedData, writer?: _m0.Writer): _m0.Writer;
26052609
}
26062610

2611+
// @public (undocumented)
2612+
export interface PBAvatarLocomotionSettings {
2613+
hardLandingCooldown?: number | undefined;
2614+
jogSpeed?: number | undefined;
2615+
jumpHeight?: number | undefined;
2616+
runJumpHeight?: number | undefined;
2617+
runSpeed?: number | undefined;
2618+
walkSpeed?: number | undefined;
2619+
}
2620+
2621+
// @public (undocumented)
2622+
export namespace PBAvatarLocomotionSettings {
2623+
// (undocumented)
2624+
export function decode(input: _m0.Reader | Uint8Array, length?: number): PBAvatarLocomotionSettings;
2625+
// (undocumented)
2626+
export function encode(message: PBAvatarLocomotionSettings, writer?: _m0.Writer): _m0.Writer;
2627+
}
2628+
26072629
// @public (undocumented)
26082630
export interface PBAvatarModifierArea {
26092631
area: PBVector3 | undefined;

‎packages/@dcl/sdk-commands/src/commands/start/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ export async function main(options: Options) {
126126
const enableWeb3 = options.args['--web3']
127127
const isHub = !!options.args['--hub']
128128
const skipClient = !!options.args['--no-client']
129-
const bevyWeb = !!options.args['--bevy-web'] && !skipClient
130-
const isMobile = options.args['--mobile'] && !skipClient
131-
const explorerAlpha = !options.args['--web-explorer'] && !bevyWeb && !skipClient
129+
const bevyWeb = !!options.args['--bevy-web']
130+
const isMobile = !!options.args['--mobile']
131+
const explorerAlpha = !options.args['--web-explorer'] && !bevyWeb
132132

133133
let hasSmartWearable = false
134134
const workspace = await getValidWorkspace(options.components, workingDirectory)

‎test/snapshots/development-bundles/static-scene.test.ts.crdt‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<<<<<<< HEAD
22
<<<<<<< HEAD
33
<<<<<<< HEAD
4+
<<<<<<< HEAD
45
SCENE_COMPILED_JS_SIZE_PROD=561.4k bytes
56
=======
67
SCENE_COMPILED_JS_SIZE_PROD=502.2k bytes
@@ -13,6 +14,9 @@ SCENE_COMPILED_JS_SIZE_PROD=519.1k bytes
1314
=======
1415
SCENE_COMPILED_JS_SIZE_PROD=551.4k bytes
1516
>>>>>>> 63ddb3f8 (update snapshots)
17+
=======
18+
SCENE_COMPILED_JS_SIZE_PROD=560.3k bytes
19+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))
1620
THE BUNDLE HAS SOURCEMAPS
1721
(start empty vm 0.21.0-3680274614.commit-1808aa1)
1822
OPCODES ~= 0k
@@ -28,6 +32,7 @@ EVAL test/snapshots/development-bundles/static-scene.test.js
2832
<<<<<<< HEAD
2933
<<<<<<< HEAD
3034
<<<<<<< HEAD
35+
<<<<<<< HEAD
3136
<<<<<<< HEAD
3237
OPCODES ~= 66k
3338
MALLOC_COUNT = 16028
@@ -87,6 +92,11 @@ EVAL test/snapshots/development-bundles/static-scene.test.js
8792
MALLOC_COUNT = 16026
8893
ALIVE_OBJS_DELTA ~= 3.15k
8994
>>>>>>> 63ddb3f8 (update snapshots)
95+
=======
96+
OPCODES ~= 58k
97+
MALLOC_COUNT = 16211
98+
ALIVE_OBJS_DELTA ~= 3.19k
99+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))
90100
CALL onStart()
91101
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}
92102
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}
@@ -142,7 +152,7 @@ CALL onUpdate(0)
142152
>>>>>>> 6cbc24b1 (Regenerate CRDT snapshots after merge)
143153
=======
144154
OPCODES ~= 16k
145-
MALLOC_COUNT = 43
155+
MALLOC_COUNT = 41
146156
ALIVE_OBJS_DELTA ~= -0.00k
147157
>>>>>>> 63ddb3f8 (update snapshots)
148158
CALL onUpdate(0.1)
@@ -155,6 +165,7 @@ CALL onUpdate(0.1)
155165
OPCODES ~= 4k
156166
MALLOC_COUNT = -5
157167
ALIVE_OBJS_DELTA ~= 0.00k
168+
<<<<<<< HEAD
158169
MEMORY_USAGE_COUNT ~= 1414.97k bytes
159170
=======
160171
OPCODES ~= 3k
@@ -174,3 +185,6 @@ CALL onUpdate(0.1)
174185
ALIVE_OBJS_DELTA ~= 0.00k
175186
MEMORY_USAGE_COUNT ~= 1387.69k bytes
176187
>>>>>>> 63ddb3f8 (update snapshots)
188+
=======
189+
MEMORY_USAGE_COUNT ~= 1402.81k bytes
190+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))

‎test/snapshots/development-bundles/testing-fw.test.ts.crdt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<<<<<<< HEAD
22
<<<<<<< HEAD
33
<<<<<<< HEAD
4+
<<<<<<< HEAD
45
SCENE_COMPILED_JS_SIZE_PROD=561.9k bytes
56
=======
67
SCENE_COMPILED_JS_SIZE_PROD=502.8k bytes
@@ -11,6 +12,9 @@ SCENE_COMPILED_JS_SIZE_PROD=519.6k bytes
1112
=======
1213
SCENE_COMPILED_JS_SIZE_PROD=551.9k bytes
1314
>>>>>>> 63ddb3f8 (update snapshots)
15+
=======
16+
SCENE_COMPILED_JS_SIZE_PROD=560.8k bytes
17+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))
1418
THE BUNDLE HAS SOURCEMAPS
1519
(start empty vm 0.21.0-3680274614.commit-1808aa1)
1620
OPCODES ~= 0k
@@ -25,6 +29,7 @@ EVAL test/snapshots/development-bundles/testing-fw.test.js
2529
<<<<<<< HEAD
2630
<<<<<<< HEAD
2731
<<<<<<< HEAD
32+
<<<<<<< HEAD
2833
<<<<<<< HEAD
2934
OPCODES ~= 75k
3035
MALLOC_COUNT = 16580
@@ -84,6 +89,11 @@ EVAL test/snapshots/development-bundles/testing-fw.test.js
8489
MALLOC_COUNT = 16262
8590
ALIVE_OBJS_DELTA ~= 3.22k
8691
>>>>>>> 63ddb3f8 (update snapshots)
92+
=======
93+
OPCODES ~= 58k
94+
MALLOC_COUNT = 16447
95+
ALIVE_OBJS_DELTA ~= 3.26k
96+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))
8797
CALL onStart()
8898
LOG: ["Adding one to position.y=0"]
8999
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}
@@ -234,9 +244,13 @@ CALL onUpdate(0.1)
234244
OPCODES ~= 5k
235245
MALLOC_COUNT = -53
236246
ALIVE_OBJS_DELTA ~= -0.01k
247+
<<<<<<< HEAD
237248
<<<<<<< HEAD
238249
MEMORY_USAGE_COUNT ~= 1330.24k bytes
239250
>>>>>>> 6cbc24b1 (Regenerate CRDT snapshots after merge)
240251
=======
241252
MEMORY_USAGE_COUNT ~= 1387.01k bytes
242253
>>>>>>> 63ddb3f8 (update snapshots)
254+
=======
255+
MEMORY_USAGE_COUNT ~= 1402.20k bytes
256+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))

‎test/snapshots/development-bundles/two-way-crdt.test.ts.crdt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<<<<<<< HEAD
22
<<<<<<< HEAD
33
<<<<<<< HEAD
4+
<<<<<<< HEAD
45
SCENE_COMPILED_JS_SIZE_PROD=561.9k bytes
56
=======
67
SCENE_COMPILED_JS_SIZE_PROD=502.8k bytes
@@ -11,6 +12,9 @@ SCENE_COMPILED_JS_SIZE_PROD=519.6k bytes
1112
=======
1213
SCENE_COMPILED_JS_SIZE_PROD=551.9k bytes
1314
>>>>>>> 63ddb3f8 (update snapshots)
15+
=======
16+
SCENE_COMPILED_JS_SIZE_PROD=560.8k bytes
17+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))
1418
THE BUNDLE HAS SOURCEMAPS
1519
(start empty vm 0.21.0-3680274614.commit-1808aa1)
1620
OPCODES ~= 0k
@@ -25,6 +29,7 @@ EVAL test/snapshots/development-bundles/two-way-crdt.test.js
2529
<<<<<<< HEAD
2630
<<<<<<< HEAD
2731
<<<<<<< HEAD
32+
<<<<<<< HEAD
2833
<<<<<<< HEAD
2934
OPCODES ~= 75k
3035
MALLOC_COUNT = 16580
@@ -84,6 +89,11 @@ EVAL test/snapshots/development-bundles/two-way-crdt.test.js
8489
MALLOC_COUNT = 16262
8590
ALIVE_OBJS_DELTA ~= 3.22k
8691
>>>>>>> 63ddb3f8 (update snapshots)
92+
=======
93+
OPCODES ~= 58k
94+
MALLOC_COUNT = 16447
95+
ALIVE_OBJS_DELTA ~= 3.26k
96+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))
8797
CALL onStart()
8898
LOG: ["Adding one to position.y=0"]
8999
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}
@@ -234,9 +244,13 @@ CALL onUpdate(0.1)
234244
OPCODES ~= 5k
235245
MALLOC_COUNT = -53
236246
ALIVE_OBJS_DELTA ~= -0.01k
247+
<<<<<<< HEAD
237248
<<<<<<< HEAD
238249
MEMORY_USAGE_COUNT ~= 1330.24k bytes
239250
>>>>>>> 6cbc24b1 (Regenerate CRDT snapshots after merge)
240251
=======
241252
MEMORY_USAGE_COUNT ~= 1387.02k bytes
242253
>>>>>>> 63ddb3f8 (update snapshots)
254+
=======
255+
MEMORY_USAGE_COUNT ~= 1402.21k bytes
256+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))

‎test/snapshots/production-bundles/append-value-crdt.ts.crdt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<<<<<<< HEAD
22
<<<<<<< HEAD
33
<<<<<<< HEAD
4+
<<<<<<< HEAD
45
SCENE_COMPILED_JS_SIZE_PROD=246.7k bytes
56
=======
67
SCENE_COMPILED_JS_SIZE_PROD=220.7k bytes
@@ -11,6 +12,9 @@ SCENE_COMPILED_JS_SIZE_PROD=228.8k bytes
1112
=======
1213
SCENE_COMPILED_JS_SIZE_PROD=242.4k bytes
1314
>>>>>>> 63ddb3f8 (update snapshots)
15+
=======
16+
SCENE_COMPILED_JS_SIZE_PROD=246.3k bytes
17+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))
1418
(start empty vm 0.21.0-3680274614.commit-1808aa1)
1519
OPCODES ~= 0k
1620
MALLOC_COUNT = 1005
@@ -23,6 +27,7 @@ EVAL test/snapshots/production-bundles/append-value-crdt.js
2327
<<<<<<< HEAD
2428
<<<<<<< HEAD
2529
<<<<<<< HEAD
30+
<<<<<<< HEAD
2631
<<<<<<< HEAD
2732
OPCODES ~= 77k
2833
MALLOC_COUNT = 14904
@@ -50,6 +55,11 @@ CALL onStart()
5055
MALLOC_COUNT = 14611
5156
ALIVE_OBJS_DELTA ~= 3.22k
5257
>>>>>>> 63ddb3f8 (update snapshots)
58+
=======
59+
OPCODES ~= 61k
60+
MALLOC_COUNT = 14789
61+
ALIVE_OBJS_DELTA ~= 3.26k
62+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))
5363
CALL onStart()
5464
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}
5565
OPCODES ~= 8k
@@ -81,8 +91,12 @@ CALL onUpdate(0)
8191
>>>>>>> 6cbc24b1 (Regenerate CRDT snapshots after merge)
8292
=======
8393
OPCODES ~= 17k
94+
<<<<<<< HEAD
8495
MALLOC_COUNT = 93
8596
>>>>>>> 63ddb3f8 (update snapshots)
97+
=======
98+
MALLOC_COUNT = 89
99+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))
86100
ALIVE_OBJS_DELTA ~= 0.03k
87101
CALL onUpdate(0.1)
88102
LOG: ["PointerEventsResult",[{"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},{"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":0,"timestamp":2,"analog":5,"tickNumber":0}]]
@@ -157,5 +171,9 @@ CALL onUpdate(0.1)
157171
OPCODES ~= 14k
158172
MALLOC_COUNT = 31
159173
ALIVE_OBJS_DELTA ~= 0.01k
174+
<<<<<<< HEAD
160175
MEMORY_USAGE_COUNT ~= 1032.30k bytes
161176
>>>>>>> 63ddb3f8 (update snapshots)
177+
=======
178+
MEMORY_USAGE_COUNT ~= 1043.30k bytes
179+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))

‎test/snapshots/production-bundles/billboard.ts.crdt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<<<<<<< HEAD
22
<<<<<<< HEAD
33
<<<<<<< HEAD
4+
<<<<<<< HEAD
45
SCENE_COMPILED_JS_SIZE_PROD=287.5k bytes
56
=======
67
SCENE_COMPILED_JS_SIZE_PROD=253.8k bytes
@@ -11,6 +12,9 @@ SCENE_COMPILED_JS_SIZE_PROD=269.6k bytes
1112
=======
1213
SCENE_COMPILED_JS_SIZE_PROD=283.2k bytes
1314
>>>>>>> 63ddb3f8 (update snapshots)
15+
=======
16+
SCENE_COMPILED_JS_SIZE_PROD=287.1k bytes
17+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))
1418
(start empty vm 0.21.0-3680274614.commit-1808aa1)
1519
OPCODES ~= 0k
1620
MALLOC_COUNT = 1005
@@ -23,6 +27,7 @@ EVAL test/snapshots/production-bundles/billboard.js
2327
<<<<<<< HEAD
2428
<<<<<<< HEAD
2529
<<<<<<< HEAD
30+
<<<<<<< HEAD
2631
<<<<<<< HEAD
2732
OPCODES ~= 79k
2833
MALLOC_COUNT = 17421
@@ -81,6 +86,11 @@ EVAL test/snapshots/production-bundles/billboard.js
8186
MALLOC_COUNT = 17545
8287
ALIVE_OBJS_DELTA ~= 3.80k
8388
>>>>>>> 63ddb3f8 (update snapshots)
89+
=======
90+
OPCODES ~= 71k
91+
MALLOC_COUNT = 17723
92+
ALIVE_OBJS_DELTA ~= 3.84k
93+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))
8494
CALL onStart()
8595
OPCODES ~= 0k
8696
MALLOC_COUNT = 4
@@ -208,5 +218,9 @@ CALL onUpdate(0.1)
208218
OPCODES ~= 11k
209219
MALLOC_COUNT = 0
210220
ALIVE_OBJS_DELTA ~= 0.00k
221+
<<<<<<< HEAD
211222
MEMORY_USAGE_COUNT ~= 1226.63k bytes
212223
>>>>>>> 63ddb3f8 (update snapshots)
224+
=======
225+
MEMORY_USAGE_COUNT ~= 1237.74k bytes
226+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))

‎test/snapshots/production-bundles/cube-deleted.ts.crdt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<<<<<<< HEAD
22
<<<<<<< HEAD
33
<<<<<<< HEAD
4+
<<<<<<< HEAD
45
SCENE_COMPILED_JS_SIZE_PROD=242.9k bytes
56
=======
67
SCENE_COMPILED_JS_SIZE_PROD=216.9k bytes
@@ -11,6 +12,9 @@ SCENE_COMPILED_JS_SIZE_PROD=225k bytes
1112
=======
1213
SCENE_COMPILED_JS_SIZE_PROD=238.6k bytes
1314
>>>>>>> 63ddb3f8 (update snapshots)
15+
=======
16+
SCENE_COMPILED_JS_SIZE_PROD=242.5k bytes
17+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))
1418
(start empty vm 0.21.0-3680274614.commit-1808aa1)
1519
OPCODES ~= 0k
1620
MALLOC_COUNT = 1005
@@ -23,6 +27,7 @@ EVAL test/snapshots/production-bundles/cube-deleted.js
2327
<<<<<<< HEAD
2428
<<<<<<< HEAD
2529
<<<<<<< HEAD
30+
<<<<<<< HEAD
2631
<<<<<<< HEAD
2732
OPCODES ~= 68k
2833
MALLOC_COUNT = 14024
@@ -81,6 +86,11 @@ EVAL test/snapshots/production-bundles/cube-deleted.js
8186
MALLOC_COUNT = 13998
8287
ALIVE_OBJS_DELTA ~= 3.06k
8388
>>>>>>> 63ddb3f8 (update snapshots)
89+
=======
90+
OPCODES ~= 60k
91+
MALLOC_COUNT = 14176
92+
ALIVE_OBJS_DELTA ~= 3.10k
93+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))
8494
CALL onStart()
8595
OPCODES ~= 0k
8696
MALLOC_COUNT = 6
@@ -160,6 +170,7 @@ CALL onUpdate(0.1)
160170
OPCODES ~= 6k
161171
MALLOC_COUNT = 1
162172
ALIVE_OBJS_DELTA ~= 0.00k
173+
<<<<<<< HEAD
163174
MEMORY_USAGE_COUNT ~= 1022.24k bytes
164175
=======
165176
OPCODES ~= 5k
@@ -179,3 +190,6 @@ CALL onUpdate(0.1)
179190
ALIVE_OBJS_DELTA ~= 0.00k
180191
MEMORY_USAGE_COUNT ~= 1000.74k bytes
181192
>>>>>>> 63ddb3f8 (update snapshots)
193+
=======
194+
MEMORY_USAGE_COUNT ~= 1011.86k bytes
195+
>>>>>>> 1828100c (sync: merge main into auth-server (#1392))

0 commit comments

Comments
 (0)