Merge pull request plotly#571 from monfera/fix-brain

etpinard · etpinard · commit b5c98271d326 · 2016-05-27T10:26:01.000-04:00
Fix to the default light positioning for the surface rendering case
diff --git a/src/traces/surface/attributes.js b/src/traces/surface/attributes.js
@@ -161,7 +161,7 @@ module.exports = {
             role: 'style',
             min: -1e5,
             max: 1e5,
-            dflt: 1e5,
+            dflt: 1e4,
             description: 'Numeric vector, representing the Y coordinate for each vertex.'
         },
         z: {
diff --git a/src/traces/surface/convert.js b/src/traces/surface/convert.js
@@ -335,13 +335,7 @@ proto.update = function(data) {
     }
 
     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;
-        }
+        surface.lightPosition = [data.lightposition.x, data.lightposition.y, data.lightposition.z];
     }
 
     if(alpha && alpha < 1) {
diff --git a/test/image/baselines/gl3d_surface-lighting.png b/test/image/baselines/gl3d_surface-lighting.png
diff --git a/test/image/mocks/gl3d_surface-lighting.json b/test/image/mocks/gl3d_surface-lighting.json
@@ -513,7 +513,7 @@
       "lightposition": {
         "x": 1e5,
         "y": 1e5,
-        "z": 1e5
+        "z": 1e4
       },
       "lighting": {
         "fresnel": 0.2,

Original file line number	Diff line number	Diff line change
`@@ -335,13 +335,7 @@ proto.update = function(data) {`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`if('lightposition' in data) {`
`338`		`- if(surface.lightPosition === void(0)) {`
`339`		`- surface.lightPosition = [data.lightposition.x, data.lightposition.y, data.lightposition.z];`
`340`		`- } else {`
`341`		`- surface.lightPosition.x = data.lightposition.x;`
`342`		`- surface.lightPosition.y = data.lightposition.y;`
`343`		`- surface.lightPosition.z = data.lightposition.z;`
`344`		`- }`
	`338`	`+ surface.lightPosition = [data.lightposition.x, data.lightposition.y, data.lightposition.z];`
`345`	`339`	`}`
`346`	`340`
`347`	`341`	`if(alpha && alpha < 1) {`