Improve destroy calls on scaffold viewer and organs renderer.

ABI-Software · May 16, 2019 · e733ca7 · e733ca7
1 parent e7a4f6b
commit e733ca7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/src/modules/ScaffoldViewer.js b/src/modules/ScaffoldViewer.js
@@ -571,6 +571,12 @@ var ScaffoldViewer = function(typeAtStartUp)  {
 		  csg.setMessageFunction(functionIn);
   }
 
+  this.destroy = function() {
+	if (csg)
+	  csg.clear();
+    (require('./RendererModule').RendererModule).prototype.destroy.call( _this );
+  }
+
   /**
    * Initialise the {@link PJP.BodyViewer}, it will create a detached renderer until
    * a display area is passed in as an argument on intialiseRenderer.

diff --git a/src/modules/organsRenderer.js b/src/modules/organsRenderer.js
@@ -883,16 +883,11 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 	  }
 
 	  this.destroy = function() {
-	    if (_this.zincRenderer) {
-	      _this.zincRenderer.dispose();
-	      _this.zincRenderer.getThreeJSRenderer().dispose();
-	      _this.zincRenderer = undefined;
-	    }
 	    if (secondaryRenderer) {
 	      secondaryRenderer.dispose();
 	      secondaryRenderer = null;
 	    }
-	    (require('./BaseModule').BaseModule).prototype.destroy.call( _this );
+	    (require('./RendererModule').RendererModule).prototype.destroy.call( _this );
 	  }
 
 	/**

diff --git a/src/utilities/csg.js b/src/utilities/csg.js
@@ -56,6 +56,7 @@ exports.csg = function(sceneIn, zincRendererIn) {
   var originalGlyphs = undefined;
   var zincRenderer = zincRendererIn;
   var preRenderCallbackId = -1;
+  var _this = this;
 
   var getCentroid = function() {
     if (currentGeometry) {
@@ -404,17 +405,21 @@ exports.csg = function(sceneIn, zincRendererIn) {
 	  }
   }
 
+  this.clear = function() {
+    csgScene.clearAll();
+    if (zincCSG)
+    	zincCSG.terminateWorker();
+    zincCSG = undefined;
+    boxGeometry = undefined;
+    currentGeometry = undefined;
+    if (scene)
+    	scene.removeObject(planeHelper);
+    planeHelper = undefined;
+  }
+
   this.reset = function() {
-	    csgScene.clearAll();
-	    if (zincCSG)
-	    	zincCSG.terminateWorker();
-	    zincCSG = undefined;
-	    boxGeometry = undefined;
-	    currentGeometry = undefined;
-	    if (scene)
-	    	scene.removeObject(planeHelper);
-	    planeHelper = undefined;
-	    createCube(1, 1, 0.0005);
+    _this.clear();
+    createCube(1, 1, 0.0005);
   }
 
   this.updatePlane = function() {