Merge remote-tracking branch 'origin/master' into aron/image

source/RobotAPI/components/ArViz/Client/Elements.h

@@ -16,7 +16,6 @@
 
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 
-#include <SimoxUtility/EigenStdVector.h>
 #include <SimoxUtility/math/normal/normal_to_mat4.h>
 #include <SimoxUtility/math/convert/rpy_to_mat3f.h>
 #include <SimoxUtility/math/pose/transform.h>

source/RobotAPI/components/ArViz/Client/elements/Mesh.h

@@ -2,8 +2,9 @@
 
 #include <functional>
 #include <numeric>  // for std::accumulate
+#include <vector>
 
-#include <SimoxUtility/EigenStdVector.h>
+#include <Eigen/Core>
 
 #include <ArmarXCore/util/CPPUtility/Iterator.h>
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>

source/RobotAPI/components/ArViz/Coin/ElementVisualizer.cpp

-#include <SimoxUtility/EigenStdVector.h>
-
 #include "ElementVisualizer.h"
 
 #include <RobotAPI/components/ArViz/IceConversions.h>

source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.h

@@ -32,7 +32,6 @@
 #include <shared_mutex>
 
 // Eigen
-#include <SimoxUtility/EigenStdVector.h>
 #include <Eigen/Geometry>
 
 // Ice

source/RobotAPI/libraries/core/CMakeLists.txt

@@ -60,7 +60,6 @@ set(LIB_FILES
 )
 
 set(LIB_HEADERS
-    EigenStl.h
     PIDController.h
     MultiDimPIDController.h
     Trajectory.h

source/RobotAPI/libraries/core/EigenStl.h

-/*
-* This file is part of ArmarX.
-*
-* ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License version 2 as
-* published by the Free Software Foundation.
-*
-* ArmarX is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-* @author     Simon Ottenhaus (simon dot ottenhaus at kit dot edu)
-* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
-*             GNU General Public License
-*/
-
-
-// allow std vector to be used with Eigen objects
-#include<Eigen/StdVector>
-#ifndef EIGEN_STL_VECTOR_SPECIFICATION_DEFINED
-#define EIGEN_STL_VECTOR_SPECIFICATION_DEFINED
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Vector2f)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Vector3f)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Vector4f)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::VectorXf)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Matrix2f)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Matrix3f)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Matrix4f)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::MatrixXf)
-
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Vector3d)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Vector3i)
-#endif

source/RobotAPI/libraries/core/observerfilters/MedianDerivativeFilterV3.h

@@ -23,7 +23,6 @@
  */
 #pragma once
 
-#include <RobotAPI/libraries/core/EigenStl.h>
 #include <ArmarXCore/observers/filters/MedianFilter.h>
 #include <RobotAPI/libraries/core/FramedPose.h>
 #include <RobotAPI/interface/core/PoseBase.h>

source/RobotAPI/libraries/core/observerfilters/PoseMedianOffsetFilter.h

@@ -23,7 +23,6 @@
  */
 #pragma once
 
-#include <RobotAPI/libraries/core/EigenStl.h>
 #include <ArmarXCore/observers/filters/MedianFilter.h>
 #include <RobotAPI/libraries/core/FramedPose.h>
 #include <RobotAPI/interface/core/PoseBase.h>
@@ -69,5 +68,3 @@ namespace armarx::filters
     };
 
 } // namespace Filters
-
-