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
60 changes: 58 additions & 2 deletions src/cotmatrix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,62 @@ void cotmatrix(
const Eigen::MatrixXi & F,
Eigen::SparseMatrix<double> & L)
{
// Add your code here
}

// Compute area of triangle for i-th face
auto triangle_area = [&l](int i){
double e0 = l(i, 0);
double e1 = l(i, 1);
double e2 = l(i, 2);
double s = (e0 + e1 + e2) / 2;
return sqrt(s*(s-e0)*(s-e1)*(s-e2));
};

int nv = F.maxCoeff() + 1;
L.resize(nv, nv);
Eigen::SparseMatrix<double> cots(nv, nv);
std::vector<Eigen::Triplet<double>> triplets(F.rows()*3);

int a, b, c;
double ea, eb, ec;
double A, cot;

for (int i = 0; i < F.rows(); ++i) {
A = triangle_area(i);
for (int j = 0; j < 3; ++j) {
a = F(i, j);
b = F(i, (j+1)%3);
c = F(i, (j+2)%3);
// Length of edge crossing vertex a,b,c
ea = l(i, j);
eb = l(i, (j+1)%3);
ec = l(i, (j+2)%3);
// Compute cotangents for edge(a,b)
cot = (ea*ea + eb*eb - ec*ec) / (2*A);
triplets.emplace_back(a, b, cot);
}
}

cots.setFromTriplets(triplets.begin(), triplets.end());

triplets.clear();
for (int i = 0; i < F.rows(); ++i) {
for (int j = 0; j < 3; ++j) {
a = F(i, j);
b = F(i, (j+1)%3);
triplets.emplace_back(a, b, cots.coeff(a, b)/2 + cots.coeff(b, a)/2);
}
}

double sum = 0;
for (int i = 0; i < nv; ++i) {
for (int j = 0; j < nv; ++j) {
if (j != i) {
sum += cots.coeff(i, j)/2 + cots.coeff(j, i)/2;
}
}
triplets.emplace_back(i, i, -sum);
sum = 0;
}

L.setFromTriplets(triplets.begin(), triplets.end());
}
22 changes: 21 additions & 1 deletion src/massmatrix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,26 @@ void massmatrix(
const Eigen::MatrixXi & F,
Eigen::DiagonalMatrix<double,Eigen::Dynamic> & M)
{
// Add your code here
M.resize(F.maxCoeff() + 1);
M.setZero();

// Compute area of triangle for i-th face
auto triangle_area = [&l](int i){
double e0 = l(i, 0);
double e1 = l(i, 1);
double e2 = l(i, 2);
double s = (e0 + e1 + e2) / 2;
return sqrt(s*(s-e0)*(s-e1)*(s-e2));
};

double A;
for (int i = 0; i < F.rows(); ++i) {
A = triangle_area(i);
for (int j = 0; j < 3; ++j) {
M.diagonal()[F(i, j)] += A;
}
}

M.diagonal() = M.diagonal() / 3;
}

32 changes: 30 additions & 2 deletions src/smooth.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,40 @@
#include "smooth.h"

#include <igl/edge_lengths.h>
#include <cotmatrix.h>
#include <massmatrix.h>

void smooth(
const Eigen::MatrixXd & V,
const Eigen::MatrixXi & F,
const Eigen::MatrixXd & G,
double lambda,
Eigen::MatrixXd & U)
{
// Replace with your code
U = G;
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);

int nv = F.maxCoeff() + 1;
Eigen::MatrixXd b(nv, G.cols());
Eigen::SparseMatrix<double> A(nv, nv);

// Fill sparse A with diagonal M
std::vector<Eigen::Triplet<double>> triplets;
for (int i = 0; i < M.rows(); ++i) {
triplets.emplace_back(i, i, M.diagonal()[i]);
}
A.setFromTriplets(triplets.begin(), triplets.end());

b = M * U;
A = A - lambda*L;

Eigen::SimplicialLLT<Eigen::SparseMatrix<double>> solver;
U = solver.compute(A).solve(b);

}