zincjs 1.3.0 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zincjs",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "ZincJS (Web-based-Zinc-Visualisation)",
   "main": "build/zinc.js",
   "directories": {
@@ -60,7 +60,7 @@
     "lodash": "^4.17.19",
     "promise-polyfill": "^8.1.3",
     "three": "^0.130.1",
-    "three-spritetext": "^1.6.2",
+    "three-spritetext": "1.6.2",
     "url-loader": "^2.1.0",
     "url-polyfill": "^1.1.7",
     "webworkify-webpack": "^2.1.5"

package/src/controls.js

@@ -71,6 +71,7 @@ const CameraControls = function ( object, domElement, renderer, scene ) {
 	this.directionalLight = 0;
 	this.scrollRate = 50;
 	let duration = 6000;
+  let enabled = true;
 	let inbuildTime = 0;
 	let cameraPath = undefined;
 	let numberOfCameraPoint = undefined;
@@ -740,7 +741,7 @@ const CameraControls = function ( object, domElement, renderer, scene ) {
 	            finishCallback();
 		    }
 		}
-		requestURL = resolveURL(path_url);
+		const requestURL = resolveURL(path_url);
 		xmlhttp.open("GET", requestURL, true);
 		xmlhttp.send();
 	}
@@ -1594,7 +1595,7 @@ const CameraAutoTumble = function (tumbleDirectionIn, tumbleRateIn, stopOnCamera
 /**
  * @author mrdoob / http://mrdoob.com/
  */
-StereoCameraZoomFixed = function () {
+const StereoCameraZoomFixed = function () {
 
 	this.type = 'StereoCamera';
 
@@ -1732,7 +1733,7 @@ const StereoEffect = function ( renderer ) {
  * W3C Device Orientation control (http://w3c.github.io/deviceorientation/spec-source-orientation.html)
  */
 
-ModifiedDeviceOrientationControls = function ( object ) {
+const ModifiedDeviceOrientationControls = function ( object ) {
 
 	const scope = this;
 

package/src/primitives/geometry.js

@@ -1,4 +1,5 @@
 const THREE = require('three');
+const toBufferGeometry = require('../utilities').toBufferGeometry;
 
 /**
  * Provides an object which stores geometry and provides method which controls its animations.
@@ -32,7 +33,7 @@ const Geometry = function () {
 		if (this.geometry && this.morph && (geometryIn != undefined))
 			return;
 		// First copy the geometry
-		let geometry = this.toBufferGeometry(geometryIn, options);
+		let geometry = toBufferGeometry(geometryIn, options);
 
 		let isTransparent = false;
 		if (1.0 > options.opacity)
@@ -109,6 +110,37 @@ const Geometry = function () {
 		}
 		geometry.uvsNeedUpdate = true;	
 	}
+
+  this.checkAndCreateTransparentMesh = function() {
+    if (this.morph.material && this.morph.material.transparent) {
+      if (!this.secondaryMesh) {
+        let secondaryMaterial = this.morph.material.clone();
+        secondaryMaterial.side =  THREE.FrontSide;
+        this.secondaryMesh = new THREE.Mesh(this.morph.geometry, secondaryMaterial);
+        this.secondaryMesh.renderOrder = this.morph.renderOrder + 1;
+        this.secondaryMesh.userData = this;
+        this.secondaryMesh.name = this.groupName;
+      }
+      this.morph.material.side = THREE.BackSide;
+      this.morph.material.needsUpdate = true;
+      this.morph.add(this.secondaryMesh);
+      this.animationGroup.add(this.secondaryMesh);
+    }
+  }
+
+/**
+ * Handle transparent mesh, remove a clone for backside rendering if it is
+ * transparent.
+ */
+ this.checkAndRemoveTransparentMesh = function() {
+  if (this.secondaryMesh) {
+    this.morph.remove(this.secondaryMesh);
+    this.animationGroup.uncache(this.secondaryMesh);
+    this.animationGroup.remove(this.secondaryMesh);
+  }
+  this.morph.material.side = THREE.DoubleSide;
+}
+  
 	
 	/**
 	 * Set wireframe display for this geometry.
@@ -119,6 +151,7 @@ const Geometry = function () {
 		this.morph.material.wireframe = wireframe;
 	}
 	
+
 }
 
 Geometry.prototype = Object.create((require('./zincObject').ZincObject).prototype);

package/src/primitives/lines.js

@@ -1,4 +1,5 @@
 const THREE = require('three');
+const toBufferGeometry = require('../utilities').toBufferGeometry;
 
 /**
  * Provides an object which stores lines.
@@ -26,7 +27,7 @@ const Lines = function () {
    */
 	this.createLineSegment = (geometryIn, materialIn, options) => {
 		if (geometryIn && materialIn) {
-			let geometry = this.toBufferGeometry(geometryIn, options);
+			let geometry = toBufferGeometry(geometryIn, options);
 			if (options.localMorphColour && geometry.morphAttributes[ "color" ])
 				materialIn.onBeforeCompile = (require("./augmentShader").augmentMorphColor)();
       let line = new (require("../three/line/LineSegments").LineSegments)(geometry, materialIn);

package/src/primitives/pointset.js

@@ -1,5 +1,6 @@
 const THREE = require('three');
 const Points = require('../three/Points').Points;
+const toBufferGeometry = require('../utilities').toBufferGeometry;
 
 /**
  * Provides an object which stores points and provides method which controls its position.
@@ -37,7 +38,7 @@ const Pointset = function () {
    */
   this.createMesh = (geometryIn, materialIn, options) => {
     if (geometryIn && materialIn) {
-      let geometry = this.toBufferGeometry(geometryIn, options);
+      let geometry = toBufferGeometry(geometryIn, options);
       const texture = getCircularTexture();
       materialIn.map = texture;
       let point = new Points(geometry, materialIn);

package/src/primitives/zincObject.js

@@ -1,6 +1,5 @@
 const THREE = require('three');
-const THREEGeometry = require('../three/Geometry').Geometry;
-
+const updateMorphColorAttribute = require("../utilities").updateMorphColorAttribute;
 let uniqueiId = 0;
 
 const getUniqueId = function () {
@@ -93,49 +92,12 @@ ZincObject.prototype.getRegion = function() {
   return this.region;
 }
 
-/**
- * Convert a {THREE.Geometry} into a {THREE.BufferGeometry}.
- */
-ZincObject.prototype.toBufferGeometry = function(geometryIn, options) {
-  let geometry = undefined;
-  if (geometryIn instanceof THREEGeometry) {
-    if (options.localTimeEnabled && !geometryIn.morphNormalsReady && 
-      (geometryIn.morphNormals == undefined || geometryIn.morphNormals.length == 0))
-      geometryIn.computeMorphNormals();
-    geometry = geometryIn.toIndexedBufferGeometry();
-    if (options.localMorphColour) {
-      require("../utilities").copyMorphColorsToIndexedBufferGeometry(geometryIn, geometry);
-    }
-  } else if (geometryIn instanceof THREE.BufferGeometry) {
-    geometry = geometryIn.clone();
-  }
-  geometry.colorsNeedUpdate = true;
-  geometry.computeBoundingBox();
-  geometry.computeBoundingSphere();
-  if (geometryIn._video)
-    geometry._video = geometryIn._video;
-  return geometry;
-}
-
 /**
  * Handle transparent mesh, create a clone for backside rendering if it is
  * transparent.
  */
 ZincObject.prototype.checkAndCreateTransparentMesh = function() {
-  if (this.isGeometry && this.morph.material && this.morph.material.transparent) {
-    if (!this.secondaryMesh) {
-      let secondaryMaterial = this.morph.material.clone();
-      secondaryMaterial.side =  THREE.FrontSide;
-      this.secondaryMesh = new THREE.Mesh(this.morph.geometry, secondaryMaterial);
-      this.secondaryMesh.renderOrder = this.morph.renderOrder + 1;
-      this.secondaryMesh.userData = this;
-      this.secondaryMesh.name = this.groupName;
-    }
-    this.morph.material.side = THREE.BackSide;
-    this.morph.material.needsUpdate = true;
-    this.morph.add(this.secondaryMesh);
-    this.animationGroup.add(this.secondaryMesh);
-  }
+  return;
 }
 
 /**
@@ -143,12 +105,7 @@ ZincObject.prototype.checkAndCreateTransparentMesh = function() {
  * transparent.
  */
 ZincObject.prototype.checkAndRemoveTransparentMesh = function() {
-  if (this.isGeometry && this.secondaryMesh) {
-    this.morph.remove(this.secondaryMesh);
-    this.animationGroup.uncache(this.secondaryMesh);
-    this.animationGroup.remove(this.secondaryMesh);
-  }
-  this.morph.material.side = THREE.DoubleSide;
+  return;
 }
 
 /**
@@ -231,32 +188,6 @@ ZincObject.prototype.getCurrentTime = function() {
   }
 }
 
-const updateMorphColorAttribute = function(targetGeometry, morph) {
-  if (morph && targetGeometry && targetGeometry.morphAttributes &&
-    targetGeometry.morphAttributes[ "color" ]) {
-    const morphColors = targetGeometry.morphAttributes[ "color" ];
-    const influences = morph.morphTargetInfluences;
-    const length = influences.length;
-    targetGeometry.deleteAttribute( 'morphColor0' );
-    targetGeometry.deleteAttribute( 'morphColor1' );
-    let bound = 0;
-    let morphArray = [];
-    for (let i = 0; (1 > bound) || (i < length); i++) {
-      if (influences[i] > 0) {
-        bound++;
-        morphArray.push([i, influences[i]]);
-      }
-    }
-    if (morphArray.length == 2) {
-      targetGeometry.setAttribute('morphColor0', morphColors[ morphArray[0][0] ] );
-      targetGeometry.setAttribute('morphColor1', morphColors[ morphArray[1][0] ] );
-    } else if (morphArray.length == 1) {
-      targetGeometry.setAttribute('morphColor0', morphColors[ morphArray[0][0] ] );
-      targetGeometry.setAttribute('morphColor1', morphColors[ morphArray[0][0] ] );
-    }
-  }
-}
-
 /**
  * Set the local time of this geometry.
  * 

package/src/renderer.js

@@ -237,7 +237,7 @@ exports.Renderer = function (containerIn) {
 		if (currentScene) {	
 			const boundingBox = currentScene.getBoundingBox();
 			if (boundingBox) {
-			    for(i = 0; i < additionalActiveScenes.length; i++) {
+			    for(let i = 0; i < additionalActiveScenes.length; i++) {
 			        const boundingBox2 = additionalActiveScenes[i].getBoundingBox();
 			        if (boundingBox2) {
 			        	boundingBox.union(boundingBox2);
@@ -470,7 +470,7 @@ exports.Renderer = function (containerIn) {
 		}
 		const delta = clock.getDelta();
 		currentScene.renderGeometries(playRate, delta, this.playAnimation);
-	    for(i = 0; i < additionalActiveScenes.length; i++) {
+	    for(let i = 0; i < additionalActiveScenes.length; i++) {
 	        const sceneItem = additionalActiveScenes[i];
 	        sceneItem.renderGeometries(playRate, delta, this.playAnimation);
 	    }
@@ -478,13 +478,13 @@ exports.Renderer = function (containerIn) {
 			renderer.clearDepth();
 			renderer.render( sceneOrtho, cameraOrtho );
 		}
-    for (key in preRenderCallbackFunctions) {
+    for (let key in preRenderCallbackFunctions) {
       if (preRenderCallbackFunctions.hasOwnProperty(key)) {
         preRenderCallbackFunctions[key].call();
       }
     }
     currentScene.render(renderer);
-    for (key in postRenderCallbackFunctions) {
+    for (let key in postRenderCallbackFunctions) {
       if (postRenderCallbackFunctions.hasOwnProperty(key)) {
         postRenderCallbackFunctions[key].call();
       }
@@ -507,7 +507,7 @@ exports.Renderer = function (containerIn) {
 		if (currentScene === sceneIn) {
 			return true;
 		} else {
-		    for(i = 0; i < additionalActiveScenes.length; i++) {
+		    for(let i = 0; i < additionalActiveScenes.length; i++) {
 		        const sceneItem = additionalActiveScenes[i];
 		        if (sceneItem === sceneIn)
 		        	return true;
@@ -534,7 +534,7 @@ exports.Renderer = function (containerIn) {
 	 * @param {Zinc.Scene} additionalScene - Scene to be removed from rendering.
 	 */
 	this.removeActiveScene = additionalScene => {
-	    for(i = 0; i < additionalActiveScenes.length; i++) {
+	    for(let i = 0; i < additionalActiveScenes.length; i++) {
 	        const sceneItem = additionalActiveScenes[i];
 	        if (sceneItem === additionalScene) {
 	        	additionalActiveScenes.splice(i, 1);

package/src/sceneLoader.js

@@ -29,7 +29,7 @@ const createNewURL = (target, reference) => {
 exports.SceneLoader = function (sceneIn) {
   const scene = sceneIn;
   this.toBeDownloaded = 0;
-  this.progressMap = [];
+  this.progressMap = {};
   let viewLoaded = false;
   let errorDownload = false;
   const primitivesLoader = new PrimitivesLoader();
@@ -131,7 +131,7 @@ exports.SceneLoader = function (sceneIn) {
         }
       }
     }
-    requestURL = resolveURL(url);
+    const requestURL = resolveURL(url);
     xmlhttp.open("GET", requestURL, true);
     xmlhttp.send();
   }
@@ -160,7 +160,7 @@ exports.SceneLoader = function (sceneIn) {
       if (morphColour != undefined && morphColour[i] != undefined)
         localMorphColour = morphColour[i] ? true : false;
       primitivesLoader.load(resolveURL(filename), meshloader(region, colour, opacity, localTimeEnabled, localMorphColour, undefined, undefined,
-        undefined, finishCallback), this.onProgress(i), this.onError(finishCallback));
+        undefined, finishCallback), this.onProgress(filename), this.onError(finishCallback));
     }
   }
 
@@ -187,7 +187,7 @@ exports.SceneLoader = function (sceneIn) {
         this.loadModelsURL(targetRegion, urls, viewData.colour, viewData.opacity, viewData.timeEnabled, viewData.morphColour, finishCallback);
       }
     }
-    requestURL = resolveURL(jsonFilePrefix + "_view.json");
+    const requestURL = resolveURL(jsonFilePrefix + "_view.json");
     xmlhttp.open("GET", requestURL, true);
     xmlhttp.send();
   }
@@ -253,7 +253,7 @@ exports.SceneLoader = function (sceneIn) {
         renderOrder, finishCallback))( object.geometry, object.materials );
     } else {
       primitivesLoader.load(url, linesloader(region, localTimeEnabled, localMorphColour, groupName, 
-        anatomicalId, renderOrder, finishCallback), this.onProgress(i), this.onError(finishCallback));
+        anatomicalId, renderOrder, finishCallback), this.onProgress(url), this.onError(finishCallback));
     }
   }
 
@@ -423,7 +423,7 @@ exports.SceneLoader = function (sceneIn) {
         loader = new OBJLoader();
         loader.crossOrigin = "Anonymous";
         loader.load(url, objloader(region, colour, opacity, localTimeEnabled,
-          localMorphColour, groupName, anatomicalId, finishCallback), this.onProgress(i), this.onError);
+          localMorphColour, groupName, anatomicalId, finishCallback), this.onProgress(url), this.onError);
         return;
       }
     }
@@ -434,7 +434,7 @@ exports.SceneLoader = function (sceneIn) {
     } else {
       loader.crossOrigin = "Anonymous";
       primitivesLoader.load(url, meshloader(region, colour, opacity, localTimeEnabled,
-        localMorphColour, groupName, anatomicalId, renderOrder, finishCallback), this.onProgress(i), this.onError(finishCallback));
+        localMorphColour, groupName, anatomicalId, renderOrder, finishCallback), this.onProgress(url), this.onError(finishCallback));
     }
   };
 
@@ -488,7 +488,7 @@ exports.SceneLoader = function (sceneIn) {
     } else {
       primitivesLoader.load(url, pointsetloader(region, localTimeEnabled, localMorphColour,
         groupName, anatomicalId, renderOrder, finishCallback),
-        this.onProgress(i), this.onError(finishCallback));
+        this.onProgress(url), this.onError(finishCallback));
     }
   }
 
@@ -529,7 +529,7 @@ exports.SceneLoader = function (sceneIn) {
    * 
    * @returns {Zinc.Geometry}
    */
-  addZincGeometry = (
+  const addZincGeometry = (
     region,
     geometryIn,
     colour,
@@ -824,7 +824,7 @@ exports.SceneLoader = function (sceneIn) {
     */
   this.loadMetadataURL = (targetRegion, url, finishCallback, allCompletedCallback) => {
     const xmlhttp = new XMLHttpRequest();
-    var requestURL = resolveURL(url);
+    const requestURL = resolveURL(url);
     xmlhttp.onreadystatechange = () => {
       if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
         scene.resetMetadata();