feat(asset-bundle): fix "assembled sab->gameObject->texture->flipY not equal (generated single sab)sab->gameObject->texture->flipY" bug

yyc-git · yyc-git · commit 4df279d24ee2 · 2019-04-26T11:17:17.000+08:00
description
assembled sab-&gt;gameObject-&gt;texture-&gt;flipY not equal (generated single sab)sab-&gt;gameObject-&gt;texture-&gt;flipY

reason
1.assembled sab-&gt;gameObject-&gt;texture is created new one, not use the dependency rab-&gt;texture!
2.assembled sab-&gt;gameObject-&gt;texture-&gt;flipY is set to be false when create(BatchCreateSystem-&gt;_batchCreateBasicSourceTexture), while the origin-&gt;flipY is true.

solution
1.WDType,GLTFType-&gt;texture data add "flipY"
2.not set flipY to be false when create(BatchCreateSystem-&gt;_batchCreateBasicSourceTexture)
diff --git a/examples/asset_bundle/asset_bundle2/sab1.sab b/examples/asset_bundle/asset_bundle2/sab1.sab
diff --git a/examples/asset_bundle/asset_bundle2/wab1.wab b/examples/asset_bundle/asset_bundle2/wab1.wab
diff --git a/src/asset/assemble/BatchCreateSystem.re b/src/asset/assemble/BatchCreateSystem.re
@@ -141,36 +141,18 @@ let _batchCreateBasicSourceTexture =
     basicSourceTextureRecord.disposedIndexArray,
   );
 
-  let (state, indexArr) =
-    basicSourceTextures
-    |> ArrayService.reduceOneParamValidi(
-         (. (state, indexArr), _, basicSourceTextureIndex) => {
-           let (state, index) =
-             CreateBasicSourceTextureMainService.create(. state);
+  basicSourceTextures
+  |> ArrayService.reduceOneParamValidi(
+       (. (state, indexArr), _, basicSourceTextureIndex) => {
+         let (state, index) =
+           CreateBasicSourceTextureMainService.create(. state);
 
-           Array.unsafe_set(indexArr, basicSourceTextureIndex, index);
+         Array.unsafe_set(indexArr, basicSourceTextureIndex, index);
 
-           (state, indexArr);
-         },
-         (state, [||]),
-       );
-
-  /* let (state, indexArr) =
-     _batchCreateComponent(
-       basicSourceTextures,
-       CreateBasicSourceTextureMainService.create,
-       state,
-     ); */
-
-  let state =
-    indexArr
-    |> WonderCommonlib.ArrayService.reduceOneParam(
-         (. state, index) =>
-           OperateBasicSourceTextureMainService.setFlipY(index, false, state),
-         state,
-       );
-
-  (state, indexArr);
+         (state, indexArr);
+       },
+       (state, [||]),
+     );
 };
 
 let _batchCreateLightComponent = (components, createFunc, state) =>
diff --git a/src/asset/assemble/BatchOperateStreamSystem.re b/src/asset/assemble/BatchOperateStreamSystem.re
@@ -118,7 +118,7 @@ let batchOperate =
     );
 
   let state =
-    BatchSetTextureAllDataSystem.batchSetFormat(
+    BatchSetTextureAllDataSystem.batchSetFormatAndFlipY(
       basicSourceTextureArr,
       basicSourceTextures,
       state,
diff --git a/src/asset/assemble/BatchOperateWholeSystem.re b/src/asset/assemble/BatchOperateWholeSystem.re
@@ -149,7 +149,7 @@ let batchOperate =
     );
 
   let state =
-    BatchSetTextureAllDataSystem.batchSetFormat(
+    BatchSetTextureAllDataSystem.batchSetFormatAndFlipY(
       basicSourceTextureArr,
       basicSourceTextures,
       state,
diff --git a/src/asset/assemble/BatchSetTextureAllDataSystem.re b/src/asset/assemble/BatchSetTextureAllDataSystem.re
@@ -110,15 +110,22 @@ let batchSetBasicSourceTextureData =
        state,
      );
 
-let batchSetFormat = (basicSourceTextureArr, basicSourceTextures, state) =>
+let batchSetFormatAndFlipY =
+    (basicSourceTextureArr, basicSourceTextures, state) =>
   basicSourceTextureArr
   |> ArrayService.reduceOneParamValidi(
-       (. state, basicSourceTexture, index) =>
-         OperateBasicSourceTextureMainService.setFormat(
-           basicSourceTexture,
-           Array.unsafe_get(basicSourceTextures, index).format
-           |> SourceTextureType.formatToUint8,
-           state,
-         ),
+       (. state, basicSourceTexture, index) => {
+         let {format, flipY} = Array.unsafe_get(basicSourceTextures, index);
+
+         state
+         |> OperateBasicSourceTextureMainService.setFormat(
+              basicSourceTexture,
+              format |> SourceTextureType.formatToUint8,
+            )
+         |> OperateBasicSourceTextureMainService.setFlipY(
+              basicSourceTexture,
+              flipY,
+            );
+       },
        state,
      );
diff --git a/src/asset/converter/ConvertGLTFJsonToRecordSystem.re b/src/asset/converter/ConvertGLTFJsonToRecordSystem.re
@@ -81,6 +81,13 @@ let _convertTextures = json =>
              name: json |> optional(field("name", string)),
              sampler: json |> optional(field("sampler", int)),
              source: json |> optional(field("source", int)),
+             extras:
+               json
+               |> optional(
+                    field("extras", json =>
+                      {flipY: json |> field("flipY", bool)}
+                    ),
+                  ),
            }
          ),
        ),
diff --git a/src/asset/converter/ConvertMeshRenderersSystem.re b/src/asset/converter/ConvertMeshRenderersSystem.re
@@ -38,24 +38,27 @@ let convertToMeshRenderers =
       {extras, meshes}: GLTFType.gltf,
     ) =>
   switch (extras) {
-  | None => _convertByMesh(meshes, geometryGameObjectIndices, geometryIndices)
-  | Some({meshRenderers}) =>
-    switch (meshRenderers) {
-    | Some(meshRenderers) when Js.Array.length(meshRenderers) > 0 =>
-      meshRenderers
-      |> WonderCommonlib.ArrayService.reduceOneParami(
-           (. arr, {drawMode, isRender}: GLTFType.meshRenderer, index) =>
-             arr
-             |> ArrayService.push(
-                  Some(
-                    {
-                      drawMode: drawMode |> DrawModeType.uint8ToDrawMode,
-                      isRender,
-                    }: WDType.meshRenderer,
-                  ),
+  | Some({meshRenderers})
+      when
+        meshRenderers
+        |> Js.Option.isSome
+        && meshRenderers
+        |> OptionService.unsafeGet
+        |> Js.Array.length > 0 =>
+    meshRenderers
+    |> OptionService.unsafeGet
+    |> WonderCommonlib.ArrayService.reduceOneParami(
+         (. arr, {drawMode, isRender}: GLTFType.meshRenderer, index) =>
+           arr
+           |> ArrayService.push(
+                Some(
+                  {
+                    drawMode: drawMode |> DrawModeType.uint8ToDrawMode,
+                    isRender,
+                  }: WDType.meshRenderer,
                 ),
-           [||],
-         )
-    | _ => _convertByMesh(meshes, geometryGameObjectIndices, geometryIndices)
-    }
+              ),
+         [||],
+       )
+  | _ => _convertByMesh(meshes, geometryGameObjectIndices, geometryIndices)
   };
diff --git a/src/asset/converter/ConvertTexturesSystem.re b/src/asset/converter/ConvertTexturesSystem.re
@@ -54,7 +54,11 @@ let convertToBasicSourceTextures =
   | Some(textures) =>
     textures
     |> WonderCommonlib.ArrayService.reduceOneParami(
-         (. arr, ({name, source}: GLTFType.texture) as texture, index) =>
+         (.
+           arr,
+           ({name, source, extras}: GLTFType.texture) as texture,
+           index,
+         ) =>
            switch (source) {
            | None => arr
            | Some(source) =>
@@ -88,6 +92,12 @@ let convertToBasicSourceTextures =
 
                      _getFormat(mimeType |> OptionService.unsafeGet);
                    },
+                   /* TODO test */
+                   flipY:
+                     switch (extras) {
+                     | Some({flipY}) => flipY
+                     | None => false
+                     },
                  }: WDType.basicSourceTexture,
                );
 
@@ -163,7 +173,7 @@ let _convertWrap = wrap =>
     }
   };
 
-let convertToSamplers = ({samplers}: GLTFType.gltf) : array(WDType.sampler) =>
+let convertToSamplers = ({samplers}: GLTFType.gltf): array(WDType.sampler) =>
   switch (samplers) {
   | None => [||]
   | Some(samplers) =>
diff --git a/src/asset/data/GLTFType.re b/src/asset/data/GLTFType.re
@@ -144,10 +144,13 @@ type sampler = {
   wrapT: option(int),
 };
 
+type textureExtra = {flipY: bool};
+
 type texture = {
   sampler: option(samplerIndex),
   source: option(imageIndex),
   name: option(string),
+  extras: option(textureExtra),
 };
 
 type textureInfo = {
diff --git a/src/asset/data/GenerateSceneGraphType.re b/src/asset/data/GenerateSceneGraphType.re
@@ -66,6 +66,7 @@ type textureData = {
   name: option(string),
   sampler: int,
   source: int,
+  flipY: bool,
 };
 
 type imageData = {
diff --git a/src/asset/data/WDType.re b/src/asset/data/WDType.re
@@ -146,6 +146,7 @@ type image = {
 type basicSourceTexture = {
   name: string,
   format: SourceTextureType.format,
+  flipY: bool,
 };
 
 type sampler = {
diff --git a/src/asset/generate/EncodeGLBJsonSystem.re b/src/asset/generate/EncodeGLBJsonSystem.re
@@ -472,7 +472,7 @@ let _encodeLightMaterials = materialDataArr => (
 let _encodeTextures = textureDataArr => (
   "textures",
   textureDataArr
-  |> Js.Array.map(({name, sampler, source}: textureData) => {
+  |> Js.Array.map(({name, sampler, source, flipY}: textureData) => {
        let list = [];
 
        let list =
@@ -487,6 +487,10 @@ let _encodeTextures = textureDataArr => (
          ...list,
        ];
 
+       let extraList = [("flipY", flipY |> bool)];
+
+       let list = [("extras", extraList |> object_), ...list];
+
        list |> object_;
      })
   |> jsonArray,
diff --git a/src/asset/generate/material/BuildLightMaterialDiffuseMapSystem.re b/src/asset/generate/material/BuildLightMaterialDiffuseMapSystem.re
@@ -42,7 +42,8 @@ let _addSamplerData = (texture, samplerIndexMap, state, samplerDataArr) => {
 
     (
       samplerIndex,
-      samplerIndexMap |> WonderCommonlib.MutableHashMapService.set(key, samplerIndex),
+      samplerIndexMap
+      |> WonderCommonlib.MutableHashMapService.set(key, samplerIndex),
       samplerDataArr
       |> ArrayService.push(
            {
@@ -300,6 +301,7 @@ let _addTextureData =
          name: NameBasicSourceTextureMainService.getName(texture, state),
          sampler: samplerIndex,
          source: imageIndex,
+         flipY: OperateBasicSourceTextureMainService.getFlipY(texture, state),
        }: GenerateSceneGraphType.textureData,
      );
 
diff --git a/src/asset_bundle/import/assemble/AssembleABSystem.re b/src/asset_bundle/import/assemble/AssembleABSystem.re
@@ -314,7 +314,7 @@ module SAB = {
       );
 
     let state =
-      BatchSetTextureAllDataSystem.batchSetFormat(
+      BatchSetTextureAllDataSystem.batchSetFormatAndFlipY(
         basicSourceTextureArr,
         basicSourceTextures,
         state,
diff --git a/src/service/record/main/data/ScriptAPIType.re b/src/service/record/main/data/ScriptAPIType.re
diff --git a/test/integration/no_worker/asset/convert/convertGLBToWDB_test.re b/test/integration/no_worker/asset/convert/convertGLBToWDB_test.re
@@ -1186,17 +1186,46 @@ let _ =
     });
 
     describe("test basicSourceTextures", () => {
+      describe("test flipY", () => {
+        test("if not has extras, set false", () =>
+          ConvertGLBTool.testResult(
+            sandbox^,
+            GLBTool.buildGLBFilePath("BoxTextured.glb"),
+            (({basicSourceTextures}, binBuffer)) =>
+            basicSourceTextures
+            |> expect
+            == [|ConvertGLBTool.buildBasicSourceTexture(~flipY=false, ())|]
+          )
+        );
+
+        test("else, set from it", () =>
+          ConvertGLBTool.testGLTFResultByGLTF(
+            ~sandbox=sandbox^,
+            ~embeddedGLTFJsonStr=ConvertGLBTool.buildGLTFJsonOfTexture(true),
+            ~state,
+            ~testFunc=
+              ({basicSourceTextures}) =>
+                basicSourceTextures
+                |> expect
+                == [|
+                     ConvertGLBTool.buildBasicSourceTexture(~flipY=true, ()),
+                   |],
+            (),
+          )
+        );
+      });
+
       test("test BoxTextured glb", () =>
         ConvertGLBTool.testResult(
           sandbox^,
           GLBTool.buildGLBFilePath("BoxTextured.glb"),
           (({basicSourceTextures}, binBuffer)) =>
           basicSourceTextures
           |> expect
-          == [|{name: "texture_0", format: SourceTextureType.Rgba}|]
+          == [|ConvertGLBTool.buildBasicSourceTexture(~flipY=false, ())|]
         )
       );
-      test("test basicSourceTextures", () =>
+      test("test AlphaBlendModeTest glb", () =>
         ConvertGLBTool.testResult(
           sandbox^,
           GLBTool.buildGLBFilePath("AlphaBlendModeTest.glb"),
@@ -1206,12 +1235,42 @@ let _ =
           == [|
                ConvertTool.getJsonSerializedNone(),
                ConvertTool.getJsonSerializedNone(),
-               {name: "texture_2", format: SourceTextureType.Rgb},
-               {name: "texture_3", format: SourceTextureType.Rgba},
-               {name: "texture_4", format: SourceTextureType.Rgba},
-               {name: "texture_5", format: SourceTextureType.Rgba},
-               {name: "texture_6", format: SourceTextureType.Rgba},
-               {name: "texture_7", format: SourceTextureType.Rgba},
+               ConvertGLBTool.buildBasicSourceTexture(
+                 ~name="texture_2",
+                 ~format=SourceTextureType.Rgb,
+                 ~flipY=false,
+                 (),
+               ),
+               ConvertGLBTool.buildBasicSourceTexture(
+                 ~name="texture_3",
+                 ~format=SourceTextureType.Rgba,
+                 ~flipY=false,
+                 (),
+               ),
+               ConvertGLBTool.buildBasicSourceTexture(
+                 ~name="texture_4",
+                 ~format=SourceTextureType.Rgba,
+                 ~flipY=false,
+                 (),
+               ),
+               ConvertGLBTool.buildBasicSourceTexture(
+                 ~name="texture_5",
+                 ~format=SourceTextureType.Rgba,
+                 ~flipY=false,
+                 (),
+               ),
+               ConvertGLBTool.buildBasicSourceTexture(
+                 ~name="texture_6",
+                 ~format=SourceTextureType.Rgba,
+                 ~flipY=false,
+                 (),
+               ),
+               ConvertGLBTool.buildBasicSourceTexture(
+                 ~name="texture_7",
+                 ~format=SourceTextureType.Rgba,
+                 ~flipY=false,
+                 (),
+               ),
              |]
         )
       );
diff --git a/test/integration/no_worker/asset/generate/generateSceneGraphByGameObject_test.re b/test/integration/no_worker/asset/generate/generateSceneGraphByGameObject_test.re
diff --git a/test/integration/no_worker/asset/tool/ConvertGLBTool.re b/test/integration/no_worker/asset/tool/ConvertGLBTool.re
diff --git a/test/integration/no_worker/asset_bundle/assemble/assembleSAB_test.re b/test/integration/no_worker/asset_bundle/assemble/assembleSAB_test.re
