Merge remote-tracking branch 'origin/develop' into develop

Author: emxsys

worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/AtmosphereLayer.java

@@ -13,11 +13,13 @@
 import java.nio.ShortBuffer;
 import java.util.Arrays;
 
+import gov.nasa.worldwind.WorldWind;
 import gov.nasa.worldwind.geom.Location;
 import gov.nasa.worldwind.geom.Sector;
 import gov.nasa.worldwind.geom.Vec3;
 import gov.nasa.worldwind.layer.AbstractLayer;
 import gov.nasa.worldwind.render.BufferObject;
+import gov.nasa.worldwind.render.ImageOptions;
 import gov.nasa.worldwind.render.ImageSource;
 import gov.nasa.worldwind.render.RenderContext;
 import gov.nasa.worldwind.util.Pool;
@@ -27,6 +29,8 @@ public class AtmosphereLayer extends AbstractLayer {
 
     protected ImageSource nightImageSource;
 
+    protected ImageOptions nightImageOptions;
+
     protected Location lightLocation;
 
     protected Vec3 activeLightDirection = new Vec3();
@@ -41,18 +45,27 @@ public AtmosphereLayer() {
         this.setDisplayName("Atmosphere");
         this.setPickEnabled(false);
         this.nightImageSource = ImageSource.fromResource(R.drawable.dnb_land_ocean_ice_2012);
+        this.nightImageOptions = ImageOptions.fromImageFormat(WorldWind.IMAGE_FORMAT_RGB_565);
     }
 
     public ImageSource getNightImageSource() {
-        return nightImageSource;
+        return this.nightImageSource;
     }
 
     public void setNightImageSource(ImageSource nightImageSource) {
         this.nightImageSource = nightImageSource;
     }
 
+    public ImageOptions getNightImageOptions() {
+        return this.nightImageOptions;
+    }
+
+    public void setNightImageOptions(ImageOptions nightImageOptions) {
+        this.nightImageOptions = nightImageOptions;
+    }
+
     public Location getLightLocation() {
-        return lightLocation;
+        return this.lightLocation;
     }
 
     public void setLightLocation(Location location) {
@@ -129,7 +142,7 @@ protected void renderGround(RenderContext rc) {
         if (this.nightImageSource != null && this.lightLocation != null) {
             drawable.nightTexture = rc.getTexture(this.nightImageSource);
             if (drawable.nightTexture == null) {
-                drawable.nightTexture = rc.retrieveTexture(this.nightImageSource);
+                drawable.nightTexture = rc.retrieveTexture(this.nightImageSource, this.nightImageOptions);
             }
         } else {
             drawable.nightTexture = null;

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

@@ -133,6 +133,28 @@ public class WorldWind {
 
     }
 
+    /**
+     * {@link ImageFormat} constant indicating 32-bit RGBA_8888 image format.
+     */
+    public static final int IMAGE_FORMAT_RGBA_8888 = 0;
+
+    /**
+     * {@link ImageFormat} constant indicating 16-bit RGBA_565 image format.
+     */
+    public static final int IMAGE_FORMAT_RGB_565 = 1;
+
+    /**
+     * Image format indicates the in-memory representation for images displayed by World Wind components. Images are
+     * typically represented in the 32-bit RGBA_8888 format, the highest quality available. Components that do not
+     * require an alpha channel and want to conserve memory may use the 16-bit RGBA_565 format. Accepted values are
+     * {@link #IMAGE_FORMAT_RGBA_8888} and {@link #IMAGE_FORMAT_RGB_565}.
+     */
+    @IntDef({IMAGE_FORMAT_RGBA_8888, IMAGE_FORMAT_RGB_565})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface ImageFormat {
+
+    }
+
     /**
      * {@link NavigatorAction} constant indicating that the navigator has moved.
      */

worldwind/src/main/java/gov/nasa/worldwind/layer/BackgroundLayer.java

@@ -6,7 +6,9 @@
 package gov.nasa.worldwind.layer;
 
 import gov.nasa.worldwind.R;
+import gov.nasa.worldwind.WorldWind;
 import gov.nasa.worldwind.geom.Sector;
+import gov.nasa.worldwind.render.ImageOptions;
 import gov.nasa.worldwind.render.ImageSource;
 import gov.nasa.worldwind.shape.SurfaceImage;
 import gov.nasa.worldwind.util.Logger;
@@ -24,18 +26,19 @@ public class BackgroundLayer extends RenderableLayer {
      * associated with the World Window.
      */
     public BackgroundLayer() {
-        this(ImageSource.fromResource(R.drawable.gov_nasa_worldwind_worldtopobathy2004053));
+        this(ImageSource.fromResource(R.drawable.gov_nasa_worldwind_worldtopobathy2004053), ImageOptions.fromImageFormat(WorldWind.IMAGE_FORMAT_RGB_565));
     }
 
     /**
      * Constructs a background image layer with an image source. The image's dimensions must be no greater than 2048 x
      * 2048.
      *
-     * @param imageSource the image source
+     * @param imageSource  the image source
+     * @param imageOptions the image options, or null to use the default options
      *
      * @throws IllegalArgumentException If the image source is null
      */
-    public BackgroundLayer(ImageSource imageSource) {
+    public BackgroundLayer(ImageSource imageSource, ImageOptions imageOptions) {
         if (imageSource == null) {
             throw new IllegalArgumentException(
                 Logger.logMessage(Logger.ERROR, "BackgroundLayer", "constructor", "missingSource"));
@@ -47,6 +50,8 @@ public BackgroundLayer(ImageSource imageSource) {
         this.setPickEnabled(false);
 
         // Delegate display to the SurfaceImage shape.
-        this.addRenderable(new SurfaceImage(new Sector().setFullSphere(), imageSource));
+        SurfaceImage surfaceImage = new SurfaceImage(new Sector().setFullSphere(), imageSource);
+        surfaceImage.setImageOptions(imageOptions);
+        this.addRenderable(surfaceImage);
     }
 }

worldwind/src/main/java/gov/nasa/worldwind/layer/BlueMarbleLandsatLayer.java

@@ -8,6 +8,7 @@
 import gov.nasa.worldwind.WorldWind;
 import gov.nasa.worldwind.ogc.WmsGetMapUrlFactory;
 import gov.nasa.worldwind.ogc.WmsLayerConfig;
+import gov.nasa.worldwind.render.ImageOptions;
 import gov.nasa.worldwind.util.LevelSet;
 import gov.nasa.worldwind.util.LevelSetConfig;
 import gov.nasa.worldwind.util.Logger;
@@ -63,6 +64,10 @@ public BlueMarbleLandsatLayer(String serviceAddress) {
         landsatConfig.transparent = false; // combining BlueMarble and esat layers results in opaque images
         this.landsatUrlFactory = new WmsGetMapUrlFactory(landsatConfig);
 
+        // Configure this layer's image options to reduce memory usage by using a 16-bit format with no alpha.
+        ImageOptions imageOptions = new ImageOptions();
+        imageOptions.imageFormat = WorldWind.IMAGE_FORMAT_RGB_565;
+
         // Configure this layer's level set to capture the entire globe at 15m resolution.
         double metersPerPixel = 15;
         double radiansPerPixel = metersPerPixel / WorldWind.WGS84_SEMI_MAJOR_AXIS;
@@ -73,6 +78,7 @@ public BlueMarbleLandsatLayer(String serviceAddress) {
         this.setLevelSet(new LevelSet(levelsConfig));
         this.setTileUrlFactory(this);
         this.setImageFormat("image/png");
+        this.setImageOptions(imageOptions);
     }
 
     @Override

worldwind/src/main/java/gov/nasa/worldwind/layer/BlueMarbleLayer.java

@@ -5,9 +5,11 @@
 
 package gov.nasa.worldwind.layer;
 
+import gov.nasa.worldwind.WorldWind;
 import gov.nasa.worldwind.geom.Sector;
 import gov.nasa.worldwind.ogc.WmsLayer;
 import gov.nasa.worldwind.ogc.WmsLayerConfig;
+import gov.nasa.worldwind.render.ImageOptions;
 import gov.nasa.worldwind.util.Logger;
 
 /**
@@ -46,7 +48,11 @@ public BlueMarbleLayer(String serviceAddress) {
         config.coordinateSystem = "EPSG:4326";
         config.transparent = false; // the BlueMarble layer is opaque
 
+        ImageOptions imageOptions = new ImageOptions();
+        imageOptions.imageFormat = WorldWind.IMAGE_FORMAT_RGB_565; // exploit opaque imagery to reduce memory usage
+
         this.setDisplayName("Blue Marble");
         this.setConfiguration(new Sector().setFullSphere(), 500, config); // 500m resolution on Earth
+        this.setImageOptions(imageOptions);
     }
 }

worldwind/src/main/java/gov/nasa/worldwind/layer/TiledImageLayer.java

@@ -12,6 +12,7 @@
 import gov.nasa.worldwind.draw.DrawableSurfaceTexture;
 import gov.nasa.worldwind.geom.Matrix3;
 import gov.nasa.worldwind.geom.Sector;
+import gov.nasa.worldwind.render.ImageOptions;
 import gov.nasa.worldwind.render.ImageSource;
 import gov.nasa.worldwind.render.ImageTile;
 import gov.nasa.worldwind.render.RenderContext;
@@ -34,6 +35,8 @@ public class TiledImageLayer extends AbstractLayer implements TileFactory {
 
     protected String imageFormat;
 
+    protected ImageOptions imageOptions;
+
     protected double detailControl = 4;
 
     protected List<Tile> topLevelTiles = new ArrayList<>();
@@ -78,7 +81,7 @@ public void setLevelSet(LevelSet levelSet) {
     }
 
     protected TileUrlFactory getTileUrlFactory() {
-        return tileUrlFactory;
+        return this.tileUrlFactory;
     }
 
     protected void setTileUrlFactory(TileUrlFactory tileUrlFactory) {
@@ -87,16 +90,25 @@ protected void setTileUrlFactory(TileUrlFactory tileUrlFactory) {
     }
 
     protected String getImageFormat() {
-        return imageFormat;
+        return this.imageFormat;
     }
 
     protected void setImageFormat(String imageFormat) {
         this.imageFormat = imageFormat;
         this.invalidateTiles();
     }
 
+    public ImageOptions getImageOptions() {
+        return this.imageOptions;
+    }
+
+    public void setImageOptions(ImageOptions imageOptions) {
+        this.imageOptions = imageOptions;
+        this.invalidateTiles();
+    }
+
     public double getDetailControl() {
-        return detailControl;
+        return this.detailControl;
     }
 
     public void setDetailControl(double detailControl) {
@@ -184,7 +196,7 @@ protected void addTileOrDescendants(RenderContext rc, ImageTile tile) {
     protected void addTile(RenderContext rc, ImageTile tile) {
         Texture texture = rc.getTexture(tile.getImageSource()); // try to get the texture from the cache
         if (texture == null) {
-            texture = rc.retrieveTexture(tile.getImageSource()); // puts retrieved textures in the cache
+            texture = rc.retrieveTexture(tile.getImageSource(), this.imageOptions); // puts retrieved textures in the cache
         }
 
         if (texture != null) { // use the tile's own texture

worldwind/src/main/java/gov/nasa/worldwind/render/ImageOptions.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2016 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
+ */
+
+package gov.nasa.worldwind.render;
+
+import gov.nasa.worldwind.WorldWind;
+
+/**
+ * Options for images displayed by World Wind components.
+ */
+public class ImageOptions {
+
+    /**
+     * Indicates the in-memory representation for images displayed by World Wind components. By default, images are
+     * represented in the 32-bit RGBA_8888 format, the highest quality available. Components that do not require an
+     * alpha channel and want to conserve memory may use the 16-bit RGBA_565 format. Accepted values are {@link
+     * WorldWind#IMAGE_FORMAT_RGBA_8888} and {@link WorldWind#IMAGE_FORMAT_RGB_565}.
+     */
+    @WorldWind.ImageFormat
+    public int imageFormat = WorldWind.IMAGE_FORMAT_RGBA_8888;
+
+    /**
+     * Constructs an image options with default values.
+     */
+    public ImageOptions() {
+    }
+
+    /**
+     * Constructs an image options with an image format.
+     *
+     * @param imageFormat the image format to use. Accepted values are {@link WorldWind#IMAGE_FORMAT_RGBA_8888} and
+     *                    {@link WorldWind#IMAGE_FORMAT_RGB_565}.
+     *
+     * @return the new image options
+     */
+    public static ImageOptions fromImageFormat(@WorldWind.ImageFormat int imageFormat) {
+        ImageOptions imageOptions = new ImageOptions();
+        imageOptions.imageFormat = imageFormat;
+        return imageOptions;
+    }
+}