Skip to content

Commit

Permalink
Revert workaround for identity transform after geometry2 fix
Browse files Browse the repository at this point in the history
The workaround was introduced in PR ros2#298 and is now fixed
directly in geometry2
  • Loading branch information
botteroa-si authored and greimela-si committed Jul 30, 2018
1 parent 8ae0604 commit a2579d8
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions rviz_common/src/rviz_common/frame_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,6 @@ bool FrameManager::transform(
Ogre::Vector3 & position,
Ogre::Quaternion & orientation)
{
// TODO(Martin-Idel-SI): Remove when https://github.com/ros2/geometry2/issues/58 closed
if (frame == fixed_frame_) {
position = rviz_common::pointMsgToOgre(pose_msg.position);
orientation = rviz_common::quaternionMsgToOgre(pose_msg.orientation);

return true;
}

if (!adjustTime(frame, time)) {
return false;
}
Expand Down Expand Up @@ -308,11 +300,6 @@ bool FrameManager::frameHasProblems(
const std::string & frame,
std::string & error)
{
// TODO(Martin-Idel-SI): Remove when https://github.com/ros2/geometry2/issues/58 closed
if (frame == fixed_frame_) {
return false;
}

if (!buffer_->_frameExists(frame)) {
error = "Frame [" + frame + "] does not exist";
if (frame == fixed_frame_) {
Expand Down

0 comments on commit a2579d8

Please sign in to comment.