feat(dispose): add "dispose texture" logic(draft)

update wonder-webgl version
Wonder-Technology · May 20, 2019 · dce7094 · dce7094
1 parent fa10df7
commit dce7094
Show file tree

Hide file tree

Showing 27 changed files with 947 additions and 381 deletions.
diff --git a/package.json b/package.json
@@ -75,11 +75,11 @@
     "wonder-imgui": "^0.0.34",
     "wonder-log": "^0.2.11",
     "wonder-most-animation-frame": "0.0.3",
-    "wonder-webgl": "^0.0.9"
+    "wonder-webgl": "^0.0.10"
   },
   "resolutions": {
     "wonder-log": "^0.2.11",
-    "wonder-webgl": "^0.0.9",
+    "wonder-webgl": "^0.0.10",
     "wonder-commonlib": "0.2.31",
     "wonder-bs-jest": "0.3.0",
     "wonder-bs-puppeteer": "^0.1.6"

diff --git a/src/service/primitive/GameObjectsMapGroupService.re b/src/service/primitive/GameObjectsMapGroupService.re
@@ -0,0 +1,19 @@
+let isGroup = (component, gameObjectsMap) =>
+  switch (GameObjectsMapService.getGameObjects(component, gameObjectsMap)) {
+  | Some(arr) when arr |> Js.Array.length > 0 => true
+  | _ => false
+  };
+
+let removeGameObject = (gameObject, component, gameObjectsMap) =>
+  GameObjectsMapService.removeGameObject(
+    gameObject,
+    component,
+    gameObjectsMap,
+  );
+
+let batchRemoveGameObjects = (gameObjectArr, component, gameObjectsMap) =>
+  GameObjectsMapService.batchRemoveGameObjects(
+    gameObjectArr,
+    component,
+    gameObjectsMap,
+  );
diff --git a/src/service/primitive/GroupService.re b/src/service/primitive/GroupService.re
diff --git a/src/service/primitive/buffer/DisposeTypeArrayService.re b/src/service/primitive/buffer/DisposeTypeArrayService.re
@@ -1,75 +1,72 @@
 let deleteBySwapAndResetFloat32TypeArr =
-  [@bs]
-  (
-    ((sourceIndex, targetIndex), typeArr, length, defaultValueArr) => {
-      open Js.Typed_array;
-      for (i in 0 to length - 1) {
-        Float32Array.unsafe_set(
-          typeArr,
-          sourceIndex + i,
-          Float32Array.unsafe_get(typeArr, targetIndex + i)
-        );
-        Float32Array.unsafe_set(typeArr, targetIndex + i, defaultValueArr[i])
-      };
-      typeArr
-    }
-  );
+  (. (sourceIndex, targetIndex), typeArr, length, defaultValueArr) => {
+    open Js.Typed_array;
+    for (i in 0 to length - 1) {
+      Float32Array.unsafe_set(
+        typeArr,
+        sourceIndex + i,
+        Float32Array.unsafe_get(typeArr, targetIndex + i),
+      );
+      Float32Array.unsafe_set(typeArr, targetIndex + i, defaultValueArr[i]);
+    };
+    typeArr;
+  };
 
 let deleteSingleValueBySwapAndResetFloat32TypeArr =
-  [@bs]
-  (
-    ((sourceIndex, targetIndex), typeArr, length: int, defaultValue) => {
-      open Js.Typed_array;
-      Float32Array.unsafe_set(typeArr, sourceIndex, Float32Array.unsafe_get(typeArr, targetIndex));
-      Float32Array.unsafe_set(typeArr, targetIndex, defaultValue);
-      typeArr
-    }
-  );
+  (. (sourceIndex, targetIndex), typeArr, length: int, defaultValue) => {
+    open Js.Typed_array;
+    Float32Array.unsafe_set(
+      typeArr,
+      sourceIndex,
+      Float32Array.unsafe_get(typeArr, targetIndex),
+    );
+    Float32Array.unsafe_set(typeArr, targetIndex, defaultValue);
+    typeArr;
+  };
 
 let deleteSingleValueBySwapUint32TypeArr = (sourceIndex, lastIndex, typeArr) => {
   open Js.Typed_array;
-  Uint32Array.unsafe_set(typeArr, sourceIndex, Uint32Array.unsafe_get(typeArr, lastIndex));
-  typeArr
+  Uint32Array.unsafe_set(
+    typeArr,
+    sourceIndex,
+    Uint32Array.unsafe_get(typeArr, lastIndex),
+  );
+  typeArr;
 };
 
 let deleteAndResetFloat32TypeArr =
-  [@bs]
-  (
-    (sourceIndex, length, defaultValueArr, typeArr) => {
-      open Js.Typed_array;
-      for (i in 0 to length - 1) {
-        Float32Array.unsafe_set(typeArr, sourceIndex + i, defaultValueArr[i])
-      };
-      typeArr
-    }
-  );
+  (. sourceIndex, length, defaultValueArr, typeArr) => {
+    open Js.Typed_array;
+    for (i in 0 to length - 1) {
+      Float32Array.unsafe_set(typeArr, sourceIndex + i, defaultValueArr[i]);
+    };
+    typeArr;
+  };
 
 let deleteAndResetFloat32 =
-  [@bs]
-  (
-    (sourceIndex, defaultValue, typeArr) => {
-      open Js.Typed_array;
-      Float32Array.unsafe_set(typeArr, sourceIndex, defaultValue);
-      typeArr
-    }
-  );
+  (. sourceIndex, defaultValue, typeArr) => {
+    open Js.Typed_array;
+    Float32Array.unsafe_set(typeArr, sourceIndex, defaultValue);
+    typeArr;
+  };
 
 let deleteAndResetUint32 =
-  [@bs]
-  (
-    (sourceIndex, defaultValue, typeArr) => {
-      open Js.Typed_array;
-      Uint32Array.unsafe_set(typeArr, sourceIndex, defaultValue);
-      typeArr
-    }
-  );
+  (. sourceIndex, defaultValue, typeArr) => {
+    open Js.Typed_array;
+    Uint32Array.unsafe_set(typeArr, sourceIndex, defaultValue);
+    typeArr;
+  };
 
 let deleteAndResetUint8 =
-  [@bs]
-  (
-    (sourceIndex, defaultValue, typeArr) => {
-      open Js.Typed_array;
-      Uint8Array.unsafe_set(typeArr, sourceIndex, defaultValue);
-      typeArr
-    }
-  );
+  (. sourceIndex, defaultValue, typeArr) => {
+    open Js.Typed_array;
+    Uint8Array.unsafe_set(typeArr, sourceIndex, defaultValue);
+    typeArr;
+  };
+
+let deleteAndResetUint16 =
+  (. sourceIndex, defaultValue, typeArr) => {
+    open Js.Typed_array;
+    Uint16Array.unsafe_set(typeArr, sourceIndex, defaultValue);
+    typeArr;
+  };
diff --git a/src/service/primitive/data/MaterialType.re b/src/service/primitive/data/MaterialType.re
@@ -4,4 +4,8 @@ type shaderIndexMap = WonderCommonlib.MutableSparseMapService.t(int);
 
 type colorMap = WonderCommonlib.MutableSparseMapService.t(array(float));
 
-type disposedIndexArray = array(int);
+type disposedIndexArray = array(int);
+
+type materialType =
+  | BasicMaterial
+  | LightMaterial;
diff --git a/src/service/record/main/data/texture/ArrayBufferViewSourceTextureType.re b/src/service/record/main/data/texture/ArrayBufferViewSourceTextureType.re
@@ -11,16 +11,22 @@ type arrayBufferViewSourceTextureRecord = {
   flipYs: Js.Typed_array.Uint8Array.t,
   widths: Js.Typed_array.Uint16Array.t,
   heights: Js.Typed_array.Uint16Array.t,
-  sourceMap: WonderCommonlib.MutableSparseMapService.t(Js.Typed_array.Uint8Array.t),
-  glTextureMap: WonderCommonlib.MutableSparseMapService.t(WonderWebgl.GlType.texture),
+  sourceMap:
+    WonderCommonlib.MutableSparseMapService.t(Js.Typed_array.Uint8Array.t),
+  glTextureMap:
+    WonderCommonlib.MutableSparseMapService.t(WonderWebgl.GlType.texture),
   bindTextureUnitCacheMap: WonderCommonlib.MutableSparseMapService.t(int),
   disposedIndexArray: array(int),
   needAddedSourceArray: array((int, Js.Typed_array.Uint8Array.t)),
   needInitedTextureIndexArray: array(int),
   nameMap: WonderCommonlib.MutableSparseMapService.t(string),
+  materialsMap:
+    WonderCommonlib.MutableSparseMapService.t(
+      array((int, MaterialType.materialType)),
+    ),
 };
 
-external arrayArrayBufferViewSourceToSparseMap :
+external arrayArrayBufferViewSourceToSparseMap:
   array(Js.Typed_array.Uint8Array.t) =>
   WonderCommonlib.MutableSparseMapService.t(Js.Typed_array.Uint8Array.t) =
   "%identity";
diff --git a/src/service/record/main/data/texture/BasicSourceTextureType.re b/src/service/record/main/data/texture/BasicSourceTextureType.re
@@ -11,11 +11,19 @@ type basicSourceTextureRecord = {
   types: Js.Typed_array.Uint8Array.t,
   isNeedUpdates: Js.Typed_array.Uint8Array.t,
   flipYs: Js.Typed_array.Uint8Array.t,
-  sourceMap: WonderCommonlib.MutableSparseMapService.t(WonderWebgl.DomExtendType.imageElement),
-  glTextureMap: WonderCommonlib.MutableSparseMapService.t(WonderWebgl.GlType.texture),
+  sourceMap:
+    WonderCommonlib.MutableSparseMapService.t(
+      WonderWebgl.DomExtendType.imageElement,
+    ),
+  glTextureMap:
+    WonderCommonlib.MutableSparseMapService.t(WonderWebgl.GlType.texture),
   bindTextureUnitCacheMap: WonderCommonlib.MutableSparseMapService.t(int),
   disposedIndexArray: array(int),
   needAddedSourceArray: array((int, WonderWebgl.DomExtendType.imageElement)),
   needInitedTextureIndexArray: array(int),
-  nameMap: WonderCommonlib.MutableSparseMapService.t(string)
+  nameMap: WonderCommonlib.MutableSparseMapService.t(string),
+  materialsMap:
+    WonderCommonlib.MutableSparseMapService.t(
+      array((int, MaterialType.materialType)),
+    ),
 };
diff --git a/src/service/record/main/geometry/GroupGeometryService.re b/src/service/record/main/geometry/GroupGeometryService.re
@@ -1,19 +1,19 @@
 open GeometryType;
 
 let isGroupGeometry = (geometry, record) =>
-  GroupService.isGroup(geometry, record.gameObjectsMap);
+  GameObjectsMapGroupService.isGroup(geometry, record.gameObjectsMap);
 
 let removeGameObject = (gameObject, geometry, {gameObjectsMap} as record) => {
   ...record,
   gameObjectsMap:
-    GroupService.removeGameObject(gameObject, geometry, gameObjectsMap),
+    GameObjectsMapGroupService.removeGameObject(gameObject, geometry, gameObjectsMap),
 };
 
 let batchRemoveGameObjects =
     (gameObjectArr, geometry, {gameObjectsMap} as record) => {
   ...record,
   gameObjectsMap:
-    GroupService.batchRemoveGameObjects(
+    GameObjectsMapGroupService.batchRemoveGameObjects(
       gameObjectArr,
       geometry,
       gameObjectsMap,

diff --git a/src/service/record/main/material/basic/GroupBasicMaterialService.re b/src/service/record/main/material/basic/GroupBasicMaterialService.re
@@ -1,19 +1,19 @@
 open BasicMaterialType;
 
 let isGroupBasicMaterial = (material, record) =>
-  GroupService.isGroup(material, record.gameObjectsMap);
+  GameObjectsMapGroupService.isGroup(material, record.gameObjectsMap);
 
 let removeGameObject = (gameObject, material, {gameObjectsMap} as record) => {
   ...record,
   gameObjectsMap:
-    GroupService.removeGameObject(gameObject, material, gameObjectsMap),
+    GameObjectsMapGroupService.removeGameObject(gameObject, material, gameObjectsMap),
 };
 
 let batchRemoveGameObjects =
     (gameObjectArr, material, {gameObjectsMap} as record) => {
   ...record,
   gameObjectsMap:
-    GroupService.batchRemoveGameObjects(
+    GameObjectsMapGroupService.batchRemoveGameObjects(
       gameObjectArr,
       material,
       gameObjectsMap,

diff --git a/src/service/record/main/material/light/GroupLightMaterialService.re b/src/service/record/main/material/light/GroupLightMaterialService.re
@@ -1,19 +1,19 @@
 open LightMaterialType;
 
 let isGroupLightMaterial = (material, record) =>
-  GroupService.isGroup(material, record.gameObjectsMap);
+  GameObjectsMapGroupService.isGroup(material, record.gameObjectsMap);
 
 let removeGameObject = (gameObject, material, {gameObjectsMap} as record) => {
   ...record,
   gameObjectsMap:
-    GroupService.removeGameObject(gameObject, material, gameObjectsMap),
+    GameObjectsMapGroupService.removeGameObject(gameObject, material, gameObjectsMap),
 };
 
 let batchRemoveGameObjects =
     (gameObjectArr, material, {gameObjectsMap} as record) => {
   ...record,
   gameObjectsMap:
-    GroupService.batchRemoveGameObjects(
+    GameObjectsMapGroupService.batchRemoveGameObjects(
       gameObjectArr,
       material,
       gameObjectsMap,