Skip to content

Jienan Yao HW2 Submission #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Jienan Yao HW2 Submission #50

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
24d6637
Update README.md
alecjacobson Jul 7, 2018
ac44898
Update README.html
alecjacobson Jul 7, 2018
480fd1f
Update closest_rotation.cpp
jnyao Oct 9, 2018
24f4975
Update hausdorff_lower_bound.cpp
jnyao Oct 9, 2018
ef8cdd0
Update icp_single_iteration.cpp
jnyao Oct 9, 2018
8cca9c4
Update point_mesh_distance.cpp
jnyao Oct 9, 2018
1fe869a
Update point_to_plane_rigid_matching.cpp
jnyao Oct 9, 2018
cbe31d1
Update point_to_point_rigid_matching.cpp
jnyao Oct 9, 2018
e748d68
Update point_triangle_distance.cpp
jnyao Oct 9, 2018
976842d
Update random_points_on_mesh.cpp
jnyao Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update point_mesh_distance.cpp
  • Loading branch information
@jnyao
jnyao authored Oct 9, 2018
commit 8cca9c4d3619676c4b5821fbd2bd31ecfb788aa8
28 changes: 25 additions & 3 deletions src/point_mesh_distance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#include "point_mesh_distance.h"
#include "point_triangle_distance.h"
#include <limits>
#include <iostream>
#include <igl/per_face_normals.h>

void point_mesh_distance(
const Eigen::MatrixXd & X,
Expand All @@ -10,7 +14,25 @@ void point_mesh_distance(
{
// Replace with your code
P.resizeLike(X);
N = Eigen::MatrixXd::Zero(X.rows(),X.cols());
for(int i = 0;i<X.rows();i++) P.row(i) = VY.row(i%VY.rows());
D = (X-P).rowwise().norm();
N = Eigen::MatrixXd::Zero(X.rows(), X.cols());
Eigen::MatrixXd AllN = Eigen::MatrixXd::Zero(FY.rows(), FY.cols());
igl::per_face_normals(VY, FY, AllN);
//for(int i = 0;i<X.rows();i++) P.row(i) = VY.row(i%VY.rows());
//D = (X-P).rowwise().norm();
D = Eigen::VectorXd(X.rows());

for (int i = 0; i < X.rows(); i++) {
double d; Eigen::RowVector3d p;
D(i) = std::numeric_limits<double>::infinity();
for (int j = 0; j < FY.rows(); j++) {
point_triangle_distance(X.row(i), VY.row(FY(j, 0)), VY.row(FY(j, 1)), VY.row(FY(j, 2)), d, p);
if (d < D(i)) {
D(i) = d;
P(i, 0) = p(0); P(i, 1) = p(1); P(i, 2) = p(2);
N.row(i) = AllN.row(j);
}
}
}


}