Skip to content

Commit

Permalink
Fixed noproj bug where missing shapemodel-related keywords (RayTraceE…
Browse files Browse the repository at this point in the history
…ngine, BulletParts, Tolerance) are dropped when the output label is created. (DOI-USGS#5378)

* 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. Addresses DOI-USGS#5377.

* Per review, moved changelog entry to the Unreleased section. Addresses DOI-USGS#5377.
  • Loading branch information
kledmundson authored and acpaquette committed Apr 18, 2024
1 parent 9aafcd2 commit ca3c984
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,14 @@ release.
- Fixed a bug in which the IrregularBodyCameraGroundMap unit test was removed but not the associated truth file. [#5461](https://github.com/DOI-USGS/ISIS3/issues/5461)
- Fixed a bug in which the histogram tool used the entire image to calculate bin size, which caused an issue with high dynamic range images. [#5371](https://github.com/DOI-USGS/ISIS3/issues/5371)
- Fixed a bug in which 'version' file was compiled as source and prevented subsequent ISIS recompilation [#5374](https://github.com/DOI-USGS/ISIS3/issues/5374)
- 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.0.2] - 2023-12-05
### Changed
- Cnetedit has been refactored to be callable; old Makefile tests have been removed and replaced by gtests. Issue: [#5346](https://github.com/USGS-Astrogeology/ISIS3/issues/5346),
- Cnetdiff has been refactored to be callable; old Makefile tests have been removed and replaced by gtests. Issue: [#5322](https://github.com/USGS-Astrogeology/ISIS3/issues/5322),
### 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)
- Fixed target name translation for any dawn images with target "4 CERES" [#5294](https://github.com/DOI-USGS/ISIS3/pull/5294)
- Fixed exception pop ups in qview when viewing images created using the CSM Camera [#5259](https://github.com/DOI-USGS/ISIS3/pull/5295/files)
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

0 comments on commit ca3c984

Please sign in to comment.