Skip to content

Commit 218dfc8

Browse files
committed
factor out zip3 into src/lib/
1 parent 971351c commit 218dfc8

File tree

4 files changed

+20
-24
lines changed

4 files changed

+20
-24
lines changed

src/lib/zip3.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/**
2+
* Copyright 2012-2018, Plotly, Inc.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* LICENSE file in the root directory of this source tree.
7+
*/
8+
9+
'use strict';
10+
11+
module.exports = function zip3(x, y, z) {
12+
var result = new Array(x.length);
13+
for(var i = 0; i < x.length; i++) {
14+
result[i] = [x[i], y[i], z[i]];
15+
}
16+
return result;
17+
};

src/traces/cone/convert.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ var createConeMesh = require('gl-cone3d').createConeMesh;
1414

1515
var simpleMap = require('../../lib').simpleMap;
1616
var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
17+
var zip3 = require('../../lib/zip3');
1718

1819
function Cone(scene, uid) {
1920
this.scene = scene;
@@ -52,14 +53,6 @@ proto.handlePick = function(selection) {
5253
}
5354
};
5455

55-
function zip3(x, y, z) {
56-
var result = new Array(x.length);
57-
for(var i = 0; i < x.length; i++) {
58-
result[i] = [x[i], y[i], z[i]];
59-
}
60-
return result;
61-
}
62-
6356
var axisName2scaleIndex = {xaxis: 0, yaxis: 1, zaxis: 2};
6457
var sizeMode2sizeKey = {scaled: 'coneSize', absolute: 'absoluteConeSize'};
6558
var anchor2coneOffset = {tip: 1, tail: 0, cm: 0.25, center: 0.5};

src/traces/mesh3d/convert.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ var convexHull = require('convex-hull');
1616

1717
var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
1818
var str2RgbaArray = require('../../lib/str2rgbarray');
19+
var zip3 = require('../../lib/zip3');
1920

2021
function Mesh3DTrace(scene, mesh, uid) {
2122
this.scene = scene;
@@ -54,14 +55,6 @@ function parseColorArray(colors) {
5455
return colors.map(str2RgbaArray);
5556
}
5657

57-
function zip3(x, y, z) {
58-
var result = new Array(x.length);
59-
for(var i = 0; i < x.length; ++i) {
60-
result[i] = [x[i], y[i], z[i]];
61-
}
62-
return result;
63-
}
64-
6558
proto.update = function(data) {
6659
var scene = this.scene,
6760
layout = scene.fullSceneLayout;

src/traces/streamtube/convert.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ var createTubeMesh = tube2mesh.createTubeMesh;
1313

1414
var simpleMap = require('../../lib').simpleMap;
1515
var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
16+
var zip3 = require('../../lib/zip3');
1617

1718
function Streamtube(scene, uid) {
1819
this.scene = scene;
@@ -44,14 +45,6 @@ proto.handlePick = function(selection) {
4445
}
4546
};
4647

47-
function zip3(x, y, z) {
48-
var result = new Array(x.length);
49-
for(var i = 0; i < x.length; ++i) {
50-
result[i] = [x[i], y[i], z[i]];
51-
}
52-
return result;
53-
}
54-
5548
var axisName2scaleIndex = {xaxis: 0, yaxis: 1, zaxis: 2};
5649

5750
function convert(scene, trace) {

0 commit comments

Comments
 (0)