ccolin/mod_geo-tp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: ccolin:37fbe47aa858644d017ae99e0373bd1762133aef
Branches Tags
ccolin:master
ccolin:architecture-rework
..
compare: ccolin:d76d891fca2c67195d45fe0d5fb672137cea9c5b
Branches Tags
ccolin:master
ccolin:architecture-rework

No commits in common. "37fbe47aa858644d017ae99e0373bd1762133aef" and "d76d891fca2c67195d45fe0d5fb672137cea9c5b" have entirely different histories.
37fbe47aa8 ... d76d891fca

7 changed files with 35 additions and 89 deletions
Show Stats Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -4,7 +4,6 @@ project(tp LANGUAGES C CXX)
find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets)
add_subdirectory(external/OpenMesh)
add_subdirectory(external/Eigen)
add_executable(${PROJECT_NAME})
target_sources(${PROJECT_NAME} PRIVATE
@ -25,8 +24,7 @@ target_sources(${PROJECT_NAME} PRIVATE
src/util.h)
target_link_libraries(${PROJECT_NAME} PRIVATE
Qt5::Core Qt5::Gui Qt5::Widgets
OpenMeshCore
eigen)
OpenMeshCore)
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)
set_target_properties(${PROJECT_NAME} PROPERTIES
AUTOMOC ON

1
data/bunnyLowPoly.obj
View File

@ -8128,6 +8128,7 @@ vn 0.8166 -0.5571 -0.1512
vn 0.4879 -0.8093 -0.3271
vn 0.4835 -0.8315 -0.2736
vn 0.7111 -0.7029 -0.0163
usemtl None
s 1
f 1//1 2//1 3//1
f 4//2 5//2 6//2

10
external/Eigen/CMakeLists.txt vendored
View File

@ -1,10 +0,0 @@
cmake_minimum_required(VERSION 3.15)
include(FetchContent)
FetchContent_Declare(
Eigen
URL https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz
URL_HASH MD5=4c527a9171d71a72a9d4186e65bea559)
FetchContent_MakeAvailable(Eigen)

5
src/my_mesh.h
View File

@ -7,17 +7,14 @@
#include <QMatrix4x4>
#include <QColor>
#include <QVector3D>
#include <OpenMesh/Core/Geometry/EigenVectorT.hh>
struct MyTraits : public OpenMesh::DefaultTraits {
using Point = Eigen::Vector3<qreal>;
using Normal = Eigen::Vector3<qreal>;
using Color = Eigen::Vector3<qreal>;
VertexAttributes(OpenMesh::Attributes::Normal);
HalfedgeAttributes(OpenMesh::Attributes::PrevHalfedge);
FaceAttributes(OpenMesh::Attributes::Normal);
EdgeAttributes(OpenMesh::Attributes::Color);
typedef OpenMesh::Vec3f Color;
};
class MyMesh : public OpenMesh::TriMesh_ArrayKernelT<MyTraits> {

80
src/smoothing.cpp
View File

@ -3,8 +3,6 @@
#include "OpenMesh/Core/Mesh/SmartHandles.hh"
#include <OpenMesh/Core/Utils/PropertyManager.hh>
#include "util.h"
#include <Eigen/Sparse>
#include <Eigen/Core>
@ -27,21 +25,32 @@
Point laplace_beltrami(const MyMesh &mesh, VertexHandle vert) {
Point sum {0, 0, 0};
qreal area = 0;
Point p = mesh.point(vert);
size_t count = 0;
Point v = mesh.point(vert);
for (HalfedgeHandle v_vi : mesh.voh_range(vert)) {
Point pi = mesh.point(mesh.to_vertex_handle(v_vi));
Point vi = mesh.point(mesh.to_vertex_handle(v_vi));
HalfedgeHandle vi_v = mesh.opposite_halfedge_handle(v_vi);
HalfedgeHandle v_va = mesh.next_halfedge_handle(vi_v);
Point pa = mesh.point(mesh.to_vertex_handle(v_va));
Point va = mesh.point(mesh.to_vertex_handle(v_va));
HalfedgeHandle vi_vb = mesh.next_halfedge_handle(v_vi);
Point pb = mesh.point(mesh.to_vertex_handle(vi_vb));
qreal a = angle_between(pi, pa, p);
qreal b = angle_between(pi, pb, p);
sum += (cotan(a) + cotan(b)) * (pi - p);
area += triangle_area(p, pi, pb);
Point vb = mesh.point(mesh.to_vertex_handle(vi_vb));
qreal a = angle_between(vi, va, v);
qreal b = angle_between(v, vb, vi);
sum += (1/qTan(a) + 1/qTan(b)) * (vi - v);
// sum += (vi - v);
area += triangle_area(v, vi, vb);
// qDebug("a: %lf, b: %lf, sum: %f %f %f, area: %lf",
// a, b, sum[0], sum[1], sum[2], area);
count++;
}
area /= 3.;
// Point tmp(sum / (2*area));
// qDebug() << tmp[0] << tmp[1] << tmp[2];
return sum / (2.*area);
// return sum / count;
}
@ -50,6 +59,7 @@ void smooth(MyMesh &mesh) {
for (VertexHandle v : mesh.vertices()) {
if (!mesh.is_boundary(v)) {
new_pos[v] = mesh.point(v) + laplace_beltrami(mesh, v);
// mesh.set_point(v, mesh.point(v) + laplace_beltrami(mesh, v));
}
}
for (VertexHandle v : mesh.vertices()) {
@ -57,54 +67,4 @@ void smooth(MyMesh &mesh) {
mesh.set_point(v, new_pos[v]);
}
}
// // Approche matricielle
// size_t n_verts = mesh.n_vertices();
// Eigen::SparseMatrix<qreal> mass(n_verts, n_verts);
// Eigen::SparseMatrix<qreal> cotangent(n_verts, n_verts);
// for (VertexHandle vert : mesh.vertices()) {
// if (mesh.is_boundary(vert)) continue;
// qreal sum = 0;
// qreal area = 0;
// qreal count = 0;
// Point v = mesh.point(vert);
// for (HalfedgeHandle v_vi : mesh.voh_range(vert)) {
// VertexHandle vi_h = mesh.to_vertex_handle(v_vi);
// Point vi = mesh.point(vi_h);
// HalfedgeHandle vi_v = mesh.opposite_halfedge_handle(v_vi);
// HalfedgeHandle v_va = mesh.next_halfedge_handle(vi_v);
// Point va = mesh.point(mesh.to_vertex_handle(v_va));
// HalfedgeHandle vi_vb = mesh.next_halfedge_handle(v_vi);
// Point vb = mesh.point(mesh.to_vertex_handle(vi_vb));
// qreal a = angle_between(vi, va, v);
// qreal b = angle_between(v, vb, vi);
// qreal w = -(1./qTan(a) + 1./qTan(b)) / 2.;
// sum += w;
// cotangent.insert(vert.idx(), vi_h.idx()) = w;
// area += triangle_area(v, vi, vb);
// count++;
// }
// cotangent.insert(vert.idx(), vert.idx()) = -sum;
// mass.insert(vert.idx(), vert.idx()) = 1. / area;
// }
// Eigen::SparseMatrix<qreal> laplacian = mass * cotangent;
// Eigen::VectorX<qreal> X(n_verts), Y(n_verts), Z(n_verts);
// for (VertexHandle vert : mesh.vertices()) {
// if (mesh.is_boundary(vert)) continue;
// size_t id = vert.idx();
// Point p = mesh.point(vert);
// X[id] = p[0];
// Y[id] = p[1];
// Z[id] = p[2];
// }
// X = laplacian * X;
// Y = laplacian * Y;
// Z = laplacian * Z;
// for (VertexHandle vert : mesh.vertices()) {
// if (mesh.is_boundary(vert)) continue;
// size_t id = vert.idx();
// mesh.set_point(vert, {X[id], Y[id], Z[id]});
// }
}

5
src/util.cpp
View File

@ -4,8 +4,3 @@
QDebug operator<<(QDebug dbg, const Point &p) {
return dbg << p[0] << p[1] << p[2];
}
qreal cotan(const qreal x) {
return 1. / qTan(x);
}

19
src/util.h
View File

@ -47,22 +47,27 @@ QDebug operator<<(QDebug dbg, const Point &p);
/* Returns the angle between the vector from p2 to p1 and the vector
* from p2 to p3. */
template <typename Point>
qreal angle_between(Point p1, Point p2, Point p3) {
qreal angle_between(Point p1,
Point p2,
Point p3) {
Point vec_a = p1 - p2;
Point vec_b = p3 - p2;
return qAcos(vec_a.dot(vec_b) / (vec_a.norm() * vec_b.norm()));
QVector3D a(vec_a[0], vec_a[1], vec_a[2]);
QVector3D b(vec_b[0], vec_b[1], vec_b[2]);
return qAcos(QVector3D::dotProduct(a.normalized(), b.normalized()));
}
template <typename Point>
qreal triangle_area(Point p1, Point p2, Point p3) {
qreal triangle_area(Point p1,
Point p2,
Point p3) {
Point vec_a = p1 - p2;
Point vec_b = p3 - p2;
return vec_a.cross(vec_b).norm() / 2.;
QVector3D a(vec_a[0], vec_a[1], vec_a[2]);
QVector3D b(vec_b[0], vec_b[1], vec_b[2]);
return QVector3D::crossProduct(a, b).length() / 2.;
}
qreal cotan(const qreal x);
#endif