[osgearth] 04/13: Merge tag 'upstream/2.7.0+dfsg'

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sun Jul 26 21:27:24 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository osgearth.

commit a7786d05e1fdac0880918ac23e150dc2c4c5a915
Merge: 962f13e 947a70e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 26 13:49:28 2015 +0200

    Merge tag 'upstream/2.7.0+dfsg'
    
    Upstream version 2.7.0+dfsg

 CMakeLists.txt                                     |    8 +-
 CMakeModules/ConfigureShaders.cmake.in             |   35 +
 CMakeModules/FindLevelDB.cmake                     |    1 +
 CMakeModules/ModuleInstall.cmake                   |   13 +-
 .../ModuleInstallOsgEarthDriverIncludes.cmake      |    2 +-
 CMakeModules/OsgEarthMacroUtils.cmake              |  163 +-
 README.txt                                         |   14 +-
 docs/source/data.rst                               |    2 +-
 docs/source/developer/shader_composition.rst       |  302 ++-
 docs/source/faq.rst                                |   54 +-
 docs/source/index.rst                              |   13 +-
 docs/source/install.rst                            |    4 +-
 docs/source/references/drivers/feature/ogr.rst     |   14 +-
 docs/source/references/drivers/terrain/mp.rst      |    2 +-
 docs/source/references/drivers/tile/index.rst      |    1 +
 docs/source/references/drivers/tile/quadkey.rst    |   27 +
 docs/source/references/earthfile.rst               |   77 +-
 docs/source/references/envvars.rst                 |    4 +-
 docs/source/references/symbology.rst               |   13 +
 docs/source/releasenotes.rst                       |   33 +
 docs/source/startup.rst                            |   12 +-
 docs/source/user/caching.rst                       |    1 +
 docs/source/user/earthfiles.rst                    |    2 +-
 docs/source/user/features.rst                      |   41 +-
 docs/source/user/tools.rst                         |  101 +-
 src/CMakeLists.txt                                 |    4 +-
 src/applications/CMakeLists.txt                    |    8 +-
 .../osgearth_annotation/osgearth_annotation.cpp    |  156 +-
 src/applications/osgearth_atlas/osgearth_atlas.cpp |   18 +-
 .../osgearth_backfill/osgearth_backfill.cpp        |    2 +-
 src/applications/osgearth_boundarygen/BoundaryUtil |   13 +-
 .../osgearth_boundarygen/BoundaryUtil.cpp          |   13 +-
 .../osgearth_boundarygen/VertexCollectionVisitor   |   13 +-
 .../VertexCollectionVisitor.cpp                    |   13 +-
 .../osgearth_boundarygen/boundarygen.cpp           |   13 +-
 .../osgearth_cache_test/CMakeLists.txt             |    7 +
 .../osgearth_cache_test/osgearth_cache_test.cpp    |   96 +
 src/applications/osgearth_city/osgearth_city.cpp   |   25 +-
 src/applications/osgearth_clamp/osgearth_clamp.cpp |   15 +-
 .../osgearth_clipplane/osgearth_clipplane.cpp      |   15 +-
 .../osgearth_colorfilter/osgearth_colorfilter.cpp  |   13 +-
 .../osgearth_controls/osgearth_controls.cpp        |   13 +-
 src/applications/osgearth_conv/osgearth_conv.cpp   |   13 +-
 .../osgearth_createtile/CMakeLists.txt             |    7 +
 .../osgearth_createtile/osgearth_createtile.cpp    |  243 ++
 src/applications/osgearth_demo/osgearth_demo.cpp   |   13 +-
 .../osgearth_elevation/osgearth_elevation.cpp      |   30 +-
 .../osgearth_featureeditor.cpp                     |   25 +-
 .../osgearth_featurefilter.cpp                     |   15 +-
 .../osgearth_featureinfo/osgearth_featureinfo.cpp  |   13 +-
 .../osgearth_featurequery.cpp                      |  115 +-
 .../osgearth_features/osgearth_features.cpp        |   13 +-
 src/applications/osgearth_fog/osgearth_fog.cpp     |   13 +-
 .../osgearth_graticule/osgearth_graticule.cpp      |  107 +-
 .../osgearth_imageoverlay.cpp                      |   13 +-
 src/applications/osgearth_los/osgearth_los.cpp     |   62 +-
 src/applications/osgearth_manip/osgearth_manip.cpp |  389 ++-
 src/applications/osgearth_map/osgearth_map.cpp     |   16 +-
 .../osgearth_measure/osgearth_measure.cpp          |   13 +-
 .../osgearth_minimap/osgearth_minimap.cpp          |  127 +-
 src/applications/osgearth_mrt/osgearth_mrt.cpp     |   17 +-
 .../osgearth_occlusionculling.cpp                  |   13 +-
 .../osgearth_overlayviewer.cpp                     |   18 +-
 .../osgearth_package/osgearth_package.cpp          |    8 +-
 src/applications/osgearth_package_qt/ExportDialog  |   13 +-
 .../osgearth_package_qt/ExportDialog.cpp           |   13 +-
 .../osgearth_package_qt/PackageQtMainWindow        |   13 +-
 .../osgearth_package_qt/SceneController.cpp        |    2 +-
 .../osgearth_package_qt/SceneController.h          |   13 +-
 .../osgearth_package_qt/TMSExporter.cpp            |   14 +-
 src/applications/osgearth_package_qt/TMSExporter.h |   13 +-
 src/applications/osgearth_package_qt/WaitDialog    |   13 +-
 .../osgearth_package_qt/WaitDialog.cpp             |   13 +-
 .../osgearth_package_qt/package_qt.cpp             |   13 +-
 src/applications/osgearth_pick/CMakeLists.txt      |    7 +
 src/applications/osgearth_pick/osgearth_pick.cpp   |  318 +++
 src/applications/osgearth_qt/DemoMainWindow        |   15 +-
 src/applications/osgearth_qt/osgearth_qt.cpp       |   21 +-
 .../osgearth_qt_simple/osgearth_qt_simple.cpp      |   13 +-
 .../osgearth_qt_windows/osgearth_qt_windows.cpp    |   13 +-
 src/applications/osgearth_seed/osgearth_seed.cpp   |   13 +-
 .../osgearth_sequencecontrol.cpp                   |   13 +-
 .../osgearth_shadercomp/osgearth_shadercomp.cpp    |  104 +-
 .../osgearth_shadergen/osgearth_shadergen.cpp      |   13 +-
 .../osgearth_sharedlayer/osgearth_sharedlayer.cpp  |   13 +-
 .../osgearth_terraineffects.cpp                    |   16 -
 .../osgearth_terrainprofile.cpp                    |   13 +-
 src/applications/osgearth_tfs/osgearth_tfs.cpp     |   89 +-
 .../osgearth_tileindex/osgearth_tileindex.cpp      |   13 +-
 .../osgearth_tilesource/osgearth_tilesource.cpp    |   21 +-
 src/applications/osgearth_toc/osgearth_toc.cpp     |   40 +-
 .../osgearth_tracks/osgearth_tracks.cpp            |   24 +-
 .../osgearth_transform/osgearth_transform.cpp      |   24 +-
 .../osgearth_version/osgearth_version.cpp          |   13 +-
 .../osgearth_viewer/osgearth_viewer.cpp            |   19 +-
 src/osgEarth/AlphaEffect                           |   11 +-
 src/osgEarth/AlphaEffect.cpp                       |   33 +-
 src/osgEarth/AlphaEffect.frag.glsl                 |   12 +
 src/osgEarth/AutoScale                             |   13 +-
 src/osgEarth/AutoScale.cpp                         |   57 +-
 src/osgEarth/Bounds                                |   13 +-
 src/osgEarth/Bounds.cpp                            |    2 +-
 src/osgEarth/CMakeLists.txt                        |   67 +-
 src/osgEarth/Cache                                 |   17 +-
 src/osgEarth/Cache.cpp                             |    4 +-
 src/osgEarth/CacheBin                              |   13 +-
 src/osgEarth/CacheEstimator                        |   13 +-
 src/osgEarth/CacheEstimator.cpp                    |    2 +-
 src/osgEarth/CachePolicy                           |   13 +-
 src/osgEarth/CachePolicy.cpp                       |    2 +-
 src/osgEarth/CacheSeed                             |   13 +-
 src/osgEarth/CacheSeed.cpp                         |   23 +-
 src/osgEarth/Capabilities                          |   21 +-
 src/osgEarth/Capabilities.cpp                      |   45 +-
 src/osgEarth/ClampableNode.cpp                     |    2 +-
 src/osgEarth/Clamping                              |   78 +
 src/osgEarth/Clamping.cpp                          |  110 +
 src/osgEarth/ClampingTechnique                     |   15 +-
 src/osgEarth/ClampingTechnique.cpp                 |  143 +-
 src/osgEarth/ColorFilter                           |    2 +-
 src/osgEarth/ColorFilter.cpp                       |    2 +-
 src/osgEarth/Common                                |    5 +-
 src/osgEarth/CompositeTileSource                   |    2 +-
 src/osgEarth/CompositeTileSource.cpp               |   13 +-
 src/osgEarth/Config                                |    2 +-
 src/osgEarth/Config.cpp                            |   50 +-
 src/osgEarth/Containers                            |  376 ++-
 src/osgEarth/Cube                                  |    2 +-
 src/osgEarth/Cube.cpp                              |    2 +-
 src/osgEarth/CullingUtils                          |   29 +-
 src/osgEarth/CullingUtils.cpp                      |  228 +-
 src/osgEarth/DPLineSegmentIntersector              |    2 +-
 src/osgEarth/DPLineSegmentIntersector.cpp          |    2 +-
 src/osgEarth/DateTime                              |   11 +-
 src/osgEarth/DateTime.cpp                          |   11 +-
 src/osgEarth/Decluttering                          |   13 +-
 src/osgEarth/Decluttering.cpp                      |  100 +-
 src/osgEarth/DepthOffset                           |    2 +-
 src/osgEarth/DepthOffset.cpp                       |  127 +-
 src/osgEarth/DepthOffset.vert.glsl                 |   30 +
 src/osgEarth/Draggers                              |  170 --
 src/osgEarth/Draggers.cpp                          |  486 ----
 src/osgEarth/DrapeableNode.cpp                     |    2 +-
 src/osgEarth/Draping.frag.glsl                     |   19 +
 src/osgEarth/Draping.vert.glsl                     |   13 +
 src/osgEarth/DrapingTechnique                      |   13 +-
 src/osgEarth/DrapingTechnique.cpp                  |   61 +-
 src/osgEarth/DrawInstanced                         |    2 +-
 src/osgEarth/DrawInstanced.cpp                     |  320 ++-
 src/osgEarth/ECEF                                  |    2 +-
 src/osgEarth/ECEF.cpp                              |   40 +-
 src/osgEarth/ElevationField                        |   79 +
 src/osgEarth/ElevationField.cpp                    |  139 ++
 src/osgEarth/ElevationLOD                          |    2 +-
 src/osgEarth/ElevationLOD.cpp                      |    2 +-
 src/osgEarth/ElevationLayer                        |    9 +-
 src/osgEarth/ElevationLayer.cpp                    |  244 +-
 src/osgEarth/ElevationQuery                        |   52 +-
 src/osgEarth/ElevationQuery.cpp                    |  201 +-
 src/osgEarth/Export                                |    2 +-
 src/osgEarth/Extension                             |  106 +
 src/osgEarth/Extension.cpp                         |   71 +
 src/osgEarth/FadeEffect                            |    6 +-
 src/osgEarth/FadeEffect.cpp                        |   24 +-
 src/osgEarth/FileUtils                             |    2 +-
 src/osgEarth/FileUtils.cpp                         |    2 +-
 src/osgEarth/GPUClamping.frag.glsl                 |   11 +
 src/osgEarth/GPUClamping.vert.glsl                 |   77 +
 src/osgEarth/GPUClamping.vert.lib.glsl             |   36 +
 src/osgEarth/GeoCommon                             |    6 +-
 src/osgEarth/GeoData                               |   16 +-
 src/osgEarth/GeoData.cpp                           |  296 ++-
 src/osgEarth/GeoMath                               |    2 +-
 src/osgEarth/GeoMath.cpp                           |    8 +-
 src/osgEarth/GeoTransform                          |    2 +-
 src/osgEarth/GeoTransform.cpp                      |    2 +-
 src/osgEarth/Geoid                                 |    2 +-
 src/osgEarth/Geoid.cpp                             |    2 +-
 src/osgEarth/HTTPClient                            |    4 +-
 src/osgEarth/HTTPClient.cpp                        |  128 +-
 src/osgEarth/HeightFieldUtils                      |   49 +-
 src/osgEarth/HeightFieldUtils.cpp                  |  177 +-
 src/osgEarth/Horizon                               |  114 +
 src/osgEarth/Horizon.cpp                           |  200 ++
 src/osgEarth/IOTypes                               |   42 +-
 src/osgEarth/IOTypes.cpp                           |    2 +-
 src/osgEarth/ImageLayer                            |   71 +-
 src/osgEarth/ImageLayer.cpp                        |  234 +-
 src/osgEarth/ImageMosaic                           |    2 +-
 src/osgEarth/ImageMosaic.cpp                       |    9 +-
 src/osgEarth/ImageToHeightFieldConverter           |   13 +-
 src/osgEarth/ImageToHeightFieldConverter.cpp       |   38 +-
 src/osgEarth/ImageUtils                            |   70 +-
 src/osgEarth/ImageUtils.cpp                        |  326 ++-
 src/osgEarth/Instancing.vert.glsl                  |   31 +
 src/osgEarth/IntersectionPicker                    |  118 +
 src/osgEarth/IntersectionPicker.cpp                |  208 ++
 src/osgEarth/JsonUtils                             |    2 +-
 src/osgEarth/JsonUtils.cpp                         |    2 +-
 src/osgEarth/Layer                                 |    2 +-
 src/osgEarth/Layer.cpp                             |    3 +-
 src/osgEarth/LineFunctor                           |    2 +-
 src/osgEarth/LocalTangentPlane                     |    2 +-
 src/osgEarth/LocalTangentPlane.cpp                 |    2 +-
 src/osgEarth/Locators                              |    3 +-
 src/osgEarth/Locators.cpp                          |   19 +-
 src/osgEarth/Map                                   |    4 +-
 src/osgEarth/Map.cpp                               |   88 +-
 src/osgEarth/MapCallback                           |    2 +-
 src/osgEarth/MapCallback.cpp                       |    2 +-
 src/osgEarth/MapFrame                              |   48 +-
 src/osgEarth/MapFrame.cpp                          |  123 +-
 src/osgEarth/MapInfo                               |    2 +-
 src/osgEarth/MapInfo.cpp                           |    2 +-
 src/osgEarth/MapModelChange                        |    2 +-
 src/osgEarth/MapNode                               |   35 +-
 src/osgEarth/MapNode.cpp                           |  102 +-
 src/osgEarth/MapNodeObserver                       |    2 +-
 src/osgEarth/MapNodeOptions                        |   13 +-
 src/osgEarth/MapNodeOptions.cpp                    |    2 +-
 src/osgEarth/MapOptions                            |   13 +-
 src/osgEarth/MapOptions.cpp                        |    2 +-
 src/osgEarth/MaskLayer                             |    3 +-
 src/osgEarth/MaskLayer.cpp                         |    3 +-
 src/osgEarth/MaskNode                              |    2 +-
 src/osgEarth/MaskNode.cpp                          |    2 +-
 src/osgEarth/MaskSource                            |    2 +-
 src/osgEarth/MaskSource.cpp                        |    2 +-
 src/osgEarth/MemCache                              |    2 +-
 src/osgEarth/MemCache.cpp                          |    2 +-
 src/osgEarth/MimeTypes.cpp                         |    2 +-
 src/osgEarth/ModelLayer                            |   31 +-
 src/osgEarth/ModelLayer.cpp                        |   87 +-
 src/osgEarth/ModelSource                           |   12 +-
 src/osgEarth/ModelSource.cpp                       |    9 +-
 src/osgEarth/NativeProgramAdapter                  |  149 ++
 src/osgEarth/NodeUtils                             |   13 +-
 src/osgEarth/NodeUtils.cpp                         |    2 +-
 src/osgEarth/Notify                                |    2 +-
 src/osgEarth/Notify.cpp                            |    2 +-
 src/osgEarth/ObjectIndex                           |  213 ++
 src/osgEarth/ObjectIndex.cpp                       |  234 ++
 src/osgEarth/OverlayDecorator                      |   13 +-
 src/osgEarth/OverlayDecorator.cpp                  |   13 +-
 src/osgEarth/OverlayNode.cpp                       |    2 +-
 src/osgEarth/PhongLightingEffect                   |   11 +-
 src/osgEarth/PhongLightingEffect.cpp               |   27 +-
 src/osgEarth/Picker                                |   62 +
 src/osgEarth/Pickers                               |  112 -
 src/osgEarth/Pickers.cpp                           |  149 --
 src/osgEarth/PrimitiveIntersector                  |    2 +-
 src/osgEarth/PrimitiveIntersector.cpp              |   59 +-
 src/osgEarth/Profile                               |    5 +-
 src/osgEarth/Profile.cpp                           |   39 +-
 src/osgEarth/Profiler                              |   70 +
 src/osgEarth/Profiler.cpp                          |   75 +
 src/osgEarth/Progress                              |    8 +-
 src/osgEarth/Progress.cpp                          |    2 +-
 src/osgEarth/Random                                |   13 +-
 src/osgEarth/Random.cpp                            |    2 +-
 src/osgEarth/Registry                              |   31 +-
 src/osgEarth/Registry.cpp                          |   47 +-
 src/osgEarth/Revisioning                           |    2 +-
 src/osgEarth/Revisioning.cpp                       |    7 +-
 src/osgEarth/ShaderFactory                         |   17 +-
 src/osgEarth/ShaderFactory.cpp                     |    7 +-
 src/osgEarth/ShaderGenerator                       |   53 +-
 src/osgEarth/ShaderGenerator.cpp                   |  432 +++-
 src/osgEarth/ShaderLoader                          |  149 ++
 src/osgEarth/ShaderLoader.cpp                      |  391 +++
 src/osgEarth/ShaderUtils                           |    5 +-
 src/osgEarth/ShaderUtils.cpp                       |   33 +-
 src/osgEarth/Shaders                               |   43 +
 src/osgEarth/Shaders.cpp.in                        |   42 +
 src/osgEarth/SharedSARepo                          |   13 +-
 src/osgEarth/SparseTexture2DArray                  |   79 -
 src/osgEarth/SparseTexture2DArray.cpp              |  406 ---
 src/osgEarth/SpatialReference                      |   14 +-
 src/osgEarth/SpatialReference.cpp                  |   36 +-
 src/osgEarth/StateSetCache                         |   13 +-
 src/osgEarth/StateSetCache.cpp                     |    2 +-
 src/osgEarth/StateSetLOD                           |   13 +-
 src/osgEarth/StateSetLOD.cpp                       |   13 +-
 src/osgEarth/StringUtils                           |    9 +-
 src/osgEarth/StringUtils.cpp                       |   14 +-
 src/osgEarth/TaskService                           |   10 +-
 src/osgEarth/TaskService.cpp                       |   79 +-
 src/osgEarth/Terrain                               |    2 +-
 src/osgEarth/Terrain.cpp                           |   15 +-
 src/osgEarth/TerrainEffect                         |    2 +-
 src/osgEarth/TerrainEngineNode                     |   83 +-
 src/osgEarth/TerrainEngineNode.cpp                 |  106 +-
 src/osgEarth/TerrainLayer                          |   31 +-
 src/osgEarth/TerrainLayer.cpp                      |  187 +-
 src/osgEarth/TerrainOptions                        |   47 +-
 src/osgEarth/TerrainOptions.cpp                    |   19 +-
 src/osgEarth/TerrainTileNode                       |   88 +
 src/osgEarth/Tessellator                           |   13 +-
 src/osgEarth/Tessellator.cpp                       |   13 +-
 src/osgEarth/TextureCompositor                     |   21 +-
 src/osgEarth/TextureCompositor.cpp                 |   25 +-
 src/osgEarth/ThreadingUtils                        |  229 +-
 src/osgEarth/ThreadingUtils.cpp                    |    4 +-
 src/osgEarth/TileHandler                           |   13 +-
 src/osgEarth/TileHandler.cpp                       |   13 +-
 src/osgEarth/TileKey                               |    9 +-
 src/osgEarth/TileKey.cpp                           |    2 +-
 src/osgEarth/TileNode.cpp                          |    0
 src/osgEarth/TileSource                            |   68 +-
 src/osgEarth/TileSource.cpp                        |  194 +-
 src/osgEarth/TileVisitor                           |   13 +-
 src/osgEarth/TileVisitor.cpp                       |    6 +-
 src/osgEarth/TimeControl                           |   13 +-
 src/osgEarth/TimeControl.cpp                       |    2 +-
 src/osgEarth/TraversalData                         |    3 +-
 src/osgEarth/TraversalData.cpp                     |    4 +-
 src/osgEarth/URI                                   |    6 +-
 src/osgEarth/URI.cpp                               |   27 +-
 src/osgEarth/Units                                 |  211 +-
 src/osgEarth/Units.cpp                             |    2 +-
 src/osgEarth/Utils                                 |   24 +-
 src/osgEarth/Utils.cpp                             |  148 +-
 src/osgEarth/Version                               |   15 +-
 src/osgEarth/Version.cpp                           |    2 +-
 src/osgEarth/VerticalDatum                         |    6 +-
 src/osgEarth/VerticalDatum.cpp                     |    9 +-
 src/osgEarth/Viewpoint                             |  208 +-
 src/osgEarth/Viewpoint.cpp                         |  305 +--
 src/osgEarth/VirtualProgram                        |   99 +-
 src/osgEarth/VirtualProgram.cpp                    |  609 +++--
 src/osgEarth/XmlUtils                              |    9 +-
 src/osgEarth/XmlUtils.cpp                          |   57 +-
 src/osgEarth/optional                              |   13 +-
 src/osgEarthAnnotation/AnnotationData              |   13 +-
 src/osgEarthAnnotation/AnnotationData.cpp          |   13 +-
 src/osgEarthAnnotation/AnnotationEditing           |   16 +-
 src/osgEarthAnnotation/AnnotationEditing.cpp       |   61 +-
 src/osgEarthAnnotation/AnnotationNode              |   18 +-
 src/osgEarthAnnotation/AnnotationNode.cpp          |   35 +-
 src/osgEarthAnnotation/AnnotationRegistry          |   13 +-
 src/osgEarthAnnotation/AnnotationRegistry.cpp      |   19 +-
 src/osgEarthAnnotation/AnnotationSettings          |   13 +-
 src/osgEarthAnnotation/AnnotationSettings.cpp      |   13 +-
 src/osgEarthAnnotation/AnnotationUtils             |   33 +-
 src/osgEarthAnnotation/AnnotationUtils.cpp         |  232 +-
 src/osgEarthAnnotation/CMakeLists.txt              |    2 +
 src/osgEarthAnnotation/CircleNode                  |   13 +-
 src/osgEarthAnnotation/CircleNode.cpp              |   13 +-
 src/osgEarthAnnotation/Common                      |    2 +-
 src/osgEarthAnnotation/Decoration                  |   13 +-
 src/osgEarthAnnotation/Decoration.cpp              |   13 +-
 src/osgEarthAnnotation/Draggers                    |  175 ++
 src/osgEarthAnnotation/Draggers.cpp                |  492 ++++
 src/osgEarthAnnotation/EllipseNode                 |   19 +-
 src/osgEarthAnnotation/EllipseNode.cpp             |   14 +-
 src/osgEarthAnnotation/Export                      |    2 +-
 src/osgEarthAnnotation/FeatureEditing              |   10 +-
 src/osgEarthAnnotation/FeatureEditing.cpp          |   24 +-
 src/osgEarthAnnotation/FeatureNode                 |   82 +-
 src/osgEarthAnnotation/FeatureNode.cpp             |  278 ++-
 src/osgEarthAnnotation/HighlightDecoration         |   13 +-
 src/osgEarthAnnotation/HighlightDecoration.cpp     |   15 +-
 src/osgEarthAnnotation/ImageOverlay                |    2 +-
 src/osgEarthAnnotation/ImageOverlay.cpp            |   17 +-
 src/osgEarthAnnotation/ImageOverlayEditor          |    7 +-
 src/osgEarthAnnotation/ImageOverlayEditor.cpp      |   20 +-
 src/osgEarthAnnotation/LabelNode                   |   14 +-
 src/osgEarthAnnotation/LabelNode.cpp               |   18 +-
 src/osgEarthAnnotation/LocalGeometryNode           |   13 +-
 src/osgEarthAnnotation/LocalGeometryNode.cpp       |   13 +-
 src/osgEarthAnnotation/LocalizedNode               |   22 +-
 src/osgEarthAnnotation/LocalizedNode.cpp           |   51 +-
 src/osgEarthAnnotation/ModelNode                   |   17 +-
 src/osgEarthAnnotation/ModelNode.cpp               |   23 +-
 src/osgEarthAnnotation/OrthoNode                   |   22 +-
 src/osgEarthAnnotation/OrthoNode.cpp               |  196 +-
 src/osgEarthAnnotation/PlaceNode                   |   15 +-
 src/osgEarthAnnotation/PlaceNode.cpp               |   22 +-
 src/osgEarthAnnotation/RectangleNode               |   13 +-
 src/osgEarthAnnotation/RectangleNode.cpp           |   13 +-
 src/osgEarthAnnotation/ScaleDecoration             |   13 +-
 src/osgEarthAnnotation/TrackNode                   |   13 +-
 src/osgEarthAnnotation/TrackNode.cpp               |   13 +-
 src/osgEarthDrivers/CMakeLists.txt                 |   82 +-
 src/osgEarthDrivers/agglite/AGGLiteOptions         |    4 +-
 .../agglite/AGGLiteRasterizerTileSource.cpp        |  206 +-
 src/osgEarthDrivers/arcgis/ArcGISOptions           |    2 +-
 src/osgEarthDrivers/arcgis/Extent.h                |    2 +-
 src/osgEarthDrivers/arcgis/MapService.h            |    2 +-
 src/osgEarthDrivers/arcgis/ReaderWriterArcGIS.cpp  |   13 +-
 .../ReaderWriterArcGISMapCache.cpp                 |    2 +-
 src/osgEarthDrivers/bing/BingOptions               |    2 +-
 .../cache_filesystem/FileSystemCache               |    2 +-
 .../cache_filesystem/FileSystemCache.cpp           |   14 +-
 src/osgEarthDrivers/cache_leveldb/CMakeLists.txt   |    3 +
 src/osgEarthDrivers/cache_leveldb/LevelDBCache     |    2 +-
 src/osgEarthDrivers/cache_leveldb/LevelDBCache.cpp |    7 +-
 src/osgEarthDrivers/cache_leveldb/LevelDBCacheBin  |    6 +-
 .../cache_leveldb/LevelDBCacheBin.cpp              |   34 +-
 .../cache_leveldb/LevelDBCacheDriver.cpp           |    2 +-
 .../cache_leveldb/LevelDBCacheOptions              |    2 +-
 src/osgEarthDrivers/cache_leveldb/Tracker          |    2 +-
 src/osgEarthDrivers/colorramp/ColorRampOptions     |    2 +-
 .../colorramp/ColorRampTileSource.cpp              |    4 +-
 src/osgEarthDrivers/debug/DebugOptions             |    6 +-
 src/osgEarthDrivers/debug/DebugTileSource.cpp      |    2 +-
 src/osgEarthDrivers/earth/EarthFileSerializer      |    2 +-
 src/osgEarthDrivers/earth/EarthFileSerializer1.cpp |    2 +-
 src/osgEarthDrivers/earth/EarthFileSerializer2.cpp |   26 +-
 src/osgEarthDrivers/earth/ReaderWriterOsgEarth.cpp |   56 +-
 .../engine_byo/BYOTerrainEngineDriver.cpp          |    2 +-
 .../engine_byo/BYOTerrainEngineNode                |    2 +-
 .../engine_byo/BYOTerrainEngineNode.cpp            |   13 +-
 .../engine_byo/BYOTerrainEngineOptions             |    2 +-
 src/osgEarthDrivers/engine_byo/Common              |    2 +-
 src/osgEarthDrivers/engine_mp/CMakeLists.txt       |   21 +-
 src/osgEarthDrivers/engine_mp/Common               |    2 +-
 .../engine_mp/DynamicLODScaleCallback              |   13 +-
 src/osgEarthDrivers/engine_mp/FileLocationCallback |   13 +-
 src/osgEarthDrivers/engine_mp/HeightFieldCache     |   99 +
 src/osgEarthDrivers/engine_mp/HeightFieldCache.cpp |  145 ++
 src/osgEarthDrivers/engine_mp/KeyNodeFactory       |   13 +-
 src/osgEarthDrivers/engine_mp/KeyNodeFactory.cpp   |   13 +-
 src/osgEarthDrivers/engine_mp/MPEngine.frag.glsl   |   37 +
 .../engine_mp/MPEngine.vert.model.glsl             |   15 +
 .../engine_mp/MPEngine.vert.view.glsl              |   27 +
 src/osgEarthDrivers/engine_mp/MPGeometry           |   27 +-
 src/osgEarthDrivers/engine_mp/MPGeometry.cpp       |  224 +-
 src/osgEarthDrivers/engine_mp/MPShaders            |   39 +
 src/osgEarthDrivers/engine_mp/MPShaders.cpp.in     |   19 +
 .../engine_mp/MPTerrainEngineDriver.cpp            |   23 +-
 src/osgEarthDrivers/engine_mp/MPTerrainEngineNode  |   22 +-
 .../engine_mp/MPTerrainEngineNode.cpp              |  477 +++-
 .../engine_mp/MPTerrainEngineOptions               |   43 +-
 .../engine_mp/QuickReleaseGLObjects                |   13 +-
 src/osgEarthDrivers/engine_mp/SingleKeyNodeFactory |   23 +-
 .../engine_mp/SingleKeyNodeFactory.cpp             |  155 +-
 src/osgEarthDrivers/engine_mp/TerrainNode          |   13 +-
 src/osgEarthDrivers/engine_mp/TerrainNode.cpp      |   13 +-
 src/osgEarthDrivers/engine_mp/TileGroup            |   13 +-
 src/osgEarthDrivers/engine_mp/TileGroup.cpp        |   21 +-
 src/osgEarthDrivers/engine_mp/TileModel            |   83 +-
 src/osgEarthDrivers/engine_mp/TileModel.cpp        |  168 +-
 src/osgEarthDrivers/engine_mp/TileModelCompiler    |   21 +-
 .../engine_mp/TileModelCompiler.cpp                | 1086 ++++----
 src/osgEarthDrivers/engine_mp/TileModelFactory     |  184 +-
 src/osgEarthDrivers/engine_mp/TileModelFactory.cpp |  209 +-
 src/osgEarthDrivers/engine_mp/TileNode             |   74 +-
 src/osgEarthDrivers/engine_mp/TileNode.cpp         |  207 +-
 src/osgEarthDrivers/engine_mp/TileNodeRegistry     |   36 +-
 src/osgEarthDrivers/engine_mp/TileNodeRegistry.cpp |   69 +-
 src/osgEarthDrivers/engine_mp/TilePagedLOD         |   32 +-
 src/osgEarthDrivers/engine_mp/TilePagedLOD.cpp     |  202 +-
 src/osgEarthDrivers/fastdxt/CMakeLists.txt         |   39 +
 .../fastdxt/FastDXTImageProcessor.cpp              |  104 +
 src/osgEarthDrivers/fastdxt/dxt.cpp                |  542 ++++
 src/osgEarthDrivers/fastdxt/dxt.h                  |   68 +
 src/osgEarthDrivers/fastdxt/intrinsic.cpp          |  533 ++++
 src/osgEarthDrivers/fastdxt/libdxt.cpp             |   95 +
 src/osgEarthDrivers/fastdxt/libdxt.h               |   35 +
 src/osgEarthDrivers/fastdxt/util.cpp               |  342 +++
 src/osgEarthDrivers/fastdxt/util.h                 |  108 +
 .../feature_elevation/CMakeLists.txt               |   17 +
 .../feature_elevation/FeatureElevationOptions      |   85 +
 .../ReaderWriterFeatureElevation.cpp               |  269 ++
 src/osgEarthDrivers/feature_ogr/FeatureCursorOGR   |    2 +-
 .../feature_ogr/FeatureCursorOGR.cpp               |   33 +-
 .../feature_ogr/FeatureSourceOGR.cpp               |   38 +-
 src/osgEarthDrivers/feature_ogr/OGRFeatureOptions  |    2 +-
 src/osgEarthDrivers/feature_raster/CMakeLists.txt  |   15 +
 .../feature_raster/FeatureSourceRaster.cpp         |  243 ++
 .../feature_raster/RasterFeatureOptions            |   89 +
 .../feature_tfs/FeatureSourceTFS.cpp               |   58 +-
 src/osgEarthDrivers/feature_tfs/TFSFeatureOptions  |    2 +-
 .../feature_wfs/FeatureSourceWFS.cpp               |   39 +-
 src/osgEarthDrivers/feature_wfs/WFSFeatureOptions  |    2 +-
 src/osgEarthDrivers/gdal/GDALOptions               |    2 +-
 src/osgEarthDrivers/gdal/ReaderWriterGDAL.cpp      |  322 ++-
 src/osgEarthDrivers/kml/CMakeLists.txt             |    4 +-
 src/osgEarthDrivers/kml/KML                        |    2 +-
 src/osgEarthDrivers/kml/KMLOptions                 |    2 +-
 src/osgEarthDrivers/kml/KMLReader                  |   11 +-
 src/osgEarthDrivers/kml/KMLReader.cpp              |   72 +-
 src/osgEarthDrivers/kml/KML_Common                 |  102 +-
 src/osgEarthDrivers/kml/KML_Container              |   14 +-
 src/osgEarthDrivers/kml/KML_Document               |    8 +-
 src/osgEarthDrivers/kml/KML_Document.cpp           |   24 +-
 src/osgEarthDrivers/kml/KML_Feature                |    8 +-
 src/osgEarthDrivers/kml/KML_Feature.cpp            |   67 +-
 src/osgEarthDrivers/kml/KML_Folder                 |    8 +-
 src/osgEarthDrivers/kml/KML_Folder.cpp             |   20 +-
 src/osgEarthDrivers/kml/KML_Geometry               |   10 +-
 src/osgEarthDrivers/kml/KML_Geometry.cpp           |  189 +-
 src/osgEarthDrivers/kml/KML_GroundOverlay          |    6 +-
 src/osgEarthDrivers/kml/KML_GroundOverlay.cpp      |   44 +-
 src/osgEarthDrivers/kml/KML_IconStyle              |    4 +-
 src/osgEarthDrivers/kml/KML_IconStyle.cpp          |   33 +-
 src/osgEarthDrivers/kml/KML_LabelStyle             |    4 +-
 src/osgEarthDrivers/kml/KML_LabelStyle.cpp         |    4 +-
 src/osgEarthDrivers/kml/KML_LineString             |    6 +-
 src/osgEarthDrivers/kml/KML_LineString.cpp         |   12 +-
 src/osgEarthDrivers/kml/KML_LineStyle              |    4 +-
 src/osgEarthDrivers/kml/KML_LineStyle.cpp          |   16 +-
 src/osgEarthDrivers/kml/KML_LinearRing             |    6 +-
 src/osgEarthDrivers/kml/KML_LinearRing.cpp         |   12 +-
 src/osgEarthDrivers/kml/KML_Model                  |    6 +-
 src/osgEarthDrivers/kml/KML_Model.cpp              |   54 +-
 src/osgEarthDrivers/kml/KML_MultiGeometry          |    4 +-
 src/osgEarthDrivers/kml/KML_MultiGeometry.cpp      |    4 +-
 src/osgEarthDrivers/kml/KML_NetworkLink            |    2 +-
 src/osgEarthDrivers/kml/KML_NetworkLink.cpp        |   36 +-
 src/osgEarthDrivers/kml/KML_NetworkLinkControl     |    6 +-
 src/osgEarthDrivers/kml/KML_NetworkLinkControl.cpp |   10 +-
 src/osgEarthDrivers/kml/KML_Object                 |    8 +-
 src/osgEarthDrivers/kml/KML_Object.cpp             |    4 +-
 src/osgEarthDrivers/kml/KML_Overlay                |    6 +-
 src/osgEarthDrivers/kml/KML_Overlay.cpp            |   10 +-
 src/osgEarthDrivers/kml/KML_PhotoOverlay           |    6 +-
 src/osgEarthDrivers/kml/KML_PhotoOverlay.cpp       |   10 +-
 src/osgEarthDrivers/kml/KML_Placemark              |    2 +-
 src/osgEarthDrivers/kml/KML_Placemark.cpp          |   55 +-
 src/osgEarthDrivers/kml/KML_Point                  |    4 +-
 src/osgEarthDrivers/kml/KML_Point.cpp              |    6 +-
 src/osgEarthDrivers/kml/KML_PolyStyle              |    4 +-
 src/osgEarthDrivers/kml/KML_PolyStyle.cpp          |   24 +-
 src/osgEarthDrivers/kml/KML_Polygon                |    6 +-
 src/osgEarthDrivers/kml/KML_Polygon.cpp            |   49 +-
 src/osgEarthDrivers/kml/KML_Root                   |    9 +-
 src/osgEarthDrivers/kml/KML_Root.cpp               |   20 +-
 src/osgEarthDrivers/kml/KML_Schema                 |    2 +-
 src/osgEarthDrivers/kml/KML_Schema.cpp             |    2 +-
 src/osgEarthDrivers/kml/KML_ScreenOverlay          |    6 +-
 src/osgEarthDrivers/kml/KML_ScreenOverlay.cpp      |    8 +-
 src/osgEarthDrivers/kml/KML_Style                  |    4 +-
 src/osgEarthDrivers/kml/KML_Style.cpp              |   14 +-
 src/osgEarthDrivers/kml/KML_StyleMap               |    4 +-
 src/osgEarthDrivers/kml/KML_StyleMap.cpp           |   12 +-
 src/osgEarthDrivers/kml/KML_StyleSelector          |    2 +-
 src/osgEarthDrivers/kml/KMZArchive                 |    2 +-
 src/osgEarthDrivers/kml/KMZArchive.cpp             |    2 +-
 src/osgEarthDrivers/kml/ReaderWriterKML.cpp        |    5 +-
 src/osgEarthDrivers/kml/rapidxml.hpp               | 2596 ++++++++++++++++++++
 src/osgEarthDrivers/kml/rapidxml_ext.hpp           |   61 +
 src/osgEarthDrivers/kml/rapidxml_iterators.hpp     |  174 ++
 src/osgEarthDrivers/kml/rapidxml_print.hpp         |  421 ++++
 src/osgEarthDrivers/kml/rapidxml_utils.hpp         |  122 +
 .../label_annotation/AnnotationLabelSource.cpp     |   28 +-
 .../label_overlay/OverlayLabelSource.cpp           |  216 --
 .../mask_feature/FeatureMaskOptions                |    2 +-
 .../mask_feature/FeatureMaskSource.cpp             |    2 +-
 src/osgEarthDrivers/mbtiles/CMakeLists.txt         |    4 +
 src/osgEarthDrivers/mbtiles/MBTilesOptions         |    5 +-
 src/osgEarthDrivers/mbtiles/MBTilesPlugin.cpp      |   11 +-
 src/osgEarthDrivers/mbtiles/MBTilesTileSource      |   11 +-
 src/osgEarthDrivers/mbtiles/MBTilesTileSource.cpp  |   26 +-
 .../model_feature_geom/FeatureGeomModelOptions     |    2 +-
 .../model_feature_geom/FeatureGeomModelSource.cpp  |    2 +-
 .../FeatureStencilModelOptions                     |    2 +-
 .../FeatureStencilModelSource.cpp                  |    2 +-
 .../model_simple/SimpleModelOptions                |    2 +-
 .../model_simple/SimpleModelSource.cpp             |   70 +-
 src/osgEarthDrivers/noise/NoiseDriver.cpp          |  321 ---
 .../ocean_simple/ElevationProxyImageLayer          |    4 +-
 .../ocean_simple/ElevationProxyImageLayer.cpp      |   11 +-
 .../ocean_simple/SimpleOceanDriver.cpp             |    2 +-
 src/osgEarthDrivers/ocean_simple/SimpleOceanNode   |    2 +-
 .../ocean_simple/SimpleOceanNode.cpp               |    6 +-
 .../ocean_simple/SimpleOceanOptions                |    4 +-
 .../ocean_simple/SimpleOceanShaders                |    2 +-
 src/osgEarthDrivers/ocean_triton/CMakeLists.txt    |    3 +
 src/osgEarthDrivers/ocean_triton/TritonContext     |   19 +-
 src/osgEarthDrivers/ocean_triton/TritonContext.cpp |   12 +-
 src/osgEarthDrivers/ocean_triton/TritonDrawable    |   23 +-
 .../ocean_triton/TritonDrawable.cpp                |  633 ++---
 src/osgEarthDrivers/ocean_triton/TritonDriver.cpp  |   13 +-
 src/osgEarthDrivers/ocean_triton/TritonNode        |   19 +-
 src/osgEarthDrivers/ocean_triton/TritonNode.cpp    |   16 +-
 src/osgEarthDrivers/ocean_triton/TritonOptions     |   51 +-
 src/osgEarthDrivers/osg/OSGOptions                 |    2 +-
 src/osgEarthDrivers/osg/OSGTileSource.cpp          |    2 +-
 src/osgEarthDrivers/quadkey/CMakeLists.txt         |   15 +
 src/osgEarthDrivers/quadkey/QuadKeyOptions         |   82 +
 .../quadkey/ReaderWriterQuadKey.cpp                |  199 ++
 .../refresh/ReaderWriterRefresh.cpp                |   13 +-
 src/osgEarthDrivers/refresh/RefreshOptions         |    2 +-
 .../script_engine_duktape/CMakeLists.txt           |    3 +
 .../script_engine_duktape/DuktapeEngine            |    6 +-
 .../script_engine_duktape/DuktapeEngine.cpp        |    2 +-
 .../script_engine_duktape/JSGeometry               |    2 +-
 .../script_engine_duktape/Plugin.cpp               |    2 +-
 .../script_engine_duktape/duktape.h                |    3 +-
 .../script_engine_javascriptcore/CMakeLists.txt    |    3 +
 .../script_engine_v8/CMakeLists.txt                |    3 +
 src/osgEarthDrivers/sky_gl/GLSkyDriver.cpp         |    2 +-
 src/osgEarthDrivers/sky_gl/GLSkyNode               |    3 +-
 src/osgEarthDrivers/sky_gl/GLSkyNode.cpp           |   20 +-
 src/osgEarthDrivers/sky_gl/GLSkyOptions            |    2 +-
 src/osgEarthDrivers/sky_gl/GLSkyShaders            |   12 +-
 .../sky_silverlining/CMakeLists.txt                |    4 +
 .../sky_silverlining/SilverLiningCloudsDrawable    |   14 +-
 .../SilverLiningCloudsDrawable.cpp                 |   30 +-
 .../sky_silverlining/SilverLiningContext           |   22 +-
 .../sky_silverlining/SilverLiningContext.cpp       |   47 +-
 .../sky_silverlining/SilverLiningDriver.cpp        |   12 +-
 .../sky_silverlining/SilverLiningNode              |   21 +-
 .../sky_silverlining/SilverLiningNode.cpp          |   62 +-
 .../sky_silverlining/SilverLiningOptions           |   37 +-
 .../sky_silverlining/SilverLiningSkyDrawable       |    8 +-
 .../sky_silverlining/SilverLiningSkyDrawable.cpp   |    8 +-
 src/osgEarthDrivers/sky_simple/CMakeLists.txt      |   52 +-
 .../sky_simple/SimpleSky.Atmosphere.frag.glsl      |   34 +
 .../sky_simple/SimpleSky.Atmosphere.vert.glsl      |  155 ++
 .../sky_simple/SimpleSky.Ground.ONeil.frag.glsl    |   67 +
 .../sky_simple/SimpleSky.Ground.ONeil.vert.glsl    |  166 ++
 .../sky_simple/SimpleSky.Moon.frag.glsl            |   10 +
 .../sky_simple/SimpleSky.Moon.vert.glsl            |   11 +
 .../sky_simple/SimpleSky.Stars.GLES.frag.glsl      |    9 +
 .../sky_simple/SimpleSky.Stars.GLES.vert.glsl      |   28 +
 .../sky_simple/SimpleSky.Stars.frag.glsl           |   12 +
 .../sky_simple/SimpleSky.Stars.vert.glsl           |   27 +
 .../sky_simple/SimpleSky.Sun.frag.glsl             |   18 +
 .../sky_simple/SimpleSky.Sun.vert.glsl             |   12 +
 src/osgEarthDrivers/sky_simple/SimpleSkyDriver.cpp |    2 +-
 src/osgEarthDrivers/sky_simple/SimpleSkyNode       |    3 +-
 src/osgEarthDrivers/sky_simple/SimpleSkyNode.cpp   |   97 +-
 src/osgEarthDrivers/sky_simple/SimpleSkyOptions    |   12 +-
 src/osgEarthDrivers/sky_simple/SimpleSkyShaders    |  675 +----
 .../sky_simple/SimpleSkyShaders.cpp.in             |   45 +
 src/osgEarthDrivers/splat_mask/SplatMaskDriver.cpp |    2 +-
 src/osgEarthDrivers/splat_mask/SplatMaskOptions    |    2 +-
 .../template_matclass/TemplateMatClassDriver.cpp   |    2 +-
 .../template_matclass/TemplateMatClassOptions      |    2 +-
 .../tilecache/ReaderWriterTileCache.cpp            |    2 +-
 src/osgEarthDrivers/tilecache/TileCacheOptions     |    2 +-
 .../tileindex/ReaderWriterTileIndex.cpp            |   13 +-
 src/osgEarthDrivers/tileindex/TileIndexOptions     |    2 +-
 .../tileservice/ReaderWriterTileService.cpp        |    2 +-
 src/osgEarthDrivers/tileservice/TileServiceOptions |    2 +-
 src/osgEarthDrivers/tms/TMSOptions                 |    2 +-
 src/osgEarthDrivers/tms/TMSPlugin.cpp              |   13 +-
 src/osgEarthDrivers/tms/TMSTileSource              |   13 +-
 src/osgEarthDrivers/tms/TMSTileSource.cpp          |   13 +-
 src/osgEarthDrivers/vdatum_egm2008/EGM2008.cpp     |    2 +-
 src/osgEarthDrivers/vdatum_egm2008/EGM2008Grid.h   |    2 +-
 src/osgEarthDrivers/vdatum_egm84/EGM84.cpp         |    4 +-
 src/osgEarthDrivers/vdatum_egm84/EGM84Grid.h       |    2 +-
 src/osgEarthDrivers/vdatum_egm96/EGM96.cpp         |    2 +-
 src/osgEarthDrivers/vdatum_egm96/EGM96Grid.h       |    2 +-
 src/osgEarthDrivers/vpb/ReaderWriterVPB.cpp        |    2 +-
 src/osgEarthDrivers/vpb/VPBOptions                 |    2 +-
 src/osgEarthDrivers/wcs/ReaderWriterWCS.cpp        |    2 +-
 src/osgEarthDrivers/wcs/WCS11Source.cpp            |    2 +-
 src/osgEarthDrivers/wcs/WCS11Source.h              |    2 +-
 src/osgEarthDrivers/wcs/WCSOptions                 |    2 +-
 src/osgEarthDrivers/wms/ReaderWriterWMS.cpp        |   39 +-
 src/osgEarthDrivers/wms/TileService                |    2 +-
 src/osgEarthDrivers/wms/TileService.cpp            |    2 +-
 src/osgEarthDrivers/wms/WMSOptions                 |    2 +-
 src/osgEarthDrivers/xyz/ReaderWriterXYZ.cpp        |   13 +-
 src/osgEarthDrivers/xyz/XYZOptions                 |    2 +-
 src/osgEarthDrivers/yahoo/ReaderWriterYahoo.cpp    |    2 +-
 src/osgEarthDrivers/yahoo/YahooOptions             |    2 +-
 .../cache_sqlite3}/cache_sqlite3/CMakeLists.txt    |    0
 .../cache_sqlite3}/cache_sqlite3/Sqlite3Cache.cpp  |    0
 .../cache_sqlite3/Sqlite3CacheOptions              |    0
 .../engine_droam/AMRGeometry                       |    0
 .../engine_droam/AMRGeometry.cpp                   |    0
 .../engine_droam/AMRShaders.h                      |    0
 .../engine_droam/CMakeLists.txt                    |    0
 .../engine_droam/Common                            |    0
 .../engine_droam/CubeManifold                      |    0
 .../engine_droam/CubeManifold.cpp                  |    0
 .../engine_droam/DRoamNode                         |    0
 .../engine_droam/DRoamNode.cpp                     |    0
 .../engine_droam/Diamond                           |    0
 .../engine_droam/Diamond.cpp                       |    0
 .../engine_droam/GeodeticManifold                  |    0
 .../engine_droam/GeodeticManifold.cpp              |    0
 .../engine_droam/Manifold                          |    0
 .../engine_droam/Manifold.cpp                      |    0
 .../engine_droam/MeshManager                       |    0
 .../engine_droam/MeshManager.cpp                   |    0
 .../engine_droam/Plugin.cpp                        |    0
 .../engine_osgterrain/CMakeLists.txt               |    0
 .../engine_osgterrain/Common                       |    0
 .../engine_osgterrain/CustomTerrain                |    0
 .../engine_osgterrain/CustomTerrain.cpp            |    0
 .../engine_osgterrain/CustomTerrainTechnique       |    0
 .../engine_osgterrain/CustomTile                   |    0
 .../engine_osgterrain/CustomTile.cpp               |    0
 .../engine_osgterrain/DynamicLODScaleCallback      |    0
 .../engine_osgterrain/FileLocationCallback         |    0
 .../engine_osgterrain/KeyNodeFactory               |    0
 .../engine_osgterrain/KeyNodeFactory.cpp           |    0
 .../engine_osgterrain/LODFactorCallback            |    0
 .../engine_osgterrain/LODFactorCallback.cpp        |    0
 .../engine_osgterrain/MultiPassTerrainTechnique    |    0
 .../MultiPassTerrainTechnique.cpp                  |    0
 .../engine_osgterrain/OSGTerrainEngineNode         |    0
 .../engine_osgterrain/OSGTerrainEngineNode.cpp     |    0
 .../engine_osgterrain/OSGTerrainOptions            |    0
 .../engine_osgterrain/OSGTileFactory               |    0
 .../engine_osgterrain/OSGTileFactory.cpp           |    0
 .../engine_osgterrain/ParallelKeyNodeFactory       |    0
 .../engine_osgterrain/ParallelKeyNodeFactory.cpp   |    0
 .../engine_osgterrain/Plugin.cpp                   |    0
 .../engine_osgterrain/SerialKeyNodeFactory         |    0
 .../engine_osgterrain/SerialKeyNodeFactory.cpp     |    0
 .../engine_osgterrain/SinglePassTerrainTechnique   |    0
 .../SinglePassTerrainTechnique.cpp                 |    0
 .../engine_osgterrain/StreamingTerrainNode         |    0
 .../engine_osgterrain/StreamingTerrainNode.cpp     |    0
 .../engine_osgterrain/StreamingTile                |    0
 .../engine_osgterrain/StreamingTile.cpp            |    0
 .../engine_osgterrain/Terrain                      |    0
 .../engine_osgterrain/Terrain.cpp                  |    0
 .../engine_osgterrain/TerrainNode                  |    0
 .../engine_osgterrain/TerrainNode.cpp              |    0
 .../engine_osgterrain/Tile                         |    0
 .../engine_osgterrain/Tile.cpp                     |    0
 .../engine_osgterrain/TileBuilder                  |    0
 .../engine_osgterrain/TileBuilder.cpp              |    0
 .../engine_osgterrain/TransparentLayer             |    0
 .../engine_quadtree/CMakeLists.txt                 |    0
 .../engine_quadtree/Common                         |    0
 .../engine_quadtree/CustomPagedLOD                 |    0
 .../engine_quadtree/CustomPagedLOD.cpp             |    0
 .../engine_quadtree/DynamicLODScaleCallback        |    0
 .../engine_quadtree/FileLocationCallback           |    0
 .../engine_quadtree/KeyNodeFactory                 |    0
 .../engine_quadtree/KeyNodeFactory.cpp             |    0
 .../engine_quadtree/LODFactorCallback              |    0
 .../engine_quadtree/LODFactorCallback.cpp          |    0
 .../QuadTreeTerrainEngineDriver.cpp                |    0
 .../engine_quadtree/QuadTreeTerrainEngineNode      |    0
 .../engine_quadtree/QuadTreeTerrainEngineNode.cpp  |    0
 .../engine_quadtree/QuadTreeTerrainEngineOptions   |    0
 .../engine_quadtree/QuickReleaseGLObjects          |    0
 .../engine_quadtree/SerialKeyNodeFactory           |    0
 .../engine_quadtree/SerialKeyNodeFactory.cpp       |    0
 .../engine_quadtree/TerrainNode                    |    0
 .../engine_quadtree/TerrainNode.cpp                |    0
 .../engine_quadtree/TileModel                      |    0
 .../engine_quadtree/TileModelCompiler              |    0
 .../engine_quadtree/TileModelCompiler.cpp          |    0
 .../engine_quadtree/TileModelFactory               |    0
 .../engine_quadtree/TileModelFactory.cpp           |    0
 .../engine_quadtree/TileNode                       |    0
 .../engine_quadtree/TileNode.cpp                   |    0
 .../engine_quadtree/TileNodeRegistry               |    0
 .../engine_quadtree/TileNodeRegistry.cpp           |    0
 .../engine_seamless/AutoBuffer                     |    0
 .../engine_seamless/CMakeLists.txt                 |    0
 .../engine_seamless/Euler                          |    0
 .../engine_seamless/Euler.cpp                      |    0
 .../engine_seamless/GeoPatch                       |    0
 .../engine_seamless/GeoPatch.cpp                   |    0
 .../engine_seamless/Geographic                     |    0
 .../engine_seamless/Geographic.cpp                 |    0
 .../engine_seamless/MultiArray                     |    0
 .../engine_seamless/Patch                          |    0
 .../engine_seamless/Patch.cpp                      |    0
 .../engine_seamless/PatchGroup                     |    0
 .../engine_seamless/PatchGroup.cpp                 |    0
 .../engine_seamless/PatchInfo                      |    0
 .../engine_seamless/PatchSet                       |    0
 .../engine_seamless/PatchSet.cpp                   |    0
 .../engine_seamless/Projected                      |    0
 .../engine_seamless/Projected.cpp                  |    0
 .../engine_seamless/QSC                            |    0
 .../engine_seamless/QSC.cpp                        |    0
 .../engine_seamless/SeamlessEngineNode             |    0
 .../engine_seamless/SeamlessEngineNode.cpp         |    0
 .../engine_seamless/SeamlessOptions                |    0
 .../engine_seamless/SeamlessPlugin.cpp             |    0
 .../engine_seamless/doc/README                     |    0
 .../engine_seamless/doc/euler.kml                  |    0
 .../engine_seamless/doc/notes.org                  |    0
 .../feature_mapnikvectortiles/CMakeLists.txt       |   29 +
 .../feature_mapnikvectortiles/FeatureSourceMVT.cpp |  446 ++++
 .../feature_mapnikvectortiles/MVTFeatureOptions    |   76 +
 .../feature_mapnikvectortiles/vector_tile.proto    |   92 +
 .../label_overlay/CMakeLists.txt                   |    0
 .../label_overlay/OverlayLabelSource               |    0
 .../label_overlay/OverlayLabelSource.cpp           |  213 ++
 .../model_feature_label/CMakeLists.txt             |    0
 .../model_feature_label/FeatureLabelModelOptions   |    0
 .../FeatureLabelModelSource.cpp                    |    0
 .../noise/CMakeLists.txt                           |    0
 src/osgEarthDriversDisabled/noise/NoiseDriver.cpp  |  322 +++
 .../noise/NoiseOptions                             |    0
 src/osgEarthExtensions/CMakeLists.txt              |   29 +
 .../billboard/BillboardExtension                   |   71 +
 .../billboard/BillboardExtension.cpp               |  288 +++
 src/osgEarthExtensions/billboard/BillboardOptions  |  111 +
 .../billboard/BillboardPlugin.cpp                  |   56 +
 src/osgEarthExtensions/billboard/BillboardShaders  |  106 +
 src/osgEarthExtensions/billboard/CMakeLists.txt    |   27 +
 .../bumpmap/BumpMap.frag.common.glsl               |   26 +
 .../bumpmap/BumpMap.frag.progressive.glsl          |   56 +
 .../bumpmap/BumpMap.frag.simple.glsl               |   23 +
 .../bumpmap/BumpMap.vert.model.glsl                |   60 +
 .../bumpmap/BumpMap.vert.view.glsl                 |   12 +
 src/osgEarthExtensions/bumpmap/BumpMapExtension    |   73 +
 .../bumpmap/BumpMapExtension.cpp                   |   98 +
 src/osgEarthExtensions/bumpmap/BumpMapOptions      |  110 +
 src/osgEarthExtensions/bumpmap/BumpMapPlugin.cpp   |   56 +
 src/osgEarthExtensions/bumpmap/BumpMapShaders      |   39 +
 .../bumpmap/BumpMapShaders.cpp.in                  |   24 +
 .../bumpmap/BumpMapTerrainEffect                   |   82 +
 .../bumpmap/BumpMapTerrainEffect.cpp               |  140 ++
 src/osgEarthExtensions/bumpmap/CMakeLists.txt      |   46 +
 src/osgEarthExtensions/mapinspector/CMakeLists.txt |   27 +
 .../mapinspector/MapInspectorExtension             |   84 +
 .../mapinspector/MapInspectorExtension.cpp         |  112 +
 .../mapinspector/MapInspectorPlugin.cpp            |   55 +
 src/osgEarthExtensions/mapinspector/MapInspectorUI |   49 +
 .../mapinspector/MapInspectorUI.cpp                |  162 ++
 src/osgEarthExtensions/noise/CMakeLists.txt        |   25 +
 src/osgEarthExtensions/noise/NoiseExtension        |   73 +
 src/osgEarthExtensions/noise/NoiseExtension.cpp    |   78 +
 src/osgEarthExtensions/noise/NoiseOptions          |   68 +
 src/osgEarthExtensions/noise/NoisePlugin.cpp       |   56 +
 src/osgEarthExtensions/noise/NoiseTerrainEffect    |   62 +
 .../noise/NoiseTerrainEffect.cpp                   |  166 ++
 src/osgEarthExtensions/normalmap/CMakeLists.txt    |   43 +
 .../normalmap/NormalMap.frag.glsl                  |   27 +
 .../normalmap/NormalMap.vert.glsl                  |   25 +
 .../normalmap/NormalMapExtension                   |   73 +
 .../normalmap/NormalMapExtension.cpp               |   80 +
 src/osgEarthExtensions/normalmap/NormalMapOptions  |   72 +
 .../normalmap/NormalMapPlugin.cpp                  |   56 +
 src/osgEarthExtensions/normalmap/NormalMapShaders  |   33 +
 .../normalmap/NormalMapShaders.cpp.in              |   14 +
 .../normalmap/NormalMapTerrainEffect               |   64 +
 .../normalmap/NormalMapTerrainEffect.cpp           |  136 +
 src/osgEarthExtensions/splat/Biome                 |   83 +
 src/osgEarthExtensions/splat/Biome.cpp             |   73 +
 src/osgEarthExtensions/splat/BiomeSelector         |   53 +
 src/osgEarthExtensions/splat/BiomeSelector.cpp     |  143 ++
 src/osgEarthExtensions/splat/CMakeLists.txt        |   60 +
 src/osgEarthExtensions/splat/LandUseTileSource     |  180 ++
 src/osgEarthExtensions/splat/LandUseTileSource.cpp |  283 +++
 src/osgEarthExtensions/splat/ModelSplatter         |   70 +
 src/osgEarthExtensions/splat/ModelSplatter.cpp     |  206 ++
 src/osgEarthExtensions/splat/Splat.Noise.glsl      |  157 ++
 .../splat/Splat.frag.common.glsl                   |   29 +
 .../splat/Splat.frag.getRenderInfo.glsl            |   18 +
 src/osgEarthExtensions/splat/Splat.frag.glsl       |  275 +++
 src/osgEarthExtensions/splat/Splat.types.glsl      |   21 +
 src/osgEarthExtensions/splat/Splat.util.glsl       |   64 +
 src/osgEarthExtensions/splat/Splat.vert.model.glsl |   14 +
 src/osgEarthExtensions/splat/Splat.vert.view.glsl  |   24 +
 src/osgEarthExtensions/splat/SplatCatalog          |  178 ++
 src/osgEarthExtensions/splat/SplatCatalog.cpp      |  389 +++
 src/osgEarthExtensions/splat/SplatCoverageLegend   |  108 +
 .../splat/SplatCoverageLegend.cpp                  |   78 +
 src/osgEarthExtensions/splat/SplatExport           |   63 +
 src/osgEarthExtensions/splat/SplatExtension        |   83 +
 src/osgEarthExtensions/splat/SplatExtension.cpp    |  239 ++
 src/osgEarthExtensions/splat/SplatOptions          |  151 ++
 src/osgEarthExtensions/splat/SplatPlugin.cpp       |   56 +
 src/osgEarthExtensions/splat/SplatShaders          |   46 +
 src/osgEarthExtensions/splat/SplatShaders.cpp.in   |   34 +
 src/osgEarthExtensions/splat/SplatTerrainEffect    |  138 ++
 .../splat/SplatTerrainEffect.cpp                   |  513 ++++
 .../terrainshader/CMakeLists.txt                   |   24 +
 .../terrainshader/TerrainShaderExtension           |   68 +
 .../terrainshader/TerrainShaderExtension.cpp       |  121 +
 .../terrainshader/TerrainShaderOptions             |   87 +
 .../terrainshader/TerrainShaderPlugin.cpp          |   56 +
 src/osgEarthExtensions/viewpoints/CMakeLists.txt   |   24 +
 .../viewpoints/ViewpointsExtension                 |   83 +
 .../viewpoints/ViewpointsExtension.cpp             |  242 ++
 .../viewpoints/ViewpointsPlugin.cpp                |   55 +
 src/osgEarthFeatures/AltitudeFilter                |    2 +-
 src/osgEarthFeatures/AltitudeFilter.cpp            |   25 +-
 src/osgEarthFeatures/BufferFilter                  |    2 +-
 src/osgEarthFeatures/BufferFilter.cpp              |    2 +-
 src/osgEarthFeatures/BuildGeometryFilter           |   10 +-
 src/osgEarthFeatures/BuildGeometryFilter.cpp       |  160 +-
 src/osgEarthFeatures/BuildTextFilter               |    2 +-
 src/osgEarthFeatures/BuildTextFilter.cpp           |    2 +-
 src/osgEarthFeatures/BuildTextOperator             |   13 +-
 src/osgEarthFeatures/BuildTextOperator.cpp         |    2 +-
 src/osgEarthFeatures/CMakeLists.txt                |    1 +
 src/osgEarthFeatures/CentroidFilter                |    2 +-
 src/osgEarthFeatures/CentroidFilter.cpp            |    2 +-
 src/osgEarthFeatures/Common                        |    2 +-
 src/osgEarthFeatures/ConvertTypeFilter             |    2 +-
 src/osgEarthFeatures/ConvertTypeFilter.cpp         |    2 +-
 src/osgEarthFeatures/CropFilter                    |    2 +-
 src/osgEarthFeatures/CropFilter.cpp                |    3 +-
 src/osgEarthFeatures/ExtrudeGeometryFilter         |   40 +-
 src/osgEarthFeatures/ExtrudeGeometryFilter.cpp     |  315 ++-
 src/osgEarthFeatures/Feature                       |   25 +-
 src/osgEarthFeatures/Feature.cpp                   |   11 +-
 src/osgEarthFeatures/FeatureCursor                 |    2 +-
 src/osgEarthFeatures/FeatureCursor.cpp             |   18 +-
 src/osgEarthFeatures/FeatureDisplayLayout          |   17 +-
 src/osgEarthFeatures/FeatureDisplayLayout.cpp      |   12 +-
 src/osgEarthFeatures/FeatureDrawSet                |    2 +-
 src/osgEarthFeatures/FeatureDrawSet.cpp            |    2 +-
 src/osgEarthFeatures/FeatureIndex                  |   54 +
 src/osgEarthFeatures/FeatureListSource             |   15 +-
 src/osgEarthFeatures/FeatureListSource.cpp         |    2 +-
 src/osgEarthFeatures/FeatureModelGraph             |   37 +-
 src/osgEarthFeatures/FeatureModelGraph.cpp         |  394 ++-
 src/osgEarthFeatures/FeatureModelSource            |   13 +-
 src/osgEarthFeatures/FeatureModelSource.cpp        |   21 +-
 src/osgEarthFeatures/FeatureRasterizer             |   49 -
 src/osgEarthFeatures/FeatureSource                 |   23 +-
 src/osgEarthFeatures/FeatureSource.cpp             |    6 +-
 src/osgEarthFeatures/FeatureSourceIndexNode        |  196 +-
 src/osgEarthFeatures/FeatureSourceIndexNode.cpp    |  357 +--
 src/osgEarthFeatures/FeatureTileSource             |   22 +-
 src/osgEarthFeatures/FeatureTileSource.cpp         |   26 +-
 src/osgEarthFeatures/Filter                        |    2 +-
 src/osgEarthFeatures/Filter.cpp                    |   17 +-
 src/osgEarthFeatures/FilterContext                 |   26 +-
 src/osgEarthFeatures/FilterContext.cpp             |   28 +-
 src/osgEarthFeatures/GeometryCompiler              |   12 +-
 src/osgEarthFeatures/GeometryCompiler.cpp          |  153 +-
 src/osgEarthFeatures/GeometryUtils                 |   13 +-
 src/osgEarthFeatures/GeometryUtils.cpp             |   13 +-
 src/osgEarthFeatures/LabelSource                   |   17 +-
 src/osgEarthFeatures/LabelSource.cpp               |    2 +-
 src/osgEarthFeatures/MeshClamper                   |    2 +-
 src/osgEarthFeatures/MeshClamper.cpp               |    2 +-
 src/osgEarthFeatures/OgrUtils                      |   21 +-
 src/osgEarthFeatures/OgrUtils.cpp                  |   30 +-
 src/osgEarthFeatures/OptimizerHints                |    2 +-
 src/osgEarthFeatures/OptimizerHints.cpp            |    2 +-
 src/osgEarthFeatures/PolygonizeLines               |    2 +-
 src/osgEarthFeatures/PolygonizeLines.cpp           |  173 +-
 src/osgEarthFeatures/ResampleFilter                |    2 +-
 src/osgEarthFeatures/ResampleFilter.cpp            |    7 +-
 src/osgEarthFeatures/ScaleFilter                   |    2 +-
 src/osgEarthFeatures/ScaleFilter.cpp               |    2 +-
 src/osgEarthFeatures/ScatterFilter                 |    2 +-
 src/osgEarthFeatures/ScatterFilter.cpp             |    2 +-
 src/osgEarthFeatures/Script                        |    2 +-
 src/osgEarthFeatures/ScriptEngine                  |    2 +-
 src/osgEarthFeatures/ScriptEngine.cpp              |    2 +-
 src/osgEarthFeatures/Session                       |    7 +-
 src/osgEarthFeatures/Session.cpp                   |    4 +-
 src/osgEarthFeatures/StencilVolumeNode             |  103 -
 src/osgEarthFeatures/SubstituteModelFilter         |    3 +-
 src/osgEarthFeatures/SubstituteModelFilter.cpp     |  271 +-
 src/osgEarthFeatures/TessellateOperator            |   35 +-
 src/osgEarthFeatures/TessellateOperator.cpp        |   42 +-
 src/osgEarthFeatures/TextSymbolizer                |    2 +-
 src/osgEarthFeatures/TextSymbolizer.cpp            |    2 +-
 src/osgEarthFeatures/TransformFilter               |    2 +-
 src/osgEarthFeatures/TransformFilter.cpp           |    2 +-
 src/osgEarthFeatures/VirtualFeatureSource          |    2 +-
 src/osgEarthFeatures/VirtualFeatureSource.cpp      |    2 +-
 src/osgEarthQt/Actions                             |    2 +-
 src/osgEarthQt/AnnotationDialogs                   |    8 +-
 src/osgEarthQt/AnnotationDialogs.cpp               |   71 +-
 src/osgEarthQt/AnnotationListWidget                |    2 +-
 src/osgEarthQt/AnnotationListWidget.cpp            |   16 +-
 src/osgEarthQt/AnnotationToolbar                   |    2 +-
 src/osgEarthQt/AnnotationToolbar.cpp               |   13 +-
 src/osgEarthQt/CollapsiblePairWidget               |    2 +-
 src/osgEarthQt/CollapsiblePairWidget.cpp           |   13 +-
 src/osgEarthQt/Common                              |    2 +-
 src/osgEarthQt/DataManager                         |    2 +-
 src/osgEarthQt/DataManager.cpp                     |   13 +-
 src/osgEarthQt/GuiActions                          |    2 +-
 src/osgEarthQt/LOSControlWidget                    |    2 +-
 src/osgEarthQt/LOSControlWidget.cpp                |   16 +-
 src/osgEarthQt/LOSCreationDialog                   |    8 +-
 src/osgEarthQt/LOSCreationDialog.cpp               |   16 +-
 src/osgEarthQt/LayerManagerWidget                  |    2 +-
 src/osgEarthQt/LayerManagerWidget.cpp              |   19 +-
 src/osgEarthQt/MapCatalogWidget                    |    2 +-
 src/osgEarthQt/MapCatalogWidget.cpp                |   29 +-
 src/osgEarthQt/TerrainProfileGraph                 |    2 +-
 src/osgEarthQt/TerrainProfileGraph.cpp             |   13 +-
 src/osgEarthQt/TerrainProfileWidget                |    2 +-
 src/osgEarthQt/TerrainProfileWidget.cpp            |   13 +-
 src/osgEarthQt/ViewWidget                          |   16 +-
 src/osgEarthQt/ViewWidget.cpp                      |   22 +-
 src/osgEarthQt/ViewerWidget                        |    2 +-
 src/osgEarthQt/ViewerWidget.cpp                    |   13 +-
 src/osgEarthSymbology/AGG.h                        |   20 +-
 src/osgEarthSymbology/AltitudeSymbol               |    5 +-
 src/osgEarthSymbology/AltitudeSymbol.cpp           |   14 +-
 src/osgEarthSymbology/CMakeLists.txt               |    4 +
 src/osgEarthSymbology/Color                        |    2 +-
 src/osgEarthSymbology/Color.cpp                    |    2 +-
 src/osgEarthSymbology/Common                       |    2 +-
 src/osgEarthSymbology/CoverageSymbol               |   61 +
 src/osgEarthSymbology/CoverageSymbol.cpp           |   63 +
 src/osgEarthSymbology/CssUtils                     |    2 +-
 src/osgEarthSymbology/CssUtils.cpp                 |    2 +-
 src/osgEarthSymbology/Expression                   |    2 +-
 src/osgEarthSymbology/Expression.cpp               |   13 +-
 src/osgEarthSymbology/ExtrusionSymbol              |    5 +-
 src/osgEarthSymbology/ExtrusionSymbol.cpp          |   14 +-
 src/osgEarthSymbology/FeatureDataSet               |   54 -
 src/osgEarthSymbology/FeatureDataSetAdapter        |   58 -
 src/osgEarthSymbology/Fill                         |    2 +-
 src/osgEarthSymbology/Fill.cpp                     |    2 +-
 src/osgEarthSymbology/GEOS                         |    2 +-
 src/osgEarthSymbology/GEOS.cpp                     |   24 +-
 src/osgEarthSymbology/Geometry                     |   32 +-
 src/osgEarthSymbology/Geometry.cpp                 |  167 +-
 src/osgEarthSymbology/GeometryExtrudeSymbolizer    |   52 -
 src/osgEarthSymbology/GeometryFactory              |    2 +-
 src/osgEarthSymbology/GeometryFactory.cpp          |    2 +-
 src/osgEarthSymbology/GeometryInput                |   44 -
 src/osgEarthSymbology/GeometryRasterizer           |    2 +-
 src/osgEarthSymbology/GeometryRasterizer.cpp       |    4 +-
 src/osgEarthSymbology/GeometrySymbol               |  190 --
 src/osgEarthSymbology/IconResource                 |    2 +-
 src/osgEarthSymbology/IconResource.cpp             |    4 +-
 src/osgEarthSymbology/IconSymbol                   |    6 +-
 src/osgEarthSymbology/IconSymbol.cpp               |   15 +-
 src/osgEarthSymbology/InstanceResource             |    2 +-
 src/osgEarthSymbology/InstanceResource.cpp         |    2 +-
 src/osgEarthSymbology/InstanceSymbol               |   11 +-
 src/osgEarthSymbology/InstanceSymbol.cpp           |   19 +-
 src/osgEarthSymbology/LineSymbol                   |   12 +-
 src/osgEarthSymbology/LineSymbol.cpp               |   21 +-
 src/osgEarthSymbology/MarkerResource               |    2 +-
 src/osgEarthSymbology/MarkerResource.cpp           |    2 +-
 src/osgEarthSymbology/MarkerSymbol                 |   12 +-
 src/osgEarthSymbology/MarkerSymbol.cpp             |   28 +-
 src/osgEarthSymbology/MarkerSymbolizer             |   47 -
 src/osgEarthSymbology/MeshConsolidator             |    2 +-
 src/osgEarthSymbology/MeshConsolidator.cpp         |  183 +-
 src/osgEarthSymbology/MeshFlattener                |   91 +
 src/osgEarthSymbology/MeshFlattener.cpp            |  204 ++
 src/osgEarthSymbology/MeshSubdivider               |    2 +-
 src/osgEarthSymbology/MeshSubdivider.cpp           |    2 +-
 src/osgEarthSymbology/ModelResource                |    2 +-
 src/osgEarthSymbology/ModelResource.cpp            |   10 +-
 src/osgEarthSymbology/ModelSymbol                  |    5 +-
 src/osgEarthSymbology/ModelSymbol.cpp              |   14 +-
 src/osgEarthSymbology/ModelSymbolizer              |   44 -
 src/osgEarthSymbology/PointSymbol                  |    5 +-
 src/osgEarthSymbology/PointSymbol.cpp              |    9 +-
 src/osgEarthSymbology/PolygonSymbol                |    5 +-
 src/osgEarthSymbology/PolygonSymbol.cpp            |    8 +-
 src/osgEarthSymbology/Query                        |    8 +-
 src/osgEarthSymbology/Query.cpp                    |   45 +-
 src/osgEarthSymbology/RenderSymbol                 |   10 +-
 src/osgEarthSymbology/RenderSymbol.cpp             |   20 +-
 src/osgEarthSymbology/Resource                     |   12 +-
 src/osgEarthSymbology/Resource.cpp                 |    2 +-
 src/osgEarthSymbology/ResourceCache                |    2 +-
 src/osgEarthSymbology/ResourceCache.cpp            |    9 +-
 src/osgEarthSymbology/ResourceLibrary              |    2 +-
 src/osgEarthSymbology/ResourceLibrary.cpp          |    2 +-
 src/osgEarthSymbology/Skins                        |   13 +-
 src/osgEarthSymbology/Skins.cpp                    |   20 +-
 src/osgEarthSymbology/StencilVolumeNode            |    2 +-
 src/osgEarthSymbology/StencilVolumeNode.cpp        |    2 +-
 src/osgEarthSymbology/Stroke                       |    2 +-
 src/osgEarthSymbology/Stroke.cpp                   |    2 +-
 src/osgEarthSymbology/Style                        |    5 +-
 src/osgEarthSymbology/Style.cpp                    |   42 +-
 src/osgEarthSymbology/StyleSelector                |    2 +-
 src/osgEarthSymbology/StyleSelector.cpp            |   13 +-
 src/osgEarthSymbology/StyleSheet                   |    2 +-
 src/osgEarthSymbology/StyleSheet.cpp               |   13 +-
 src/osgEarthSymbology/Symbol                       |   19 +-
 src/osgEarthSymbology/Symbol.cpp                   |    9 +-
 src/osgEarthSymbology/Tags                         |   13 +-
 src/osgEarthSymbology/TextSymbol                   |    5 +-
 src/osgEarthSymbology/TextSymbol.cpp               |   34 +-
 src/osgEarthUtil/ActivityMonitorTool               |    2 +-
 src/osgEarthUtil/ActivityMonitorTool.cpp           |    2 +-
 src/osgEarthUtil/AnnotationEvents                  |   22 +-
 src/osgEarthUtil/AnnotationEvents.cpp              |   29 +-
 src/osgEarthUtil/ArcGIS                            |   13 +-
 src/osgEarthUtil/ArcGIS.cpp                        |    2 +-
 src/osgEarthUtil/AtlasBuilder                      |   20 +-
 src/osgEarthUtil/AtlasBuilder.cpp                  |    7 +-
 src/osgEarthUtil/AutoClipPlaneHandler              |    6 +-
 src/osgEarthUtil/AutoClipPlaneHandler.cpp          |    2 +-
 src/osgEarthUtil/BrightnessContrastColorFilter     |   13 +-
 src/osgEarthUtil/BrightnessContrastColorFilter.cpp |   13 +-
 src/osgEarthUtil/CMYKColorFilter                   |   13 +-
 src/osgEarthUtil/CMYKColorFilter.cpp               |   13 +-
 src/osgEarthUtil/CMakeLists.txt                    |   52 +-
 src/osgEarthUtil/ChromaKeyColorFilter              |    2 +-
 src/osgEarthUtil/ChromaKeyColorFilter.cpp          |    2 +-
 src/osgEarthUtil/ClampCallback                     |   13 +-
 src/osgEarthUtil/ClampCallback.cpp                 |   13 +-
 src/osgEarthUtil/Common                            |    2 +-
 src/osgEarthUtil/ContourMap                        |   11 +-
 src/osgEarthUtil/ContourMap.cpp                    |   60 +-
 src/osgEarthUtil/ContourMap.frag.glsl              |   16 +
 src/osgEarthUtil/ContourMap.vert.glsl              |   18 +
 src/osgEarthUtil/Controls                          |    9 +-
 src/osgEarthUtil/Controls.cpp                      |   86 +-
 src/osgEarthUtil/DataScanner                       |   13 +-
 src/osgEarthUtil/DataScanner.cpp                   |   13 +-
 src/osgEarthUtil/DateTime                          |   34 -
 src/osgEarthUtil/DateTime.cpp                      |   85 -
 src/osgEarthUtil/DetailTexture                     |  114 -
 src/osgEarthUtil/DetailTexture.cpp                 |  478 ----
 src/osgEarthUtil/EarthManipulator                  |  200 +-
 src/osgEarthUtil/EarthManipulator.cpp              | 1735 +++++++------
 src/osgEarthUtil/Ephemeris                         |   13 +-
 src/osgEarthUtil/Ephemeris.cpp                     |   13 +-
 src/osgEarthUtil/ExampleResources                  |   26 +-
 src/osgEarthUtil/ExampleResources.cpp              |  350 ++-
 src/osgEarthUtil/Export                            |    2 +-
 src/osgEarthUtil/FeatureQueryTool                  |  136 +-
 src/osgEarthUtil/FeatureQueryTool.cpp              |  304 +--
 src/osgEarthUtil/Fog                               |   11 +-
 src/osgEarthUtil/Fog.cpp                           |   51 +-
 src/osgEarthUtil/Fog.frag.glsl                     |   13 +
 src/osgEarthUtil/Fog.vert.glsl                     |   16 +
 src/osgEarthUtil/Formatter                         |    2 +-
 src/osgEarthUtil/GLSLColorFilter                   |   13 +-
 src/osgEarthUtil/GLSLColorFilter.cpp               |   13 +-
 src/osgEarthUtil/GammaColorFilter                  |   13 +-
 src/osgEarthUtil/GammaColorFilter.cpp              |   13 +-
 src/osgEarthUtil/GeodeticGraticule                 |    2 +-
 src/osgEarthUtil/GeodeticGraticule.cpp             |    6 +-
 src/osgEarthUtil/Graticule.frag.glsl               |   31 +
 src/osgEarthUtil/Graticule.vert.glsl               |   16 +
 src/osgEarthUtil/GraticuleExtension                |   74 +
 src/osgEarthUtil/GraticuleExtension.cpp            |  109 +
 src/osgEarthUtil/GraticuleNode                     |  117 +
 src/osgEarthUtil/GraticuleNode.cpp                 |  417 ++++
 src/osgEarthUtil/GraticuleOptions                  |  114 +
 src/osgEarthUtil/GraticuleTerrainEffect            |   61 +
 src/osgEarthUtil/GraticuleTerrainEffect.cpp        |   87 +
 src/osgEarthUtil/HSLColorFilter                    |    2 +-
 src/osgEarthUtil/HSLColorFilter.cpp                |   13 +-
 src/osgEarthUtil/HTM                               |   13 +-
 src/osgEarthUtil/HTM.cpp                           |   13 +-
 src/osgEarthUtil/LODBlending                       |   11 +-
 src/osgEarthUtil/LODBlending.cpp                   |   28 +-
 src/osgEarthUtil/LatLongFormatter                  |   10 +-
 src/osgEarthUtil/LatLongFormatter.cpp              |  122 +-
 src/osgEarthUtil/LineOfSight                       |    2 +-
 src/osgEarthUtil/LinearLineOfSight                 |   19 +-
 src/osgEarthUtil/LinearLineOfSight.cpp             |   25 +-
 src/osgEarthUtil/LogDepthBuffer.VertOnly.vert.glsl |   15 +
 src/osgEarthUtil/LogDepthBuffer.frag.glsl          |   16 +
 src/osgEarthUtil/LogDepthBuffer.vert.glsl          |   17 +
 src/osgEarthUtil/LogarithmicDepthBuffer            |   26 +-
 src/osgEarthUtil/LogarithmicDepthBuffer.cpp        |  178 +-
 src/osgEarthUtil/MGRSFormatter                     |    2 +-
 src/osgEarthUtil/MGRSFormatter.cpp                 |    2 +-
 src/osgEarthUtil/MGRSGraticule                     |    2 +-
 src/osgEarthUtil/MGRSGraticule.cpp                 |    2 +-
 src/osgEarthUtil/MeasureTool                       |    2 +-
 src/osgEarthUtil/MeasureTool.cpp                   |    3 +-
 src/osgEarthUtil/MouseCoordsTool                   |    2 +-
 src/osgEarthUtil/MouseCoordsTool.cpp               |    2 +-
 src/osgEarthUtil/NearFarGroup                      |   52 -
 src/osgEarthUtil/NightColorFilter                  |   55 +
 src/osgEarthUtil/NightColorFilter.cpp              |  114 +
 src/osgEarthUtil/NormalMap                         |   78 -
 src/osgEarthUtil/NormalMap.cpp                     |  209 --
 src/osgEarthUtil/ObjectLocator                     |   20 +-
 src/osgEarthUtil/Ocean                             |   13 +-
 src/osgEarthUtil/Ocean.cpp                         |   17 +-
 src/osgEarthUtil/PolyhedralLineOfSight             |   13 +-
 src/osgEarthUtil/PolyhedralLineOfSight.cpp         |   13 +-
 src/osgEarthUtil/RGBColorFilter                    |   13 +-
 src/osgEarthUtil/RGBColorFilter.cpp                |   13 +-
 src/osgEarthUtil/RTTPicker                         |  144 ++
 src/osgEarthUtil/RTTPicker.cpp                     |  409 +++
 src/osgEarthUtil/RadialLineOfSight                 |   17 +-
 src/osgEarthUtil/RadialLineOfSight.cpp             |   23 +-
 src/osgEarthUtil/Shaders                           |   50 +
 src/osgEarthUtil/Shaders.cpp.in                    |   36 +
 src/osgEarthUtil/Shadowing                         |   13 +-
 src/osgEarthUtil/Shadowing.cpp                     |   19 +-
 src/osgEarthUtil/SimplexNoise                      |   29 +-
 src/osgEarthUtil/SimplexNoise.cpp                  |   92 +-
 src/osgEarthUtil/Sky                               |   19 +-
 src/osgEarthUtil/Sky.cpp                           |   25 +-
 src/osgEarthUtil/SpatialData                       |    2 +-
 src/osgEarthUtil/SpatialData.cpp                   |    2 +-
 src/osgEarthUtil/StarData                          |   13 +-
 src/osgEarthUtil/TFS                               |   13 +-
 src/osgEarthUtil/TFS.cpp                           |    2 +-
 src/osgEarthUtil/TFSPackager                       |    2 +-
 src/osgEarthUtil/TFSPackager.cpp                   |   13 +-
 src/osgEarthUtil/TMS                               |   13 +-
 src/osgEarthUtil/TMS.cpp                           |    3 +-
 src/osgEarthUtil/TMSBackFiller                     |   13 +-
 src/osgEarthUtil/TMSBackFiller.cpp                 |   13 +-
 src/osgEarthUtil/TMSPackager                       |   25 +-
 src/osgEarthUtil/TMSPackager.cpp                   |   98 +-
 src/osgEarthUtil/TerrainProfile                    |   13 +-
 src/osgEarthUtil/TerrainProfile.cpp                |   13 +-
 src/osgEarthUtil/TextureSplatter                   |  121 -
 src/osgEarthUtil/TextureSplatter.cpp               |  362 ---
 src/osgEarthUtil/TileIndex                         |   13 +-
 src/osgEarthUtil/TileIndex.cpp                     |   13 +-
 src/osgEarthUtil/TileIndexBuilder                  |   13 +-
 src/osgEarthUtil/TileIndexBuilder.cpp              |   13 +-
 src/osgEarthUtil/UTMGraticule                      |    2 +-
 src/osgEarthUtil/UTMGraticule.cpp                  |    6 +-
 src/osgEarthUtil/VerticalScale                     |   11 +-
 src/osgEarthUtil/VerticalScale.cpp                 |   13 +-
 src/osgEarthUtil/WFS                               |   13 +-
 src/osgEarthUtil/WFS.cpp                           |    2 +-
 src/osgEarthUtil/WMS                               |   13 +-
 src/osgEarthUtil/WMS.cpp                           |    2 +-
 tests/annotation.earth                             |    4 +-
 tests/annotation_flat.earth                        |  129 +-
 tests/arcgisonline.earth                           |    4 +-
 tests/billboard.earth                              |   39 +
 tests/boston-gpu.earth                             |  172 ++
 tests/boston.earth                                 |    5 +-
 tests/boston_buildings.earth                       |   10 +-
 tests/boston_projected.earth                       |    2 +-
 tests/detail_texture.earth                         |   35 -
 tests/feature_clip_plane.earth                     |   31 +
 tests/feature_draped_lines.earth                   |    2 -
 tests/feature_gpx.earth                            |    4 +-
 tests/feature_labels.earth                         |   30 +-
 tests/feature_model_scatter.earth                  |   13 +-
 tests/feature_models.earth                         |    3 +-
 tests/feature_offset_polygons.earth                |  112 +
 tests/feature_overlay.earth                        |   12 +-
 tests/feature_population_cylinders.earth           |   61 +-
 tests/feature_tfs.earth                            |    4 +-
 tests/feature_tfs_scripting.earth                  |    4 +-
 tests/fractal_detail.earth                         |   58 -
 tests/glsl.earth                                   |   28 +
 tests/graticule.earth                              |   41 +
 tests/ldb.earth                                    |   28 +
 tests/min_max_range.earth                          |    8 +-
 tests/night.earth                                  |   27 +
 tests/nodata.earth                                 |    6 +
 tests/noise.earth                                  |   81 +-
 tests/normalmap.earth                              |   51 +-
 tests/ocean.earth                                  |   30 +-
 tests/openweathermap_clouds.earth                  |   30 +
 tests/openweathermap_precipitation.earth           |   31 +
 tests/openweathermap_pressure.earth                |   31 +
 tests/readymap-osm.earth                           |   17 +-
 tests/readymap.earth                               |    4 +-
 tests/silverlining.earth                           |   15 +-
 tests/simple_model.earth                           |    4 +-
 tests/splat-edit.bat                               |   21 +
 tests/splat-gpunoise.bat                           |   31 +
 tests/splat-test.earth                             |   57 +
 tests/splat-with-imagery.earth                     |   52 +
 tests/splat.bat                                    |    7 +
 tests/splat.earth                                  |  118 -
 tests/triton.earth                                 |   21 +-
 tests/wms_jpl_landsat.earth                        |   18 -
 1256 files changed, 42368 insertions(+), 15681 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osgearth.git



More information about the Pkg-grass-devel mailing list