Skip to content
Snippets Groups Projects
Commit c8280165 authored by Fabian Reister's avatar Fabian Reister
Browse files

fixing bounding box for familiarobjectinstance

parent 7859d11e
No related branches found
No related tags found
No related merge requests found
Pipeline #21256 failed
...@@ -53,7 +53,7 @@ Core segment type of Object/Instance. ...@@ -53,7 +53,7 @@ Core segment type of Object/Instance.
<!-- Orientation of the bounding box in the 'sens' frame --> <!-- Orientation of the bounding box in the 'sens' frame -->
<ObjectChild key="boundingBoxOrientation"> <ObjectChild key="boundingBoxOrientation">
<FramedOrientation optional="true" /> <Orientation optional="true" />
</ObjectChild> </ObjectChild>
<!-- bounding box in local sensFrame (see poseSensFrame) --> <!-- bounding box in local sensFrame (see poseSensFrame) -->
......
...@@ -94,7 +94,7 @@ namespace armarx::armem::server::obj::familiar_object_instance ...@@ -94,7 +94,7 @@ namespace armarx::armem::server::obj::familiar_object_instance
if(familiarObject.boundingBoxOrientation.has_value()) if(familiarObject.boundingBoxOrientation.has_value())
{ {
obj_T_bb.linear() = familiarObject.boundingBoxOrientation->orientation.toRotationMatrix(); obj_T_bb.linear() = familiarObject.boundingBoxOrientation->toRotationMatrix();
} }
const Eigen::Isometry3f global_T_bb = global_T_obj * obj_T_bb; const Eigen::Isometry3f global_T_bb = global_T_obj * obj_T_bb;
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <SimoxUtility/meta/type_name.h> #include <SimoxUtility/meta/type_name.h>
#include <RobotAPI/interface/aron/Aron.h>
#include <RobotAPI/libraries/aron/codegeneration_util/TypeName.h> #include <RobotAPI/libraries/aron/codegeneration_util/TypeName.h>
namespace armarx::aron::codegenerator::cpp::generator namespace armarx::aron::codegenerator::cpp::generator
...@@ -176,7 +177,7 @@ namespace armarx::aron::codegenerator::cpp::generator ...@@ -176,7 +177,7 @@ namespace armarx::aron::codegenerator::cpp::generator
{ {
CppBlockPtr block_if_data = std::make_shared<CppBlock>(); CppBlockPtr block_if_data = std::make_shared<CppBlock>();
block_if_data->addLine("if (not (" + accessor + nextEl() + "isApprox(" + block_if_data->addLine("if (not (" + accessor + nextEl() + "isApprox(" +
otherInstanceAccessor + ")))"); (type.getMaybe() != type::Maybe::NONE ? "*" + otherInstanceAccessor : otherInstanceAccessor) + ")))");
block_if_data->addLineAsBlock("return false;"); block_if_data->addLineAsBlock("return false;");
return resolveMaybeEqualsBlock(block_if_data, accessor, otherInstanceAccessor); return resolveMaybeEqualsBlock(block_if_data, accessor, otherInstanceAccessor);
} }
......
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