This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osgearth.
commit bd98f6c106e09db66c8edd47e8b465dbd6b4553d Merge: ecf816d 0af4bfe Author: Bas Couwenberg <[email protected]> Date: Sun Jun 18 14:08:44 2017 +0200 Merge branch 'experimental' Conflicts: debian/changelog debian/copyright .travis.yml | 42 + CMakeLists.txt | 30 +- CMakeModules/ConfigureShaders.cmake.in | 14 +- CMakeModules/FindMiniZip.cmake | 70 - CMakeModules/FindPoco.cmake | 69 + CMakeModules/FindRocksDB.cmake | 42 + CMakeModules/FindSilverLining.cmake | 30 +- CMakeModules/FindTriton.cmake | 24 +- CMakeModules/OsgEarthMacroUtils.cmake | 12 - README.md | 23 + README.txt | 20 - debian/changelog | 50 +- debian/control | 44 +- debian/copyright | 291 +- debian/gbp.conf | 2 +- debian/libosgearth5.lintian-overrides | 2 +- debian/libosgearth5.symbols | 1898 +- debian/libosgearthannotation5.symbols | 791 +- debian/libosgearthfeatures5.symbols | 895 +- debian/libosgearthqt5.symbols | 1195 +- debian/libosgearthsplat5.install | 1 + debian/libosgearthsplat5.symbols | 741 + debian/libosgearthsymbology5.symbols | 623 +- debian/libosgearthutil5.symbols | 1001 +- debian/man/osgearth_sharedlayer.1.xml | 55 - ...penscenegraph-plugin-osgearth.lintian-overrides | 4 + debian/osgearth.docs | 2 +- debian/osgearth.manpages | 1 - debian/patches/fallback-getCurrentThreadId.patch | 31 - debian/patches/kfreebsd-getCurrentThreadId.patch | 25 - debian/patches/series | 6 - debian/patches/soversion.patch | 4 +- debian/patches/spelling-errors.patch | 46 - debian/patches/spelling-errors2.patch | 15 - ...ndefined-reference-to-symbol-XInitThreads.patch | 56 - debian/patches/version.patch | 16 - debian/rules | 51 +- docs/CMakeLists.txt | 1 - docs/Doxyfile | 2353 + docs/source/data.rst | 9 +- docs/source/developer/shader_composition.rst | 22 +- docs/source/developer/utilities.rst | 8 +- docs/source/faq.rst | 54 +- .../source/references/drivers/cache/filesystem.rst | 2 +- .../drivers/model/feature_model_shared_props.rst | 4 +- .../references/drivers/model/feature_stencil.rst | 41 - docs/source/references/drivers/model/index.rst | 1 - docs/source/references/drivers/model/simple.rst | 2 +- docs/source/references/earthfile.rst | 25 +- docs/source/references/symbology.rst | 13 +- docs/source/releasenotes.rst | 46 + docs/source/startup.rst | 47 +- docs/source/user/caching.rst | 2 +- docs/source/user/features.rst | 67 + docs/source/user/tools.rst | 4 +- src/CMakeLists.txt | 35 +- src/applications/CMakeLists.txt | 118 +- src/applications/osgearth_3pv/CMakeLists.txt | 7 + src/applications/osgearth_3pv/osgearth_3pv.cpp | 263 + .../osgearth_annotation/osgearth_annotation.cpp | 294 +- src/applications/osgearth_atlas/osgearth_atlas.cpp | 29 +- .../osgearth_backfill/osgearth_backfill.cpp | 2 +- src/applications/osgearth_boundarygen/BoundaryUtil | 2 +- .../osgearth_boundarygen/BoundaryUtil.cpp | 4 +- .../osgearth_boundarygen/VertexCollectionVisitor | 2 +- .../VertexCollectionVisitor.cpp | 2 +- .../osgearth_boundarygen/boundarygen.cpp | 2 +- .../osgearth_cache_test/osgearth_cache_test.cpp | 12 +- src/applications/osgearth_city/osgearth_city.cpp | 7 +- src/applications/osgearth_clamp/osgearth_clamp.cpp | 2 +- .../osgearth_clipplane/osgearth_clipplane.cpp | 4 +- .../osgearth_colorfilter/osgearth_colorfilter.cpp | 2 +- .../osgearth_computerangecallback/CMakeLists.txt | 7 + .../osgearth_computerangecallback.cpp | 122 + .../osgearth_controls/osgearth_controls.cpp | 20 +- src/applications/osgearth_conv/osgearth_conv.cpp | 42 +- .../osgearth_createtile/osgearth_createtile.cpp | 85 +- src/applications/osgearth_datetime/CMakeLists.txt | 7 + .../osgearth_datetime/osgearth_datetime.cpp | 198 + .../osgearth_deformation/CMakeLists.txt | 7 + .../osgearth_deformation/osgearth_deformation.cpp | 599 + src/applications/osgearth_demo/osgearth_demo.cpp | 3 + .../osgearth_elevation/osgearth_elevation.cpp | 67 +- src/applications/osgearth_ephemeris/CMakeLists.txt | 7 + .../osgearth_ephemeris/osgearth_ephemeris.cpp | 144 + .../osgearth_featureeditor.cpp | 21 +- .../osgearth_featurefilter.cpp | 2 +- .../osgearth_featureinfo/osgearth_featureinfo.cpp | 7 +- .../osgearth_featurequery.cpp | 2 +- .../osgearth_features/osgearth_features.cpp | 24 +- src/applications/osgearth_fog/osgearth_fog.cpp | 133 +- .../osgearth_graticule/osgearth_graticule.cpp | 2 +- src/applications/osgearth_horizon/CMakeLists.txt | 7 + .../osgearth_horizon/osgearth_horizon.cpp | 172 + src/applications/osgearth_http/CMakeLists.txt | 7 + src/applications/osgearth_http/osgearth_http.cpp | 48 + .../osgearth_imageoverlay.cpp | 2 +- src/applications/osgearth_los/osgearth_los.cpp | 2 +- src/applications/osgearth_manip/osgearth_manip.cpp | 115 +- src/applications/osgearth_map/osgearth_map.cpp | 2 +- .../osgearth_measure/osgearth_measure.cpp | 4 +- .../osgearth_minimap/osgearth_minimap.cpp | 2 +- src/applications/osgearth_mrt/osgearth_mrt.cpp | 13 +- .../osgearth_occlusionculling.cpp | 8 +- .../osgearth_overlayviewer.cpp | 27 +- .../osgearth_package/osgearth_package.cpp | 9 +- .../osgearth_package_qt/CMakeLists.txt | 11 +- src/applications/osgearth_package_qt/ExportDialog | 2 +- .../osgearth_package_qt/ExportDialog.cpp | 2 +- .../osgearth_package_qt/PackageQtMainWindow | 2 +- .../osgearth_package_qt/SceneController.cpp | 2 +- .../osgearth_package_qt/SceneController.h | 2 +- .../osgearth_package_qt/TMSExporter.cpp | 2 +- src/applications/osgearth_package_qt/TMSExporter.h | 2 +- src/applications/osgearth_package_qt/WaitDialog | 2 +- .../osgearth_package_qt/WaitDialog.cpp | 2 +- .../osgearth_package_qt/package_qt.cpp | 2 +- .../osgearth_pagingtest/CMakeLists.txt | 8 + .../osgearth_pagingtest/osgearth_pagingtest.cpp | 334 + src/applications/osgearth_pick/osgearth_pick.cpp | 27 +- src/applications/osgearth_qt/CMakeLists.txt | 44 - src/applications/osgearth_qt/DemoMainWindow | 201 - src/applications/osgearth_qt/demo_style.qss | 22 - src/applications/osgearth_qt/images.qrc | 5 - .../osgearth_qt/images/terrain_profile.png | Bin 358 -> 0 bytes src/applications/osgearth_qt/osgearth_qt.cpp | 415 - src/applications/osgearth_qt_simple/CMakeLists.txt | 11 +- .../osgearth_qt_simple/osgearth_qt_simple.cpp | 3 +- .../osgearth_qt_windows/CMakeLists.txt | 11 +- .../osgearth_qt_windows/osgearth_qt_windows.cpp | 4 +- src/applications/osgearth_seed/osgearth_seed.cpp | 75 +- .../osgearth_sequencecontrol.cpp | 4 +- src/applications/osgearth_server/CMakeLists.txt | 13 + .../osgearth_server/osgearth_server.cpp | 623 + .../osgearth_shadercomp/osgearth_shadercomp.cpp | 270 +- .../osgearth_shadergen/osgearth_shadergen.cpp | 2 +- .../osgearth_sharedlayer/osgearth_sharedlayer.cpp | 2 +- .../osgearth_silverlining/CMakeLists.txt | 9 + .../osgearth_silverlining.cpp | 242 + src/applications/osgearth_skyview/CMakeLists.txt | 14 + src/applications/osgearth_skyview/SkyManipulator | 40 + .../osgearth_skyview/SkyManipulator.cpp | 120 + .../osgearth_skyview/osgearth_skyview.cpp | 108 + src/applications/osgearth_splat/CMakeLists.txt | 10 + src/applications/osgearth_splat/osgearth_splat.cpp | 135 + src/applications/osgearth_srstest/CMakeLists.txt | 7 + .../osgearth_srstest/osgearth_srstest.cpp | 70 + .../osgearth_terrainprofile.cpp | 2 +- src/applications/osgearth_tfs/osgearth_tfs.cpp | 9 +- .../osgearth_tileindex/osgearth_tileindex.cpp | 2 +- .../osgearth_tilesource/osgearth_tilesource.cpp | 6 +- src/applications/osgearth_toc/osgearth_toc.cpp | 44 +- .../osgearth_tracks/osgearth_tracks.cpp | 34 +- .../osgearth_transform/osgearth_transform.cpp | 2 +- src/applications/osgearth_triton/CMakeLists.txt | 9 + .../osgearth_triton/osgearth_triton.cpp | 189 + .../osgearth_version/osgearth_version.cpp | 2 +- .../osgearth_viewer/osgearth_viewer.cpp | 39 +- src/applications/osgearth_wfs/CMakeLists.txt | 7 + src/applications/osgearth_wfs/osgearth_wfs.cpp | 116 + src/applications/osgearth_xfbtest/CMakeLists.txt | 7 + .../osgearth_xfbtest/osgearth_xfbtest.cpp | 438 + src/osgEarth/AlphaEffect | 3 +- src/osgEarth/AlphaEffect.cpp | 82 +- src/osgEarth/AlphaEffect.frag.glsl | 8 +- src/osgEarth/AutoScale | 5 +- src/osgEarth/AutoScale.cpp | 8 +- src/osgEarth/Bounds | 2 +- src/osgEarth/Bounds.cpp | 2 +- src/osgEarth/CMakeLists.txt | 69 +- src/osgEarth/Cache | 89 +- src/osgEarth/Cache.cpp | 85 +- src/osgEarth/CacheBin | 55 +- src/osgEarth/CacheBin.cpp | 379 + src/osgEarth/CacheEstimator | 2 +- src/osgEarth/CacheEstimator.cpp | 4 +- src/osgEarth/CachePolicy | 22 +- src/osgEarth/CachePolicy.cpp | 71 +- src/osgEarth/CacheSeed | 2 +- src/osgEarth/CacheSeed.cpp | 2 +- src/osgEarth/Capabilities | 2 +- src/osgEarth/Capabilities.cpp | 10 +- src/osgEarth/ClampableNode.cpp | 3 +- src/osgEarth/Clamping | 12 +- src/osgEarth/Clamping.cpp | 16 +- src/osgEarth/ClampingTechnique | 5 +- src/osgEarth/ClampingTechnique.cpp | 8 +- src/osgEarth/ColorFilter | 5 +- src/osgEarth/ColorFilter.cpp | 2 +- src/osgEarth/Common | 17 +- src/osgEarth/CompositeTileSource | 2 +- src/osgEarth/CompositeTileSource.cpp | 47 +- src/osgEarth/Config | 130 +- src/osgEarth/Config.cpp | 80 +- src/osgEarth/Containers | 128 +- src/osgEarth/Cube | 2 +- src/osgEarth/Cube.cpp | 4 +- src/osgEarth/CullingUtils | 49 +- src/osgEarth/CullingUtils.cpp | 262 +- src/osgEarth/DPLineSegmentIntersector | 2 +- src/osgEarth/DPLineSegmentIntersector.cpp | 181 +- src/osgEarth/DateTime.cpp | 6 +- src/osgEarth/DateTimeRange | 52 + src/osgEarth/DateTimeRange.cpp | 91 + src/osgEarth/Decluttering | 178 - src/osgEarth/Decluttering.cpp | 807 - src/osgEarth/DepthOffset | 2 +- src/osgEarth/DepthOffset.cpp | 2 +- src/osgEarth/DepthOffset.vert.glsl | 6 +- src/osgEarth/DrapeableNode | 27 +- src/osgEarth/DrapeableNode.cpp | 77 +- src/osgEarth/Draping.frag.glsl | 12 +- src/osgEarth/Draping.vert.glsl | 8 +- src/osgEarth/DrapingCullSet | 76 + src/osgEarth/DrapingCullSet.cpp | 155 + src/osgEarth/DrapingTechnique | 13 +- src/osgEarth/DrapingTechnique.cpp | 191 +- src/osgEarth/DrawInstanced | 14 +- src/osgEarth/DrawInstanced.cpp | 26 +- src/osgEarth/ECEF | 2 +- src/osgEarth/ECEF.cpp | 2 +- src/osgEarth/ElevationField | 79 - src/osgEarth/ElevationField.cpp | 139 - src/osgEarth/ElevationLOD | 2 +- src/osgEarth/ElevationLOD.cpp | 29 +- src/osgEarth/ElevationLayer | 14 +- src/osgEarth/ElevationLayer.cpp | 63 +- src/osgEarth/ElevationQuery | 27 +- src/osgEarth/ElevationQuery.cpp | 77 +- src/osgEarth/Export | 2 +- src/osgEarth/Extension | 105 +- src/osgEarth/Extension.cpp | 25 +- src/osgEarth/FadeEffect | 2 +- src/osgEarth/FadeEffect.cpp | 2 +- src/osgEarth/FileUtils | 7 +- src/osgEarth/FileUtils.cpp | 19 +- src/osgEarth/GLSLChunker | 63 + src/osgEarth/GLSLChunker.cpp | 228 + src/osgEarth/GPUClamping.frag.glsl | 9 +- src/osgEarth/GPUClamping.vert.glsl | 44 +- src/osgEarth/GPUClamping.vert.lib.glsl | 6 +- src/osgEarth/GeoCommon | 2 +- src/osgEarth/GeoData | 6 +- src/osgEarth/GeoData.cpp | 70 +- src/osgEarth/GeoMath | 2 +- src/osgEarth/GeoMath.cpp | 2 +- src/osgEarth/GeoTransform | 31 +- src/osgEarth/GeoTransform.cpp | 57 +- src/osgEarth/Geoid | 2 +- src/osgEarth/Geoid.cpp | 2 +- src/osgEarth/GeometryClamper | 99 + src/osgEarth/GeometryClamper.cpp | 198 + src/osgEarth/HTTPClient | 3 +- src/osgEarth/HTTPClient.cpp | 302 +- src/osgEarth/HeightFieldUtils | 6 +- src/osgEarth/HeightFieldUtils.cpp | 38 +- src/osgEarth/Horizon | 128 +- src/osgEarth/Horizon.cpp | 481 +- src/osgEarth/IOTypes | 14 +- src/osgEarth/IOTypes.cpp | 15 +- src/osgEarth/ImageLayer | 4 +- src/osgEarth/ImageLayer.cpp | 93 +- src/osgEarth/ImageMosaic | 2 +- src/osgEarth/ImageMosaic.cpp | 45 +- src/osgEarth/ImageToHeightFieldConverter | 2 +- src/osgEarth/ImageToHeightFieldConverter.cpp | 8 +- src/osgEarth/ImageUtils | 47 +- src/osgEarth/ImageUtils.cpp | 163 +- src/osgEarth/Instancing.vert.glsl | 18 +- src/osgEarth/IntersectionPicker | 2 +- src/osgEarth/IntersectionPicker.cpp | 4 +- src/osgEarth/JsonUtils | 8 +- src/osgEarth/JsonUtils.cpp | 25 +- src/osgEarth/Layer | 2 +- src/osgEarth/Layer.cpp | 2 +- src/osgEarth/LineFunctor | 2 +- src/osgEarth/LocalTangentPlane | 2 +- src/osgEarth/LocalTangentPlane.cpp | 2 +- src/osgEarth/Locators | 13 +- src/osgEarth/Locators.cpp | 2 +- src/osgEarth/Map | 37 +- src/osgEarth/Map.cpp | 173 +- src/osgEarth/MapCallback | 2 +- src/osgEarth/MapCallback.cpp | 2 +- src/osgEarth/MapFrame | 19 +- src/osgEarth/MapFrame.cpp | 24 +- src/osgEarth/MapInfo | 2 +- src/osgEarth/MapInfo.cpp | 2 +- src/osgEarth/MapModelChange | 2 +- src/osgEarth/MapNode | 40 +- src/osgEarth/MapNode.cpp | 249 +- src/osgEarth/MapNodeObserver | 2 +- src/osgEarth/MapNodeOptions | 2 +- src/osgEarth/MapNodeOptions.cpp | 2 +- src/osgEarth/MapOptions | 15 +- src/osgEarth/MapOptions.cpp | 6 +- src/osgEarth/MaskLayer | 17 +- src/osgEarth/MaskLayer.cpp | 53 +- src/osgEarth/MaskNode | 2 +- src/osgEarth/MaskNode.cpp | 2 +- src/osgEarth/MaskSource | 42 +- src/osgEarth/MaskSource.cpp | 18 +- src/osgEarth/MemCache | 2 +- src/osgEarth/MemCache.cpp | 24 +- src/osgEarth/Memory | 52 + src/osgEarth/Memory.cpp | 175 + src/osgEarth/MimeTypes.cpp | 2 +- src/osgEarth/ModelLayer | 55 +- src/osgEarth/ModelLayer.cpp | 183 +- src/osgEarth/ModelSource | 48 +- src/osgEarth/ModelSource.cpp | 30 +- src/osgEarth/NativeProgramAdapter | 2 +- src/osgEarth/NodeUtils | 27 +- src/osgEarth/NodeUtils.cpp | 2 +- src/osgEarth/Notify | 7 +- src/osgEarth/Notify.cpp | 9 +- src/osgEarth/ObjectIndex | 33 +- src/osgEarth/ObjectIndex.cpp | 110 +- src/osgEarth/OverlayDecorator | 32 +- src/osgEarth/OverlayDecorator.cpp | 106 +- src/osgEarth/OverlayNode.cpp | 4 +- src/osgEarth/PhongLightingEffect | 1 - src/osgEarth/PhongLightingEffect.cpp | 17 +- src/osgEarth/Picker | 2 +- src/osgEarth/PrimitiveIntersector | 2 +- src/osgEarth/PrimitiveIntersector.cpp | 8 +- src/osgEarth/Profile | 2 +- src/osgEarth/Profile.cpp | 28 +- src/osgEarth/Profiler | 2 +- src/osgEarth/Profiler.cpp | 2 +- src/osgEarth/Progress | 29 +- src/osgEarth/Progress.cpp | 31 +- src/osgEarth/QuadTree | 199 + src/osgEarth/QuadTree.cpp | 825 + src/osgEarth/Random | 7 +- src/osgEarth/Random.cpp | 11 +- src/osgEarth/Registry | 47 +- src/osgEarth/Registry.cpp | 193 +- src/osgEarth/ResourceReleaser | 58 + src/osgEarth/ResourceReleaser.cpp | 74 + src/osgEarth/Revisioning | 5 +- src/osgEarth/Revisioning.cpp | 2 +- src/osgEarth/ScreenSpaceLayout | 204 + src/osgEarth/ScreenSpaceLayout.cpp | 945 + src/osgEarth/ShaderFactory | 23 +- src/osgEarth/ShaderFactory.cpp | 1013 +- src/osgEarth/ShaderGenerator | 7 + src/osgEarth/ShaderGenerator.cpp | 45 +- src/osgEarth/ShaderLoader | 33 +- src/osgEarth/ShaderLoader.cpp | 229 +- src/osgEarth/ShaderUtils | 8 +- src/osgEarth/ShaderUtils.cpp | 195 +- src/osgEarth/Shaders.cpp.in | 16 +- src/osgEarth/Shadowing | 41 + src/osgEarth/Shadowing.cpp | 42 + src/osgEarth/SharedSARepo | 2 +- src/osgEarth/SpatialReference | 6 +- src/osgEarth/SpatialReference.cpp | 65 +- src/osgEarth/StateSetCache | 20 +- src/osgEarth/StateSetCache.cpp | 2 +- src/osgEarth/StateSetLOD | 2 +- src/osgEarth/StateSetLOD.cpp | 2 +- src/osgEarth/Status | 75 + src/osgEarth/Status.cpp | 47 + src/osgEarth/StringUtils | 10 +- src/osgEarth/StringUtils.cpp | 62 +- src/osgEarth/TaskService | 2 +- src/osgEarth/TaskService.cpp | 12 +- src/osgEarth/Terrain | 6 +- src/osgEarth/Terrain.cpp | 18 +- src/osgEarth/TerrainEffect | 2 +- src/osgEarth/TerrainEngineNode | 175 +- src/osgEarth/TerrainEngineNode.cpp | 118 +- src/osgEarth/TerrainEngineRequirements | 39 + src/osgEarth/TerrainLayer | 153 +- src/osgEarth/TerrainLayer.cpp | 785 +- src/osgEarth/TerrainOptions | 34 +- src/osgEarth/TerrainOptions.cpp | 33 +- src/osgEarth/TerrainTileModel | 234 + src/osgEarth/TerrainTileModel.cpp | 124 + src/osgEarth/TerrainTileModelFactory | 128 + src/osgEarth/TerrainTileModelFactory.cpp | 399 + src/osgEarth/TerrainTileNode | 50 +- src/osgEarth/Tessellator | 2 +- src/osgEarth/Tessellator.cpp | 2 +- src/osgEarth/TextureBufferSerializer.cpp | 37 + src/osgEarth/TextureCompositor | 2 +- src/osgEarth/TextureCompositor.cpp | 2 +- src/osgEarth/ThreadingUtils | 2 +- src/osgEarth/ThreadingUtils.cpp | 15 +- src/osgEarth/TileHandler | 2 +- src/osgEarth/TileHandler.cpp | 2 +- src/osgEarth/TileKey | 4 +- src/osgEarth/TileKey.cpp | 2 +- src/osgEarth/TileKeyDataStore | 40 + src/osgEarth/TilePatchCallback | 79 + src/osgEarth/TilePatchCallback.cpp | 26 + src/osgEarth/TileSource | 71 +- src/osgEarth/TileSource.cpp | 216 +- src/osgEarth/TileVisitor | 2 +- src/osgEarth/TileVisitor.cpp | 15 +- src/osgEarth/TimeControl | 2 +- src/osgEarth/TimeControl.cpp | 2 +- src/osgEarth/TraversalData | 92 +- src/osgEarth/TraversalData.cpp | 122 +- src/osgEarth/URI | 30 +- src/osgEarth/URI.cpp | 93 +- src/osgEarth/Units | 14 +- src/osgEarth/Units.cpp | 68 +- src/osgEarth/Utils | 7 +- src/osgEarth/Utils.cpp | 67 +- src/osgEarth/Version | 5 +- src/osgEarth/Version.cpp | 16 +- src/osgEarth/VerticalDatum | 2 +- src/osgEarth/VerticalDatum.cpp | 6 +- src/osgEarth/Viewpoint | 5 +- src/osgEarth/Viewpoint.cpp | 2 +- src/osgEarth/VirtualProgram | 166 +- src/osgEarth/VirtualProgram.cpp | 529 +- src/osgEarth/XmlUtils | 6 +- src/osgEarth/XmlUtils.cpp | 106 +- src/osgEarth/optional | 5 +- src/osgEarth/tinyxml.h | 2 +- src/osgEarthAnnotation/AnnotationData | 36 +- src/osgEarthAnnotation/AnnotationData.cpp | 3 +- src/osgEarthAnnotation/AnnotationEditing | 18 +- src/osgEarthAnnotation/AnnotationEditing.cpp | 37 +- src/osgEarthAnnotation/AnnotationExtension | 61 + src/osgEarthAnnotation/AnnotationExtension.cpp | 91 + src/osgEarthAnnotation/AnnotationNode | 145 +- src/osgEarthAnnotation/AnnotationNode.cpp | 328 +- src/osgEarthAnnotation/AnnotationRegistry | 9 +- src/osgEarthAnnotation/AnnotationRegistry.cpp | 31 +- src/osgEarthAnnotation/AnnotationSettings | 2 +- src/osgEarthAnnotation/AnnotationSettings.cpp | 2 +- src/osgEarthAnnotation/AnnotationUtils | 38 +- src/osgEarthAnnotation/AnnotationUtils.cpp | 347 +- src/osgEarthAnnotation/BboxDrawable | 47 + src/osgEarthAnnotation/BboxDrawable.cpp | 81 + src/osgEarthAnnotation/CMakeLists.txt | 12 +- src/osgEarthAnnotation/CircleNode | 32 +- src/osgEarthAnnotation/CircleNode.cpp | 79 +- src/osgEarthAnnotation/Common | 2 +- src/osgEarthAnnotation/Decoration | 7 +- src/osgEarthAnnotation/Decoration.cpp | 16 +- src/osgEarthAnnotation/Draggers | 55 +- src/osgEarthAnnotation/Draggers.cpp | 160 +- src/osgEarthAnnotation/EllipseNode | 27 +- src/osgEarthAnnotation/EllipseNode.cpp | 73 +- src/osgEarthAnnotation/Export | 2 +- src/osgEarthAnnotation/FeatureEditing | 2 +- src/osgEarthAnnotation/FeatureEditing.cpp | 2 +- src/osgEarthAnnotation/FeatureNode | 41 +- src/osgEarthAnnotation/FeatureNode.cpp | 240 +- src/osgEarthAnnotation/GeoPositionNode | 141 + src/osgEarthAnnotation/GeoPositionNode.cpp | 307 + src/osgEarthAnnotation/GeoPositionNodeAutoScaler | 58 + .../GeoPositionNodeAutoScaler.cpp | 53 + src/osgEarthAnnotation/HighlightDecoration | 4 +- src/osgEarthAnnotation/HighlightDecoration.cpp | 6 +- src/osgEarthAnnotation/ImageOverlay | 25 +- src/osgEarthAnnotation/ImageOverlay.cpp | 89 +- src/osgEarthAnnotation/ImageOverlayEditor | 2 +- src/osgEarthAnnotation/ImageOverlayEditor.cpp | 5 +- src/osgEarthAnnotation/LabelNode | 27 +- src/osgEarthAnnotation/LabelNode.cpp | 173 +- src/osgEarthAnnotation/LocalGeometryNode | 44 +- src/osgEarthAnnotation/LocalGeometryNode.cpp | 251 +- src/osgEarthAnnotation/LocalizedNode | 159 - src/osgEarthAnnotation/LocalizedNode.cpp | 354 - src/osgEarthAnnotation/ModelNode | 13 +- src/osgEarthAnnotation/ModelNode.cpp | 71 +- src/osgEarthAnnotation/OrthoNode | 158 - src/osgEarthAnnotation/OrthoNode.cpp | 413 - src/osgEarthAnnotation/PlaceNode | 36 +- src/osgEarthAnnotation/PlaceNode.cpp | 254 +- src/osgEarthAnnotation/RectangleNode | 12 +- src/osgEarthAnnotation/RectangleNode.cpp | 31 +- src/osgEarthAnnotation/ScaleDecoration | 4 +- src/osgEarthAnnotation/TrackNode | 12 +- src/osgEarthAnnotation/TrackNode.cpp | 62 +- src/osgEarthDrivers/CMakeLists.txt | 2 +- src/osgEarthDrivers/agglite/AGGLiteOptions | 2 +- .../agglite/AGGLiteRasterizerTileSource.cpp | 6 +- src/osgEarthDrivers/arcgis/ArcGISOptions | 2 +- src/osgEarthDrivers/arcgis/Extent.h | 2 +- src/osgEarthDrivers/arcgis/MapService.cpp | 9 +- src/osgEarthDrivers/arcgis/MapService.h | 2 +- src/osgEarthDrivers/arcgis/ReaderWriterArcGIS.cpp | 11 +- .../ReaderWriterArcGISMapCache.cpp | 4 +- src/osgEarthDrivers/bing/BingOptions | 6 +- src/osgEarthDrivers/bing/BingTileSource.cpp | 36 +- .../bumpmap/BumpMap.frag.common.glsl | 26 + .../bumpmap/BumpMap.frag.progressive.glsl | 60 + .../bumpmap/BumpMap.frag.simple.glsl | 29 + src/osgEarthDrivers/bumpmap/BumpMap.vert.view.glsl | 52 + src/osgEarthDrivers/bumpmap/BumpMapExtension | 75 + src/osgEarthDrivers/bumpmap/BumpMapExtension.cpp | 106 + src/osgEarthDrivers/bumpmap/BumpMapOptions | 118 + src/osgEarthDrivers/bumpmap/BumpMapPlugin.cpp | 28 + src/osgEarthDrivers/bumpmap/BumpMapShaders | 39 + src/osgEarthDrivers/bumpmap/BumpMapShaders.cpp.in | 19 + src/osgEarthDrivers/bumpmap/BumpMapTerrainEffect | 86 + .../bumpmap/BumpMapTerrainEffect.cpp | 146 + src/osgEarthDrivers/bumpmap/CMakeLists.txt | 43 + .../cache_filesystem/FileSystemCache | 2 +- .../cache_filesystem/FileSystemCache.cpp | 182 +- src/osgEarthDrivers/cache_leveldb/LevelDBCache | 2 +- src/osgEarthDrivers/cache_leveldb/LevelDBCache.cpp | 11 +- src/osgEarthDrivers/cache_leveldb/LevelDBCacheBin | 58 +- .../cache_leveldb/LevelDBCacheBin.cpp | 66 +- .../cache_leveldb/LevelDBCacheDriver.cpp | 4 +- .../cache_leveldb/LevelDBCacheOptions | 2 +- src/osgEarthDrivers/cache_leveldb/Tracker | 2 +- src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt | 32 + src/osgEarthDrivers/cache_rocksdb/RocksDBCache | 77 + src/osgEarthDrivers/cache_rocksdb/RocksDBCache.cpp | 258 + src/osgEarthDrivers/cache_rocksdb/RocksDBCacheBin | 144 + .../cache_rocksdb/RocksDBCacheBin.cpp | 688 + .../cache_rocksdb/RocksDBCacheDriver.cpp | 57 + .../cache_rocksdb/RocksDBCacheOptions | 153 + src/osgEarthDrivers/cache_rocksdb/Tracker | 113 + src/osgEarthDrivers/colorramp/ColorRampOptions | 2 +- .../colorramp/ColorRampTileSource.cpp | 11 +- src/osgEarthDrivers/debug/DebugOptions | 2 +- src/osgEarthDrivers/debug/DebugTileSource.cpp | 4 +- src/osgEarthDrivers/detail/CMakeLists.txt | 42 + src/osgEarthDrivers/detail/Detail.frag.glsl | 15 + src/osgEarthDrivers/detail/Detail.vert.view.glsl | 20 + src/osgEarthDrivers/detail/DetailExtension | 73 + src/osgEarthDrivers/detail/DetailExtension.cpp | 79 + src/osgEarthDrivers/detail/DetailOptions | 101 + src/osgEarthDrivers/detail/DetailPlugin.cpp | 56 + src/osgEarthDrivers/detail/DetailShaders | 39 + src/osgEarthDrivers/detail/DetailShaders.cpp.in | 15 + src/osgEarthDrivers/detail/DetailTerrainEffect | 62 + src/osgEarthDrivers/detail/DetailTerrainEffect.cpp | 113 + src/osgEarthDrivers/earth/CMakeLists.txt | 4 +- src/osgEarthDrivers/earth/EarthFileSerializer | 43 +- src/osgEarthDrivers/earth/EarthFileSerializer1.cpp | 2 +- src/osgEarthDrivers/earth/EarthFileSerializer2.cpp | 514 +- src/osgEarthDrivers/earth/ReaderWriterOsgEarth.cpp | 92 +- .../engine_byo/BYOTerrainEngineDriver.cpp | 4 +- .../engine_byo/BYOTerrainEngineNode | 6 +- .../engine_byo/BYOTerrainEngineNode.cpp | 10 +- .../engine_byo/BYOTerrainEngineOptions | 2 +- src/osgEarthDrivers/engine_byo/Common | 2 +- src/osgEarthDrivers/engine_mp/CMakeLists.txt | 6 +- src/osgEarthDrivers/engine_mp/Common | 2 +- .../engine_mp/DynamicLODScaleCallback | 2 +- src/osgEarthDrivers/engine_mp/FileLocationCallback | 2 +- src/osgEarthDrivers/engine_mp/GeometryPool | 92 + src/osgEarthDrivers/engine_mp/GeometryPool.cpp | 254 + src/osgEarthDrivers/engine_mp/HeightFieldCache | 4 +- src/osgEarthDrivers/engine_mp/HeightFieldCache.cpp | 8 +- src/osgEarthDrivers/engine_mp/KeyNodeFactory | 2 +- src/osgEarthDrivers/engine_mp/KeyNodeFactory.cpp | 2 +- .../engine_mp/MPEngine.NormalMap.frag.glsl | 37 + .../engine_mp/MPEngine.NormalMap.vert.glsl | 23 + src/osgEarthDrivers/engine_mp/MPEngine.frag.glsl | 15 +- .../engine_mp/MPEngine.vert.model.glsl | 20 +- .../engine_mp/MPEngine.vert.pooled.glsl | 24 + .../engine_mp/MPEngine.vert.view.glsl | 10 +- src/osgEarthDrivers/engine_mp/MPGeometry | 18 +- src/osgEarthDrivers/engine_mp/MPGeometry.cpp | 133 +- src/osgEarthDrivers/engine_mp/MPShaders | 8 +- src/osgEarthDrivers/engine_mp/MPShaders.cpp.in | 20 +- .../engine_mp/MPTerrainEngineDriver.cpp | 6 +- src/osgEarthDrivers/engine_mp/MPTerrainEngineNode | 19 +- .../engine_mp/MPTerrainEngineNode.cpp | 457 +- .../engine_mp/MPTerrainEngineOptions | 24 +- src/osgEarthDrivers/engine_mp/MaskGenerator | 81 + src/osgEarthDrivers/engine_mp/MaskGenerator.cpp | 29 + .../engine_mp/QuickReleaseGLObjects | 94 - src/osgEarthDrivers/engine_mp/RenderBindings | 70 + src/osgEarthDrivers/engine_mp/SingleKeyNodeFactory | 15 +- .../engine_mp/SingleKeyNodeFactory.cpp | 118 +- src/osgEarthDrivers/engine_mp/SurfaceNode | 53 + src/osgEarthDrivers/engine_mp/SurfaceNode.cpp | 0 src/osgEarthDrivers/engine_mp/SurfaceNodeFactory | 130 + .../engine_mp/SurfaceNodeFactory.cpp | 344 + src/osgEarthDrivers/engine_mp/TerrainNode | 17 +- src/osgEarthDrivers/engine_mp/TerrainNode.cpp | 62 +- src/osgEarthDrivers/engine_mp/TileDrawable | 156 + src/osgEarthDrivers/engine_mp/TileDrawable.cpp | 534 + src/osgEarthDrivers/engine_mp/TileGroup | 7 +- src/osgEarthDrivers/engine_mp/TileGroup.cpp | 18 +- src/osgEarthDrivers/engine_mp/TileGroupFactory | 100 + src/osgEarthDrivers/engine_mp/TileGroupFactory.cpp | 383 + src/osgEarthDrivers/engine_mp/TileModel | 16 +- src/osgEarthDrivers/engine_mp/TileModel.cpp | 55 +- src/osgEarthDrivers/engine_mp/TileModelCompiler | 2 +- .../engine_mp/TileModelCompiler.cpp | 116 +- src/osgEarthDrivers/engine_mp/TileModelFactory | 5 +- src/osgEarthDrivers/engine_mp/TileModelFactory.cpp | 9 +- src/osgEarthDrivers/engine_mp/TileNode | 13 +- src/osgEarthDrivers/engine_mp/TileNode.cpp | 37 +- src/osgEarthDrivers/engine_mp/TileNodeRegistry | 34 +- src/osgEarthDrivers/engine_mp/TileNodeRegistry.cpp | 125 +- src/osgEarthDrivers/engine_mp/TilePagedLOD | 10 +- src/osgEarthDrivers/engine_mp/TilePagedLOD.cpp | 87 +- src/osgEarthDrivers/engine_rex/CMakeLists.txt | 69 + src/osgEarthDrivers/engine_rex/Common | 24 + .../engine_rex/ElevationTextureUtils | 73 + .../engine_rex/ElevationTextureUtils.cpp | 119 + src/osgEarthDrivers/engine_rex/EngineContext | 135 + src/osgEarthDrivers/engine_rex/EngineContext.cpp | 232 + src/osgEarthDrivers/engine_rex/GeometryPool | 138 + src/osgEarthDrivers/engine_rex/GeometryPool.cpp | 421 + src/osgEarthDrivers/engine_rex/LoadTileData | 51 + src/osgEarthDrivers/engine_rex/LoadTileData.cpp | 268 + src/osgEarthDrivers/engine_rex/Loader | 227 + src/osgEarthDrivers/engine_rex/Loader.cpp | 483 + src/osgEarthDrivers/engine_rex/MPTexture | 106 + src/osgEarthDrivers/engine_rex/MPTexture.cpp | 171 + src/osgEarthDrivers/engine_rex/MaskGenerator | 102 + src/osgEarthDrivers/engine_rex/MaskGenerator.cpp | 532 + src/osgEarthDrivers/engine_rex/ProxyGeometry | 75 + src/osgEarthDrivers/engine_rex/ProxyGeometry.cpp | 234 + src/osgEarthDrivers/engine_rex/ProxySurfaceNode | 58 + .../engine_rex/ProxySurfaceNode.cpp | 55 + src/osgEarthDrivers/engine_rex/RenderBindings | 97 + .../engine_rex/RexEngine.Morphing.vert.glsl | 87 + .../engine_rex/RexEngine.NormalMap.frag.glsl | 37 + .../engine_rex/RexEngine.NormalMap.vert.glsl | 22 + .../engine_rex/RexEngine.SDK.vert.glsl | 79 + src/osgEarthDrivers/engine_rex/RexEngine.frag.glsl | 84 + src/osgEarthDrivers/engine_rex/RexEngine.gs.glsl | 43 + src/osgEarthDrivers/engine_rex/RexEngine.tcs.glsl | 3 + src/osgEarthDrivers/engine_rex/RexEngine.tes.glsl | 10 + src/osgEarthDrivers/engine_rex/RexEngine.vert.glsl | 35 + .../engine_rex/RexEngine.vert.view.glsl | 65 + .../engine_rex/RexTerrainEngineDriver.cpp | 72 + .../engine_rex/RexTerrainEngineNode | 192 + .../engine_rex/RexTerrainEngineNode.cpp | 1070 + .../engine_rex/RexTerrainEngineOptions | 163 + src/osgEarthDrivers/engine_rex/SelectionInfo | 77 + src/osgEarthDrivers/engine_rex/SelectionInfo.cpp | 120 + src/osgEarthDrivers/engine_rex/Shaders | 39 + src/osgEarthDrivers/engine_rex/Shaders.cpp.in | 32 + src/osgEarthDrivers/engine_rex/SurfaceNode | 124 + src/osgEarthDrivers/engine_rex/SurfaceNode.cpp | 418 + src/osgEarthDrivers/engine_rex/TileDrawable | 166 + src/osgEarthDrivers/engine_rex/TileDrawable.cpp | 689 + src/osgEarthDrivers/engine_rex/TileNode | 175 + src/osgEarthDrivers/engine_rex/TileNode.cpp | 744 + src/osgEarthDrivers/engine_rex/TileNodeRegistry | 239 + .../engine_rex/TileNodeRegistry.cpp | 278 + src/osgEarthDrivers/engine_rex/Unloader | 73 + src/osgEarthDrivers/engine_rex/Unloader.cpp | 124 + src/osgEarthDrivers/fastdxt/CMakeLists.txt | 6 +- .../feature_elevation/FeatureElevationOptions | 12 +- .../ReaderWriterFeatureElevation.cpp | 249 +- .../feature_mapnikvectortiles/CMakeLists.txt | 25 + .../feature_mapnikvectortiles/FeatureSourceMVT.cpp | 315 + .../feature_mapnikvectortiles/MVTFeatureOptions | 76 + src/osgEarthDrivers/feature_ogr/FeatureCursorOGR | 3 +- .../feature_ogr/FeatureCursorOGR.cpp | 144 +- .../feature_ogr/FeatureSourceOGR.cpp | 266 +- src/osgEarthDrivers/feature_ogr/OGRFeatureOptions | 2 +- .../feature_raster/FeatureSourceRaster.cpp | 50 +- .../feature_tfs/FeatureSourceTFS.cpp | 222 +- src/osgEarthDrivers/feature_tfs/TFSFeatureOptions | 22 +- .../feature_wfs/FeatureSourceWFS.cpp | 174 +- src/osgEarthDrivers/feature_wfs/WFSFeatureOptions | 2 +- .../featurefilter_intersect/CMakeLists.txt | 15 + .../IntersectFeatureFilter.cpp | 196 + .../IntersectFeatureFilterOptions | 78 + .../featurefilter_join/CMakeLists.txt | 15 + .../featurefilter_join/JoinFeatureFilter.cpp | 160 + .../featurefilter_join/JoinFeatureFilterOptions | 67 + src/osgEarthDrivers/gdal/GDALOptions | 2 +- src/osgEarthDrivers/gdal/ReaderWriterGDAL.cpp | 179 +- src/osgEarthDrivers/kml/CMakeLists.txt | 10 +- src/osgEarthDrivers/kml/KML | 24 +- src/osgEarthDrivers/kml/KMLOptions | 2 +- src/osgEarthDrivers/kml/KMLReader | 2 +- src/osgEarthDrivers/kml/KMLReader.cpp | 12 +- src/osgEarthDrivers/kml/KML_Common | 17 +- src/osgEarthDrivers/kml/KML_Container | 2 +- src/osgEarthDrivers/kml/KML_Document | 2 +- src/osgEarthDrivers/kml/KML_Document.cpp | 2 +- src/osgEarthDrivers/kml/KML_Feature | 2 +- src/osgEarthDrivers/kml/KML_Feature.cpp | 27 +- src/osgEarthDrivers/kml/KML_Folder | 2 +- src/osgEarthDrivers/kml/KML_Folder.cpp | 2 +- src/osgEarthDrivers/kml/KML_Geometry | 2 +- src/osgEarthDrivers/kml/KML_Geometry.cpp | 14 +- src/osgEarthDrivers/kml/KML_GroundOverlay | 2 +- src/osgEarthDrivers/kml/KML_GroundOverlay.cpp | 2 +- src/osgEarthDrivers/kml/KML_IconStyle | 2 +- src/osgEarthDrivers/kml/KML_IconStyle.cpp | 14 +- src/osgEarthDrivers/kml/KML_LabelStyle | 2 +- src/osgEarthDrivers/kml/KML_LabelStyle.cpp | 2 +- src/osgEarthDrivers/kml/KML_LineString | 2 +- src/osgEarthDrivers/kml/KML_LineString.cpp | 2 +- src/osgEarthDrivers/kml/KML_LineStyle | 2 +- src/osgEarthDrivers/kml/KML_LineStyle.cpp | 7 +- src/osgEarthDrivers/kml/KML_LinearRing | 2 +- src/osgEarthDrivers/kml/KML_LinearRing.cpp | 2 +- src/osgEarthDrivers/kml/KML_Model | 2 +- src/osgEarthDrivers/kml/KML_Model.cpp | 2 +- src/osgEarthDrivers/kml/KML_MultiGeometry | 2 +- src/osgEarthDrivers/kml/KML_MultiGeometry.cpp | 2 +- src/osgEarthDrivers/kml/KML_NetworkLink.cpp | 7 +- src/osgEarthDrivers/kml/KML_NetworkLinkControl | 2 +- src/osgEarthDrivers/kml/KML_NetworkLinkControl.cpp | 2 +- src/osgEarthDrivers/kml/KML_Object | 2 +- src/osgEarthDrivers/kml/KML_Object.cpp | 2 +- src/osgEarthDrivers/kml/KML_Overlay | 2 +- src/osgEarthDrivers/kml/KML_Overlay.cpp | 2 +- src/osgEarthDrivers/kml/KML_PhotoOverlay | 2 +- src/osgEarthDrivers/kml/KML_PhotoOverlay.cpp | 2 +- src/osgEarthDrivers/kml/KML_Placemark.cpp | 78 +- src/osgEarthDrivers/kml/KML_Point | 2 +- src/osgEarthDrivers/kml/KML_Point.cpp | 2 +- src/osgEarthDrivers/kml/KML_PolyStyle | 2 +- src/osgEarthDrivers/kml/KML_PolyStyle.cpp | 2 +- src/osgEarthDrivers/kml/KML_Polygon | 2 +- src/osgEarthDrivers/kml/KML_Polygon.cpp | 6 +- src/osgEarthDrivers/kml/KML_Root | 2 +- src/osgEarthDrivers/kml/KML_Root.cpp | 2 +- src/osgEarthDrivers/kml/KML_Schema | 2 +- src/osgEarthDrivers/kml/KML_Schema.cpp | 2 +- src/osgEarthDrivers/kml/KML_ScreenOverlay | 2 +- src/osgEarthDrivers/kml/KML_ScreenOverlay.cpp | 2 +- src/osgEarthDrivers/kml/KML_Style | 2 +- src/osgEarthDrivers/kml/KML_Style.cpp | 2 +- src/osgEarthDrivers/kml/KML_StyleMap | 2 +- src/osgEarthDrivers/kml/KML_StyleMap.cpp | 2 +- src/osgEarthDrivers/kml/KML_StyleSelector | 2 +- src/osgEarthDrivers/kml/KMZArchive | 20 +- src/osgEarthDrivers/kml/KMZArchive.cpp | 238 +- src/osgEarthDrivers/kml/ReaderWriterKML.cpp | 37 +- src/osgEarthDrivers/kml/rapidxml_ext.hpp | 15 +- .../label_annotation/AnnotationLabelSource.cpp | 37 +- src/osgEarthDrivers/mapinspector/CMakeLists.txt | 26 + .../mapinspector/MapInspectorExtension | 84 + .../mapinspector/MapInspectorExtension.cpp | 116 + src/osgEarthDrivers/mapinspector/MapInspectorUI | 49 + .../mapinspector/MapInspectorUI.cpp | 162 + .../mask_feature/FeatureMaskOptions | 2 +- .../mask_feature/FeatureMaskSource.cpp | 40 +- src/osgEarthDrivers/mbtiles/MBTilesPlugin.cpp | 2 +- src/osgEarthDrivers/mbtiles/MBTilesTileSource.cpp | 99 +- .../model_feature_geom/FeatureGeomModelOptions | 2 +- .../model_feature_geom/FeatureGeomModelSource.cpp | 13 +- .../FeatureStencilModelSource.cpp | 380 - .../model_simple/SimpleModelOptions | 2 +- .../model_simple/SimpleModelSource.cpp | 11 +- src/osgEarthDrivers/monitor/CMakeLists.txt | 28 + src/osgEarthDrivers/monitor/MonitorExtension | 82 + src/osgEarthDrivers/monitor/MonitorExtension.cpp | 127 + src/osgEarthDrivers/monitor/MonitorPlugin.cpp | 55 + src/osgEarthDrivers/monitor/MonitorUI | 46 + src/osgEarthDrivers/monitor/MonitorUI.cpp | 69 + 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 + src/osgEarthDrivers/ocean_simple/CMakeLists.txt | 31 +- .../ocean_simple/ElevationProxyImageLayer | 6 +- .../ocean_simple/ElevationProxyImageLayer.cpp | 8 +- src/osgEarthDrivers/ocean_simple/Shaders.cpp.in | 14 + .../ocean_simple/SimpleOcean.FS.glsl | 114 + .../ocean_simple/SimpleOcean.VS.glsl | 102 + .../ocean_simple/SimpleOceanDriver.cpp | 146 +- src/osgEarthDrivers/ocean_simple/SimpleOceanNode | 16 +- .../ocean_simple/SimpleOceanNode.cpp | 117 +- .../ocean_simple/SimpleOceanOptions | 17 +- .../ocean_simple/SimpleOceanShaders | 297 +- src/osgEarthDrivers/ocean_triton/CMakeLists.txt | 15 +- src/osgEarthDrivers/ocean_triton/TritonContext | 85 - src/osgEarthDrivers/ocean_triton/TritonContext.cpp | 141 - src/osgEarthDrivers/ocean_triton/TritonDrawable | 85 - .../ocean_triton/TritonDrawable.cpp | 558 - src/osgEarthDrivers/ocean_triton/TritonDriver.cpp | 90 +- src/osgEarthDrivers/ocean_triton/TritonNode | 61 - src/osgEarthDrivers/ocean_triton/TritonNode.cpp | 84 - src/osgEarthDrivers/ocean_triton/TritonOptions | 83 - src/osgEarthDrivers/osg/OSGOptions | 2 +- src/osgEarthDrivers/osg/OSGTileSource.cpp | 8 +- src/osgEarthDrivers/quadkey/QuadKeyOptions | 2 +- .../quadkey/ReaderWriterQuadKey.cpp | 8 +- .../refresh/ReaderWriterRefresh.cpp | 4 +- src/osgEarthDrivers/refresh/RefreshOptions | 2 +- .../script_engine_duktape/CMakeLists.txt | 1 + .../script_engine_duktape/DuktapeEngine | 5 +- .../script_engine_duktape/DuktapeEngine.cpp | 107 +- .../script_engine_duktape/JSGeometry | 4 +- .../script_engine_duktape/Plugin.cpp | 6 +- .../script_engine_duktape/duk_config.h | 3643 + .../script_engine_duktape/duktape.c | 71505 ++++++++++++------- .../script_engine_duktape/duktape.h | 3472 +- src/osgEarthDrivers/sky_gl/CMakeLists.txt | 1 + src/osgEarthDrivers/sky_gl/GLSkyDriver.cpp | 62 - src/osgEarthDrivers/sky_gl/GLSkyExtension.cpp | 153 + src/osgEarthDrivers/sky_gl/GLSkyNode | 6 +- src/osgEarthDrivers/sky_gl/GLSkyNode.cpp | 4 +- src/osgEarthDrivers/sky_gl/GLSkyOptions | 6 +- src/osgEarthDrivers/sky_gl/GLSkyShaders | 14 +- .../sky_silverlining/CMakeLists.txt | 13 +- .../sky_silverlining/SilverLiningCloudsDrawable | 64 - .../SilverLiningCloudsDrawable.cpp | 83 - .../sky_silverlining/SilverLiningContext | 108 - .../sky_silverlining/SilverLiningContext.cpp | 242 - .../sky_silverlining/SilverLiningDriver.cpp | 130 +- .../sky_silverlining/SilverLiningNode | 69 - .../sky_silverlining/SilverLiningNode.cpp | 176 - .../sky_silverlining/SilverLiningOptions | 101 - .../sky_silverlining/SilverLiningSkyDrawable | 56 - .../sky_silverlining/SilverLiningSkyDrawable.cpp | 110 - src/osgEarthDrivers/sky_simple/CMakeLists.txt | 2 +- .../sky_simple/SimpleSky.Atmosphere.frag.glsl | 6 +- .../sky_simple/SimpleSky.Atmosphere.vert.glsl | 6 +- .../sky_simple/SimpleSky.Ground.ONeil.frag.glsl | 18 +- .../sky_simple/SimpleSky.Ground.ONeil.vert.glsl | 10 +- .../sky_simple/SimpleSky.Stars.frag.glsl | 6 +- .../sky_simple/SimpleSky.Stars.vert.glsl | 6 +- src/osgEarthDrivers/sky_simple/SimpleSkyDriver.cpp | 63 - .../sky_simple/SimpleSkyExtension.cpp | 124 + src/osgEarthDrivers/sky_simple/SimpleSkyNode | 7 +- src/osgEarthDrivers/sky_simple/SimpleSkyNode.cpp | 22 +- src/osgEarthDrivers/sky_simple/SimpleSkyOptions | 8 +- src/osgEarthDrivers/sky_simple/SimpleSkyShaders | 6 +- .../sky_simple/SimpleSkyShaders.cpp.in | 26 +- src/osgEarthDrivers/skyview/CMakeLists.txt | 15 + src/osgEarthDrivers/skyview/SkyViewOptions | 71 + src/osgEarthDrivers/skyview/SkyViewTileSource.cpp | 130 + src/osgEarthDrivers/splat_mask/SplatMaskDriver.cpp | 6 +- src/osgEarthDrivers/splat_mask/SplatMaskOptions | 2 +- src/osgEarthDrivers/template/CMakeLists.txt | 11 + src/osgEarthDrivers/template/NLTemplate.cpp | 491 + src/osgEarthDrivers/template/NLTemplate.h | 179 + .../template/NL_Template_LICENSE.txt | 20 + .../template/ReaderWriterTemplate.cpp | 101 + .../template_matclass/TemplateMatClassDriver.cpp | 16 +- .../template_matclass/TemplateMatClassOptions | 2 +- src/osgEarthDrivers/terrainshader/CMakeLists.txt | 23 + .../terrainshader/TerrainShaderExtension | 70 + .../terrainshader/TerrainShaderExtension.cpp | 228 + .../terrainshader/TerrainShaderOptions | 177 + .../tilecache/ReaderWriterTileCache.cpp | 4 +- src/osgEarthDrivers/tilecache/TileCacheOptions | 2 +- .../tileindex/ReaderWriterTileIndex.cpp | 6 +- src/osgEarthDrivers/tileindex/TileIndexOptions | 2 +- .../tileservice/ReaderWriterTileService.cpp | 4 +- src/osgEarthDrivers/tileservice/TileServiceOptions | 2 +- src/osgEarthDrivers/tms/TMSOptions | 14 +- src/osgEarthDrivers/tms/TMSPlugin.cpp | 4 +- src/osgEarthDrivers/tms/TMSTileSource | 2 +- src/osgEarthDrivers/tms/TMSTileSource.cpp | 25 +- src/osgEarthDrivers/vdatum_egm2008/EGM2008.cpp | 4 +- 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 | 4 +- src/osgEarthDrivers/vdatum_egm96/EGM96Grid.h | 53253 +++++++------- src/osgEarthDrivers/viewpoints/CMakeLists.txt | 24 + src/osgEarthDrivers/viewpoints/ViewpointsExtension | 86 + .../viewpoints/ViewpointsExtension.cpp | 244 + .../viewpoints/ViewpointsPlugin.cpp | 55 + src/osgEarthDrivers/vpb/ReaderWriterVPB.cpp | 4 +- src/osgEarthDrivers/vpb/VPBOptions | 2 +- src/osgEarthDrivers/wcs/CMakeLists.txt | 4 +- src/osgEarthDrivers/wcs/ReaderWriterWCS.cpp | 4 +- src/osgEarthDrivers/wcs/WCS11Source.cpp | 4 +- src/osgEarthDrivers/wcs/WCS11Source.h | 2 +- src/osgEarthDrivers/wcs/WCSOptions | 2 +- src/osgEarthDrivers/wms/ReaderWriterWMS.cpp | 8 +- src/osgEarthDrivers/wms/TileService | 2 +- src/osgEarthDrivers/wms/TileService.cpp | 2 +- src/osgEarthDrivers/wms/WMSOptions | 2 +- src/osgEarthDrivers/xyz/ReaderWriterXYZ.cpp | 10 +- src/osgEarthDrivers/xyz/XYZOptions | 2 +- src/osgEarthDrivers/yahoo/ReaderWriterYahoo.cpp | 22 +- src/osgEarthDrivers/yahoo/YahooOptions | 2 +- src/osgEarthDriversDisabled/geobuf/CMakeLists.txt | 22 + .../geobuf/ReaderWriterGeobuf.cpp | 90 + src/osgEarthDriversDisabled/geobuf/geobuf.proto | 66 + .../model_feature_stencil/CMakeLists.txt | 0 .../FeatureStencilModelOptions | 0 .../FeatureStencilModelSource.cpp | 380 + .../model_feature_stencil/StencilUtils.cpp | 0 .../model_feature_stencil/StencilUtils.h | 0 .../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/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 | 149 +- src/osgEarthFeatures/BufferFilter | 2 +- src/osgEarthFeatures/BufferFilter.cpp | 2 +- src/osgEarthFeatures/BuildGeometryFilter | 11 +- src/osgEarthFeatures/BuildGeometryFilter.cpp | 487 +- src/osgEarthFeatures/BuildTextFilter | 2 +- src/osgEarthFeatures/BuildTextFilter.cpp | 2 +- src/osgEarthFeatures/BuildTextOperator | 54 - src/osgEarthFeatures/BuildTextOperator.cpp | 241 - src/osgEarthFeatures/CMakeLists.txt | 53 +- 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 | 2 +- src/osgEarthFeatures/ExtrudeGeometryFilter | 22 +- src/osgEarthFeatures/ExtrudeGeometryFilter.cpp | 37 +- src/osgEarthFeatures/Feature | 15 +- src/osgEarthFeatures/Feature.cpp | 89 +- src/osgEarthFeatures/FeatureCursor | 4 +- src/osgEarthFeatures/FeatureCursor.cpp | 17 +- src/osgEarthFeatures/FeatureDisplayLayout | 14 +- src/osgEarthFeatures/FeatureDisplayLayout.cpp | 7 +- src/osgEarthFeatures/FeatureDrawSet | 2 +- src/osgEarthFeatures/FeatureDrawSet.cpp | 2 +- src/osgEarthFeatures/FeatureIndex | 5 +- src/osgEarthFeatures/FeatureListSource | 5 +- src/osgEarthFeatures/FeatureListSource.cpp | 5 +- src/osgEarthFeatures/FeatureModelGraph | 76 +- src/osgEarthFeatures/FeatureModelGraph.cpp | 574 +- src/osgEarthFeatures/FeatureModelSource | 29 +- src/osgEarthFeatures/FeatureModelSource.cpp | 98 +- src/osgEarthFeatures/FeatureSource | 72 +- src/osgEarthFeatures/FeatureSource.cpp | 126 +- src/osgEarthFeatures/FeatureSourceIndexNode | 47 +- src/osgEarthFeatures/FeatureSourceIndexNode.cpp | 284 +- src/osgEarthFeatures/FeatureTileSource | 8 +- src/osgEarthFeatures/FeatureTileSource.cpp | 207 +- src/osgEarthFeatures/Filter | 32 +- src/osgEarthFeatures/Filter.cpp | 57 +- src/osgEarthFeatures/FilterContext | 2 +- src/osgEarthFeatures/FilterContext.cpp | 4 +- src/osgEarthFeatures/GeometryCompiler | 19 +- src/osgEarthFeatures/GeometryCompiler.cpp | 47 +- src/osgEarthFeatures/GeometryUtils | 2 +- src/osgEarthFeatures/GeometryUtils.cpp | 4 +- src/osgEarthFeatures/LabelSource | 2 +- src/osgEarthFeatures/LabelSource.cpp | 6 +- src/osgEarthFeatures/MVT | 40 + src/osgEarthFeatures/MVT.cpp | 246 + src/osgEarthFeatures/MarkerFactory | 71 - src/osgEarthFeatures/MarkerFactory.cpp | 208 - src/osgEarthFeatures/MeshClamper | 88 - src/osgEarthFeatures/MeshClamper.cpp | 207 - src/osgEarthFeatures/OgrUtils | 2 +- src/osgEarthFeatures/OgrUtils.cpp | 15 +- src/osgEarthFeatures/OptimizerHints | 2 +- src/osgEarthFeatures/OptimizerHints.cpp | 2 +- src/osgEarthFeatures/PolygonizeLines | 4 +- src/osgEarthFeatures/PolygonizeLines.cpp | 8 +- src/osgEarthFeatures/ResampleFilter | 89 +- src/osgEarthFeatures/ResampleFilter.cpp | 52 +- src/osgEarthFeatures/ScaleFilter | 2 +- src/osgEarthFeatures/ScaleFilter.cpp | 2 +- src/osgEarthFeatures/ScatterFilter | 3 +- src/osgEarthFeatures/ScatterFilter.cpp | 14 +- src/osgEarthFeatures/Script | 8 +- src/osgEarthFeatures/ScriptEngine | 13 +- src/osgEarthFeatures/ScriptEngine.cpp | 19 +- src/osgEarthFeatures/ScriptFilter | 105 + src/osgEarthFeatures/ScriptFilter.cpp | 104 + src/osgEarthFeatures/Session | 2 +- src/osgEarthFeatures/Session.cpp | 14 +- src/osgEarthFeatures/SubstituteModelFilter | 2 +- src/osgEarthFeatures/SubstituteModelFilter.cpp | 106 +- src/osgEarthFeatures/TessellateOperator | 2 +- src/osgEarthFeatures/TessellateOperator.cpp | 2 +- src/osgEarthFeatures/TextSymbolizer | 2 +- src/osgEarthFeatures/TextSymbolizer.cpp | 2 +- src/osgEarthFeatures/TransformFilter | 2 +- src/osgEarthFeatures/TransformFilter.cpp | 2 +- src/osgEarthFeatures/VirtualFeatureSource | 11 +- src/osgEarthFeatures/VirtualFeatureSource.cpp | 18 +- src/osgEarthFeatures/vector_tile.proto | 92 + 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/Actions | 2 +- src/osgEarthQt/AnnotationListWidget.cpp | 12 +- src/osgEarthQt/CMakeLists.txt | 213 +- src/osgEarthQt/CollapsiblePairWidget | 2 +- src/osgEarthQt/CollapsiblePairWidget.cpp | 2 +- src/osgEarthQt/Common | 2 +- src/osgEarthQt/DataManager | 2 +- src/osgEarthQt/DataManager.cpp | 12 +- src/osgEarthQt/GuiActions | 2 +- src/osgEarthQt/LOSControlWidget | 2 +- src/osgEarthQt/LOSControlWidget.cpp | 2 +- src/osgEarthQt/LOSCreationDialog | 2 +- src/osgEarthQt/LOSCreationDialog.cpp | 12 +- src/osgEarthQt/LayerManagerWidget | 2 +- src/osgEarthQt/LayerManagerWidget.cpp | 4 +- src/osgEarthQt/MapCatalogWidget | 2 +- src/osgEarthQt/MapCatalogWidget.cpp | 42 +- src/osgEarthQt/TerrainProfileGraph | 2 +- src/osgEarthQt/TerrainProfileGraph.cpp | 2 +- src/osgEarthQt/TerrainProfileWidget | 2 +- src/osgEarthQt/TerrainProfileWidget.cpp | 2 +- src/osgEarthQt/ViewWidget | 2 +- src/osgEarthQt/ViewWidget.cpp | 2 +- src/osgEarthQt/ViewerWidget | 2 +- src/osgEarthQt/ViewerWidget.cpp | 4 +- src/osgEarthSilverLining/CMakeLists.txt | 71 + src/osgEarthSilverLining/Common | 32 + src/osgEarthSilverLining/Export | 74 + src/osgEarthSilverLining/SilverLiningAPIWrapper | 202 + .../SilverLiningAPIWrapper.cpp | 128 + src/osgEarthSilverLining/SilverLiningCallback | 48 + .../SilverLiningCloudsDrawable | 66 + .../SilverLiningCloudsDrawable.cpp | 103 + src/osgEarthSilverLining/SilverLiningContext | 123 + src/osgEarthSilverLining/SilverLiningContext.cpp | 295 + src/osgEarthSilverLining/SilverLiningContextNode | 80 + .../SilverLiningContextNode.cpp | 158 + src/osgEarthSilverLining/SilverLiningNode | 91 + src/osgEarthSilverLining/SilverLiningNode.cpp | 199 + src/osgEarthSilverLining/SilverLiningOptions | 102 + src/osgEarthSilverLining/SilverLiningSkyDrawable | 57 + .../SilverLiningSkyDrawable.cpp | 139 + src/osgEarthSplat/BiomeRegion | 84 + src/osgEarthSplat/BiomeRegion.cpp | 76 + src/osgEarthSplat/BiomeRegionSelector | 56 + src/osgEarthSplat/BiomeRegionSelector.cpp | 143 + src/osgEarthSplat/CMakeLists.txt | 99 + src/osgEarthSplat/Coverage | 118 + src/osgEarthSplat/Coverage.cpp | 103 + src/osgEarthSplat/Export | 63 + src/osgEarthSplat/LandCover | 445 + src/osgEarthSplat/LandCover.FS.glsl | 49 + src/osgEarthSplat/LandCover.GS.glsl | 334 + src/osgEarthSplat/LandCover.TCS.glsl | 55 + src/osgEarthSplat/LandCover.TES.glsl | 50 + 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 | 184 + src/osgEarthSplat/LandUseTileSource.cpp | 282 + .../splat => osgEarthSplat}/ModelSplatter | 0 .../splat => osgEarthSplat}/ModelSplatter.cpp | 0 src/osgEarthSplat/NoiseTextureFactory | 39 + src/osgEarthSplat/NoiseTextureFactory.cpp | 119 + src/osgEarthSplat/Splat.Noise.glsl | 158 + src/osgEarthSplat/Splat.frag.common.glsl | 35 + src/osgEarthSplat/Splat.frag.glsl | 292 + src/osgEarthSplat/Splat.types.glsl | 22 + src/osgEarthSplat/Splat.util.glsl | 65 + src/osgEarthSplat/Splat.vert.model.glsl | 16 + src/osgEarthSplat/Splat.vert.view.glsl | 31 + src/osgEarthSplat/SplatCatalog | 172 + src/osgEarthSplat/SplatCatalog.cpp | 390 + src/osgEarthSplat/SplatCoverageLegend | 112 + src/osgEarthSplat/SplatCoverageLegend.cpp | 93 + src/osgEarthSplat/SplatExtension | 90 + src/osgEarthSplat/SplatExtension.cpp | 177 + src/osgEarthSplat/SplatOptions | 94 + src/osgEarthSplat/SplatShaders | 57 + src/osgEarthSplat/SplatShaders.cpp.in | 47 + src/osgEarthSplat/SplatTerrainEffect | 111 + src/osgEarthSplat/SplatTerrainEffect.cpp | 232 + src/osgEarthSplat/Surface | 115 + src/osgEarthSplat/Surface.cpp | 227 + src/osgEarthSplat/Zone | 155 + src/osgEarthSplat/Zone.cpp | 196 + src/osgEarthSymbology/AltitudeSymbol | 2 +- src/osgEarthSymbology/AltitudeSymbol.cpp | 32 +- src/osgEarthSymbology/BBoxSymbol | 80 + src/osgEarthSymbology/BBoxSymbol.cpp | 94 + src/osgEarthSymbology/BillboardResource | 70 + src/osgEarthSymbology/BillboardResource.cpp | 57 + src/osgEarthSymbology/BillboardSymbol | 82 + src/osgEarthSymbology/BillboardSymbol.cpp | 81 + src/osgEarthSymbology/CMakeLists.txt | 6 + src/osgEarthSymbology/Color | 2 +- src/osgEarthSymbology/Color.cpp | 2 +- src/osgEarthSymbology/Common | 2 +- src/osgEarthSymbology/CoverageSymbol | 2 +- src/osgEarthSymbology/CoverageSymbol.cpp | 2 +- src/osgEarthSymbology/CssUtils | 2 +- src/osgEarthSymbology/CssUtils.cpp | 2 +- src/osgEarthSymbology/Expression | 11 +- src/osgEarthSymbology/Expression.cpp | 25 +- src/osgEarthSymbology/ExtrusionSymbol | 2 +- src/osgEarthSymbology/ExtrusionSymbol.cpp | 2 +- src/osgEarthSymbology/Fill | 2 +- src/osgEarthSymbology/Fill.cpp | 2 +- src/osgEarthSymbology/GEOS | 2 +- src/osgEarthSymbology/GEOS.cpp | 26 +- src/osgEarthSymbology/Geometry | 30 +- src/osgEarthSymbology/Geometry.cpp | 114 +- .../GeometryExtrudeSymbolizer.cpp | 298 - src/osgEarthSymbology/GeometryFactory | 2 +- src/osgEarthSymbology/GeometryFactory.cpp | 2 +- src/osgEarthSymbology/GeometryRasterizer | 2 +- src/osgEarthSymbology/GeometryRasterizer.cpp | 2 +- src/osgEarthSymbology/IconResource | 2 +- src/osgEarthSymbology/IconResource.cpp | 7 +- src/osgEarthSymbology/IconSymbol | 2 +- src/osgEarthSymbology/IconSymbol.cpp | 6 +- src/osgEarthSymbology/InstanceResource | 4 +- src/osgEarthSymbology/InstanceResource.cpp | 2 +- src/osgEarthSymbology/InstanceSymbol | 5 +- src/osgEarthSymbology/InstanceSymbol.cpp | 14 +- src/osgEarthSymbology/LineSymbol | 2 +- src/osgEarthSymbology/LineSymbol.cpp | 2 +- src/osgEarthSymbology/MarkerResource | 2 +- src/osgEarthSymbology/MarkerResource.cpp | 2 +- src/osgEarthSymbology/MarkerSymbol | 2 +- src/osgEarthSymbology/MarkerSymbol.cpp | 4 +- src/osgEarthSymbology/MeshConsolidator | 2 +- src/osgEarthSymbology/MeshConsolidator.cpp | 4 +- src/osgEarthSymbology/MeshFlattener | 8 +- src/osgEarthSymbology/MeshFlattener.cpp | 64 +- src/osgEarthSymbology/MeshSubdivider | 2 +- src/osgEarthSymbology/MeshSubdivider.cpp | 31 +- src/osgEarthSymbology/ModelResource | 23 +- src/osgEarthSymbology/ModelResource.cpp | 75 +- src/osgEarthSymbology/ModelSymbol | 43 +- src/osgEarthSymbology/ModelSymbol.cpp | 66 +- src/osgEarthSymbology/PointSymbol | 2 +- src/osgEarthSymbology/PointSymbol.cpp | 2 +- src/osgEarthSymbology/PolygonSymbol | 2 +- src/osgEarthSymbology/PolygonSymbol.cpp | 2 +- src/osgEarthSymbology/Query | 6 +- src/osgEarthSymbology/Query.cpp | 12 +- src/osgEarthSymbology/RenderSymbol | 7 +- src/osgEarthSymbology/RenderSymbol.cpp | 13 +- src/osgEarthSymbology/Resource | 5 +- src/osgEarthSymbology/Resource.cpp | 2 +- src/osgEarthSymbology/ResourceCache | 17 +- src/osgEarthSymbology/ResourceCache.cpp | 23 +- src/osgEarthSymbology/ResourceLibrary | 18 +- src/osgEarthSymbology/ResourceLibrary.cpp | 68 +- src/osgEarthSymbology/Skins | 57 +- src/osgEarthSymbology/Skins.cpp | 147 +- src/osgEarthSymbology/StencilVolumeNode | 2 +- src/osgEarthSymbology/StencilVolumeNode.cpp | 4 +- src/osgEarthSymbology/Stroke | 2 +- src/osgEarthSymbology/Stroke.cpp | 2 +- src/osgEarthSymbology/Style | 2 +- src/osgEarthSymbology/Style.cpp | 2 +- src/osgEarthSymbology/StyleSelector | 2 +- src/osgEarthSymbology/StyleSelector.cpp | 2 +- src/osgEarthSymbology/StyleSheet | 6 +- src/osgEarthSymbology/StyleSheet.cpp | 20 +- src/osgEarthSymbology/Symbol | 4 +- src/osgEarthSymbology/Symbol.cpp | 2 +- src/osgEarthSymbology/Tags | 9 +- src/osgEarthSymbology/TextSymbol | 31 +- src/osgEarthSymbology/TextSymbol.cpp | 160 +- src/osgEarthTriton/CMakeLists.txt | 69 + src/osgEarthTriton/Common | 32 + src/osgEarthTriton/Export | 74 + src/osgEarthTriton/Shaders/user-functions.glsl | 81 + src/osgEarthTriton/TritonAPIWrapper | 102 + src/osgEarthTriton/TritonAPIWrapper.cpp | 85 + src/osgEarthTriton/TritonCallback | 40 + src/osgEarthTriton/TritonContext | 99 + src/osgEarthTriton/TritonContext.cpp | 185 + src/osgEarthTriton/TritonDrawable | 95 + src/osgEarthTriton/TritonDrawable.cpp | 718 + src/osgEarthTriton/TritonNode | 70 + src/osgEarthTriton/TritonNode.cpp | 100 + src/osgEarthTriton/TritonOptions | 109 + src/osgEarthUtil/ActivityMonitorTool | 2 +- src/osgEarthUtil/ActivityMonitorTool.cpp | 2 +- src/osgEarthUtil/AnnotationEvents | 4 +- src/osgEarthUtil/AnnotationEvents.cpp | 2 +- src/osgEarthUtil/ArcGIS | 2 +- src/osgEarthUtil/ArcGIS.cpp | 2 +- src/osgEarthUtil/AtlasBuilder | 2 +- src/osgEarthUtil/AtlasBuilder.cpp | 13 +- src/osgEarthUtil/AutoClipPlaneHandler | 2 +- src/osgEarthUtil/AutoClipPlaneHandler.cpp | 4 +- src/osgEarthUtil/BrightnessContrastColorFilter | 2 +- src/osgEarthUtil/BrightnessContrastColorFilter.cpp | 2 +- src/osgEarthUtil/CMYKColorFilter | 2 +- src/osgEarthUtil/CMYKColorFilter.cpp | 2 +- src/osgEarthUtil/CMakeLists.txt | 6 +- src/osgEarthUtil/ChromaKeyColorFilter | 2 +- src/osgEarthUtil/ChromaKeyColorFilter.cpp | 2 +- src/osgEarthUtil/ClampCallback | 2 +- src/osgEarthUtil/ClampCallback.cpp | 18 +- src/osgEarthUtil/Common | 2 +- src/osgEarthUtil/ContourMap | 76 +- src/osgEarthUtil/ContourMap.cpp | 116 +- src/osgEarthUtil/ContourMap.frag.glsl | 17 +- src/osgEarthUtil/ContourMap.vert.glsl | 14 +- src/osgEarthUtil/Controls | 41 +- src/osgEarthUtil/Controls.cpp | 64 +- src/osgEarthUtil/DataScanner | 2 +- src/osgEarthUtil/DataScanner.cpp | 2 +- src/osgEarthUtil/EarthManipulator | 136 +- src/osgEarthUtil/EarthManipulator.cpp | 457 +- src/osgEarthUtil/Ephemeris | 2 +- src/osgEarthUtil/Ephemeris.cpp | 189 +- src/osgEarthUtil/ExampleResources | 19 +- src/osgEarthUtil/ExampleResources.cpp | 526 +- src/osgEarthUtil/Export | 2 +- src/osgEarthUtil/FeatureQueryTool | 2 +- src/osgEarthUtil/FeatureQueryTool.cpp | 2 +- src/osgEarthUtil/Fog | 12 + src/osgEarthUtil/Fog.cpp | 25 + src/osgEarthUtil/Fog.frag.glsl | 10 +- src/osgEarthUtil/Fog.vert.glsl | 29 +- src/osgEarthUtil/Formatter | 2 +- src/osgEarthUtil/GLSLColorFilter | 2 +- src/osgEarthUtil/GLSLColorFilter.cpp | 2 +- src/osgEarthUtil/GammaColorFilter | 2 +- src/osgEarthUtil/GammaColorFilter.cpp | 2 +- src/osgEarthUtil/GeodeticGraticule | 2 +- src/osgEarthUtil/GeodeticGraticule.cpp | 26 +- src/osgEarthUtil/Graticule.frag.glsl | 17 +- src/osgEarthUtil/Graticule.vert.glsl | 13 +- src/osgEarthUtil/GraticuleExtension | 9 +- src/osgEarthUtil/GraticuleExtension.cpp | 38 +- src/osgEarthUtil/GraticuleNode | 3 +- src/osgEarthUtil/GraticuleNode.cpp | 106 +- src/osgEarthUtil/GraticuleOptions | 4 +- src/osgEarthUtil/GraticuleTerrainEffect.cpp | 4 +- src/osgEarthUtil/HSLColorFilter | 2 +- src/osgEarthUtil/HSLColorFilter.cpp | 2 +- src/osgEarthUtil/HTM | 115 +- src/osgEarthUtil/HTM.cpp | 471 +- src/osgEarthUtil/LODBlending | 106 +- src/osgEarthUtil/LODBlending.cpp | 166 +- src/osgEarthUtil/LatLongFormatter | 2 +- src/osgEarthUtil/LatLongFormatter.cpp | 2 +- src/osgEarthUtil/LineOfSight | 2 +- src/osgEarthUtil/LinearLineOfSight | 2 +- src/osgEarthUtil/LinearLineOfSight.cpp | 2 +- src/osgEarthUtil/LogDepthBuffer.VertOnly.vert.glsl | 6 +- src/osgEarthUtil/LogDepthBuffer.frag.glsl | 6 +- src/osgEarthUtil/LogDepthBuffer.vert.glsl | 6 +- src/osgEarthUtil/LogarithmicDepthBuffer | 2 +- src/osgEarthUtil/LogarithmicDepthBuffer.cpp | 2 +- src/osgEarthUtil/MGRSFormatter | 2 +- src/osgEarthUtil/MGRSFormatter.cpp | 2 +- src/osgEarthUtil/MGRSGraticule | 2 +- src/osgEarthUtil/MGRSGraticule.cpp | 12 +- src/osgEarthUtil/MeasureTool | 2 +- src/osgEarthUtil/MeasureTool.cpp | 17 +- src/osgEarthUtil/MouseCoordsTool | 2 +- src/osgEarthUtil/MouseCoordsTool.cpp | 19 +- src/osgEarthUtil/NightColorFilter | 2 +- src/osgEarthUtil/NightColorFilter.cpp | 2 +- src/osgEarthUtil/ObjectLocator | 2 +- src/osgEarthUtil/Ocean | 25 +- src/osgEarthUtil/Ocean.cpp | 60 +- src/osgEarthUtil/PolyhedralLineOfSight | 11 +- src/osgEarthUtil/PolyhedralLineOfSight.cpp | 17 +- src/osgEarthUtil/RGBColorFilter | 2 +- src/osgEarthUtil/RGBColorFilter.cpp | 2 +- src/osgEarthUtil/RTTPicker | 2 +- src/osgEarthUtil/RTTPicker.cpp | 57 +- src/osgEarthUtil/RadialLineOfSight | 2 +- src/osgEarthUtil/RadialLineOfSight.cpp | 13 +- src/osgEarthUtil/Shaders | 5 +- src/osgEarthUtil/Shaders.cpp.in | 23 +- src/osgEarthUtil/Shadowing | 20 +- src/osgEarthUtil/Shadowing.cpp | 162 +- src/osgEarthUtil/Shadowing.frag.glsl | 94 + src/osgEarthUtil/Shadowing.vert.glsl | 18 + src/osgEarthUtil/SimplePager | 145 + src/osgEarthUtil/SimplePager.cpp | 362 + src/osgEarthUtil/SimplexNoise | 4 +- src/osgEarthUtil/SimplexNoise.cpp | 11 +- src/osgEarthUtil/Sky | 21 +- src/osgEarthUtil/Sky.cpp | 52 +- src/osgEarthUtil/SpatialData | 2 +- src/osgEarthUtil/SpatialData.cpp | 20 +- src/osgEarthUtil/StarData | 2 +- src/osgEarthUtil/TFS | 2 +- src/osgEarthUtil/TFS.cpp | 2 +- src/osgEarthUtil/TFSPackager | 2 +- src/osgEarthUtil/TFSPackager.cpp | 2 +- src/osgEarthUtil/TMS | 11 +- src/osgEarthUtil/TMS.cpp | 51 +- src/osgEarthUtil/TMSBackFiller | 2 +- src/osgEarthUtil/TMSBackFiller.cpp | 8 +- src/osgEarthUtil/TMSPackager | 13 +- src/osgEarthUtil/TMSPackager.cpp | 72 +- src/osgEarthUtil/TerrainProfile | 2 +- src/osgEarthUtil/TerrainProfile.cpp | 2 +- src/osgEarthUtil/TileIndex | 2 +- src/osgEarthUtil/TileIndex.cpp | 16 +- src/osgEarthUtil/TileIndexBuilder | 2 +- src/osgEarthUtil/TileIndexBuilder.cpp | 2 +- src/osgEarthUtil/UTMGraticule | 2 +- src/osgEarthUtil/UTMGraticule.cpp | 2 +- src/osgEarthUtil/WFS | 2 +- src/osgEarthUtil/WFS.cpp | 8 +- src/osgEarthUtil/WMS | 2 +- src/osgEarthUtil/WMS.cpp | 2 +- tests/annotation.earth | 347 +- tests/annotation_flat.earth | 334 +- tests/arcgisonline.earth | 5 +- tests/billboard.earth | 39 - tests/boston-gpu.earth | 25 +- tests/boston.earth | 24 +- tests/boston_buildings.earth | 17 +- tests/boston_projected.earth | 16 +- tests/boston_viewpoints.xml | 4 + tests/bumpmap.earth | 27 + tests/clouds.earth | 39 + tests/colorramp.earth | 4 +- tests/contourmap.earth | 16 + tests/dc_viewpoints.xml | 2 + tests/detail_texture.earth | 20 + tests/errors.earth | 32 + tests/fade_elevation.earth | 59 + tests/feature_clip_plane.earth | 1 + tests/feature_country_boundaries.earth | 42 + tests/feature_custom_filters.earth | 4 +- tests/feature_draped_polygons.earth | 34 +- tests/feature_elevation.earth | 49 + tests/feature_extrude.earth | 27 +- tests/feature_labels.earth | 29 +- tests/feature_labels_script.earth | 2 +- tests/feature_model_scatter.earth | 47 +- tests/feature_offset_polygons.earth | 107 +- tests/feature_poles.earth | 64 + tests/feature_population_cylinders.earth | 2 +- tests/feature_raster.earth | 119 + tests/feature_rasterize.earth | 5 - tests/feature_rasterize_2.earth | 21 +- tests/feature_scripted_styling.earth | 4 +- tests/feature_scripted_styling_2.earth | 4 +- tests/feature_style_selector.earth | 12 +- tests/feature_tfs_scripting.earth | 5 +- tests/feature_wfs.earth | 20 +- tests/gdal_tiff.earth | 2 +- tests/geomshader.earth | 62 + tests/glsl.earth | 30 +- tests/graticule.earth | 43 +- tests/hires-inset.earth | 8 +- tests/intersect_filter.earth | 58 + tests/ldb.earth | 30 +- tests/mapquest_open_aerial.earth | 25 - tests/mapquest_osm.earth | 26 - tests/mapquest_with_srtm.earth | 30 - tests/mb_tiles.earth | 12 +- tests/mercator_to_plate_carre.earth | 10 +- tests/min_max_level.earth | 17 +- tests/min_max_range.earth | 21 +- tests/min_max_range_rex.earth | 23 + tests/multiple_heightfields.earth | 5 +- tests/night.earth | 4 +- tests/nodata.earth | 8 +- tests/noise.earth | 118 +- tests/normalmap.earth | 14 +- tests/ocean.earth | 46 +- tests/openstreetmap_buildings.earth | 93 + tests/openstreetmap_flat.earth | 7 +- tests/openstreetmap_full.earth | 242 + tests/osgearth_server/README.md | 4 + tests/osgearth_server/css/l.geosearch.css | 65 + tests/osgearth_server/images/Thumbs.db | Bin 0 -> 4608 bytes tests/osgearth_server/images/alert.png | Bin 0 -> 1094 bytes tests/osgearth_server/images/geosearch.png | Bin 0 -> 699 bytes tests/osgearth_server/images/layers-2x.png | Bin 0 -> 2898 bytes tests/osgearth_server/images/layers.png | Bin 0 -> 1502 bytes tests/osgearth_server/images/marker-icon-2x.png | Bin 0 -> 4033 bytes tests/osgearth_server/images/marker-icon.png | Bin 0 -> 1747 bytes tests/osgearth_server/images/marker-shadow.png | Bin 0 -> 797 bytes tests/osgearth_server/images/spinner.gif | Bin 0 -> 1397 bytes tests/osgearth_server/images/transparent.png | Bin 0 -> 951 bytes tests/osgearth_server/index.html | 20 + tests/osgearth_server/js/l.control.geosearch.js | 204 + .../js/l.geosearch.provider.nominatim.js | 70 + tests/osgearth_server/leaflet.css | 479 + tests/osgearth_server/leaflet.js | 9168 +++ tests/photosphere1.earth | 30 + tests/photosphere2.earth | 30 + tests/readymap-osm.earth | 4 +- tests/readymap-priority.earth | 35 + tests/readymap-rex.earth | 31 + tests/readymap.earth | 8 +- tests/readymap_elevation.xml | 3 + tests/readymap_imagery.xml | 3 + tests/readymap_include.earth | 12 + tests/readymap_pixel_size.earth | 31 + tests/readymap_template.earth | 23 + tests/silverlining.earth | 22 +- tests/simple_model.earth | 18 +- tests/skyview1.earth | 30 + tests/skyview2.earth | 30 + tests/splat-edit.bat | 4 +- tests/splat-gpunoise.bat | 2 +- tests/splat-ranges.earth | 55 + tests/splat-server.earth | 105 + tests/splat-test.earth | 57 - tests/splat-with-imagery.earth | 52 - tests/splat-with-vectors.earth | 109 + tests/splat.bat | 21 +- tests/splat.earth | 78 + tests/stamen_watercolor.earth | 4 +- tests/{dc_state_plane.earth => state_plane.earth} | 0 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 | 45 +- tests/triton_drop_shader.earth | 73 + tests/vertical_scale.earth | 29 - tests/viewpoints.xml | 65 + 1497 files changed, 159064 insertions(+), 84630 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osgearth.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
