Merged
Conversation
Contributor
Author
|
Few changes are required for this PR, currently making those. |
Contributor
Author
|
Changes done. I am not very clear as to what this PR was originally supposed to accomplish, but this fix builds! |
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## main #2343 +/- ##
==========================================
+ Coverage 50.72% 50.74% +0.03%
==========================================
Files 386 386
Lines 31970 31970
==========================================
+ Hits 16213 16220 +7
+ Misses 15757 15750 -7
☔ View full report in Codecov by Sentry. |
Contributor
|
There are some clang-tidy complaints, could you fix those ? |
198cf90 to
b158e54
Compare
Contributor
Author
Yep, done. Just needed to change a couple of variable names in GLRenderer. |
b158e54 to
880af9b
Compare
5 tasks
sjahr
reviewed
Sep 12, 2023
Contributor
sjahr
left a comment
There was a problem hiding this comment.
One minor thing to change. Otherwise, I think this is good to go. Thanks for picking it up!
moveit_core/collision_detection/src/collision_octomap_filter.cpp
Outdated
Show resolved
Hide resolved
86297d2 to
be8761e
Compare
sjahr
approved these changes
Sep 12, 2023
Limited the scope of variables in moveit_core/collision_detection
Co-authored-by: AndyZe <andyz@utexas.edu>
Co-authored-by: AndyZe <andyz@utexas.edu>
Co-authored-by: AndyZe <andyz@utexas.edu>
…rtual function and needs to be overriden
*Changed reinterpret_cast to double* from float*
be8761e to
972d827
Compare
tylerjw
approved these changes
Sep 14, 2023
m-elwin
pushed a commit
to m-elwin/moveit2
that referenced
this pull request
Dec 4, 2023
* Limiting the scope of variables moveit#874 Limited the scope of variables in moveit_core/collision_detection * Update moveit_core/collision_detection/src/collision_octomap_filter.cpp Co-authored-by: AndyZe <andyz@utexas.edu> * Update moveit_core/collision_detection/src/collision_octomap_filter.cpp Co-authored-by: AndyZe <andyz@utexas.edu> * Update moveit_core/collision_detection/src/collision_octomap_filter.cpp Co-authored-by: AndyZe <andyz@utexas.edu> * convert float to double * change double to float * Feedback fixes * Introduced variables removed from previous merge commit * Updated GL_Renderer function definitions with double instead of float * Changed update() function arguments to float since it is a derived virtual function and needs to be overriden * Fixed all override errors in visualization * *Fixed override errors in perception *Changed reinterpret_cast to double* from float* * change variable types to fit function definition * Fixed clang-tidy warnings * Fixed scope of reusable variables --------- Co-authored-by: Salah Soliman <salahsoliman96@gmail.com> Co-authored-by: AndyZe <andyz@utexas.edu> Co-authored-by: Henning Kayser <henningkayser@picknik.ai>
6 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixed merge conflicts by keeping the previous PR changes where float was converted to double, and accepted current changes for the rest.
Fixes #2322
Checklist