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.

Sign up for GitHub

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

Fix CTAD compile warnings #663

Merged
merged 2 commits into from
Jul 8, 2024
Merged

Fix CTAD compile warnings #663

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ad355c
Fix compile warning
iche033 Jul 1, 2024
d4f7b41
Merge branch 'gz-physics7' into fix_ctad
iche033 Jul 8, 2024
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
Next Next commit
Fix compile warning 
Signed-off-by: Ian Chen <ichen@openrobotics.org>
  • Loading branch information
@iche033
iche033 committed Jul 1, 2024
commit 3ad355cf0c5faa0251f5d21307400525acc505b2
8 changes: 4 additions & 4 deletions bullet-featherstone/src/JointFeatures.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@ double JointFeatures::GetJointForce(
// According to the documentation in btMultibodyLink.h,
// m_axesTop[0] is the joint axis for revolute joints.
Eigen::Vector3d axis = convert(link.getAxisTop(0));
math::Vector3 axis_converted(axis[0], axis[1], axis[2]);
math::Vector3d axis_converted(axis[0], axis[1], axis[2]);
btVector3 angular = feedback->m_reactionForces.getAngular();
math::Vector3<double> angularTorque(
math::Vector3d angularTorque(
angular.getX(),
angular.getY(),
angular.getZ());
Expand All @@ -193,9 +193,9 @@ double JointFeatures::GetJointForce(
else if (link.m_jointType == btMultibodyLink::ePrismatic)
{
auto axis = convert(link.getAxisBottom(0));
math::Vector3 axis_converted(axis[0], axis[1], axis[2]);
math::Vector3d axis_converted(axis[0], axis[1], axis[2]);
btVector3 linear = feedback->m_reactionForces.getLinear();
math::Vector3<double> linearForce(
math::Vector3d linearForce(
linear.getX(),
linear.getY(),
linear.getZ());
Expand Down
Loading