Skip to content
Snippets Groups Projects
Commit 28d5056d authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Make name more precise

parent a14ed3a4
No related branches found
No related tags found
1 merge request!283Resolve "Add component to interactively change the object instances in the memory via ArViz interactive"
...@@ -109,7 +109,7 @@ namespace armarx ...@@ -109,7 +109,7 @@ namespace armarx
if (isChanged) if (isChanged)
{ {
providingPoses.push_back(current.toProvidedObjectPose()); providingPoses.push_back(current.toProvidedObjectPoseGlobal());
objpose::ProvidedObjectPose& providing = providingPoses.back(); objpose::ProvidedObjectPose& providing = providingPoses.back();
providing.providerName = properties.providerName; providing.providerName = properties.providerName;
......
...@@ -172,7 +172,8 @@ namespace armarx::objpose ...@@ -172,7 +172,8 @@ namespace armarx::objpose
objpose::fromIce(provided.localOOBB, localOOBB); objpose::fromIce(provided.localOOBB, localOOBB);
} }
objpose::ProvidedObjectPose ObjectPose::toProvidedObjectPose() const // ToDo: We can provide ...Robot() and ...Original() versions as well.
objpose::ProvidedObjectPose ObjectPose::toProvidedObjectPoseGlobal() const
{ {
objpose::ProvidedObjectPose providedObjectPose; objpose::ProvidedObjectPose providedObjectPose;
......
...@@ -46,7 +46,7 @@ namespace armarx::objpose ...@@ -46,7 +46,7 @@ namespace armarx::objpose
void toIce(data::ObjectPose& ice) const; void toIce(data::ObjectPose& ice) const;
void fromProvidedPose(const data::ProvidedObjectPose& provided, VirtualRobot::RobotPtr robot = nullptr); void fromProvidedPose(const data::ProvidedObjectPose& provided, VirtualRobot::RobotPtr robot = nullptr);
objpose::ProvidedObjectPose toProvidedObjectPose() const; objpose::ProvidedObjectPose toProvidedObjectPoseGlobal() const;
void setObjectPoseRobot(const Eigen::Matrix4f& objectPoseRobot, bool updateObjectPoseGlobal = true); void setObjectPoseRobot(const Eigen::Matrix4f& objectPoseRobot, bool updateObjectPoseGlobal = true);
void setObjectPoseGlobal(const Eigen::Matrix4f& objectPoseGlobal, bool updateObjectPoseRobot = true); void setObjectPoseGlobal(const Eigen::Matrix4f& objectPoseGlobal, bool updateObjectPoseRobot = true);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment