Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 35 additions & 0 deletions src/cotmatrix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,40 @@ void cotmatrix(
Eigen::SparseMatrix<double> & L)
{
// Add your code here
int V_num = F.maxCoeff() + 1;
L.resize(V_num, V_num);

auto cot = [](double a, double b, double c){
double cosA = (b * b + c * c - a * a) * 1.0 / (2 * b * c);
double sinA = sqrt(1 - cosA * cosA);
return cosA / sinA;
};

for (int i = 0; i < F.rows(); i++) {
double edge0 = l(i, 0);
double edge1 = l(i, 1);
double edge2 = l(i, 2);

double cot0 = cot(edge0, edge1, edge2);
double cot1 = cot(edge1, edge0, edge2);
double cot2 = cot(edge2, edge0, edge1);

int v0 = F(i, 0), v1 = F(i, 1), v2 = F(i, 2);
L.coeffRef(v0, v1) += 0.5 * cot2;
L.coeffRef(v1, v0) += 0.5 * cot2;
L.coeffRef(v1, v2) += 0.5 * cot0;
L.coeffRef(v2, v1) += 0.5 * cot0;
L.coeffRef(v0, v2) += 0.5 * cot1;
L.coeffRef(v2, v0) += 0.5 * cot1;

L.coeffRef(v0, v0) -= 0.5 * cot1;
L.coeffRef(v0, v0) -= 0.5 * cot2;
L.coeffRef(v1, v1) -= 0.5 * cot0;
L.coeffRef(v1, v1) -= 0.5 * cot2;
L.coeffRef(v2, v2) -= 0.5 * cot0;
L.coeffRef(v2, v2) -= 0.5 * cot1;
}

L.makeCompressed();
}

21 changes: 21 additions & 0 deletions src/massmatrix.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
#include "massmatrix.h"
#include <igl/doublearea.h>

void massmatrix(
const Eigen::MatrixXd & l,
const Eigen::MatrixXi & F,
Eigen::DiagonalMatrix<double,Eigen::Dynamic> & M)
{
// Add your code here
int V_num = F.maxCoeff() + 1;
M.resize(V_num);

Eigen::VectorXd diag(V_num);

for (int i = 0; i < F.rows(); i++) {
double edge0 = l(i, 0);
double edge1 = l(i, 1);
double edge2 = l(i, 2);
double area = 0.25 * sqrt((edge0 + edge1 + edge2) * (-edge0 + edge1 + edge2) * (edge0 - edge1 + edge2) * (edge0 + edge1 - edge2));

int v0 = F(i, 0), v1 = F(i, 1), v2 = F(i, 2);

diag(v0) += area / 3;
diag(v1) += area / 3;
diag(v2) += area / 3;
}

M.diagonal() = diag;

}

24 changes: 23 additions & 1 deletion src/smooth.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#include "smooth.h"
#include "massmatrix.h"
#include "cotmatrix.h"
#include <igl/edge_lengths.h>
#include <Eigen/SparseCholesky>

void smooth(
const Eigen::MatrixXd & V,
Expand All @@ -8,5 +12,23 @@ void smooth(
Eigen::MatrixXd & U)
{
// Replace with your code
U = G;
Eigen::MatrixXd l;
igl::edge_lengths(V, F, l);

Eigen::SparseMatrix<double> L;
cotmatrix(l, F, L);

Eigen::DiagonalMatrix<double, Eigen::Dynamic> M;
massmatrix(l, F, M);

Eigen::SparseMatrix<double> A = - lambda * L;
for (int i = 0; i < M.rows(); i++) {
A.coeffRef(i, i) += M.diagonal()(i);
}

Eigen::MatrixXd B = M * G;

Eigen::SimplicialLDLT<Eigen::SparseMatrix<double>> solver;
solver.compute(A);
U = solver.solve(B);
}