DEV: Updated stable to latest default

--HG--
branch : stable

.hgtags

@@ -1,3 +1,4 @@
+92219a239f790c4b83417ea7c35711237c644bcf stable-2021-12
 213a6d77df6c7e7ffa12a0034cf805b1ba13a94c simdis10.0_SR10
 213a6d77df6c7e7ffa12a0034cf805b1ba13a94c simdissdk-1.15
 4025ed8b26448a3314d254a1f675db789b5fed4f stable-2021-06

CMakeImport/ImportOSG.cmake

@@ -267,18 +267,27 @@ set(OSG_ALL_LIBDEPENDENCIES
 
 # Install if INSTALL_THIRDPARTY_LIBRARIES is undefined, or if it is set to true
 if(OSG_SHOULD_INSTALL)
+    # osg_p3d.dll/so is release, and need special treatment
     install(DIRECTORY ${OSG_PLUGIN_PATH}/
         DESTINATION ${OSG_PLUGIN_INSTALL_DIR}
         CONFIGURATIONS "Debug"
         COMPONENT ${OSG_INSTALL_COMPONENT}
-        FILES_MATCHING REGEX ${DEBUG_INSTALL_PATTERN}
+        FILES_MATCHING
+            REGEX ${DEBUG_INSTALL_PATTERN}
+            PATTERN "*p3d.*" EXCLUDE
     )
 
+    # SIM-13848: Install release DLLs on Linux if debug not found
+    set(CONFIG "Release")
+    if(UNIX AND NOT EXISTS "${OSG_PLUGIN_PATH}/osgdb_rotd.so")
+        set(CONFIG)
+    endif()
     install(DIRECTORY ${OSG_PLUGIN_PATH}/
         DESTINATION ${OSG_PLUGIN_INSTALL_DIR}
-        CONFIGURATIONS "Release"
+        CONFIGURATIONS ${CONFIG}
         COMPONENT ${OSG_INSTALL_COMPONENT}
-        FILES_MATCHING REGEX ${RELEASE_INSTALL_PATTERN}
+            REGEX ${RELEASE_INSTALL_PATTERN}
+            PATTERN "*p3d.*"
     )
 endif()
 

CMakeImport/ImportOSGEarth.cmake

@@ -181,10 +181,16 @@ if(OSGEARTH_SHOULD_INSTALL)
             REGEX ${DEBUG_INSTALL_PATTERN}
             PATTERN "*billboard.*" EXCLUDE)
 
+    # SIM-13848: Install release DLLs on Linux if debug not found
+    set(CONFIG "Release")
+    if(UNIX AND NOT EXISTS "${OSG_PLUGIN_PATH}/osgdb_rotd.so")
+        set(CONFIG)
+    endif()
+
     # Note that "*billboard.*" is a release pattern and needs inclusion
     install(DIRECTORY ${OSGEARTH_PLUGIN_PATH}/
         DESTINATION ${OSGEARTH_PLUGIN_INSTALL_DIR}
-        CONFIGURATIONS "Release"
+        CONFIGURATIONS ${CONFIG}
         COMPONENT ${OSGEARTH_INSTALL_COMPONENT}
         FILES_MATCHING
             REGEX ${RELEASE_INSTALL_PATTERN}

CMakeModules/BuildSystemVariables.cmake

@@ -1,15 +1,15 @@
 # Define system specific parameters:
 # BUILD_SYSTEM_OS {win|linux}
-# BUILD_SYSTEM_ARCH {x86|amd64}
-# BUILD_COMPILER {vc-10.0|vc-12.0|vc-14.0|vc-14.1|vc-14.2|gcc-4.4}
+# BUILD_SYSTEM_ARCH {amd64}
+# BUILD_COMPILER {vc-14.1|vc-14.2|vc-14.3|gcc-8.3}
 # BUILD_COMPILER_NAME {vc|${CMAKE_C_COMPILER}}
 # BUILD_COMPILER_VERSION (Compiler name with max and min version numbers)
 # BUILD_COMPILER_MAJOR_VERSION
 # BUILD_COMPILER_MINOR_VERSION
 # BUILD_SYSTEM_CANONICAL_NAME {${BUILD_PLATFORM}_${BUILD_COMPILER}}
-# BUILD_TYPE {32|64}
-# BUILD_HWOS {x86-nt|amd64-nt|amd64-linux}
-# BUILD_PLATFORM {win32|win64|linux64}
+# BUILD_TYPE {64}
+# BUILD_HWOS {amd64-nt|amd64-linux}
+# BUILD_PLATFORM {win64|linux64}
 
 # CMAKE_SYSTEM_PROCESSOR is set to the PROCESSOR_ARCHITECTURE value (eg x86 or AMD64) for Windows and uname -p result or UNIX/Linux
 string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} BUILD_SYSTEM_ARCH)

CMakeModules/ConfigureShadersTemplate.cmake.in

@@ -12,10 +12,9 @@ set(OUTPUT_CPP_FILE "@OUTPUT_CPP_FILE@")
 
 foreach(FILE ${SHADER_FILES})
     file(READ "${SOURCE_DIR}/${FILE}" CONTENTS)
-    # Replace \n with EOL text into TEMP_STR (append a newline)
-    string(REGEX REPLACE "\n" "%EOL%" TEMP_STR "${CONTENTS}\n")
-    # Replace " with QUOTE into ${FILE}, used as a configure in the .in file
-    string(REGEX REPLACE "\"" "%QUOTE%" ${FILE} "${TEMP_STR}")
+    # Compress whitespace
+    string(REGEX REPLACE "\n\n+" "\n" TEMP_STR "${CONTENTS}")
+    set(${FILE} "\nR\"shader(${TEMP_STR})shader\"")
 endforeach()
 
 # Next configure the template .in file with all of our variables

CMakeModules/HelperFunctions.cmake

@@ -477,6 +477,11 @@ function(vsi_install_export TARGET VERSION COMPATIBILITY)
         vsi_set_rpath(${TARGET} ${INSTALLSETTINGS_SHARED_LIBRARY_DIR})
     endif()
 
+    # CMake prior to 3.19 did not support VERSION as whitelisted property on INTERFACE targets
+    if(NOT TARGET_TYPE STREQUAL "INTERFACE_LIBRARY" OR NOT CMAKE_VERSION VERSION_LESS "3.19")
+        set_target_properties(${TARGET} PROPERTIES VERSION "${VERSION}")
+    endif()
+
     # Create the ConfigVersion.cmake file for the target
     include(CMakePackageConfigHelpers)
     write_basic_package_version_file("${TARGET}ConfigVersion.cmake"

Doc/SDKFooter.html

@@ -8,7 +8,7 @@
               Code 5773<br>
               4555 Overlook Ave., SW<br>
               Washington, DC 20375<br>
-              <a href="mailto:simdis&#064;enews&#046;nrl&#046;navy&#046;mil" title="Email SIMDIS">simdis&#064;enews&#046;nrl&#046;navy&#046;mil</a>
+              <a href="mailto:simdis&#064;nrl&#046;navy&#046;mil" title="Email SIMDIS">simdis&#064;nrl&#046;navy&#046;mil</a>
   </small>
   </td>
   <td>
@@ -17,7 +17,8 @@
             <a href="http://www.navy.com" target="_blank" title="Navy Recruiting">Navy Recruiting</a><br>
             <a href="http://foia.navy.mil" target="_blank" title="Navy Freedom of Information Act">Navy Freedom of Information Act</a><br>
             <a href="http://www.onr.navy.mil" target="_blank" title="Office of Naval Research">Office of Naval Research</a><br>
-            <a href="https://simdis.nrl.navy.mil" target="_blank" title="SIMDIS">SIMDIS</a>
+            <a href="https://www.trmc.osd.mil/helpdesk/projects/SIMDIS" target="_blank" title="SIMDIS Help Desk">SIMDIS Help Desk (CAC)</a>
+            <a href="https://www.tena-sda.org/helpdesk/projects/SIMDIS" target="_blank" title="SIMDIS Help Desk">SIMDIS Help Desk (Public)</a>
 			</small>
           </td>
  </tr>

Doc/mainpage.dox

@@ -14,7 +14,7 @@
  *
  *  The intent of the SIMDIS SDK is to provide a C++ framework to be used by third party developers to incorporate functionality similar to that provided by the SIMDIS 3D Visualization and Analysis Toolkit within their own applications.  The SIMDIS SDK will also serve as the basis for development of the next major SIMDIS release, SIMDIS 10.  
  *
- *  The SIMDIS SDK was developed by the Visualization Systems Integration branch of the Tactical Electronic Warfare Division at the U.S. Naval Research Laboratory.  For more information visit:  <a href=https://simdis.nrl.navy.mil>https://simdis.nrl.navy.mil</a>
+ *  The SIMDIS SDK was developed by the Visualization Systems Integration branch of the Tactical Electronic Warfare Division at the U.S. Naval Research Laboratory.  For more information visit:  <a href=https://www.trmc.osd.mil/helpdesk/projects/SIMDIS/issues>SIMDIS (CAC)</a> or <a href=https://www.tena-sda.org/helpdesk/projects/SIMDIS>SIMDIS (Public)</a>
  *
  *  This document is the SIMDIS SDK reference.  It contains reference documentation
  *  for all components of the SDK, consisting of:

Examples/ASIViewer/ASIViewer.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.

Examples/AngleTest/AngleTestExample.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.

Examples/AnimatedLine/ExampleAnimatedLine.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.

Examples/AntennaPattern/ExampleAntennaPattern.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.

Examples/ArticulatedModel/ExampleArticulatedModel.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.

Examples/AsyncModelLoading/main.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.
@@ -577,7 +577,7 @@ int main(int argc, char **argv)
   osg::ref_ptr<osgEarth::Map> map = simExamples::createDefaultExampleMap();
 
   // SDK viewer to display the scene
-  osg::ref_ptr<simVis::Viewer> viewer = new simVis::Viewer(simVis::Viewer::WINDOWED, 200, 100, 1024, 768);
+  osg::ref_ptr<simVis::Viewer> viewer = new simVis::Viewer();
   viewer->getViewer()->setThreadingModel(osgViewer::ViewerBase::ThreadingModel::SingleThreaded);
   viewer->setMap(map.get());
   viewer->setNavigationMode(simVis::NAVMODE_ROTATEPAN);

Examples/BasicViewer/BasicViewer.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.

Examples/BasicViewerText/BasicViewerText.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.

Examples/BeamTest/BeamTest.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.
@@ -136,13 +136,13 @@ class ControlPanel : public GUI::BaseGui
 
       // Horizontal width
       float horzSize = horzSize_;
-      IMGUI_ADD_ROW(ImGui::SliderFloat, "Horiz. Size", &horzSize_, 1.f, 400.f, "%.3f", ImGuiSliderFlags_AlwaysClamp);
+      IMGUI_ADD_ROW(ImGui::SliderFloat, "Horiz. Size", &horzSize_, .01f, 400.f, "%.3f", ImGuiSliderFlags_AlwaysClamp);
       if (horzSize != horzSize_)
         needUpdate = true;
 
       // Vertical size
       float vertSize = vertSize_;
-      IMGUI_ADD_ROW(ImGui::SliderFloat, "Vert. Size", &vertSize_, 1.f, 200.f, "%.3f", ImGuiSliderFlags_AlwaysClamp);
+      IMGUI_ADD_ROW(ImGui::SliderFloat, "Vert. Size", &vertSize_, .01f, 200.f, "%.3f", ImGuiSliderFlags_AlwaysClamp);
       if (vertSize != vertSize_)
         needUpdate = true;
 
@@ -495,12 +495,12 @@ ui::Control* createUI(AppData& app)
 
   r++;
   grid->setControl(c, r, new ui::LabelControl("Horiz. Size"));
-  app.horizSlider_ = grid->setControl(c+1, r, new ui::HSliderControl(1.0, 400.0, 45.0, applyUI.get()));
+  app.horizSlider_ = grid->setControl(c+1, r, new ui::HSliderControl(.01, 400.0, 45.0, applyUI.get()));
   app.horizLabel_  = grid->setControl(c+2, r, new ui::LabelControl(app.horizSlider_.get()));
 
   r++;
   grid->setControl(c, r, new ui::LabelControl("Vert. Size"));
-  app.vertSlider_ = grid->setControl(c+1, r, new ui::HSliderControl(1.0, 200.0, 45.0, applyUI.get()));
+  app.vertSlider_ = grid->setControl(c+1, r, new ui::HSliderControl(.01, 200.0, 45.0, applyUI.get()));
   app.vertLabel_  = grid->setControl(c+2, r, new ui::LabelControl(app.vertSlider_.get()));
 
   r++;

Examples/CentroidEyePosition/main.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.
@@ -442,7 +442,7 @@ int main(int argc, char **argv)
   osg::ref_ptr<osgEarth::Map> map = simExamples::createDefaultExampleMap();
 
   // SDK viewer to display the scene
-  osg::ref_ptr<simVis::Viewer> viewer = new simVis::Viewer(simVis::Viewer::WINDOWED, 200, 100, 1024, 768);
+  osg::ref_ptr<simVis::Viewer> viewer = new simVis::Viewer();
   viewer->getViewer()->setThreadingModel(osgViewer::ViewerBase::ThreadingModel::SingleThreaded);
   viewer->setMap(map.get());
   viewer->setNavigationMode(simVis::NAVMODE_ROTATEPAN);

Examples/CustomRenderingTest/CustomRenderingTest.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.

Examples/DBReader/DBReader.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.

Examples/EciTrackHistoryTest/EciTrackHistoryTest.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.

Examples/GOGAttachments/ExampleGOGAttachments.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.
@@ -590,6 +590,12 @@ int main(int argc, char **argv)
   /// add some stock OSG handlers
   viewer->installDebugHandlers();
 
-  return viewer->run();
+  const int status = viewer->run();
+
+  // clean up resources held in static containers
+  s_attachments.clear();
+  s_overlayNodes.clear();
+
+  return status;
 }
 

Examples/GOGReader/GOGReader.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.
@@ -50,7 +50,6 @@
 #include "simVis/Scenario.h"
 #include "simVis/SceneManager.h"
 #include "simVis/Viewer.h"
-#include "simVis/GOG/GOG.h"
 #include "simVis/GOG/GogNodeInterface.h"
 #include "simVis/GOG/Loader.h"
 #include "simUtil/ExampleResources.h"
@@ -528,7 +527,7 @@ int main(int argc, char** argv)
   osg::ArgumentParser ap(&argc, argv);
 
   // start up a SIMDIS viewer
-  osg::ref_ptr<simVis::Viewer> viewer = new simVis::Viewer(simVis::Viewer::WINDOWED, 100, 100, 800, 800);
+  osg::ref_ptr<simVis::Viewer> viewer = new simVis::Viewer();
   viewer->setMap(map.get());
   osg::ref_ptr<simVis::SceneManager> scene = viewer->getSceneManager();
 
@@ -570,11 +569,10 @@ int main(int argc, char** argv)
   // add the gog file vector layers.
   for (const std::string& gogFile : gogFiles)
   {
-
     simCore::GOG::Parser parser;
     simVis::GOG::Loader loader(parser, scene->getMapNode());
     // sets a default reference location for relative GOGs:
-    loader.setReferencePosition(simVis::GOG::BSTUR.position());
+    loader.setReferencePosition(simCore::GOG::BSTUR);
 
     std::ifstream is(simCore::streamFixUtf8(gogFile));
     if (!is.is_open())

Examples/GateTest/GateTest.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.

Examples/GeoFencing/ExampleGeoFencing.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.

Examples/HudPositionManager/HudPositionTest.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.

Examples/ImageIcons/ImageIcons.cpp

@@ -14,7 +14,7 @@
  *               Washington, D.C. 20375-5339
  *
  * License for source code is in accompanying LICENSE.txt file. If you did
- * not receive a LICENSE.txt with this code, email simdis@enews.nrl.navy.mil.
+ * not receive a LICENSE.txt with this code, email [email protected].
  *
  * The U.S. Government retains all rights to use, duplicate, distribute,
  * disclose, or release this software.