[osgearth] branch master updated (496c849 -> 91af315)
Bas Couwenberg
sebastic at xs4all.nl
Thu Feb 20 23:27:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a change to branch master
in repository osgearth.
from 496c849 Update changelog timestamp.
new a723734 Repack orig tarball with XZ compression.
new bb4247a Update Files-Excluded for osgEarth 2.5.
adds 81ed7db Upstream version 2.3 RC
adds e372c10 Upstream release 2.3
adds 7968994 Upstream version 2.4 RC
adds d4e10ff Upstream version 2.4
new 1b16339 Imported Upstream version 2.5
new 5cdeb07 Merge branch 'upstream'
new 373b43f New upstream release.
new 39d69f0 Add build dependencies on libv8-dev and libnoise-dev.
new 886789c Refresh soversion.patch.
new d720e74 Enable KMZ support with libminizip from libkml.
new 1f95a31 Drop MPGeometry-OpenSceneGraph-3.1.8.patch, included in upstream.
new 8425cb3 Drop becuase-typo.patch, applied upstream.
new 8d59235 Refresh cmake-FindMiniZip.patch.
new 155ab8f Add manpage for osgearth_tileindex.
new abec5ed Add manpage for osgearth_terraineffects.
new bb1a852 Add manpage for osgearth_sharedlayer.
new f7434b4 Add manpage for osgearth_demo.
new 9f6781a Update symbols for amd64.
new 4d7a225 Update symbols for i386.
new 1cb3b43 Bump SOVERSION to 3.
new 91af315 Set distribution to unstable.
The 19 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:
CMakeLists.txt | 38 +-
CMakeModules/FindCURL.cmake | 3 +
CMakeModules/FindJavaScriptCore.cmake | 46 +
CMakeModules/FindLibNoise.cmake | 64 ++
CMakeModules/FindMiniZip.cmake | 104 ++-
CMakeModules/FindV8.cmake | 142 ++-
CMakeModules/GetGitRevisionDescription.cmake | 123 +++
CMakeModules/GetGitRevisionDescription.cmake.in | 38 +
LICENSE.txt | 21 +
debian/changelog | 16 +
debian/control | 26 +-
debian/copyright | 1 +
debian/get-orig-source | 8 +-
.../{libosgearth2.install => libosgearth3.install} | 0
...an-overrides => libosgearth3.lintian-overrides} | 4 +-
.../{libosgearth2.symbols => libosgearth3.symbols} | 798 +++++++++++++----
debian/libosgearthannotation2.lintian-overrides | 2 -
...ion2.install => libosgearthannotation3.install} | 0
debian/libosgearthannotation3.lintian-overrides | 2 +
...ion2.symbols => libosgearthannotation3.symbols} | 422 +++++----
debian/libosgearthfeatures2.lintian-overrides | 2 -
...tures2.install => libosgearthfeatures3.install} | 0
debian/libosgearthfeatures3.lintian-overrides | 2 +
...tures2.symbols => libosgearthfeatures3.symbols} | 292 +++---
...bosgearthqt2.install => libosgearthqt3.install} | 0
...-overrides => libosgearthqt3.lintian-overrides} | 2 +-
...bosgearthqt2.symbols => libosgearthqt3.symbols} | 192 ++--
debian/libosgearthsymbology2.lintian-overrides | 2 -
...logy2.install => libosgearthsymbology3.install} | 0
debian/libosgearthsymbology3.lintian-overrides | 2 +
...logy2.symbols => libosgearthsymbology3.symbols} | 375 +++++---
debian/libosgearthutil2.lintian-overrides | 2 -
...earthutil2.install => libosgearthutil3.install} | 0
...verrides => libosgearthutil3.lintian-overrides} | 2 +-
...earthutil2.symbols => libosgearthutil3.symbols} | 725 ++++++++++-----
debian/man/osgearth_demo.1.xml | 45 +
debian/man/osgearth_sharedlayer.1.xml | 55 ++
..._viewer.1.xml => osgearth_terraineffects.1.xml} | 15 +-
debian/man/osgearth_tileindex.1.xml | 52 ++
debian/osgearth.manpages | 4 +
.../patches/MPGeometry-OpenSceneGraph-3.1.8.patch | 130 ---
debian/patches/becuase-typo.patch | 49 --
debian/patches/cmake-FindMiniZip.patch | 65 +-
debian/patches/series | 2 -
debian/patches/soversion.patch | 17 +-
docs/CMakeLists.txt | 117 +++
docs/source/about.rst | 26 +-
docs/source/data.rst | 8 +-
docs/source/developer/coordinate_systems.rst | 74 ++
docs/source/developer/index.rst | 1 +
docs/source/developer/shader_composition.rst | 55 +-
docs/source/developer/utilities.rst | 114 +++
docs/source/faq.rst | 40 +-
docs/source/ios.rst | 5 +
docs/source/references/drivers/terrain/mp.rst | 23 +-
.../drivers/terrain/terrain_options_shared.rst | 3 -
docs/source/references/drivers/tile/gdal.rst | 5 +-
docs/source/references/drivers/tile/index.rst | 1 +
docs/source/references/drivers/tile/noise.rst | 111 +++
docs/source/references/earthfile.rst | 87 +-
docs/source/references/envvars.rst | 21 +-
docs/source/references/symbology.rst | 208 +++--
docs/source/releasenotes.rst | 47 +
docs/source/user/caching.rst | 28 +-
docs/source/user/tools.rst | 15 +-
src/applications/CMakeLists.txt | 11 +-
.../osgearth_annotation/osgearth_annotation.cpp | 2 +-
src/applications/osgearth_city/osgearth_city.cpp | 11 +-
.../osgearth_contour/osgearth_contour.cpp | 163 ----
.../osgearth_controls/osgearth_controls.cpp | 36 +-
.../CMakeLists.txt | 4 +-
.../osgearth_demo.cpp} | 48 +-
.../CMakeLists.txt | 4 +-
.../osgearth_detailtex/osgearth_detailtex.cpp | 134 +++
.../osgearth_elevation/osgearth_elevation.cpp | 4 +-
.../osgearth_featureeditor.cpp | 118 +--
.../osgearth_features/osgearth_features.cpp | 7 +-
.../osgearth_imageoverlay.cpp | 20 +-
src/applications/osgearth_manip/osgearth_manip.cpp | 94 +-
.../osgearth_measure/osgearth_measure.cpp | 11 +-
.../osgearth_occlusionculling.cpp | 2 +-
.../osgearth_overlayviewer.cpp | 18 +-
.../osgearth_package/osgearth_package.cpp | 8 +-
.../osgearth_package_qt/ExportDialog.ui | 10 +-
.../osgearth_package_qt/PackageQtMainWindow | 13 +-
.../osgearth_package_qt/TMSExporter.cpp | 52 +-
src/applications/osgearth_package_qt/TMSExporter.h | 16 +-
.../osgearth_package_qt/images/delete.png | Bin 947 -> 667 bytes
.../osgearth_package_qt/package_qt.cpp | 16 +-
src/applications/osgearth_qt/DemoMainWindow | 24 +-
src/applications/osgearth_qt/osgearth_qt.cpp | 113 +--
.../osgearth_qt_simple/osgearth_qt_simple.cpp | 5 +-
src/applications/osgearth_seed/osgearth_seed.cpp | 116 ++-
.../CMakeLists.txt | 4 +-
.../osgearth_sharedlayer/osgearth_sharedlayer.cpp | 222 +++++
.../CMakeLists.txt | 4 +-
.../osgearth_terraineffects.cpp | 228 +++++
.../osgearth_terrainprofile.cpp | 2 +-
src/applications/osgearth_tfs/osgearth_tfs.cpp | 19 +-
.../CMakeLists.txt | 4 +-
.../osgearth_tileindex/osgearth_tileindex.cpp | 85 ++
src/applications/osgearth_toc/osgearth_toc.cpp | 97 +-
.../osgearth_tracks/osgearth_tracks.cpp | 4 +-
.../osgearth_verticalscale.cpp | 132 ++-
.../osgearth_viewer/osgearth_viewer.cpp | 12 +-
.../osgEarthViewerIOS.xcodeproj/project.pbxproj | 52 +-
.../osgEarthViewerIOS/ViewController.m | 18 +-
.../osgEarthViewerIOS/osgPlugins.h | 1 +
src/osgEarth/AlphaEffect | 68 ++
src/osgEarth/AlphaEffect.cpp | 115 +++
.../WaitDialog => osgEarth/AutoScale} | 34 +-
src/osgEarth/AutoScale.cpp | 191 ++++
src/osgEarth/CMakeLists.txt | 22 +
src/osgEarth/Cache | 10 +-
src/osgEarth/Cache.cpp | 12 +
src/osgEarth/CacheBin | 58 +-
src/osgEarth/CacheEstimator | 114 +++
src/osgEarth/CacheEstimator.cpp | 94 ++
src/osgEarth/CachePolicy | 25 +-
src/osgEarth/CachePolicy.cpp | 60 +-
src/osgEarth/CacheSeed | 46 +-
src/osgEarth/CacheSeed.cpp | 341 ++++----
src/osgEarth/Capabilities | 21 +-
src/osgEarth/Capabilities.cpp | 31 +-
src/osgEarth/ClampableNode | 47 +-
src/osgEarth/ClampableNode.cpp | 85 +-
src/osgEarth/ClampingTechnique.cpp | 160 ++--
src/osgEarth/ColorFilter | 2 +-
src/osgEarth/CompositeTileSource.cpp | 1 +
src/osgEarth/Config | 21 +-
src/osgEarth/Config.cpp | 142 ++-
src/osgEarth/Containers | 4 -
src/osgEarth/Cube | 10 +-
src/osgEarth/Cube.cpp | 12 +
src/osgEarth/CullingUtils | 62 +-
src/osgEarth/CullingUtils.cpp | 226 ++++-
src/osgEarth/DateTime | 74 ++
src/osgEarth/DateTime.cpp | 134 +++
src/{osgEarthAnnotation => osgEarth}/Decluttering | 35 +-
.../Decluttering.cpp | 28 +-
src/osgEarth/DepthOffset | 131 +--
src/osgEarth/DepthOffset.cpp | 538 +++++-------
src/osgEarth/Draggers.cpp | 18 +-
src/osgEarth/DrapingTechnique | 11 +-
src/osgEarth/DrapingTechnique.cpp | 440 +++++++---
src/osgEarth/DrawInstanced | 3 +-
src/osgEarth/DrawInstanced.cpp | 202 +++--
src/osgEarth/ElevationLayer | 12 +-
src/osgEarth/ElevationLayer.cpp | 153 +++-
src/osgEarth/ElevationQuery.cpp | 130 ++-
src/osgEarth/FadeEffect.cpp | 76 +-
src/osgEarth/FileUtils | 58 ++
src/osgEarth/FileUtils.cpp | 93 +-
src/osgEarth/GeoData | 12 +
src/osgEarth/GeoData.cpp | 346 +++++---
src/osgEarth/HTTPClient | 34 +-
src/osgEarth/HTTPClient.cpp | 173 ++--
src/osgEarth/HeightFieldUtils | 72 +-
src/osgEarth/HeightFieldUtils.cpp | 150 +++-
src/osgEarth/IOTypes | 35 +-
src/osgEarth/IOTypes.cpp | 18 +
src/osgEarth/ImageLayer | 42 +-
src/osgEarth/ImageLayer.cpp | 145 ++-
src/osgEarth/ImageUtils | 20 +-
src/osgEarth/ImageUtils.cpp | 119 ++-
src/osgEarth/Locators | 17 +-
src/osgEarth/Locators.cpp | 42 +-
src/osgEarth/Map | 25 +-
src/osgEarth/Map.cpp | 68 +-
src/osgEarth/MapModelChange | 1 +
src/osgEarth/MapNode | 10 +-
src/osgEarth/MapNode.cpp | 96 +-
src/osgEarth/MapNodeOptions | 14 +
src/osgEarth/MapNodeOptions.cpp | 92 +-
src/osgEarth/MapOptions | 4 +-
src/osgEarth/MaskNode | 6 +-
src/osgEarth/MaskNode.cpp | 4 +
src/osgEarth/MaskSource | 10 +-
src/osgEarth/MaskSource.cpp | 18 +
src/osgEarth/MemCache.cpp | 46 +-
src/osgEarth/ModelLayer | 26 +-
src/osgEarth/ModelLayer.cpp | 70 +-
src/osgEarth/ModelSource | 10 +-
src/osgEarth/ModelSource.cpp | 18 +-
src/osgEarth/OverlayDecorator | 14 +-
src/osgEarth/OverlayDecorator.cpp | 211 +++--
src/osgEarth/OverlayNode | 2 +-
src/osgEarth/OverlayNode.cpp | 93 +-
src/osgEarth/Pickers | 24 +-
src/osgEarth/Pickers.cpp | 81 +-
src/osgEarth/PrimitiveIntersector | 127 +++
src/osgEarth/PrimitiveIntersector.cpp | 681 ++++++++++++++
src/osgEarth/Profile | 2 +-
src/osgEarth/Profile.cpp | 132 ++-
src/osgEarth/Progress | 6 +-
src/osgEarth/Registry.cpp | 35 +-
src/osgEarth/ShaderFactory | 49 +-
src/osgEarth/ShaderFactory.cpp | 22 +-
src/osgEarth/ShaderGenerator | 50 +-
src/osgEarth/ShaderGenerator.cpp | 351 +++++---
src/osgEarth/ShaderUtils.cpp | 4 +
src/osgEarth/SpatialReference | 48 +-
src/osgEarth/SpatialReference.cpp | 122 +--
src/osgEarth/StateSetCache | 14 +-
src/osgEarth/StateSetCache.cpp | 67 ++
src/osgEarth/TaskService.cpp | 18 -
src/osgEarth/Terrain | 32 +-
src/osgEarth/Terrain.cpp | 108 ++-
src/osgEarth/TerrainEffect | 57 ++
src/osgEarth/TerrainEngineNode | 45 +-
src/osgEarth/TerrainEngineNode.cpp | 43 +-
src/osgEarth/TerrainLayer | 20 +-
src/osgEarth/TerrainLayer.cpp | 62 +-
src/osgEarth/TerrainOptions | 3 +-
src/osgEarth/TerrainOptions.cpp | 3 +-
src/osgEarth/TextureCompositor.cpp | 14 +-
src/osgEarth/TextureCompositorMulti.cpp | 4 +-
src/osgEarth/ThreadingUtils | 2 +-
src/osgEarth/TileKey | 22 +-
src/osgEarth/TileKey.cpp | 13 +
src/osgEarth/TileSource | 68 +-
src/osgEarth/TileSource.cpp | 43 +-
src/osgEarth/TraversalData | 8 +-
src/osgEarth/TraversalData.cpp | 6 +-
src/osgEarth/URI | 3 +-
src/osgEarth/URI.cpp | 47 +-
src/osgEarth/Utils | 23 +
src/osgEarth/Utils.cpp | 88 ++
src/osgEarth/Version | 4 +-
src/osgEarth/Version.cpp | 13 +-
src/osgEarth/VersionGit.cpp.in | 7 +
src/osgEarth/VirtualProgram | 120 ++-
src/osgEarth/VirtualProgram.cpp | 974 +++++++++++++--------
src/osgEarth/XmlUtils.cpp | 10 -
src/osgEarthAnnotation/AnnotationData | 19 +-
src/osgEarthAnnotation/AnnotationEditing.cpp | 6 +-
src/osgEarthAnnotation/AnnotationNode | 5 +-
src/osgEarthAnnotation/AnnotationNode.cpp | 45 +-
src/osgEarthAnnotation/AnnotationRegistry.cpp | 2 +-
src/osgEarthAnnotation/AnnotationSettings | 20 +-
src/osgEarthAnnotation/AnnotationSettings.cpp | 3 +-
src/osgEarthAnnotation/AnnotationUtils | 30 +-
src/osgEarthAnnotation/AnnotationUtils.cpp | 201 ++---
src/osgEarthAnnotation/CMakeLists.txt | 22 +-
src/osgEarthAnnotation/CircleNode.cpp | 9 +-
src/osgEarthAnnotation/EllipseNode.cpp | 9 +-
src/osgEarthAnnotation/FeatureEditing | 35 +-
src/osgEarthAnnotation/FeatureEditing.cpp | 70 +-
src/osgEarthAnnotation/FeatureNode | 18 +-
src/osgEarthAnnotation/FeatureNode.cpp | 35 +-
src/osgEarthAnnotation/ImageOverlay.cpp | 19 +-
src/osgEarthAnnotation/ImageOverlayEditor | 9 +-
src/osgEarthAnnotation/ImageOverlayEditor.cpp | 15 +-
src/osgEarthAnnotation/LabelNode | 2 +-
src/osgEarthAnnotation/LabelNode.cpp | 6 +-
src/osgEarthAnnotation/LocalGeometryNode.cpp | 7 +-
src/osgEarthAnnotation/LocalizedNode | 10 +-
src/osgEarthAnnotation/LocalizedNode.cpp | 85 +-
src/osgEarthAnnotation/ModelNode.cpp | 30 +-
src/osgEarthAnnotation/OrthoNode | 9 +-
src/osgEarthAnnotation/OrthoNode.cpp | 85 +-
src/osgEarthAnnotation/PlaceNode.cpp | 55 +-
src/osgEarthAnnotation/RectangleNode.cpp | 8 +-
src/osgEarthAnnotation/TrackNode.cpp | 8 +-
src/osgEarthDrivers/CMakeLists.txt | 10 +
.../agglite/AGGLiteRasterizerTileSource.cpp | 247 +++---
src/osgEarthDrivers/arcgis/ArcGISOptions | 9 +
src/osgEarthDrivers/arcgis/ReaderWriterArcGIS.cpp | 29 +-
src/osgEarthDrivers/bing/BingOptions | 113 +++
src/osgEarthDrivers/bing/BingTileSource.cpp | 309 +++++++
src/osgEarthDrivers/bing/CMakeLists.txt | 19 +
.../cache_filesystem/FileSystemCache | 2 +-
.../cache_filesystem/FileSystemCache.cpp | 280 ++++--
src/osgEarthDrivers/debug/DebugTileSource.cpp | 4 +-
src/osgEarthDrivers/earth/EarthFileSerializer2.cpp | 20 +-
src/osgEarthDrivers/earth/ReaderWriterOsgEarth.cpp | 23 +-
.../engine_byo/BYOTerrainEngineNode.cpp | 5 +-
src/osgEarthDrivers/engine_mp/CMakeLists.txt | 13 +-
src/osgEarthDrivers/engine_mp/CustomPagedLOD | 73 --
src/osgEarthDrivers/engine_mp/CustomPagedLOD.cpp | 111 ---
src/osgEarthDrivers/engine_mp/FileLocationCallback | 1 -
src/osgEarthDrivers/engine_mp/KeyNodeFactory | 8 +-
.../engine_mp/LODFactorCallback.cpp | 80 --
src/osgEarthDrivers/engine_mp/MPGeometry | 59 +-
src/osgEarthDrivers/engine_mp/MPGeometry.cpp | 321 +++++--
.../engine_mp/MPTerrainEngineDriver.cpp | 81 +-
src/osgEarthDrivers/engine_mp/MPTerrainEngineNode | 23 +-
.../engine_mp/MPTerrainEngineNode.cpp | 385 +++++---
.../engine_mp/MPTerrainEngineOptions | 40 +-
.../engine_mp/SerialKeyNodeFactory.cpp | 224 -----
.../{SerialKeyNodeFactory => SingleKeyNodeFactory} | 41 +-
.../engine_mp/SingleKeyNodeFactory.cpp | 215 +++++
src/osgEarthDrivers/engine_mp/TerrainNode | 1 -
src/osgEarthDrivers/engine_mp/TileGroup | 71 ++
src/osgEarthDrivers/engine_mp/TileGroup.cpp | 193 ++++
src/osgEarthDrivers/engine_mp/TileModel | 142 ++-
src/osgEarthDrivers/engine_mp/TileModel.cpp | 231 +++++
src/osgEarthDrivers/engine_mp/TileModelCompiler | 22 +-
.../engine_mp/TileModelCompiler.cpp | 969 +++++++++++---------
src/osgEarthDrivers/engine_mp/TileModelFactory | 21 +-
src/osgEarthDrivers/engine_mp/TileModelFactory.cpp | 130 ++-
src/osgEarthDrivers/engine_mp/TileNode | 92 +-
src/osgEarthDrivers/engine_mp/TileNode.cpp | 77 +-
src/osgEarthDrivers/engine_mp/TileNodeRegistry | 28 +-
src/osgEarthDrivers/engine_mp/TileNodeRegistry.cpp | 52 +-
src/osgEarthDrivers/engine_mp/TilePagedLOD | 68 ++
src/osgEarthDrivers/engine_mp/TilePagedLOD.cpp | 171 ++++
.../engine_osgterrain/OSGTerrainEngineNode.cpp | 2 +-
.../engine_quadtree/QuadTreeTerrainEngineOptions | 7 +
src/osgEarthDrivers/engine_quadtree/TileModel | 11 +
.../engine_quadtree/TileModelCompiler.cpp | 45 +-
.../engine_quadtree/TileModelFactory.cpp | 17 +
src/osgEarthDrivers/engine_quadtree/TileNode | 1 +
src/osgEarthDrivers/engine_quadtree/TileNode.cpp | 9 +
.../feature_ogr/FeatureCursorOGR.cpp | 23 +-
.../feature_ogr/FeatureSourceOGR.cpp | 3 +-
.../feature_wfs/FeatureSourceWFS.cpp | 29 +-
src/osgEarthDrivers/gdal/GDALOptions | 17 +-
src/osgEarthDrivers/gdal/ReaderWriterGDAL.cpp | 117 +--
src/osgEarthDrivers/kml/KMLReader.cpp | 3 +-
src/osgEarthDrivers/kml/KML_Geometry.cpp | 96 +-
src/osgEarthDrivers/kml/KML_LineString.cpp | 13 +-
src/osgEarthDrivers/kml/KML_LinearRing.cpp | 13 +-
src/osgEarthDrivers/kml/KML_Placemark.cpp | 74 +-
src/osgEarthDrivers/kml/KML_Polygon.cpp | 6 +
.../label_annotation/AnnotationLabelSource.cpp | 161 ++--
.../mbtiles/ReaderWriterMBTiles.cpp | 66 +-
.../FeatureStencilModelSource.cpp | 14 +-
.../model_simple/SimpleModelOptions | 17 +-
.../model_simple/SimpleModelSource.cpp | 57 +-
src/osgEarthDrivers/noise/CMakeLists.txt | 14 +
src/osgEarthDrivers/noise/NoiseOptions | 220 +++++
src/osgEarthDrivers/noise/ReaderWriterNoise.cpp | 318 +++++++
.../ocean_surface/OceanCompositor.cpp | 24 +-
.../script_engine_javascriptcore/CMakeLists.txt | 23 +
.../JSWrappers} | 23 +-
.../script_engine_javascriptcore/JSWrappers.cpp | 87 ++
.../JavaScriptCoreEngine} | 35 +-
.../JavaScriptCoreEngine.cpp | 126 +++
.../JavaScriptCoreEngineFactory.cpp} | 14 +-
.../script_engine_v8/CMakeLists.txt | 4 +-
src/osgEarthDrivers/script_engine_v8/JSWrappers | 118 +--
.../script_engine_v8/JSWrappers.cpp | 809 +++++++++--------
.../script_engine_v8/JavascriptEngineV8 | 17 +-
.../script_engine_v8/JavascriptEngineV8.cpp | 233 ++---
src/osgEarthDrivers/script_engine_v8/V8Util | 8 +-
.../tilecache/ReaderWriterTileCache.cpp | 2 +-
.../{label_overlay => tileindex}/CMakeLists.txt | 18 +-
.../tileindex/ReaderWriterTileIndex.cpp | 186 ++++
.../ArcGISOptions => tileindex/TileIndexOptions} | 39 +-
src/osgEarthDrivers/tms/ReaderWriterTMS.cpp | 33 +-
.../vpb/Copy of ReaderWriterVPB.cpp | 669 --------------
src/osgEarthDrivers/vpb/VPBOptions | 12 +-
src/osgEarthDrivers/wms/ReaderWriterWMS.cpp | 113 +--
src/osgEarthDrivers/yahoo/ReaderWriterYahoo.cpp | 2 +-
src/osgEarthFeatures/BuildGeometryFilter | 40 +-
src/osgEarthFeatures/BuildGeometryFilter.cpp | 658 +++++++++-----
src/osgEarthFeatures/BuildTextFilter | 3 +-
src/osgEarthFeatures/BuildTextFilter.cpp | 36 +-
src/osgEarthFeatures/ExtrudeGeometryFilter.cpp | 114 +--
src/osgEarthFeatures/Feature.cpp | 2 +-
src/osgEarthFeatures/FeatureDrawSet | 2 +-
src/osgEarthFeatures/FeatureDrawSet.cpp | 4 +
src/osgEarthFeatures/FeatureModelGraph | 4 +-
src/osgEarthFeatures/FeatureModelGraph.cpp | 60 +-
src/osgEarthFeatures/FeatureModelSource.cpp | 20 +-
src/osgEarthFeatures/FeatureSource | 4 +-
src/osgEarthFeatures/FeatureSource.cpp | 8 +
src/osgEarthFeatures/FeatureTileSource.cpp | 30 +-
src/osgEarthFeatures/Filter | 15 +-
src/osgEarthFeatures/Filter.cpp | 55 ++
src/osgEarthFeatures/FilterContext | 23 +-
src/osgEarthFeatures/FilterContext.cpp | 16 +-
src/osgEarthFeatures/GeometryCompiler.cpp | 66 +-
src/osgEarthFeatures/LabelSource | 10 +-
src/osgEarthFeatures/LabelSource.cpp | 9 +
src/osgEarthFeatures/MeshClamper.cpp | 9 +
src/osgEarthFeatures/PolygonizeLines | 18 +-
src/osgEarthFeatures/PolygonizeLines.cpp | 219 ++---
src/osgEarthFeatures/ScriptEngine | 10 +
src/osgEarthFeatures/ScriptEngine.cpp | 43 +-
src/osgEarthFeatures/Session.cpp | 9 +-
src/osgEarthFeatures/SubstituteModelFilter | 2 +-
src/osgEarthFeatures/SubstituteModelFilter.cpp | 141 ++-
src/osgEarthFeatures/TextSymbolizer.cpp | 17 -
src/osgEarthFeatures/TransformFilter.cpp | 43 -
src/osgEarthQt/AnnotationDialogs | 1 +
src/osgEarthQt/CMakeLists.txt | 2 -
src/osgEarthQt/LayerManagerWidget | 26 +-
src/osgEarthQt/LayerManagerWidget.cpp | 115 ++-
src/osgEarthQt/MultiViewerWidget | 57 --
src/osgEarthQt/MultiViewerWidget.cpp | 159 ----
src/osgEarthQt/images.qrc | 1 +
src/osgEarthQt/images/close.png | Bin 0 -> 247 bytes
src/osgEarthSymbology/AltitudeSymbol.cpp | 2 +
src/osgEarthSymbology/Expression | 3 +
src/osgEarthSymbology/Expression.cpp | 9 +
src/osgEarthSymbology/ExtrusionSymbol.cpp | 2 +
src/osgEarthSymbology/Geometry | 17 +-
src/osgEarthSymbology/Geometry.cpp | 40 +
src/osgEarthSymbology/GeometryRasterizer | 4 +-
src/osgEarthSymbology/GeometryRasterizer.cpp | 17 +-
src/osgEarthSymbology/IconResource | 2 +
src/osgEarthSymbology/IconResource.cpp | 63 +-
src/osgEarthSymbology/IconSymbol | 10 +
src/osgEarthSymbology/IconSymbol.cpp | 32 +-
src/osgEarthSymbology/InstanceResource | 3 +
src/osgEarthSymbology/InstanceResource.cpp | 18 +-
src/osgEarthSymbology/InstanceSymbol.cpp | 3 +-
src/osgEarthSymbology/LineSymbol.cpp | 9 +
src/osgEarthSymbology/MarkerResource.cpp | 3 -
src/osgEarthSymbology/MarkerSymbol.cpp | 2 +
src/osgEarthSymbology/MeshConsolidator | 2 +-
src/osgEarthSymbology/MeshConsolidator.cpp | 4 +-
src/osgEarthSymbology/MeshSubdivider.cpp | 9 +-
src/osgEarthSymbology/ModelResource | 2 +
src/osgEarthSymbology/ModelResource.cpp | 21 +
src/osgEarthSymbology/ModelSymbol | 5 +
src/osgEarthSymbology/ModelSymbol.cpp | 28 +-
src/osgEarthSymbology/PointSymbol.cpp | 6 +-
src/osgEarthSymbology/PolygonSymbol.cpp | 2 +
src/osgEarthSymbology/RenderSymbol | 5 +
src/osgEarthSymbology/RenderSymbol.cpp | 46 +-
src/osgEarthSymbology/ResourceCache | 16 +-
src/osgEarthSymbology/ResourceCache.cpp | 128 +--
src/osgEarthSymbology/Skins.cpp | 2 +
src/osgEarthSymbology/Stroke | 18 +-
src/osgEarthSymbology/Stroke.cpp | 7 +-
src/osgEarthSymbology/Style.cpp | 59 +-
src/osgEarthSymbology/Symbol | 81 +-
src/osgEarthSymbology/Symbol.cpp | 46 +
src/osgEarthSymbology/TextSymbol | 21 +
src/osgEarthSymbology/TextSymbol.cpp | 72 +-
src/osgEarthUtil/ArcGIS | 112 +++
src/osgEarthUtil/ArcGIS.cpp | 168 ++++
src/osgEarthUtil/BrightnessContrastColorFilter.cpp | 2 +-
src/osgEarthUtil/CMYKColorFilter.cpp | 2 +-
src/osgEarthUtil/CMakeLists.txt | 24 +-
src/osgEarthUtil/ChromaKeyColorFilter.cpp | 2 +-
src/osgEarthUtil/ContourMap | 79 ++
src/osgEarthUtil/ContourMap.cpp | 226 +++++
src/osgEarthUtil/Controls | 95 +-
src/osgEarthUtil/Controls.cpp | 967 +++++++++++---------
.../LODFactorCallback => osgEarthUtil/DateTime} | 23 +-
src/osgEarthUtil/DateTime.cpp | 85 ++
src/osgEarthUtil/DetailTexture | 80 ++
src/osgEarthUtil/DetailTexture.cpp | 252 ++++++
src/osgEarthUtil/EarthManipulator | 42 +-
src/osgEarthUtil/EarthManipulator.cpp | 274 +++---
src/osgEarthUtil/ExampleResources.cpp | 132 ++-
src/osgEarthUtil/FeatureQueryTool.cpp | 4 +-
src/osgEarthUtil/GLSLColorFilter.cpp | 2 +-
src/osgEarthUtil/GammaColorFilter.cpp | 2 +-
src/osgEarthUtil/GeodeticGraticule.cpp | 71 +-
src/osgEarthUtil/HSLColorFilter.cpp | 2 +-
src/osgEarthUtil/HTM | 195 +++++
src/osgEarthUtil/HTM.cpp | 604 +++++++++++++
src/osgEarthUtil/LODBlending | 84 ++
src/osgEarthUtil/LODBlending.cpp | 249 ++++++
src/osgEarthUtil/LinearLineOfSight | 23 +-
src/osgEarthUtil/LinearLineOfSight.cpp | 117 +--
src/osgEarthUtil/MGRSGraticule.cpp | 10 +-
src/osgEarthUtil/MeasureTool.cpp | 20 +-
src/osgEarthUtil/MouseCoordsTool.cpp | 6 +-
src/osgEarthUtil/NormalMap | 78 ++
src/osgEarthUtil/NormalMap.cpp | 209 +++++
src/osgEarthUtil/RGBColorFilter.cpp | 2 +-
src/osgEarthUtil/RadialLineOfSight | 18 +-
src/osgEarthUtil/RadialLineOfSight.cpp | 101 +--
src/osgEarthUtil/ShadowUtils.cpp | 19 +-
src/osgEarthUtil/SkyNode | 31 +-
src/osgEarthUtil/SkyNode.cpp | 165 ++--
src/osgEarthUtil/SpatialData.cpp | 53 +-
src/osgEarthUtil/TFSPackager | 9 +-
src/osgEarthUtil/TFSPackager.cpp | 36 +-
src/osgEarthUtil/TMS | 50 +-
src/osgEarthUtil/TMS.cpp | 88 +-
src/osgEarthUtil/TMSPackager | 22 +-
src/osgEarthUtil/TMSPackager.cpp | 393 ++++++---
src/osgEarthUtil/TileIndex | 68 ++
src/osgEarthUtil/TileIndex.cpp | 143 +++
src/osgEarthUtil/TileIndexBuilder | 75 ++
src/osgEarthUtil/TileIndexBuilder.cpp | 126 +++
src/osgEarthUtil/UTMGraticule | 1 -
src/osgEarthUtil/UTMGraticule.cpp | 13 +-
.../{GLSLColorFilter => VerticalScale} | 45 +-
src/osgEarthUtil/VerticalScale.cpp | 148 ++++
src/osgEarthUtil/WFS.cpp | 13 +-
tests/arcgisonline-utm.earth | 36 -
tests/arcgisonline.earth | 18 +-
tests/bing.earth | 24 +
tests/boston.earth | 27 +-
tests/byo.earth | 12 -
tests/cloudmade.earth | 22 -
tests/{readymap.earth => detail_texture.earth} | 24 +-
...re_overlay.earth => feature_draped_lines.earth} | 9 +-
...y_polys.earth => feature_draped_polygons.earth} | 1 +
tests/feature_geom.earth | 14 +-
..._inline.earth => feature_inline_geometry.earth} | 6 +-
tests/feature_labels.earth | 16 +-
tests/feature_model_scatter.earth | 18 +-
tests/feature_models.earth | 26 +-
tests/feature_occlusion_culling.earth | 51 ++
tests/feature_overlay.earth | 6 +-
tests/feature_rasterize.earth | 40 +-
tests/feature_rasterize_2.earth | 6 +-
tests/feature_scripted_styling.earth | 4 +-
tests/feature_scripted_styling_2.earth | 12 +-
tests/feature_scripting.earth | 1 -
...tyling_2.earth => feature_style_selector.earth} | 23 +-
tests/feature_tfs.earth | 5 +-
tests/feature_wfs.earth | 11 +-
tests/fractal_detail.earth | 58 ++
tests/glsl_filter.earth | 5 +-
tests/hires-inset.earth | 30 +-
tests/{shadows.earth => lod_blending.earth} | 35 +-
tests/mapquest_open_aerial.earth | 3 -
..._open_aerial.earth => mapquest_with_srtm.earth} | 10 +-
tests/mask.earth | 4 +-
tests/mb_tiles.earth | 10 +-
tests/min_max_resolutions.earth | 34 +-
tests/multiple_heightfields.earth | 26 +-
tests/noise.earth | 27 +
tests/normalmap.earth | 43 +
tests/ocean.earth | 7 +-
tests/readymap.earth | 18 +-
tests/refresh.earth | 33 -
tests/simple_model.earth | 24 +-
tests/vertical_datum.earth | 4 +-
tests/vertical_scale.earth | 29 +
tests/vpb_earth_bayarea.earth | 24 -
tests/vpb_with_inset.earth | 1 +
tests/wms-t_nexrad_animated.earth | 7 +
tests/wms_metacarta.earth | 22 -
tests/wms_nexrad.earth | 1 +
535 files changed, 24739 insertions(+), 11407 deletions(-)
create mode 100644 CMakeModules/FindJavaScriptCore.cmake
create mode 100644 CMakeModules/FindLibNoise.cmake
create mode 100644 CMakeModules/GetGitRevisionDescription.cmake
create mode 100644 CMakeModules/GetGitRevisionDescription.cmake.in
rename debian/{libosgearth2.install => libosgearth3.install} (100%)
rename debian/{libosgearth2.lintian-overrides => libosgearth3.lintian-overrides} (68%)
rename debian/{libosgearth2.symbols => libosgearth3.symbols} (86%)
delete mode 100644 debian/libosgearthannotation2.lintian-overrides
rename debian/{libosgearthannotation2.install => libosgearthannotation3.install} (100%)
create mode 100644 debian/libosgearthannotation3.lintian-overrides
rename debian/{libosgearthannotation2.symbols => libosgearthannotation3.symbols} (85%)
delete mode 100644 debian/libosgearthfeatures2.lintian-overrides
rename debian/{libosgearthfeatures2.install => libosgearthfeatures3.install} (100%)
create mode 100644 debian/libosgearthfeatures3.lintian-overrides
rename debian/{libosgearthfeatures2.symbols => libosgearthfeatures3.symbols} (91%)
rename debian/{libosgearthqt2.install => libosgearthqt3.install} (100%)
rename debian/{libosgearth1.lintian-overrides => libosgearthqt3.lintian-overrides} (51%)
rename debian/{libosgearthqt2.symbols => libosgearthqt3.symbols} (92%)
delete mode 100644 debian/libosgearthsymbology2.lintian-overrides
rename debian/{libosgearthsymbology2.install => libosgearthsymbology3.install} (100%)
create mode 100644 debian/libosgearthsymbology3.lintian-overrides
rename debian/{libosgearthsymbology2.symbols => libosgearthsymbology3.symbols} (80%)
delete mode 100644 debian/libosgearthutil2.lintian-overrides
rename debian/{libosgearthutil2.install => libosgearthutil3.install} (100%)
rename debian/{libosgearthqt2.lintian-overrides => libosgearthutil3.lintian-overrides} (50%)
rename debian/{libosgearthutil2.symbols => libosgearthutil3.symbols} (84%)
create mode 100644 debian/man/osgearth_demo.1.xml
create mode 100644 debian/man/osgearth_sharedlayer.1.xml
copy debian/man/{osgearth_viewer.1.xml => osgearth_terraineffects.1.xml} (91%)
create mode 100644 debian/man/osgearth_tileindex.1.xml
delete mode 100644 debian/patches/MPGeometry-OpenSceneGraph-3.1.8.patch
delete mode 100644 debian/patches/becuase-typo.patch
create mode 100644 docs/CMakeLists.txt
create mode 100644 docs/source/developer/coordinate_systems.rst
create mode 100644 docs/source/references/drivers/tile/noise.rst
delete mode 100644 src/applications/osgearth_contour/osgearth_contour.cpp
copy src/applications/{osgearth_qt_simple => osgearth_demo}/CMakeLists.txt (85%)
copy src/applications/{osgearth_qt_simple/osgearth_qt_simple.cpp => osgearth_demo/osgearth_demo.cpp} (54%)
rename src/applications/{osgearth_contour => osgearth_detailtex}/CMakeLists.txt (69%)
create mode 100644 src/applications/osgearth_detailtex/osgearth_detailtex.cpp
copy src/applications/{osgearth_backfill => osgearth_sharedlayer}/CMakeLists.txt (68%)
create mode 100644 src/applications/osgearth_sharedlayer/osgearth_sharedlayer.cpp
copy src/applications/{osgearth_backfill => osgearth_terraineffects}/CMakeLists.txt (66%)
create mode 100644 src/applications/osgearth_terraineffects/osgearth_terraineffects.cpp
copy src/applications/{osgearth_features => osgearth_tileindex}/CMakeLists.txt (69%)
create mode 100644 src/applications/osgearth_tileindex/osgearth_tileindex.cpp
create mode 100644 src/osgEarth/AlphaEffect
create mode 100644 src/osgEarth/AlphaEffect.cpp
copy src/{applications/osgearth_package_qt/WaitDialog => osgEarth/AutoScale} (58%)
create mode 100644 src/osgEarth/AutoScale.cpp
create mode 100644 src/osgEarth/CacheEstimator
create mode 100644 src/osgEarth/CacheEstimator.cpp
create mode 100644 src/osgEarth/DateTime
create mode 100644 src/osgEarth/DateTime.cpp
rename src/{osgEarthAnnotation => osgEarth}/Decluttering (87%)
rename src/{osgEarthAnnotation => osgEarth}/Decluttering.cpp (96%)
create mode 100644 src/osgEarth/PrimitiveIntersector
create mode 100644 src/osgEarth/PrimitiveIntersector.cpp
create mode 100644 src/osgEarth/TerrainEffect
create mode 100644 src/osgEarth/VersionGit.cpp.in
create mode 100644 src/osgEarthDrivers/bing/BingOptions
create mode 100644 src/osgEarthDrivers/bing/BingTileSource.cpp
create mode 100644 src/osgEarthDrivers/bing/CMakeLists.txt
delete mode 100644 src/osgEarthDrivers/engine_mp/CustomPagedLOD
delete mode 100644 src/osgEarthDrivers/engine_mp/CustomPagedLOD.cpp
delete mode 100644 src/osgEarthDrivers/engine_mp/LODFactorCallback.cpp
delete mode 100644 src/osgEarthDrivers/engine_mp/SerialKeyNodeFactory.cpp
rename src/osgEarthDrivers/engine_mp/{SerialKeyNodeFactory => SingleKeyNodeFactory} (59%)
create mode 100644 src/osgEarthDrivers/engine_mp/SingleKeyNodeFactory.cpp
create mode 100644 src/osgEarthDrivers/engine_mp/TileGroup
create mode 100644 src/osgEarthDrivers/engine_mp/TileGroup.cpp
create mode 100644 src/osgEarthDrivers/engine_mp/TileModel.cpp
create mode 100644 src/osgEarthDrivers/engine_mp/TilePagedLOD
create mode 100644 src/osgEarthDrivers/engine_mp/TilePagedLOD.cpp
create mode 100644 src/osgEarthDrivers/noise/CMakeLists.txt
create mode 100644 src/osgEarthDrivers/noise/NoiseOptions
create mode 100644 src/osgEarthDrivers/noise/ReaderWriterNoise.cpp
create mode 100644 src/osgEarthDrivers/script_engine_javascriptcore/CMakeLists.txt
copy src/osgEarthDrivers/{kml/KML_Schema => script_engine_javascriptcore/JSWrappers} (70%)
create mode 100644 src/osgEarthDrivers/script_engine_javascriptcore/JSWrappers.cpp
copy src/osgEarthDrivers/{script_engine_v8/JavascriptEngineV8 => script_engine_javascriptcore/JavaScriptCoreEngine} (56%)
create mode 100644 src/osgEarthDrivers/script_engine_javascriptcore/JavaScriptCoreEngine.cpp
copy src/osgEarthDrivers/{script_engine_v8/JavascriptEngineV8Factory.cpp => script_engine_javascriptcore/JavaScriptCoreEngineFactory.cpp} (71%)
copy src/osgEarthDrivers/{label_overlay => tileindex}/CMakeLists.txt (51%)
create mode 100644 src/osgEarthDrivers/tileindex/ReaderWriterTileIndex.cpp
copy src/osgEarthDrivers/{arcgis/ArcGISOptions => tileindex/TileIndexOptions} (64%)
delete mode 100644 src/osgEarthDrivers/vpb/Copy of ReaderWriterVPB.cpp
delete mode 100644 src/osgEarthQt/MultiViewerWidget
delete mode 100644 src/osgEarthQt/MultiViewerWidget.cpp
create mode 100644 src/osgEarthQt/images/close.png
create mode 100644 src/osgEarthUtil/ArcGIS
create mode 100644 src/osgEarthUtil/ArcGIS.cpp
create mode 100644 src/osgEarthUtil/ContourMap
create mode 100644 src/osgEarthUtil/ContourMap.cpp
mode change 100644 => 100755 src/osgEarthUtil/Controls.cpp
rename src/{osgEarthDrivers/engine_mp/LODFactorCallback => osgEarthUtil/DateTime} (65%)
create mode 100644 src/osgEarthUtil/DateTime.cpp
create mode 100644 src/osgEarthUtil/DetailTexture
create mode 100644 src/osgEarthUtil/DetailTexture.cpp
create mode 100644 src/osgEarthUtil/HTM
create mode 100644 src/osgEarthUtil/HTM.cpp
create mode 100644 src/osgEarthUtil/LODBlending
create mode 100644 src/osgEarthUtil/LODBlending.cpp
create mode 100644 src/osgEarthUtil/NormalMap
create mode 100644 src/osgEarthUtil/NormalMap.cpp
create mode 100644 src/osgEarthUtil/TileIndex
create mode 100644 src/osgEarthUtil/TileIndex.cpp
create mode 100644 src/osgEarthUtil/TileIndexBuilder
create mode 100644 src/osgEarthUtil/TileIndexBuilder.cpp
copy src/osgEarthUtil/{GLSLColorFilter => VerticalScale} (50%)
create mode 100644 src/osgEarthUtil/VerticalScale.cpp
delete mode 100644 tests/arcgisonline-utm.earth
create mode 100644 tests/bing.earth
delete mode 100644 tests/byo.earth
delete mode 100644 tests/cloudmade.earth
copy tests/{readymap.earth => detail_texture.earth} (72%)
copy tests/{feature_overlay.earth => feature_draped_lines.earth} (81%)
rename tests/{feature_overlay_polys.earth => feature_draped_polygons.earth} (98%)
rename tests/{feature_inline.earth => feature_inline_geometry.earth} (89%)
create mode 100644 tests/feature_occlusion_culling.earth
copy tests/{feature_scripted_styling_2.earth => feature_style_selector.earth} (57%)
create mode 100644 tests/fractal_detail.earth
rename tests/{shadows.earth => lod_blending.earth} (50%)
copy tests/{mapquest_open_aerial.earth => mapquest_with_srtm.earth} (76%)
create mode 100644 tests/noise.earth
create mode 100644 tests/normalmap.earth
delete mode 100644 tests/refresh.earth
create mode 100644 tests/vertical_scale.earth
delete mode 100644 tests/vpb_earth_bayarea.earth
delete mode 100644 tests/wms_metacarta.earth
--
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