Merge remote-tracking branch 'origin/feature/refactor-camera' into develop

# Conflicts:
#	worldwind-examples/src/main/java/gov/nasa/worldwindx/GeneralGlobeActivity.java
#	worldwind-examples/src/main/java/gov/nasa/worldwindx/PlacemarksMilStd2525Activity.java
#	worldwind-tutorials/src/main/java/gov/nasa/worldwindx/NavigatorEventFragment.java
#	worldwind/src/test/java/gov/nasa/worldwind/geom/FrustumTest.java

Author: EMaksymenko

worldwind-examples/src/main/java/gov/nasa/worldwindx/GeneralGlobeActivity.java

@@ -79,12 +79,8 @@ protected void onCreate(Bundle savedInstanceState) {
             // Update the status overlay views whenever the navigator stops moving,
             // and also it is moving but at an (arbitrary) maximum refresh rate of 20 Hz.
             if (eventAction == WorldWind.NAVIGATOR_STOPPED || elapsedTime > 50) {
-                // Pick terrain located behind the viewport center point
-                PickedObject terrainPickedObject = wwd.pick(wwd.getViewport().width / 2f, wwd.getViewport().height / 2f).terrainPickedObject();
-                Position terrainPosition = terrainPickedObject != null ? terrainPickedObject.getTerrainPosition() : null;
-
                 // Get the current camera state to apply to the overlays
-                event.getCamera().getAsLookAt(wwd.getGlobe(), wwd.getVerticalExaggeration(), terrainPosition, lookAt);
+                wwd.cameraAsLookAt(lookAt);
 
                 // Update the overlays
                 updateOverlayContents(lookAt, event.getCamera());

worldwind-examples/src/main/java/gov/nasa/worldwindx/OmnidirectionalSightlineActivity.java

@@ -89,7 +89,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // And finally, for this demo, position the viewer to look at the sightline position
         LookAt lookAt = new LookAt().set(pos.latitude, pos.longitude, pos.altitude, WorldWind.ABSOLUTE, 2e4 /*range*/, 0 /*heading*/, 45 /*tilt*/, 0 /*roll*/);
-        this.getWorldWindow().getCamera().setFromLookAt(this.wwd.getGlobe(), this.wwd.getVerticalExaggeration(), lookAt);
+        this.getWorldWindow().cameraFromLookAt(lookAt);
     }
 
     /**

worldwind-examples/src/main/java/gov/nasa/worldwindx/PathsExampleActivity.java

@@ -57,7 +57,7 @@ protected void onCreate(Bundle savedInstanceState) {
         WorldWindow wwd = this.getWorldWindow();
         LookAt lookAt = new LookAt().set(47.448982,-122.309311, 0, WorldWind.ABSOLUTE,
                 wwd.distanceToViewGlobeExtents() / 4 /*range*/, 0 /*heading*/, 60 /*tilt*/, 0 /*roll*/);
-        wwd.getCamera().setFromLookAt(wwd.getGlobe(), wwd.getVerticalExaggeration(), lookAt);
+        wwd.cameraFromLookAt(lookAt);
     }
 
     @Override

worldwind-examples/src/main/java/gov/nasa/worldwindx/PlacemarksMilStd2525Activity.java

@@ -39,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
         Position pos = Position.fromDegrees(32.420, 63.414, 0);
         LookAt lookAt = new LookAt(pos.latitude, pos.longitude, pos.altitude, WorldWind.ABSOLUTE,
                 2e4 /*range*/, 0 /*heading*/, 60 /*tilt*/, 0 /*roll*/);
-        this.getWorldWindow().getCamera().setFromLookAt(this.wwd.getGlobe(), this.wwd.getVerticalExaggeration(), lookAt);
+        this.getWorldWindow().cameraFromLookAt(lookAt);
 
         // The MIL-STD-2525 rendering library takes time initialize, we'll perform this task via the
         // AsyncTask's background thread and then load the symbols in its post execute handler.

worldwind-examples/src/main/java/gov/nasa/worldwindx/PlacemarksSelectDragActivity.java

@@ -172,7 +172,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // And finally, for this demo, position the viewer to look at the placemarks
         LookAt lookAt = new LookAt().set(34.150, -119.150, 0, WorldWind.ABSOLUTE, 2e4 /*range*/, 0 /*heading*/, 45 /*tilt*/, 0 /*roll*/);
-        this.getWorldWindow().getCamera().setFromLookAt(this.wwd.getGlobe(), this.wwd.getVerticalExaggeration(), lookAt);
+        this.getWorldWindow().cameraFromLookAt(lookAt);
     }
 
     /**

worldwind-tutorials/src/main/assets/look_at_view_tutorial.html

@@ -59,7 +59,7 @@ <h3>LookAtViewFragment.java</h3>
         // Apply the new view
         LookAt lookAt = new LookAt();
         lookAt.set(airport.latitude, airport.longitude, airport.altitude, WorldWind.ABSOLUTE, range, heading, tilt, 0 /*roll*/);
-        wwd.getCamera().setFromLookAt(wwd.getGlobe(), wwd.getVerticalExaggeration(), lookAt);
+        wwd.cameraFromLookAt(lookAt);
 
         return wwd;
     }

worldwind-tutorials/src/main/assets/navigator_events_tutorial.html

@@ -86,12 +86,8 @@ <h3>NavigatorEventFragment.java</h3>
                 // Update the status overlay views whenever the navigator stops moving,
                 // and also it is moving but at an (arbitrary) maximum refresh rate of 20 Hz.
                 if (eventAction == WorldWind.NAVIGATOR_STOPPED || elapsedTime > 50) {
-                    // Pick terrain located behind the viewport center point
-                    PickedObject terrainPickedObject = wwd.pick(wwd.getViewport().width / 2f, wwd.getViewport().height / 2f).terrainPickedObject();
-                    Position terrainPosition = terrainPickedObject != null ? terrainPickedObject.getTerrainPosition() : null;
-
                     // Get the current camera state to apply to the overlays
-                    event.getCamera().getAsLookAt(wwd.getGlobe(), wwd.getVerticalExaggeration(), terrainPosition, lookAt);
+                    wwd.cameraAsLookAt(lookAt);
 
                     // Update the overlays
                     updateOverlayContents(lookAt, event.getCamera());

worldwind-tutorials/src/main/assets/placemarks_picking_tutorial.html

@@ -63,7 +63,7 @@ <h3>PlacemarksPickingFragment.java</h3>
 
         // Position the viewer to look near the airports
         LookAt lookAt = new LookAt().set(34.15, -119.15, 0, WorldWind.ABSOLUTE, 2e4 /*range*/, 0 /*heading*/, 45 /*tilt*/, 0 /*roll*/);
-        wwd.getCamera().setFromLookAt(wwd.getGlobe(), wwd.getVerticalExaggeration(), lookAt);
+        wwd.cameraFromLookAt(lookAt);
 
         return wwd;
     }

worldwind-tutorials/src/main/assets/placemarks_tutorial.html

@@ -91,7 +91,7 @@ <h3>PlacemarksFragment.java</h3>
         Position pos = airport.getPosition();
         LookAt lookAt = new LookAt().set(pos.latitude, pos.longitude, pos.altitude, WorldWind.ABSOLUTE,
             1e5 /*range*/, 0 /*heading*/, 80 /*tilt*/, 0 /*roll*/);
-        wwd.getCamera().setFromLookAt(wwd.getGlobe(), wwd.getVerticalExaggeration(), lookAt);
+        wwd.cameraFromLookAt(lookAt);
 
         return wwd;
     }

worldwind-tutorials/src/main/java/gov/nasa/worldwindx/LookAtViewFragment.java

@@ -39,7 +39,7 @@ public WorldWindow createWorldWindow() {
         // Apply the new view
         LookAt lookAt = new LookAt();
         lookAt.set(airport.latitude, airport.longitude, airport.altitude, WorldWind.ABSOLUTE, range, heading, tilt, 0 /*roll*/);
-        wwd.getCamera().setFromLookAt(wwd.getGlobe(), wwd.getVerticalExaggeration(), lookAt);
+        wwd.cameraFromLookAt(lookAt);
 
         return wwd;
     }