zincjs 1.2.0 → 1.4.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zincjs",
-  "version": "1.2.0",
+  "version": "1.4.0-beta.0",
   "description": "ZincJS (Web-based-Zinc-Visualisation)",
   "main": "build/zinc.js",
   "directories": {

package/src/assets/mapMarker.svg

@@ -4,7 +4,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 365 560" enable-background="new 0 0 365 560" xml:space="preserve">
 <g>
-	<path fill="#00AEEF" d="M182.9,551.7c0,0.1,0.2,0.3,0.2,0.3S358.3,283,358.3,194.6c0-130.1-88.8-186.7-175.4-186.9
+	<path fill="#005974" d="M182.9,551.7c0,0.1,0.2,0.3,0.2,0.3S358.3,283,358.3,194.6c0-130.1-88.8-186.7-175.4-186.9
 		C96.3,7.9,7.5,64.5,7.5,194.6c0,88.4,175.3,357.4,175.3,357.4S182.9,551.7,182.9,551.7z M122.2,187.2c0-33.6,27.2-60.8,60.8-60.8
 		c33.6,0,60.8,27.2,60.8,60.8S216.5,248,182.9,248C149.4,248,122.2,220.8,122.2,187.2z"/>
 </g>

package/src/geometryCSG.js

@@ -17,16 +17,16 @@ const GeometryCSG = function (hostIn) {
   let myResolve = undefined;
   
   var createGeometryFromJSON = json => {
-	  	const material = host.morph.material.clone();
-	  	material.morphTargets = false;
-	    const newGeometry = new Geometry();
+	  const material = host.getMorph().material.clone();
+	  material.morphTargets = false;
+	  const newGeometry = new Geometry();
 		const JSONParser = new JSONLoader();
 		const geometry = JSONParser.parse(json);
-        const mesh = new THREE.Mesh(geometry.geometry, material);
-	    newGeometry.geometry = mesh.geometry;
-	    newGeometry.morph = mesh;
-	    newGeometry.morph.userData = newGeometry;
-	    return newGeometry;
+    const mesh = new THREE.Mesh(geometry.geometry, material);
+	  newGeometry.geometry = mesh.geometry;
+    mesh.userData = newGeometry;
+	  newGeometry.setMorph(mesh);
+	  return newGeometry;
   }
   
   var workerEventHandler = ev => {
@@ -54,7 +54,7 @@ const GeometryCSG = function (hostIn) {
 	    core = new (require('./workers/geometryCSGInternal').GeometryCSGInternal)(hostIn);
 	  } else {
 		if (hostIn && hostIn.isGeometry) {
-		  let mesh = hostIn.morph;
+		  let mesh = hostIn.getMorph();
 		  let json = mesh.geometry.clone().applyMatrix(mesh.matrix).toJSON();
 		  worker.addEventListener('message', function (ev) {
 			  workerEventHandler(ev);
@@ -65,20 +65,20 @@ const GeometryCSG = function (hostIn) {
   }
   
   this.getHostGeometry = () => {
-	const tempCSG = new ThreeBSP(host.morph);
+	const tempCSG = new ThreeBSP(host.getMorph());
     return new createZincGeometry(tempCSG);
   }
   
   this.getGeometry = () => host;
   
   const createZincGeometry = csgMesh => {
-		const material = host.morph.material.clone();
+		const material = host.getMorph().material.clone();
 		material.morphTargets = false;
 		const newMesh = csgMesh.toMesh(material);
 	    const newGeometry = new Geometry();
 	    newGeometry.geometry = newMesh.geometry;
-	    newGeometry.morph = newMesh;
-	    newGeometry.morph.userData = newGeometry;
+	    newMesh.userData = newGeometry;
+	    newGeometry.setMorph(newMesh);
 	    return newGeometry;
   }
   
@@ -88,7 +88,7 @@ const GeometryCSG = function (hostIn) {
   
   const sendToWork = (guestGeometry, action, resolve, reject) => {
 	  if (!onProgress) {
-		  let mesh = guestGeometry.morph;
+		  let mesh = guestGeometry.getMorph();
 		  const json = mesh.geometry.clone().applyMatrix(mesh.matrix).toJSON();
 		  myResolve = resolve;
 		  onProgress = true;

package/src/glyphsetCSG.js

@@ -44,11 +44,11 @@ const GlyphsetCSG = function (hostIn) {
   };
   
   const prepareCSG = guestGeometry => {
-	  if (host && guestGeometry && guestGeometry.morph) {
+	  if (host && guestGeometry && guestGeometry.getMorph()) {
 	      if (hostCSGs.length == 0) {
 	    	  host.forEachGlyph(prepareCSGForGlyphs());
 	      }
-	     const guestCSG = new ThreeBSP(guestGeometry.morph);
+	     const guestCSG = new ThreeBSP(guestGeometry.getMorph());
 	     return guestCSG;
 	  }
 	  return undefined;

package/src/loaders/GLTFToZincJSLoader.js

@@ -39,8 +39,9 @@ const GLTFToZincJSLoader = function () {
           }
           zincGeometry.setMesh(object.clone(), localTimeEnabled, localMorphColour);
           region.addZincObject(zincGeometry);
-          zincGeometry.groupName = zincGeometry.morph.name;
-          zincGeometry.morph.matrixAutoUpdate = true;
+          const morph = zincGeometry.getMorph();
+          zincGeometry.groupName = morph.name;
+          morph.matrixAutoUpdate = true;
           if (finishCallback != undefined && (typeof finishCallback == 'function'))
             finishCallback(zincGeometry);
         }

package/src/loaders/primitivesLoader.js

@@ -33,7 +33,9 @@ exports.PrimitivesLoader = function () {
   const onFinally = function(callback, loader) {
     return (...args) => {
       --concurrentDownloads;
-      callback(...args);
+      if (callback) {
+        callback(...args);
+      }
       loader.loadFromWaitingList();
     }
   }

package/src/primitives/geometry.js

@@ -1,4 +1,61 @@
 const THREE = require('three');
+const toBufferGeometry = require('../utilities').toBufferGeometry;
+
+const createMeshForGeometry =  (geometryIn, materialIn, options) => {
+  // First copy the geometry
+  let geometry = toBufferGeometry(geometryIn, options);
+
+  let isTransparent = false;
+  if (1.0 > options.opacity)
+      isTransparent = true;
+
+  let material = undefined;
+  if (geometry._video === undefined) {
+    const morphTargets = options.localTimeEnabled || options.localMorphColour;
+    if (materialIn) {
+      material = materialIn;
+      material.morphTargets = morphTargets;
+      material.morphNormals = options.localTimeEnabled;
+    } else {
+      if (geometry instanceof THREE.BufferGeometry && geometry.attributes.color === undefined) {
+        material = new THREE.MeshPhongMaterial({
+          color : options.colour,
+          morphTargets : morphTargets,
+          morphNormals : options.localTimeEnabled,
+          transparent : isTransparent,
+          opacity : options.opacity,
+          side : THREE.DoubleSide
+        });
+      } else {
+        material = new THREE.MeshPhongMaterial({
+          color : options.colour,
+          morphTargets : morphTargets,
+          morphNormals : options.localTimeEnabled,
+          vertexColors : THREE.VertexColors,
+          transparent : isTransparent,
+          opacity : options.opacity,
+          side : THREE.DoubleSide
+        });
+      }
+    }
+    //material = PhongToToon(material);
+    if (options.localMorphColour && geometry.morphAttributes[ "color" ]) {
+      material.onBeforeCompile = (require("./augmentShader").augmentMorphColor)();
+    }
+  } else {
+    let videoTexture = geometry._video.createCanvasVideoTexture();
+    material = new THREE.MeshBasicMaterial({
+      morphTargets : options.localTimeEnabled,
+      color : new THREE.Color(1, 1, 1),
+      transparent : isTransparent,
+      opacity : options.opacity,
+      map : videoTexture,
+      side : THREE.DoubleSide
+    });
+    this.videoHandler = geometry._video;
+  }
+  return new THREE.Mesh(geometry, material); 
+}
 
 /**
  * Provides an object which stores geometry and provides method which controls its animations.
@@ -29,61 +86,10 @@ const Geometry = function () {
    * @param {Number} options.opacity - Opacity to be set for the geometry
    */
 	this.createMesh = (geometryIn, materialIn, options) => {
-		if (this.geometry && this.morph && (geometryIn != undefined))
+    //Skip if there is a morph already
+		if (this.morph && this.morph.geometry && (geometryIn != undefined))
 			return;
-		// First copy the geometry
-		let geometry = this.toBufferGeometry(geometryIn, options);
-
-		let isTransparent = false;
-		if (1.0 > options.opacity)
-			  isTransparent = true;
-
-		let material = undefined;
-		if (geometry._video === undefined) {
-      const morphTargets = options.localTimeEnabled || options.localMorphColour;
-			if (materialIn) {
-				material = materialIn;
-				material.morphTargets = morphTargets;
-				material.morphNormals = options.localTimeEnabled;
-			} else {
-				if (geometry instanceof THREE.BufferGeometry && geometry.attributes.color === undefined) {
-					material = new THREE.MeshPhongMaterial({
-						color : options.colour,
-						morphTargets : morphTargets,
-						morphNormals : options.localTimeEnabled,
-						transparent : isTransparent,
-						opacity : options.opacity,
-						side : THREE.DoubleSide
-					});
-				} else {
-					material = new THREE.MeshPhongMaterial({
-						color : options.colour,
-						morphTargets : morphTargets,
-						morphNormals : options.localTimeEnabled,
-						vertexColors : THREE.VertexColors,
-						transparent : isTransparent,
-						opacity : options.opacity,
-						side : THREE.DoubleSide
-					});
-				}
-			}
-			//material = PhongToToon(material);
-			if (options.localMorphColour && geometry.morphAttributes[ "color" ]) {
-				material.onBeforeCompile = (require("./augmentShader").augmentMorphColor)();
-			}
-		} else {
-			let videoTexture = geometry._video.createCanvasVideoTexture();
-			material = new THREE.MeshBasicMaterial({
-				morphTargets : options.localTimeEnabled,
-				color : new THREE.Color(1, 1, 1),
-				transparent : isTransparent,
-				opacity : options.opacity,
-				map : videoTexture,
-				side : THREE.DoubleSide
-			});
-			this.videoHandler = geometry._video;
-		}
-		let mesh = new THREE.Mesh(geometry, material); 
+		const mesh = createMeshForGeometry(geometryIn, materialIn, options); 
 		this.setMesh(mesh, options.localTimeEnabled, options.localMorphColour);
 	}
 
@@ -91,6 +97,7 @@ const Geometry = function () {
    * Calculate the UV for texture rendering.
    */
 	this.calculateUVs = () => {
+    //Multilayers
 		this.geometry.computeBoundingBox();
 		const max = this.geometry.boundingBox.max, min = this.geometry.boundingBox.min;
 		const offset = new THREE.Vector2(0 - min.x, 0 - min.y);
@@ -109,6 +116,14 @@ const Geometry = function () {
 		}
 		geometry.uvsNeedUpdate = true;	
 	}
+
+  /**
+   * Handle transparent mesh, create a clone for backside rendering if it is
+   * transparent.
+   */
+  this.checkTransparentMesh = function(transparentChanged) {
+    this._lod.checkTransparentMesh(this.animationGroup, transparentChanged);
+  }
 	
 	/**
 	 * Set wireframe display for this geometry.
@@ -119,6 +134,7 @@ const Geometry = function () {
 		this.morph.material.wireframe = wireframe;
 	}
 	
+
 }
 
 Geometry.prototype = Object.create((require('./zincObject').ZincObject).prototype);

package/src/primitives/glyphset.js

@@ -90,7 +90,8 @@ const Glyphset = function () {
     scaleFactors = glyphsetData.metadata.scale_factors;
     const loader = new JSONLoader();
     this.geometry = new THREE.BufferGeometry();
-    this.morph = new THREE.InstancedMesh(this.geometry, undefined, numberOfVertices);
+    const instancedMesh = new THREE.InstancedMesh(this.geometry, undefined, numberOfVertices);
+    this.setMorph(instancedMesh);
     if (isInline) {
       var object = loader.parse(glyphURL);
       (meshloader(finishCallback, displayLabels))(object.geometry, object.materials);
@@ -498,6 +499,7 @@ const Glyphset = function () {
       createGlyphs(displayLabels);
       this.morph.name = this.groupName;
       this.morph.userData = this;
+      this.setMorph(this.morph);
       geometry.dispose();
       if (finishCallback != undefined && (typeof finishCallback == 'function'))
         finishCallback(this);
@@ -510,19 +512,17 @@ const Glyphset = function () {
   this.getClosestVertexIndex = function () {
     let closestIndex = -1;
     if (this.morph && this.ready) {
-      let center = new THREE.Vector3();
-      this.getBoundingBox().getCenter(center);
+      this.getBoundingBox().getCenter(this._v1);
       let current_positions = positions["0"];
       const numberOfPositions = current_positions.length / 3;
-      let position = new THREE.Vector3();
       let distance = -1;
       let currentDistance = 0;
       for (let i = 0; i < numberOfPositions; i++) {
         const current_index = i * 3;
-        position.set(current_positions[current_index],
+        this._v2.set(current_positions[current_index],
           current_positions[current_index + 1],
           current_positions[current_index + 2]);
-        currentDistance = center.distanceTo(position);
+        currentDistance = this._v1.distanceTo(this._v2);
         if (distance == -1) {
           distance = currentDistance;
           closestIndex = i;

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);