Change default mouse handling.

CesiumGS · Jun 20, 2012 · 22a5d63 · 22a5d63 · emackey · Jun 20, 2012
1 parent b3683b0
commit 22a5d63
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Source/Scene/Camera2DController.js b/Source/Scene/Camera2DController.js
@@ -73,9 +73,9 @@ define([
         this._maximumZoomRate = FAR;
 
         this._translateHandler = new CameraEventHandler(canvas, CameraEventType.LEFT_DRAG);
-        this._zoomHandler = new CameraEventHandler(canvas, CameraEventType.RIGHT_DRAG);
+        this._zoomHandler = new CameraEventHandler(canvas, CameraEventType.MIDDLE_DRAG);
         this._zoomWheel = new CameraEventHandler(canvas, CameraEventType.WHEEL);
-        this._twistHandler = new CameraEventHandler(canvas, CameraEventType.MIDDLE_DRAG);
+        this._twistHandler = new CameraEventHandler(canvas, CameraEventType.RIGHT_DRAG);
 
         this._lastInertiaTranslateMovement = undefined;
         this._lastInertiaZoomMovement = undefined;

diff --git a/Source/Scene/CameraColumbusViewController.js b/Source/Scene/CameraColumbusViewController.js
@@ -56,12 +56,13 @@ define([
         // TODO: Shouldn't change private variables like this, need to be able to change event modifiers
         //       on controllers.
         this._spindleController._spinHandler = this._spindleController._spinHandler && this._spindleController._spinHandler.destroy();
+        this._spindleController._spinHandler = new CameraEventHandler(canvas, CameraEventType.RIGHT_DRAG);
+        this._spindleController.mouseConstrainedZAxis = true;
 
         this._freeLookController = new CameraFreeLookController(canvas, camera);
         this._freeLookController.horizontalRotationAxis = Cartesian3.UNIT_Z;
 
         this._transform = this._camera.transform.clone();
-
         this._lastInertiaTranslateMovement = undefined;
     }
 
@@ -83,6 +84,8 @@ define([
         this._spindleController.update();
         this._freeLookController.update();
 
+        this._updateReferenceFrame();
+
         return true;
     };
 
@@ -99,8 +102,6 @@ define([
 
         var diff = startPlanePos.subtract(endPlanePos);
         camera.position = camera.position.add(diff);
-
-        this._updateReferenceFrame();
     };
 
     CameraColumbusViewController.prototype._updateReferenceFrame = function() {

diff --git a/Source/Scene/CameraSpindleController.js b/Source/Scene/CameraSpindleController.js
@@ -98,7 +98,7 @@ define([
         this._minimumRotateRate = 1.0 / 5000.0;
 
         this._spinHandler = new CameraEventHandler(canvas, CameraEventType.LEFT_DRAG);
-        this._zoomHandler = new CameraEventHandler(canvas, CameraEventType.RIGHT_DRAG);
+        this._zoomHandler = new CameraEventHandler(canvas, CameraEventType.MIDDLE_DRAG);
         this._zoomWheel = new CameraEventHandler(canvas, CameraEventType.WHEEL);
 
         this._lastInertiaSpinMovement = undefined;