zincjs 1.16.3 → 1.16.4

package/package.json

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

package/src/primitives/lines2.js

@@ -8,7 +8,7 @@ const LineSegmentsGeometry = require("../three/line/LineSegmentsGeometry").LineS
  * Provides an object which stores lines.
  * This is created when a valid json file containing lines is read into a {@link Zinc.Scene}
  * object.
- * 
+ *
  * @class
  * @author Alan Wu
  * @return {Lines}
@@ -20,7 +20,7 @@ const Lines2 = function () {
 
   /**
    * Create the line segements using geometry and material.
-   * 
+   *
    * @param {Array} arrayIn - Geometry of lines to be rendered.
    * @param {THREE.Material} materialIn - Material to be set for the lines.
    * @param {Object} options - Provide various options
@@ -43,7 +43,7 @@ const Lines2 = function () {
 
   /**
    * Set the width for the lines.
-   * 
+   *
    * @param {Number} width - Width of the lines.
    */
 	this.setWidth = width => {
@@ -121,6 +121,7 @@ const Lines2 = function () {
       if (!mesh || 0 > i || maxIndex >= this.drawRange) {
         return;
       } else {
+
         let index = i * 3;
         coords.forEach(coord => {
           positions[index++] = coord[0];

package/src/primitives/pointset.js

@@ -66,7 +66,10 @@ const Pointset = function () {
    */
   this.addPoints = (coords, labels, colour) => {
     if (coords && coords.length > 0) {
-      let current = this.drawRange - 1;
+      let current = this.drawRange;
+      if (current === -1) {
+        current = 0;
+      }
       const geometry = this.addVertices(coords);
       let mesh = this.getMorph();
       if (!mesh) {
@@ -76,13 +79,15 @@ const Pointset = function () {
         geometry.colorsNeedUpdate = true;
         this.createMesh(geometry, material, options);
       }
+
       let end = current + coords.length;
       let index = 0;
       if ((Array.isArray(labels) && labels.length === coords.length) ||
         (typeof labels === "string")) {
+        const size = labelSets.length;
         for (current; current + index < end;) {
           const labelText = typeof labels === "string" ? labels : labels[index];
-          addLabel(index, coords[index], labelText, colour);
+          addLabel(current + index, coords[index], labelText, this._lod._material.color);
           index++;
         }
       }
@@ -199,6 +204,7 @@ const Pointset = function () {
     }
     Pointset.prototype.render.call(this, delta, playAnimation, cameraControls, options);
   }
+
 }
 
 Pointset.prototype = Object.create((require('./zincObject').ZincObject).prototype);