Commit e85c0349 authored by Dženan Zukić's avatar Dženan Zukić

ENH: use latest version of Eigen

parent f4f9b1e6
......@@ -117,9 +117,9 @@ VRPNDeviceClient::analogChangeHandler(void *userData, const _vrpn_ANALOGCB a)
if (a.num_channel >= 6)
{
deviceClient->m_orientation =
Rotd(a.channel[3]*M_PI,Vec3d::UnitX())*
Rotd(a.channel[4]*M_PI,Vec3d::UnitY())*
Rotd(a.channel[5]*M_PI,Vec3d::UnitZ());
Rotd(a.channel[3]*PI,Vec3d::UnitX())*
Rotd(a.channel[4]*PI,Vec3d::UnitY())*
Rotd(a.channel[5]*PI,Vec3d::UnitZ());
//LOG(DEBUG) << "analog: orientation = " << deviceClient->m_orientation.matrix();
}
}
......
......@@ -293,7 +293,7 @@ PbdModel::initializeDihedralConstraints(const double& stiffness)
auto triMesh = std::static_pointer_cast<SurfaceMesh>(m_mesh);
auto elements = triMesh->getTrianglesVertices();
// following algorithm is terrible, should use half-edge instead
std::vector<std::vector<unsigned int>> onering(triMesh->getNumVertices());
std::vector<std::vector<size_t>> onering(triMesh->getNumVertices());
for (size_t k = 0; k < elements.size(); ++k)
{
......
......@@ -143,7 +143,7 @@ VTKRenderDelegate::updateActorTransform()
m_transform->Identity();
m_transform->PostMultiply();
m_transform->Scale(scaling, scaling, scaling);
m_transform->RotateWXYZ(angleAxis.angle() * 180 / M_PI,
m_transform->RotateWXYZ(angleAxis.angle() * 180 / PI,
angleAxis.axis()[0],
angleAxis.axis()[1],
angleAxis.axis()[2]);
......
......@@ -95,7 +95,7 @@ VirtualCouplingPBDObject::computeTransform(Vec3d& pos, Quatd& quat, Eigen::Matri
Eigen::Affine3d rot =
Eigen::Affine3d(
Eigen::AngleAxisd(
angleAxis.angle() * 180 / M_PI,
angleAxis.angle() * 180 / PI,
Eigen::Vector3d(angleAxis.axis()[0],angleAxis.axis()[1],angleAxis.axis()[2])
)
);
......
......@@ -113,7 +113,7 @@ public:
void solve(const Vectord &rhs, Vectord &x);
private:
Eigen::SparseLU<SparseMatrixd, Eigen::COLAMDOrdering<MatrixType::Index>> m_solver;//?
Eigen::SparseLU<SparseMatrixd, Eigen::COLAMDOrdering<MatrixType::StorageIndex>> m_solver;//?
};
} // imstk
......
......@@ -47,28 +47,28 @@ namespace imstk
//}
template<typename SystemMatrixType>
Eigen::SparseTriangularView < SystemMatrixType, Eigen::Lower >
Eigen::TriangularView < SystemMatrixType, Eigen::Lower >
LinearSystem<SystemMatrixType>::getLowerTriangular() const
{
return m_A.template triangularView<Eigen::Lower>();
}
template<typename SystemMatrixType>
Eigen::SparseTriangularView < SystemMatrixType, Eigen::StrictlyLower >
Eigen::TriangularView < SystemMatrixType, Eigen::StrictlyLower >
LinearSystem<SystemMatrixType>::getStrictLowerTriangular() const
{
return m_A.template triangularView<Eigen::StrictlyLower>();
}
template<typename SystemMatrixType>
Eigen::SparseTriangularView < SystemMatrixType, Eigen::Upper >
Eigen::TriangularView < SystemMatrixType, Eigen::Upper >
LinearSystem<SystemMatrixType>::getUpperTrianglular() const
{
return m_A.template triangularView<Eigen::Upper>();
}
template<typename SystemMatrixType>
Eigen::SparseTriangularView < SystemMatrixType, Eigen::StrictlyUpper >
Eigen::TriangularView < SystemMatrixType, Eigen::StrictlyUpper >
LinearSystem<SystemMatrixType>::getStrictUpperTriangular() const
{
return m_A.template triangularView<Eigen::StrictlyUpper>();
......
......@@ -108,25 +108,25 @@ public:
///
/// \brief Returns template expression for the lower triangular part of A.
///
Eigen::SparseTriangularView < SystemMatrixType, Eigen::Lower >
Eigen::TriangularView < SystemMatrixType, Eigen::Lower >
getLowerTriangular() const;
///
/// \brief Returns template expression for the strict lower triangular part of A.
///
Eigen::SparseTriangularView < SystemMatrixType, Eigen::StrictlyLower >
Eigen::TriangularView < SystemMatrixType, Eigen::StrictlyLower >
getStrictLowerTriangular() const;
///
/// \brief Returns template expression for the upper triangular part of A.
///
Eigen::SparseTriangularView < SystemMatrixType, Eigen::Upper >
Eigen::TriangularView < SystemMatrixType, Eigen::Upper >
getUpperTrianglular() const;
///
/// \brief Returns template expression for the strict upper triangular part of A.
///
Eigen::SparseTriangularView < SystemMatrixType, Eigen::StrictlyUpper >
Eigen::TriangularView < SystemMatrixType, Eigen::StrictlyUpper >
getStrictUpperTriangular() const;
///
......
......@@ -4,7 +4,7 @@
include(imstkAddExternalProject)
imstk_add_external_project( Eigen
GIT_REPOSITORY ${git_protocol}://github.com/RLovelett/eigen.git
GIT_TAG 3.2.10
GIT_TAG 3.3.3
CONFIGURE_COMMAND ${SKIP_STEP_COMMAND}
BUILD_COMMAND ${SKIP_STEP_COMMAND}
INSTALL_COMMAND ${SKIP_STEP_COMMAND}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment