@@ -85,7 +85,6 @@ module.exports = function(canvasGL, layout, data, unitToColor, context) {
85
85
} ;
86
86
87
87
var variables = data ;
88
- var data = variables . map ( function ( v ) { return v . values ; } ) ;
89
88
var variableCount = variables . length ;
90
89
var sampleCount = variables [ 0 ] . values . length ;
91
90
@@ -110,7 +109,7 @@ module.exports = function(canvasGL, layout, data, unitToColor, context) {
110
109
var coloringVariableUnitScale = variables [ coloringVariable ] . domainToUnitScale ;
111
110
112
111
function colorProjection ( j ) {
113
- return colorScale ( coloringVariableUnitScale ( data [ coloringVariable ] [ j ] ) ) ;
112
+ return colorScale ( coloringVariableUnitScale ( data [ coloringVariable ] . values [ j ] ) ) ;
114
113
}
115
114
116
115
var gpuVariableCount = 60 ; // don't change this; 3 + 1 extra variables also apply
@@ -123,7 +122,7 @@ module.exports = function(canvasGL, layout, data, unitToColor, context) {
123
122
var points = [ ]
124
123
for ( var j = 0 ; j < sampleCount ; j ++ )
125
124
for ( var i = 0 ; i < gpuVariableCount ; i ++ )
126
- points . push ( i < variableCount ? paddedUnit ( variables [ i ] . domainToUnitScale ( data [ i ] [ j ] ) ) : 0.5 ) ;
125
+ points . push ( i < variableCount ? paddedUnit ( variables [ i ] . domainToUnitScale ( data [ i ] . values [ j ] ) ) : 0.5 ) ;
127
126
128
127
var pointPairs = [ ] ;
129
128
@@ -145,7 +144,7 @@ module.exports = function(canvasGL, layout, data, unitToColor, context) {
145
144
var depthUnitScale = variables[depthVariable].domainToUnitScale;
146
145
var depth = utils.range(sampleCount * 2).map(function(d) {
147
146
return Math.max(depthLimitEpsilon, Math.min(1 - depthLimitEpsilon,
148
- depthUnitScale(data[depthVariable][Math.round((d - d % 2) / 2)])));
147
+ depthUnitScale(data[depthVariable].values [Math.round((d - d % 2) / 2)])));
149
148
})
150
149
*/
151
150
@@ -201,7 +200,7 @@ module.exports = function(canvasGL, layout, data, unitToColor, context) {
201
200
pf : styling
202
201
} ;
203
202
204
- for ( var i = 0 ; i < gpuVariableCount / 4 ; i ++ ) {
203
+ for ( i = 0 ; i < gpuVariableCount / 4 ; i ++ ) {
205
204
attributes [ 'p' + i . toString ( 16 ) ] = {
206
205
offset : i * 16 ,
207
206
stride : positionStride ,
0 commit comments