From 08917908f3c0ed5300a13e115c611e3efa9dd7c7 Mon Sep 17 00:00:00 2001 From: ozantonkal Date: Sat, 24 Aug 2013 13:15:44 +0200 Subject: [PATCH] remove eigen dependency --- modules/viz/src/precomp.hpp | 2 -- modules/viz/src/viz3d_impl.cpp | 18 ------------------ modules/viz/src/viz3d_impl.hpp | 8 -------- 3 files changed, 28 deletions(-) diff --git a/modules/viz/src/precomp.hpp b/modules/viz/src/precomp.hpp index 12a042c15..69d20a535 100644 --- a/modules/viz/src/precomp.hpp +++ b/modules/viz/src/precomp.hpp @@ -5,8 +5,6 @@ #include #include -#include - #if defined __GNUC__ #pragma GCC system_header #ifdef __DEPRECATED diff --git a/modules/viz/src/viz3d_impl.cpp b/modules/viz/src/viz3d_impl.cpp index 6e91338d3..f6d560da9 100644 --- a/modules/viz/src/viz3d_impl.cpp +++ b/modules/viz/src/viz3d_impl.cpp @@ -472,24 +472,6 @@ void cv::viz::Viz3d::VizImpl::allocVtkUnstructuredGrid (vtkSmartPointer::New (); } ////////////////////////////////////////////////////////////////////////////////////////////// -void cv::viz::convertToVtkMatrix (const Eigen::Vector4f &origin, const Eigen::Quaternion &orientation, vtkSmartPointer &vtk_matrix) -{ - // set rotation - Eigen::Matrix3f rot = orientation.toRotationMatrix (); - for (int i = 0; i < 3; i++) - for (int k = 0; k < 3; k++) - vtk_matrix->SetElement (i, k, rot (i, k)); - - // set translation - vtk_matrix->SetElement (0, 3, origin (0)); - vtk_matrix->SetElement (1, 3, origin (1)); - vtk_matrix->SetElement (2, 3, origin (2)); - vtk_matrix->SetElement (3, 3, 1.0f); -} - - -////////////////////////////////////////////////////////////////////////////////////////////// - void cv::viz::Viz3d::VizImpl::setFullScreen (bool mode) { if (window_) diff --git a/modules/viz/src/viz3d_impl.hpp b/modules/viz/src/viz3d_impl.hpp index 988b732f1..5dcd4bf85 100644 --- a/modules/viz/src/viz3d_impl.hpp +++ b/modules/viz/src/viz3d_impl.hpp @@ -190,17 +190,9 @@ namespace cv { namespace viz { - //void getTransformationMatrix (const Eigen::Vector4f &origin, const Eigen::Quaternionf& orientation, Eigen::Matrix4f &transformation); vtkSmartPointer convertToVtkMatrix (const cv::Matx44f &m); cv::Matx44f convertToMatx(const vtkSmartPointer& vtk_matrix); - /** \brief Convert origin and orientation to vtkMatrix4x4 - * \param[in] origin the point cloud origin - * \param[in] orientation the point cloud orientation - * \param[out] vtk_matrix the resultant VTK 4x4 matrix - */ - void convertToVtkMatrix (const Eigen::Vector4f &origin, const Eigen::Quaternion &orientation, vtkSmartPointer &vtk_matrix); - struct NanFilter { template