handle typed arrays in scatter3d

Author: archmoj

stackgl_modules/index.js

@@ -21678,6 +21678,17 @@ var IDENTITY = [1,0,0,0,
                 0,0,1,0,
                 0,0,0,1]
 
+var ab = ArrayBuffer
+var dv = DataView
+
+function isTypedArray(a) {
+    return ab.isView(a) && !(a instanceof dv)
+}
+
+function isArrayOrTypedArray(a) {
+    return Array.isArray(a) || isTypedArray(a)
+}
+
 module.exports = createPointCloud
 
 function transformMat4(x, m) {
@@ -22065,7 +22076,7 @@ function get_glyphData(glyphs, index, font, pixelRatio) {
   var str
 
   // use the data if presented in an array
-  if(Array.isArray(glyphs)) {
+  if(isArrayOrTypedArray(glyphs)) {
     if(index < glyphs.length) {
       str = glyphs[index]
     } else {
@@ -22086,19 +22097,19 @@ function get_glyphData(glyphs, index, font, pixelRatio) {
   if(!font) font = {}
 
   var family = font.family
-  if(Array.isArray(family)) family = family[index]
+  if(isArrayOrTypedArray(family)) family = family[index]
   if(!family) family = "normal"
 
   var weight = font.weight
-  if(Array.isArray(weight)) weight = weight[index]
+  if(isArrayOrTypedArray(weight)) weight = weight[index]
   if(!weight) weight = "normal"
 
   var style = font.style
-  if(Array.isArray(style)) style = style[index]
+  if(isArrayOrTypedArray(style)) style = style[index]
   if(!style) style = "normal"
 
   var variant = font.variant
-  if(Array.isArray(variant)) variant = variant[index]
+  if(isArrayOrTypedArray(variant)) variant = variant[index]
   if(!variant) variant = "normal"
 
   var glyph = getGlyph(str, {
@@ -22133,15 +22144,15 @@ proto.update = function(options) {
     this.lineWidth = options.lineWidth
   }
   if('project' in options) {
-    if(Array.isArray(options.project)) {
+    if(isArrayOrTypedArray(options.project)) {
       this.axesProject = options.project
     } else {
       var v = !!options.project
       this.axesProject = [v,v,v]
     }
   }
   if('projectScale' in options) {
-    if(Array.isArray(options.projectScale)) {
+    if(isArrayOrTypedArray(options.projectScale)) {
       this.projectScale = options.projectScale.slice()
     } else {
       var s = +options.projectScale
@@ -22151,7 +22162,7 @@ proto.update = function(options) {
 
   this.projectHasAlpha = false // default to no transparent draw
   if('projectOpacity' in options) {
-    if(Array.isArray(options.projectOpacity)) {
+    if(isArrayOrTypedArray(options.projectOpacity)) {
       this.projectOpacity = options.projectOpacity.slice()
     } else {
       var s = +options.projectOpacity
@@ -22262,8 +22273,8 @@ proto.update = function(options) {
     var color      = [0,0,0,1]
     var lineColor  = [0,0,0,1]
 
-    var isColorArray      = Array.isArray(colors)     && Array.isArray(colors[0])
-    var isLineColorArray  = Array.isArray(lineColors) && Array.isArray(lineColors[0])
+    var isColorArray      = isArrayOrTypedArray(colors)     && isArrayOrTypedArray(colors[0])
+    var isLineColorArray  = isArrayOrTypedArray(lineColors) && isArrayOrTypedArray(lineColors[0])
 
   fill_loop:
     for(var i=0; i<numPoints; ++i) {
@@ -22289,7 +22300,7 @@ proto.update = function(options) {
 
       //Get color
       if(!glyphVisible) color = [1,1,1,0]
-      else if(Array.isArray(colors)) {
+      else if(isArrayOrTypedArray(colors)) {
         var c
         if(isColorArray) {
           if(i < colors.length) {
@@ -22320,7 +22331,7 @@ proto.update = function(options) {
 
       //Get lineColor
       if(!glyphVisible) lineColor = [1,1,1,0]
-      else if(Array.isArray(lineColors)) {
+      else if(isArrayOrTypedArray(lineColors)) {
         var c
         if(isLineColorArray) {
           if(i < lineColors.length) {
@@ -22351,7 +22362,7 @@ proto.update = function(options) {
 
       var size = 0.5
       if(!glyphVisible) size = 0.0
-      else if(Array.isArray(sizes)) {
+      else if(isArrayOrTypedArray(sizes)) {
         if(i < sizes.length) {
           size = +sizes[i]
         } else {
@@ -22365,7 +22376,7 @@ proto.update = function(options) {
 
 
       var angle = 0
-      if(Array.isArray(angles)) {
+      if(isArrayOrTypedArray(angles)) {
         if(i < angles.length) {
           angle = +angles[i]
         } else {
@@ -22390,7 +22401,7 @@ proto.update = function(options) {
       var textOffsetY = alignmentY
 
       var textOffsetX = 0
-      if(Array.isArray(alignmentX)) {
+      if(isArrayOrTypedArray(alignmentX)) {
         if(i < alignmentX.length) {
           textOffsetX = alignmentX[i]
         } else {
@@ -22401,7 +22412,7 @@ proto.update = function(options) {
       }
 
       var textOffsetY = 0
-      if(Array.isArray(alignmentY)) {
+      if(isArrayOrTypedArray(alignmentY)) {
         if(i < alignmentY.length) {
           textOffsetY = alignmentY[i]
         } else {

stackgl_modules/package-lock.json

@@ -22,7 +22,7 @@
     "gl-plot2d": "^1.5.0",
     "gl-plot3d": "^2.4.7",
     "gl-pointcloud2d": "^1.0.3",
-    "gl-scatter3d": "^1.3.0",
+    "gl-scatter3d": "github:gl-vis/gl-scatter3d#52e58adea4141c86b019f25d781725b54fb2f07c",
     "gl-select-box": "^1.0.4",
     "gl-shader": "4.3.1",
     "gl-spikes2d": "^1.0.2",