diff --git a/include/igl/dqs.cpp b/include/igl/dqs.cpp index aab3c6532..56090ef47 100644 --- a/include/igl/dqs.cpp +++ b/include/igl/dqs.cpp @@ -1,9 +1,9 @@ // This file is part of libigl, a simple c++ geometry processing library. -// +// // Copyright (C) 2014 Alec Jacobson -// -// This Source Code Form is subject to the terms of the Mozilla Public License -// v. 2.0. If a copy of the MPL was not distributed with this file, You can +// +// This Source Code Form is subject to the terms of the Mozilla Public License +// v. 2.0. If a copy of the MPL was not distributed with this file, You can // obtain one at http://mozilla.org/MPL/2.0/. #include "dqs.h" #include @@ -15,8 +15,8 @@ template < typename T, typename DerivedU> IGL_INLINE void igl::dqs( - const Eigen::PlainObjectBase & V, - const Eigen::PlainObjectBase & W, + const Eigen::MatrixBase & V, + const Eigen::MatrixBase & W, const std::vector & vQ, const std::vector & vT, Eigen::PlainObjectBase & U) @@ -70,5 +70,5 @@ IGL_INLINE void igl::dqs( #ifdef IGL_STATIC_LIBRARY // Explicit template instantiation -template void igl::dqs, Eigen::Matrix, Eigen::Quaternion, Eigen::aligned_allocator >, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, std::vector, Eigen::aligned_allocator > > const&, std::vector, std::allocator > > const&, Eigen::PlainObjectBase >&); +template void igl::dqs, Eigen::Matrix, Eigen::Quaternion, Eigen::aligned_allocator >, Eigen::Matrix, Eigen::Matrix >(Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, std::vector, Eigen::aligned_allocator > > const&, std::vector, std::allocator > > const&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/dqs.h b/include/igl/dqs.h index 9b53ae1c7..288d308fd 100644 --- a/include/igl/dqs.h +++ b/include/igl/dqs.h @@ -1,9 +1,9 @@ // This file is part of libigl, a simple c++ geometry processing library. -// +// // Copyright (C) 2014 Alec Jacobson -// -// This Source Code Form is subject to the terms of the Mozilla Public License -// v. 2.0. If a copy of the MPL was not distributed with this file, You can +// +// This Source Code Form is subject to the terms of the Mozilla Public License +// v. 2.0. If a copy of the MPL was not distributed with this file, You can // obtain one at http://mozilla.org/MPL/2.0/. #ifndef IGL_DQS_H #define IGL_DQS_H @@ -17,7 +17,7 @@ namespace igl // Inputs: // V #V by 3 list of rest positions // W #W by #C list of weights - // vQ #C list of rotation quaternions + // vQ #C list of rotation quaternions // vT #C list of translation vectors // Outputs: // U #V by 3 list of new positions @@ -29,8 +29,8 @@ namespace igl typename T, typename DerivedU> IGL_INLINE void dqs( - const Eigen::PlainObjectBase & V, - const Eigen::PlainObjectBase & W, + const Eigen::MatrixBase & V, + const Eigen::MatrixBase & W, const std::vector & vQ, const std::vector & vT, Eigen::PlainObjectBase & U);