From d1ae8e498a3ca9d04fc0b4aef04bf3cfd09c1568 Mon Sep 17 00:00:00 2001
From: Raphael Grimm <raphael.grimm@kit.edu>
Date: Mon, 25 Nov 2019 17:29:18 +0100
Subject: [PATCH] Adapt to upstream changes
---
CMakeLists.txt | 11 -----------
etc/cmake/UseRobotAPI.cmake | 2 --
.../components/DebugDrawer/DebugDrawerHelper.h | 4 ++--
3 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12a6ea10e..c7bd1763d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/etc/cmake/UseRobotAPI.cmake b/etc/cmake/UseRobotAPI.cmake
index de1c501c0..ddbb6cead 100644
--- a/etc/cmake/UseRobotAPI.cmake
+++ b/etc/cmake/UseRobotAPI.cmake
@@ -1,3 +1 @@
# This file contains macros for projects depending on RobotAPI
-find_package(Simox QUIET)
-find_package(Eigen3 QUIET)
diff --git a/source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h b/source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h
index 5656bc799..b2e14c046 100644
--- a/source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h
+++ b/source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h
@@ -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);
}
--
GitLab