Merge branch 'master' of github.com:libigl/libigl

Former-commit-id: 9486c1e1f1ad34d7e2736f18baf0c65951972191

include/igl/comiso/miq.cpp

@@ -1284,7 +1284,7 @@ IGL_INLINE void igl::PoissonSolver<DerivedV, DerivedF>::perElementRHS(int f,
 
   Eigen::Matrix<typename DerivedV::Scalar, 3, 1> K1,K2;
   K1 = PD1.row(f);
-  K2 = PD2.row(f);
+  K2 = -PD2.row(f); // TODO: the "-" accounts for the orientation of local_basis.h, adapt the code before and remove the "-"
 
   scaled_Kreal = K1*(vector_field_scale)/2;
   scaled_Kimag = K2*(vector_field_scale)/2;

include/igl/local_basis.cpp

@@ -1,9 +1,9 @@
 // This file is part of libigl, a simple c++ geometry processing library.
-// 
+//
 // Copyright (C) 2014 Alec Jacobson <alecjacobson@gmail.com>
-// 
-// 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 "local_basis.h"
 

tutorial/508_ConjugateField/main.cpp

@@ -55,12 +55,7 @@ bool key_down(igl::Viewer& viewer, unsigned char key, int modifier)
   if (key <'1' || key >'3')
     return false;
 
-  viewer.clear();
-  viewer.core.show_lines = false;
-  viewer.core.show_texture = false;
-
-  viewer.set_mesh(V, F);
-
+  viewer.data.lines.resize(0,9);
   // Highlight in red the constrained faces
   MatrixXd C = MatrixXd::Constant(F.rows(),3,1);
   for (unsigned i=0; i<F.rows();++i)
@@ -150,8 +145,11 @@ int main(int argc, char *argv[])
 
   // Launch the viewer
   igl::Viewer viewer;
-  key_down(viewer,'3',0);
   viewer.core.invert_normals = true;
+  viewer.core.show_lines = false;
+  viewer.core.show_texture = false;
+  viewer.set_mesh(V, F);
   viewer.callback_key_down = &key_down;
+  key_down(viewer,'3',0);
   viewer.launch();
 }

tutorial/509_Planarization/main.cpp

@@ -41,7 +41,7 @@ bool key_down(igl::Viewer& viewer, unsigned char key, int modifier)
     VectorXd planarity;
     igl::quad_planarity( VQC, FQC, planarity);
     MatrixXd Ct;
-    igl::jet(planarity, 0, 0.02, Ct);
+    igl::jet(planarity, 0, 0.01, Ct);
     MatrixXd C(FQCtri.rows(),3);
     C << Ct, Ct;
     viewer.set_colors(C);
@@ -63,7 +63,7 @@ bool key_down(igl::Viewer& viewer, unsigned char key, int modifier)
     VectorXd planarity;
     igl::quad_planarity( VQCplan, FQC, planarity);
     MatrixXd Ct;
-    igl::jet(planarity, 0, 0.02, Ct);
+    igl::jet(planarity, 0, 0.01, Ct);
     MatrixXd C(FQCtri.rows(),3);
     C << Ct, Ct;
     viewer.set_colors(C);

tutorial/CMakeLists.txt

@@ -41,6 +41,7 @@ add_subdirectory("305_QuadraticProgramming")
 add_subdirectory("401_BiharmonicDeformation")
 add_subdirectory("402_PolyharmonicDeformation")
 add_subdirectory("403_BoundedBiharmonicWeights")
+add_subdirectory("404_DualQuaternionSkinning")
 
 # Chapter 5
 add_subdirectory("501_HarmonicParam")

tutorial/images/508_ConjugateField.png.REMOVED.git-id

@@ -0,0 +1 @@
+251c8335a4f4aad1420dbd3743503dfe71ff4ed9

tutorial/images/509_Planarization.png.REMOVED.git-id

@@ -0,0 +1 @@
+c63f0e533d60258edf823f524c9fdedf29a53b9d

tutorial/images/607_LIM.png.REMOVED.git-id

@@ -0,0 +1 @@
+8e3efaad08e135f073207ab69f7929ca258f21b6

tutorial/tutorial.md.REMOVED.git-id

@@ -1 +1 @@
-dddc341ea3bd1f0592e5b2562f501efe0dbf1fad
+2f8b5fee4a92ff739615f011ed1a0dffc0ff55a7