improved gl-plot3d scene and camera modules to fixed issue 3576 - lock jasmine test

Author: archmoj

package-lock.json

@@ -80,7 +80,7 @@
     "gl-mat4": "^1.2.0",
     "gl-mesh3d": "^2.0.8",
     "gl-plot2d": "^1.4.2",
-    "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#7f63b591d13a3065a05a23a5d5a55d2b0480f225",
+    "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#5f28e06ac02b248e6990ef385d2df49bb3a7baf8",
     "gl-pointcloud2d": "^1.0.2",
     "gl-scatter3d": "^1.2.0",
     "gl-select-box": "^1.0.3",

package.json

@@ -352,8 +352,6 @@ function Scene(options, fullLayout) {
     this.drawAnnotations = Registry.getComponentMethod('annotations3d', 'draw');
 
     initializeGLPlot(this, this.pixelRatio);
-
-    this.enableGLCameraMouseListener();
 }
 
 var proto = Scene.prototype;
@@ -372,16 +370,6 @@ proto.initializeGLCamera = function() {
         zoomMax: 100,
         mode: 'orbit'
     });
-
-    this.disableGLCameraMouseListener();
-};
-
-proto.enableGLCameraMouseListener = function() {
-    this.camera.mouseListener.enabled = true;
-};
-
-proto.disableGLCameraMouseListener = function() {
-    this.camera.mouseListener.enabled = false;
 };
 
 proto.recoverContext = function() {

src/plots/gl3d/scene.js

@@ -76,6 +76,11 @@ describe('Test gl3d before/after plot', function() {
             return delay(20)();
         }
 
+        function _clickOtherplace() {
+            mouseEvent('mouseover', 300, 300, {buttons: 1});
+            return delay(20)();
+        }
+
         _stayThere()
         .then(function() {
             gd = createGraphDiv();
@@ -118,11 +123,26 @@ describe('Test gl3d before/after plot', function() {
             expect(cameraAfter.center[0]).toBeCloseTo(0, 2, 'cameraAfter.center[0]');
             expect(cameraAfter.center[1]).toBeCloseTo(0, 2, 'cameraAfter.center[1]');
             expect(cameraAfter.center[2]).toBeCloseTo(0, 2, 'cameraAfter.center[2]');
-            expect(cameraAfter.eye[0]).not.toBeCloseTo(1.2, 2, 'cameraAfter.eye[0]');
-            expect(cameraAfter.eye[1]).not.toBeCloseTo(1.2, 2, 'cameraAfter.eye[1]');
-            expect(cameraAfter.eye[2]).not.toBeCloseTo(1.2, 2, 'cameraAfter.eye[2]');
+            expect(cameraAfter.eye[0]).toBeCloseTo(1.2, 2, 'cameraAfter.eye[0]');
+            expect(cameraAfter.eye[1]).toBeCloseTo(1.2, 2, 'cameraAfter.eye[1]');
+            expect(cameraAfter.eye[2]).toBeCloseTo(1.2, 2, 'cameraAfter.eye[2]');
             expect(cameraAfter.mouseListener.enabled === true);
         })
+        .then(_clickOtherplace)
+        .then(delay(20))
+        .then(function() {
+            var cameraFinal = gd._fullLayout.scene._scene.glplot.camera;
+            expect(cameraFinal.up[0]).toBeCloseTo(0, 2, 'cameraFinal.up[0]');
+            expect(cameraFinal.up[1]).toBeCloseTo(0, 2, 'cameraFinal.up[1]');
+            expect(cameraFinal.up[2]).toBeCloseTo(1, 2, 'cameraFinal.up[2]');
+            expect(cameraFinal.center[0]).toBeCloseTo(0, 2, 'cameraFinal.center[0]');
+            expect(cameraFinal.center[1]).toBeCloseTo(0, 2, 'cameraFinal.center[1]');
+            expect(cameraFinal.center[2]).toBeCloseTo(0, 2, 'cameraFinal.center[2]');
+            expect(cameraFinal.eye[0]).not.toBeCloseTo(1.2, 2, 'cameraFinal.eye[0]');
+            expect(cameraFinal.eye[1]).not.toBeCloseTo(1.2, 2, 'cameraFinal.eye[1]');
+            expect(cameraFinal.eye[2]).not.toBeCloseTo(1.2, 2, 'cameraFinal.eye[2]');
+            expect(cameraFinal.mouseListener.enabled === true);
+        })
         .then(done);
     });