Merge remote-tracking branch 'origin/feature/select-drag-listener' into develop

Author: EMaksymenko

worldwind/src/main/java/gov/nasa/worldwind/BasicWorldWindowController.java

@@ -26,7 +26,7 @@
 
 public class BasicWorldWindowController implements WorldWindowController, GestureListener {
 
-    private static final float ZOOM_FACTOR = 1.5f;
+    protected float zoomFactor = 1.5f;
 
     protected final WorldWindow wwd;
 
@@ -84,15 +84,27 @@ public BasicWorldWindowController(WorldWindow wwd) {
         this.selectDragDetector = new GestureDetector(wwd.getContext(), selectDragListener);
     }
 
+    public float getZoomFactor() {
+        return zoomFactor;
+    }
+
+    public void setZoomFactor(float zoomFactor) {
+        this.zoomFactor = zoomFactor;
+    }
+
     public void setSelectDragCallback(SelectDragCallback callback) {
         selectDragListener.setCallback(callback);
     }
 
-    public void resetOrientation(boolean headingOnly) {
+    public void resetOrientation(boolean heading, boolean tilt, boolean roll) {
         this.gestureDidBegin();
-        this.lookAt.heading = 0;
-        if(!headingOnly) {
+        if (heading) {
+            this.lookAt.heading = 0;
+        }
+        if (tilt) {
             this.lookAt.tilt = 0;
+        }
+        if (roll) {
             this.lookAt.roll = 0;
         }
         this.wwd.cameraFromLookAt(this.lookAt);
@@ -102,7 +114,7 @@ public void resetOrientation(boolean headingOnly) {
 
     public void zoomIn() {
         this.gestureDidBegin();
-        this.lookAt.range /= ZOOM_FACTOR;
+        this.lookAt.range /= zoomFactor;
         this.applyLimits(lookAt);
         this.wwd.cameraFromLookAt(this.lookAt);
         this.wwd.requestRedraw();
@@ -111,7 +123,7 @@ public void zoomIn() {
 
     public void zoomOut() {
         this.gestureDidBegin();
-        this.lookAt.range *= ZOOM_FACTOR;
+        this.lookAt.range *= zoomFactor;
         this.applyLimits(lookAt);
         this.wwd.cameraFromLookAt(this.lookAt);
         this.wwd.requestRedraw();