Skip to content

Commit

Permalink
nits
Browse files Browse the repository at this point in the history
Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>
  • Loading branch information
Lobotuerk committed May 19, 2021
1 parent b27dbf5 commit 2592a48
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 19 deletions.
6 changes: 0 additions & 6 deletions bullet/src/KinematicsFeatures.cc
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,6 @@ FrameData3d KinematicsFeatures::FrameDataRelativeToWorld(
btVector3 omega = rigidBody->getAngularVelocity();
btVector3 vel = rigidBody->getLinearVelocity();

// Transform to world frame
// const auto matBaseToWorld =
// btMatrix3x3(rigidBody->getWorldToBaseRot()).inverse();
// omega = matBaseToWorld * omega;
// vel = matBaseToWorld * vel;

data.linearVelocity = convert(vel) + ignition::math::eigen3::convert(
ignition::math::eigen3::convert(convert(omega)).Cross(
-ignition::math::eigen3::convert(data.pose).Rot() *
Expand Down
13 changes: 0 additions & 13 deletions bullet/src/SDFFeatures_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -120,24 +120,11 @@ TEST(SDFFeatures_TEST, WorldIsParentOrChild)
CreateTestModel(world, "test0", std::nullopt, std::nullopt);
EXPECT_EQ(nullptr, joint);
}
/*
{
const auto &[model, joint] = CreateTestModel(world, "test1", parent, child);
EXPECT_NE(nullptr, joint);
}
*/
{
const auto &[model, joint] =
CreateTestModel(world, "test2", std::nullopt, child);
EXPECT_NE(nullptr, joint);
}
/*
{
const auto &[model, joint] =
CreateTestModel(world, "test3", parent, std::nullopt);
EXPECT_EQ(nullptr, joint);
}
*/
}

int main(int argc, char *argv[])
Expand Down

0 comments on commit 2592a48

Please sign in to comment.