diff --git a/include/igl/comiso/miq.cpp.REMOVED.git-id b/include/igl/comiso/miq.cpp.REMOVED.git-id index dd6391d1a..f6fe6f0ae 100644 --- a/include/igl/comiso/miq.cpp.REMOVED.git-id +++ b/include/igl/comiso/miq.cpp.REMOVED.git-id @@ -1 +1 @@ -62a42bbac866d4cbc7e2d6dc00c7d3d17cce84e6 \ No newline at end of file +7417ec66154d8aa8468ea9b36c103ed6e7899ec7 \ No newline at end of file diff --git a/tutorial/505_MIQ/main.cpp b/tutorial/505_MIQ/main.cpp index 1150f7a7d..dba8b49d4 100755 --- a/tutorial/505_MIQ/main.cpp +++ b/tutorial/505_MIQ/main.cpp @@ -49,9 +49,9 @@ Eigen::MatrixXi FUV; // Create a texture that hides the integer translation in the parametrization -void line_texture(Eigen::Matrix &texture_R, - Eigen::Matrix &texture_G, - Eigen::Matrix &texture_B) +void line_texture(Eigen::Matrix &texture_R, + Eigen::Matrix &texture_G, + Eigen::Matrix &texture_B) { unsigned size = 128; unsigned size2 = size/2; @@ -202,7 +202,7 @@ bool key_down(igl::Viewer& viewer, unsigned char key, int modifier) viewer.data.set_colors(Eigen::RowVector3d(1,1,1)); // Replace the standard texture with an integer shift invariant texture - Eigen::Matrix texture_R, texture_G, texture_B; + Eigen::Matrix texture_R, texture_G, texture_B; line_texture(texture_R, texture_G, texture_B); viewer.data.set_texture(texture_R, texture_B, texture_G); @@ -258,7 +258,7 @@ int main(int argc, char *argv[]) igl::find_cross_field_singularities(V, F, MMatch, isSingularity, singularityIndex); // Cut the mesh, duplicating all vertices on the seams - igl::cut_mesh_from_singularities(V, F, MMatch, isSingularity, singularityIndex, Seams); + igl::cut_mesh_from_singularities(V, F, MMatch, Seams); // Comb the frame-field accordingly igl::comb_frame_field(V, F, X1, X2, BIS1_combed, BIS2_combed, X1_combed, X2_combed); @@ -268,11 +268,8 @@ int main(int argc, char *argv[]) F, X1_combed, X2_combed, - BIS1_combed, - BIS2_combed, MMatch, isSingularity, - singularityIndex, Seams, UV, FUV, @@ -288,11 +285,8 @@ igl::miq(V, F, X1_combed, X2_combed, - BIS1_combed, - BIS2_combed, MMatch, isSingularity, - singularityIndex, Seams, UV_seams, FUV_seams, diff --git a/tutorial/506_FrameField/main.cpp b/tutorial/506_FrameField/main.cpp index e81f73d2c..dbfeacb52 100755 --- a/tutorial/506_FrameField/main.cpp +++ b/tutorial/506_FrameField/main.cpp @@ -45,9 +45,9 @@ Eigen::MatrixXd V_uv; Eigen::MatrixXi F_uv; // Create a texture that hides the integer translation in the parametrization -void line_texture(Eigen::Matrix &texture_R, - Eigen::Matrix &texture_G, - Eigen::Matrix &texture_B) +void line_texture(Eigen::Matrix &texture_R, + Eigen::Matrix &texture_G, + Eigen::Matrix &texture_B) { unsigned size = 128; unsigned size2 = size/2; @@ -162,7 +162,7 @@ bool key_down(igl::Viewer& viewer, unsigned char key, int modifier) } // Replace the standard texture with an integer shift invariant texture - Eigen::Matrix texture_R, texture_G, texture_B; + Eigen::Matrix 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);