camera.projection.type

Author: archmoj

package-lock.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",

package.json

@@ -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)

src/plots/gl3d/layout/defaults.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'}),

src/plots/gl3d/layout/layout_attributes.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) {

src/plots/gl3d/scene.js

@@ -10,7 +10,7 @@
     "height": 600,
     "scene": {
       "camera": {
-        "ortho": true,
+        "projection": { "type": "orthographic" },
         "eye": {"x": 2.1, "y": 0.1, "z": 0.9}
       },
       "xaxis": {

test/image/mocks/gl3d_annotations_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,

test/image/mocks/gl3d_isosurface_9more-surfaces_between-ranges_orthographic.json

@@ -124,7 +124,7 @@
         "zerolinewidth": 5
       },
       "camera": {
-        "ortho": true,
+        "projection": { "type": "orthographic" },
         "eye": {
           "x": -1.75,
           "y": -0.75,

test/image/mocks/gl3d_mesh3d_surface3d_scatter3d_orthographic.json

@@ -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)}