test(unit-integration-test): pass all tests

Wonder-Technology · May 24, 2019 · 33d2053 · 33d2053
1 parent cf480b2
commit 33d2053
Show file tree

Hide file tree

Showing 10 changed files with 186 additions and 167 deletions.
diff --git a/src/asset/assemble/AssembleCommon.re b/src/asset/assemble/AssembleCommon.re
@@ -10,24 +10,4 @@ let addChildrenToParent = (parent, children, (parentMap, childMap)) => (
        parentMap,
      ),
   WonderCommonlib.MutableSparseMapService.set(parent, children, childMap),
-);
-
-let checkNotDisposedBefore = disposedIndexArray =>
-  WonderLog.Contract.requireCheck(
-    () =>
-      WonderLog.(
-        Contract.(
-          Operators.(
-            test(
-              Log.buildAssertMessage(
-                ~expect={j|not disposed before|j},
-                ~actual={j|do|j},
-              ),
-              () =>
-              disposedIndexArray |> Js.Array.length == 0
-            )
-          )
-        )
-      ),
-    IsDebugMainService.getIsDebug(StateDataMain.stateData),
-  );
+);
diff --git a/src/asset/assemble/BatchCreateSystem.re b/src/asset/assemble/BatchCreateSystem.re
@@ -137,10 +137,6 @@ let _batchCreateBasicSourceTexture =
   let basicSourceTextureRecord =
     RecordBasicSourceTextureMainService.getRecord(state);
 
-  AssembleCommon.checkNotDisposedBefore(
-    basicSourceTextureRecord.disposedIndexArray,
-  );
-
   basicSourceTextures
   |> ArrayService.reduceOneParamValidi(
        (. (state, indexArr), _, basicSourceTextureIndex) => {

diff --git a/src/service/primitive/texture/DisposeTextureService.re b/src/service/primitive/texture/DisposeTextureService.re
@@ -1,3 +1,6 @@
+let needDisposeGlTextureMap = (texture, glTextureMap) =>
+  glTextureMap |> WonderCommonlib.MutableSparseMapService.has(texture);
+
 let disposeGlTextureMap = (texture, gl, glTextureMap) =>
   switch (
     glTextureMap |> WonderCommonlib.MutableSparseMapService.get(texture)

diff --git a/src/service/state/main/texture/DisposeTextureMainService.re b/src/service/state/main/texture/DisposeTextureMainService.re
@@ -18,26 +18,30 @@ let disposeBasicSourceTextureGlTextureMap = (texture, state) =>
         };
       } :
       {
-        /* TODO optimize: add gl texture to pool? */
-        let gl =
-          DeviceManagerService.unsafeGetGl(. state.deviceManagerRecord);
-
         let {glTextureMap} as basicSourceTextureRecord =
           RecordBasicSourceTextureMainService.getRecord(state);
 
-        {
-          ...state,
-          basicSourceTextureRecord:
-            Some({
-              ...basicSourceTextureRecord,
-              glTextureMap:
-                DisposeTextureService.disposeGlTextureMap(
-                  texture,
-                  gl,
-                  glTextureMap,
-                ),
-            }),
-        };
+        DisposeTextureService.needDisposeGlTextureMap(texture, glTextureMap) ?
+          {
+            /* TODO optimize: add gl texture to pool? */
+            let gl =
+              DeviceManagerService.unsafeGetGl(. state.deviceManagerRecord);
+
+            {
+              ...state,
+              basicSourceTextureRecord:
+                Some({
+                  ...basicSourceTextureRecord,
+                  glTextureMap:
+                    DisposeTextureService.disposeGlTextureMap(
+                      texture,
+                      gl,
+                      glTextureMap,
+                    ),
+                }),
+            };
+          } :
+          state;
       }
   );
 
@@ -60,27 +64,32 @@ let disposeArrayBufferViewSourceTextureGlTextureMap = (texture, state) =>
       };
     } :
     {
-      /* TODO optimize: add gl texture to pool? */
-      let gl = DeviceManagerService.unsafeGetGl(. state.deviceManagerRecord);
-
       let (
             {glTextureMap}: ArrayBufferViewSourceTextureType.arrayBufferViewSourceTextureRecord
           ) as arrayBufferViewSourceTextureRecord =
         RecordArrayBufferViewSourceTextureMainService.getRecord(state);
 
-      {
-        ...state,
-        arrayBufferViewSourceTextureRecord:
-          Some({
-            ...arrayBufferViewSourceTextureRecord,
-            glTextureMap:
-              DisposeTextureService.disposeGlTextureMap(
-                texture,
-                gl,
-                glTextureMap,
-              ),
-          }),
-      };
+      DisposeTextureService.needDisposeGlTextureMap(texture, glTextureMap) ?
+        {
+          /* TODO optimize: add gl texture to pool? */
+          let gl =
+            DeviceManagerService.unsafeGetGl(. state.deviceManagerRecord);
+
+          {
+            ...state,
+            arrayBufferViewSourceTextureRecord:
+              Some({
+                ...arrayBufferViewSourceTextureRecord,
+                glTextureMap:
+                  DisposeTextureService.disposeGlTextureMap(
+                    texture,
+                    gl,
+                    glTextureMap,
+                  ),
+              }),
+          };
+        } :
+        state;
     };
 
 let disposeNeedAddedSourceArray = (texture, needAddedSourceArray) =>

diff --git a/src/service/state/render/texture/UpdateSourceTextureRenderService.re b/src/service/state/render/texture/UpdateSourceTextureRenderService.re
@@ -105,6 +105,7 @@ let update =
       (allocateSourceToTextureFunc, setFlipYFunc),
     ) => {
   let isSourcePowerOfTwo = _isSourcePowerOfTwo(width, height);
+
   setFlipYFunc(gl, flipY, browserDetectRecord);
 
   gl

diff --git a/src/service/state/render/texture/UpdateTextureRenderService.re b/src/service/state/render/texture/UpdateTextureRenderService.re
@@ -1,64 +1,82 @@
 open StateRenderType;
 
 let _handleUpdateBasicSourceTexture =
-  [@bs]
-  (
+  (.
+    basicSourceTexture,
     (
-      basicSourceTextureInTypeArray,
-      (
-        gl,
-        {basicSourceTextureRecord, arrayBufferViewSourceTextureRecord, browserDetectRecord} as state
-      )
-    ) => {
-      let (basicSourceTextureRecord, browserDetectRecord) =
-        UpdateBasicSourceTextureRenderService.isNeedUpdate(
+      gl,
+      {
+        basicSourceTextureRecord,
+        arrayBufferViewSourceTextureRecord,
+        browserDetectRecord,
+      } as state,
+    ),
+  ) => {
+    let basicSourceTextureInTypeArray = basicSourceTexture;
+
+    let (basicSourceTextureRecord, browserDetectRecord) =
+      UpdateBasicSourceTextureRenderService.isNeedUpdate(
+        basicSourceTextureInTypeArray,
+        basicSourceTextureRecord,
+      ) ?
+        UpdateBasicSourceTextureRenderService.update(
+          gl,
           basicSourceTextureInTypeArray,
-          basicSourceTextureRecord
-        ) ?
-          UpdateBasicSourceTextureRenderService.update(
-            gl,
-            basicSourceTextureInTypeArray,
-            (basicSourceTextureRecord, browserDetectRecord)
-          ) :
-          (basicSourceTextureRecord, browserDetectRecord);
-      state
-    }
-  );
+          (basicSourceTextureRecord, browserDetectRecord),
+        ) :
+        (basicSourceTextureRecord, browserDetectRecord);
+    state;
+  };
 
 let _handleUpdateArrayBufferViewSourceTexture =
-  [@bs]
-  (
+  (.
+    arrayBufferViewTexture,
     (
-      arrayBufferViewTextureInTypeArray,
-      (
-        gl,
-        {basicSourceTextureRecord, arrayBufferViewSourceTextureRecord, browserDetectRecord} as state
-      )
-    ) => {
-      let (arrayBufferViewSourceTextureRecord, browserDetectRecord) =
-        UpdateArrayBufferViewSourceTextureRenderService.isNeedUpdate(
-          arrayBufferViewTextureInTypeArray,
-          arrayBufferViewSourceTextureRecord
-        ) ?
-          UpdateArrayBufferViewSourceTextureRenderService.update(
-            gl,
-            arrayBufferViewTextureInTypeArray,
-            (arrayBufferViewSourceTextureRecord, browserDetectRecord)
-          ) :
-          (arrayBufferViewSourceTextureRecord, browserDetectRecord);
-      state
-    }
-  );
+      gl,
+      {
+        basicSourceTextureRecord,
+        arrayBufferViewSourceTextureRecord,
+        browserDetectRecord,
+      } as state,
+    ),
+  ) => {
+    let arrayBufferViewTextureInTypeArray =
+      IndexSourceTextureService.getArrayBufferViewSourceTextureIndexInTypeArray(
+        arrayBufferViewTexture,
+        arrayBufferViewSourceTextureRecord.textureIndexOffset,
+      );
+
+    let (arrayBufferViewSourceTextureRecord, browserDetectRecord) =
+      UpdateArrayBufferViewSourceTextureRenderService.isNeedUpdate(
+        arrayBufferViewTextureInTypeArray,
+        arrayBufferViewSourceTextureRecord,
+      ) ?
+        UpdateArrayBufferViewSourceTextureRenderService.update(
+          gl,
+          (arrayBufferViewTexture,
+          arrayBufferViewTextureInTypeArray),
+          (arrayBufferViewSourceTextureRecord, browserDetectRecord),
+        ) :
+        (arrayBufferViewSourceTextureRecord, browserDetectRecord);
+    state;
+  };
 
 let handleUpdate =
     (
       gl,
       texture,
-      {basicSourceTextureRecord, arrayBufferViewSourceTextureRecord, browserDetectRecord} as state
+      {
+        basicSourceTextureRecord,
+        arrayBufferViewSourceTextureRecord,
+        browserDetectRecord,
+      } as state,
     ) =>
   IndexSourceTextureService.handleByJudgeSourceTextureIndex(
     texture,
     arrayBufferViewSourceTextureRecord.textureIndexOffset,
     (gl, state),
-    (_handleUpdateBasicSourceTexture, _handleUpdateArrayBufferViewSourceTexture)
+    (
+      _handleUpdateBasicSourceTexture,
+      _handleUpdateArrayBufferViewSourceTexture,
+    ),
   );
diff --git a/.../render/texture/arrayBufferView_source/UpdateArrayBufferViewSourceTextureRenderService.re b/.../render/texture/arrayBufferView_source/UpdateArrayBufferViewSourceTextureRenderService.re
@@ -5,13 +5,13 @@ open RenderArrayBufferViewSourceTextureType;
 open BrowserDetectType;
 
 /* let _setUnpackAlignmentaToOne = [%bs.raw
-  {|
-         function(gl){
+     {|
+            function(gl){
 
-     gl.pixelStorei(gl.UNPACK_ALIGNMENT, 1);
-         }
-         |}
-]; */
+        gl.pixelStorei(gl.UNPACK_ALIGNMENT, 1);
+            }
+            |}
+   ]; */
 
 let _drawTexture =
     (gl, (target, index, source, glFormat, glType), (width, height)) => {
@@ -59,7 +59,7 @@ let _allocateSourceToTexture = (sizeTuple, gl, paramTuple, source) =>
 let update =
     (
       gl,
-      textureInTypeArray,
+      (texture, textureInTypeArray),
       (arrayBufferViewSourceTextureRecord, browserDetectRecord),
     ) => {
   let {
@@ -76,7 +76,8 @@ let update =
     heights,
     setFlipYFunc,
   } = arrayBufferViewSourceTextureRecord;
-  switch (TextureSourceMapService.getSource(textureInTypeArray, sourceMap)) {
+
+  switch (TextureSourceMapService.getSource(texture, sourceMap)) {
   | None => (arrayBufferViewSourceTextureRecord, browserDetectRecord)
   | Some(source) =>
     let width =

diff --git a/test/integration/no_worker/asset/assemble/fixAssembleWDBBug_test.re b/test/integration/no_worker/asset/assemble/fixAssembleWDBBug_test.re
@@ -22,9 +22,16 @@ let _ =
 
     describe("test dispose gameObject before assemble", () =>
       testPromise(
-        "all components should create component from disposedIndexArray when assemble except basicSourceTexture component",
+        "all components should create component from disposedIndexArray when assemble",
         () => {
-          let (state, gameObject1, geometry1, _, _, _) =
+          let (
+            state,
+            gameObject1,
+            geometry1,
+            _,
+            _,
+            (diffuseMap1, specularMap1),
+          ) =
             FrontRenderLightJobTool.prepareGameObjectWithCreatedMap(
               sandbox,
               state^,
@@ -68,7 +75,7 @@ let _ =
                   state,
                 ),
               )
-              |> expect == ([|geometry1|], [|specularMap2 + 1|]);
+              |> expect == ([|geometry1|], [|specularMap1|]);
             },
             state,
           );