feat(asset-bundle): add "assemble sab" logic

Wonder-Technology · Apr 18, 2019 · 001a1d8 · 001a1d8
1 parent a92371d
commit 001a1d8
Show file tree

Hide file tree

Showing 19 changed files with 1,242 additions and 440 deletions.
diff --git a/src/asset/assemble/AssembleWholeWDBSystem.re b/src/asset/assemble/AssembleWholeWDBSystem.re
@@ -22,9 +22,10 @@ let _getArrayBuffer = (binBuffer, bufferView, bufferViews: array(bufferView)) =>
 
 let _buildImageArray = (isLoadImage, {images, bufferViews}: wd, binBuffer) => {
   let blobObjectUrlImageArr = [||];
-  let imageUint8ArrayDataMap = WonderCommonlib.MutableSparseMapService.createEmpty();
+  let imageUint8ArrayDataMap =
+    WonderCommonlib.MutableSparseMapService.createEmpty();
 
-  ! isLoadImage ?
+  !isLoadImage ?
     resolve((blobObjectUrlImageArr, imageUint8ArrayDataMap)) :
     (
       images |> OptionService.isJsonSerializedValueNone ?
@@ -89,28 +90,6 @@ let _buildImageArray = (isLoadImage, {images, bufferViews}: wd, binBuffer) => {
      typeArr |> Uint8Array.buffer;
    }; */
 
-let _buildBufferArray = (buffers: array(int), binBuffer) => {
-  WonderLog.Contract.requireCheck(
-    () => {
-      open WonderLog;
-      open Contract;
-      open Operators;
-
-      let bufferLen = buffers |> Js.Array.length;
-      test(
-        Log.buildAssertMessage(
-          ~expect={j|has only one buffer|j},
-          ~actual={j|has $bufferLen|j},
-        ),
-        () =>
-        bufferLen == 1
-      );
-    },
-    IsDebugMainService.getIsDebug(StateDataMain.stateData),
-  );
-
-  [|binBuffer|];
-};
 
 let checkWDB = dataView => {
   WonderLog.Contract.requireCheck(
@@ -160,11 +139,16 @@ let assembleWDBData =
         isLoadImage,
       ),
       state,
-    ) =>
+    ) => {
+  StateDataMainService.setState(StateDataMain.stateData, state) |> ignore;
+
   _buildImageArray(isLoadImage, wd, binBuffer)
   |> then_(imageDataTuple => {
+       let state =
+         StateDataMainService.unsafeGetState(StateDataMain.stateData);
+
        let hasIMGUIFunc =
-         ! OptionService.isJsonSerializedValueNone(wd.scene.imgui);
+         !OptionService.isJsonSerializedValueNone(wd.scene.imgui);
        let state =
          isSetIMGUIFunc && hasIMGUIFunc ?
            state |> SetIMGUIFuncSystem.setIMGUIFunc(wd) : state;
@@ -175,7 +159,7 @@ let assembleWDBData =
          |> BatchOperateWholeSystem.batchOperate(
               wd,
               imageDataTuple,
-              _buildBufferArray(buffers, binBuffer),
+              AssembleWholeWDBUtils. buildBufferArray(buffers, binBuffer),
               (isBindEvent, isActiveCamera),
             );
 
@@ -186,6 +170,7 @@ let assembleWDBData =
        |> resolve;
      })
   |> WonderBsMost.Most.fromPromise;
+};
 
 let assemble = (wdb, configTuple, state) => {
   let (wdFileContent, streamChunk, binBuffer) =

diff --git a/src/asset/assemble/BatchOperateWholeGeometrySystem.re b/src/asset/assemble/BatchOperateWholeGeometrySystem.re
@@ -104,4 +104,76 @@ let getBufferIndex32Data = (componentType, accessorIndex, dataViewArr, wd) =>
     )
     ->Some
   | _ => None
-  };
+  };
+
+let setGeometryData =
+    (
+      geometry,
+      wd,
+      dataViewArr,
+      {position, normal, texCoord, index}: WDType.geometry,
+      state,
+    ) => {
+  let state =
+    VerticesGeometryMainService.setVerticesByTypeArray(
+      geometry,
+      getBufferAttributeData(position, dataViewArr, wd),
+      state,
+    );
+  let state =
+    normal |> OptionService.isJsonSerializedValueNone ?
+      state :
+      NormalsGeometryMainService.setNormalsByTypeArray(
+        geometry,
+        getBufferAttributeData(
+          normal |> OptionService.unsafeGetJsonSerializedValue,
+          dataViewArr,
+          wd,
+        ),
+        state,
+      );
+  let state =
+    texCoord |> OptionService.isJsonSerializedValueNone ?
+      state :
+      TexCoordsGeometryMainService.setTexCoordsByTypeArray(
+        geometry,
+        getBufferAttributeData(
+          texCoord |> OptionService.unsafeGetJsonSerializedValue,
+          dataViewArr,
+          wd,
+        ),
+        state,
+      );
+
+  let componentType = getAccessorComponentType(wd, index);
+  let state =
+    switch (getBufferIndex16Data(componentType, index, dataViewArr, wd)) {
+    | Some(data) =>
+      IndicesGeometryMainService.setIndicesByUint16Array(
+        geometry,
+        data,
+        state,
+      )
+    | None =>
+      switch (getBufferIndex32Data(componentType, index, dataViewArr, wd)) {
+      | Some(data) =>
+        IndicesGeometryMainService.setIndicesByUint32Array(
+          geometry,
+          data,
+          state,
+        )
+      | None =>
+        WonderLog.Log.fatal(
+          WonderLog.Log.buildFatalMessage(
+            ~title="_batchSetGeometryData",
+            ~description={j|unknown componentType: $componentType|j},
+            ~reason="",
+            ~solution={j||j},
+            ~params={j||j},
+          ),
+        )
+      }
+    };
+
+  state;
+};
diff --git a/src/asset/assemble/BatchOperateWholeSystem.re b/src/asset/assemble/BatchOperateWholeSystem.re
@@ -16,96 +16,18 @@ let _batchSetGeometryData =
          geometryData |> OptionService.isJsonSerializedValueNone ?
            state :
            {
-             let {position, normal, texCoord, index}: WDType.geometry =
+             let ({position, normal, texCoord, index}: WDType.geometry) as geometryData =
                geometryData |> OptionService.unsafeGetJsonSerializedValue;
 
              let geometry = Array.unsafe_get(geometryArr, geometryIndex);
 
-             let state =
-               VerticesGeometryMainService.setVerticesByTypeArray(
-                 geometry,
-                 BatchOperateWholeGeometrySystem.getBufferAttributeData(
-                   position,
-                   dataViewArr,
-                   wd,
-                 ),
-                 state,
-               );
-             let state =
-               normal |> OptionService.isJsonSerializedValueNone ?
-                 state :
-                 NormalsGeometryMainService.setNormalsByTypeArray(
-                   geometry,
-                   BatchOperateWholeGeometrySystem.getBufferAttributeData(
-                     normal |> OptionService.unsafeGetJsonSerializedValue,
-                     dataViewArr,
-                     wd,
-                   ),
-                   state,
-                 );
-             let state =
-               texCoord |> OptionService.isJsonSerializedValueNone ?
-                 state :
-                 TexCoordsGeometryMainService.setTexCoordsByTypeArray(
-                   geometry,
-                   BatchOperateWholeGeometrySystem.getBufferAttributeData(
-                     texCoord |> OptionService.unsafeGetJsonSerializedValue,
-                     dataViewArr,
-                     wd,
-                   ),
-                   state,
-                 );
-
-             let componentType =
-               BatchOperateWholeGeometrySystem.getAccessorComponentType(
-                 wd,
-                 index,
-               );
-             let state =
-               switch (
-                 BatchOperateWholeGeometrySystem.getBufferIndex16Data(
-                   componentType,
-                   index,
-                   dataViewArr,
-                   wd,
-                 )
-               ) {
-               | Some(data) =>
-                 IndicesGeometryMainService.setIndicesByUint16Array(
-                   geometry,
-                   data,
-                   state,
-                 )
-               | None =>
-                 switch (
-                   BatchOperateWholeGeometrySystem.getBufferIndex32Data(
-                     componentType,
-                     index,
-                     dataViewArr,
-                     wd,
-                   )
-                 ) {
-                 | Some(data) =>
-                   IndicesGeometryMainService.setIndicesByUint32Array(
-                     geometry,
-                     data,
-                     state,
-                   )
-                 | None =>
-                   WonderLog.Log.fatal(
-                     WonderLog.Log.buildFatalMessage(
-                       ~title="_batchSetGeometryData",
-                       ~description=
-                         {j|unknown componentType: $componentType|j},
-                       ~reason="",
-                       ~solution={j||j},
-                       ~params={j||j},
-                     ),
-                   )
-                 }
-               };
-
-             state;
+             BatchOperateWholeGeometrySystem.setGeometryData(
+               geometry,
+               wd,
+               dataViewArr,
+               geometryData,
+               state,
+             );
            },
        state,
      );
@@ -133,7 +55,7 @@ let _getBatchTextureData =
   ),
 );
 
-let _getBatchAllTypeTextureData =
+let getBatchAllTypeTextureData =
     (lightMaterialArr, basicSourceTextureArr, blobObjectUrlImageArr, wd) =>
   _getBatchTextureData(
     lightMaterialArr,
@@ -234,7 +156,7 @@ let batchOperate =
     );
 
   let basicSourceTextureData =
-    _getBatchAllTypeTextureData(
+    getBatchAllTypeTextureData(
       lightMaterialArr,
       basicSourceTextureArr,
       blobObjectUrlImageArr,

diff --git a/src/asset/assemble/utils/AssembleWholeWDBUtils.re b/src/asset/assemble/utils/AssembleWholeWDBUtils.re
@@ -0,0 +1,22 @@
+let buildBufferArray = (buffers: array(int), binBuffer) => {
+  WonderLog.Contract.requireCheck(
+    () => {
+      open WonderLog;
+      open Contract;
+      open Operators;
+
+      let bufferLen = buffers |> Js.Array.length;
+      test(
+        Log.buildAssertMessage(
+          ~expect={j|has only one buffer|j},
+          ~actual={j|has $bufferLen|j},
+        ),
+        () =>
+        bufferLen == 1
+      );
+    },
+    IsDebugMainService.getIsDebug(StateDataMain.stateData),
+  );
+
+  [|binBuffer|];
+};