mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-11 10:28:58 +08:00
revert auto formating
This commit is contained in:
Filip Sykala
parent
c8e3836177
commit
9e1ebcf4c6
@ -266,15 +266,13 @@ TEST_CASE("Italic check", "[Emboss]")
|
|||||||
}
|
}
|
||||||
#endif // not __APPLE__
|
#endif // not __APPLE__
|
||||||
|
|
||||||
|
|
||||||
#include <CGAL/Polygon_mesh_processing/corefinement.h>
|
#include <CGAL/Polygon_mesh_processing/corefinement.h>
|
||||||
#include <CGAL/Exact_integer.h>
|
#include <CGAL/Exact_integer.h>
|
||||||
#include <CGAL/Surface_mesh.h>
|
#include <CGAL/Surface_mesh.h>
|
||||||
#include <CGAL/Cartesian_converter.h>
|
#include <CGAL/Cartesian_converter.h>
|
||||||
|
|
||||||
// Referencing a glyph contour (an ExPolygon) plus a vertex base of the contour.
|
// Referencing a glyph contour (an ExPolygon) plus a vertex base of the contour.
|
||||||
struct GlyphContour
|
struct GlyphContour {
|
||||||
{
|
|
||||||
// Index of a glyph in a vector of glyphs.
|
// Index of a glyph in a vector of glyphs.
|
||||||
int32_t glyph{ -1 };
|
int32_t glyph{ -1 };
|
||||||
// Index of an ExPolygon in ExPolygons of a glyph.
|
// Index of an ExPolygon in ExPolygons of a glyph.
|
||||||
@ -299,11 +297,7 @@ struct GlyphID
|
|||||||
// 3th - 2nd text face
|
// 3th - 2nd text face
|
||||||
int32_t idx { -1 };
|
int32_t idx { -1 };
|
||||||
|
|
||||||
GlyphID &operator++()
|
GlyphID& operator++() { ++idx; return *this; }
|
||||||
{
|
|
||||||
++idx;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
namespace Slic3r::MeshBoolean::cgal2 {
|
namespace Slic3r::MeshBoolean::cgal2 {
|
||||||
@ -326,7 +320,8 @@ void triangle_mesh_to_cgal(
|
|||||||
CGALMesh &out,
|
CGALMesh &out,
|
||||||
CGALMesh::Property_map<CGAL::SM_Face_index, int32_t> object_face_source_id)
|
CGALMesh::Property_map<CGAL::SM_Face_index, int32_t> object_face_source_id)
|
||||||
{
|
{
|
||||||
if (F.empty()) return;
|
if (F.empty())
|
||||||
|
return;
|
||||||
|
|
||||||
size_t vertices_count = V.size();
|
size_t vertices_count = V.size();
|
||||||
size_t edges_count = (F.size() * 3) / 2;
|
size_t edges_count = (F.size() * 3) / 2;
|
||||||
@ -353,83 +348,65 @@ void glyph2model(
|
|||||||
CGALMesh::Property_map<CGAL::SM_Face_index, GlyphID> &glyph_id_face)
|
CGALMesh::Property_map<CGAL::SM_Face_index, GlyphID> &glyph_id_face)
|
||||||
{
|
{
|
||||||
std::vector<CGALMesh::Vertex_index> indices;
|
std::vector<CGALMesh::Vertex_index> indices;
|
||||||
auto insert_contour = [&projection, &indices, &out, glyph_id,
|
auto insert_contour = [&projection, &indices , &out, glyph_id, &glyph_contours, &glyph_id_edge, &glyph_id_face](const Polygon& polygon, int32_t iexpoly, int32_t id) {
|
||||||
&glyph_contours, &glyph_id_edge,
|
|
||||||
&glyph_id_face](const Polygon &polygon,
|
|
||||||
int32_t iexpoly, int32_t id) {
|
|
||||||
indices.clear();
|
indices.clear();
|
||||||
indices.reserve(polygon.points.size() * 2);
|
indices.reserve(polygon.points.size() * 2);
|
||||||
size_t num_vertices_old = out.number_of_vertices();
|
size_t num_vertices_old = out.number_of_vertices();
|
||||||
GlyphID glid{ int32_t(glyph_contours.size()), 0 };
|
GlyphID glid{ int32_t(glyph_contours.size()), 0 };
|
||||||
glyph_contours.push_back(
|
glyph_contours.push_back({ glyph_id, iexpoly, id, int32_t(num_vertices_old) });
|
||||||
{glyph_id, iexpoly, id, int32_t(num_vertices_old)});
|
|
||||||
for (const Point& p2 : polygon.points) {
|
for (const Point& p2 : polygon.points) {
|
||||||
auto p = projection.project(p2);
|
auto p = projection.project(p2);
|
||||||
auto vi = out.add_vertex(typename CGALMesh::Point{p.first.x(),
|
auto vi = out.add_vertex(typename CGALMesh::Point{ p.first.x(), p.first.y(), p.first.z() });
|
||||||
p.first.y(),
|
|
||||||
p.first.z()});
|
|
||||||
assert((size_t)vi == indices.size() + num_vertices_old);
|
assert((size_t)vi == indices.size() + num_vertices_old);
|
||||||
indices.emplace_back(vi);
|
indices.emplace_back(vi);
|
||||||
vi = out.add_vertex(typename CGALMesh::Point{p.second.x(),
|
vi = out.add_vertex(typename CGALMesh::Point{ p.second.x(), p.second.y(), p.second.z() });
|
||||||
p.second.y(),
|
|
||||||
p.second.z()});
|
|
||||||
assert((size_t)vi == indices.size() + num_vertices_old);
|
assert((size_t)vi == indices.size() + num_vertices_old);
|
||||||
indices.emplace_back(vi);
|
indices.emplace_back(vi);
|
||||||
}
|
}
|
||||||
for (int32_t i = 0; i < int32_t(indices.size()); i += 2) {
|
for (int32_t i = 0; i < int32_t(indices.size()); i += 2) {
|
||||||
int32_t j = (i + 2) % int32_t(indices.size());
|
int32_t j = (i + 2) % int32_t(indices.size());
|
||||||
auto find_edge = [&out](CGALMesh::Face_index fi,
|
auto find_edge = [&out](CGALMesh::Face_index fi, CGALMesh::Vertex_index from, CGALMesh::Vertex_index to) {
|
||||||
CGALMesh::Vertex_index from,
|
|
||||||
CGALMesh::Vertex_index to) {
|
|
||||||
CGALMesh::Halfedge_index hi = out.halfedge(fi);
|
CGALMesh::Halfedge_index hi = out.halfedge(fi);
|
||||||
for (; out.target(hi) != to; hi = out.next(hi))
|
for (; out.target(hi) != to; hi = out.next(hi));
|
||||||
;
|
|
||||||
assert(out.source(hi) == from);
|
assert(out.source(hi) == from);
|
||||||
assert(out.target(hi) == to);
|
assert(out.target(hi) == to);
|
||||||
return hi;
|
return hi;
|
||||||
};
|
};
|
||||||
auto fi = out.add_face(indices[i], indices[i + 1], indices[j]);
|
auto fi = out.add_face(indices[i], indices[i + 1], indices[j]);
|
||||||
glyph_id_edge[out.edge(
|
glyph_id_edge[out.edge(find_edge(fi, indices[i], indices[i + 1]))] = glid;
|
||||||
find_edge(fi, indices[i], indices[i + 1]))] = glid;
|
|
||||||
glyph_id_face[fi] = ++ glid;
|
glyph_id_face[fi] = ++ glid;
|
||||||
glyph_id_edge[out.edge(
|
glyph_id_edge[out.edge(find_edge(fi, indices[i + 1], indices[j]))] = ++ glid;
|
||||||
find_edge(fi, indices[i + 1], indices[j]))] = ++glid;
|
glyph_id_face[out.add_face(indices[j], indices[i + 1], indices[j + 1])] = ++ glid;
|
||||||
glyph_id_face[out.add_face(indices[j], indices[i + 1],
|
|
||||||
indices[j + 1])] = ++glid;
|
|
||||||
++ glid;
|
++ glid;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
size_t count_point = count_points(glyph);
|
size_t count_point = count_points(glyph);
|
||||||
out.reserve(out.number_of_vertices() + 2 * count_point,
|
out.reserve(out.number_of_vertices() + 2 * count_point, out.number_of_edges() + 4 * count_point, out.number_of_faces() + 2 * count_point);
|
||||||
out.number_of_edges() + 4 * count_point,
|
|
||||||
out.number_of_faces() + 2 * count_point);
|
|
||||||
|
|
||||||
for (const ExPolygon &expolygon : glyph) {
|
for (const ExPolygon &expolygon : glyph) {
|
||||||
int32_t idx_contour = &expolygon - &glyph.front();
|
int32_t idx_contour = &expolygon - &glyph.front();
|
||||||
insert_contour(expolygon.contour, idx_contour, 0);
|
insert_contour(expolygon.contour, idx_contour, 0);
|
||||||
for (const Polygon& hole : expolygon.holes)
|
for (const Polygon& hole : expolygon.holes)
|
||||||
insert_contour(hole, idx_contour,
|
insert_contour(hole, idx_contour, 1 + (&hole - &expolygon.holes.front()));
|
||||||
1 + (&hole - &expolygon.holes.front()));
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} // namespace Slic3r::MeshBoolean::cgal2
|
|
||||||
|
|
||||||
bool its_write_obj(const indexed_triangle_set &its,
|
bool its_write_obj(const indexed_triangle_set& its, const std::vector<Vec3f> &color, const char* file)
|
||||||
const std::vector<Vec3f> &color,
|
|
||||||
const char *file)
|
|
||||||
{
|
{
|
||||||
Slic3r::CNumericLocalesSetter locales_setter;
|
Slic3r::CNumericLocalesSetter locales_setter;
|
||||||
FILE* fp = fopen(file, "w");
|
FILE* fp = fopen(file, "w");
|
||||||
if (fp == nullptr) { return false; }
|
if (fp == nullptr) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
for (size_t i = 0; i < its.vertices.size(); ++i)
|
for (size_t i = 0; i < its.vertices.size(); ++i)
|
||||||
fprintf(fp, "v %f %f %f %f %f %f\n", its.vertices[i](0),
|
fprintf(fp, "v %f %f %f %f %f %f\n",
|
||||||
its.vertices[i](1), its.vertices[i](2), color[i](0),
|
its.vertices[i](0), its.vertices[i](1), its.vertices[i](2),
|
||||||
color[i](1), color[i](2));
|
color[i](0), color[i](1), color[i](2));
|
||||||
for (size_t i = 0; i < its.indices.size(); ++i)
|
for (size_t i = 0; i < its.indices.size(); ++i)
|
||||||
fprintf(fp, "f %d %d %d\n", its.indices[i][0] + 1,
|
fprintf(fp, "f %d %d %d\n", its.indices[i][0] + 1, its.indices[i][1] + 1, its.indices[i][2] + 1);
|
||||||
its.indices[i][1] + 1, its.indices[i][2] + 1);
|
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -466,43 +443,23 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
// its_translate(cube2, Vec3f(0, 0, 40));
|
// its_translate(cube2, Vec3f(0, 0, 40));
|
||||||
its_translate(cube2, Vec3f(0, -40, 40));
|
its_translate(cube2, Vec3f(0, -40, 40));
|
||||||
for (auto &face : cube2.indices)
|
for (auto &face : cube2.indices)
|
||||||
for (int i = 0; i < 3; ++i) face(i) += int(cube.vertices.size());
|
for (int i = 0; i < 3; ++ i)
|
||||||
|
face(i) += int(cube.vertices.size());
|
||||||
append(cube.vertices, cube2.vertices);
|
append(cube.vertices, cube2.vertices);
|
||||||
append(cube.indices, cube2.indices);
|
append(cube.indices, cube2.indices);
|
||||||
|
|
||||||
MeshBoolean::cgal2::CGALMesh cgalcube, cgaltext;
|
MeshBoolean::cgal2::CGALMesh cgalcube, cgaltext;
|
||||||
auto object_face_source_id =
|
auto object_face_source_id = cgalcube.add_property_map<MeshBoolean::cgal2::CGALMesh::Face_index, int32_t>("f:object_face_source_id").first;
|
||||||
cgalcube
|
MeshBoolean::cgal2::triangle_mesh_to_cgal(cube.vertices, cube.indices, cgalcube, object_face_source_id);
|
||||||
.add_property_map<MeshBoolean::cgal2::CGALMesh::Face_index,
|
|
||||||
int32_t>("f:object_face_source_id")
|
|
||||||
.first;
|
|
||||||
MeshBoolean::cgal2::triangle_mesh_to_cgal(cube.vertices, cube.indices,
|
|
||||||
cgalcube,
|
|
||||||
object_face_source_id);
|
|
||||||
|
|
||||||
auto edge_glyph_id =
|
auto edge_glyph_id = cgaltext.add_property_map<MeshBoolean::cgal2::CGALMesh::Edge_index, GlyphID>("e:glyph_id").first;
|
||||||
cgaltext
|
auto face_glyph_id = cgaltext.add_property_map<MeshBoolean::cgal2::CGALMesh::Face_index, GlyphID>("f:glyph_id").first;
|
||||||
.add_property_map<MeshBoolean::cgal2::CGALMesh::Edge_index,
|
auto vertex_glyph_id = cgalcube.add_property_map<MeshBoolean::cgal2::CGALMesh::Vertex_index, GlyphID>("v:glyph_id").first;
|
||||||
GlyphID>("e:glyph_id")
|
|
||||||
.first;
|
|
||||||
auto face_glyph_id =
|
|
||||||
cgaltext
|
|
||||||
.add_property_map<MeshBoolean::cgal2::CGALMesh::Face_index,
|
|
||||||
GlyphID>("f:glyph_id")
|
|
||||||
.first;
|
|
||||||
auto vertex_glyph_id =
|
|
||||||
cgalcube
|
|
||||||
.add_property_map<MeshBoolean::cgal2::CGALMesh::Vertex_index,
|
|
||||||
GlyphID>("v:glyph_id")
|
|
||||||
.first;
|
|
||||||
std::vector<GlyphContour> glyph_contours;
|
std::vector<GlyphContour> glyph_contours;
|
||||||
|
|
||||||
MeshBoolean::cgal2::glyph2model(shape, 0, projection, cgaltext,
|
MeshBoolean::cgal2::glyph2model(shape, 0, projection, cgaltext, glyph_contours, edge_glyph_id, face_glyph_id);
|
||||||
glyph_contours, edge_glyph_id,
|
|
||||||
face_glyph_id);
|
|
||||||
|
|
||||||
struct Visitor
|
struct Visitor {
|
||||||
{
|
|
||||||
using TriangleMesh = Slic3r::MeshBoolean::cgal2::CGALMesh;
|
using TriangleMesh = Slic3r::MeshBoolean::cgal2::CGALMesh;
|
||||||
|
|
||||||
const TriangleMesh &object;
|
const TriangleMesh &object;
|
||||||
@ -512,10 +469,8 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
TriangleMesh::Property_map<CGAL::SM_Edge_index, GlyphID> glyph_id_edge;
|
TriangleMesh::Property_map<CGAL::SM_Edge_index, GlyphID> glyph_id_edge;
|
||||||
TriangleMesh::Property_map<CGAL::SM_Face_index, GlyphID> glyph_id_face;
|
TriangleMesh::Property_map<CGAL::SM_Face_index, GlyphID> glyph_id_face;
|
||||||
// Properties of the object mesh.
|
// Properties of the object mesh.
|
||||||
TriangleMesh::Property_map<CGAL::SM_Face_index, int32_t>
|
TriangleMesh::Property_map<CGAL::SM_Face_index, int32_t> object_face_source_id;
|
||||||
object_face_source_id;
|
TriangleMesh::Property_map<CGAL::SM_Vertex_index, GlyphID> object_vertex_glyph_id;
|
||||||
TriangleMesh::Property_map<CGAL::SM_Vertex_index, GlyphID>
|
|
||||||
object_vertex_glyph_id;
|
|
||||||
|
|
||||||
typedef boost::graph_traits<TriangleMesh> GT;
|
typedef boost::graph_traits<TriangleMesh> GT;
|
||||||
typedef typename GT::face_descriptor face_descriptor;
|
typedef typename GT::face_descriptor face_descriptor;
|
||||||
@ -524,14 +479,12 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
|
|
||||||
int32_t source_face_id;
|
int32_t source_face_id;
|
||||||
|
|
||||||
void before_subface_creations(face_descriptor f_old,
|
void before_subface_creations(face_descriptor f_old, TriangleMesh& mesh)
|
||||||
TriangleMesh &mesh)
|
|
||||||
{
|
{
|
||||||
assert(&mesh == &object);
|
assert(&mesh == &object);
|
||||||
source_face_id = object_face_source_id[f_old];
|
source_face_id = object_face_source_id[f_old];
|
||||||
}
|
}
|
||||||
void after_subface_created(face_descriptor f_new, TriangleMesh &mesh)
|
void after_subface_created(face_descriptor f_new, TriangleMesh& mesh) {
|
||||||
{
|
|
||||||
assert(&mesh == &object);
|
assert(&mesh == &object);
|
||||||
object_face_source_id[f_new] = source_face_id;
|
object_face_source_id[f_new] = source_face_id;
|
||||||
}
|
}
|
||||||
@ -542,16 +495,14 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
void intersection_point_detected(
|
void intersection_point_detected(
|
||||||
// ID of the intersection point, starting at 0. Ids are consecutive.
|
// ID of the intersection point, starting at 0. Ids are consecutive.
|
||||||
std::size_t i_id,
|
std::size_t i_id,
|
||||||
// Dimension of a simplex part of face(hh_face) that is
|
// Dimension of a simplex part of face(hh_face) that is intersected by hh_edge:
|
||||||
// intersected by hh_edge: 0 for vertex: target(hh_face) 1 for
|
// 0 for vertex: target(hh_face)
|
||||||
// edge: hh_face 2 for the interior of face: face(hh_face)
|
// 1 for edge: hh_face
|
||||||
|
// 2 for the interior of face: face(hh_face)
|
||||||
int simplex_dimension,
|
int simplex_dimension,
|
||||||
// Edge of tm_edge, see edge_source_coplanar_with_face &
|
// Edge of tm_edge, see edge_source_coplanar_with_face & edge_target_coplanar_with_face whether any vertex of hh_edge is coplanar with face(hh_face).
|
||||||
// edge_target_coplanar_with_face whether any vertex of hh_edge is
|
|
||||||
// coplanar with face(hh_face).
|
|
||||||
halfedge_descriptor hh_edge,
|
halfedge_descriptor hh_edge,
|
||||||
// Vertex, halfedge or face of tm_face intersected by hh_edge, see
|
// Vertex, halfedge or face of tm_face intersected by hh_edge, see comment at simplex_dimension.
|
||||||
// comment at simplex_dimension.
|
|
||||||
halfedge_descriptor hh_face,
|
halfedge_descriptor hh_face,
|
||||||
// Mesh containing hh_edge
|
// Mesh containing hh_edge
|
||||||
const TriangleMesh& tm_edge,
|
const TriangleMesh& tm_edge,
|
||||||
@ -563,8 +514,7 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
bool edge_target_coplanar_with_face)
|
bool edge_target_coplanar_with_face)
|
||||||
{
|
{
|
||||||
if (i_id <= intersection_point_glyph.size()) {
|
if (i_id <= intersection_point_glyph.size()) {
|
||||||
intersection_point_glyph.reserve(
|
intersection_point_glyph.reserve(Slic3r::next_highest_power_of_2(i_id + 1));
|
||||||
Slic3r::next_highest_power_of_2(i_id + 1));
|
|
||||||
intersection_point_glyph.resize(i_id + 1);
|
intersection_point_glyph.resize(i_id + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -580,7 +530,8 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
// edge x face intersection
|
// edge x face intersection
|
||||||
glyph = &glyph_id_face[glyphs.face(hh_face)];
|
glyph = &glyph_id_face[glyphs.face(hh_face)];
|
||||||
break;
|
break;
|
||||||
default: assert(false);
|
default:
|
||||||
|
assert(false);
|
||||||
}
|
}
|
||||||
if (edge_source_coplanar_with_face)
|
if (edge_source_coplanar_with_face)
|
||||||
object_vertex_glyph_id[object.source(hh_edge)] = *glyph;
|
object_vertex_glyph_id[object.source(hh_edge)] = *glyph;
|
||||||
@ -597,9 +548,7 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
intersection_point_glyph[i_id] = glyph;
|
intersection_point_glyph[i_id] = glyph;
|
||||||
}
|
}
|
||||||
|
|
||||||
void new_vertex_added(std::size_t node_id,
|
void new_vertex_added(std::size_t node_id, vertex_descriptor vh, const TriangleMesh &tm)
|
||||||
vertex_descriptor vh,
|
|
||||||
const TriangleMesh &tm)
|
|
||||||
{
|
{
|
||||||
assert(&tm == &object);
|
assert(&tm == &object);
|
||||||
assert(node_id < intersection_point_glyph.size());
|
assert(node_id < intersection_point_glyph.size());
|
||||||
@ -612,45 +561,22 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
|
|
||||||
void after_subface_creations(TriangleMesh&) {}
|
void after_subface_creations(TriangleMesh&) {}
|
||||||
void before_subface_created(TriangleMesh&) {}
|
void before_subface_created(TriangleMesh&) {}
|
||||||
void before_edge_split(halfedge_descriptor /* h */,
|
void before_edge_split(halfedge_descriptor /* h */, TriangleMesh& /* tm */) {}
|
||||||
TriangleMesh & /* tm */)
|
void edge_split(halfedge_descriptor /* hnew */, TriangleMesh& /* tm */) {}
|
||||||
{}
|
|
||||||
void edge_split(halfedge_descriptor /* hnew */,
|
|
||||||
TriangleMesh & /* tm */)
|
|
||||||
{}
|
|
||||||
void after_edge_split() {}
|
void after_edge_split() {}
|
||||||
void add_retriangulation_edge(halfedge_descriptor /* h */,
|
void add_retriangulation_edge(halfedge_descriptor /* h */, TriangleMesh& /* tm */) {}
|
||||||
TriangleMesh & /* tm */)
|
}
|
||||||
{}
|
visitor { cgalcube, cgaltext, /* glyph_contours, */ edge_glyph_id, face_glyph_id, object_face_source_id, vertex_glyph_id};
|
||||||
} visitor{cgalcube,
|
|
||||||
cgaltext,
|
|
||||||
/* glyph_contours, */ edge_glyph_id,
|
|
||||||
face_glyph_id,
|
|
||||||
object_face_source_id,
|
|
||||||
vertex_glyph_id};
|
|
||||||
|
|
||||||
auto ecm = get(CGAL::dynamic_edge_property_t<bool>(), cgalcube);
|
auto ecm = get(CGAL::dynamic_edge_property_t<bool>(), cgalcube);
|
||||||
const auto &p =
|
const auto& p = CGAL::Polygon_mesh_processing::parameters::throw_on_self_intersection(false).visitor(visitor).edge_is_constrained_map(ecm);
|
||||||
CGAL::Polygon_mesh_processing::parameters::throw_on_self_intersection(
|
const auto& q = CGAL::Polygon_mesh_processing::parameters::visitor(visitor).do_not_modify(true);
|
||||||
false)
|
|
||||||
.visitor(visitor)
|
|
||||||
.edge_is_constrained_map(ecm);
|
|
||||||
const auto &q = CGAL::Polygon_mesh_processing::parameters::visitor(visitor)
|
|
||||||
.do_not_modify(true);
|
|
||||||
// CGAL::Polygon_mesh_processing::corefine(cgalcube, cgalcube2, p, p);
|
// CGAL::Polygon_mesh_processing::corefine(cgalcube, cgalcube2, p, p);
|
||||||
|
|
||||||
CGAL::Polygon_mesh_processing::corefine(cgalcube, cgaltext, p, q);
|
CGAL::Polygon_mesh_processing::corefine(cgalcube, cgaltext, p, q);
|
||||||
|
|
||||||
auto vertex_colors =
|
auto vertex_colors = cgalcube.add_property_map<MeshBoolean::cgal2::CGALMesh::Vertex_index, CGAL::Color>("v:color").first;
|
||||||
cgalcube
|
auto face_colors = cgalcube.add_property_map<MeshBoolean::cgal2::CGALMesh::Face_index, CGAL::Color>("f:color").first;
|
||||||
.add_property_map<MeshBoolean::cgal2::CGALMesh::Vertex_index,
|
|
||||||
CGAL::Color>("v:color")
|
|
||||||
.first;
|
|
||||||
auto face_colors =
|
|
||||||
cgalcube
|
|
||||||
.add_property_map<MeshBoolean::cgal2::CGALMesh::Face_index,
|
|
||||||
CGAL::Color>("f:color")
|
|
||||||
.first;
|
|
||||||
|
|
||||||
const CGAL::Color marked { 255, 0, 0 };
|
const CGAL::Color marked { 255, 0, 0 };
|
||||||
for (auto fi : cgalcube.faces()) {
|
for (auto fi : cgalcube.faces()) {
|
||||||
@ -662,17 +588,12 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
// This face has a constrained edge.
|
// This face has a constrained edge.
|
||||||
GlyphID g1 = vertex_glyph_id[cgalcube.source(hi)];
|
GlyphID g1 = vertex_glyph_id[cgalcube.source(hi)];
|
||||||
GlyphID g2 = vertex_glyph_id[cgalcube.target(hi)];
|
GlyphID g2 = vertex_glyph_id[cgalcube.target(hi)];
|
||||||
assert(g1.glyph_contour != -1 &&
|
assert(g1.glyph_contour != -1 && g1.glyph_contour == g2.glyph_contour);
|
||||||
g1.glyph_contour == g2.glyph_contour);
|
|
||||||
assert(g1.idx != -1);
|
assert(g1.idx != -1);
|
||||||
assert(g2.idx != -1);
|
assert(g2.idx != -1);
|
||||||
const GlyphContour &glyph_contour =
|
const GlyphContour &glyph_contour = glyph_contours[g1.glyph_contour];
|
||||||
glyph_contours[g1.glyph_contour];
|
|
||||||
const auto &expoly = glyph->shape[glyph_contour.expoly];
|
const auto &expoly = glyph->shape[glyph_contour.expoly];
|
||||||
const auto &contour =
|
const auto &contour = glyph_contour.contour == 0 ? expoly.contour : expoly.holes[glyph_contour.contour - 1];
|
||||||
glyph_contour.contour == 0 ?
|
|
||||||
expoly.contour :
|
|
||||||
expoly.holes[glyph_contour.contour - 1];
|
|
||||||
bool inside = false;
|
bool inside = false;
|
||||||
int32_t i1 = g1.idx / 4;
|
int32_t i1 = g1.idx / 4;
|
||||||
int32_t i2 = g2.idx / 4;
|
int32_t i2 = g2.idx / 4;
|
||||||
@ -680,23 +601,14 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
// Crossing both object vertices with the same glyph face.
|
// Crossing both object vertices with the same glyph face.
|
||||||
int type = g1.idx % 4;
|
int type = g1.idx % 4;
|
||||||
assert(type == 1 || type == 3);
|
assert(type == 1 || type == 3);
|
||||||
const auto &p = cgalcube.point(
|
const auto& p = cgalcube.point(cgalcube.target(cgalcube.next(hi)));
|
||||||
cgalcube.target(cgalcube.next(hi)));
|
|
||||||
int i = i1 * 2;
|
int i = i1 * 2;
|
||||||
int j = (i1 + 1 == int(contour.size())) ? 0 : i + 2;
|
int j = (i1 + 1 == int(contour.size())) ? 0 : i + 2;
|
||||||
i += glyph_contour.vertex_base;
|
i += glyph_contour.vertex_base;
|
||||||
j += glyph_contour.vertex_base;
|
j += glyph_contour.vertex_base;
|
||||||
auto abcp =
|
auto abcp = type == 1 ?
|
||||||
type == 1 ?
|
CGAL::orientation(cgaltext.point(CGAL::SM_Vertex_index(i)), cgaltext.point(CGAL::SM_Vertex_index(i + 1)), cgaltext.point(CGAL::SM_Vertex_index(j)), p) :
|
||||||
CGAL::orientation(
|
CGAL::orientation(cgaltext.point(CGAL::SM_Vertex_index(j)), cgaltext.point(CGAL::SM_Vertex_index(i + 1)), cgaltext.point(CGAL::SM_Vertex_index(j + 1)), p);
|
||||||
cgaltext.point(CGAL::SM_Vertex_index(i)),
|
|
||||||
cgaltext.point(CGAL::SM_Vertex_index(i + 1)),
|
|
||||||
cgaltext.point(CGAL::SM_Vertex_index(j)), p) :
|
|
||||||
CGAL::orientation(
|
|
||||||
cgaltext.point(CGAL::SM_Vertex_index(j)),
|
|
||||||
cgaltext.point(CGAL::SM_Vertex_index(i + 1)),
|
|
||||||
cgaltext.point(CGAL::SM_Vertex_index(j + 1)),
|
|
||||||
p);
|
|
||||||
inside = abcp == CGAL::POSITIVE;
|
inside = abcp == CGAL::POSITIVE;
|
||||||
} else if (g1.idx < g2.idx) {
|
} else if (g1.idx < g2.idx) {
|
||||||
if (i1 == 0 && i2 + 1 == contour.size()) {
|
if (i1 == 0 && i2 + 1 == contour.size()) {
|
||||||
@ -715,15 +627,13 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
// Is this face oriented towards p or away from p?
|
// Is this face oriented towards p or away from p?
|
||||||
const auto &a = cgalcube.point(cgalcube.source(hi));
|
const auto &a = cgalcube.point(cgalcube.source(hi));
|
||||||
const auto &b = cgalcube.point(cgalcube.target(hi));
|
const auto &b = cgalcube.point(cgalcube.target(hi));
|
||||||
const auto &c = cgalcube.point(
|
const auto &c = cgalcube.point(cgalcube.target(cgalcube.next(hi)));
|
||||||
cgalcube.target(cgalcube.next(hi)));
|
|
||||||
//FIXME prosim nahrad skutecnou projekci.
|
//FIXME prosim nahrad skutecnou projekci.
|
||||||
//projection.project()
|
//projection.project()
|
||||||
const auto p =
|
const auto p = a + MeshBoolean::cgal2::EpicKernel::Vector_3(0, 0, 10);
|
||||||
a +
|
|
||||||
MeshBoolean::cgal2::EpicKernel::Vector_3(0, 0, 10);
|
|
||||||
auto abcp = CGAL::orientation(a, b, c, p);
|
auto abcp = CGAL::orientation(a, b, c, p);
|
||||||
if (abcp == CGAL::POSITIVE) color = marked;
|
if (abcp == CGAL::POSITIVE)
|
||||||
|
color = marked;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -742,9 +652,7 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
auto hi = cgalcube.halfedge(fi_seed);
|
auto hi = cgalcube.halfedge(fi_seed);
|
||||||
auto hi_prev = cgalcube.prev(hi);
|
auto hi_prev = cgalcube.prev(hi);
|
||||||
auto hi_next = cgalcube.next(hi);
|
auto hi_next = cgalcube.next(hi);
|
||||||
if (!get(ecm, cgalcube.edge(hi)) &&
|
if (! get(ecm, cgalcube.edge(hi)) && ! get(ecm, cgalcube.edge(hi_prev)) && ! get(ecm, cgalcube.edge(hi_next))) {
|
||||||
!get(ecm, cgalcube.edge(hi_prev)) &&
|
|
||||||
!get(ecm, cgalcube.edge(hi_next))) {
|
|
||||||
queue.emplace_back(fi_seed);
|
queue.emplace_back(fi_seed);
|
||||||
do {
|
do {
|
||||||
auto fi = queue.back();
|
auto fi = queue.back();
|
||||||
@ -752,26 +660,19 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
auto hi = cgalcube.halfedge(fi);
|
auto hi = cgalcube.halfedge(fi);
|
||||||
auto hi_prev = cgalcube.prev(hi);
|
auto hi_prev = cgalcube.prev(hi);
|
||||||
auto hi_next = cgalcube.next(hi);
|
auto hi_next = cgalcube.next(hi);
|
||||||
// The following condition may not apply if crossing a
|
// The following condition may not apply if crossing a silhouette wrt. the glyph projection direction.
|
||||||
// silhouette wrt. the glyph projection direction.
|
// assert(! get(ecm, cgalcube.edge(hi)) && ! get(ecm, cgalcube.edge(hi_prev)) && ! get(ecm, cgalcube.edge(hi_next)));
|
||||||
// assert(! get(ecm, cgalcube.edge(hi))
|
|
||||||
// && ! get(ecm, cgalcube.edge(hi_prev))
|
|
||||||
// && ! get(ecm, cgalcube.edge(hi_next)));
|
|
||||||
auto this_opposite = cgalcube.face(cgalcube.opposite(hi));
|
auto this_opposite = cgalcube.face(cgalcube.opposite(hi));
|
||||||
bool this_marked = face_colors[this_opposite] == marked;
|
bool this_marked = face_colors[this_opposite] == marked;
|
||||||
auto prev_opposite = cgalcube.face(
|
auto prev_opposite = cgalcube.face(cgalcube.opposite(hi_prev));
|
||||||
cgalcube.opposite(hi_prev));
|
|
||||||
bool prev_marked = face_colors[prev_opposite] == marked;
|
bool prev_marked = face_colors[prev_opposite] == marked;
|
||||||
auto next_opposite = cgalcube.face(
|
auto next_opposite = cgalcube.face(cgalcube.opposite(hi_next));
|
||||||
cgalcube.opposite(hi_next));
|
|
||||||
bool next_marked = face_colors[next_opposite] == marked;
|
bool next_marked = face_colors[next_opposite] == marked;
|
||||||
int num_marked = this_marked + prev_marked + next_marked;
|
int num_marked = this_marked + prev_marked + next_marked;
|
||||||
if (num_marked >= 2) {
|
if (num_marked >= 2) {
|
||||||
face_colors[fi] = marked;
|
face_colors[fi] = marked;
|
||||||
if (num_marked == 2)
|
if (num_marked == 2)
|
||||||
queue.emplace_back(!this_marked ? this_opposite :
|
queue.emplace_back(! this_marked ? this_opposite : ! prev_marked ? prev_opposite : next_opposite);
|
||||||
!prev_marked ? prev_opposite :
|
|
||||||
next_opposite);
|
|
||||||
}
|
}
|
||||||
} while (! queue.empty());
|
} while (! queue.empty());
|
||||||
}
|
}
|
||||||
@ -788,8 +689,7 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
MarkedSplit = -5,
|
MarkedSplit = -5,
|
||||||
UnmarkedEmitted = -6,
|
UnmarkedEmitted = -6,
|
||||||
};
|
};
|
||||||
std::vector<FaceState> face_states(cube.indices.size(),
|
std::vector<FaceState> face_states(cube.indices.size(), FaceState::Unknown);
|
||||||
FaceState::Unknown);
|
|
||||||
for (auto fi_seed : cgalcube.faces()) {
|
for (auto fi_seed : cgalcube.faces()) {
|
||||||
FaceState &state = face_states[object_face_source_id[fi_seed]];
|
FaceState &state = face_states[object_face_source_id[fi_seed]];
|
||||||
bool m = face_colors[fi_seed] == marked;
|
bool m = face_colors[fi_seed] == marked;
|
||||||
@ -802,42 +702,37 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
state = m ? FaceState::MarkedSplit : FaceState::UnmarkedSplit;
|
state = m ? FaceState::MarkedSplit : FaceState::UnmarkedSplit;
|
||||||
break;
|
break;
|
||||||
case FaceState::Marked:
|
case FaceState::Marked:
|
||||||
case FaceState::MarkedSplit: state = FaceState::MarkedSplit; break;
|
case FaceState::MarkedSplit:
|
||||||
default: assert(false);
|
state = FaceState::MarkedSplit;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
assert(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
indexed_triangle_set its_extruded;
|
indexed_triangle_set its_extruded;
|
||||||
its_extruded.indices.reserve(cgalcube.number_of_faces());
|
its_extruded.indices.reserve(cgalcube.number_of_faces());
|
||||||
its_extruded.vertices.reserve(cgalcube.number_of_vertices());
|
its_extruded.vertices.reserve(cgalcube.number_of_vertices());
|
||||||
// Mapping of its_extruded vertices (original and offsetted) to
|
// Mapping of its_extruded vertices (original and offsetted) to cgalcuble's vertices.
|
||||||
// cgalcuble's vertices.
|
std::vector<std::pair<int32_t, int32_t>> map_vertices(cgalcube.number_of_vertices(), std::pair<int32_t, int32_t>{-1, -1});
|
||||||
std::vector<std::pair<int32_t, int32_t>>
|
|
||||||
map_vertices(cgalcube.number_of_vertices(),
|
|
||||||
std::pair<int32_t, int32_t>{-1, -1});
|
|
||||||
|
|
||||||
Vec3f extrude_dir { 0, 0, 5.f };
|
Vec3f extrude_dir { 0, 0, 5.f };
|
||||||
for (auto fi : cgalcube.faces()) {
|
for (auto fi : cgalcube.faces()) {
|
||||||
const int32_t source_face_id = object_face_source_id[fi];
|
const int32_t source_face_id = object_face_source_id[fi];
|
||||||
const FaceState state = face_states[source_face_id];
|
const FaceState state = face_states[source_face_id];
|
||||||
assert(state == FaceState::Unmarked ||
|
assert(state == FaceState::Unmarked || state == FaceState::UnmarkedSplit || state == FaceState::UnmarkedEmitted ||
|
||||||
state == FaceState::UnmarkedSplit ||
|
|
||||||
state == FaceState::UnmarkedEmitted ||
|
|
||||||
state == FaceState::Marked || state == FaceState::MarkedSplit);
|
state == FaceState::Marked || state == FaceState::MarkedSplit);
|
||||||
if (state == FaceState::UnmarkedEmitted) {
|
if (state == FaceState::UnmarkedEmitted) {
|
||||||
// Already emitted.
|
// Already emitted.
|
||||||
} else if (state == FaceState::Unmarked ||
|
} else if (state == FaceState::Unmarked || state == FaceState::UnmarkedSplit) {
|
||||||
state == FaceState::UnmarkedSplit) {
|
|
||||||
// Just copy the unsplit source face.
|
// Just copy the unsplit source face.
|
||||||
const Vec3i source_vertices = cube.indices[source_face_id];
|
const Vec3i source_vertices = cube.indices[source_face_id];
|
||||||
Vec3i target_vertices;
|
Vec3i target_vertices;
|
||||||
for (int i = 0; i < 3; ++i) {
|
for (int i = 0; i < 3; ++i) {
|
||||||
target_vertices(i) = map_vertices[source_vertices(i)].first;
|
target_vertices(i) = map_vertices[source_vertices(i)].first;
|
||||||
if (target_vertices(i) == -1) {
|
if (target_vertices(i) == -1) {
|
||||||
map_vertices[source_vertices(i)].first = target_vertices(
|
map_vertices[source_vertices(i)].first = target_vertices(i) = int(its_extruded.vertices.size());
|
||||||
i) = int(its_extruded.vertices.size());
|
its_extruded.vertices.emplace_back(cube.vertices[source_vertices(i)]);
|
||||||
its_extruded.vertices.emplace_back(
|
|
||||||
cube.vertices[source_vertices(i)]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
its_extruded.indices.emplace_back(target_vertices);
|
its_extruded.indices.emplace_back(target_vertices);
|
||||||
@ -846,47 +741,31 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
auto hi = cgalcube.halfedge(fi);
|
auto hi = cgalcube.halfedge(fi);
|
||||||
auto hi_prev = cgalcube.prev(hi);
|
auto hi_prev = cgalcube.prev(hi);
|
||||||
auto hi_next = cgalcube.next(hi);
|
auto hi_next = cgalcube.next(hi);
|
||||||
const Vec3i
|
const Vec3i source_vertices{ int((std::size_t)cgalcube.target(hi)), int((std::size_t)cgalcube.target(hi_next)), int((std::size_t)cgalcube.target(hi_prev)) };
|
||||||
source_vertices{int((std::size_t) cgalcube.target(hi)),
|
|
||||||
int((std::size_t) cgalcube.target(hi_next)),
|
|
||||||
int((std::size_t) cgalcube.target(hi_prev))};
|
|
||||||
Vec3i target_vertices;
|
Vec3i target_vertices;
|
||||||
if (face_colors[fi] == marked) {
|
if (face_colors[fi] == marked) {
|
||||||
// Extrude the face. Neighbor edges separating extruded face
|
// Extrude the face. Neighbor edges separating extruded face from non-extruded face will be extruded.
|
||||||
// from non-extruded face will be extruded.
|
|
||||||
bool boundary_vertex[3] = { false, false, false };
|
bool boundary_vertex[3] = { false, false, false };
|
||||||
Vec3i target_vertices_extruded { -1, -1, -1 };
|
Vec3i target_vertices_extruded { -1, -1, -1 };
|
||||||
for (int i = 0; i < 3; ++i) {
|
for (int i = 0; i < 3; ++i) {
|
||||||
if (face_colors[cgalcube.face(cgalcube.opposite(hi))] !=
|
if (face_colors[cgalcube.face(cgalcube.opposite(hi))] != marked)
|
||||||
marked)
|
|
||||||
// Edge separating extruded / non-extruded region.
|
// Edge separating extruded / non-extruded region.
|
||||||
boundary_vertex[i] = boundary_vertex[(i + 2) % 3] =
|
boundary_vertex[i] = boundary_vertex[(i + 2) % 3] = true;
|
||||||
true;
|
|
||||||
hi = cgalcube.next(hi);
|
hi = cgalcube.next(hi);
|
||||||
}
|
}
|
||||||
for (int i = 0; i < 3; ++ i) {
|
for (int i = 0; i < 3; ++ i) {
|
||||||
target_vertices_extruded(
|
target_vertices_extruded(i) = map_vertices[source_vertices(i)].second;
|
||||||
i) = map_vertices[source_vertices(i)].second;
|
|
||||||
if (target_vertices_extruded(i) == -1) {
|
if (target_vertices_extruded(i) == -1) {
|
||||||
map_vertices[source_vertices(i)].second =
|
map_vertices[source_vertices(i)].second = target_vertices_extruded(i) = int(its_extruded.vertices.size());
|
||||||
target_vertices_extruded(i) = int(
|
|
||||||
its_extruded.vertices.size());
|
|
||||||
const auto& p = cgalcube.point(cgalcube.target(hi));
|
const auto& p = cgalcube.point(cgalcube.target(hi));
|
||||||
its_extruded.vertices.emplace_back(
|
its_extruded.vertices.emplace_back(Vec3f{ float(p.x()), float(p.y()), float(p.z()) } + extrude_dir);
|
||||||
Vec3f{float(p.x()), float(p.y()), float(p.z())} +
|
|
||||||
extrude_dir);
|
|
||||||
}
|
}
|
||||||
if (boundary_vertex[i]) {
|
if (boundary_vertex[i]) {
|
||||||
target_vertices(
|
target_vertices(i) = map_vertices[source_vertices(i)].first;
|
||||||
i) = map_vertices[source_vertices(i)].first;
|
|
||||||
if (target_vertices(i) == -1) {
|
if (target_vertices(i) == -1) {
|
||||||
map_vertices[source_vertices(i)].first =
|
map_vertices[source_vertices(i)].first = target_vertices(i) = int(its_extruded.vertices.size());
|
||||||
target_vertices(i) = int(
|
const auto& p = cgalcube.point(cgalcube.target(hi));
|
||||||
its_extruded.vertices.size());
|
its_extruded.vertices.emplace_back(p.x(), p.y(), p.z());
|
||||||
const auto &p = cgalcube.point(
|
|
||||||
cgalcube.target(hi));
|
|
||||||
its_extruded.vertices.emplace_back(p.x(), p.y(),
|
|
||||||
p.z());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
hi = cgalcube.next(hi);
|
hi = cgalcube.next(hi);
|
||||||
@ -895,33 +774,22 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
// Add the sides.
|
// Add the sides.
|
||||||
for (int i = 0; i < 3; ++ i) {
|
for (int i = 0; i < 3; ++ i) {
|
||||||
int j = (i + 1) % 3;
|
int j = (i + 1) % 3;
|
||||||
assert(target_vertices_extruded[i] != -1 &&
|
assert(target_vertices_extruded[i] != -1 && target_vertices_extruded[j] != -1);
|
||||||
target_vertices_extruded[j] != -1);
|
|
||||||
if (boundary_vertex[i] && boundary_vertex[j]) {
|
if (boundary_vertex[i] && boundary_vertex[j]) {
|
||||||
assert(target_vertices[i] != -1 &&
|
assert(target_vertices[i] != -1 && target_vertices[j] != -1);
|
||||||
target_vertices[j] != -1);
|
its_extruded.indices.emplace_back(Vec3i{ target_vertices[i], target_vertices[j], target_vertices_extruded[i] });
|
||||||
its_extruded.indices.emplace_back(
|
its_extruded.indices.emplace_back(Vec3i{ target_vertices_extruded[i], target_vertices[j], target_vertices_extruded[j] });
|
||||||
Vec3i{target_vertices[i], target_vertices[j],
|
|
||||||
target_vertices_extruded[i]});
|
|
||||||
its_extruded.indices.emplace_back(
|
|
||||||
Vec3i{target_vertices_extruded[i],
|
|
||||||
target_vertices[j],
|
|
||||||
target_vertices_extruded[j]});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Copy the face.
|
// Copy the face.
|
||||||
Vec3i target_vertices;
|
Vec3i target_vertices;
|
||||||
for (int i = 0; i < 3; ++ i) {
|
for (int i = 0; i < 3; ++ i) {
|
||||||
target_vertices(
|
target_vertices(i) = map_vertices[source_vertices(i)].first;
|
||||||
i) = map_vertices[source_vertices(i)].first;
|
|
||||||
if (target_vertices(i) == -1) {
|
if (target_vertices(i) == -1) {
|
||||||
map_vertices[source_vertices(i)].first =
|
map_vertices[source_vertices(i)].first = target_vertices(i) = int(its_extruded.vertices.size());
|
||||||
target_vertices(i) = int(
|
|
||||||
its_extruded.vertices.size());
|
|
||||||
const auto &p = cgalcube.point(cgalcube.target(hi));
|
const auto &p = cgalcube.point(cgalcube.target(hi));
|
||||||
its_extruded.vertices.emplace_back(p.x(), p.y(),
|
its_extruded.vertices.emplace_back(p.x(), p.y(), p.z());
|
||||||
p.z());
|
|
||||||
}
|
}
|
||||||
hi = cgalcube.next(hi);
|
hi = cgalcube.next(hi);
|
||||||
}
|
}
|
||||||
@ -940,19 +808,15 @@ TEST_CASE("Emboss extrude cut", "[Emboss-Cut]")
|
|||||||
const auto &p2 = cgalcube.point(cgalcube.vertex(ei, 1));
|
const auto &p2 = cgalcube.point(cgalcube.vertex(ei, 1));
|
||||||
bool constrained = get(ecm, ei);
|
bool constrained = get(ecm, ei);
|
||||||
Vec3f color = constrained ? Vec3f{ 1.f, 0, 0 } : Vec3f{ 0, 1., 0 };
|
Vec3f color = constrained ? Vec3f{ 1.f, 0, 0 } : Vec3f{ 0, 1., 0 };
|
||||||
edges_its.indices.emplace_back(
|
edges_its.indices.emplace_back(Vec3i(edges_its.vertices.size(), edges_its.vertices.size() + 1, edges_its.vertices.size() + 2));
|
||||||
Vec3i(edges_its.vertices.size(), edges_its.vertices.size() + 1,
|
|
||||||
edges_its.vertices.size() + 2));
|
|
||||||
edges_its.vertices.emplace_back(Vec3f(p1.x(), p1.y(), p1.z()));
|
edges_its.vertices.emplace_back(Vec3f(p1.x(), p1.y(), p1.z()));
|
||||||
edges_its.vertices.emplace_back(Vec3f(p2.x(), p2.y(), p2.z()));
|
edges_its.vertices.emplace_back(Vec3f(p2.x(), p2.y(), p2.z()));
|
||||||
edges_its.vertices.emplace_back(
|
edges_its.vertices.emplace_back(Vec3f(p2.x(), p2.y(), p2.z() + 0.001));
|
||||||
Vec3f(p2.x(), p2.y(), p2.z() + 0.001));
|
|
||||||
edges_its_colors.emplace_back(color);
|
edges_its_colors.emplace_back(color);
|
||||||
edges_its_colors.emplace_back(color);
|
edges_its_colors.emplace_back(color);
|
||||||
edges_its_colors.emplace_back(color);
|
edges_its_colors.emplace_back(color);
|
||||||
}
|
}
|
||||||
its_write_obj(edges_its, edges_its_colors,
|
its_write_obj(edges_its, edges_its_colors, "c:\\data\\temp\\corefined-edges.obj");
|
||||||
"c:\\data\\temp\\corefined-edges.obj");
|
|
||||||
|
|
||||||
// MeshBoolean::cgal::minus(cube, cube2);
|
// MeshBoolean::cgal::minus(cube, cube2);
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user