Skip to content

Commit cfe9dd1

Browse files
committed
simplify unused code blocks to handle surface transparency
1 parent 13324e2 commit cfe9dd1

File tree

4 files changed

+4
-15
lines changed

4 files changed

+4
-15
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"gl-select-box": "^1.0.4",
9191
"gl-spikes2d": "^1.0.2",
9292
"gl-streamtube3d": "^1.4.1",
93-
"gl-surface3d": "git://github.com/gl-vis/gl-surface3d.git#77c2db23f81ba994047f82705afcfcc0d897e154",
93+
"gl-surface3d": "git://github.com/gl-vis/gl-surface3d.git#88fff861ee7f1ff44360fa9b649e236af770be34",
9494
"gl-text": "^1.1.8",
9595
"glslify": "^7.1.1",
9696
"has-hover": "^1.0.1",

src/traces/surface/convert.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,6 @@ proto.update = function(data) {
433433
var scene = this.scene;
434434
var sceneLayout = scene.fullSceneLayout;
435435
var surface = this.surface;
436-
var alpha = data.opacity;
437436
var colormap = parseColorScale(data);
438437
var scaleFactor = scene.dataScale;
439438
var xlen = data.z[0].length;
@@ -679,10 +678,6 @@ proto.update = function(data) {
679678
if('lightposition' in data) {
680679
surface.lightPosition = [data.lightposition.x, data.lightposition.y, data.lightposition.z];
681680
}
682-
683-
if(alpha && alpha < 1) {
684-
surface.supportsTransparency = true;
685-
}
686681
};
687682

688683
proto.dispose = function() {

test/image/compare_pixels_test.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ if(allMock || argv.filter) {
9393
allMockList = allMockList.filter(function(mockName) {
9494
var cond = !(
9595
mockName === 'font-wishlist' ||
96-
mockName === 'treemap_with-without_values' ||
97-
mockName === 'gl3d_surface-heatmap-treemap_transparent-colorscale' ||
9896
mockName.indexOf('mapbox_') !== -1
9997
);
10098
if(!cond) console.log(' -', mockName);
@@ -104,12 +102,8 @@ if(allMock || argv.filter) {
104102

105103
var FLAKY_LIST = [
106104
'treemap_coffee',
107-
'treemap_textposition',
108-
'treemap_sunburst_marker_colors',
109-
'gl3d_surface-lighting',
110-
'gl3d_surface_contour_start-end-size',
105+
'treemap_with-without_values',
111106
'gl3d_directions-streamtube1',
112-
'gl3d_traces-with-opacity',
113107
];
114108

115109
console.log('');

0 commit comments

Comments
 (0)