separate triangulation into cgal project
This commit is contained in:
Filip Sykala
parent
325a391988
commit
77209abbcd
6 changed files with 226 additions and 187 deletions
src/libslic3r
|
|
@ -6,6 +6,8 @@
|
|||
#define STB_TRUETYPE_IMPLEMENTATION // force following include to generate implementation
|
||||
#include "imgui/imstb_truetype.h" // stbtt_fontinfo
|
||||
|
||||
#include <Triangulation.hpp> // CGAL project
|
||||
|
||||
using namespace Slic3r;
|
||||
|
||||
Emboss::FontItem::FontItem(const std::string &name, const std::string &path)
|
||||
|
|
@ -371,7 +373,10 @@ Emboss::FontList Emboss::get_font_list_by_folder() {
|
|||
}
|
||||
|
||||
#else
|
||||
void Emboss::get_font_list() {}
|
||||
Emboss::FontList Emboss::get_font_list() {
|
||||
// not implemented
|
||||
return {};
|
||||
}
|
||||
|
||||
std::optional<std::wstring> Emboss::get_font_path(const std::wstring &font_face_name){
|
||||
// not implemented
|
||||
|
|
@ -545,7 +550,7 @@ indexed_triangle_set Emboss::polygons2model(const Polygons &shape2d,
|
|||
std::make_move_iterator(back_points.end()));
|
||||
|
||||
// CW order of triangle indices
|
||||
std::vector<Vec3i> shape_triangles = triangulate(shape2d);
|
||||
std::vector<Vec3i> shape_triangles = Triangulation::triangulate(shape2d);
|
||||
result.indices.reserve(shape_triangles.size() * 2 + count_point * 2);
|
||||
// top triangles - change to CCW
|
||||
for (const Vec3i &t : shape_triangles)
|
||||
|
|
@ -575,164 +580,6 @@ indexed_triangle_set Emboss::polygons2model(const Polygons &shape2d,
|
|||
return result;
|
||||
}
|
||||
|
||||
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
|
||||
#include <CGAL/Constrained_Delaunay_triangulation_2.h>
|
||||
#include <CGAL/Triangulation_vertex_base_with_info_2.h>
|
||||
Emboss::Indices Emboss::triangulate(const Points &points, const HalfEdges &half_edges)
|
||||
{
|
||||
// IMPROVE use int point insted of float !!!
|
||||
|
||||
// use cgal triangulation
|
||||
using K = CGAL::Exact_predicates_inexact_constructions_kernel;
|
||||
using Itag = CGAL::Exact_predicates_tag;
|
||||
using CDT = CGAL::Constrained_Delaunay_triangulation_2<K, CGAL::Default, Itag>;
|
||||
using Point = CDT::Point;
|
||||
|
||||
// construct a constrained triangulation
|
||||
CDT cdt;
|
||||
std::map<CDT::Vertex_handle, uint32_t> map; // for indices
|
||||
std::vector<CDT::Vertex_handle> vertices_handle; // for constriants
|
||||
vertices_handle.reserve(points.size());
|
||||
for (const auto& p: points) {
|
||||
Point cdt_p(p.x(), p.y());
|
||||
auto handl = cdt.insert(cdt_p);
|
||||
vertices_handle.push_back(handl);
|
||||
// point index
|
||||
uint32_t pi = &p - &points.front();
|
||||
map[handl] = pi;
|
||||
}
|
||||
|
||||
// triangle can not contain forbiden edge
|
||||
for (const std::pair<uint32_t, uint32_t> &edge : half_edges) {
|
||||
const CDT::Vertex_handle& vh1 = vertices_handle[edge.first];
|
||||
const CDT::Vertex_handle& vh2 = vertices_handle[edge.second];
|
||||
cdt.insert_constraint(vh1, vh2);
|
||||
}
|
||||
|
||||
auto faces = cdt.finite_face_handles();
|
||||
std::vector<Vec3i> indices;
|
||||
indices.reserve(faces.size());
|
||||
for (CDT::Face_handle face : faces) {
|
||||
// point indices
|
||||
std::array<uint32_t, 3> pi;
|
||||
for (size_t i = 0; i < 3; ++i)
|
||||
pi[i] = map[face->vertex(i)];
|
||||
|
||||
// Do not use triangles with opposit edges
|
||||
if (half_edges.find(std::make_pair(pi[1], pi[0])) != half_edges.end()) continue;
|
||||
if (half_edges.find(std::make_pair(pi[2], pi[1])) != half_edges.end()) continue;
|
||||
if (half_edges.find(std::make_pair(pi[0], pi[2])) != half_edges.end()) continue;
|
||||
|
||||
indices.emplace_back(pi[0], pi[1], pi[2]);
|
||||
}
|
||||
return indices;
|
||||
}
|
||||
|
||||
Emboss::Indices Emboss::triangulate(const Polygon &polygon)
|
||||
{
|
||||
const Points &pts = polygon.points;
|
||||
std::set<std::pair<uint32_t, uint32_t>> edges;
|
||||
for (uint32_t i = 1; i < pts.size(); ++i) edges.insert({i - 1, i});
|
||||
edges.insert({(uint32_t)pts.size() - 1, uint32_t(0)});
|
||||
Emboss::Indices indices = triangulate(pts, edges);
|
||||
remove_outer(indices, edges);
|
||||
return indices;
|
||||
}
|
||||
|
||||
Emboss::Indices Emboss::triangulate(const Polygons &polygons)
|
||||
{
|
||||
size_t count = count_points(polygons);
|
||||
Points points;
|
||||
points.reserve(count);
|
||||
for (const Polygon &polygon : polygons)
|
||||
points.insert(points.end(), polygon.points.begin(),
|
||||
polygon.points.end());
|
||||
|
||||
std::set<std::pair<uint32_t, uint32_t>> edges;
|
||||
uint32_t offset = 0;
|
||||
for (const Polygon& polygon : polygons) {
|
||||
const Points &pts = polygon.points;
|
||||
for (uint32_t i = 1; i < pts.size(); ++i) {
|
||||
uint32_t i2 = i + offset;
|
||||
edges.insert({i2 - 1, i2});
|
||||
}
|
||||
uint32_t size = static_cast<uint32_t>(pts.size());
|
||||
// add connection from first to last point
|
||||
edges.insert({offset + size - 1, offset});
|
||||
offset += size;
|
||||
}
|
||||
Emboss::Indices indices = triangulate(points, edges);
|
||||
remove_outer(indices, edges);
|
||||
return indices;
|
||||
}
|
||||
|
||||
void Emboss::remove_outer(Indices &indices, const HalfEdges &half_edges) {
|
||||
uint32_t no_triangle = indices.size();
|
||||
std::map<HalfEdge, uint32_t> edge2triangle;
|
||||
// triangles with all edges out of half_edge, candidate to remove
|
||||
std::vector<uint32_t> triangles_to_check;
|
||||
triangles_to_check.reserve(indices.size()/3);
|
||||
for (const auto& t : indices) {
|
||||
uint32_t index = &t - &indices.front();
|
||||
bool is_border = false;
|
||||
for (size_t j = 0; j < 3; ++j) {
|
||||
size_t j2 = (j == 0) ? 2 : (j - 1);
|
||||
HalfEdge he(t[j2], t[j]);
|
||||
if (half_edges.find(he) != half_edges.end())
|
||||
is_border = true;
|
||||
else
|
||||
edge2triangle[he] = index;
|
||||
}
|
||||
if (!is_border) {
|
||||
triangles_to_check.push_back(index);
|
||||
}
|
||||
}
|
||||
|
||||
std::set<uint32_t> remove;
|
||||
std::queue<uint32_t> insert;
|
||||
for (uint32_t index : triangles_to_check) {
|
||||
auto it = remove.find(index);
|
||||
if (it != remove.end()) continue; // already removed
|
||||
|
||||
bool is_edge = false;
|
||||
const Vec3i &t = indices[index];
|
||||
for (size_t j = 0; j < 3; ++j) {
|
||||
size_t j2 = (j == 0) ? 2 : (j - 1);
|
||||
// opposit
|
||||
HalfEdge he(t[j], t[j2]);
|
||||
if (edge2triangle.find(he) == edge2triangle.end()) is_edge = true;
|
||||
}
|
||||
|
||||
if (!is_edge) continue; // correct
|
||||
|
||||
insert.push(index);
|
||||
while (!insert.empty()) {
|
||||
uint32_t i = insert.front();
|
||||
insert.pop();
|
||||
if (remove.find(i) != remove.end()) continue;
|
||||
remove.insert(i);
|
||||
|
||||
for (size_t j = 0; j < 3; ++j) {
|
||||
size_t j2 = (j == 0) ? 2 : (j - 1);
|
||||
// opposit
|
||||
HalfEdge he(t[j], t[j2]);
|
||||
auto it = edge2triangle.find(he);
|
||||
if (it == edge2triangle.end()) continue; // edge
|
||||
insert.push(it->second);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// remove indices
|
||||
std::vector<uint32_t> rem(remove.begin(), remove.end());
|
||||
std::sort(rem.begin(), rem.end());
|
||||
uint32_t offset = 0;
|
||||
for (uint32_t i : rem) {
|
||||
indices.erase(indices.begin() + (i - offset));
|
||||
++offset;
|
||||
}
|
||||
}
|
||||
|
||||
std::pair<Vec3f, Vec3f> Emboss::ProjectZ::project(const Point &p) const
|
||||
{
|
||||
Vec3f front(p.x(),p.y(),0.f);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue