@deck.gl/layers
Advanced tools
Comparing version 7.0.0-beta.3 to 7.0.0-beta.4
@@ -76,3 +76,3 @@ "use strict"; | ||
type: 'number', | ||
value: 1, | ||
value: 0, | ||
min: 0 | ||
@@ -197,7 +197,7 @@ }, | ||
var widthMultiplier = widthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
widthScale: widthScale * widthMultiplier, | ||
widthMinPixels: widthMinPixels, | ||
widthMaxPixels: widthMaxPixels | ||
})); | ||
})).draw(); | ||
} | ||
@@ -204,0 +204,0 @@ }, { |
@@ -194,3 +194,3 @@ "use strict"; | ||
if (bitmapTexture && model) { | ||
model.render(Object.assign({}, uniforms, { | ||
model.setUniforms(Object.assign({}, uniforms, { | ||
bitmapTexture: bitmapTexture, | ||
@@ -200,3 +200,3 @@ desaturate: desaturate, | ||
tintColor: tintColor | ||
})); | ||
})).draw(); | ||
} | ||
@@ -203,0 +203,0 @@ } |
@@ -222,3 +222,3 @@ "use strict"; | ||
angle = _this$props.angle; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
radius: radius, | ||
@@ -230,3 +230,3 @@ angle: angle / 180 * Math.PI, | ||
elevationScale: elevationScale | ||
})); | ||
})).draw(); | ||
} | ||
@@ -233,0 +233,0 @@ }, { |
@@ -61,3 +61,3 @@ "use strict"; | ||
angle = _this$props.angle; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
radius: cellSize / 2, | ||
@@ -69,3 +69,3 @@ angle: angle, | ||
elevationScale: elevationScale | ||
})); | ||
})).draw(); | ||
} | ||
@@ -72,0 +72,0 @@ }]); |
@@ -245,3 +245,3 @@ "use strict"; | ||
if (iconsTexture) { | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
iconsTexture: iconsTexture, | ||
@@ -253,3 +253,3 @@ iconsTextureDim: [iconsTexture.width, iconsTexture.height], | ||
billboard: billboard | ||
})); | ||
})).draw(); | ||
} | ||
@@ -256,0 +256,0 @@ } |
@@ -62,3 +62,3 @@ "use strict"; | ||
type: 'number', | ||
value: 1, | ||
value: 0, | ||
min: 0 | ||
@@ -165,7 +165,7 @@ }, | ||
var widthMultiplier = widthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
widthScale: widthScale * widthMultiplier, | ||
widthMinPixels: widthMinPixels, | ||
widthMaxPixels: widthMaxPixels | ||
})); | ||
})).draw(); | ||
} | ||
@@ -172,0 +172,0 @@ }, { |
@@ -225,3 +225,3 @@ "use strict"; | ||
var widthMultiplier = widthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
jointType: Number(rounded), | ||
@@ -233,3 +233,3 @@ alignMode: Number(dashJustified), | ||
widthMaxPixels: widthMaxPixels | ||
})); | ||
})).draw(); | ||
} | ||
@@ -236,0 +236,0 @@ }, { |
@@ -143,5 +143,5 @@ "use strict"; | ||
var sizeMultiplier = sizeUnits === 'meters' ? viewport.distanceScales.pixelsPerMeter[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
radiusPixels: pointSize * sizeMultiplier | ||
})); | ||
})).draw(); | ||
} | ||
@@ -148,0 +148,0 @@ }, { |
@@ -41,3 +41,3 @@ "use strict"; | ||
min: 0, | ||
value: 1 | ||
value: 0 | ||
}, | ||
@@ -58,3 +58,3 @@ radiusMaxPixels: { | ||
min: 0, | ||
value: 1 | ||
value: 0 | ||
}, | ||
@@ -203,3 +203,3 @@ lineWidthMaxPixels: { | ||
var widthMultiplier = lineWidthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
stroked: stroked ? 1 : 0, | ||
@@ -213,3 +213,3 @@ filled: filled, | ||
lineWidthMaxPixels: lineWidthMaxPixels | ||
})); | ||
})).draw(); | ||
} | ||
@@ -216,0 +216,0 @@ }, { |
@@ -242,5 +242,5 @@ "use strict"; | ||
sideModel.setDrawMode(3); | ||
sideModel.render({ | ||
sideModel.setUniforms({ | ||
isWireframe: true | ||
}); | ||
}).draw(); | ||
} | ||
@@ -250,5 +250,5 @@ | ||
sideModel.setDrawMode(6); | ||
sideModel.render({ | ||
sideModel.setUniforms({ | ||
isWireframe: false | ||
}); | ||
}).draw(); | ||
} | ||
@@ -259,3 +259,3 @@ } | ||
topModel.setVertexCount(polygonTesselator.get('indices').length); | ||
topModel.render(renderUniforms); | ||
topModel.setUniforms(renderUniforms).draw(); | ||
} | ||
@@ -262,0 +262,0 @@ } |
@@ -46,3 +46,3 @@ import { Layer, createIterable } from '@deck.gl/core'; | ||
type: 'number', | ||
value: 1, | ||
value: 0, | ||
min: 0 | ||
@@ -154,7 +154,7 @@ }, | ||
const widthMultiplier = widthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
widthScale: widthScale * widthMultiplier, | ||
widthMinPixels, | ||
widthMaxPixels | ||
})); | ||
})).draw(); | ||
} | ||
@@ -161,0 +161,0 @@ |
@@ -156,3 +156,3 @@ import { Layer } from '@deck.gl/core'; | ||
if (bitmapTexture && model) { | ||
model.render(Object.assign({}, uniforms, { | ||
model.setUniforms(Object.assign({}, uniforms, { | ||
bitmapTexture, | ||
@@ -162,3 +162,3 @@ desaturate, | ||
tintColor | ||
})); | ||
})).draw(); | ||
} | ||
@@ -165,0 +165,0 @@ } |
@@ -177,3 +177,3 @@ import { Layer, log, createIterable } from '@deck.gl/core'; | ||
angle = _this$props.angle; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
radius, | ||
@@ -185,3 +185,3 @@ angle: angle / 180 * Math.PI, | ||
elevationScale | ||
})); | ||
})).draw(); | ||
} | ||
@@ -188,0 +188,0 @@ |
@@ -29,3 +29,3 @@ import { CubeGeometry } from '@luma.gl/core'; | ||
angle = _this$props.angle; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
radius: cellSize / 2, | ||
@@ -37,3 +37,3 @@ angle, | ||
elevationScale | ||
})); | ||
})).draw(); | ||
} | ||
@@ -40,0 +40,0 @@ |
@@ -198,3 +198,3 @@ import { Layer, createIterable } from '@deck.gl/core'; | ||
if (iconsTexture) { | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
iconsTexture, | ||
@@ -206,3 +206,3 @@ iconsTextureDim: [iconsTexture.width, iconsTexture.height], | ||
billboard | ||
})); | ||
})).draw(); | ||
} | ||
@@ -209,0 +209,0 @@ } |
@@ -33,3 +33,3 @@ import { Layer, createIterable } from '@deck.gl/core'; | ||
type: 'number', | ||
value: 1, | ||
value: 0, | ||
min: 0 | ||
@@ -123,7 +123,7 @@ }, | ||
const widthMultiplier = widthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
widthScale: widthScale * widthMultiplier, | ||
widthMinPixels, | ||
widthMaxPixels | ||
})); | ||
})).draw(); | ||
} | ||
@@ -130,0 +130,0 @@ |
@@ -183,3 +183,3 @@ import { Layer } from '@deck.gl/core'; | ||
const widthMultiplier = widthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
jointType: Number(rounded), | ||
@@ -191,3 +191,3 @@ alignMode: Number(dashJustified), | ||
widthMaxPixels | ||
})); | ||
})).draw(); | ||
} | ||
@@ -194,0 +194,0 @@ |
@@ -103,5 +103,5 @@ import { Layer, createIterable } from '@deck.gl/core'; | ||
const sizeMultiplier = sizeUnits === 'meters' ? viewport.distanceScales.pixelsPerMeter[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
radiusPixels: pointSize * sizeMultiplier | ||
})); | ||
})).draw(); | ||
} | ||
@@ -108,0 +108,0 @@ |
@@ -16,3 +16,3 @@ import { Layer, createIterable } from '@deck.gl/core'; | ||
min: 0, | ||
value: 1 | ||
value: 0 | ||
}, | ||
@@ -33,3 +33,3 @@ radiusMaxPixels: { | ||
min: 0, | ||
value: 1 | ||
value: 0 | ||
}, | ||
@@ -163,3 +163,3 @@ lineWidthMaxPixels: { | ||
const widthMultiplier = lineWidthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
stroked: stroked ? 1 : 0, | ||
@@ -173,3 +173,3 @@ filled, | ||
lineWidthMaxPixels | ||
})); | ||
})).draw(); | ||
} | ||
@@ -176,0 +176,0 @@ |
@@ -201,5 +201,5 @@ import { Layer } from '@deck.gl/core'; | ||
sideModel.setDrawMode(3); | ||
sideModel.render({ | ||
sideModel.setUniforms({ | ||
isWireframe: true | ||
}); | ||
}).draw(); | ||
} | ||
@@ -209,5 +209,5 @@ | ||
sideModel.setDrawMode(6); | ||
sideModel.render({ | ||
sideModel.setUniforms({ | ||
isWireframe: false | ||
}); | ||
}).draw(); | ||
} | ||
@@ -218,3 +218,3 @@ } | ||
topModel.setVertexCount(polygonTesselator.get('indices').length); | ||
topModel.render(renderUniforms); | ||
topModel.setUniforms(renderUniforms).draw(); | ||
} | ||
@@ -221,0 +221,0 @@ } |
@@ -56,3 +56,3 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck"; | ||
type: 'number', | ||
value: 1, | ||
value: 0, | ||
min: 0 | ||
@@ -179,7 +179,7 @@ }, | ||
var widthMultiplier = widthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
widthScale: widthScale * widthMultiplier, | ||
widthMinPixels: widthMinPixels, | ||
widthMaxPixels: widthMaxPixels | ||
})); | ||
})).draw(); | ||
} | ||
@@ -186,0 +186,0 @@ }, { |
@@ -176,3 +176,3 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck"; | ||
if (bitmapTexture && model) { | ||
model.render(Object.assign({}, uniforms, { | ||
model.setUniforms(Object.assign({}, uniforms, { | ||
bitmapTexture: bitmapTexture, | ||
@@ -182,3 +182,3 @@ desaturate: desaturate, | ||
tintColor: tintColor | ||
})); | ||
})).draw(); | ||
} | ||
@@ -185,0 +185,0 @@ } |
@@ -203,3 +203,3 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck"; | ||
angle = _this$props.angle; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
radius: radius, | ||
@@ -211,3 +211,3 @@ angle: angle / 180 * Math.PI, | ||
elevationScale: elevationScale | ||
})); | ||
})).draw(); | ||
} | ||
@@ -214,0 +214,0 @@ }, { |
@@ -46,3 +46,3 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck"; | ||
angle = _this$props.angle; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
radius: cellSize / 2, | ||
@@ -54,3 +54,3 @@ angle: angle, | ||
elevationScale: elevationScale | ||
})); | ||
})).draw(); | ||
} | ||
@@ -57,0 +57,0 @@ }]); |
@@ -228,3 +228,3 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck"; | ||
if (iconsTexture) { | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
iconsTexture: iconsTexture, | ||
@@ -236,3 +236,3 @@ iconsTextureDim: [iconsTexture.width, iconsTexture.height], | ||
billboard: billboard | ||
})); | ||
})).draw(); | ||
} | ||
@@ -239,0 +239,0 @@ } |
@@ -43,3 +43,3 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck"; | ||
type: 'number', | ||
value: 1, | ||
value: 0, | ||
min: 0 | ||
@@ -148,7 +148,7 @@ }, | ||
var widthMultiplier = widthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
widthScale: widthScale * widthMultiplier, | ||
widthMinPixels: widthMinPixels, | ||
widthMaxPixels: widthMaxPixels | ||
})); | ||
})).draw(); | ||
} | ||
@@ -155,0 +155,0 @@ }, { |
@@ -207,3 +207,3 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck"; | ||
var widthMultiplier = widthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
jointType: Number(rounded), | ||
@@ -215,3 +215,3 @@ alignMode: Number(dashJustified), | ||
widthMaxPixels: widthMaxPixels | ||
})); | ||
})).draw(); | ||
} | ||
@@ -218,0 +218,0 @@ }, { |
@@ -126,5 +126,5 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck"; | ||
var sizeMultiplier = sizeUnits === 'meters' ? viewport.distanceScales.pixelsPerMeter[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
radiusPixels: pointSize * sizeMultiplier | ||
})); | ||
})).draw(); | ||
} | ||
@@ -131,0 +131,0 @@ }, { |
@@ -22,3 +22,3 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck"; | ||
min: 0, | ||
value: 1 | ||
value: 0 | ||
}, | ||
@@ -39,3 +39,3 @@ radiusMaxPixels: { | ||
min: 0, | ||
value: 1 | ||
value: 0 | ||
}, | ||
@@ -186,3 +186,3 @@ lineWidthMaxPixels: { | ||
var widthMultiplier = lineWidthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1; | ||
this.state.model.render(Object.assign({}, uniforms, { | ||
this.state.model.setUniforms(Object.assign({}, uniforms, { | ||
stroked: stroked ? 1 : 0, | ||
@@ -196,3 +196,3 @@ filled: filled, | ||
lineWidthMaxPixels: lineWidthMaxPixels | ||
})); | ||
})).draw(); | ||
} | ||
@@ -199,0 +199,0 @@ }, { |
@@ -222,5 +222,5 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck"; | ||
sideModel.setDrawMode(3); | ||
sideModel.render({ | ||
sideModel.setUniforms({ | ||
isWireframe: true | ||
}); | ||
}).draw(); | ||
} | ||
@@ -230,5 +230,5 @@ | ||
sideModel.setDrawMode(6); | ||
sideModel.render({ | ||
sideModel.setUniforms({ | ||
isWireframe: false | ||
}); | ||
}).draw(); | ||
} | ||
@@ -239,3 +239,3 @@ } | ||
topModel.setVertexCount(polygonTesselator.get('indices').length); | ||
topModel.render(renderUniforms); | ||
topModel.setUniforms(renderUniforms).draw(); | ||
} | ||
@@ -242,0 +242,0 @@ } |
@@ -5,3 +5,3 @@ { | ||
"license": "MIT", | ||
"version": "7.0.0-beta.3", | ||
"version": "7.0.0-beta.4", | ||
"publishConfig": { | ||
@@ -25,3 +25,2 @@ "access": "public" | ||
"src", | ||
"dist.js", | ||
"dist.min.js" | ||
@@ -28,0 +27,0 @@ ], |
@@ -46,3 +46,3 @@ // Copyright (c) 2015 - 2017 Uber Technologies, Inc. | ||
widthScale: {type: 'number', value: 1, min: 0}, | ||
widthMinPixels: {type: 'number', value: 1, min: 0}, | ||
widthMinPixels: {type: 'number', value: 0, min: 0}, | ||
widthMaxPixels: {type: 'number', value: Number.MAX_SAFE_INTEGER, min: 0}, | ||
@@ -132,9 +132,11 @@ | ||
this.state.model.render( | ||
Object.assign({}, uniforms, { | ||
widthScale: widthScale * widthMultiplier, | ||
widthMinPixels, | ||
widthMaxPixels | ||
}) | ||
); | ||
this.state.model | ||
.setUniforms( | ||
Object.assign({}, uniforms, { | ||
widthScale: widthScale * widthMultiplier, | ||
widthMinPixels, | ||
widthMaxPixels | ||
}) | ||
) | ||
.draw(); | ||
} | ||
@@ -141,0 +143,0 @@ |
@@ -188,10 +188,12 @@ // Copyright (c) 2015 Uber Technologies, Inc. | ||
if (bitmapTexture && model) { | ||
model.render( | ||
Object.assign({}, uniforms, { | ||
bitmapTexture, | ||
desaturate, | ||
transparentColor, | ||
tintColor | ||
}) | ||
); | ||
model | ||
.setUniforms( | ||
Object.assign({}, uniforms, { | ||
bitmapTexture, | ||
desaturate, | ||
transparentColor, | ||
tintColor | ||
}) | ||
) | ||
.draw(); | ||
} | ||
@@ -198,0 +200,0 @@ } |
@@ -157,12 +157,14 @@ // Copyright (c) 2015 - 2017 Uber Technologies, Inc. | ||
this.state.model.render( | ||
Object.assign({}, uniforms, { | ||
radius, | ||
angle: (angle / 180) * Math.PI, | ||
offset, | ||
extruded, | ||
coverage, | ||
elevationScale | ||
}) | ||
); | ||
this.state.model | ||
.setUniforms( | ||
Object.assign({}, uniforms, { | ||
radius, | ||
angle: (angle / 180) * Math.PI, | ||
offset, | ||
extruded, | ||
coverage, | ||
elevationScale | ||
}) | ||
) | ||
.draw(); | ||
} | ||
@@ -169,0 +171,0 @@ |
@@ -38,12 +38,14 @@ // Copyright (c) 2015 - 2017 Uber Technologies, Inc. | ||
this.state.model.render( | ||
Object.assign({}, uniforms, { | ||
radius: cellSize / 2, | ||
angle, | ||
offset, | ||
extruded, | ||
coverage, | ||
elevationScale | ||
}) | ||
); | ||
this.state.model | ||
.setUniforms( | ||
Object.assign({}, uniforms, { | ||
radius: cellSize / 2, | ||
angle, | ||
offset, | ||
extruded, | ||
coverage, | ||
elevationScale | ||
}) | ||
) | ||
.draw(); | ||
} | ||
@@ -50,0 +52,0 @@ } |
@@ -184,13 +184,15 @@ // Copyright (c) 2015 - 2017 Uber Technologies, Inc. | ||
if (iconsTexture) { | ||
this.state.model.render( | ||
Object.assign({}, uniforms, { | ||
iconsTexture, | ||
iconsTextureDim: [iconsTexture.width, iconsTexture.height], | ||
sizeScale: | ||
sizeScale * (sizeUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1), | ||
sizeMinPixels, | ||
sizeMaxPixels, | ||
billboard | ||
}) | ||
); | ||
this.state.model | ||
.setUniforms( | ||
Object.assign({}, uniforms, { | ||
iconsTexture, | ||
iconsTextureDim: [iconsTexture.width, iconsTexture.height], | ||
sizeScale: | ||
sizeScale * (sizeUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1), | ||
sizeMinPixels, | ||
sizeMaxPixels, | ||
billboard | ||
}) | ||
) | ||
.draw(); | ||
} | ||
@@ -197,0 +199,0 @@ } |
@@ -41,3 +41,3 @@ // Copyright (c) 2015 - 2017 Uber Technologies, Inc. | ||
widthScale: {type: 'number', value: 1, min: 0}, | ||
widthMinPixels: {type: 'number', value: 1, min: 0}, | ||
widthMinPixels: {type: 'number', value: 0, min: 0}, | ||
widthMaxPixels: {type: 'number', value: Number.MAX_SAFE_INTEGER, min: 0}, | ||
@@ -111,9 +111,11 @@ | ||
this.state.model.render( | ||
Object.assign({}, uniforms, { | ||
widthScale: widthScale * widthMultiplier, | ||
widthMinPixels, | ||
widthMaxPixels | ||
}) | ||
); | ||
this.state.model | ||
.setUniforms( | ||
Object.assign({}, uniforms, { | ||
widthScale: widthScale * widthMultiplier, | ||
widthMinPixels, | ||
widthMaxPixels | ||
}) | ||
) | ||
.draw(); | ||
} | ||
@@ -120,0 +122,0 @@ |
@@ -161,12 +161,14 @@ // Copyright (c) 2015 - 2017 Uber Technologies, Inc. | ||
this.state.model.render( | ||
Object.assign({}, uniforms, { | ||
jointType: Number(rounded), | ||
alignMode: Number(dashJustified), | ||
widthScale: widthScale * widthMultiplier, | ||
miterLimit, | ||
widthMinPixels, | ||
widthMaxPixels | ||
}) | ||
); | ||
this.state.model | ||
.setUniforms( | ||
Object.assign({}, uniforms, { | ||
jointType: Number(rounded), | ||
alignMode: Number(dashJustified), | ||
widthScale: widthScale * widthMultiplier, | ||
miterLimit, | ||
widthMinPixels, | ||
widthMaxPixels | ||
}) | ||
) | ||
.draw(); | ||
} | ||
@@ -173,0 +175,0 @@ |
@@ -102,7 +102,9 @@ // Copyright (c) 2015 - 2017 Uber Technologies, Inc. | ||
this.state.model.render( | ||
Object.assign({}, uniforms, { | ||
radiusPixels: pointSize * sizeMultiplier | ||
}) | ||
); | ||
this.state.model | ||
.setUniforms( | ||
Object.assign({}, uniforms, { | ||
radiusPixels: pointSize * sizeMultiplier | ||
}) | ||
) | ||
.draw(); | ||
} | ||
@@ -109,0 +111,0 @@ |
@@ -33,3 +33,3 @@ // Copyright (c) 2015 - 2017 Uber Technologies, Inc. | ||
radiusScale: {type: 'number', min: 0, value: 1}, | ||
radiusMinPixels: {type: 'number', min: 0, value: 1}, // min point radius in pixels | ||
radiusMinPixels: {type: 'number', min: 0, value: 0}, // min point radius in pixels | ||
radiusMaxPixels: {type: 'number', min: 0, value: Number.MAX_SAFE_INTEGER}, // max point radius in pixels | ||
@@ -39,3 +39,3 @@ | ||
lineWidthScale: {type: 'number', min: 0, value: 1}, | ||
lineWidthMinPixels: {type: 'number', min: 0, value: 1}, | ||
lineWidthMinPixels: {type: 'number', min: 0, value: 0}, | ||
lineWidthMaxPixels: {type: 'number', min: 0, value: Number.MAX_SAFE_INTEGER}, | ||
@@ -135,14 +135,16 @@ | ||
this.state.model.render( | ||
Object.assign({}, uniforms, { | ||
stroked: stroked ? 1 : 0, | ||
filled, | ||
radiusScale, | ||
radiusMinPixels, | ||
radiusMaxPixels, | ||
lineWidthScale: lineWidthScale * widthMultiplier, | ||
lineWidthMinPixels, | ||
lineWidthMaxPixels | ||
}) | ||
); | ||
this.state.model | ||
.setUniforms( | ||
Object.assign({}, uniforms, { | ||
stroked: stroked ? 1 : 0, | ||
filled, | ||
radiusScale, | ||
radiusMinPixels, | ||
radiusMaxPixels, | ||
lineWidthScale: lineWidthScale * widthMultiplier, | ||
lineWidthMinPixels, | ||
lineWidthMaxPixels | ||
}) | ||
) | ||
.draw(); | ||
} | ||
@@ -149,0 +151,0 @@ |
@@ -216,7 +216,7 @@ // Copyright (c) 2015 - 2017 Uber Technologies, Inc. | ||
sideModel.setDrawMode(GL.LINE_STRIP); | ||
sideModel.render({isWireframe: true}); | ||
sideModel.setUniforms({isWireframe: true}).draw(); | ||
} | ||
if (filled) { | ||
sideModel.setDrawMode(GL.TRIANGLE_FAN); | ||
sideModel.render({isWireframe: false}); | ||
sideModel.setUniforms({isWireframe: false}).draw(); | ||
} | ||
@@ -227,3 +227,3 @@ } | ||
topModel.setVertexCount(polygonTesselator.get('indices').length); | ||
topModel.render(renderUniforms); | ||
topModel.setUniforms(renderUniforms).draw(); | ||
} | ||
@@ -230,0 +230,0 @@ } |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
2510072
32758