diff --git a/CHANGELOG.md b/CHANGELOG.md index edbd767712..54b208fc7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,9 @@ release. ### Added - Added new csm plugins path to IsisPreferences [#5397](https://github.com/DOI-USGS/ISIS3/pull/5397) +### Fixed +- Fixed noproj bug where missing shapemodel-related keywords (RayTraceEngine, BulletParts, Tolerance) are dropped when the output label is created. This resulted in the Bullet collision detection engine not being used. Issue: [#5377](https://github.com/USGS-Astrogeology/ISIS3/issues/5377) + ## [8.1.0] - 2023-12-05 ### Changed @@ -73,7 +76,7 @@ release. ### Removed ### Fixed -- Bug fix for Cnetthinner app resolving divide by zero in CnetManager.cpp. Issue: [#5354](https://github.com/USGS-Astrogeology/ISIS3/issues/5354), +- Bug fix for Cnetthinner app resolving divide by zero in CnetManager.cpp. Issue: [#5354](https://github.com/USGS-Astrogeology/ISIS3/issues/5354) - Updated photomet MinnaertEmpirical model to support photemplate-style PVL format [#3621](https://github.com/DOI-USGS/ISIS3/issues/3621) - Fix matrix inversion errors in findfeatures due to bad FASTGEOM matrix transforms using a more robust implementation to detect these errors and throw exceptions. Images with these errors are captured and logged to the TONOTMATCHED file. Fixes [#4639](https://github.com/DOI-USGS/ISIS3/issues/4639) - Fixed findfeatures use of projected mosaics with correct check for TargetName in the Mapping labels. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) diff --git a/isis/src/base/apps/noproj/noproj.cpp b/isis/src/base/apps/noproj/noproj.cpp index e5083260f4..968fddd59d 100644 --- a/isis/src/base/apps/noproj/noproj.cpp +++ b/isis/src/base/apps/noproj/noproj.cpp @@ -260,7 +260,10 @@ namespace Isis { bool isTable = false; bool isFrameCode = kernelsKeyword.isNamed("NaifFrameCode") || kernelsKeyword.isNamed("NaifIkCode"); - bool isShapeModel = kernelsKeyword.isNamed("ShapeModel"); + bool isShapeModel = kernelsKeyword.isNamed("ShapeModel") || + kernelsKeyword.isNamed("RayTraceEngine") || + kernelsKeyword.isNamed("BulletParts") || + kernelsKeyword.isNamed("Tolerance"); for (int keyValueIndex = 0; keyValueIndex < kernelsKeyword.size(); keyValueIndex++) { if (kernelsKeyword[keyValueIndex] == "Table") { diff --git a/isis/src/base/apps/noproj/noproj.xml b/isis/src/base/apps/noproj/noproj.xml index cd312ee469..4e5f68144f 100644 --- a/isis/src/base/apps/noproj/noproj.xml +++ b/isis/src/base/apps/noproj/noproj.xml @@ -67,6 +67,15 @@ Refactored app to be callable and converted its tests to GTests. + + Added checks for ray tracing options in UofA OSIRIS-REx ISIS code base. + The keywords needed for Bullet to operate properly are RayTraceEngine, + BulletParts, and Tolerance. These parameters must be included in the + output label in order for cam2cam to run and subsequent use is consistent. + + + Incorporated Kris Becker's 2021-05-06 bug fix above into USGS code base. +