Make vertexnormalsepsilon and facenormalsepsilon specific to mesh3d

Set a different default light position for surface vs mesh

Author: monfera

src/traces/mesh3d/attributes.js

@@ -124,8 +124,29 @@ module.exports = {
     reversescale: colorscaleAttrs.reversescale,
     showscale: colorscaleAttrs.showscale,
 
-    lightposition: extendFlat({}, surfaceAtts.lightposition),
-    lighting: extendFlat({}, surfaceAtts.lighting),
+    lightposition: {
+        'x': extendFlat({}, surfaceAtts.lightposition.x, {dflt: 1e5}),
+        'y': extendFlat({}, surfaceAtts.lightposition.y, {dflt: 1e5}),
+        'z': extendFlat({}, surfaceAtts.lightposition.z, {dflt: 0})
+    },
+    lighting: extendFlat({}, {
+        vertexnormalsepsilon: {
+            valType: 'number',
+            role: 'style',
+            min: 0.00,
+            max: 1,
+            dflt: 1e-12, // otherwise finely tessellated things eg. the brain will have no specular light reflection
+            description: 'Epsilon for vertex normals calculation avoids math issues arising from degenerate geometry.'
+        },
+        facenormalsepsilon: {
+            valType: 'number',
+            role: 'style',
+            min: 0.00,
+            max: 1,
+            dflt: 1e-6, // even the brain model doesn't appear to need finer than this
+            description: 'Epsilon for face normals calculation avoids math issues arising from degenerate geometry.'
+        }
+    }, surfaceAtts.lighting),
 
     _nestedModules: {  // nested module coupling
         'colorbar': 'Colorbar'

src/traces/surface/attributes.js

@@ -153,7 +153,7 @@ module.exports = {
             role: 'style',
             min: -1e5,
             max: 1e5,
-            dflt: 1e5,
+            dflt: 10,
             description: 'Numeric vector, representing the X coordinate for each vertex.'
         },
         y: {
@@ -217,22 +217,6 @@ module.exports = {
                 'Represents the reflectance as a dependency of the viewing angle; e.g. paper is reflective',
                 'when viewing it from the edge of the paper (almost 90 degrees), causing shine.'
             ].join(' ')
-        },
-        vertexnormalsepsilon: {
-            valType: 'number',
-            role: 'style',
-            min: 0.00,
-            max: 1,
-            dflt: 1e-12, // otherwise finely tessellated things eg. the brain will have no specular light reflection
-            description: 'Epsilon for vertex normals calculation avoids math issues arising from degenerate geometry.'
-        },
-        facenormalsepsilon: {
-            valType: 'number',
-            role: 'style',
-            min: 0.00,
-            max: 1,
-            dflt: 1e-6, // even the brain model doesn't appear to need finer than this
-            description: 'Epsilon for face normals calculation avoids math issues arising from degenerate geometry.'
         }
     },
 

src/traces/surface/convert.js

@@ -334,6 +334,16 @@ proto.update = function(data) {
         surface.fresnel = data.lighting.fresnel;
     }
 
+    if('lightposition' in data) {
+        if(surface.lightPosition === void(0)) {
+            surface.lightPosition = [data.lightposition.x, data.lightposition.y, data.lightposition.z];
+        } else {
+            surface.lightPosition.x = data.lightposition.x;
+            surface.lightPosition.y = data.lightposition.y;
+            surface.lightPosition.z = data.lightposition.z;
+        }
+    }
+
     if(alpha && alpha < 1) {
         surface.supportsTransparency = true;
     }