From 72fffbe135a32ca754a1a05168c0b8a0c1b41b9f Mon Sep 17 00:00:00 2001
From: "fabian.peller-konrad@kit.edu" <fabian.peller-konrad@kit.edu>
Date: Wed, 17 Jun 2020 17:50:35 +0200
Subject: [PATCH] fixed unity build namespace error
---
.../components/ObjectPoseObserver/ObjectPose.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/source/RobotAPI/components/ObjectPoseObserver/ObjectPose.cpp b/source/RobotAPI/components/ObjectPoseObserver/ObjectPose.cpp
index 2fd894a53..cb85b8b87 100644
--- a/source/RobotAPI/components/ObjectPoseObserver/ObjectPose.cpp
+++ b/source/RobotAPI/components/ObjectPoseObserver/ObjectPose.cpp
@@ -13,7 +13,6 @@
namespace armarx::objpose
{
-
Eigen::Vector3f toEigen(const Vector3BasePtr pose)
{
auto cast = Vector3Ptr::dynamicCast(pose);
@@ -48,13 +47,13 @@ namespace armarx::objpose
objectType = ice.objectType;
objectID = { ice.objectID.dataset, ice.objectID.name };
- objectPoseRobot = toEigen(ice.objectPoseRobot);
- objectPoseGlobal = toEigen(ice.objectPoseGlobal);
- objectPoseOriginal = toEigen(ice.objectPoseOriginal);
+ objectPoseRobot = armarx::objpose::toEigen(ice.objectPoseRobot);
+ objectPoseGlobal = armarx::objpose::toEigen(ice.objectPoseGlobal);
+ objectPoseOriginal = armarx::objpose::toEigen(ice.objectPoseOriginal);
objectPoseOriginalFrame = ice.objectPoseOriginalFrame;
robotConfig = ice.robotConfig;
- robotPose = toEigen(ice.robotPose);
+ robotPose = armarx::objpose::toEigen(ice.robotPose);
confidence = ice.confidence;
timestamp = IceUtil::Time::microSeconds(ice.timestampMicroSeconds);
--
GitLab