Cleaned object dispose for 3d scene

cvdlab · Oct 24, 2016 · ab78a73 · ab78a73
1 parent 5907ac2
commit ab78a73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 87 deletions.
diff --git a/src/components/viewer3d/scene-creator.js b/src/components/viewer3d/scene-creator.js
@@ -1,6 +1,7 @@
 import Three from 'three';
 import createGrid from './grid-creator';
 import convert from 'convert-units';
+import {disposeObject} from './three-memory-cleaner';
 
 export function parseData(sceneData, editingActions, catalog) {
 
@@ -261,33 +262,7 @@ function replaceLine(layer, oldLineObject, newLineData, editingActions, planData
 
   planData.plan.remove(oldLineObject);
 
-  oldLineObject.traverse(function (child) {
-    if (child instanceof Three.Mesh || child instanceof Three.BoxHelper) {
-
-      child.geometry.dispose();
-
-      let material = child.material;
-
-      if (material instanceof Three.MultiMaterial) {
-        material.materials.forEach(childMaterial => {
-          let childTexture = childMaterial.map;
-          if (childTexture) {
-            childTexture.dispose();
-          }
-
-          childMaterial.dispose();
-        });
-      } else {
-        let texture = child.material.map;
-        // Save memory for the renderer
-        if (texture) {
-          texture.dispose();
-        }
-        material.dispose();
-      }
-    }
-  });
-
+  disposeObject(oldLineObject);
   oldLineObject = null;
 
   planData.plan.add(newLineObject);
@@ -343,33 +318,7 @@ function replaceArea(layer, oldAreaObject, newAreaData, editingActions, planData
     planData.grid.position.z += oldCenter[2];
 
     planData.plan.remove(oldAreaObject);
-
-    oldAreaObject.traverse(function (child) {
-      if (child instanceof Three.Mesh || child instanceof Three.BoxHelper) {
-
-        child.geometry.dispose();
-
-        let material = child.material;
-
-        if (material instanceof Three.MultiMaterial) {
-          material.materials.forEach(childMaterial => {
-            let childTexture = childMaterial.map;
-            if (childTexture) {
-              childTexture.dispose();
-            }
-
-            childMaterial.dispose();
-          });
-        } else {
-          let texture = child.material.map;
-          // Save memory for the renderer
-          if (texture) {
-            texture.dispose();
-          }
-          material.dispose();
-        }
-      }
-    });
+    disposeObject(oldAreaObject);
 
     planData.plan.add(newAreaObject);
 
@@ -392,7 +341,6 @@ function replaceArea(layer, oldAreaObject, newAreaData, editingActions, planData
     return newAreaObject;
   }
 
-  planData.plan.remove(oldAreaObject);
   return new Three.Object3D();
 
 }
@@ -435,33 +383,7 @@ function createItem(layer, item, editingActions, sceneGraph, catalog, plan, scen
 function replaceItem(layer, oldItemObject, newItemData, editingActions, planData, catalog, scene) {
 
   planData.plan.remove(oldItemObject);
-
-  oldItemObject.traverse(function (child) {
-    if (child instanceof Three.Mesh || child instanceof Three.BoxHelper) {
-
-      child.geometry.dispose();
-
-      let material = child.material;
-
-      if (material instanceof Three.MultiMaterial) {
-        material.materials.forEach(childMaterial => {
-          let childTexture = childMaterial.map;
-          if (childTexture) {
-            childTexture.dispose();
-          }
-
-          childMaterial.dispose();
-        });
-      } else {
-        let texture = child.material.map;
-        // Save memory for the renderer
-        if (texture) {
-          texture.dispose();
-        }
-        material.dispose();
-      }
-    }
-  });
+  disposeObject(oldItemObject);
 
   let item3DPromise = catalog.getElement(newItemData.type).render3D(newItemData, layer, scene);
 

diff --git a/src/components/viewer3d/three-memory-cleaner.js b/src/components/viewer3d/three-memory-cleaner.js
@@ -1,3 +1,5 @@
+import Three from 'three';
+
 function disposeGeometry(geometry) {
   geometry.dispose();
 }
@@ -28,24 +30,23 @@ function disposeMaterial(material) {
   material.dispose();
 }
 
-function disposeMesh(scene3D, mesh) {
+function disposeMesh(mesh) {
   if (!(mesh instanceof Three.Mesh || mesh instanceof Three.BoxHelper)) {
     return;
   }
-  scene3D.remove(mesh);
   disposeGeometry(mesh.geometry);
   disposeMultimaterial(mesh.material);
   disposeMaterial(mesh.material);
 }
 
 export function disposeScene(scene3D) {
   scene3D.traverse(child => {
-    disposeMesh(scene3D, child);
+    disposeMesh(child);
   });
 }
 
-export function disposeObject(scene3D, object) {
+export function disposeObject(object) {
   object.traverse(child => {
-    disposeMesh(scene3D, child);
+    disposeMesh(child);
   });
 }