- compilation fixes for the tutorials in chapter 4

Former-commit-id: 2bd5cadaf2132cae9be4223a46079028a0fe9331

include/igl/column_to_quats.h

@@ -1,9 +1,9 @@
 // This file is part of libigl, a simple c++ geometry processing library.
-// 
+//
 // Copyright (C) 2013 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/.
 #ifndef IGL_COLUMN_TO_QUATS_H
 #define IGL_COLUMN_TO_QUATS_H
@@ -28,9 +28,7 @@ namespace igl
 }
 
 #ifndef IGL_STATIC_LIBRARY
-#  include "columns_to_quats.cpp"
+#  include "column_to_quats.cpp"
 #endif
 
 #endif
-
-

include/igl/deform_skeleton.cpp

@@ -13,7 +13,7 @@ void igl::deform_skeleton(
   BET.resize(BE.rows(),2);
   for(int e = 0;e<BE.rows();e++)
   {
-    BET(e,0) = 2*e; 
+    BET(e,0) = 2*e;
     BET(e,1) = 2*e+1;
     Affine3d a = vA[e];
     Vector3d c0 = C.row(BE(e,0));
@@ -32,12 +32,12 @@ IGL_INLINE void igl::deform_skeleton(
   Eigen::MatrixXi & BET)
 {
   using namespace Eigen;
-  assert(BE.rows() == (int)vA.size());
+  //assert(BE.rows() == (int)vA.size());
   CT.resize(2*BE.rows(),C.cols());
   BET.resize(BE.rows(),2);
   for(int e = 0;e<BE.rows();e++)
   {
-    BET(e,0) = 2*e; 
+    BET(e,0) = 2*e;
     BET(e,1) = 2*e+1;
     Affine3d a;
     a.matrix() = T.block(e*4,0,4,3).transpose();

tutorial/403_BoundedBiharmonicWeights/CMakeLists.txt

@@ -3,6 +3,8 @@ project(403_BoundedBiharmonicWeights)
 
 include("../CMakeLists.shared")
 
+add_definitions(-DIGL_NO_MOSEK)
+
 set(SOURCES
 ${PROJECT_SOURCE_DIR}/main.cpp
 )

tutorial/CMakeLists.txt

@@ -25,6 +25,11 @@ add_subdirectory("303_LaplaceEquation")
 add_subdirectory("304_LinearEqualityConstraints")
 add_subdirectory("305_QuadraticProgramming")
 
+# Chapter 4
+add_subdirectory("401_BiharmonicDeformation")
+add_subdirectory("402_PolyharmonicDeformation")
+add_subdirectory("403_BoundedBiharmonicWeights")
+
 # Chapter 5
 add_subdirectory("501_HarmonicParam")
 add_subdirectory("502_LSCMParam")