camera.projection.type

archmoj · archmoj · commit 43e4a04c3202 · 2019-02-18T15:19:14.000-05:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "gl-mat4": "^1.2.0",
     "gl-mesh3d": "^2.0.7",
     "gl-plot2d": "^1.4.2",
-    "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#c7f8316a9c4182a2439fb45f3921a09405ac85a8",
+    "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#827c18c2510f678e91cc680d5886f9ca523051b4",
     "gl-pointcloud2d": "^1.0.2",
     "gl-scatter3d": "^1.1.6",
     "gl-select-box": "^1.0.3",
diff --git a/src/plots/gl3d/layout/defaults.js b/src/plots/gl3d/layout/defaults.js
@@ -68,7 +68,8 @@ function handleGl3dDefaults(sceneLayoutIn, sceneLayoutOut, coerce, opts) {
         coerce('camera.' + cameraKeys[j] + '.y');
         coerce('camera.' + cameraKeys[j] + '.z');
     }
-    coerce('camera.ortho');
+
+    coerce('camera.projection.type');
 
     /*
      * coerce to positive number (min 0) but also do not accept 0 (>0 not >=0)
diff --git a/src/plots/gl3d/layout/layout_attributes.js b/src/plots/gl3d/layout/layout_attributes.js
@@ -72,16 +72,21 @@ module.exports = {
                 'of this scene.'
             ].join(' ')
         }),
-        ortho: extendFlat({
-            valType: 'boolean',
-            role: 'info',
-            dflt: false,
-            editType: 'camera',
-            description: [
-                'Enable/disable orthographic camera.',
-                'Default is perspective.'
-            ].join(' ')
-        }),
+        projection: {
+            type: {
+                valType: 'enumerated',
+                role: 'info',
+                values: ['perspective', 'orthographic'],
+                dflt: 'perspective',
+                editType: 'camera',
+                description: [
+                    'Sets the projection type. The projection type could be',
+                    'either *perspective* or *orthographic*. The default is',
+                    '*perspective*.'
+                ].join(' ')
+            },
+            editType: 'camera'
+        },
         editType: 'camera'
     },
     domain: domainAttrs({name: 'scene', editType: 'plot'}),
diff --git a/src/plots/gl3d/scene.js b/src/plots/gl3d/scene.js
@@ -350,12 +350,13 @@ var proto = Scene.prototype;
 proto.initializeGLCamera = function() {
 
     var cameraData = this.fullSceneLayout.camera;
+    var ortho = (cameraData.projection.type === 'orthographic');
 
     this.camera = createCamera(this.container, {
         center: [cameraData.center.x, cameraData.center.y, cameraData.center.z],
         eye: [cameraData.eye.x, cameraData.eye.y, cameraData.eye.z],
         up: [cameraData.up.x, cameraData.up.y, cameraData.up.z],
-        ortho: cameraData.ortho,
+        ortho: ortho,
         zoomMin: 0.01,
         zoomMax: 100,
         mode: 'orbit'
@@ -750,7 +751,7 @@ function getLayoutCamera(camera) {
         up: {x: camera.up[0], y: camera.up[1], z: camera.up[2]},
         center: {x: camera.center[0], y: camera.center[1], z: camera.center[2]},
         eye: {x: camera.eye[0], y: camera.eye[1], z: camera.eye[2]},
-        ortho: !!camera.ortho
+        projection: {type: (camera.projection && camera.projection.type === 'orthographic') ? 'orthographic' : 'perspective'}
     };
 }
 
@@ -790,7 +791,7 @@ proto.saveCamera = function saveCamera(layout) {
                 }
             }
         }
-        if(cameraData.ortho !== cameraDataLastSave.ortho) hasChanged = true;
+        if(cameraData.projection.type !== cameraDataLastSave.projection.type) hasChanged = true;
     }
 
     if(hasChanged) {
diff --git a/test/image/mocks/gl3d_annotations_orthographic.json b/test/image/mocks/gl3d_annotations_orthographic.json
@@ -10,7 +10,7 @@
     "height": 600,
     "scene": {
       "camera": {
-        "ortho": true,
+        "projection": { "type": "orthographic" },
         "eye": {"x": 2.1, "y": 0.1, "z": 0.9}
       },
       "xaxis": {
diff --git a/test/image/mocks/gl3d_isosurface_9more-surfaces_between-ranges_orthographic.json b/test/image/mocks/gl3d_isosurface_9more-surfaces_between-ranges_orthographic.json
@@ -2646,7 +2646,7 @@
             "yaxis": { "nticks": 12 },
             "zaxis": { "nticks": 12 },
             "camera": {
-                "ortho": true,
+                "projection": { "type": "orthographic" },
                 "eye": {
                     "x": 1.5,
                     "y": 2.5,
diff --git a/test/image/mocks/gl3d_mesh3d_surface3d_scatter3d_orthographic.json b/test/image/mocks/gl3d_mesh3d_surface3d_scatter3d_orthographic.json
@@ -124,7 +124,7 @@
         "zerolinewidth": 5
       },
       "camera": {
-        "ortho": true,
+        "projection": { "type": "orthographic" },
         "eye": {
           "x": -1.75,
           "y": -0.75,
diff --git a/test/jasmine/tests/gl_plot_interact_basic_test.js b/test/jasmine/tests/gl_plot_interact_basic_test.js
@@ -11,7 +11,7 @@ var failTest = require('../assets/fail_test');
 
 // Expected shape of projection-related data
 var cameraStructure = {
-    ortho: jasmine.any(Boolean),
+    projection: {type: jasmine.any(String)},
     up: {x: jasmine.any(Number), y: jasmine.any(Number), z: jasmine.any(Number)},
     center: {x: jasmine.any(Number), y: jasmine.any(Number), z: jasmine.any(Number)},
     eye: {x: jasmine.any(Number), y: jasmine.any(Number), z: jasmine.any(Number)}

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ function handleGl3dDefaults(sceneLayoutIn, sceneLayoutOut, coerce, opts) {`
`68`	`68`	`coerce('camera.' + cameraKeys[j] + '.y');`
`69`	`69`	`coerce('camera.' + cameraKeys[j] + '.z');`
`70`	`70`	`}`
`71`		`- coerce('camera.ortho');`
	`71`	`+`
	`72`	`+ coerce('camera.projection.type');`
`72`	`73`
`73`	`74`	`/*`
`74`	`75`	`* coerce to positive number (min 0) but also do not accept 0 (>0 not >=0)`
Original file line number	Diff line number	Diff line change
`@@ -350,12 +350,13 @@ var proto = Scene.prototype;`
`350`	`350`	`proto.initializeGLCamera = function() {`
`351`	`351`
`352`	`352`	`var cameraData = this.fullSceneLayout.camera;`
	`353`	`+ var ortho = (cameraData.projection.type === 'orthographic');`
`353`	`354`
`354`	`355`	`this.camera = createCamera(this.container, {`
`355`	`356`	`center: [cameraData.center.x, cameraData.center.y, cameraData.center.z],`
`356`	`357`	`eye: [cameraData.eye.x, cameraData.eye.y, cameraData.eye.z],`
`357`	`358`	`up: [cameraData.up.x, cameraData.up.y, cameraData.up.z],`
`358`		`- ortho: cameraData.ortho,`
	`359`	`+ ortho: ortho,`
`359`	`360`	`zoomMin: 0.01,`
`360`	`361`	`zoomMax: 100,`
`361`	`362`	`mode: 'orbit'`
`@@ -750,7 +751,7 @@ function getLayoutCamera(camera) {`
`750`	`751`	`up: {x: camera.up[0], y: camera.up[1], z: camera.up[2]},`
`751`	`752`	`center: {x: camera.center[0], y: camera.center[1], z: camera.center[2]},`
`752`	`753`	`eye: {x: camera.eye[0], y: camera.eye[1], z: camera.eye[2]},`
`753`		`- ortho: !!camera.ortho`
	`754`	`+ projection: {type: (camera.projection && camera.projection.type === 'orthographic') ? 'orthographic' : 'perspective'}`
`754`	`755`	`};`
`755`	`756`	`}`
`756`	`757`
`@@ -790,7 +791,7 @@ proto.saveCamera = function saveCamera(layout) {`
`790`	`791`	`}`
`791`	`792`	`}`
`792`	`793`	`}`
`793`		`- if(cameraData.ortho !== cameraDataLastSave.ortho) hasChanged = true;`
	`794`	`+ if(cameraData.projection.type !== cameraDataLastSave.projection.type) hasChanged = true;`
`794`	`795`	`}`
`795`	`796`
`796`	`797`	`if(hasChanged) {`