Merge branch 'main' into stable-branch

USNavalResearchLaboratory · Sep 6, 2024 · 26ef4f9 · 26ef4f9
2 parents d6f9193 + 5bca86d
commit 26ef4f9
Show file tree

Hide file tree

Showing 97 changed files with 1,626 additions and 433 deletions.
diff --git a/CMakeImport/ImportOSGEarth.cmake b/CMakeImport/ImportOSGEarth.cmake
@@ -76,6 +76,12 @@ elseif(EXISTS "${${LIBRARYNAME}_LIBRARY_INCLUDE_PATH}/osgEarthTriton/TritonOptio
     list(APPEND SUBLIBRARY_NAMES Triton)
 endif()
 
+# osgEarthImGui added in osgEarth SOVERSION 159
+if(EXISTS "${${LIBRARYNAME}_LIBRARY_INCLUDE_PATH}/osgEarthImGui/ImGuiPanel")
+    set(HAVE_OSGEARTH_IMGUI_NODEKIT TRUE)
+    list(APPEND SUBLIBRARY_NAMES ImGui)
+endif()
+
 # Internal macro to import osgEarth libraries.  NAME can be empty string, Util, Symbology, etc.
 macro(import_osgearth_lib NAMEVAL)
     if("${NAMEVAL}" STREQUAL "")

diff --git a/CMakeImport/ImportSWIG.cmake b/CMakeImport/ImportSWIG.cmake
@@ -1,7 +1,7 @@
 # Helper script for VSI to find SWIG executable.
 
 initialize_ENV(SWIG_DIR)
-set(SWIG_VERSION 4.1.1)
+set(SWIG_VERSION 4.2.1)
 find_program(SWIG_EXECUTABLE
     NAMES swig
     HINTS

diff --git a/CMakeUtilities/valgrind.supp b/CMakeUtilities/valgrind.supp
@@ -463,14 +463,12 @@
 }
 
 {
-   osgEarth suppressed for Globals on startup
+   Ignore osgEarth globals in ref_ptr
    Memcheck:Leak
    match-leak-kinds: reachable
-   fun:_Znwm
-   fun:_GLOBAL__sub_I_HTTPClient.cpp
-   fun:call_init.part.0
-   fun:call_init
+   ...
+   fun:_GLOBAL__sub_*
+   ...
    fun:_dl_init
-   obj:/usr/lib*/ld-2*
    ...
 }
diff --git a/Examples/ASIViewer/ASIViewer.cpp b/Examples/ASIViewer/ASIViewer.cpp
@@ -919,7 +919,7 @@ class ControlPanel : public simExamples::SimExamplesGui
 
       ImGui::TableNextColumn();
       ImGui::TableNextColumn();
-      ImGui::Text(app_.nowTimeStr_.c_str());
+      ImGui::Text("%s", app_.nowTimeStr_.c_str());
 
       bool playing = app_.playing_;
       IMGUI_ADD_ROW(ImGui::Checkbox, "Playing", &app_.playing_);

diff --git a/Examples/AsyncModelLoading/main.cpp b/Examples/AsyncModelLoading/main.cpp
@@ -251,10 +251,10 @@ class ControlPanel : public simExamples::SimExamplesGui
       ImGui::Text("Timing"); ImGui::TableNextColumn(); ImGui::TableNextColumn();
       popLargeFont_();
 
-      ImGui::Text("Platform:"); ImGui::TableNextColumn(); ImGui::Text(app_.entityTimerStr.c_str()); ImGui::TableNextColumn();
-      ImGui::Text("Asynchronous:"); ImGui::TableNextColumn(); ImGui::Text(app_.asyncTimerStr.c_str()); ImGui::TableNextColumn();
-      ImGui::Text("Async Round-Trip:"); ImGui::TableNextColumn(); ImGui::Text(app_.asyncRoundTripStr.c_str()); ImGui::TableNextColumn();
-      ImGui::Text("Synchronous:"); ImGui::TableNextColumn(); ImGui::Text(app_.syncTimerStr.c_str()); ImGui::TableNextColumn();
+      ImGui::Text("Platform:"); ImGui::TableNextColumn(); ImGui::Text("%s", app_.entityTimerStr.c_str()); ImGui::TableNextColumn();
+      ImGui::Text("Asynchronous:"); ImGui::TableNextColumn(); ImGui::Text("%s", app_.asyncTimerStr.c_str()); ImGui::TableNextColumn();
+      ImGui::Text("Async Round-Trip:"); ImGui::TableNextColumn(); ImGui::Text("%s", app_.asyncRoundTripStr.c_str()); ImGui::TableNextColumn();
+      ImGui::Text("Synchronous:"); ImGui::TableNextColumn(); ImGui::Text("%s", app_.syncTimerStr.c_str()); ImGui::TableNextColumn();
 
       ImGui::EndTable();
     }

diff --git a/Examples/BeamTest/BeamTest.cpp b/Examples/BeamTest/BeamTest.cpp
@@ -109,7 +109,7 @@ class ControlPanel : public simExamples::SimExamplesGui
       std::string type = (props->type() == simData::BeamProperties_BeamType_ABSOLUTE_POSITION ? "ABSOLUTE" : "BODY RELATIVE");
       xaction.complete(&props);
 
-      ImGui::TableNextColumn(); ImGui::Text("Type"); ImGui::TableNextColumn(); ImGui::Text(type.c_str());
+      ImGui::TableNextColumn(); ImGui::Text("Type"); ImGui::TableNextColumn(); ImGui::Text("%s", type.c_str());
 
       // Draw mode combo box
       ImGui::TableNextColumn(); ImGui::Text("Draw Mode"); ImGui::TableNextColumn();

diff --git a/Examples/GOGAttachments/ExampleGOGAttachments.cpp b/Examples/GOGAttachments/ExampleGOGAttachments.cpp
@@ -160,7 +160,7 @@ struct ControlPanel : public simExamples::SimExamplesGui
     ImGui::Text("g : cycle through the various GOG types");
 
     if (!nowViewing_.empty())
-      ImGui::Text(nowViewing_.c_str());
+      ImGui::Text("%s", nowViewing_.c_str());
 
     ImGui::End();
 

diff --git a/Examples/GOGReader/GOGReader.cpp b/Examples/GOGReader/GOGReader.cpp
@@ -468,8 +468,8 @@ struct ControlPanel : public simExamples::SimExamplesGui
     ImGui::SetNextWindowBgAlpha(.6f);
     ImGui::Begin(name(), visible(), ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_AlwaysAutoResize);
 
-    ImGui::Text(s_help.c_str());
-    ImGui::Text(handler_.statusText().c_str());
+    ImGui::Text("%s", s_help.c_str());
+    ImGui::Text("%s", handler_.statusText().c_str());
 
     float opacity = opacity_;
     ImGui::Text("Opacity: "); ImGui::SameLine();

diff --git a/Examples/GateTest/GateTest.cpp b/Examples/GateTest/GateTest.cpp
@@ -114,7 +114,7 @@ class ControlPanel : public simExamples::SimExamplesGui
       const simData::GateProperties* props = ds_.gateProperties(gateId_, &xaction);
       std::string type = (props->type() == simData::GateProperties_GateType_ABSOLUTE_POSITION ? "ABSOLUTE" : "BODY RELATIVE");
       xaction.complete(&props);
-      ImGui::TableNextColumn(); ImGui::Text("Type"); ImGui::TableNextColumn(); ImGui::Text(type.c_str());
+      ImGui::TableNextColumn(); ImGui::Text("Type"); ImGui::TableNextColumn(); ImGui::Text("%s", type.c_str());
 
       // Draw mode combo box
       ImGui::TableNextColumn(); ImGui::Text("Draw Mode"); ImGui::TableNextColumn();

diff --git a/Examples/GeoFencing/ExampleGeoFencing.cpp b/Examples/GeoFencing/ExampleGeoFencing.cpp
@@ -132,7 +132,7 @@ struct ControlPanel : public simExamples::SimExamplesGui
     ImGui::TextColored(ImVec4(1.f, 1.f, 0.f, 1.f), "The yellow areas are geo-fences.");
     ImGui::Text("Move mouse to test whether inside/outside");
     if (!app_.feedbackText.empty())
-      ImGui::Text(app_.feedbackText.c_str());
+      ImGui::Text("%s", app_.feedbackText.c_str());
 
     ImGui::End();
   }

diff --git a/Examples/ImageIcons/ImageIcons.cpp b/Examples/ImageIcons/ImageIcons.cpp
@@ -169,7 +169,7 @@ struct ControlPanel : public simExamples::SimExamplesGui
 
     std::stringstream ss;
     ss << "Currently viewing: " << IconRotation_Name(s_iconRotation);
-    ImGui::TextColored(ImVec4(1.f, 1.f, 0.f, 1.f), ss.str().c_str());
+    ImGui::TextColored(ImVec4(1.f, 1.f, 0.f, 1.f), "%s", ss.str().c_str());
 
     ImGui::End();
 

diff --git a/Examples/LoadEarthFile/LoadEarthFile.cpp b/Examples/LoadEarthFile/LoadEarthFile.cpp
@@ -195,7 +195,7 @@ struct ControlPanel : public simExamples::SimExamplesGui
     ImGui::Text("r : remove all insets");
 
     if (!llaLabel_.empty())
-      ImGui::Text(llaLabel_.c_str());
+      ImGui::Text("%s", llaLabel_.c_str());
 
     ImGui::End();
     handlePressedKeys_();

diff --git a/Examples/Ocean/Ocean.cpp b/Examples/Ocean/Ocean.cpp
@@ -1110,6 +1110,10 @@ namespace
     rv->setMaxAltitude(30000.0f);
     rv->setRenderBinNumber(simVis::BIN_OCEAN);
     rv->setOpacity(0.8f);
+#if OSGEARTH_SOVERSION >= 154
+    // render Triton on the ellipsoid (old default)
+    rv->setVerticalDatum("");
+#endif
     simVis::OverheadMode::configureOceanLayer(rv);
     return rv;
   }

diff --git a/Examples/Overhead/OverheadExample.cpp b/Examples/Overhead/OverheadExample.cpp
@@ -269,11 +269,11 @@ struct ControlPanel : public simExamples::SimExamplesGui
 
     std::stringstream ss;
     ss << "Dynamic Scale: " << (dynamicScaleOn_ ? "ON" : "OFF");
-    ImGui::Text(ss.str().c_str()); ss.str(""); ss.clear();
+    ImGui::Text("%s", ss.str().c_str()); ss.str(""); ss.clear();
 
     const simVis::View* focusedView = viewer_->getMainView()->getFocusManager()->getFocusedView();
     ss << std::fixed << std::setprecision(2) << "Camera Distance: " << focusedView->getViewpoint().range().value().getValue() << " m";
-    ImGui::Text(ss.str().c_str()); ss.str(""); ss.clear();
+    ImGui::Text("%s", ss.str().c_str()); ss.str(""); ss.clear();
 
     ss << "Centered: ";
     centeredPlat_ = getCenteredPlatformId(focusedView);
@@ -287,10 +287,10 @@ struct ControlPanel : public simExamples::SimExamplesGui
       if (prefs)
         ss << prefs->commonprefs().name();
     }
-    ImGui::Text(ss.str().c_str()); ss.str(""); ss.clear();
+    ImGui::Text("%s", ss.str().c_str()); ss.str(""); ss.clear();
 
     ss << "Focused View: " << focusedView->getName() << (focusedView->isOverheadEnabled() ? " OVERHEAD" : " PERSPECTIVE");
-    ImGui::Text(ss.str().c_str()); ss.str(""); ss.clear();
+    ImGui::Text("%s", ss.str().c_str()); ss.str(""); ss.clear();
 
     // Avoid showing the sentinel value for off-map
     if (latLonElevListener_->lat() == simUtil::MousePositionManipulator::INVALID_POSITION_VALUE)
@@ -305,7 +305,7 @@ struct ControlPanel : public simExamples::SimExamplesGui
       if (showElevation_)
         ss << ", elev: " << latLonElevListener_->elev();
     }
-    ImGui::Text(ss.str().c_str());
+    ImGui::Text("%s", ss.str().c_str());
     ImGui::End();
     handlePressedKeys_();
   }

diff --git a/Examples/Periscope/PeriscopeExample.cpp b/Examples/Periscope/PeriscopeExample.cpp
@@ -316,6 +316,10 @@ int main(int argc, char** argv)
     layer->setUseHeightMap(false);
     layer->setMaxAltitude(30000.0f);
     layer->setRenderBinNumber(simVis::BIN_OCEAN);
+#if OSGEARTH_SOVERSION >= 154
+    // render Triton on the ellipsoid (old default)
+    layer->setVerticalDatum("");
+#endif
     scene->getMap()->addLayer(layer);
   }
   else

diff --git a/Examples/Picking/ExamplePicking.cpp b/Examples/Picking/ExamplePicking.cpp
@@ -361,7 +361,7 @@ struct ControlPanel : public simExamples::SimExamplesGui
       ImGui::Text("2 : Toggle RTT 2 display");
     }
     ImGui::Text("Picked: "); ImGui::SameLine();
-    ImGui::TextColored(ImVec4(0.f, 1.f, 0.f, 1.f), app_.pickLabel.c_str());
+    ImGui::TextColored(ImVec4(0.f, 1.f, 0.f, 1.f), "%s", app_.pickLabel.c_str());
 
     ImGui::End();
   }

diff --git a/Examples/PlatformSymbology/PlatformSymbology.cpp b/Examples/PlatformSymbology/PlatformSymbology.cpp
@@ -162,7 +162,7 @@ struct ControlPanel : public simExamples::SimExamplesGui
     ImGui::Begin(name(), visible(), ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_AlwaysAutoResize);
     ImGui::TextUnformatted(s_help.c_str());
     if (!text_.empty())
-      ImGui::TextColored(ImVec4(0.f, 1.f, 0.f, 1.f), text_.c_str());
+      ImGui::TextColored(ImVec4(0.f, 1.f, 0.f, 1.f), "%s", text_.c_str());
     ImGui::End();
   }
 

diff --git a/Examples/Projectors/Projectors.cpp b/Examples/Projectors/Projectors.cpp
@@ -128,16 +128,16 @@ struct ControlPanel : public simExamples::SimExamplesGui
     }
     ImGui::SetNextWindowBgAlpha(.6f);
     ImGui::Begin(name(), visible(), ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::Text(s_rotate.c_str());
-    ImGui::Text(s_interpolate.c_str());
-    ImGui::Text(s_viewPlatformOne.c_str());
-    ImGui::Text(s_viewPlatformTwo.c_str());
-    ImGui::Text(s_viewPlatformThree.c_str());
-    ImGui::Text(s_viewPlatformFour.c_str());
-    ImGui::Text(s_viewPlatformFive.c_str());
-    ImGui::Text(s_togglePlatformFiveShadowMap.c_str());
-    ImGui::Text(s_togglePlatformFiveMaxDrawRange.c_str());
-    ImGui::Text(s_reloadMap.c_str());
+    ImGui::Text("%s", s_rotate.c_str());
+    ImGui::Text("%s", s_interpolate.c_str());
+    ImGui::Text("%s", s_viewPlatformOne.c_str());
+    ImGui::Text("%s", s_viewPlatformTwo.c_str());
+    ImGui::Text("%s", s_viewPlatformThree.c_str());
+    ImGui::Text("%s", s_viewPlatformFour.c_str());
+    ImGui::Text("%s", s_viewPlatformFive.c_str());
+    ImGui::Text("%s", s_togglePlatformFiveShadowMap.c_str());
+    ImGui::Text("%s", s_togglePlatformFiveMaxDrawRange.c_str());
+    ImGui::Text("%s", s_reloadMap.c_str());
     ImGui::End();
   }
 };

diff --git a/Examples/RadialLOS/ExampleRadialLOS.cpp b/Examples/RadialLOS/ExampleRadialLOS.cpp
@@ -269,7 +269,7 @@ class ControlPanel : public simExamples::SimExamplesGui
       {
         std::stringstream ss;
         ss << "P2P Result: " << app_.p2pResult;
-        ImGui::Text(ss.str().c_str());
+        ImGui::Text("%s", ss.str().c_str());
       }
 
       if (needUpdate)

diff --git a/Examples/RangeTool/ExampleRangeTool.cpp b/Examples/RangeTool/ExampleRangeTool.cpp
@@ -102,9 +102,9 @@ struct ControlPanel : public simExamples::SimExamplesGui
     ImGui::SetNextWindowBgAlpha(.6f);
     ImGui::Begin(name(), visible(), ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_AlwaysAutoResize);
     ImGui::Text("1: cycle through line calculations");
-    ImGui::TextColored(yellow, lineCalcText.c_str());
+    ImGui::TextColored(yellow, "%s", lineCalcText.c_str());
     ImGui::Text("2: cycle through angle calculations");
-    ImGui::TextColored(yellow, angleCalcText.c_str());
+    ImGui::TextColored(yellow, "%s", angleCalcText.c_str());
     ImGui::Text("3: zoom in");
     ImGui::Text("4: rotate zoomed in view");
     ImGui::Text("5: reset to main view");

diff --git a/Examples/SimpleServer/InstallOcean.cpp b/Examples/SimpleServer/InstallOcean.cpp
@@ -127,6 +127,10 @@ void InstallOcean::install(simVis::SceneManager& scene)
     layer->setUseHeightMap(false);
     layer->setMaxAltitude(30000.0f);
     layer->setRenderBinNumber(simVis::BIN_OCEAN);
+#if OSGEARTH_SOVERSION >= 154
+    // render Triton on the ellipsoid (old default)
+    layer->setVerticalDatum("");
+#endif
 
     // Configure it to work in overhead mode
     simVis::OverheadMode::configureOceanLayer(layer.get());

diff --git a/Examples/TimestampedLayer/ExampleTimestampedLayer.cpp b/Examples/TimestampedLayer/ExampleTimestampedLayer.cpp
@@ -142,7 +142,7 @@ class ControlPanel : public simExamples::SimExamplesGui
 
       ImGui::TableNextColumn(); ImGui::Text("Clock:"); ImGui::TableNextColumn();
       if (!app_.timeLabel_.empty())
-        ImGui::Text(app_.timeLabel_.c_str());
+        ImGui::Text("%s", app_.timeLabel_.c_str());
 
       ImGui::EndTable();
     }

diff --git a/Examples/imgui/BaseGui.cpp b/Examples/imgui/BaseGui.cpp
@@ -21,7 +21,6 @@
  *
  */
 #include "imgui.h"
-#include "osgEarth/ImGui/ImGui"
 #include "BaseGui.h"
 
 namespace GUI {

diff --git a/Examples/imgui/BaseGui.h b/Examples/imgui/BaseGui.h
@@ -25,7 +25,6 @@
 
 #include "imgui.h"
 #include "imgui_internal.h"
-#include "osgEarth/ImGui/ImGui"
 #include <string>
 
 struct ImFont;

diff --git a/Examples/imgui/CMakeLists.txt b/Examples/imgui/CMakeLists.txt
@@ -29,6 +29,9 @@ add_library(ImGuiLib ${SOURCE_FILES})
 target_include_directories(ImGuiLib PUBLIC . )
 target_link_libraries(ImGuiLib PUBLIC VSI::GL GLEW OSGEARTH PRIVATE simVis simCore simNotify)
 target_compile_definitions(ImGuiLib PRIVATE IMGUI_IMPL_OPENGL_LOADER_GLEW)
+if(CMAKE_COMPILER_IS_GNUCXX)
+    target_compile_options(ImGuiLib PRIVATE -fno-strict-aliasing)
+endif()
 set_target_properties(ImGuiLib PROPERTIES
     FOLDER "ImGui Library"
     PROJECT_LABEL "ImGui"