zincjs 1.13.0 → 1.13.2

package/package.json

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

package/src/loaders/JSONLoader.js

@@ -92,10 +92,18 @@ Object.assign( JSONLoader.prototype, {
 			}
 
       if (scope && scope.parse) {
-        var object = scope.parse( json, texturePath );
-        onLoad( object.geometry, object.materials );
-      }
-
+				try {
+					var object = scope.parse( json, texturePath );
+					onLoad( object.geometry, object.materials );
+				} catch (e) {
+					console.error("The loader has encountered aon loading the geometry");
+					console.error(e);
+					if (onError) {
+						onError({responseURL: url});
+						return;
+					}
+				}
+			}
 		}, onProgress, onError );
 
 	},

package/src/primitives/textureSlides.js

@@ -19,6 +19,7 @@ const TextureSlides = function (textureIn) {
   this.morph = new THREE.Group();
   this.group = this.morph;
   this.morph.userData = this;
+  let edgesLine = undefined;
   let flipY = true;
 
   /**
@@ -59,7 +60,7 @@ const TextureSlides = function (textureIn) {
     mesh.position.z = 0;
     switch (settings.direction) {
       case "x":
-        const rotation = flipY ? -Math.PI / 2 : Math.PI / 2;
+        const rotation = -Math.PI / 2;
         mesh.rotation.y = rotation;
         uniforms.direction.value = 1;
         uniforms.slide.value.set(settings.value, 0, 0);
@@ -225,30 +226,32 @@ const TextureSlides = function (textureIn) {
 
   //Expand the boundingbox with slide settings
   const expandBoxWithSettings = (box, settings, vector) => {
-    switch (settings.direction.value) {
-      case 1:
-        vector.copy(settings.slide.value);
-        box.expandByPoint(vector);
-        vector.setY(1.0);
-        vector.setZ(1.0);
-        box.expandByPoint(vector);
-        break;
-      case 2:
-        vector.copy(settings.slide.value);
-        box.expandByPoint(vector);
-        vector.setX(1.0);
-        vector.setZ(1.0);
-        box.expandByPoint(vector);
-        break;
-      case 3:
-        vector.copy(settings.slide.value);
-        box.expandByPoint(vector);
-        vector.setX(1.0);
-        vector.setY(1.0);
-        box.expandByPoint(vector);
-        break;
-      default:
-        break;
+    if (settings) {
+      switch (settings.direction.value) {
+        case 1:
+          vector.copy(settings.slide.value);
+          box.expandByPoint(vector);
+          vector.setY(1.0);
+          vector.setZ(1.0);
+          box.expandByPoint(vector);
+          break;
+        case 2:
+          vector.copy(settings.slide.value);
+          box.expandByPoint(vector);
+          vector.setX(1.0);
+          vector.setZ(1.0);
+          box.expandByPoint(vector);
+          break;
+        case 3:
+          vector.copy(settings.slide.value);
+          box.expandByPoint(vector);
+          vector.setX(1.0);
+          vector.setY(1.0);
+          box.expandByPoint(vector);
+          break;
+        default:
+          break;
+      }
     }
   }
 
@@ -303,9 +306,13 @@ const TextureSlides = function (textureIn) {
     this.boundingBoxUpdateRequired = true;
   }
 
+  this.setRenderOrder = (order) => {
+    //multiilayers
+    this.morph.renderOrder = order;
+  }
+
   this.initialise = (textureData, finishCallback) => {
     if (textureData) {
-
       const locations = textureData.locations;
       if (locations && locations.length > 0) {
         this.applyTransformation(locations[0].orientation,
@@ -320,6 +327,25 @@ const TextureSlides = function (textureIn) {
       }
     }
   }
+
+  this.showEdges = (color) => {
+    if (!edgesLine) {
+      const geometry = new THREE.BoxGeometry( 1, 1, 1 );
+      geometry.translate(0.5, 0.5, 0.5);
+      const edges = new THREE.EdgesGeometry( geometry );
+      edgesLine = new THREE.LineSegments(edges, new THREE.LineBasicMaterial( { color } ) );
+      this.group.add( edgesLine );
+    } else {
+      edgesLine.material.color = color;
+    }
+    edgesLine.visible = true;
+  }
+
+  this.hideEdges = () => {
+    if (edgesLine) {
+      edgesLine.visible = false;
+    }
+  }
 }
 
 TextureSlides.prototype = Object.create((require('./texturePrimitive').TexturePrimitive).prototype);

package/src/scene.js

@@ -820,7 +820,7 @@ exports.Scene = function (containerIn, rendererIn) {
       const newVec1 = new THREE.Vector3();
       const newVec2 = new THREE.Vector3();
       newVec1.subVectors(target, eyePosition).normalize();
-      newVec2.subVectors(target, center).normalize();
+      newVec2.subVectors(target, _v3).normalize();
       const newVec3 = new THREE.Vector3();
       newVec3.crossVectors(newVec1, newVec2);
       const angle = newVec1.angleTo(newVec2);
@@ -858,7 +858,7 @@ exports.Scene = function (containerIn, rendererIn) {
   }
 
   /**
-   * Transition the camera into viewing the zinc object with a 
+   * Transition the camera into viewing the zinc object wiexports.Scene.alignBoundingBoxToCameraViewth a 
    * smooth transition within the providied transitionTime.
    * 
    * @param {ZincObject} zincObject - the bounding box to target
@@ -888,13 +888,13 @@ exports.Scene = function (containerIn, rendererIn) {
       const newVec1 = new THREE.Vector3();
       const newVec2 = new THREE.Vector3();
       newVec1.subVectors(eyePosition, target);
-      newVec2.addVectors(center, newVec1);
+      newVec2.addVectors(_v3, newVec1);
       viewport.eyePosition[0] = newVec2.x;
       viewport.eyePosition[1] = newVec2.y;
       viewport.eyePosition[2] = newVec2.z;
-      viewport.targetPosition[0] = center.x;
-      viewport.targetPosition[1] = center.y;
-      viewport.targetPosition[2] = center.z;
+      viewport.targetPosition[0] = _v3.x;
+      viewport.targetPosition[1] = _v3.y;
+      viewport.targetPosition[2] = _v3.z;
       this.getZincCameraControls().setCurrentCameraSettings(viewport);
       markerCluster.markerUpdateRequired = true;
     }

package/src/sceneLoader.js

@@ -60,7 +60,7 @@ exports.SceneLoader = function (sceneIn) {
     return xhr => {
       this.toBeDownloaded = this.toBeDownloaded - 1;
       errorDownload = true;
-      console.error(`There is an issue with external resource: ${xhr?.responseURL}.`);
+      console.error(`There is an issue with external resource ${xhr?.responseURL ? ": " +  xhr?.responseURL: ""}.`);
       const payload = {
         type: "Error",
         xhr
@@ -122,7 +122,7 @@ exports.SceneLoader = function (sceneIn) {
           if (finishCallback != undefined && (typeof finishCallback == 'function'))
             finishCallback();
         } else {
-          this.onError();
+          (this.onError(finishCallback))({responseURL: url});
         }
       }
     }

package/src/shaders/textureSlide.js

@@ -9,6 +9,7 @@ precision highp int;
 precision highp sampler2DArray;
 
 uniform sampler2DArray diffuse;
+uniform bool discardAlpha;
 in vec3 vUw;
 
 out vec4 outColor;
@@ -18,7 +19,9 @@ void main() {
   vec4 color = texture( diffuse, vUw );
 
   // lighten a bit
-  outColor = vec4( color.rgb + .2, 1.0 );
+  if (discardAlpha && color.a == 0.0) discard;
+
+  outColor = vec4( color.rgba );
 
 }
 `;
@@ -58,6 +61,7 @@ const getUniforms = function() {
     slide: { value: new THREE.Vector3( 0, 0, 1 ) },
     direction: {value: 1},
     flipY: { value: true},
+    discardAlpha: {value: true},
   };
 }
 

package/src/texture/textureArray.js

@@ -78,8 +78,9 @@ const TextureArray = function () {
       if (options) {
         if (options.vs && options.fs) {
           let transparent = true;
-          if (options.transparent)
+          if ("transparent" in options) {
             transparent = options.transparent;
+          }
           let side = THREE.FrontSide;
           if (options.side)
             side = options.side;