Skip to content

Commit 2a4affd

Browse files
yyc-gityyc-git
committed
feat(asset-bundle): fix api->generateSingleRAB, generateSingleSAB: not return state
1 parent 2e14fd1 commit 2a4affd

File tree

10 files changed

+179
-280
lines changed

10 files changed

+179
-280
lines changed

‎src/asset_bundle/single/rab/generate/BuildSingleRABJsonDataSystem.re

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -315,11 +315,11 @@ let _buildGeometryData =
315315
(imageAlignedByteLength, imageBufferViewArr, {geometrys}, state) => {
316316
let imageBufferViewIndex = imageBufferViewArr |> Js.Array.length;
317317

318-
let (state, geometryArr, uint8ArrayArr, bufferViewArr, byteOffset) =
318+
let (geometryArr, uint8ArrayArr, bufferViewArr, byteOffset) =
319319
geometrys
320320
|> WonderCommonlib.ArrayService.reduceOneParam(
321321
(.
322-
(state, geometryArr, uint8ArrayArr, bufferViewArr, byteOffset),
322+
(geometryArr, uint8ArrayArr, bufferViewArr, byteOffset),
323323
geometryComponent,
324324
) => {
325325
let (vertexBufferView, bufferViewArr, byteOffset, uint8ArrayArr) =
@@ -396,7 +396,6 @@ let _buildGeometryData =
396396
);
397397

398398
(
399-
state,
400399
geometryArr
401400
|> ArrayService.push({
402401
name:
@@ -421,11 +420,10 @@ let _buildGeometryData =
421420
byteOffset,
422421
);
423422
},
424-
(state, [||], [||], [||], imageAlignedByteLength),
423+
([||], [||], [||], imageAlignedByteLength),
425424
);
426425

427426
(
428-
state,
429427
geometryArr,
430428
uint8ArrayArr,
431429
bufferViewArr,
@@ -495,7 +493,6 @@ let buildJsonData = (resourceData, state) => {
495493
let (basicMaterialArr, lightMaterialArr) =
496494
_buildMaterialData(textureIndexMap, resourceData, state);
497495
let (
498-
state,
499496
geometryArr,
500497
geometryArrayBufferArr,
501498
geometryBufferViewArr,
@@ -513,7 +510,6 @@ let buildJsonData = (resourceData, state) => {
513510
let scriptAttributeArr = _buildScriptAttributeData(resourceData);
514511

515512
(
516-
state,
517513
(
518514
imageArr,
519515
textureArr,

‎src/asset_bundle/single/rab/generate/GenerateSingleRABSystem.re

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ let generateRAB =
3333

3434
let generateSingleRAB = (resourceData, state) => {
3535
let (
36-
state,
3736
(
3837
imageArr,
3938
textureArr,
@@ -61,16 +60,13 @@ let generateSingleRAB = (resourceData, state) => {
6160
bufferViews: Js.Array.concat(geometryBufferViewArr, imageBufferViewArr),
6261
});
6362

64-
let rab =
65-
generateRAB(
66-
(
67-
(imageBufferViewArr, geometryBufferViewArr),
68-
imageUint8ArrayArr,
69-
geometryUint8ArrayArr,
70-
),
71-
bufferTotalAlignedByteLength,
72-
jsonUint8Array,
73-
);
74-
75-
(state, rab);
63+
generateRAB(
64+
(
65+
(imageBufferViewArr, geometryBufferViewArr),
66+
imageUint8ArrayArr,
67+
geometryUint8ArrayArr,
68+
),
69+
bufferTotalAlignedByteLength,
70+
jsonUint8Array,
71+
);
7672
};

‎src/asset_bundle/single/sab/generate/GenerateSingleSABSystem.re

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ let generateSingleSAB = (sceneGameObject, imageUint8ArrayMap, state) => {
5151
state,
5252
);
5353

54-
(state, ConvertGLBSystem.convertGLBData(gltf, binBuffer));
54+
ConvertGLBSystem.convertGLBData(gltf, binBuffer);
5555
};

‎test/integration/no_worker/asset_bundle/assemble/assembleRAB_test.re

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ let _ =
5353
(),
5454
);
5555

56-
let (state, rab1) =
56+
let rab1 =
5757
GenerateSingleRABSystem.generateSingleRAB(resourceData1, state);
5858

5959
let image2 =
@@ -80,7 +80,7 @@ let _ =
8080
(),
8181
);
8282

83-
let (state, rab2) =
83+
let rab2 =
8484
GenerateSingleRABSystem.generateSingleRAB(resourceData2, state);
8585

8686
GenerateAllABTool.TestWithTwoRAB.generateAllAB((rab1, rab2), state)
@@ -140,7 +140,7 @@ let _ =
140140
(),
141141
);
142142

143-
let (state, rab1) =
143+
let rab1 =
144144
GenerateSingleRABSystem.generateSingleRAB(resourceData1, state);
145145

146146
let image2 =
@@ -170,7 +170,7 @@ let _ =
170170
(),
171171
);
172172

173-
let (state, rab2) =
173+
let rab2 =
174174
GenerateSingleRABSystem.generateSingleRAB(resourceData2, state);
175175

176176
GenerateAllABTool.TestWithTwoRAB.generateAllAB((rab1, rab2), state)
@@ -263,7 +263,7 @@ let _ =
263263
(),
264264
);
265265

266-
let (state, rab1) =
266+
let rab1 =
267267
GenerateSingleRABSystem.generateSingleRAB(resourceData1, state);
268268

269269
GenerateAllABTool.TestWithOneRAB.generateAllAB(rab1, state)
@@ -352,7 +352,7 @@ let _ =
352352
(),
353353
);
354354

355-
let (state, rab1) =
355+
let rab1 =
356356
GenerateSingleRABSystem.generateSingleRAB(resourceData1, state);
357357

358358
GenerateAllABTool.TestWithOneRAB.generateAllAB(rab1, state)
@@ -406,7 +406,7 @@ let _ =
406406
(),
407407
);
408408

409-
let (state, rab1) =
409+
let rab1 =
410410
GenerateSingleRABSystem.generateSingleRAB(resourceData1, state);
411411

412412
GenerateAllABTool.TestWithOneRAB.generateAllAB(rab1, state)
@@ -483,7 +483,7 @@ let _ =
483483
(),
484484
);
485485

486-
let (state, rab1) =
486+
let rab1 =
487487
GenerateSingleRABSystem.generateSingleRAB(resourceData1, state);
488488

489489
GenerateAllABTool.TestWithOneRAB.generateAllAB(rab1, state)
@@ -597,10 +597,10 @@ let _ =
597597
(),
598598
);
599599

600-
let (state, rab1) =
600+
let rab1 =
601601
GenerateSingleRABSystem.generateSingleRAB(resourceData1, state);
602602

603-
let (state, rab2) =
603+
let rab2 =
604604
GenerateSingleRABSystem.generateSingleRAB(resourceData2, state);
605605

606606
GenerateAllABTool.TestWithTwoRAB.generateAllAB((rab1, rab2), state)
@@ -683,7 +683,7 @@ let _ =
683683
(),
684684
);
685685

686-
let (state, rab1) =
686+
let rab1 =
687687
GenerateSingleRABSystem.generateSingleRAB(resourceData1, state);
688688

689689
GenerateAllABTool.TestWithOneRAB.generateAllAB(rab1, state)
@@ -740,7 +740,7 @@ let _ =
740740
(),
741741
);
742742

743-
let (state, rab1) =
743+
let rab1 =
744744
GenerateSingleRABSystem.generateSingleRAB(resourceData1, state);
745745

746746
GenerateAllABTool.TestWithOneRAB.generateAllAB(rab1, state)
@@ -773,10 +773,10 @@ let _ =
773773
let resourceData1 =
774774
GenerateSingleRABTool.ResourceData.buildResourceData();
775775

776-
let (state, rab1) =
776+
let rab1 =
777777
GenerateSingleRABSystem.generateSingleRAB(resourceData1, state^);
778778

779-
GenerateAllABTool.TestWithOneRAB.generateAllAB(rab1, state)
779+
GenerateAllABTool.TestWithOneRAB.generateAllAB(rab1, state^)
780780
|> MostTool.testStream(data => {
781781
let rab1RelativePath =
782782
GenerateAllABTool.TestWithOneRAB.getRabRelativePath();

‎test/integration/no_worker/asset_bundle/assemble/assembleSAB_test.re

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ let _ =
5353
(),
5454
);
5555

56-
let (state, rab1) =
56+
let (rab1) =
5757
GenerateSingleRABSystem.generateSingleRAB(resourceData1, state);
5858

5959
let (state, gameObject2, transform2, (material2, texture2)) =
@@ -71,7 +71,7 @@ let _ =
7171
let (canvas, context, (base64Str1, base64Str2)) =
7272
GenerateSceneGraphSystemTool.prepareCanvas(sandbox);
7373

74-
let (state, sab1) =
74+
let (sab1) =
7575
GenerateSingleSABSystem.generateSingleSAB(
7676
SceneAPI.getSceneGameObject(state),
7777
WonderCommonlib.MutableSparseMapService.createEmpty(),
@@ -150,7 +150,7 @@ let _ =
150150
(),
151151
);
152152

153-
let (state, rab1) =
153+
let (rab1) =
154154
GenerateSingleRABSystem.generateSingleRAB(resourceData1, state);
155155

156156
let (state, gameObject2, transform2, (material2, texture2)) =
@@ -176,7 +176,7 @@ let _ =
176176
let (canvas, context, (base64Str1, base64Str2)) =
177177
GenerateSceneGraphSystemTool.prepareCanvas(sandbox);
178178

179-
let (state, sab1) =
179+
let (sab1) =
180180
GenerateSingleSABSystem.generateSingleSAB(
181181
SceneAPI.getSceneGameObject(state),
182182
WonderCommonlib.MutableSparseMapService.createEmpty(),
@@ -245,7 +245,7 @@ let _ =
245245
(),
246246
);
247247

248-
let (state, rab1) =
248+
let (rab1) =
249249
GenerateSingleRABSystem.generateSingleRAB(resourceData1, state);
250250

251251
let gameObject2Name = "gameObject2";
@@ -292,7 +292,7 @@ let _ =
292292
|> SceneAPI.addSceneChild(transform2)
293293
|> SceneAPI.addSceneChild(transform3);
294294

295-
let (state, sab1) =
295+
let (sab1) =
296296
GenerateSingleSABSystem.generateSingleSAB(
297297
SceneAPI.getSceneGameObject(state),
298298
WonderCommonlib.MutableSparseMapService.createEmpty(),

0 commit comments

Comments
 (0)