diff --git a/CHANGELOG.md b/CHANGELOG.md index c465613a4a..09a5d3286c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ ctest FunctionalTestJigsawApollo to validate this output. [#5710](https://github - Added ShowDeprecated option to show or hide warnings in IsisPreferences. [#5611](https://github.com/DOI-USGS/ISIS3/issues/5611) ### Changed +- Changed mechanism for specifying shapemodel RayTraceEngine keywords from IsisPreferences to BulletEngineSelect.pref file. BulletEngineSelect.pref was added to ISIS3/isis and CMakeLists.txt updated so that the file is copied to $ISISROOT by cmake. [#5807](https://github.com/DOI-USGS/ISIS3/issues/5807) - Removed Arm dependency on xalan-c, as it does not build for now on conda-forge. This requires turning off doc building on Arm. Also changed some variables to avoid name clashes on Arm with clang 16. [#5802])(https://github.com/DOI-USGS/ISIS3/pull/5802) - Update OSIRIS-REx OCams instrument (Map, Poly, & SamCam) support to current state in UofA code base [#5426](https://github.com/DOI-USGS/ISIS3/issues/5426) - Enhanced csminit by removing the need to specify model and plugin [#5585](https://github.com/DOI-USGS/ISIS3/issues/5585) diff --git a/isis/BulletEngineSelect.pref b/isis/BulletEngineSelect.pref new file mode 100644 index 0000000000..2e3a9a451a --- /dev/null +++ b/isis/BulletEngineSelect.pref @@ -0,0 +1,18 @@ +######################################################## +# Specifies Bullet ray-tracing engine for processing with +# shape models. +# +# RayTraceEngine = Bullet +# OnError = Continue | Fail +# Tolerance = { numerical value that will be set as the +# tolerance for the Bullet or Embree shape +# model } +# +######################################################## + +Group = ShapeModel + RayTraceEngine = Bullet + OnError = Continue +EndGroup + +End diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt index 9bbde008e1..325988bcb5 100644 --- a/isis/CMakeLists.txt +++ b/isis/CMakeLists.txt @@ -421,6 +421,7 @@ install(CODE "EXECUTE_PROCESS(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/libisis$ install(CODE "EXECUTE_PROCESS(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/libisis${VERSION_MAJOR}${SO})") EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/TestPreferences ${CMAKE_BINARY_DIR}/) install(CODE "EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/IsisPreferences ${CMAKE_INSTALL_PREFIX}/)") +install(CODE "EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/BulletEngineSelect.pref ${CMAKE_INSTALL_PREFIX}/)") # Install the header files install(CODE "EXECUTE_PROCESS(COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/include/isis)") @@ -615,12 +616,14 @@ add_custom_target(clean_source COMMAND rm -rf "${CMAKE_BINARY_DIR}/*" "${CMAKE_I # Set up a few top level files for installation. EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/IsisPreferences ${CMAKE_BINARY_DIR}) +EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/BulletEngineSelect.pref ${CMAKE_BINARY_DIR}) EXECUTE_PROCESS(COMMAND cp -rf ${CMAKE_SOURCE_DIR}/scripts ${CMAKE_BINARY_DIR}) EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/../LICENSE.md ${CMAKE_BINARY_DIR}) EXECUTE_PROCESS(COMMAND cp -rf ${CMAKE_SOURCE_DIR}/make ${CMAKE_BINARY_DIR}) # Copy the files on make install as well install(FILES ${CMAKE_SOURCE_DIR}/IsisPreferences DESTINATION ${CMAKE_INSTALL_PREFIX}) +install(FILES ${CMAKE_SOURCE_DIR}/BulletEngineSelect.pref DESTINATION ${CMAKE_INSTALL_PREFIX}) install(FILES ${CMAKE_SOURCE_DIR}/../LICENSE.md DESTINATION ${CMAKE_INSTALL_PREFIX}) install(FILES ${CMAKE_SOURCE_DIR}/../AUTHORS.rst DESTINATION ${CMAKE_INSTALL_PREFIX}) install(FILES ${CMAKE_SOURCE_DIR}/../CHANGELOG.md DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/isis/IsisPreferences b/isis/IsisPreferences index 119df760b9..857fe80dcb 100644 --- a/isis/IsisPreferences +++ b/isis/IsisPreferences @@ -51,28 +51,6 @@ Group = ErrorFacility StackTrace = Off EndGroup -######################################################## -# Specify which ray-tracing engine to use for shape -# models. -# -# Leave the ShapeModel Group commented-out to continue -# using the ISIS default. -# -# RayTraceEngine = Bullet | Embree -# OnError = Continue | Fail -# Tolerance = { numerical value that will be set as the -# tolerance for the Bullet or Embree shape -# model } -# -######################################################## - -#Group = ShapeModel -# RayTraceEngine = Embree -# OnError = Continue -# CubeSupported = False -# Tolerance = DBL_MAX -#EndGroup - ######################################################## # Customize how session logging is handled # diff --git a/isis/TestPreferences b/isis/TestPreferences index e6d7497853..1694bdc22a 100644 --- a/isis/TestPreferences +++ b/isis/TestPreferences @@ -49,28 +49,6 @@ Group = ErrorFacility StackTrace = Off EndGroup -######################################################## -# Specify which ray-tracing engine to use for shape -# models. -# -# Leave the ShapeModel Group commented-out to continue -# using the ISIS default. -# -# RayTraceEngine = Bullet | Embree -# OnError = Continue | Fail -# Tolerance = { numerical value that will be set as the -# tolerance for the Bullet or Embree shape -# model } -# -######################################################## - -#Group = ShapeModel -# RayTraceEngine = Embree -# OnError = Continue -# CubeSupported = False -# Tolerance = DBL_MAX -#EndGroup - ######################################################## # Customize how session logging is handled # diff --git a/isis/src/base/apps/spiceinit/spiceinit.xml b/isis/src/base/apps/spiceinit/spiceinit.xml index 4d3cc2b3df..dfc90a8b59 100644 --- a/isis/src/base/apps/spiceinit/spiceinit.xml +++ b/isis/src/base/apps/spiceinit/spiceinit.xml @@ -90,9 +90,11 @@ not have their paths expanded. This is to allow variables like $msg/ to work correctly.

- The spiceinit program will also add the RayTraceEngine, OnError, and Tolerance keywords to the Kernels - group if specified in the IsisPreferences file. If included, these keywords specify the ray-tracing engine to use and how to use it for shapemodels. - Please see the IsisPreferences file for more details. + The spiceinit program will add the RayTraceEngine, OnError, and Tolerance keywords to the Kernels + group if specified in the preference file BulletEngineSelect.pref. These keywords set the + ray-tracing engine to use and how to use it for processing with shapemodels. To include these + keywords, run spiceinit with shape=user, a specified shape model, and + -pref=$ISISROOT/BulletEngineSelect.pref on the command line.

Troubleshooting: If spiceinit is failing with the error