-
Notifications
You must be signed in to change notification settings - Fork 41
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
Kinematics features #169
Merged
Lobotuerk
merged 2 commits into
bullet_classic_dev
from
bulletDev/lobotuerk/KinematicsFeatures
Nov 25, 2020
Merged
Kinematics features #169
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
#include <ignition/common/Console.hh> | ||
#include "KinematicsFeatures.hh" | ||
|
||
namespace ignition { | ||
namespace physics { | ||
namespace bullet { | ||
|
||
///////////////////////////////////////////////// | ||
FrameData3d KinematicsFeatures::FrameDataRelativeToWorld( | ||
const FrameID &_id) const | ||
{ | ||
FrameData3d data; | ||
|
||
// The feature system should never send us the world ID. | ||
if (_id.IsWorld()) | ||
{ | ||
ignerr << "Given a FrameID belonging to the world. This should not be " | ||
<< "possible! Please report this bug!\n"; | ||
assert(false); | ||
return data; | ||
} | ||
|
||
const auto linkID = _id.ID(); | ||
|
||
if (this->links.find(linkID) == this->links.end()) | ||
{ | ||
ignerr << "Given a FrameID not belonging to a link.\n"; | ||
return data; | ||
} | ||
const auto &linkInfo = this->links.at(linkID); | ||
const auto &model = linkInfo->link; | ||
|
||
const btVector3 pos = model->getCenterOfMassTransform().getOrigin(); | ||
const btMatrix3x3 mat = model->getCenterOfMassTransform().getBasis(); | ||
|
||
auto eigenMat = convert(mat); | ||
auto eigenVec = convert(pos); | ||
|
||
data.pose.linear() = eigenMat; | ||
data.pose.translation() = eigenVec; | ||
|
||
// Add base velocities | ||
btVector3 omega = model->getAngularVelocity(); | ||
btVector3 vel = model->getLinearVelocity(); | ||
// Transform to world frame | ||
// const auto matBaseToWorld = btMatrix3x3(model->getWorldToBaseRot()).inverse(); | ||
// omega = matBaseToWorld * omega; | ||
// vel = matBaseToWorld * vel; | ||
|
||
data.linearVelocity = convert(vel); | ||
data.angularVelocity = convert(omega); | ||
|
||
// \todo(anyone) compute frame accelerations | ||
|
||
return data; | ||
} | ||
|
||
} | ||
} | ||
} |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
#ifndef IGNITION_PHYSICS_BULLET_SRC_KINEMATICSFEATURES_HH_ | ||
#define IGNITION_PHYSICS_BULLET_SRC_KINEMATICSFEATURES_HH_ | ||
|
||
#include <ignition/physics/FrameSemantics.hh> | ||
#include <ignition/physics/FreeGroup.hh> | ||
|
||
#include "Base.hh" | ||
|
||
namespace ignition { | ||
namespace physics { | ||
namespace bullet { | ||
|
||
using KinematicsFeatureList = FeatureList< | ||
LinkFrameSemantics | ||
>; | ||
|
||
class KinematicsFeatures : | ||
public virtual Base, | ||
public virtual Implements3d<KinematicsFeatureList> | ||
{ | ||
public: FrameData3d FrameDataRelativeToWorld(const FrameID &_id) const; | ||
}; | ||
|
||
} | ||
} | ||
} | ||
|
||
#endif |
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we will the _id, which is a FrameID as a replacement to query the linkIDs I think we should something to exit the function cleanly in the case this function receives a not valid linkID.
I won't block this PR on that, but you can add a comment about it here so we remember later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added on 25225aa