Skip to content

Commit

Permalink
Merge branch 'ign-gazebo4' into jennuine/follow_offset_service
Browse files Browse the repository at this point in the history
  • Loading branch information
jennuine authored Jun 10, 2021
2 parents 141b1a5 + 5694336 commit 85b559c
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions src/gui/plugins/scene3d/Scene3D.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1652,10 +1652,6 @@ void IgnRenderer::HandleMouseViewControl()
<< std::endl;
}

math::Vector3d camWorldPos;
if (!this->dataPtr->followTarget.empty())
this->dataPtr->camera->WorldPosition();

this->dataPtr->viewControl.SetCamera(this->dataPtr->camera);

if (this->dataPtr->mouseEvent.Type() == common::MouseEvent::SCROLL)
Expand Down Expand Up @@ -1708,13 +1704,7 @@ void IgnRenderer::HandleMouseViewControl()


if (!this->dataPtr->followTarget.empty())
{
math::Vector3d dPos = this->dataPtr->camera->WorldPosition() - camWorldPos;
if (dPos != math::Vector3d::Zero)
{
this->dataPtr->followOffsetDirty = true;
}
}
this->dataPtr->followOffsetDirty = true;
}

/////////////////////////////////////////////////
Expand Down

0 comments on commit 85b559c

Please sign in to comment.