zincjs 1.16.7 → 1.16.8

package/package.json

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

package/src/primitives/label.js

@@ -19,9 +19,9 @@ exports.Label = function (textIn, colourIn) {
   let size = 1.0;
   let fontWeight = 500;
   if (colourIn)
-    sprite = new SpriteText(text, 0.015, colourIn.getStyle());
+    sprite = new SpriteText(text, 0.012, colourIn.getStyle());
   else
-    sprite = new SpriteText(text, 0.015);
+    sprite = new SpriteText(text, 0.012);
   sprite.fontFace = "Asap";
   sprite.fontWeight = fontWeight;
   sprite.material.map.generateMipmaps = false;
@@ -98,7 +98,7 @@ exports.Label = function (textIn, colourIn) {
    * @param {Number} scaling - Scale to be set.
    */
   this.setSize = sizeIn => {
-    if (sizeIn && sizeIn !== size) {
+    if (sizeIn > 0.0) {
       sprite.scale.x = originalScale[0] * sizeIn;
       sprite.scale.y = originalScale[1] * sizeIn;
       size = sizeIn;

package/src/primitives/pointset.js

@@ -170,7 +170,7 @@ const Pointset = function () {
     labelSize = size;
     for (let i = 0; i < labelSets.length; i++) {
       if (labelSets[i]) {
-        labelSets[i].setSize(size);
+        labelSets[i].setSize(labelSize);
       }
     }
   }

package/src/primitives/textureSlides.js

@@ -21,6 +21,8 @@ const TextureSlides = function (textureIn) {
   this.morph.userData = this;
   let edgesLine = undefined;
   let flipY = true;
+  let brightness = 0.0;
+  let contrast = 1.0;
 
   /**
     @typedef SLIDE_SETTINGS
@@ -111,6 +113,8 @@ const TextureSlides = function (textureIn) {
         const geometry = new THREE.PlaneGeometry(1, 1);
         geometry.translate(0.5, 0.5, 0);
         const uniforms = shader.getUniforms();
+        uniforms.brightness.value = brightness;
+        uniforms.contrast.value = contrast;
         uniforms.diffuse.value = this.texture.impl;
         uniforms.depth.value = this.texture.size.depth;
         uniforms.flipY.value = flipY;
@@ -341,6 +345,40 @@ const TextureSlides = function (textureIn) {
     edgesLine.visible = true;
   }
 
+  this.getBrightness = () => {
+    return brightness;
+  }
+
+  this.setBrightness = (brightnessIn) => {
+    brightness = brightnessIn;
+    this.morph.children.forEach((mesh) => {
+      const material = mesh.material;
+      if (material.type === "ShaderMaterial") {
+        const uniforms = material.uniforms;
+        uniforms.brightness.value = brightness;
+        material.needsUpdate = true;
+      }
+    });
+  }
+
+  this.getContrast = () => {
+    return contrast;
+  }
+
+  this.setContrast = (contrastIn) => {
+    if (contrast >= 0 ) {
+      contrast = contrastIn;
+      this.morph.children.forEach((mesh) => {
+        const material = mesh.material;
+        if (material.type === "ShaderMaterial") {
+          const uniforms = material.uniforms;
+          uniforms.contrast.value = contrast;
+          material.needsUpdate = true;
+        }
+      });
+    }
+  }
+
   this.hideEdges = () => {
     if (edgesLine) {
       edgesLine.visible = false;

package/src/shaders/textureSlide.js

@@ -10,6 +10,8 @@ precision highp sampler2DArray;
 
 uniform sampler2DArray diffuse;
 uniform bool discardAlpha;
+uniform float brightness;
+uniform float contrast;
 in vec3 vUw;
 
 out vec4 outColor;
@@ -18,15 +20,17 @@ void main() {
 
   vec4 color = texture( diffuse, vUw );
 
-  // lighten a bit
+  // discard if alpha is zero
   if (discardAlpha && color.a == 0.0) discard;
-
-  outColor = vec4( color.rgba );
-
+  // Apply brightness
+  vec3 brightenedColor = color.rgb + vec3(brightness);
+  // Apply contrast
+  vec3 contrastedColor = (brightenedColor - vec3(0.5)) * contrast + vec3(0.5);
+  outColor = vec4(contrastedColor, color.a);
 }
 `;
 
-const vs = 
+const vs =
 `
 out vec3 vUw;
 uniform float depth;
@@ -46,7 +50,7 @@ void main() {
   if (direction == 3)
     slidePos = vec3(position.x, position.y, slide.z);
 
-  if (flipY) 
+  if (flipY)
     slidePos.y = 1.0 - slidePos.y;
 
   vUw.xyz = vec3(slidePos.x, slidePos.y, slidePos.z * depth);
@@ -56,12 +60,14 @@ void main() {
 
 const getUniforms = function() {
   return {
-    diffuse: { value: undefined },
+    brightness: { value: 0},
+    contrast: { value: 1},
     depth: { value: 1 },
-    slide: { value: new THREE.Vector3( 0, 0, 1 ) },
+    discardAlpha: {value: true},
+    diffuse: { value: undefined },
     direction: {value: 1},
     flipY: { value: true},
-    discardAlpha: {value: true},
+    slide: { value: new THREE.Vector3( 0, 0, 1 ) },
   };
 }
 

package/src/texture/textureArray.js

@@ -3,7 +3,7 @@ const THREE = require('three');
 /**
  * Texture array object for holding array of images into
  * texures unit that can be used by other texture primitives.
- * 
+ *
  * @class
  * @author Alan Wu
  * @return {TextureArray}
@@ -15,7 +15,7 @@ const TextureArray = function () {
 
   /**
    * Read images from an array containg src locations.
-   * 
+   *
    * @async
    * @param {Array} srcArrays - List of source location of the images.
    */
@@ -61,16 +61,16 @@ const TextureArray = function () {
   /**
    * Get and create the material containing shaders and the textures.
    * The texture must be read and ready before calling this function.
-   * 
+   *
    *
    * @param {Object} options - Customise the material with the options object.
-   * @param {String} options.fs - string of the fragment shader used for 
+   * @param {String} options.fs - string of the fragment shader used for
    * visualisation.
-   * @param {String} options.vs - string of the vertex shader used for 
+   * @param {String} options.vs - string of the vertex shader used for
    * visualisation.
    * @param {Object} options.uniforms - Containing the data to be passed into the shaders.
    * @param {String} options.glslVersion - Version of glsl used for compile this shader.
-   * 
+   *
    */
   this.getMaterial = (options) => {
     if (this.impl) {