record glplot aspect in fullLayout aspectratio

Author: archmoj

package-lock.json

@@ -81,7 +81,7 @@
     "gl-mat4": "^1.2.0",
     "gl-mesh3d": "^2.1.1",
     "gl-plot2d": "^1.4.2",
-    "gl-plot3d": "^2.2.2",
+    "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#4d41ca21b3c0a25db8776ce92261995323bb62e8",
     "gl-pointcloud2d": "^1.0.2",
     "gl-scatter3d": "^1.2.2",
     "gl-select-box": "^1.0.3",

package.json

@@ -11,6 +11,7 @@
 
 var createCamera = require('gl-plot3d').createCamera;
 var createPlot = require('gl-plot3d').createScene;
+var mouseWheel = require('mouse-wheel');
 var getContext = require('webgl-context');
 var passiveSupported = require('has-passive-events');
 
@@ -243,7 +244,26 @@ function tryCreatePlot(scene, cameraObject, pixelRatio, canvas, gl) {
         }
     }
 
-    return failed < 2;
+    if(failed < 2) {
+        scene.wheelListener = mouseWheel(scene.glplot.canvas, function(dx, dy) {
+            // TODO remove now that we can disable scroll via scrollZoom?
+            if(scene.glplot.camera.keyBindingMode === false) return;
+            if(!scene.glplot.camera.enableWheel) return;
+
+            if(scene.glplot.camera._ortho) {
+                var s = (dx > dy) ? 1.1 : 1.0 / 1.1;
+
+                scene.fullSceneLayout.aspectratio.x = scene.glplot.aspect[0] *= s;
+                scene.fullSceneLayout.aspectratio.y = scene.glplot.aspect[1] *= s;
+                scene.fullSceneLayout.aspectratio.z = scene.glplot.aspect[2] *= s;
+
+                scene.glplot.redraw();
+            }
+        }, true);
+
+        return true;
+    }
+    return false;
 }
 
 function initializeGLPlot(scene, pixelRatio, canvas, gl) {

src/plots/gl3d/scene.js

@@ -906,6 +906,24 @@ describe('Test gl3d drag and wheel interactions', function() {
             return scroll(sceneTarget2);
         })
         .then(function() {
+            expect(
+                gd._fullLayout.scene2.aspectratio.x
+            ).toEqual(
+                gd._fullLayout.scene2._scene.glplot.aspect[0]
+            );
+
+            expect(
+                gd._fullLayout.scene2.aspectratio.y
+            ).toEqual(
+                gd._fullLayout.scene2._scene.glplot.aspect[1]
+            );
+
+            expect(
+                gd._fullLayout.scene2.aspectratio.z
+            ).toEqual(
+                gd._fullLayout.scene2._scene.glplot.aspect[2]
+            );
+
             _assertAndReset(2);
         })
         .catch(failTest)