zincjs 1.13.2 → 1.14.1

package/package.json

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

package/src/primitives/zincObject.js

@@ -61,6 +61,9 @@ const ZincObject = function() {
   //Draw range is only used by primitives added
   //programatically with addVertices function
   this.drawRange = -1;
+  //Default value of colour
+  this.origColour = undefined;
+  this.origVertexColors = false;
 }
 
 /**
@@ -195,6 +198,16 @@ ZincObject.prototype.setMesh = function(mesh, localTimeEnabled, localMorphColour
   this.boundingBoxUpdateRequired = true;
 }
 
+/**
+ * Set the name for this ZincObject.
+ * 
+ * @param {String} anatomicalId - Id to be set.
+ */
+ZincObject.prototype.setAnatomicalId = function(anatomicalId) {
+  this.anatomicalId = anatomicalId;
+}
+
+
 /**
  * Set the name for this ZincObject.
  * 
@@ -352,6 +365,33 @@ ZincObject.prototype.setColour = function(colour) {
   this._lod.setColour(colour);
 }
 
+/**
+ * Set the colour of the mesh.
+ * 
+ * @param {THREE.Color} colour - Colour to be set for this geometry.
+ */
+ZincObject.prototype.setGreyScale = function(flag) {
+  if (flag) {
+    if (!this.origColour) {
+      if (this._lod._material) {
+        this.origColour = this._lod._material.color;
+        this.origVertexColors = this._lod._material.vertexColors;
+        this._lod.setVertexColors(false);
+        this._lod.setColour(new THREE.Color().setHex( 0xBBBBBB ));
+        return true;
+      }
+    }
+  } else {
+    if (this.origColour) {
+      this._lod.setColour(this.origColour);
+      this._lod.setVertexColors(this.origVertexColors);
+      this.origColour = undefined;
+      return true;
+    }
+  }
+  return false;
+}
+
 /**
  * Get the colour of the mesh in hex string form.
  * 

package/src/sceneLoader.js

@@ -208,7 +208,7 @@ exports.SceneLoader = function (sceneIn) {
       if (newLines) {
         newLines.createLineSegment(geometry, material, options);
         newLines.setName(groupName);
-        newLines.anatomicalId = anatomicalId;
+        newLines.setAnatomicalId(anatomicalId);
         newLines.setRenderOrder(renderOrder);
         region.addZincObject(newLines);
         newLines.setDuration(scene.getDuration());
@@ -276,7 +276,7 @@ exports.SceneLoader = function (sceneIn) {
     else {
       newGlyphset.load(glyphsetData, resolveURL(glyphurl), myCallback, isInline, displayLabels);
     }
-    newGlyphset.anatomicalId = anatomicalId;
+    newGlyphset.setAnatomicalId(anatomicalId);
     newGlyphset.setRenderOrder(renderOrder);
     region.addZincObject(newGlyphset);
   };
@@ -311,7 +311,7 @@ exports.SceneLoader = function (sceneIn) {
       if (newPointset) {
         newPointset.createMesh(geometry, material, options);
         newPointset.setName(groupName);
-        newPointset.anatomicalId = anatomicalId;
+        newPointset.setAnatomicalId(anatomicalId);
         region.addZincObject(newPointset);
         newPointset.setDuration(scene.getDuration());
         newPointset.setRenderOrder(renderOrder);
@@ -492,7 +492,7 @@ exports.SceneLoader = function (sceneIn) {
         }
         ++this.toBeDownloaded;
         newTexture.load(textureData, myCallback, isInline);
-        newTexture.anatomicalId = anatomicalId;
+        newTexture.setAnatomicalId(anatomicalId);
         newTexture.setRenderOrder(renderOrder);
         region.addZincObject(newTexture);
       }
@@ -576,7 +576,9 @@ exports.SceneLoader = function (sceneIn) {
     localMorphColour,
     finishCallback,
     materialIn,
-    groupName
+    groupName,
+    renderOrder,
+    anatomicalId
   ) => {
     let options = {};
     options.colour = colour;
@@ -587,6 +589,8 @@ exports.SceneLoader = function (sceneIn) {
     newGeometry.createMesh(geometryIn, materialIn, options);
     if (newGeometry.getMorph()) {
       newGeometry.setName(groupName);
+      newGeometry.setRenderOrder(renderOrder);
+      newGeometry.setAnatomicalId(anatomicalId);
       if (region) region.addZincObject(newGeometry);
       newGeometry.setDuration(scene.getDuration());
       if (finishCallback != undefined && (typeof finishCallback == 'function'))
@@ -617,9 +621,7 @@ exports.SceneLoader = function (sceneIn) {
         material = materials[0];
       }
       const zincGeometry = addZincGeometry(region, geometry, colour, opacity, 
-        localTimeEnabled, localMorphColour, undefined, material, groupName, renderOrder);
-      zincGeometry.anatomicalId = anatomicalId;
-      zincGeometry.setRenderOrder(renderOrder);
+        localTimeEnabled, localMorphColour, undefined, material, groupName, renderOrder, anatomicalId);
       if (options.lod && options.lod.levels) {
         for (const [key, value] of Object.entries(options.lod.levels)) {
           zincGeometry.addLOD(primitivesLoader, key, value.URL, value.Index, options.lod.preload);