merge

Former-commit-id: da9b6a48ccd20b3ae5ca2f481b90049d76e3dc61

include/igl/viewer/ViewerData.cpp

@@ -71,8 +71,8 @@ IGL_INLINE void igl::ViewerData::set_mesh(const Eigen::MatrixXd& _V, const Eigen
   // If V only has two columns, pad with a column of zeros
   if (_V.cols() == 2)
   {
-    V_temp = Eigen::MatrixXd::Zero(V.rows(),3);
-    V_temp.block(0,0,V.rows(),2) = _V;
+    V_temp = Eigen::MatrixXd::Zero(_V.rows(),3);
+    V_temp.block(0,0,_V.rows(),2) = _V;
   }
   else
     V_temp = _V;
@@ -92,7 +92,7 @@ IGL_INLINE void igl::ViewerData::set_mesh(const Eigen::MatrixXd& _V, const Eigen
   }
   else
   {
-    if (V.rows() == V.rows() && F.rows() == F.rows())
+    if (_V.rows() == V.rows() && _F.rows() == F.rows())
     {
       V = V_temp;
       F = _F;
@@ -214,7 +214,7 @@ IGL_INLINE void igl::ViewerData::set_texture(
 }
 
 IGL_INLINE void igl::ViewerData::set_points(
-  const Eigen::MatrixXd& P,  
+  const Eigen::MatrixXd& P,
   const Eigen::MatrixXd& C)
 {
   // clear existing points

tutorial/501_HarmonicParam/main.cpp

@@ -11,11 +11,17 @@ Eigen::MatrixXd V_uv;
 bool key_down(igl::Viewer& viewer, unsigned char key, int modifier)
 {
   if (key == '1')
+  {
     // Plot the 3D mesh
     viewer.data.set_mesh(V,F);
+    viewer.core.align_camera_center(V,F);
+  }
   else if (key == '2')
+  {
     // Plot the mesh in 2D using the UV coordinates as vertex coordinates
     viewer.data.set_mesh(V_uv,F);
+    viewer.core.align_camera_center(V_uv,F);
+  }
 
   viewer.data.compute_normals();
 

tutorial/502_LSCMParam/main.cpp

@@ -12,11 +12,17 @@ bool key_down(igl::Viewer& viewer, unsigned char key, int modifier)
 {
 
   if (key == '1')
+  {
     // Plot the 3D mesh
     viewer.data.set_mesh(V,F);
+    viewer.core.align_camera_center(V,F);
+  }
   else if (key == '2')
+  {
     // Plot the mesh in 2D using the UV coordinates as vertex coordinates
     viewer.data.set_mesh(V_uv,F);
+    viewer.core.align_camera_center(V_uv,F);
+  }
 
   viewer.data.compute_normals();
 

tutorial/503_ARAPParam/main.cpp

@@ -23,9 +23,15 @@ bool key_down(igl::Viewer& viewer, unsigned char key, int modifier)
     V_uv = initial_guess;
 
   if (show_uv)
+  {
     viewer.data.set_mesh(V_uv,F);
+    viewer.core.align_camera_center(V_uv,F);
+  }
   else
+  {
     viewer.data.set_mesh(V,F);
+    viewer.core.align_camera_center(V,F);
+  }
 
   viewer.data.compute_normals();
 
@@ -51,7 +57,7 @@ int main(int argc, char *argv[])
   arap_data.with_dynamics = true;
   Eigen::VectorXi b  = Eigen::VectorXi::Zero(0);
   Eigen::MatrixXd bc = Eigen::MatrixXd::Zero(0,0);
-  
+
   // Initialize ARAP
   arap_data.max_iter = 100;
   // 2 means that we're going to *solve* in 2d

tutorial/505_MIQ/main.cpp

@@ -206,6 +206,8 @@ bool key_down(igl::Viewer& viewer, unsigned char key, int modifier)
   line_texture(texture_R, texture_G, texture_B);
   viewer.data.set_texture(texture_R, texture_B, texture_G);
 
+  viewer.core.align_camera_center(viewer.data.V,viewer.data.F);
+
   return false;
 }
 

tutorial/506_FrameField/main.cpp

@@ -165,6 +165,7 @@ bool key_down(igl::Viewer& viewer, unsigned char key, int modifier)
   Eigen::Matrix<char,Eigen::Dynamic,Eigen::Dynamic> texture_R, texture_G, texture_B;
   line_texture(texture_R, texture_G, texture_B);
   viewer.data.set_texture(texture_R, texture_B, texture_G);
+  viewer.core.align_camera_center(viewer.data.V,viewer.data.F);
 
   return false;
 }

tutorial/tutorial.html.REMOVED.git-id

@@ -1 +1 @@
-517a4351e96c89480f823c75a0e29473b348fb8d
+7c2e6ed8a0789197fdaae35c8a1cbd5f502f3c53

tutorial/tutorial.md.REMOVED.git-id

@@ -1 +1 @@
-c99c9bce7b1fc567643b1afb15f63257ec40858a
+42ca9d25da0463896cb835b63fd76d862ebe0e48