[osgearth] branch experimental updated (0af4bfe -> 0f9c784)

Bas Couwenberg sebastic at debian.org
Sun Jan 7 14:40:57 UTC 2018


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

sebastic pushed a change to branch experimental
in repository osgearth.

      from  0af4bfe   Fix spelling errors in copyright file.
      adds  ecf816d   Fix spelling errors in copyright file.
      adds  bd98f6c   Merge branch 'experimental'
      adds  3247131   Update branch in gbp.conf & Vcs-Git URL.
      adds  10b243d   Update symbols for other architectures.
      adds  d71dc96   Set distribution to unstable.
      adds  4de06b4   Bump Standards-Version to 4.0.0, no changes.
      adds  5e7150f   Add autopkgtest to test installability.
      adds  575e8c1   Use pkg-info.mk variables instead of dpkg-parsechangelog output.
      adds  89c6e2a   Update symbols for other architectures.
      adds  90c9127   Set distribution to unstable.
      adds  e0f473f   Bump Standards-Version to 4.1.0, no changes.
      adds  cd0395f   Strip trailing whitespace from changelog.
       new  1946602   Bump Standards-Version to 4.1.2, no changes.
       new  9256a0d   Update branch in gbp.conf & Vcs-Git URL.
       new  0a56028   Update Files-Excluded for osgEarth 2.9rc1.
       new  9901b6e   New upstream version 2.9~rc1+dfsg
       new  0f8e196   Merge tag 'upstream/2.9_rc1+dfsg' into experimental
       new  6aa382c   New upstream release candidate.
       new  8d78d30   Bump Standards-Version to 4.1.3, no changes.
       new  c6eb76a   Refresh patches.
       new  e2f1f8d   Update packaging for libosgEarthQt changes.
       new  d17c503   Set OSG_DIR CMake option to fix OpenSceneGraph detection.
       new  27e2edd   Update symbols for amd64.
       new  855160a   Update paths for EarthMultiTouchManipulator sources in copyright file.
       new  464453c   Don't install osgEarth_tests executable.
       new  62c30aa   Add patch to fix spelling errors.
       new  0f9c784   Set distribution to experimental.

The 15 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml                                        |    12 +-
 CMakeLists.txt                                     |   276 +-
 CMakeModules/FindExpat.cmake                       |    52 -
 CMakeModules/FindGDAL.cmake                        |    18 +-
 CMakeModules/FindGEOS.cmake                        |    15 +-
 CMakeModules/FindGLCORE.cmake                      |    36 +
 CMakeModules/FindJavaScriptCore.cmake              |    46 -
 CMakeModules/FindLevelDB.cmake                     |     5 +
 CMakeModules/FindLibNoise.cmake                    |    64 -
 CMakeModules/FindOSG.cmake                         |    14 +-
 CMakeModules/FindOpenGLES.cmake                    |    12 +
 CMakeModules/FindRocksDB.cmake                     |     2 +
 CMakeModules/FindV8.cmake                          |   245 -
 CMakeModules/ModuleInstall.cmake                   |    12 +-
 CMakeModules/OsgEarthMacroUtils.cmake              |   140 +-
 data/resources/textures_us/catalog.xml             |     4 +
 debian/changelog                                   |    33 +-
 debian/control                                     |     6 +-
 debian/copyright                                   |    21 +-
 debian/libosgearth5.symbols                        |  2553 +++--
 debian/libosgearthannotation5.symbols              |   207 +-
 debian/libosgearthfeatures5.symbols                |   861 +-
 debian/libosgearthqt5-5.install                    |     1 +
 ...sgearthqt5.symbols => libosgearthqt5-5.symbols} |     6 +-
 debian/libosgearthqt5.install                      |     1 -
 debian/libosgearthsplat5.symbols                   |   795 +-
 debian/libosgearthsymbology5.symbols               |   399 +-
 debian/libosgearthutil5.symbols                    |  1192 ++-
 debian/patches/series                              |     1 +
 debian/patches/soversion.patch                     |     4 +-
 debian/patches/spelling-errors.patch               |    28 +
 debian/rules                                       |    14 +-
 debian/tests/control                               |     3 +
 docs/source/about.rst                              |    41 +-
 docs/source/data.rst                               |    81 +-
 docs/source/developer/shader_composition.rst       |     4 +-
 docs/source/faq.rst                                |     8 +-
 docs/source/index.rst                              |     1 +
 docs/source/references/drivers/tile/tms.rst        |     6 +-
 docs/source/references/earthfile.rst               |    18 +-
 docs/source/references/envvars.rst                 |     2 +-
 docs/source/startup.rst                            |     2 +-
 docs/source/support.rst                            |    24 +
 docs/source/user/features.rst                      |     6 +-
 src/CMakeLists.txt                                 |    22 +-
 src/applications/CMakeLists.txt                    |    38 +-
 src/applications/osgearth_3pv/osgearth_3pv.cpp     |     4 +-
 .../osgearth_annotation/osgearth_annotation.cpp    |    37 +-
 src/applications/osgearth_atlas/osgearth_atlas.cpp |     6 +-
 .../osgearth_boundarygen/BoundaryUtil.cpp          |     2 +-
 .../osgearth_boundarygen/boundarygen.cpp           |     8 +-
 src/applications/osgearth_city/osgearth_city.cpp   |    94 +-
 src/applications/osgearth_clamp/osgearth_clamp.cpp |   178 -
 .../osgearth_clipplane/osgearth_clipplane.cpp      |     2 +-
 .../osgearth_colorfilter/osgearth_colorfilter.cpp  |    11 +-
 .../osgearth_computerangecallback.cpp              |     1 +
 .../osgearth_controls/osgearth_controls.cpp        |     2 +-
 src/applications/osgearth_conv/osgearth_conv.cpp   |   200 +-
 .../osgearth_createtile/osgearth_createtile.cpp    |     8 +-
 .../osgearth_datetime/osgearth_datetime.cpp        |     4 +-
 .../osgearth_deformation/osgearth_deformation.cpp  |    34 +-
 .../osgearth_elevation/osgearth_elevation.cpp      |    85 +-
 .../osgearth_ephemeris/osgearth_ephemeris.cpp      |     7 +-
 .../osgearth_featureeditor.cpp                     |   286 -
 .../osgearth_featurefilter.cpp                     |     3 +-
 .../osgearth_featureinfo/osgearth_featureinfo.cpp  |     6 +-
 .../osgearth_featuremanip.cpp                      |   168 -
 .../osgearth_featurequery.cpp                      |    21 +-
 .../osgearth_features/osgearth_features.cpp        |    63 +-
 src/applications/osgearth_fog/osgearth_fog.cpp     |   100 -
 .../osgearth_graticule/osgearth_graticule.cpp      |   109 +-
 .../osgearth_horizon/osgearth_horizon.cpp          |     5 +-
 .../{osgearth_fog => osgearth_htm}/CMakeLists.txt  |     4 +-
 .../osgearth_htm.cpp}                              |    95 +-
 .../osgearth_imageoverlay.cpp                      |    23 +-
 .../CMakeLists.txt                                 |     4 +-
 .../osgearth_infinitescroll.cpp                    |   207 +
 .../CMakeLists.txt                                 |     4 +-
 .../osgearth_lights/osgearth_lights.cpp            |   244 +
 src/applications/osgearth_los/osgearth_los.cpp     |    63 +-
 src/applications/osgearth_manip/osgearth_manip.cpp |    53 +-
 src/applications/osgearth_map/osgearth_map.cpp     |    43 +-
 .../osgearth_minimap/osgearth_minimap.cpp          |     6 +-
 src/applications/osgearth_mrt/osgearth_mrt.cpp     |    51 +-
 .../CMakeLists.txt                                 |     5 +-
 .../osgearth_noisegen.cpp}                         |    60 +-
 .../osgearth_occlusionculling.cpp                  |     4 +-
 .../osgearth_package/osgearth_package.cpp          |    42 +-
 .../osgearth_package_qt/CMakeLists.txt             |     8 +-
 .../osgearth_package_qt/ExportDialog.cpp           |    45 +-
 .../osgearth_package_qt/PackageQtMainWindow        |    14 +-
 .../osgearth_package_qt/TMSExporter.cpp            |    25 +-
 .../osgearth_pagingtest/osgearth_pagingtest.cpp    |     6 +-
 src/applications/osgearth_pick/osgearth_pick.cpp   |   228 +-
 src/applications/osgearth_qt_simple/CMakeLists.txt |     8 +-
 .../osgearth_qt_windows/CMakeLists.txt             |     8 +-
 .../osgearth_qt_windows/osgearth_qt_windows.cpp    |     7 +-
 src/applications/osgearth_seed/osgearth_seed.cpp   |    63 +-
 .../osgearth_sequencecontrol.cpp                   |     3 +-
 .../osgearth_shadercomp/osgearth_shadercomp.cpp    |    29 +-
 .../osgearth_shadergen/osgearth_shadergen.cpp      |     6 +-
 .../osgearth_sharedlayer/osgearth_sharedlayer.cpp  |    10 +-
 .../osgearth_silverlining.cpp                      |     1 +
 src/applications/osgearth_splat/osgearth_splat.cpp |   255 +-
 .../osgearth_terrainprofile.cpp                    |     9 +-
 src/applications/osgearth_tfs/osgearth_tfs.cpp     |     2 +-
 .../osgearth_tilesource/osgearth_tilesource.cpp    |     3 +-
 src/applications/osgearth_toc/osgearth_toc.cpp     |   407 +-
 .../osgearth_tracks/osgearth_tracks.cpp            |     4 +-
 .../osgearth_transform/osgearth_transform.cpp      |    46 +-
 .../osgearth_triton/osgearth_triton.cpp            |   168 +-
 .../CMakeLists.txt                                 |     4 +-
 .../osgearth_video.cpp}                            |    34 +-
 .../osgearth_viewer/osgearth_viewer.cpp            |    15 +-
 .../{osgEarthViewerIOS => }/AppDelegate.h          |     0
 .../AppDelegate.m => AppDelegate.mm}               |     0
 src/applications/osgearth_viewerIOS/CMakeLists.txt |   143 +
 .../EarthMultiTouchManipulator.cpp                 |     0
 .../EarthMultiTouchManipulator.h                   |     0
 .../StartViewerController.h                        |     0
 ...ViewerController.m => StartViewerController.mm} |    33 +-
 .../StartViewerController.xib                      |     0
 .../{osgEarthViewerIOS => }/ViewController.h       |     2 +
 .../ViewController.m => ViewController.mm}         |   103 +-
 .../osgearth_viewerIOS/ViewController.xib          |    39 +
 .../{osgEarthViewerIOS/main.m => main.mm}          |     0
 .../osgEarthViewerIOS-Info.plist                   |     0
 .../osgEarthViewerIOS.xcodeproj/project.pbxproj    |  1066 --
 .../project.xcworkspace/contents.xcworkspacedata   |     7 -
 .../ShaderGen/GLES2ShaderGenVisitor.cpp            |   581 -
 .../ShaderGen/GLES2ShaderGenVisitor.h              |    84 -
 .../osgEarthViewerIOS/ShaderGen/ShaderGenScene.h   |   227 -
 .../osgEarthViewerIOS/en.lproj/InfoPlist.strings   |     2 -
 .../en.lproj/ViewController_iPad.xib               |   125 -
 .../en.lproj/ViewController_iPhone.xib             |   124 -
 .../osgEarthViewerIOS/osgEarthViewerIOS-Prefix.pch |    14 -
 .../osgEarthViewerIOS/osgPlugins.h                 |    84 -
 .../osgEarthViewerIOS/osgearth_viewerIOS.cpp       |    66 -
 src/applications/osgearth_viewerIOS/osgPlugins.h   |   206 +
 src/applications/osgearth_wfs/osgearth_wfs.cpp     |    66 +-
 src/osgEarth/AlphaEffect                           |    73 -
 src/osgEarth/AlphaEffect.cpp                       |   151 -
 src/osgEarth/AlphaEffect.frag.glsl                 |    12 -
 src/osgEarth/AutoScale.cpp                         |   138 -
 src/osgEarth/Bounds.cpp                            |     2 +-
 src/osgEarth/CMakeLists.txt                        |    74 +-
 src/osgEarth/Cache                                 |    22 +-
 src/osgEarth/Cache.cpp                             |     6 +-
 src/osgEarth/CacheBin.cpp                          |    19 +-
 src/osgEarth/CacheEstimator.cpp                    |     3 -
 src/osgEarth/CachePolicy                           |    10 +-
 src/osgEarth/CachePolicy.cpp                       |    25 -
 src/osgEarth/CacheSeed                             |     9 +-
 src/osgEarth/CacheSeed.cpp                         |    46 +-
 src/osgEarth/Capabilities                          |    14 +-
 src/osgEarth/Capabilities.cpp                      |    41 +-
 src/osgEarth/ClampableNode                         |    41 +-
 src/osgEarth/ClampableNode.cpp                     |   138 +-
 src/osgEarth/Clamping                              |    73 +-
 src/osgEarth/Clamping.cpp                          |   148 +-
 src/osgEarth/ClampingTechnique                     |    10 +-
 src/osgEarth/ClampingTechnique.cpp                 |   159 +-
 src/osgEarth/ColorFilter                           |     8 +
 src/osgEarth/CompositeTileSource.cpp               |    86 +-
 src/osgEarth/Config                                |    62 +-
 src/osgEarth/Config.cpp                            |    30 +-
 src/osgEarth/Containers                            |    99 +-
 src/osgEarth/Cube                                  |     9 +-
 src/osgEarth/Cube.cpp                              |    53 +-
 src/osgEarth/CullingUtils                          |    44 +-
 src/osgEarth/CullingUtils.cpp                      |    82 +-
 src/osgEarth/DPLineSegmentIntersector              |     8 +-
 src/osgEarth/DPLineSegmentIntersector.cpp          |    14 +-
 src/osgEarth/DateTime                              |     2 +-
 src/osgEarth/DateTimeRange                         |    13 +
 src/osgEarth/DepthOffset                           |    31 +-
 src/osgEarth/DepthOffset.cpp                       |    30 +-
 src/osgEarth/DepthOffset.vert.glsl                 |    15 +-
 src/osgEarth/DrapeableNode                         |    19 +-
 src/osgEarth/DrapeableNode.cpp                     |    42 +-
 src/osgEarth/Draping.frag.glsl                     |    13 +-
 src/osgEarth/Draping.vert.glsl                     |     2 +-
 src/osgEarth/DrapingCullSet                        |    22 +-
 src/osgEarth/DrapingCullSet.cpp                    |    25 +-
 src/osgEarth/DrapingTechnique                      |     9 +-
 src/osgEarth/DrapingTechnique.cpp                  |    95 +-
 src/osgEarth/DrawInstanced                         |     4 +-
 src/osgEarth/DrawInstanced.cpp                     |    41 +-
 src/osgEarth/ElevationLOD                          |     3 +
 src/osgEarth/ElevationLayer                        |   118 +-
 src/osgEarth/ElevationLayer.cpp                    |   595 +-
 src/osgEarth/ElevationPool                         |   266 +
 src/osgEarth/ElevationPool.cpp                     |   513 +
 src/osgEarth/ElevationQuery                        |   140 +-
 src/osgEarth/ElevationQuery.cpp                    |   420 +-
 src/osgEarth/Endian                                |   178 +
 src/osgEarth/Export                                |     3 +
 src/osgEarth/Extension                             |    55 +-
 src/osgEarth/FadeEffect                            |     2 +-
 src/osgEarth/FadeEffect.cpp                        |     6 +-
 src/osgEarth/FileUtils.cpp                         |   113 +-
 src/osgEarth/GLSLChunker.cpp                       |     2 +-
 src/osgEarth/GPUClamping.frag.glsl                 |     3 +-
 src/osgEarth/GPUClamping.vert.glsl                 |   120 +-
 src/osgEarth/GPUClamping.vert.lib.glsl             |     2 +-
 src/osgEarth/GeoCommon                             |     6 +-
 src/osgEarth/GeoData                               |   143 +-
 src/osgEarth/GeoData.cpp                           |  1124 +-
 src/osgEarth/GeoTransform                          |    18 +-
 src/osgEarth/GeoTransform.cpp                      |   143 +-
 src/osgEarth/GeometryClamper                       |     7 +-
 src/osgEarth/GeometryClamper.cpp                   |   180 +-
 src/osgEarth/HTTPClient                            |     7 +-
 src/osgEarth/HTTPClient.cpp                        |  3362 +++---
 src/osgEarth/HeightFieldUtils                      |   102 +-
 src/osgEarth/HeightFieldUtils.cpp                  |   221 +-
 src/osgEarth/Horizon.cpp                           |     9 +-
 src/osgEarth/IOTypes                               |     8 +
 src/osgEarth/ImageLayer                            |   151 +-
 src/osgEarth/ImageLayer.cpp                        |   360 +-
 src/osgEarth/ImageMosaic.cpp                       |     3 +-
 src/osgEarth/ImageToHeightFieldConverter           |     2 +
 src/osgEarth/ImageToHeightFieldConverter.cpp       |    27 +
 src/osgEarth/ImageUtils                            |    22 +
 src/osgEarth/ImageUtils.cpp                        |   372 +-
 src/osgEarth/Instancing.vert.glsl                  |     2 +
 src/osgEarth/IntersectionPicker                    |     5 +
 src/osgEarth/LandCover                             |   250 +
 src/osgEarth/LandCover.cpp                         |   315 +
 src/osgEarth/LandCoverLayer                        |   108 +
 src/osgEarth/LandCoverLayer.cpp                    |   635 ++
 src/osgEarth/Layer                                 |   280 +-
 src/osgEarth/Layer.cpp                             |   307 +-
 src/osgEarth/LayerListener                         |   146 +
 src/osgEarth/Lighting                              |   137 +
 src/osgEarth/Lighting.cpp                          |   264 +
 src/osgEarth/LineFunctor                           |    12 -
 src/osgEarth/Locators.cpp                          |     4 +-
 src/osgEarth/Map                                   |   269 +-
 src/osgEarth/Map.cpp                               |  1052 +-
 src/osgEarth/MapCallback                           |    44 +-
 src/osgEarth/MapCallback.cpp                       |   109 +-
 src/osgEarth/MapFrame                              |    87 +-
 src/osgEarth/MapFrame.cpp                          |   264 +-
 src/osgEarth/MapInfo                               |    23 +-
 src/osgEarth/MapInfo.cpp                           |    27 +-
 src/osgEarth/MapModelChange                        |    20 +-
 src/osgEarth/MapNode                               |    89 +-
 src/osgEarth/MapNode.cpp                           |   540 +-
 src/osgEarth/MapNodeOptions                        |     7 +
 src/osgEarth/MapNodeOptions.cpp                    |     2 +-
 src/osgEarth/MapOptions                            |    17 +-
 src/osgEarth/MapOptions.cpp                        |    22 +-
 src/osgEarth/MaskLayer                             |    85 +-
 src/osgEarth/MaskLayer.cpp                         |   200 +-
 src/osgEarth/MaskNode                              |     1 +
 src/osgEarth/MaskSource                            |     3 +
 src/osgEarth/MaskSource.cpp                        |     7 +-
 src/osgEarth/MemCache                              |     3 -
 src/osgEarth/MemCache.cpp                          |     8 +-
 src/osgEarth/Mercator                              |    46 -
 src/osgEarth/Mercator.cpp                          |   149 -
 src/osgEarth/MetaTile                              |    77 +
 src/osgEarth/MetaTile.cpp                          |   122 +
 src/osgEarth/Metrics                               |   269 +
 src/osgEarth/Metrics.cpp                           |   496 +
 src/osgEarth/ModelLayer                            |   170 +-
 src/osgEarth/ModelLayer.cpp                        |   292 +-
 src/osgEarth/ModelSource                           |    41 +-
 src/osgEarth/ModelSource.cpp                       |   103 +-
 src/osgEarth/NodeUtils                             |    31 +-
 src/osgEarth/Notify                                |     2 +
 src/osgEarth/ObjectIndex                           |     7 +-
 src/osgEarth/ObjectIndex.cpp                       |     2 +
 src/osgEarth/OverlayDecorator                      |    14 +-
 src/osgEarth/OverlayDecorator.cpp                  |   138 +-
 src/osgEarth/OverlayNode                           |    94 -
 src/osgEarth/OverlayNode.cpp                       |   398 -
 src/osgEarth/PagedNode                             |    95 +
 src/osgEarth/PagedNode.cpp                         |   165 +
 src/osgEarth/PatchLayer                            |   121 +
 .../{TilePatchCallback.cpp => PatchLayer.cpp}      |    26 +-
 src/osgEarth/PhongLighting.frag.glsl               |   145 +
 src/osgEarth/PhongLighting.vert.glsl               |    20 +
 src/osgEarth/PhongLightingEffect                   |     5 +-
 src/osgEarth/PhongLightingEffect.cpp               |   160 +-
 src/osgEarth/PluginLoader                          |    83 +
 src/osgEarth/Profile                               |     5 +-
 src/osgEarth/Profile.cpp                           |    42 +-
 src/osgEarth/Profiler                              |     6 +
 src/osgEarth/Profiler.cpp                          |     7 +
 src/osgEarth/QuadTree                              |   199 -
 src/osgEarth/QuadTree.cpp                          |   825 --
 src/osgEarth/Registry                              |    65 +-
 src/osgEarth/Registry.cpp                          |   106 +-
 src/osgEarth/ResourceReleaser.cpp                  |     8 +-
 src/osgEarth/SceneGraphCallback                    |   115 +
 src/osgEarth/SceneGraphCallback.cpp                |   149 +
 src/osgEarth/ScreenSpaceLayout                     |    16 +-
 src/osgEarth/ScreenSpaceLayout.cpp                 |   150 +-
 src/osgEarth/ShaderFactory                         |    11 +-
 src/osgEarth/ShaderFactory.cpp                     |    86 +-
 src/osgEarth/ShaderGenerator                       |    10 +-
 src/osgEarth/ShaderGenerator.cpp                   |   258 +-
 src/osgEarth/ShaderLoader                          |     4 +
 src/osgEarth/ShaderLoader.cpp                      |   294 +-
 src/osgEarth/ShaderUtils                           |    76 -
 src/osgEarth/ShaderUtils.cpp                       |   370 +-
 src/osgEarth/Shaders                               |     2 +-
 src/osgEarth/Shaders.cpp.in                        |    13 +-
 src/osgEarth/Shadowing.cpp                         |     7 +-
 src/{osgEarthUtil => osgEarth}/SimplexNoise        |    22 +-
 src/{osgEarthUtil => osgEarth}/SimplexNoise.cpp    |    80 +-
 src/osgEarth/SpatialReference                      |    15 +-
 src/osgEarth/SpatialReference.cpp                  |   126 +-
 src/osgEarth/StateSetCache.cpp                     |     4 +-
 src/osgEarth/StateSetLOD                           |     5 +-
 src/osgEarth/StringUtils                           |     2 +-
 src/osgEarth/StringUtils.cpp                       |     6 +-
 src/osgEarth/Terrain                               |    72 +-
 src/osgEarth/Terrain.cpp                           |   143 +-
 src/osgEarth/TerrainEngineNode                     |    99 +-
 src/osgEarth/TerrainEngineNode.cpp                 |   224 +-
 src/osgEarth/TerrainEngineRequirements             |     2 +
 src/osgEarth/TerrainLayer                          |   305 +-
 src/osgEarth/TerrainLayer.cpp                      |   871 +-
 src/osgEarth/TerrainOptions                        |    22 +-
 src/osgEarth/TerrainOptions.cpp                    |    79 +-
 src/osgEarth/TerrainResources                      |   138 +
 src/osgEarth/TerrainResources.cpp                  |   262 +
 src/osgEarth/TerrainTileModel                      |    78 +-
 src/osgEarth/TerrainTileModel.cpp                  |    88 +-
 src/osgEarth/TerrainTileModelFactory               |    82 +-
 src/osgEarth/TerrainTileModelFactory.cpp           |   381 +-
 src/osgEarth/TerrainTileNode                       |    19 +-
 src/osgEarth/Tessellator.cpp                       |     4 +-
 src/osgEarth/TextureBufferSerializer.cpp           |    22 +
 src/osgEarth/TextureCompositor                     |    71 -
 src/osgEarth/TextureCompositor.cpp                 |    79 -
 src/osgEarth/ThreadingUtils                        |   333 +-
 src/osgEarth/ThreadingUtils.cpp                    |   170 +
 src/osgEarth/TileKeyDataStore                      |     1 +
 src/osgEarth/TilePatchCallback                     |    79 -
 src/osgEarth/TileRasterizer                        |   116 +
 src/osgEarth/TileRasterizer.cpp                    |   284 +
 src/osgEarth/TileSource                            |   156 +-
 src/osgEarth/TileSource.cpp                        |   395 +-
 src/osgEarth/TileVisitor.cpp                       |     8 +-
 src/osgEarth/TraversalData                         |     6 +-
 src/osgEarth/TraversalData.cpp                     |    48 +-
 src/osgEarth/URI                                   |    35 +
 src/osgEarth/URI.cpp                               |    32 +-
 src/osgEarth/Units                                 |    10 +-
 src/osgEarth/Units.cpp                             |     2 +-
 src/osgEarth/Utils                                 |    41 +-
 src/osgEarth/Utils.cpp                             |    53 +-
 src/osgEarth/Version                               |     4 +-
 src/osgEarth/VerticalDatum.cpp                     |     9 +-
 src/osgEarth/VideoLayer                            |    93 +
 src/osgEarth/VideoLayer.cpp                        |   155 +
 src/osgEarth/VirtualProgram                        |    22 +-
 src/osgEarth/VirtualProgram.cpp                    |   172 +-
 src/osgEarth/VisibleLayer                          |   108 +
 src/osgEarth/VisibleLayer.cpp                      |   177 +
 src/osgEarth/WrapperLayer                          |    74 +
 src/osgEarth/catch.hpp                             | 10663 +++++++++++++++++++
 src/osgEarth/tinyxml.cpp                           |     2 +
 src/osgEarth/tinyxml.h                             |   104 +-
 src/osgEarth/tinyxmlerror.cpp                      |     1 +
 src/osgEarth/tinyxmlparser.cpp                     |    12 +-
 src/osgEarthAnnotation/AnnotationEditing.cpp       |     2 +-
 src/osgEarthAnnotation/AnnotationExtension         |    61 -
 src/osgEarthAnnotation/AnnotationExtension.cpp     |    91 -
 src/osgEarthAnnotation/AnnotationLayer             |    98 +
 src/osgEarthAnnotation/AnnotationLayer.cpp         |    74 +
 src/osgEarthAnnotation/AnnotationNode              |     6 +
 src/osgEarthAnnotation/AnnotationNode.cpp          |    59 +-
 src/osgEarthAnnotation/AnnotationRegistry          |     5 +
 src/osgEarthAnnotation/AnnotationUtils.cpp         |    68 +-
 src/osgEarthAnnotation/BboxDrawable.cpp            |     2 -
 src/osgEarthAnnotation/CMakeLists.txt              |    13 +-
 src/osgEarthAnnotation/Common                      |     5 +-
 src/osgEarthAnnotation/Decoration                  |   120 -
 src/osgEarthAnnotation/Decoration.cpp              |   106 -
 src/osgEarthAnnotation/FeatureEditing.cpp          |     6 +-
 src/osgEarthAnnotation/FeatureNode                 |    55 +-
 src/osgEarthAnnotation/FeatureNode.cpp             |   126 +-
 src/osgEarthAnnotation/GeoPositionNode             |    12 +-
 src/osgEarthAnnotation/GeoPositionNode.cpp         |    41 +-
 .../GeoPositionNodeAutoScaler.cpp                  |    55 +-
 src/osgEarthAnnotation/HighlightDecoration         |    62 -
 src/osgEarthAnnotation/HighlightDecoration.cpp     |    95 -
 src/osgEarthAnnotation/ImageOverlay                |    16 +-
 src/osgEarthAnnotation/ImageOverlay.cpp            |   289 +-
 src/osgEarthAnnotation/LabelNode                   |     4 +
 src/osgEarthAnnotation/LabelNode.cpp               |    76 +-
 src/osgEarthAnnotation/LocalGeometryNode           |    17 +-
 src/osgEarthAnnotation/LocalGeometryNode.cpp       |   101 +-
 src/osgEarthAnnotation/ModelNode.cpp               |     7 +-
 src/osgEarthAnnotation/PlaceNode                   |     4 +
 src/osgEarthAnnotation/PlaceNode.cpp               |    60 +-
 src/osgEarthAnnotation/RectangleNode.cpp           |     4 +-
 src/osgEarthAnnotation/ScaleDecoration             |    54 -
 src/osgEarthAnnotation/TrackNode                   |     4 +
 src/osgEarthAnnotation/TrackNode.cpp               |    11 +-
 src/osgEarthDrivers/CMakeLists.txt                 |    63 +-
 src/osgEarthDrivers/agglite/AGGLiteOptions         |     4 +-
 .../agglite/AGGLiteRasterizerTileSource.cpp        |    29 +-
 src/osgEarthDrivers/arcgis/ArcGISOptions           |     8 +-
 .../arcgis_map_cache/CMakeLists.txt                |     3 -
 .../ReaderWriterArcGISMapCache.cpp                 |   147 -
 src/osgEarthDrivers/bing/BingOptions               |     6 +-
 src/osgEarthDrivers/bing/BingTileSource.cpp        |    10 +-
 .../bumpmap/BumpMap.frag.common.glsl               |     2 +-
 .../bumpmap/BumpMap.frag.progressive.glsl          |    14 +-
 .../bumpmap/BumpMap.frag.simple.glsl               |    14 +-
 src/osgEarthDrivers/bumpmap/BumpMap.vert.view.glsl |    10 +
 src/osgEarthDrivers/bumpmap/BumpMapOptions         |    12 +-
 .../bumpmap/BumpMapTerrainEffect.cpp               |     1 -
 .../cache_filesystem/FileSystemCache.cpp           |    36 +-
 src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt   |     2 +
 src/osgEarthDrivers/colorramp/CMakeLists.txt       |     2 +-
 src/osgEarthDrivers/colorramp/ColorRampOptions     |     4 +-
 src/osgEarthDrivers/debug/DebugOptions             |     6 +-
 src/osgEarthDrivers/debug/DebugTileSource.cpp      |    18 +-
 src/osgEarthDrivers/detail/Detail.frag.glsl        |     4 +-
 src/osgEarthDrivers/detail/Detail.vert.view.glsl   |     3 +-
 src/osgEarthDrivers/detail/DetailOptions           |    10 +-
 src/osgEarthDrivers/detail/DetailTerrainEffect.cpp |     2 +-
 src/osgEarthDrivers/earth/EarthFileSerializer1.cpp |     7 +-
 src/osgEarthDrivers/earth/EarthFileSerializer2.cpp |   234 +-
 .../engine_byo/BYOTerrainEngineDriver.cpp          |    66 -
 .../engine_byo/BYOTerrainEngineNode                |    57 -
 .../engine_byo/BYOTerrainEngineNode.cpp            |    81 -
 .../engine_byo/BYOTerrainEngineOptions             |    91 -
 src/osgEarthDrivers/engine_byo/CMakeLists.txt      |    20 -
 src/osgEarthDrivers/engine_byo/Common              |    24 -
 src/osgEarthDrivers/engine_mp/HeightFieldCache.cpp |     2 +-
 .../engine_mp/MPEngine.NormalMap.frag.glsl         |     3 +-
 .../engine_mp/MPEngine.NormalMap.vert.glsl         |     1 +
 src/osgEarthDrivers/engine_mp/MPEngine.frag.glsl   |    19 +-
 src/osgEarthDrivers/engine_mp/MPGeometry           |     5 +
 src/osgEarthDrivers/engine_mp/MPGeometry.cpp       |   104 +-
 .../engine_mp/MPTerrainEngineDriver.cpp            |     8 +-
 src/osgEarthDrivers/engine_mp/MPTerrainEngineNode  |    15 +-
 .../engine_mp/MPTerrainEngineNode.cpp              |   232 +-
 .../engine_mp/MPTerrainEngineOptions               |    40 +-
 .../engine_mp/SingleKeyNodeFactory.cpp             |    64 +-
 src/osgEarthDrivers/engine_mp/TileModel.cpp        |     4 +-
 src/osgEarthDrivers/engine_mp/TileModelCompiler    |     6 +-
 .../engine_mp/TileModelCompiler.cpp                |    51 +-
 src/osgEarthDrivers/engine_mp/TileModelFactory.cpp |    41 +-
 src/osgEarthDrivers/engine_mp/TileNode             |     6 +-
 src/osgEarthDrivers/engine_mp/TileNode.cpp         |     8 +-
 src/osgEarthDrivers/engine_mp/TileNodeRegistry     |     4 +-
 src/osgEarthDrivers/engine_mp/TileNodeRegistry.cpp |    11 +-
 src/osgEarthDrivers/engine_mp/TilePagedLOD         |    17 +-
 src/osgEarthDrivers/engine_mp/TilePagedLOD.cpp     |    67 +-
 src/osgEarthDrivers/engine_rex/CMakeLists.txt      |    16 +-
 src/osgEarthDrivers/engine_rex/DrawState           |   152 +
 src/osgEarthDrivers/engine_rex/DrawState.cpp       |    79 +
 src/osgEarthDrivers/engine_rex/DrawTileCommand     |   114 +
 src/osgEarthDrivers/engine_rex/DrawTileCommand.cpp |   155 +
 src/osgEarthDrivers/engine_rex/EngineContext       |    47 +-
 src/osgEarthDrivers/engine_rex/EngineContext.cpp   |    83 +-
 src/osgEarthDrivers/engine_rex/GeometryPool        |   121 +-
 src/osgEarthDrivers/engine_rex/GeometryPool.cpp    |   549 +-
 src/osgEarthDrivers/engine_rex/LayerDrawable       |    87 +
 src/osgEarthDrivers/engine_rex/LayerDrawable.cpp   |    96 +
 src/osgEarthDrivers/engine_rex/LoadTileData        |    23 +-
 src/osgEarthDrivers/engine_rex/LoadTileData.cpp    |   275 +-
 src/osgEarthDrivers/engine_rex/Loader              |    33 +-
 src/osgEarthDrivers/engine_rex/Loader.cpp          |   153 +-
 src/osgEarthDrivers/engine_rex/MPTexture           |   106 -
 src/osgEarthDrivers/engine_rex/MPTexture.cpp       |   171 -
 src/osgEarthDrivers/engine_rex/MaskGenerator       |     5 +-
 src/osgEarthDrivers/engine_rex/MaskGenerator.cpp   |    40 +-
 src/osgEarthDrivers/engine_rex/RenderBindings      |    45 +-
 .../engine_rex/RexEngine.Morphing.vert.glsl        |    21 +-
 .../engine_rex/RexEngine.NormalMap.frag.glsl       |    24 +-
 .../engine_rex/RexEngine.NormalMap.vert.glsl       |    15 +-
 .../engine_rex/RexEngine.SDK.vert.glsl             |    26 +-
 .../engine_rex/RexEngine.elevation.glsl            |    33 +
 src/osgEarthDrivers/engine_rex/RexEngine.frag.glsl |    58 +-
 src/osgEarthDrivers/engine_rex/RexEngine.gs.glsl   |     1 +
 src/osgEarthDrivers/engine_rex/RexEngine.tcs.glsl  |     1 +
 src/osgEarthDrivers/engine_rex/RexEngine.vert.glsl |     3 +-
 .../engine_rex/RexEngine.vert.view.glsl            |    27 +-
 .../engine_rex/RexTerrainEngineNode                |    99 +-
 .../engine_rex/RexTerrainEngineNode.cpp            |  1095 +-
 .../engine_rex/RexTerrainEngineOptions             |    79 +-
 src/osgEarthDrivers/engine_rex/SelectionInfo       |    28 +-
 src/osgEarthDrivers/engine_rex/SelectionInfo.cpp   |    98 +-
 src/osgEarthDrivers/engine_rex/Shaders             |     1 +
 src/osgEarthDrivers/engine_rex/Shaders.cpp.in      |     3 +
 src/osgEarthDrivers/engine_rex/SurfaceNode         |    21 +-
 src/osgEarthDrivers/engine_rex/SurfaceNode.cpp     |    39 +-
 src/osgEarthDrivers/engine_rex/TerrainCuller       |    94 +
 src/osgEarthDrivers/engine_rex/TerrainCuller.cpp   |   274 +
 src/osgEarthDrivers/engine_rex/TerrainRenderData   |    75 +
 .../engine_rex/TerrainRenderData.cpp               |   131 +
 src/osgEarthDrivers/engine_rex/TileDrawable        |   143 +-
 src/osgEarthDrivers/engine_rex/TileDrawable.cpp    |   626 +-
 src/osgEarthDrivers/engine_rex/TileNode            |   100 +-
 src/osgEarthDrivers/engine_rex/TileNode.cpp        |   952 +-
 src/osgEarthDrivers/engine_rex/TileNodeRegistry    |    10 +-
 .../engine_rex/TileNodeRegistry.cpp                |    90 +-
 src/osgEarthDrivers/engine_rex/TileRenderModel     |   171 +
 src/osgEarthDrivers/engine_rex/Unloader            |    12 +-
 src/osgEarthDrivers/engine_rex/Unloader.cpp        |    12 +-
 src/osgEarthDrivers/fastdxt/CMakeLists.txt         |    11 +-
 .../fastdxt/FastDXTImageProcessor.cpp              |     8 +-
 src/osgEarthDrivers/fastdxt/util.cpp               |     4 +-
 src/osgEarthDrivers/fastdxt/util.h                 |     4 +-
 .../feature_elevation/FeatureElevationOptions      |     6 +-
 .../ReaderWriterFeatureElevation.cpp               |    29 +-
 .../feature_mapnikvectortiles/FeatureSourceMVT.cpp |     4 +-
 .../feature_mapnikvectortiles/MVTFeatureOptions    |     2 +-
 src/osgEarthDrivers/feature_ogr/FeatureCursorOGR   |    16 +-
 .../feature_ogr/FeatureCursorOGR.cpp               |    31 +-
 .../feature_ogr/FeatureSourceOGR.cpp               |     2 +-
 src/osgEarthDrivers/feature_ogr/OGRFeatureOptions  |    16 +-
 .../feature_raster/FeatureSourceRaster.cpp         |    14 +-
 .../feature_raster/RasterFeatureOptions            |     6 +-
 .../feature_tfs/FeatureSourceTFS.cpp               |    30 +-
 src/osgEarthDrivers/feature_tfs/TFSFeatureOptions  |    10 +-
 .../feature_wfs/FeatureSourceWFS.cpp               |    53 +-
 src/osgEarthDrivers/feature_wfs/WFSFeatureOptions  |    14 +-
 src/osgEarthDrivers/feature_xyz/CMakeLists.txt     |    18 +
 .../feature_xyz/FeatureSourceXYZ.cpp               |   416 +
 .../feature_xyz/XYZFeatureOptions}                 |    48 +-
 .../IntersectFeatureFilter.cpp                     |    12 +-
 .../featurefilter_join/JoinFeatureFilter.cpp       |     2 +
 src/osgEarthDrivers/gdal/GDALOptions               |    16 +-
 src/osgEarthDrivers/gdal/ReaderWriterGDAL.cpp      |   799 +-
 src/osgEarthDrivers/kml/KMLReader.cpp              |    19 +-
 src/osgEarthDrivers/kml/KML_Placemark.cpp          |    22 +-
 src/osgEarthDrivers/kml/KML_PolyStyle.cpp          |    49 +-
 src/osgEarthDrivers/kml/rapidxml_ext.hpp           |    13 +-
 .../label_annotation/AnnotationLabelSource.cpp     |     1 +
 .../mapinspector/MapInspectorExtension             |     9 +-
 .../mapinspector/MapInspectorExtension.cpp         |    21 +-
 src/osgEarthDrivers/mapinspector/MapInspectorUI    |     2 +
 .../mapinspector/MapInspectorUI.cpp                |    48 +-
 .../mask_feature/FeatureMaskOptions                |     2 +-
 .../mask_feature/FeatureMaskSource.cpp             |     3 +
 src/osgEarthDrivers/mbtiles/MBTilesOptions         |     9 +-
 src/osgEarthDrivers/mbtiles/MBTilesTileSource.cpp  |   102 +-
 .../model_feature_geom/FeatureGeomModelOptions     |    17 +-
 .../model_feature_geom/FeatureGeomModelSource.cpp  |     2 +-
 .../model_simple/SimpleModelOptions                |    14 +-
 .../model_simple/SimpleModelSource.cpp             |     2 +-
 src/osgEarthDrivers/noise/CMakeLists.txt           |    24 -
 src/osgEarthDrivers/noise/NoiseExtension           |    74 -
 src/osgEarthDrivers/noise/NoiseExtension.cpp       |    80 -
 src/osgEarthDrivers/noise/NoiseOptions             |    82 -
 src/osgEarthDrivers/noise/NoiseTerrainEffect       |    65 -
 src/osgEarthDrivers/noise/NoiseTerrainEffect.cpp   |   167 -
 .../ocean_simple/ElevationProxyImageLayer          |     2 +-
 .../ocean_simple/ElevationProxyImageLayer.cpp      |    36 +-
 .../ocean_simple/SimpleOcean.FS.glsl               |    67 +-
 .../ocean_simple/SimpleOcean.VS.glsl               |    46 +-
 .../ocean_simple/SimpleOceanNode.cpp               |    70 +-
 .../ocean_simple/SimpleOceanOptions                |    22 +-
 src/osgEarthDrivers/ocean_triton/TritonDriver.cpp  |     4 +-
 src/osgEarthDrivers/osg/OSGOptions                 |    15 +-
 src/osgEarthDrivers/osg/OSGTileSource.cpp          |    38 +-
 src/osgEarthDrivers/quadkey/CMakeLists.txt         |    15 -
 src/osgEarthDrivers/quadkey/QuadKeyOptions         |    82 -
 .../quadkey/ReaderWriterQuadKey.cpp                |   199 -
 src/osgEarthDrivers/refresh/CMakeLists.txt         |    13 -
 .../refresh/ReaderWriterRefresh.cpp                |   251 -
 src/osgEarthDrivers/refresh/RefreshOptions         |    85 -
 .../script_engine_duktape/DuktapeEngine.cpp        |     2 +-
 .../script_engine_javascriptcore/CMakeLists.txt    |    26 -
 .../script_engine_javascriptcore/JSWrappers        |    33 -
 .../script_engine_javascriptcore/JSWrappers.cpp    |    87 -
 .../JavaScriptCoreEngine                           |    59 -
 .../JavaScriptCoreEngine.cpp                       |   126 -
 .../JavaScriptCoreEngineFactory.cpp                |    50 -
 .../script_engine_v8/CMakeLists.txt                |    29 -
 src/osgEarthDrivers/script_engine_v8/JSWrappers    |   233 -
 .../script_engine_v8/JSWrappers.cpp                |  1294 ---
 .../script_engine_v8/JavascriptEngineV8            |    74 -
 .../script_engine_v8/JavascriptEngineV8.cpp        |   474 -
 .../script_engine_v8/JavascriptEngineV8Factory.cpp |    50 -
 src/osgEarthDrivers/script_engine_v8/V8Util        |    79 -
 src/osgEarthDrivers/sky_gl/CMakeLists.txt          |     1 -
 src/osgEarthDrivers/sky_gl/GLSkyExtension.cpp      |    41 +-
 src/osgEarthDrivers/sky_gl/GLSkyNode               |     3 +-
 src/osgEarthDrivers/sky_gl/GLSkyNode.cpp           |    38 +-
 src/osgEarthDrivers/sky_gl/GLSkyShaders            |   130 -
 .../sky_silverlining/SilverLiningDriver.cpp        |     1 +
 .../sky_simple/SimpleSky.Atmosphere.frag.glsl      |    17 +-
 .../sky_simple/SimpleSky.Atmosphere.vert.glsl      |    20 +-
 .../sky_simple/SimpleSky.Ground.ONeil.frag.glsl    |   184 +-
 .../sky_simple/SimpleSky.Ground.ONeil.vert.glsl    |    56 +-
 .../sky_simple/SimpleSky.Moon.frag.glsl            |     6 +-
 .../sky_simple/SimpleSky.Moon.vert.glsl            |     5 +-
 .../sky_simple/SimpleSky.Stars.GLES.frag.glsl      |    11 +-
 .../sky_simple/SimpleSky.Stars.GLES.vert.glsl      |     9 +-
 .../sky_simple/SimpleSky.Stars.frag.glsl           |     5 +-
 .../sky_simple/SimpleSky.Stars.vert.glsl           |    10 +-
 .../sky_simple/SimpleSky.Sun.frag.glsl             |    13 +-
 .../sky_simple/SimpleSky.Sun.vert.glsl             |     2 +-
 .../sky_simple/SimpleSkyExtension.cpp              |    10 +-
 src/osgEarthDrivers/sky_simple/SimpleSkyNode       |     3 +-
 src/osgEarthDrivers/sky_simple/SimpleSkyNode.cpp   |    70 +-
 src/osgEarthDrivers/sky_simple/SimpleSkyOptions    |    22 +-
 src/osgEarthDrivers/skyview/SkyViewOptions         |     2 +-
 src/osgEarthDrivers/splat_mask/CMakeLists.txt      |    14 -
 src/osgEarthDrivers/splat_mask/SplatMaskDriver.cpp |   205 -
 src/osgEarthDrivers/splat_mask/SplatMaskOptions    |    79 -
 .../template_matclass/CMakeLists.txt               |    16 -
 .../template_matclass/TemplateMatClassDriver.cpp   |   167 -
 .../template_matclass/TemplateMatClassOptions      |    83 -
 .../terrainshader/TerrainShaderExtension.cpp       |     8 +-
 src/osgEarthDrivers/tilecache/CMakeLists.txt       |    17 -
 .../tilecache/ReaderWriterTileCache.cpp            |   131 -
 src/osgEarthDrivers/tilecache/TileCacheOptions     |    79 -
 src/osgEarthDrivers/tileindex/TileIndexOptions     |     2 +-
 src/osgEarthDrivers/tileservice/CMakeLists.txt     |    15 -
 .../tileservice/ReaderWriterTileService.cpp        |   138 -
 src/osgEarthDrivers/tileservice/TileServiceOptions |    79 -
 src/osgEarthDrivers/tms/TMSOptions                 |     6 +-
 src/osgEarthDrivers/tms/TMSTileSource.cpp          |    30 +-
 src/osgEarthDrivers/vpb/VPBOptions                 |    18 +-
 src/osgEarthDrivers/wcs/WCS11Source.cpp            |     4 +-
 src/osgEarthDrivers/wcs/WCSOptions                 |    12 +-
 src/osgEarthDrivers/wms/ReaderWriterWMS.cpp        |    15 +-
 src/osgEarthDrivers/wms/WMSOptions                 |    29 +-
 src/osgEarthDrivers/xyz/ReaderWriterXYZ.cpp        |   216 +-
 src/osgEarthDrivers/xyz/XYZOptions                 |    14 +-
 src/osgEarthDrivers/yahoo/CMakeLists.txt           |     9 -
 src/osgEarthDrivers/yahoo/ReaderWriterYahoo.cpp    |   151 -
 src/osgEarthDrivers/yahoo/YahooOptions             |    69 -
 .../feature_mapnikvectortiles/CMakeLists.txt       |    29 -
 .../feature_mapnikvectortiles/FeatureSourceMVT.cpp |   446 -
 .../feature_mapnikvectortiles/vector_tile.proto    |    92 -
 src/osgEarthExtensions/CMakeLists.txt              |    29 -
 src/osgEarthFeatures/AltitudeFilter.cpp            |   126 +-
 src/osgEarthFeatures/BufferFilter.cpp              |     1 +
 src/osgEarthFeatures/BuildGeometryFilter           |    27 +-
 src/osgEarthFeatures/BuildGeometryFilter.cpp       |   564 +-
 src/osgEarthFeatures/BuildTextFilter               |     2 -
 src/osgEarthFeatures/BuildTextFilter.cpp           |     2 +-
 src/osgEarthFeatures/CMakeLists.txt                |    42 +-
 src/osgEarthFeatures/CentroidFilter.cpp            |     1 +
 src/osgEarthFeatures/ConvertTypeFilter.cpp         |     2 -
 src/osgEarthFeatures/ExtrudeGeometryFilter         |     9 +-
 src/osgEarthFeatures/ExtrudeGeometryFilter.cpp     |    13 +-
 src/osgEarthFeatures/Feature                       |    31 +-
 src/osgEarthFeatures/Feature.cpp                   |    94 +-
 src/osgEarthFeatures/FeatureCursor                 |    18 +-
 src/osgEarthFeatures/FeatureCursor.cpp             |    27 +-
 src/osgEarthFeatures/FeatureDisplayLayout          |     9 +-
 src/osgEarthFeatures/FeatureDisplayLayout.cpp      |     5 +-
 src/osgEarthFeatures/FeatureDrawSet                |    91 -
 src/osgEarthFeatures/FeatureDrawSet.cpp            |   257 -
 src/osgEarthFeatures/FeatureListSource             |     7 +-
 src/osgEarthFeatures/FeatureListSource.cpp         |     4 +-
 src/osgEarthFeatures/FeatureMaskLayer              |   124 +
 src/osgEarthFeatures/FeatureMaskLayer.cpp          |   209 +
 src/osgEarthFeatures/FeatureModelGraph             |    80 +-
 src/osgEarthFeatures/FeatureModelGraph.cpp         |   519 +-
 src/osgEarthFeatures/FeatureModelLayer             |   130 +
 src/osgEarthFeatures/FeatureModelLayer.cpp         |   255 +
 src/osgEarthFeatures/FeatureModelSource            |    72 +-
 src/osgEarthFeatures/FeatureModelSource.cpp        |   138 +-
 src/osgEarthFeatures/FeatureRasterizer.cpp         |    20 +-
 src/osgEarthFeatures/FeatureSource                 |    20 +-
 src/osgEarthFeatures/FeatureSource.cpp             |    39 +-
 src/osgEarthFeatures/FeatureSourceIndexNode.cpp    |     1 +
 src/osgEarthFeatures/FeatureSourceLayer            |    94 +
 src/osgEarthFeatures/FeatureSourceLayer.cpp        |    94 +
 src/osgEarthFeatures/FeatureTileSource             |     2 +-
 src/osgEarthFeatures/FeatureTileSource.cpp         |    12 +-
 src/osgEarthFeatures/Filter                        |    30 +-
 src/osgEarthFeatures/Filter.cpp                    |    11 +-
 src/osgEarthFeatures/FilterContext                 |    30 +-
 src/osgEarthFeatures/FilterContext.cpp             |    55 +-
 src/osgEarthFeatures/GPULines                      |    96 +
 src/osgEarthFeatures/GPULines.cpp                  |   206 +
 src/osgEarthFeatures/GPULinesScreenProj.glsl       |   181 +
 src/osgEarthFeatures/GeometryCompiler              |    28 +-
 src/osgEarthFeatures/GeometryCompiler.cpp          |    52 +-
 src/osgEarthFeatures/LabelSource                   |     3 +-
 src/osgEarthFeatures/LabelSource.cpp               |    11 +-
 src/osgEarthFeatures/MVT.cpp                       |   339 +-
 src/osgEarthFeatures/OgrUtils.cpp                  |    97 +-
 src/osgEarthFeatures/OptimizerHints                |    78 -
 src/osgEarthFeatures/OptimizerHints.cpp            |    59 -
 src/osgEarthFeatures/PolygonizeLines               |     9 +-
 src/osgEarthFeatures/PolygonizeLines.cpp           |    61 +-
 src/osgEarthFeatures/ResampleFilter                |     1 +
 src/osgEarthFeatures/ResampleFilter.cpp            |     2 +-
 src/osgEarthFeatures/ScaleFilter.cpp               |     1 +
 src/osgEarthFeatures/ScatterFilter.cpp             |     1 +
 src/osgEarthFeatures/ScriptEngine.cpp              |     7 +-
 src/osgEarthFeatures/ScriptFilter.cpp              |     1 +
 src/osgEarthFeatures/Session                       |   128 +-
 src/osgEarthFeatures/Session.cpp                   |    96 +-
 src/{osgEarth => osgEarthFeatures}/Shaders         |    21 +-
 src/osgEarthFeatures/Shaders.cpp.in                |    13 +
 src/osgEarthFeatures/SubstituteModelFilter         |     6 +
 src/osgEarthFeatures/SubstituteModelFilter.cpp     |    16 +-
 src/osgEarthFeatures/TessellateOperator            |     2 +
 src/osgEarthFeatures/TessellateOperator.cpp        |    28 +-
 src/osgEarthFeatures/TextSymbolizer.cpp            |    13 +-
 src/osgEarthFeatures/TransformFilter.cpp           |     2 +
 src/osgEarthFeatures/VirtualFeatureSource          |     8 +-
 src/osgEarthFeatures/VirtualFeatureSource.cpp      |    24 +-
 src/osgEarthProcedural/CMakeLists.txt              |    67 -
 src/osgEarthProcedural/Common                      |    32 -
 src/osgEarthProcedural/CoverageLegend              |    99 -
 src/osgEarthProcedural/CoverageLegend.cpp          |    77 -
 src/osgEarthProcedural/Export                      |    74 -
 src/osgEarthProcedural/Shaders                     |    31 -
 src/osgEarthProcedural/Shaders.cpp.in              |     9 -
 src/osgEarthProcedural/SimplexNoise                |   159 -
 src/osgEarthProcedural/SimplexNoise.cpp            |   556 -
 src/osgEarthProcedural/SplatCatalog                |   161 -
 src/osgEarthProcedural/SplatCatalog.cpp            |   343 -
 src/osgEarthQt/CMakeLists.txt                      |   340 +-
 src/osgEarthQt/DataManager                         |    14 +-
 src/osgEarthQt/DataManager.cpp                     |    42 +-
 src/osgEarthQt/GuiActions                          |     1 +
 src/osgEarthQt/LayerManagerWidget                  |     3 +
 src/osgEarthQt/LayerManagerWidget.cpp              |    30 +-
 src/osgEarthQt/MapCatalogWidget.cpp                |    15 +-
 .../SilverLiningContextNode.cpp                    |     1 +
 src/osgEarthSilverLining/SilverLiningNode          |     2 +-
 src/osgEarthSilverLining/SilverLiningNode.cpp      |    17 +-
 src/osgEarthSplat/CMakeLists.txt                   |    27 +-
 src/osgEarthSplat/Coverage                         |     4 +-
 src/osgEarthSplat/Coverage.cpp                     |     3 +-
 src/osgEarthSplat/Export                           |     2 +-
 src/osgEarthSplat/GroundCover                      |   260 +
 src/osgEarthSplat/GroundCover.FS.glsl              |    29 +
 .../{LandCover.GS.glsl => GroundCover.GS.glsl}     |   243 +-
 .../{LandCover.TCS.glsl => GroundCover.TCS.glsl}   |    24 +-
 .../{LandCover.TES.glsl => GroundCover.TES.glsl}   |     6 +-
 src/osgEarthSplat/GroundCover.cpp                  |   448 +
 src/osgEarthSplat/GroundCoverLayer                 |   163 +
 src/osgEarthSplat/GroundCoverLayer.cpp             |   414 +
 src/osgEarthSplat/LandCover                        |   445 -
 src/osgEarthSplat/LandCover.FS.glsl                |    49 -
 src/osgEarthSplat/LandCover.cpp                    |   438 -
 src/osgEarthSplat/LandCoverTerrainEffect           |    87 -
 src/osgEarthSplat/LandCoverTerrainEffect.cpp       |   238 -
 src/osgEarthSplat/LandCoverTilePatchCallback       |    58 -
 src/osgEarthSplat/LandCoverTilePatchCallback.cpp   |    89 -
 src/osgEarthSplat/LandUseTileSource                |     6 +-
 src/osgEarthSplat/LandUseTileSource.cpp            |     8 +-
 src/osgEarthSplat/NoiseTextureFactory.cpp          |     5 +-
 src/osgEarthSplat/RoadSurfaceLayer                 |   160 +
 src/osgEarthSplat/RoadSurfaceLayer.cpp             |   407 +
 src/osgEarthSplat/Splat.Noise.glsl                 |     1 +
 src/osgEarthSplat/Splat.frag.common.glsl           |    35 -
 src/osgEarthSplat/Splat.frag.glsl                  |   162 +-
 src/osgEarthSplat/Splat.util.glsl                  |     1 +
 src/osgEarthSplat/Splat.vert.model.glsl            |    14 +
 src/osgEarthSplat/Splat.vert.view.glsl             |     7 +-
 src/osgEarthSplat/SplatCatalog                     |     3 +-
 src/osgEarthSplat/SplatExtension                   |    12 +-
 src/osgEarthSplat/SplatExtension.cpp               |    70 +-
 src/osgEarthSplat/SplatLayer                       |   139 +
 src/osgEarthSplat/SplatLayer.cpp                   |   352 +
 src/osgEarthSplat/SplatOptions                     |     6 +-
 src/osgEarthSplat/SplatShaders                     |    12 +-
 src/osgEarthSplat/SplatShaders.cpp.in              |    21 +-
 src/osgEarthSplat/SplatTerrainEffect               |   111 -
 src/osgEarthSplat/SplatTerrainEffect.cpp           |   232 -
 src/osgEarthSplat/Surface                          |    13 +-
 src/osgEarthSplat/Surface.cpp                      |   113 +-
 src/osgEarthSplat/Zone                             |   106 +-
 src/osgEarthSplat/Zone.cpp                         |    94 +-
 src/osgEarthSymbology/GEOS                         |     6 +
 src/osgEarthSymbology/GEOS.cpp                     |    21 +-
 src/osgEarthSymbology/Geometry                     |    10 +
 src/osgEarthSymbology/Geometry.cpp                 |    48 +-
 src/osgEarthSymbology/InstanceResource.cpp         |     2 +-
 src/osgEarthSymbology/LineSymbol                   |    13 +-
 src/osgEarthSymbology/LineSymbol.cpp               |    24 +-
 src/osgEarthSymbology/MarkerSymbolizer.cpp         |     4 +-
 src/osgEarthSymbology/MeshConsolidator.cpp         |     5 +-
 src/osgEarthSymbology/MeshSubdivider.cpp           |    12 +-
 src/osgEarthSymbology/ModelResource                |     2 +-
 src/osgEarthSymbology/ModelResource.cpp            |    14 +-
 src/osgEarthSymbology/PolygonSymbol                |     7 +
 src/osgEarthSymbology/PolygonSymbol.cpp            |     9 +-
 src/osgEarthSymbology/Query                        |    10 +-
 src/osgEarthSymbology/Query.cpp                    |    18 +-
 src/osgEarthSymbology/RenderSymbol                 |    10 +
 src/osgEarthSymbology/RenderSymbol.cpp             |    36 +-
 src/osgEarthSymbology/Resource                     |     9 +
 src/osgEarthSymbology/ResourceCache                |     6 +
 src/osgEarthSymbology/ResourceCache.cpp            |    30 +
 src/osgEarthSymbology/ResourceLibrary              |     1 +
 src/osgEarthSymbology/ResourceLibrary.cpp          |    10 +-
 src/osgEarthSymbology/Skins.cpp                    |    48 +-
 src/osgEarthSymbology/Style                        |     4 +
 src/osgEarthSymbology/StyleSheet                   |     4 +
 src/osgEarthSymbology/StyleSheet.cpp               |    10 +-
 src/osgEarthSymbology/Symbol                       |    13 +-
 src/osgEarthSymbology/TextSymbol                   |     5 -
 src/osgEarthSymbology/TextSymbol.cpp               |    10 -
 src/osgEarthTriton/CMakeLists.txt                  |     2 +
 src/osgEarthTriton/TritonAPIWrapper                |     8 +-
 src/osgEarthTriton/TritonContext                   |    24 +-
 src/osgEarthTriton/TritonContext.cpp               |    46 +-
 src/osgEarthTriton/TritonDrawable                  |     8 +-
 src/osgEarthTriton/TritonDrawable.cpp              |   101 +-
 src/osgEarthTriton/{TritonOptions => TritonLayer}  |    83 +-
 src/osgEarthTriton/TritonLayer.cpp                 |    96 +
 src/osgEarthTriton/TritonNode                      |    26 +-
 src/osgEarthTriton/TritonNode.cpp                  |   125 +-
 src/osgEarthTriton/TritonOptions                   |    16 +-
 src/osgEarthUtil/AnnotationEvents.cpp              |     1 +
 src/osgEarthUtil/AtlasBuilder.cpp                  |    17 +-
 src/osgEarthUtil/AutoClipPlaneHandler.cpp          |     4 -
 src/osgEarthUtil/CMakeLists.txt                    |    57 +-
 src/osgEarthUtil/ContourMap                        |     9 +-
 src/osgEarthUtil/ContourMap.cpp                    |     7 +-
 src/osgEarthUtil/ContourMap.frag.glsl              |     6 +-
 src/osgEarthUtil/ContourMap.vert.glsl              |     6 +-
 src/osgEarthUtil/Controls                          |    10 +-
 src/osgEarthUtil/Controls.cpp                      |    81 +-
 src/osgEarthUtil/EarthManipulator                  |    30 +-
 src/osgEarthUtil/EarthManipulator.cpp              |    97 +-
 src/osgEarthUtil/ExampleResources.cpp              |    37 +-
 src/osgEarthUtil/FeatureQueryTool                  |    57 -
 src/osgEarthUtil/FeatureQueryTool.cpp              |    35 -
 src/osgEarthUtil/FlatteningLayer                   |   217 +
 src/osgEarthUtil/FlatteningLayer.cpp               |   985 ++
 src/osgEarthUtil/Fog.cpp                           |     2 +-
 src/osgEarthUtil/Fog.frag.glsl                     |     4 +-
 src/osgEarthUtil/Fog.vert.glsl                     |     4 +-
 src/osgEarthUtil/FractalElevationLayer             |   154 +
 src/osgEarthUtil/FractalElevationLayer.cpp         |   378 +
 src/osgEarthUtil/GARSGraticule                     |   115 +
 src/osgEarthUtil/GARSGraticule.cpp                 |   382 +
 src/osgEarthUtil/GeodeticGraticule                 |   256 +-
 src/osgEarthUtil/GeodeticGraticule.cpp             |   860 +-
 src/osgEarthUtil/Graticule.frag.glsl               |    27 +-
 src/osgEarthUtil/Graticule.vert.glsl               |     8 +-
 src/osgEarthUtil/GraticuleExtension                |    75 -
 src/osgEarthUtil/GraticuleExtension.cpp            |    83 -
 src/osgEarthUtil/GraticuleNode                     |   118 -
 src/osgEarthUtil/GraticuleNode.cpp                 |   425 -
 src/osgEarthUtil/GraticuleOptions                  |   114 -
 src/osgEarthUtil/GraticuleTerrainEffect            |    61 -
 src/osgEarthUtil/GraticuleTerrainEffect.cpp        |    87 -
 src/osgEarthUtil/HTM                               |    52 +-
 src/osgEarthUtil/HTM.cpp                           |   162 +-
 src/osgEarthUtil/LODBlending.cpp                   |    42 +-
 src/osgEarthUtil/LinearLineOfSight.cpp             |    18 +-
 src/osgEarthUtil/LogDepthBuffer.VertOnly.vert.glsl |     4 +-
 src/osgEarthUtil/LogDepthBuffer.frag.glsl          |    12 +-
 src/osgEarthUtil/LogDepthBuffer.vert.glsl          |     7 +-
 src/osgEarthUtil/LogarithmicDepthBuffer            |     3 +
 src/osgEarthUtil/LogarithmicDepthBuffer.cpp        |     8 +-
 src/osgEarthUtil/MGRSGraticule                     |   123 +-
 src/osgEarthUtil/MGRSGraticule.cpp                 |  1357 ++-
 src/osgEarthUtil/MouseCoordsTool.cpp               |    22 +-
 src/osgEarthUtil/MultiElevationLayer               |   100 +
 src/osgEarthUtil/MultiElevationLayer.cpp           |   179 +
 src/osgEarthUtil/NightColorFilter.cpp              |     7 +-
 src/osgEarthUtil/ObjectLocator                     |   204 -
 src/osgEarthUtil/ObjectLocator.cpp                 |   288 -
 src/osgEarthUtil/PolyhedralLineOfSight.cpp         |     6 +-
 src/osgEarthUtil/RTTPicker                         |    28 +-
 src/osgEarthUtil/RTTPicker.cpp                     |   215 +-
 src/osgEarthUtil/RadialLineOfSight.cpp             |    26 +-
 src/osgEarthUtil/Shaders                           |     5 +-
 src/osgEarthUtil/Shaders.cpp.in                    |     6 +
 src/osgEarthUtil/Shadowing.cpp                     |     3 +-
 src/osgEarthUtil/Shadowing.frag.glsl               |    24 +-
 src/osgEarthUtil/Shadowing.vert.glsl               |     1 +
 src/osgEarthUtil/SimpleOceanLayer                  |   146 +
 src/osgEarthUtil/SimpleOceanLayer.cpp              |   202 +
 src/osgEarthUtil/SimpleOceanLayer.frag.glsl        |    46 +
 src/osgEarthUtil/SimpleOceanLayer.vert.glsl        |    33 +
 src/osgEarthUtil/SimplePager                       |     4 +
 src/osgEarthUtil/SimplePager.cpp                   |    52 +-
 src/osgEarthUtil/Sky                               |    34 +-
 src/osgEarthUtil/Sky.cpp                           |    38 +-
 src/osgEarthUtil/SpatialData                       |     1 -
 src/osgEarthUtil/SpatialData.cpp                   |    51 +-
 src/osgEarthUtil/TFS                               |     2 +-
 src/osgEarthUtil/TFSPackager.cpp                   |    20 +-
 src/osgEarthUtil/TMS.cpp                           |    31 +-
 src/osgEarthUtil/TMSBackFiller.cpp                 |     5 +-
 src/osgEarthUtil/TMSPackager.cpp                   |   139 +-
 src/osgEarthUtil/TerrainProfile                    |     2 +-
 src/osgEarthUtil/TerrainProfile.cpp                |     2 +-
 src/osgEarthUtil/TileIndex.cpp                     |     9 +-
 src/osgEarthUtil/TileIndexBuilder.cpp              |     1 +
 src/osgEarthUtil/TopologyGraph                     |   147 +
 .../TopologyGraph.cpp}                             |   333 +-
 src/osgEarthUtil/UTMGraticule                      |   150 +-
 src/osgEarthUtil/UTMGraticule.cpp                  |   344 +-
 src/osgEarthUtil/UTMLabelingEngine                 |    79 +
 src/osgEarthUtil/UTMLabelingEngine.cpp             |   511 +
 src/osgEarthUtil/ViewFitter                        |    65 +
 src/osgEarthUtil/ViewFitter.cpp                    |   230 +
 src/osgEarthUtil/WMS.cpp                           |    16 +
 src/tests/CMakeLists.txt                           |    31 +
 src/tests/osgEarth_tests/CMakeLists.txt            |    17 +
 src/tests/osgEarth_tests/EndianTests.cpp           |    95 +
 src/tests/osgEarth_tests/FeatureTests.cpp          |    53 +
 src/tests/osgEarth_tests/GeoExtentTests.cpp        |   238 +
 src/tests/osgEarth_tests/ImageLayerTests.cpp       |    59 +
 src/tests/osgEarth_tests/SpatialReferenceTests.cpp |    92 +
 src/tests/osgEarth_tests/ThreadingTests.cpp        |   135 +
 .../AutoScale => tests/osgEarth_tests/main.cpp}    |    29 +-
 tests/aeqd.earth                                   |    22 +
 tests/annotation.earth                             |    12 +-
 tests/annotation_dateline.earth                    |    27 +
 tests/annotation_dateline_projected.earth          |    45 +
 tests/boston-gpu.earth                             |    28 +-
 tests/boston.earth                                 |    56 +-
 tests/boston_tfs.earth                             |    50 -
 tests/city_labels.xml                              |    25 +
 tests/clouds.earth                                 |    57 +-
 tests/datum_override.earth                         |     3 +-
 tests/{night.earth => day_night_mp.earth}          |     0
 tests/day_night_rex.earth                          |    61 +
 tests/detail_texture.earth                         |     7 +-
 tests/fade_elevation.earth                         |    59 -
 tests/feature_clip_plane.earth                     |    14 +-
 tests/feature_country_boundaries.earth             |    43 +-
 tests/feature_custom_filters.earth                 |    16 +-
 tests/feature_draped_lines.earth                   |    13 +-
 tests/feature_draped_polygons.earth                |    23 +-
 tests/feature_extrude.earth                        |    38 +-
 tests/feature_geom.earth                           |    28 +-
 tests/feature_gpx.earth                            |    11 +-
 tests/feature_inline_geometry.earth                |    18 +-
 tests/feature_labels.earth                         |    45 +-
 tests/feature_labels_script.earth                  |    26 +-
 tests/feature_levels_and_selectors.earth           |    10 +-
 tests/feature_model_scatter.earth                  |     4 +-
 tests/feature_models.earth                         |    11 +-
 tests/feature_occlusion_culling.earth              |    27 +-
 tests/feature_overlay.earth                        |    38 -
 tests/feature_population_cylinders.earth           |    60 +-
 tests/feature_raster.earth                         |    67 +-
 tests/feature_rasterize.earth                      |     4 -
 tests/feature_tfs.earth                            |    23 +-
 tests/feature_tfs_scripting.earth                  |    33 +-
 tests/feature_wfs.earth                            |    21 +-
 tests/fractal_elevation.earth                      |    99 +
 tests/gdal_multiple_files.earth                    |     4 +-
 tests/geomshader.earth                             |    20 +-
 tests/glsl.earth                                   |    30 +-
 tests/glsl_filter.earth                            |    16 -
 tests/graticule.earth                              |    36 -
 tests/graticules.earth                             |    79 +
 tests/intersect_filter.earth                       |     7 +-
 tests/land_cover_mixed.earth                       |    84 +
 tests/lod_blending.earth                           |    31 -
 tests/mapbox.earth                                 |   178 +
 tests/mask.earth                                   |     7 +-
 tests/mb_tiles.earth                               |    10 +-
 tests/min_max_range.earth                          |     4 +
 tests/multiple_heightfields.earth                  |     7 +-
 tests/nodata.earth                                 |     6 +-
 tests/noise.earth                                  |    77 -
 tests/normalmap.earth                              |    22 -
 tests/ocean.earth                                  |    31 +-
 tests/{ocean.earth => ocean_no_elevation.earth}    |    58 +-
 tests/openstreetmap_buildings.earth                |    50 +-
 tests/openstreetmap_flat.earth                     |     7 +-
 tests/openstreetmap_full.earth                     |    80 +-
 ...eathermap_clouds.earth => openweathermap.earth} |    16 +-
 tests/openweathermap_precipitation.earth           |    31 -
 tests/openweathermap_pressure.earth                |    31 -
 ...eadymap.earth => readymap-elevation-only.earth} |    10 +-
 tests/readymap-priority.earth                      |    35 -
 tests/readymap-rex.earth                           |     5 +-
 tests/readymap.earth                               |    10 +-
 ...adymap_pixel_size.earth => readymap_flat.earth} |     9 +-
 tests/roads-flattened.earth                        |   198 +
 tests/roads-test.earth                             |   107 +
 tests/roads.earth                                  |   109 +
 tests/scene_clamping.earth                         |   130 +
 tests/{gdal_tiff.earth => simple.earth}            |     7 +-
 tests/splat-blended-with-imagery.earth             |    47 +
 tests/{splat-edit.bat => splat-detail-tool.bat}    |     0
 tests/splat-gpunoise.bat                           |    31 -
 tests/splat-groundcover-tool.bat                   |    15 +
 tests/splat-ranges.earth                           |    55 -
 tests/splat-server.earth                           |   105 -
 tests/splat-with-mask-layer.earth                  |    92 +
 tests/splat-with-multiple-zones.earth              |   116 +
 tests/splat-with-rasterized-land-cover.earth       |    81 +
 tests/splat-with-vectors.earth                     |   109 -
 tests/splat.bat                                    |    14 -
 tests/splat.earth                                  |   132 +-
 tests/tess-coastlines.earth                        |   157 -
 tests/tess-masking.earth                           |   176 -
 tests/tess-terrain.earth                           |   146 -
 tests/tess_screen_space.earth                      |   120 -
 tests/test-morphing.earth                          |    50 -
 tests/triton.earth                                 |    31 +-
 tests/{readymap-osm.earth => utm.earth}            |    24 +-
 tests/viewpoints.xml                               |   131 +-
 tests/viewpoints_flat.xml                          |    74 +
 1009 files changed, 60040 insertions(+), 40553 deletions(-)
 delete mode 100644 CMakeModules/FindExpat.cmake
 create mode 100644 CMakeModules/FindGLCORE.cmake
 delete mode 100644 CMakeModules/FindJavaScriptCore.cmake
 delete mode 100644 CMakeModules/FindLibNoise.cmake
 create mode 100644 CMakeModules/FindOpenGLES.cmake
 delete mode 100644 CMakeModules/FindV8.cmake
 create mode 100644 debian/libosgearthqt5-5.install
 rename debian/{libosgearthqt5.symbols => libosgearthqt5-5.symbols} (89%)
 delete mode 100644 debian/libosgearthqt5.install
 create mode 100644 debian/patches/spelling-errors.patch
 create mode 100644 debian/tests/control
 create mode 100644 docs/source/support.rst
 delete mode 100644 src/applications/osgearth_clamp/osgearth_clamp.cpp
 delete mode 100644 src/applications/osgearth_featureeditor/osgearth_featureeditor.cpp
 delete mode 100644 src/applications/osgearth_featuremanip/osgearth_featuremanip.cpp
 delete mode 100644 src/applications/osgearth_fog/osgearth_fog.cpp
 copy src/applications/{osgearth_fog => osgearth_htm}/CMakeLists.txt (72%)
 copy src/applications/{osgearth_viewer/osgearth_viewer.cpp => osgearth_htm/osgearth_htm.cpp} (52%)
 rename src/applications/{osgearth_fog => osgearth_infinitescroll}/CMakeLists.txt (66%)
 create mode 100644 src/applications/osgearth_infinitescroll/osgearth_infinitescroll.cpp
 rename src/applications/{osgearth_featuremanip => osgearth_lights}/CMakeLists.txt (67%)
 create mode 100644 src/applications/osgearth_lights/osgearth_lights.cpp
 rename src/applications/{osgearth_featureeditor => osgearth_noisegen}/CMakeLists.txt (67%)
 copy src/applications/{osgearth_map/osgearth_map.cpp => osgearth_noisegen/osgearth_noisegen.cpp} (57%)
 rename src/applications/{osgearth_clamp => osgearth_video}/CMakeLists.txt (71%)
 copy src/applications/{osgearth_map/osgearth_map.cpp => osgearth_video/osgearth_video.cpp} (73%)
 rename src/applications/osgearth_viewerIOS/{osgEarthViewerIOS => }/AppDelegate.h (100%)
 rename src/applications/osgearth_viewerIOS/{osgEarthViewerIOS/AppDelegate.m => AppDelegate.mm} (100%)
 create mode 100644 src/applications/osgearth_viewerIOS/CMakeLists.txt
 rename src/applications/osgearth_viewerIOS/{osgEarthViewerIOS/MultiTouchManipulator => }/EarthMultiTouchManipulator.cpp (100%)
 rename src/applications/osgearth_viewerIOS/{osgEarthViewerIOS/MultiTouchManipulator => }/EarthMultiTouchManipulator.h (100%)
 rename src/applications/osgearth_viewerIOS/{osgEarthViewerIOS => }/StartViewerController.h (100%)
 rename src/applications/osgearth_viewerIOS/{osgEarthViewerIOS/StartViewerController.m => StartViewerController.mm} (80%)
 rename src/applications/osgearth_viewerIOS/{osgEarthViewerIOS => }/StartViewerController.xib (100%)
 rename src/applications/osgearth_viewerIOS/{osgEarthViewerIOS => }/ViewController.h (92%)
 rename src/applications/osgearth_viewerIOS/{osgEarthViewerIOS/ViewController.m => ViewController.mm} (65%)
 create mode 100644 src/applications/osgearth_viewerIOS/ViewController.xib
 rename src/applications/osgearth_viewerIOS/{osgEarthViewerIOS/main.m => main.mm} (100%)
 rename src/applications/osgearth_viewerIOS/{osgEarthViewerIOS => }/osgEarthViewerIOS-Info.plist (100%)
 delete mode 100644 src/applications/osgearth_viewerIOS/osgEarthViewerIOS.xcodeproj/project.pbxproj
 delete mode 100644 src/applications/osgearth_viewerIOS/osgEarthViewerIOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 delete mode 100755 src/applications/osgearth_viewerIOS/osgEarthViewerIOS/ShaderGen/GLES2ShaderGenVisitor.cpp
 delete mode 100755 src/applications/osgearth_viewerIOS/osgEarthViewerIOS/ShaderGen/GLES2ShaderGenVisitor.h
 delete mode 100755 src/applications/osgearth_viewerIOS/osgEarthViewerIOS/ShaderGen/ShaderGenScene.h
 delete mode 100644 src/applications/osgearth_viewerIOS/osgEarthViewerIOS/en.lproj/InfoPlist.strings
 delete mode 100644 src/applications/osgearth_viewerIOS/osgEarthViewerIOS/en.lproj/ViewController_iPad.xib
 delete mode 100644 src/applications/osgearth_viewerIOS/osgEarthViewerIOS/en.lproj/ViewController_iPhone.xib
 delete mode 100644 src/applications/osgearth_viewerIOS/osgEarthViewerIOS/osgEarthViewerIOS-Prefix.pch
 delete mode 100755 src/applications/osgearth_viewerIOS/osgEarthViewerIOS/osgPlugins.h
 delete mode 100755 src/applications/osgearth_viewerIOS/osgEarthViewerIOS/osgearth_viewerIOS.cpp
 create mode 100755 src/applications/osgearth_viewerIOS/osgPlugins.h
 delete mode 100644 src/osgEarth/AlphaEffect
 delete mode 100644 src/osgEarth/AlphaEffect.cpp
 delete mode 100644 src/osgEarth/AlphaEffect.frag.glsl
 delete mode 100644 src/osgEarth/AutoScale.cpp
 create mode 100644 src/osgEarth/ElevationPool
 create mode 100644 src/osgEarth/ElevationPool.cpp
 create mode 100644 src/osgEarth/Endian
 create mode 100644 src/osgEarth/LandCover
 create mode 100644 src/osgEarth/LandCover.cpp
 create mode 100644 src/osgEarth/LandCoverLayer
 create mode 100644 src/osgEarth/LandCoverLayer.cpp
 create mode 100644 src/osgEarth/LayerListener
 create mode 100644 src/osgEarth/Lighting
 create mode 100644 src/osgEarth/Lighting.cpp
 delete mode 100644 src/osgEarth/Mercator
 delete mode 100644 src/osgEarth/Mercator.cpp
 create mode 100644 src/osgEarth/MetaTile
 create mode 100644 src/osgEarth/MetaTile.cpp
 create mode 100644 src/osgEarth/Metrics
 create mode 100644 src/osgEarth/Metrics.cpp
 delete mode 100644 src/osgEarth/OverlayNode
 delete mode 100644 src/osgEarth/OverlayNode.cpp
 create mode 100644 src/osgEarth/PagedNode
 create mode 100644 src/osgEarth/PagedNode.cpp
 create mode 100644 src/osgEarth/PatchLayer
 rename src/osgEarth/{TilePatchCallback.cpp => PatchLayer.cpp} (68%)
 create mode 100644 src/osgEarth/PhongLighting.frag.glsl
 create mode 100644 src/osgEarth/PhongLighting.vert.glsl
 create mode 100644 src/osgEarth/PluginLoader
 delete mode 100644 src/osgEarth/QuadTree
 delete mode 100644 src/osgEarth/QuadTree.cpp
 create mode 100644 src/osgEarth/SceneGraphCallback
 create mode 100644 src/osgEarth/SceneGraphCallback.cpp
 rename src/{osgEarthUtil => osgEarth}/SimplexNoise (92%)
 rename src/{osgEarthUtil => osgEarth}/SimplexNoise.cpp (90%)
 create mode 100644 src/osgEarth/TerrainResources
 create mode 100755 src/osgEarth/TerrainResources.cpp
 delete mode 100644 src/osgEarth/TextureCompositor
 delete mode 100755 src/osgEarth/TextureCompositor.cpp
 delete mode 100644 src/osgEarth/TilePatchCallback
 create mode 100644 src/osgEarth/TileRasterizer
 create mode 100644 src/osgEarth/TileRasterizer.cpp
 create mode 100644 src/osgEarth/VideoLayer
 create mode 100644 src/osgEarth/VideoLayer.cpp
 create mode 100644 src/osgEarth/VisibleLayer
 create mode 100644 src/osgEarth/VisibleLayer.cpp
 create mode 100644 src/osgEarth/WrapperLayer
 create mode 100644 src/osgEarth/catch.hpp
 delete mode 100644 src/osgEarthAnnotation/AnnotationExtension
 delete mode 100644 src/osgEarthAnnotation/AnnotationExtension.cpp
 create mode 100644 src/osgEarthAnnotation/AnnotationLayer
 create mode 100644 src/osgEarthAnnotation/AnnotationLayer.cpp
 delete mode 100644 src/osgEarthAnnotation/Decoration
 delete mode 100644 src/osgEarthAnnotation/Decoration.cpp
 delete mode 100644 src/osgEarthAnnotation/HighlightDecoration
 delete mode 100644 src/osgEarthAnnotation/HighlightDecoration.cpp
 delete mode 100644 src/osgEarthAnnotation/ScaleDecoration
 delete mode 100644 src/osgEarthDrivers/arcgis_map_cache/CMakeLists.txt
 delete mode 100644 src/osgEarthDrivers/arcgis_map_cache/ReaderWriterArcGISMapCache.cpp
 delete mode 100644 src/osgEarthDrivers/engine_byo/BYOTerrainEngineDriver.cpp
 delete mode 100644 src/osgEarthDrivers/engine_byo/BYOTerrainEngineNode
 delete mode 100644 src/osgEarthDrivers/engine_byo/BYOTerrainEngineNode.cpp
 delete mode 100644 src/osgEarthDrivers/engine_byo/BYOTerrainEngineOptions
 delete mode 100644 src/osgEarthDrivers/engine_byo/CMakeLists.txt
 delete mode 100644 src/osgEarthDrivers/engine_byo/Common
 create mode 100644 src/osgEarthDrivers/engine_rex/DrawState
 create mode 100644 src/osgEarthDrivers/engine_rex/DrawState.cpp
 create mode 100644 src/osgEarthDrivers/engine_rex/DrawTileCommand
 create mode 100644 src/osgEarthDrivers/engine_rex/DrawTileCommand.cpp
 create mode 100644 src/osgEarthDrivers/engine_rex/LayerDrawable
 create mode 100644 src/osgEarthDrivers/engine_rex/LayerDrawable.cpp
 delete mode 100644 src/osgEarthDrivers/engine_rex/MPTexture
 delete mode 100644 src/osgEarthDrivers/engine_rex/MPTexture.cpp
 create mode 100644 src/osgEarthDrivers/engine_rex/RexEngine.elevation.glsl
 create mode 100644 src/osgEarthDrivers/engine_rex/TerrainCuller
 create mode 100644 src/osgEarthDrivers/engine_rex/TerrainCuller.cpp
 create mode 100644 src/osgEarthDrivers/engine_rex/TerrainRenderData
 create mode 100644 src/osgEarthDrivers/engine_rex/TerrainRenderData.cpp
 create mode 100644 src/osgEarthDrivers/engine_rex/TileRenderModel
 create mode 100644 src/osgEarthDrivers/feature_xyz/CMakeLists.txt
 create mode 100644 src/osgEarthDrivers/feature_xyz/FeatureSourceXYZ.cpp
 rename src/{osgEarthDriversDisabled/feature_mapnikvectortiles/MVTFeatureOptions => osgEarthDrivers/feature_xyz/XYZFeatureOptions} (51%)
 delete mode 100644 src/osgEarthDrivers/noise/CMakeLists.txt
 delete mode 100644 src/osgEarthDrivers/noise/NoiseExtension
 delete mode 100644 src/osgEarthDrivers/noise/NoiseExtension.cpp
 delete mode 100644 src/osgEarthDrivers/noise/NoiseOptions
 delete mode 100644 src/osgEarthDrivers/noise/NoiseTerrainEffect
 delete mode 100644 src/osgEarthDrivers/noise/NoiseTerrainEffect.cpp
 delete mode 100644 src/osgEarthDrivers/quadkey/CMakeLists.txt
 delete mode 100644 src/osgEarthDrivers/quadkey/QuadKeyOptions
 delete mode 100644 src/osgEarthDrivers/quadkey/ReaderWriterQuadKey.cpp
 delete mode 100644 src/osgEarthDrivers/refresh/CMakeLists.txt
 delete mode 100644 src/osgEarthDrivers/refresh/ReaderWriterRefresh.cpp
 delete mode 100644 src/osgEarthDrivers/refresh/RefreshOptions
 delete mode 100644 src/osgEarthDrivers/script_engine_javascriptcore/CMakeLists.txt
 delete mode 100644 src/osgEarthDrivers/script_engine_javascriptcore/JSWrappers
 delete mode 100644 src/osgEarthDrivers/script_engine_javascriptcore/JSWrappers.cpp
 delete mode 100644 src/osgEarthDrivers/script_engine_javascriptcore/JavaScriptCoreEngine
 delete mode 100644 src/osgEarthDrivers/script_engine_javascriptcore/JavaScriptCoreEngine.cpp
 delete mode 100644 src/osgEarthDrivers/script_engine_javascriptcore/JavaScriptCoreEngineFactory.cpp
 delete mode 100644 src/osgEarthDrivers/script_engine_v8/CMakeLists.txt
 delete mode 100644 src/osgEarthDrivers/script_engine_v8/JSWrappers
 delete mode 100644 src/osgEarthDrivers/script_engine_v8/JSWrappers.cpp
 delete mode 100644 src/osgEarthDrivers/script_engine_v8/JavascriptEngineV8
 delete mode 100644 src/osgEarthDrivers/script_engine_v8/JavascriptEngineV8.cpp
 delete mode 100644 src/osgEarthDrivers/script_engine_v8/JavascriptEngineV8Factory.cpp
 delete mode 100644 src/osgEarthDrivers/script_engine_v8/V8Util
 delete mode 100644 src/osgEarthDrivers/sky_gl/GLSkyShaders
 delete mode 100644 src/osgEarthDrivers/splat_mask/CMakeLists.txt
 delete mode 100644 src/osgEarthDrivers/splat_mask/SplatMaskDriver.cpp
 delete mode 100644 src/osgEarthDrivers/splat_mask/SplatMaskOptions
 delete mode 100644 src/osgEarthDrivers/template_matclass/CMakeLists.txt
 delete mode 100644 src/osgEarthDrivers/template_matclass/TemplateMatClassDriver.cpp
 delete mode 100644 src/osgEarthDrivers/template_matclass/TemplateMatClassOptions
 delete mode 100644 src/osgEarthDrivers/tilecache/CMakeLists.txt
 delete mode 100644 src/osgEarthDrivers/tilecache/ReaderWriterTileCache.cpp
 delete mode 100644 src/osgEarthDrivers/tilecache/TileCacheOptions
 delete mode 100644 src/osgEarthDrivers/tileservice/CMakeLists.txt
 delete mode 100644 src/osgEarthDrivers/tileservice/ReaderWriterTileService.cpp
 delete mode 100644 src/osgEarthDrivers/tileservice/TileServiceOptions
 delete mode 100644 src/osgEarthDrivers/yahoo/CMakeLists.txt
 delete mode 100644 src/osgEarthDrivers/yahoo/ReaderWriterYahoo.cpp
 delete mode 100644 src/osgEarthDrivers/yahoo/YahooOptions
 delete mode 100644 src/osgEarthDriversDisabled/feature_mapnikvectortiles/CMakeLists.txt
 delete mode 100644 src/osgEarthDriversDisabled/feature_mapnikvectortiles/FeatureSourceMVT.cpp
 delete mode 100644 src/osgEarthDriversDisabled/feature_mapnikvectortiles/vector_tile.proto
 delete mode 100644 src/osgEarthExtensions/CMakeLists.txt
 delete mode 100644 src/osgEarthFeatures/FeatureDrawSet
 delete mode 100644 src/osgEarthFeatures/FeatureDrawSet.cpp
 create mode 100644 src/osgEarthFeatures/FeatureMaskLayer
 create mode 100644 src/osgEarthFeatures/FeatureMaskLayer.cpp
 create mode 100644 src/osgEarthFeatures/FeatureModelLayer
 create mode 100644 src/osgEarthFeatures/FeatureModelLayer.cpp
 create mode 100644 src/osgEarthFeatures/FeatureSourceLayer
 create mode 100644 src/osgEarthFeatures/FeatureSourceLayer.cpp
 create mode 100644 src/osgEarthFeatures/GPULines
 create mode 100644 src/osgEarthFeatures/GPULines.cpp
 create mode 100644 src/osgEarthFeatures/GPULinesScreenProj.glsl
 delete mode 100644 src/osgEarthFeatures/OptimizerHints
 delete mode 100644 src/osgEarthFeatures/OptimizerHints.cpp
 copy src/{osgEarth => osgEarthFeatures}/Shaders (70%)
 create mode 100644 src/osgEarthFeatures/Shaders.cpp.in
 delete mode 100644 src/osgEarthProcedural/CMakeLists.txt
 delete mode 100644 src/osgEarthProcedural/Common
 delete mode 100644 src/osgEarthProcedural/CoverageLegend
 delete mode 100644 src/osgEarthProcedural/CoverageLegend.cpp
 delete mode 100644 src/osgEarthProcedural/Export
 delete mode 100644 src/osgEarthProcedural/Shaders
 delete mode 100644 src/osgEarthProcedural/Shaders.cpp.in
 delete mode 100644 src/osgEarthProcedural/SimplexNoise
 delete mode 100644 src/osgEarthProcedural/SimplexNoise.cpp
 delete mode 100644 src/osgEarthProcedural/SplatCatalog
 delete mode 100644 src/osgEarthProcedural/SplatCatalog.cpp
 create mode 100644 src/osgEarthSplat/GroundCover
 create mode 100644 src/osgEarthSplat/GroundCover.FS.glsl
 rename src/osgEarthSplat/{LandCover.GS.glsl => GroundCover.GS.glsl} (51%)
 rename src/osgEarthSplat/{LandCover.TCS.glsl => GroundCover.TCS.glsl} (55%)
 rename src/osgEarthSplat/{LandCover.TES.glsl => GroundCover.TES.glsl} (90%)
 create mode 100644 src/osgEarthSplat/GroundCover.cpp
 create mode 100644 src/osgEarthSplat/GroundCoverLayer
 create mode 100644 src/osgEarthSplat/GroundCoverLayer.cpp
 delete mode 100644 src/osgEarthSplat/LandCover
 delete mode 100644 src/osgEarthSplat/LandCover.FS.glsl
 delete mode 100644 src/osgEarthSplat/LandCover.cpp
 delete mode 100644 src/osgEarthSplat/LandCoverTerrainEffect
 delete mode 100644 src/osgEarthSplat/LandCoverTerrainEffect.cpp
 delete mode 100644 src/osgEarthSplat/LandCoverTilePatchCallback
 delete mode 100644 src/osgEarthSplat/LandCoverTilePatchCallback.cpp
 create mode 100644 src/osgEarthSplat/RoadSurfaceLayer
 create mode 100644 src/osgEarthSplat/RoadSurfaceLayer.cpp
 delete mode 100644 src/osgEarthSplat/Splat.frag.common.glsl
 create mode 100644 src/osgEarthSplat/SplatLayer
 create mode 100644 src/osgEarthSplat/SplatLayer.cpp
 delete mode 100644 src/osgEarthSplat/SplatTerrainEffect
 delete mode 100644 src/osgEarthSplat/SplatTerrainEffect.cpp
 copy src/osgEarthTriton/{TritonOptions => TritonLayer} (60%)
 create mode 100644 src/osgEarthTriton/TritonLayer.cpp
 delete mode 100644 src/osgEarthUtil/FeatureQueryTool
 delete mode 100644 src/osgEarthUtil/FeatureQueryTool.cpp
 create mode 100644 src/osgEarthUtil/FlatteningLayer
 create mode 100644 src/osgEarthUtil/FlatteningLayer.cpp
 create mode 100644 src/osgEarthUtil/FractalElevationLayer
 create mode 100644 src/osgEarthUtil/FractalElevationLayer.cpp
 create mode 100644 src/osgEarthUtil/GARSGraticule
 create mode 100644 src/osgEarthUtil/GARSGraticule.cpp
 delete mode 100644 src/osgEarthUtil/GraticuleExtension
 delete mode 100644 src/osgEarthUtil/GraticuleExtension.cpp
 delete mode 100644 src/osgEarthUtil/GraticuleNode
 delete mode 100644 src/osgEarthUtil/GraticuleNode.cpp
 delete mode 100644 src/osgEarthUtil/GraticuleOptions
 delete mode 100644 src/osgEarthUtil/GraticuleTerrainEffect
 delete mode 100644 src/osgEarthUtil/GraticuleTerrainEffect.cpp
 create mode 100644 src/osgEarthUtil/MultiElevationLayer
 create mode 100644 src/osgEarthUtil/MultiElevationLayer.cpp
 delete mode 100644 src/osgEarthUtil/ObjectLocator
 delete mode 100644 src/osgEarthUtil/ObjectLocator.cpp
 create mode 100644 src/osgEarthUtil/SimpleOceanLayer
 create mode 100644 src/osgEarthUtil/SimpleOceanLayer.cpp
 create mode 100644 src/osgEarthUtil/SimpleOceanLayer.frag.glsl
 create mode 100644 src/osgEarthUtil/SimpleOceanLayer.vert.glsl
 create mode 100644 src/osgEarthUtil/TopologyGraph
 copy src/{applications/osgearth_boundarygen/BoundaryUtil.cpp => osgEarthUtil/TopologyGraph.cpp} (69%)
 create mode 100644 src/osgEarthUtil/UTMLabelingEngine
 create mode 100644 src/osgEarthUtil/UTMLabelingEngine.cpp
 create mode 100644 src/osgEarthUtil/ViewFitter
 create mode 100644 src/osgEarthUtil/ViewFitter.cpp
 create mode 100644 src/tests/CMakeLists.txt
 create mode 100644 src/tests/osgEarth_tests/CMakeLists.txt
 create mode 100644 src/tests/osgEarth_tests/EndianTests.cpp
 create mode 100644 src/tests/osgEarth_tests/FeatureTests.cpp
 create mode 100644 src/tests/osgEarth_tests/GeoExtentTests.cpp
 create mode 100644 src/tests/osgEarth_tests/ImageLayerTests.cpp
 create mode 100644 src/tests/osgEarth_tests/SpatialReferenceTests.cpp
 create mode 100644 src/tests/osgEarth_tests/ThreadingTests.cpp
 rename src/{osgEarth/AutoScale => tests/osgEarth_tests/main.cpp} (61%)
 create mode 100644 tests/aeqd.earth
 create mode 100644 tests/annotation_dateline.earth
 create mode 100644 tests/annotation_dateline_projected.earth
 delete mode 100644 tests/boston_tfs.earth
 create mode 100644 tests/city_labels.xml
 rename tests/{night.earth => day_night_mp.earth} (100%)
 create mode 100644 tests/day_night_rex.earth
 delete mode 100644 tests/fade_elevation.earth
 delete mode 100644 tests/feature_overlay.earth
 create mode 100644 tests/fractal_elevation.earth
 delete mode 100644 tests/glsl_filter.earth
 delete mode 100644 tests/graticule.earth
 create mode 100644 tests/graticules.earth
 create mode 100644 tests/land_cover_mixed.earth
 delete mode 100644 tests/lod_blending.earth
 create mode 100644 tests/mapbox.earth
 delete mode 100644 tests/noise.earth
 delete mode 100644 tests/normalmap.earth
 copy tests/{ocean.earth => ocean_no_elevation.earth} (50%)
 rename tests/{openweathermap_clouds.earth => openweathermap.earth} (58%)
 delete mode 100644 tests/openweathermap_precipitation.earth
 delete mode 100644 tests/openweathermap_pressure.earth
 copy tests/{readymap.earth => readymap-elevation-only.earth} (83%)
 delete mode 100644 tests/readymap-priority.earth
 rename tests/{readymap_pixel_size.earth => readymap_flat.earth} (78%)
 create mode 100644 tests/roads-flattened.earth
 create mode 100644 tests/roads-test.earth
 create mode 100644 tests/roads.earth
 create mode 100644 tests/scene_clamping.earth
 rename tests/{gdal_tiff.earth => simple.earth} (57%)
 create mode 100644 tests/splat-blended-with-imagery.earth
 rename tests/{splat-edit.bat => splat-detail-tool.bat} (100%)
 delete mode 100644 tests/splat-gpunoise.bat
 create mode 100644 tests/splat-groundcover-tool.bat
 delete mode 100644 tests/splat-ranges.earth
 delete mode 100644 tests/splat-server.earth
 create mode 100644 tests/splat-with-mask-layer.earth
 create mode 100644 tests/splat-with-multiple-zones.earth
 create mode 100644 tests/splat-with-rasterized-land-cover.earth
 delete mode 100644 tests/splat-with-vectors.earth
 delete mode 100644 tests/splat.bat
 delete mode 100644 tests/tess-coastlines.earth
 delete mode 100644 tests/tess-masking.earth
 delete mode 100644 tests/tess-terrain.earth
 delete mode 100644 tests/tess_screen_space.earth
 delete mode 100644 tests/test-morphing.earth
 rename tests/{readymap-osm.earth => utm.earth} (59%)
 create mode 100644 tests/viewpoints_flat.xml

-- 
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