Merge branch 'master' of github.com:gwaldron/osgearth

CMakeLists.txt

@@ -93,6 +93,7 @@ option(OSGEARTH_BUILD_DOCS "Include the documentation folder" ON)
 option(OSGEARTH_ENABLE_PROFILING "Enable profiling with Tracy" OFF)
 option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built with geocoder support)" OFF)
 option(OSGEARTH_ASSUME_SINGLE_GL_CONTEXT "Assume the use of a single GL context for all GL objects (advanced)" OFF)
+option(OSGEARTH_ASSUME_SINGLE_THREADED_OSG "Assume OSG will always be configured to run in SingleThreaded mode (advanced)" OFF)
 option(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when installing (OFF=inlined shaders)" OFF)
 
 mark_as_advanced(OSGEARTH_BUILD_TESTS)
@@ -204,6 +205,10 @@ if(OSGEARTH_ASSUME_SINGLE_GL_CONTEXT)
     add_definitions(-DOSGEARTH_SINGLE_GL_CONTEXT)
 endif()
 
+if(OSGEARTH_ASSUME_SINGLE_THREADED_OSG)
+    add_definitions(-DOSGEARTH_SINGLE_THREADED_OSG)
+endif()
+
 # Protobuf enables the MVT (Mapnik Vector Tiles) format
 set(PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compiled as dll")
 

src/applications/osgearth_terrainprofile/osgearth_terrainprofile.cpp

@@ -108,24 +108,28 @@ class TerrainProfileGraph : public osg::Group
         _distanceMinLabel->setFont( font.get() );
         _distanceMinLabel->setAlignment(osgText::TextBase::LEFT_BOTTOM);
         _distanceMinLabel->setColor(textColor);
+        _distanceMinLabel->setDataVariance(osg::Object::DYNAMIC);
 
         _distanceMaxLabel = new osgText::Text();
         _distanceMaxLabel->setCharacterSize( textSize );
         _distanceMaxLabel->setFont( font.get() );
         _distanceMaxLabel->setAlignment(osgText::TextBase::RIGHT_BOTTOM);
         _distanceMaxLabel->setColor(textColor);
+        _distanceMaxLabel->setDataVariance(osg::Object::DYNAMIC);
 
         _elevationMinLabel = new osgText::Text();
         _elevationMinLabel->setCharacterSize( textSize );
         _elevationMinLabel->setFont( font.get() );
         _elevationMinLabel->setAlignment(osgText::TextBase::RIGHT_BOTTOM);
         _elevationMinLabel->setColor(textColor);
+        _elevationMinLabel->setDataVariance(osg::Object::DYNAMIC);
 
         _elevationMaxLabel = new osgText::Text();
         _elevationMaxLabel->setCharacterSize( textSize );
         _elevationMaxLabel->setFont( font.get() );
         _elevationMaxLabel->setAlignment(osgText::TextBase::RIGHT_TOP);
         _elevationMaxLabel->setColor(textColor);
+        _elevationMaxLabel->setDataVariance(osg::Object::DYNAMIC);
     }
 
     ~TerrainProfileGraph()