scenegraph-node delete() (#1014)

visgl · Mar 31, 2019 · 6c3046a · 6c3046a
1 parent 30301cc
commit 6c3046a
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 3 deletions.
diff --git a/examples/core/gltf/app.js b/examples/core/gltf/app.js
@@ -1,6 +1,6 @@
 /* global document, window */
 import {loadFile, parseFile, registerLoaders} from '@loaders.gl/core';
-import {setParameters, clear, log} from '@luma.gl/core';
+import {setParameters, clear, log, lumaStats} from '@luma.gl/core';
 import {
   createGLTFObjects,
   GLBScenegraphLoader,
@@ -269,6 +269,7 @@ export class DemoApp {
     canvas.ondrop = e => {
       e.preventDefault();
       if (e.dataTransfer.files && e.dataTransfer.files.length === 1) {
+        this._deleteScenes();
         loadGLTF(
           new Promise(resolve => {
             const reader = new window.FileReader();
@@ -314,6 +315,7 @@ export class DemoApp {
       );
 
       modelSelector.onchange = event => {
+        this._deleteScenes();
         loadGLTF(GLTF_BASE_URL + modelSelector.value, this.gl, this.loadOptions).then(result =>
           Object.assign(this, result)
         );
@@ -383,9 +385,19 @@ export class DemoApp {
     (this.gltf.meshes || []).forEach(mesh => delete mesh._mesh);
     (this.gltf.nodes || []).forEach(node => delete node._node);
 
+    this._deleteScenes();
     Object.assign(this, createGLTFObjects(this.gl, this.gltf, this.loadOptions));
   }
 
+  _deleteScenes() {
+    this.scenes.forEach(scene => scene.delete());
+    this.scenes = [];
+
+    lumaStats.get('Resource Counts').forEach(({name, count}) => {
+      log.info(3, `${name}: ${count}`)();
+    });
+  }
+
   applyLight(model) {
     // TODO: only do this when light changes
     model.updateModuleSettings({

diff --git a/modules/addons/src/gltf/create-gltf-model.js b/modules/addons/src/gltf/create-gltf-model.js
@@ -83,7 +83,8 @@ export default function createGLTFModel(gl, options) {
         defines: materialParser.defines,
         parameters: materialParser.parameters,
         vs: addVersionToShader(gl, vs),
-        fs: addVersionToShader(gl, fs)
+        fs: addVersionToShader(gl, fs),
+        generatedTextures: materialParser.generatedTextures
       },
       modelOptions
     )

diff --git a/modules/addons/src/gltf/gltf-environment.js b/modules/addons/src/gltf/gltf-environment.js
@@ -81,4 +81,21 @@ export default class GLTFEnvironment {
 
     return this._BrdfTexture;
   }
+
+  delete() {
+    if (this._DiffuseEnvSampler) {
+      this._DiffuseEnvSampler.delete();
+      this._DiffuseEnvSampler = null;
+    }
+
+    if (this._SpecularEnvSampler) {
+      this._SpecularEnvSampler.delete();
+      this._SpecularEnvSampler = null;
+    }
+
+    if (this._BrdfTexture) {
+      this._BrdfTexture.delete();
+      this._BrdfTexture = null;
+    }
+  }
 }
diff --git a/modules/addons/src/gltf/gltf-material-parser.js b/modules/addons/src/gltf/gltf-material-parser.js
@@ -21,6 +21,7 @@ export default class GLTFMaterialParser {
     };
 
     this.parameters = {};
+    this.generatedTextures = [];
 
     if (imageBasedLightingEnvironment) {
       this.uniforms.u_DiffuseEnvSampler = imageBasedLightingEnvironment.getDiffuseEnvSampler();
@@ -73,6 +74,7 @@ export default class GLTFMaterialParser {
     });
     this.uniforms[name] = texture;
     this.defineIfPresent(define, define);
+    this.generatedTextures.push(texture);
   }
 
   parsePbrMetallicRoughness(pbrMetallicRoughness) {

diff --git a/modules/core/src/scenegraph/nodes/group-node.js b/modules/core/src/scenegraph/nodes/group-node.js
@@ -37,6 +37,12 @@ export default class GroupNode extends ScenegraphNode {
     return this;
   }
 
+  delete() {
+    this.children.forEach(child => child.delete());
+    this.removeAll();
+    super.delete();
+  }
+
   traverse(visitor, {worldMatrix = new Matrix4()} = {}) {
     const modelMatrix = new Matrix4(worldMatrix).multiplyRight(this.matrix);
 

diff --git a/modules/core/src/scenegraph/nodes/model-node.js b/modules/core/src/scenegraph/nodes/model-node.js
@@ -15,6 +15,7 @@ export default class ModelNode extends ScenegraphNode {
       this._setModelNodeProps(props);
     } else {
       this.model = new Model(gl, props);
+      this.generatedTextures = props.generatedTextures;
     }
   }
 
@@ -25,7 +26,15 @@ export default class ModelNode extends ScenegraphNode {
   }
 
   delete() {
-    this.model.delete();
+    if (this.model) {
+      this.model.delete();
+      this.model = null;
+    }
+    if (Array.isArray(this.generatedTextures)) {
+      this.generatedTextures.forEach(texture => texture.delete());
+      this.generatedTextures = null;
+    }
+    // TODO: delete buffers after making sure there are not shared!
   }
 
   // Forward node methods