Direct delta mush python binding

README.md

@@ -45,4 +45,3 @@ To run the tests:
 python setup.py test
 ```
 
-

azure-pipelines.yml

@@ -51,6 +51,7 @@ jobs:
       python -m pip install --upgrade pip
       pip install numpy
       pip install scipy
+      pip install packaging
     displayName: 'Install dependencies'
 
   - script: |

cmake/PyiglDownloadExternal.cmake

@@ -37,7 +37,7 @@ function(pyigl_download_test_data)
 	pyigl_download_project(test_data
 		SOURCE_DIR "${PYLIBIGL_EXTERNAL}/../data"
 		GIT_REPOSITORY https://github.com/libigl/libigl-tests-data
-		GIT_TAG        fa8ee953a64a560f24553dd8bda0c6cd4fbb5353
+		GIT_TAG        19cedf96d70702d8b3a83eb27934780c542356fe
 	)
 endfunction()
 
@@ -46,7 +46,7 @@ function(pyigl_download_tutorial_data)
 	pyigl_download_project(tutorial_data
 		SOURCE_DIR "${PYLIBIGL_EXTERNAL}/../tutorial/data"
 		GIT_REPOSITORY https://github.com/libigl/libigl-tutorial-data
-		GIT_TAG        38bbed76692710af038b90c69bf33d6d0f99476d
+		GIT_TAG        c1f9ede366d02e3531ecbaec5e3769312f31cccd
 	)
 endfunction()
 

setup.py

@@ -4,7 +4,7 @@
 import platform
 import subprocess
 
-from distutils.version import LooseVersion
+from packaging.version import Version
 from setuptools import setup, Extension, find_packages
 from setuptools.command.build_ext import build_ext
 
@@ -24,8 +24,8 @@ def run(self):
 
         # self.debug = True
 
-        cmake_version = LooseVersion(re.search(r'version\s*([\d.]+)', out.decode()).group(1))
-        if cmake_version < '3.2.0':
+        cmake_version = Version(re.search(r'version\s*([\d.]+)', out.decode()).group(1))
+        if cmake_version < Version('3.2.0'):
             raise RuntimeError("CMake >= 3.2.0 is required")
 
         for ext in self.extensions:

src/direct_delta_mush.cpp

@@ -0,0 +1,109 @@
+#include <common.h>
+#include <npe.h>
+#include <typedefs.h>
+#include <igl/direct_delta_mush.h>
+
+const char* ds_direct_delta_mush = R"igl_Qu8mg5v7(
+Perform Direct Delta Mush Skinning. 
+Computes Direct Delta Mesh Skinning (Variant 0) from 
+"Direct Delta Mush Skinning and Variants"
+
+Parameters
+----------
+v  #V by 3 list of rest pose vertex positions
+t  #E*4 by 3 list of bone pose transformations
+omega #V by #E*10 list of precomputated matrix values
+
+Returns
+-------
+u  #V by 3 list of output vertex positions
+
+See also
+--------
+
+
+Notes
+-----
+None
+
+Examples
+--------
+)igl_Qu8mg5v7";
+
+npe_function(direct_delta_mush)
+npe_doc(ds_direct_delta_mush)
+
+npe_arg(v, dense_double)
+npe_arg(t, dense_double)
+npe_arg(omega, dense_double)
+
+npe_begin_code()
+  assert_cols_equals(v, 3, "v");
+  assert_valid_bone_transforms(t, "t");
+  assert_rows_equals(t, (omega.cols() * 4) / 10, "t");
+
+  std::vector<Eigen::Affine3d, Eigen::aligned_allocator<Eigen::Affine3d>> 
+      t_affine(t.rows() / 4);
+
+  for(int bone = 0; bone < t_affine.size(); ++bone)
+  {
+    t_affine[bone] = Eigen::Affine3d::Identity();
+    t_affine[bone].matrix().block(0, 0, 3, 4) = t.block(bone * 4, 0, 4, 3).transpose();
+  }
+
+  EigenDenseLike<npe_Matrix_v> u;
+  igl::direct_delta_mush(v, t_affine, omega, u);
+  return npe::move(u);
+
+npe_end_code()
+
+const char* ds_direct_delta_mush_precomp = R"igl_Qu8mg5v7(
+Do the Omega precomputation necessary for Direct Delta Mush Skinning.
+
+Parameters
+----------
+v  #V by 3 list of rest pose vertex positions
+f  #F by 3 list of triangle indices into rows of V
+w  #V by #Edges list of weights
+p  number of smoothing iterations
+lambda  rotation smoothing step size
+kappa   translation smoothness step size
+alpha   translation smoothness blending weight
+
+Returns
+-------
+omega : #V by #E*10 list of precomputated matrix values
+
+See also
+--------
+
+
+Notes
+-----
+None
+
+Examples
+--------
+)igl_Qu8mg5v7";
+
+npe_function(direct_delta_mush_precomputation)
+npe_doc(ds_direct_delta_mush_precomp)
+
+npe_arg(v, dense_double)
+npe_arg(f, dense_int, dense_long, dense_longlong)
+npe_arg(w, npe_matches(v))
+npe_arg(p, int)
+npe_arg(lambda, double)
+npe_arg(kappa, double)
+npe_arg(alpha, double)
+
+npe_begin_code()
+  assert_valid_3d_tri_mesh(v, f);
+
+  Eigen::MatrixXd w_copy = w.template cast<double>();
+
+  EigenDenseLike<npe_Matrix_v> omega;
+  igl::direct_delta_mush_precomputation(v, f, w_copy, p, lambda, kappa, alpha, omega);
+  return npe::move(omega);
+
+npe_end_code()

src/include/common.h

@@ -311,3 +311,21 @@ void assert_valid_2d_tri_mesh(const TV& v, const TF& f, std::string v_name="v",
                                     ".shape = [" + std::to_string(f.rows()) + ", " + std::to_string(f.cols()) + "]");
     }
 }
+
+template <typename TV>
+void assert_valid_bone_transforms(const TV& t, std::string t_name="t") {
+    if (t.rows() <= 0) {
+        throw pybind11::value_error("Invalid number of transforms, " + t_name + " has zero rows (" + t_name +
+                                    ".shape = [" + std::to_string(t.rows()) + ", " + std::to_string(t.cols()) + "]) ");
+    }
+
+    if (t.cols() != 3) {
+        throw pybind11::value_error("Invalid number of cols in transforms, " + t_name + " must have shape [#bones * 4, 3] but got " + t_name +
+                                    ".shape = [" + std::to_string(t.rows()) + ", " + std::to_string(t.cols()) + "]");
+    }
+
+    if (t.rows() % 4 != 0) {
+        throw pybind11::value_error("Invalid number of rows in transforms, " + t_name + " must have shape [#bones * 4, 3] but got " + t_name +
+                                    ".shape = [" + std::to_string(t.rows()) + ", " + std::to_string(t.cols()) + "].");   
+    }
+}