Fix defined check

Author: dy

circle-vert.glsl

@@ -46,9 +46,9 @@ void main() {
   gl_PointSize = (size + borderSize) * pixelRatio;
 
   vec2 pos = (position + translate) * scale
-			+ (positionFract + translateFract) * scale
-			+ (position + translate) * scaleFract
-			+ (positionFract + translateFract) * scaleFract;
+      + (positionFract + translateFract) * scale
+      + (position + translate) * scaleFract
+      + (positionFract + translateFract) * scaleFract;
 
   gl_Position = vec4(pos * 2. - 1., 0, 1);
 

package.json

@@ -33,7 +33,6 @@
     "clamp": "^1.0.1",
     "color-id": "^1.1.0",
     "color-normalize": "^1.0.3",
-    "defined": "^1.0.0",
     "flatten-vertex-data": "^1.0.0",
     "glslify": "^6.1.0",
     "is-iexplorer": "^1.0.0",

readme.md

@@ -55,11 +55,7 @@ Option | Default | Description
 `range`, `dataBox` | `null` | Data bounds limiting visible data as `[left, top, right, bottom]`. If `null`, the range is detected as `positions` boundaries.
 `viewport`, `viewBox` | `null` | Bounding box limiting visible area within the canvas in pixels, can be an array `[left, top, right, bottom]` or an object `{left, top, right, bottom}` or `{x, y, w, h}`.
 `clone` | `null` | Source _scatter2d_ instance to clone for faster creation.
-`cluster` | `null` | [Point-cluster](https://github.com/dfcreative/point-cluster) instance for custom points clustering, like kd-tree etc.
-<!--
-`snap` | `1e5` | Number of points threshold to enable snapping, can be bool. See [snap-points-2d](https://github.com/gl-vis/snap-points-2d).
--->
-```
+`cluster` | `null` | A bool, number of points threshold to enable snapping or [point-cluster](https://github.com/dfcreative/point-cluster) instance.
 
 ### `scatter.update(optionsA, optionsB, ...rest)`
 

scatter.js

@@ -13,7 +13,6 @@ const ie = require('is-iexplorer')
 const {float32, fract32} = require('to-float32')
 const arrayRange = require('array-range')
 const parseRect = require('parse-rect')
-const defined = require('defined')
 
 
 module.exports = Scatter
@@ -486,26 +485,26 @@ Scatter.prototype.update = function (...args) {
 		updateDiff(group, options, [{
 			snap: true,
 			size: s => {
-				if (!defined(s)) s = Scatter.defaults.size
+				if (s == null) s = Scatter.defaults.size
 				sizeCount += s && s.length ? 1 : 0
 				return s
 			},
 			borderSize: s => {
-				if (!defined(s)) s = Scatter.defaults.borderSize
+				if (s == null) s = Scatter.defaults.borderSize
 				sizeCount += s && s.length ? 1 : 0
 				return s
 			},
 			opacity: parseFloat,
 
 			// add colors to palette, save references
 			color: (c, group) => {
-				if (!defined(c)) c = Scatter.defaults.color
+				if (c == null) c = Scatter.defaults.color
 				c = this.updateColor(c)
 				colorCount++
 				return c
 			},
 			borderColor: (c, group) => {
-				if (!defined(c)) c = Scatter.defaults.borderColor
+				if (c == null) c = Scatter.defaults.borderColor
 				c = this.updateColor(c)
 				colorCount++
 				return c
@@ -613,7 +612,7 @@ Scatter.prototype.update = function (...args) {
 			positions: (positions, group) => {
 				if (!positions || !positions.length) return
 
-				let {markerIds, snap, bounds, offset} = group
+				let { markerIds, snap, bounds, offset } = group
 
 				for (let i = 0; i < markerIds.length; i++) {
 					let ids = markerIds[i]