Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed noproj bug where missing shapemodel-related keywords (RayTraceEngine, BulletParts, Tolerance) are dropped when the output label is created. #5378

Merged
merged 3 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ release.
### Added
- Added new csm plugins path to IsisPreferences [#5397](https://github.com/DOI-USGS/ISIS3/pull/5397)

### Fixed
- Fixed <i>noproj</i> 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
Expand Down Expand Up @@ -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 <i>findfeatures</i> 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 <b>TONOTMATCHED</b> file. Fixes [#4639](https://github.com/DOI-USGS/ISIS3/issues/4639)
- Fixed <i>findfeatures</i> use of projected mosaics with correct check for <b>TargetName</b> in the Mapping labels. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
Expand Down
5 changes: 4 additions & 1 deletion isis/src/base/apps/noproj/noproj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
9 changes: 9 additions & 0 deletions isis/src/base/apps/noproj/noproj.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@
<change name="Kaitlyn Lee" date="2021-03-31">
Refactored app to be callable and converted its tests to GTests.
</change>
<change name="Kris Becker" date="2021-05-06">
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.
</change>
<change name="Ken Edmundson" date="2023-12-14">
Incorporated Kris Becker's 2021-05-06 bug fix above into USGS code base.
</change>
</history>

<category>
Expand Down