pass gl-mesh3d lighting params

Author: etpinard

src/traces/cone/attributes.js

@@ -161,7 +161,7 @@ extendFlat(attrs, colorAttrs('', 'calc', true), {
 });
 delete attrs.color;
 
-var fromMesh3d = ['opacity', 'flatshading', 'lightposition', 'lighting'];
+var fromMesh3d = ['opacity', 'lightposition', 'lighting'];
 
 fromMesh3d.forEach(function(k) {
     attrs[k] = mesh3dAttrs[k];

src/traces/cone/convert.js

@@ -98,6 +98,15 @@ function convert(scene, trace) {
     // stash positions for gl-scatter3d 'hover' trace
     meshData._pts = coneOpts.positions;
 
+    // pass gl-mesh3d lighting attributes
+    meshData.lightPosition = [trace.lightposition.x, trace.lightposition.y, trace.lightposition.z];
+    meshData.ambient = trace.lighting.ambient;
+    meshData.diffuse = trace.lighting.diffuse;
+    meshData.specular = trace.lighting.specular;
+    meshData.roughness = trace.lighting.roughness;
+    meshData.fresnel = trace.lighting.fresnel;
+    meshData.opacity = trace.opacity;
+
     return meshData;
 }
 

src/traces/cone/defaults.js

@@ -40,14 +40,11 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     coerce('anchor');
 
-    // TODO do these attributes work?
     coerce('lighting.ambient');
     coerce('lighting.diffuse');
     coerce('lighting.specular');
     coerce('lighting.roughness');
     coerce('lighting.fresnel');
-    coerce('lighting.vertexnormalsepsilon');
-    coerce('lighting.facenormalsepsilon');
     coerce('lightposition.x');
     coerce('lightposition.y');
     coerce('lightposition.z');

src/traces/cone/index.js

@@ -12,7 +12,7 @@ module.exports = {
     moduleType: 'trace',
     name: 'cone',
     basePlotModule: require('../../plots/gl3d'),
-    categories: ['gl3d', '2dMap', 'noOpacity'],
+    categories: ['gl3d'],
 
     attributes: require('./attributes'),
     supplyDefaults: require('./defaults'),

test/image/baselines/gl3d_cone-lighting.png

@@ -0,0 +1,118 @@
+{
+  "data": [
+    {
+      "type": "cone",
+      "name": "base",
+      "x": [1, 1, 1],
+      "y": [1, 2, 3],
+      "z": [1, 1, 1],
+      "u": [1, 2, 3],
+      "v": [1, 1, 2],
+      "w": [4, 4, 1],
+      "hoverinfo": "u+v+w+name",
+      "showscale": false
+    },
+    {
+      "type": "cone",
+      "name": "opacity:0.3",
+      "x": [2, 2, 2],
+      "y": [1, 2, 3],
+      "z": [1, 1, 1],
+      "u": [1, 2, 3],
+      "v": [1, 1, 2],
+      "w": [4, 4, 1],
+      "hoverinfo": "u+v+w+name",
+      "showscale": false,
+      "opacity": 0.3
+    },
+    {
+      "type": "cone",
+      "name": "lighting.ambient:0.3",
+      "x": [3, 3, 3],
+      "y": [1, 2, 3],
+      "z": [1, 1, 1],
+      "u": [1, 2, 3],
+      "v": [1, 1, 2],
+      "w": [4, 4, 1],
+      "hoverinfo": "u+v+w+name",
+      "showscale": false,
+      "lighting": {"ambient": 0.3}
+    },
+    {
+      "type": "cone",
+      "name": "lighting.diffuse:0.3",
+      "x": [4, 4, 4],
+      "y": [1, 2, 3],
+      "z": [1, 1, 1],
+      "u": [1, 2, 3],
+      "v": [1, 1, 2],
+      "w": [4, 4, 1],
+      "hoverinfo": "u+v+w+name",
+      "showscale": false,
+      "lighting": {"diffuse": 0.3}
+    },
+    {
+      "type": "cone",
+      "name": "lighting.specular:2",
+      "x": [5, 5, 5],
+      "y": [1, 2, 3],
+      "z": [1, 1, 1],
+      "u": [1, 2, 3],
+      "v": [1, 1, 2],
+      "w": [4, 4, 1],
+      "hoverinfo": "u+v+w+name",
+      "showscale": false,
+      "lighting": {"specular": 2}
+    },
+    {
+      "type": "cone",
+      "name": "lighting.roughness:1",
+      "x": [6, 6, 6],
+      "y": [1, 2, 3],
+      "z": [1, 1, 1],
+      "u": [1, 2, 3],
+      "v": [1, 1, 2],
+      "w": [4, 4, 1],
+      "hoverinfo": "u+v+w+name",
+      "showscale": false,
+      "lighting": {"roughness": 1}
+    },
+    {
+      "type": "cone",
+      "name": "lighting.fresnel:2",
+      "x": [7, 7, 7],
+      "y": [1, 2, 3],
+      "z": [1, 1, 1],
+      "u": [1, 2, 3],
+      "v": [1, 1, 2],
+      "w": [4, 4, 1],
+      "hoverinfo": "u+v+w+name",
+      "showscale": false,
+      "lighting": {"fresnel": 2}
+    },
+    {
+      "type": "cone",
+      "name": "lighting.position x:0,y:0,z:1e5",
+      "x": [8, 8, 8],
+      "y": [1, 2, 3],
+      "z": [1, 1, 1],
+      "u": [1, 2, 3],
+      "v": [1, 1, 2],
+      "w": [4, 4, 1],
+      "hoverinfo": "u+v+w+name",
+      "showscale": false,
+      "lightposition": {"x": 0, "y": 0, "z": 1e5}
+    }
+  ],
+  "layout": {
+    "scene": {
+      "aspectmode": "data",
+      "camera": {
+        "eye": {"x": 0.05, "y": -2.6, "z": 2}
+      }
+    },
+    "width": 500,
+    "height": 500,
+    "margin": {"t": 0, "b": 0, "l": 0, "r": 0}
+  }
+}