Skip to content

Commit 0c4cebb

Browse files
authored
Merge pull request #4446 from plotly/mesh3d-intensity-mode
Add intensitymode to allow cell intensity values in mesh3d
2 parents ed26d23 + cd055e4 commit 0c4cebb

File tree

8 files changed

+2075
-10
lines changed

8 files changed

+2075
-10
lines changed

Diff for: package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"gl-heatmap2d": "^1.0.5",
8181
"gl-line3d": "^1.1.11",
8282
"gl-mat4": "^1.2.0",
83-
"gl-mesh3d": "^2.1.3",
83+
"gl-mesh3d": "^2.2.0",
8484
"gl-plot2d": "^1.4.2",
8585
"gl-plot3d": "^2.3.0",
8686
"gl-pointcloud2d": "^1.0.2",

Diff for: src/traces/mesh3d/attributes.js

+13-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,19 @@ module.exports = extendFlat({
144144
valType: 'data_array',
145145
editType: 'calc',
146146
description: [
147-
'Sets the vertex intensity values,',
148-
'used for plotting fields on meshes'
147+
'Sets the intensity values for vertices or cells',
148+
'as defined by `intensitymode`.',
149+
'It can be used for plotting fields on meshes.'
150+
].join(' ')
151+
},
152+
intensitymode: {
153+
valType: 'enumerated',
154+
values: ['vertex', 'cell'],
155+
dflt: 'vertex',
156+
editType: 'calc',
157+
role: 'info',
158+
description: [
159+
'Determines the source of `intensity` values.'
149160
].join(' ')
150161
},
151162

Diff for: src/traces/mesh3d/convert.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,9 @@ proto.update = function(data) {
160160
if(data.intensity) {
161161
var cOpts = extractOpts(data);
162162
this.color = '#fff';
163-
config.vertexIntensity = data.intensity;
164-
config.vertexIntensityBounds = [cOpts.min, cOpts.max];
163+
var mode = data.intensitymode;
164+
config[mode + 'Intensity'] = data.intensity;
165+
config[mode + 'IntensityBounds'] = [cOpts.min, cOpts.max];
165166
config.colormap = parseColorScale(data);
166167
} else if(data.vertexcolor) {
167168
this.color = data.vertexcolor[0];

Diff for: src/traces/mesh3d/defaults.js

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
7979

8080
if('intensity' in traceIn) {
8181
coerce('intensity');
82+
coerce('intensitymode');
8283
colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'c'});
8384
} else {
8485
traceOut.showscale = false;

Diff for: test/image/baselines/gl3d_mesh3d_cell-intensity.png

32.7 KB
Loading

0 commit comments

Comments
 (0)