MERGE

Former-commit-id: 19dfb7443f623170f09db0c298103f03d7c62f3d

include/igl/svd3x3/arap.cpp

@@ -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/.
 #include "arap.h"
 #include <igl/colon.h>
@@ -18,7 +18,6 @@
 #include <igl/arap_rhs.h>
 #include <igl/repdiag.h>
 #include <igl/columnize.h>
-#include <igl/matlab/MatlabWorkspace.h>
 #include "fit_rotations.h"
 #include <cassert>
 #include <iostream>
@@ -252,7 +251,7 @@ IGL_INLINE bool igl::arap_solve(
       eff_R.resize(Rdim,num_rots*Rdim);
       for(int r = 0;r<num_rots;r++)
       {
-        eff_R.block(0,Rdim*r,Rdim,Rdim) = 
+        eff_R.block(0,Rdim*r,Rdim,Rdim) =
           R.block(0,Rdim*data.G(r),Rdim,Rdim);
       }
     }
@@ -260,7 +259,7 @@ IGL_INLINE bool igl::arap_solve(
     MatrixXd Dl;
     if(data.with_dynamics)
     {
-      assert(data.M.rows() == n && 
+      assert(data.M.rows() == n &&
         "No mass matrix. Call arap_precomputation if changing with_dynamics");
       const double h = data.h;
       assert(h != 0);

tutorial/106_Picking/CMakeLists.txt → tutorial/607_Picking/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-project(106_Picking)
+project(607_Picking)
 
 include("../CMakeLists.shared")
 

tutorial/607_LIM/CMakeLists.txt → tutorial/608_LIM/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-project(607_LIM)
+project(608_LIM)
 
 include("../CMakeLists.shared")
 find_package(LIM REQUIRED)

tutorial/CMakeLists.txt

@@ -19,9 +19,6 @@ add_subdirectory("102_DrawMesh")
 add_subdirectory("103_Events")
 add_subdirectory("104_Colors")
 add_subdirectory("105_Overlays")
-if(EMBREE_FOUND)
-add_subdirectory("106_Picking")
-endif(EMBREE_FOUND)
 
 # Chapter 2
 add_subdirectory("201_Normals")
@@ -43,6 +40,7 @@ add_subdirectory("402_PolyharmonicDeformation")
 add_subdirectory("403_BoundedBiharmonicWeights")
 add_subdirectory("404_DualQuaternionSkinning")
 add_subdirectory("405_AsRigidAsPossible")
+add_subdirectory("406_FastAutomaticSkinningTransformations")
 
 # Chapter 5
 add_subdirectory("501_HarmonicParam")
@@ -67,5 +65,6 @@ add_subdirectory("604_Triangle")
 add_subdirectory("605_Tetgen")
 if(EMBREE_FOUND)
 add_subdirectory("606_AmbientOcclusion")
+add_subdirectory("607_Picking")
 endif(EMBREE_FOUND)
-add_subdirectory("607_LIM")
+add_subdirectory("608_LIM")

tutorial/tutorial.md.REMOVED.git-id

@@ -1 +1 @@
-2f6111c27f2a0e83a06f51cbc61ff326e5d191a7
+8dcbd924cd9f668749bcabb4389119deba946317