diff --git a/worldwind-examples/src/main/java/gov/nasa/worldwindx/BasicGlobeActivity.java b/worldwind-examples/src/main/java/gov/nasa/worldwindx/BasicGlobeActivity.java index 91d62c5a1..74a7b2415 100644 --- a/worldwind-examples/src/main/java/gov/nasa/worldwindx/BasicGlobeActivity.java +++ b/worldwind-examples/src/main/java/gov/nasa/worldwindx/BasicGlobeActivity.java @@ -12,7 +12,7 @@ import gov.nasa.worldwind.globe.BasicElevationCoverage; import gov.nasa.worldwind.layer.BackgroundLayer; import gov.nasa.worldwind.layer.BlueMarbleLandsatLayer; -import gov.nasa.worldwindx.experimental.AtmosphereLayer; +import gov.nasa.worldwind.layer.atmosphere.AtmosphereLayer; /** * Creates a simple view of a globe with touch navigation and a few layers. diff --git a/worldwind-examples/src/main/java/gov/nasa/worldwindx/DayNightCycleActivity.java b/worldwind-examples/src/main/java/gov/nasa/worldwindx/DayNightCycleActivity.java index 5e27fb0ff..cb1297e91 100644 --- a/worldwind-examples/src/main/java/gov/nasa/worldwindx/DayNightCycleActivity.java +++ b/worldwind-examples/src/main/java/gov/nasa/worldwindx/DayNightCycleActivity.java @@ -11,7 +11,7 @@ import gov.nasa.worldwind.Navigator; import gov.nasa.worldwind.geom.Location; import gov.nasa.worldwind.layer.LayerList; -import gov.nasa.worldwindx.experimental.AtmosphereLayer; +import gov.nasa.worldwind.layer.atmosphere.AtmosphereLayer; public class DayNightCycleActivity extends BasicGlobeActivity implements Choreographer.FrameCallback { diff --git a/worldwind-examples/src/main/java/gov/nasa/worldwindx/MultiGlobeActivity.java b/worldwind-examples/src/main/java/gov/nasa/worldwindx/MultiGlobeActivity.java index 6dbef6e4a..5d3a58835 100644 --- a/worldwind-examples/src/main/java/gov/nasa/worldwindx/MultiGlobeActivity.java +++ b/worldwind-examples/src/main/java/gov/nasa/worldwindx/MultiGlobeActivity.java @@ -15,7 +15,7 @@ import gov.nasa.worldwind.WorldWindow; import gov.nasa.worldwind.layer.BackgroundLayer; import gov.nasa.worldwind.layer.BlueMarbleLandsatLayer; -import gov.nasa.worldwindx.experimental.AtmosphereLayer; +import gov.nasa.worldwind.layer.atmosphere.AtmosphereLayer; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; diff --git a/worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/AtmosphereLayer.java b/worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/AtmosphereLayer.java similarity index 99% rename from worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/AtmosphereLayer.java rename to worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/AtmosphereLayer.java index 554041bc3..43c160c40 100644 --- a/worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/AtmosphereLayer.java +++ b/worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/AtmosphereLayer.java @@ -3,7 +3,7 @@ * National Aeronautics and Space Administration. All Rights Reserved. */ -package gov.nasa.worldwindx.experimental; +package gov.nasa.worldwind.layer.atmosphere; import android.opengl.GLES20; @@ -23,7 +23,7 @@ import gov.nasa.worldwind.render.ImageSource; import gov.nasa.worldwind.render.RenderContext; import gov.nasa.worldwind.util.Pool; -import gov.nasa.worldwindx.R; +import gov.nasa.worldwind.R; public class AtmosphereLayer extends AbstractLayer { diff --git a/worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/AtmosphereProgram.java b/worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/AtmosphereProgram.java similarity index 99% rename from worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/AtmosphereProgram.java rename to worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/AtmosphereProgram.java index 7501d3793..5826a3230 100644 --- a/worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/AtmosphereProgram.java +++ b/worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/AtmosphereProgram.java @@ -3,7 +3,7 @@ * National Aeronautics and Space Administration. All Rights Reserved. */ -package gov.nasa.worldwindx.experimental; +package gov.nasa.worldwind.layer.atmosphere; import android.opengl.GLES20; import android.support.annotation.IntDef; diff --git a/worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/DrawableGroundAtmosphere.java b/worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/DrawableGroundAtmosphere.java similarity index 99% rename from worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/DrawableGroundAtmosphere.java rename to worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/DrawableGroundAtmosphere.java index 7639e6d25..18d83b489 100644 --- a/worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/DrawableGroundAtmosphere.java +++ b/worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/DrawableGroundAtmosphere.java @@ -3,7 +3,7 @@ * National Aeronautics and Space Administration. All Rights Reserved. */ -package gov.nasa.worldwindx.experimental; +package gov.nasa.worldwind.layer.atmosphere; import android.opengl.GLES20; diff --git a/worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/DrawableSkyAtmosphere.java b/worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/DrawableSkyAtmosphere.java similarity index 98% rename from worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/DrawableSkyAtmosphere.java rename to worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/DrawableSkyAtmosphere.java index 683cdf6a7..3aa2bf9db 100644 --- a/worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/DrawableSkyAtmosphere.java +++ b/worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/DrawableSkyAtmosphere.java @@ -3,7 +3,7 @@ * National Aeronautics and Space Administration. All Rights Reserved. */ -package gov.nasa.worldwindx.experimental; +package gov.nasa.worldwind.layer.atmosphere; import android.opengl.GLES20; diff --git a/worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/GroundProgram.java b/worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/GroundProgram.java similarity index 92% rename from worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/GroundProgram.java rename to worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/GroundProgram.java index de534de1e..5309b0c08 100644 --- a/worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/GroundProgram.java +++ b/worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/GroundProgram.java @@ -3,13 +3,13 @@ * National Aeronautics and Space Administration. All Rights Reserved. */ -package gov.nasa.worldwindx.experimental; +package gov.nasa.worldwind.layer.atmosphere; import android.content.res.Resources; import gov.nasa.worldwind.util.Logger; import gov.nasa.worldwind.util.WWUtil; -import gov.nasa.worldwindx.R; +import gov.nasa.worldwind.R; public class GroundProgram extends AtmosphereProgram { diff --git a/worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/SkyProgram.java b/worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/SkyProgram.java similarity index 92% rename from worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/SkyProgram.java rename to worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/SkyProgram.java index 14e5f92dc..7bba178ab 100644 --- a/worldwind-examples/src/main/java/gov/nasa/worldwindx/experimental/SkyProgram.java +++ b/worldwind/src/main/java/gov/nasa/worldwind/layer/atmosphere/SkyProgram.java @@ -3,13 +3,13 @@ * National Aeronautics and Space Administration. All Rights Reserved. */ -package gov.nasa.worldwindx.experimental; +package gov.nasa.worldwind.layer.atmosphere; import android.content.res.Resources; import gov.nasa.worldwind.util.Logger; import gov.nasa.worldwind.util.WWUtil; -import gov.nasa.worldwindx.R; +import gov.nasa.worldwind.R; public class SkyProgram extends AtmosphereProgram { diff --git a/worldwind-examples/src/main/res/drawable/dnb_land_ocean_ice_2012.png b/worldwind/src/main/res/drawable/dnb_land_ocean_ice_2012.png similarity index 100% rename from worldwind-examples/src/main/res/drawable/dnb_land_ocean_ice_2012.png rename to worldwind/src/main/res/drawable/dnb_land_ocean_ice_2012.png diff --git a/worldwind-examples/src/main/res/raw/gov_nasa_worldwind_groundprogram_frag.glsl b/worldwind/src/main/res/raw/gov_nasa_worldwind_groundprogram_frag.glsl similarity index 100% rename from worldwind-examples/src/main/res/raw/gov_nasa_worldwind_groundprogram_frag.glsl rename to worldwind/src/main/res/raw/gov_nasa_worldwind_groundprogram_frag.glsl diff --git a/worldwind-examples/src/main/res/raw/gov_nasa_worldwind_groundprogram_vert.glsl b/worldwind/src/main/res/raw/gov_nasa_worldwind_groundprogram_vert.glsl similarity index 100% rename from worldwind-examples/src/main/res/raw/gov_nasa_worldwind_groundprogram_vert.glsl rename to worldwind/src/main/res/raw/gov_nasa_worldwind_groundprogram_vert.glsl diff --git a/worldwind-examples/src/main/res/raw/gov_nasa_worldwind_skyprogram_frag.glsl b/worldwind/src/main/res/raw/gov_nasa_worldwind_skyprogram_frag.glsl similarity index 100% rename from worldwind-examples/src/main/res/raw/gov_nasa_worldwind_skyprogram_frag.glsl rename to worldwind/src/main/res/raw/gov_nasa_worldwind_skyprogram_frag.glsl diff --git a/worldwind-examples/src/main/res/raw/gov_nasa_worldwind_skyprogram_vert.glsl b/worldwind/src/main/res/raw/gov_nasa_worldwind_skyprogram_vert.glsl similarity index 100% rename from worldwind-examples/src/main/res/raw/gov_nasa_worldwind_skyprogram_vert.glsl rename to worldwind/src/main/res/raw/gov_nasa_worldwind_skyprogram_vert.glsl