Skip to content
Snippets Groups Projects
Commit d1ae8e49 authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Adapt to upstream changes

parent effbe69e
No related branches found
No related tags found
No related merge requests found
......@@ -17,19 +17,8 @@ set(ARMARX_ENABLE_AUTO_CODE_FORMATTING TRUE)
armarx_project("RobotAPI")
depends_on_armarx_package(ArmarXGui)
set(ArmarX_Simox_VERSION 2.3.72)
option(REQUIRE_SIMOX "If enabled the Simox dependency is a required dependency" TRUE)
if(REQUIRE_SIMOX)
find_package(Simox ${ArmarX_Simox_VERSION} REQUIRED)
else()
find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
endif()
add_subdirectory(source)
list(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "simox (= ${ArmarX_Simox_VERSION})")
install_project()
add_subdirectory(scenarios)
# This file contains macros for projects depending on RobotAPI
find_package(Simox QUIET)
find_package(Eigen3 QUIET)
......@@ -24,7 +24,7 @@
#pragma once
#include <VirtualRobot/Robot.h>
#include <VirtualRobot/math/OrientedBox.h>
#include <SimoxUtility/eigen/OrientedBox.h>
#include <RobotAPI/interface/visualization/DebugDrawerInterface.h>
#include <RobotAPI/libraries/core/Pose.h>
......@@ -87,7 +87,7 @@ namespace armarx::detail::DebugDrawerHelper
void drawBox(const std::string& name, const Eigen::Vector3f& position, float size, const DrawColor& color);
void drawBox(const std::string& name, const Eigen::Matrix4f& pose, float size, const DrawColor& color);
template<class FloatT>
void drawBox(const std::string& name, const VirtualRobot::OrientedBox<FloatT>& box, const DrawColor& color)
void drawBox(const std::string& name, const simox::OrientedBox<FloatT>& box, const DrawColor& color)
{
drawBox(name, box.template transformation_centered<float>(), box.template dimensions<float>(), color);
}
......
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