summaryrefslogtreecommitdiff
path: root/src/PolySetCGALEvaluator.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/PolySetCGALEvaluator.cc')
-rw-r--r--src/PolySetCGALEvaluator.cc302
1 files changed, 177 insertions, 125 deletions
diff --git a/src/PolySetCGALEvaluator.cc b/src/PolySetCGALEvaluator.cc
index a914a62..b019ad5 100644
--- a/src/PolySetCGALEvaluator.cc
+++ b/src/PolySetCGALEvaluator.cc
@@ -1,22 +1,39 @@
#include "PolySetCGALEvaluator.h"
+#include "cgal.h"
+#include "cgalutils.h"
#include "polyset.h"
#include "CGALEvaluator.h"
#include "projectionnode.h"
#include "dxflinextrudenode.h"
#include "dxfrotextrudenode.h"
+#include "cgaladvnode.h"
+#include "rendernode.h"
#include "dxfdata.h"
#include "dxftess.h"
#include "module.h"
#include "printutils.h"
#include "openscad.h" // get_fragments_from_r()
+#include <boost/foreach.hpp>
-PolySet *PolySetCGALEvaluator::evaluatePolySet(const ProjectionNode &node, AbstractPolyNode::render_mode_e)
+PolySetCGALEvaluator::PolySetCGALEvaluator(CGALEvaluator &cgalevaluator)
+ : PolySetEvaluator(cgalevaluator.getTree()), cgalevaluator(cgalevaluator)
{
- const string &cacheid = this->cgalevaluator.getTree().getString(node);
- if (this->cache.contains(cacheid)) return this->cache[cacheid]->ps->link();
+}
- CGAL_Nef_polyhedron N = this->cgalevaluator.evaluateCGALMesh(node);
+PolySet *PolySetCGALEvaluator::evaluatePolySet(const ProjectionNode &node)
+{
+ // Before projecting, union all children
+ CGAL_Nef_polyhedron sum;
+ BOOST_FOREACH (AbstractNode * v, node.getChildren()) {
+ if (v->modinst->tag_background) continue;
+ CGAL_Nef_polyhedron N = this->cgalevaluator.evaluateCGALMesh(*v);
+ if (N.dim == 3) {
+ if (sum.empty()) sum = N.copy();
+ else sum += N;
+ }
+ }
+ if (sum.empty()) return NULL;
PolySet *ps = new PolySet();
ps->convexity = node.convexity;
@@ -24,56 +41,55 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const ProjectionNode &node, Abstr
if (node.cut_mode)
{
- PolySet *cube = new PolySet();
+ PolySet cube;
double infval = 1e8, eps = 0.1;
double x1 = -infval, x2 = +infval, y1 = -infval, y2 = +infval, z1 = 0, z2 = eps;
- cube->append_poly(); // top
- cube->append_vertex(x1, y1, z2);
- cube->append_vertex(x2, y1, z2);
- cube->append_vertex(x2, y2, z2);
- cube->append_vertex(x1, y2, z2);
-
- cube->append_poly(); // bottom
- cube->append_vertex(x1, y2, z1);
- cube->append_vertex(x2, y2, z1);
- cube->append_vertex(x2, y1, z1);
- cube->append_vertex(x1, y1, z1);
-
- cube->append_poly(); // side1
- cube->append_vertex(x1, y1, z1);
- cube->append_vertex(x2, y1, z1);
- cube->append_vertex(x2, y1, z2);
- cube->append_vertex(x1, y1, z2);
-
- cube->append_poly(); // side2
- cube->append_vertex(x2, y1, z1);
- cube->append_vertex(x2, y2, z1);
- cube->append_vertex(x2, y2, z2);
- cube->append_vertex(x2, y1, z2);
-
- cube->append_poly(); // side3
- cube->append_vertex(x2, y2, z1);
- cube->append_vertex(x1, y2, z1);
- cube->append_vertex(x1, y2, z2);
- cube->append_vertex(x2, y2, z2);
-
- cube->append_poly(); // side4
- cube->append_vertex(x1, y2, z1);
- cube->append_vertex(x1, y1, z1);
- cube->append_vertex(x1, y1, z2);
- cube->append_vertex(x1, y2, z2);
- CGAL_Nef_polyhedron Ncube = this->cgalevaluator.evaluateCGALMesh(*cube);
- cube->unlink();
+ cube.append_poly(); // top
+ cube.append_vertex(x1, y1, z2);
+ cube.append_vertex(x2, y1, z2);
+ cube.append_vertex(x2, y2, z2);
+ cube.append_vertex(x1, y2, z2);
+
+ cube.append_poly(); // bottom
+ cube.append_vertex(x1, y2, z1);
+ cube.append_vertex(x2, y2, z1);
+ cube.append_vertex(x2, y1, z1);
+ cube.append_vertex(x1, y1, z1);
+
+ cube.append_poly(); // side1
+ cube.append_vertex(x1, y1, z1);
+ cube.append_vertex(x2, y1, z1);
+ cube.append_vertex(x2, y1, z2);
+ cube.append_vertex(x1, y1, z2);
+
+ cube.append_poly(); // side2
+ cube.append_vertex(x2, y1, z1);
+ cube.append_vertex(x2, y2, z1);
+ cube.append_vertex(x2, y2, z2);
+ cube.append_vertex(x2, y1, z2);
+
+ cube.append_poly(); // side3
+ cube.append_vertex(x2, y2, z1);
+ cube.append_vertex(x1, y2, z1);
+ cube.append_vertex(x1, y2, z2);
+ cube.append_vertex(x2, y2, z2);
+
+ cube.append_poly(); // side4
+ cube.append_vertex(x1, y2, z1);
+ cube.append_vertex(x1, y1, z1);
+ cube.append_vertex(x1, y1, z2);
+ cube.append_vertex(x1, y2, z2);
+ CGAL_Nef_polyhedron Ncube = this->cgalevaluator.evaluateCGALMesh(cube);
// N.p3 *= CGAL_Nef_polyhedron3(CGAL_Plane(0, 0, 1, 0), CGAL_Nef_polyhedron3::INCLUDED);
- N.p3 *= Ncube.p3;
- if (!N.p3.is_simple()) {
+ sum *= Ncube;
+ if (!sum.p3->is_simple()) {
PRINTF("WARNING: Body of projection(cut = true) isn't valid 2-manifold! Modify your design..");
goto cant_project_non_simple_polyhedron;
}
- PolySet *ps3 = N.convertToPolyset();
+ PolySet *ps3 = sum.convertToPolyset();
Grid2d<int> conversion_grid(GRID_COARSE);
for (size_t i = 0; i < ps3->polygons.size(); i++) {
for (size_t j = 0; j < ps3->polygons[i].size(); j++) {
@@ -95,18 +111,17 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const ProjectionNode &node, Abstr
}
next_ps3_polygon_cut_mode:;
}
- ps3->unlink();
+ delete ps3;
}
else
{
- if (!N.p3.is_simple()) {
+ if (!sum.p3->is_simple()) {
PRINTF("WARNING: Body of projection(cut = false) isn't valid 2-manifold! Modify your design..");
goto cant_project_non_simple_polyhedron;
}
- PolySet *ps3 = N.convertToPolyset();
+ PolySet *ps3 = sum.convertToPolyset();
CGAL_Nef_polyhedron np;
- np.dim = 2;
for (size_t i = 0; i < ps3->polygons.size(); i++)
{
int min_x_p = -1;
@@ -144,38 +159,43 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const ProjectionNode &node, Abstr
else
plist.push_back(p);
}
- np.p2 += CGAL_Nef_polyhedron2(plist.begin(), plist.end(),
- CGAL_Nef_polyhedron2::INCLUDED);
+ // FIXME: Should the CGAL_Nef_polyhedron2 be cached?
+ if (np.empty()) {
+ np.dim = 2;
+ np.p2.reset(new CGAL_Nef_polyhedron2(plist.begin(), plist.end(), CGAL_Nef_polyhedron2::INCLUDED));
+ }
+ else {
+ (*np.p2) += CGAL_Nef_polyhedron2(plist.begin(), plist.end(), CGAL_Nef_polyhedron2::INCLUDED);
+ }
}
- DxfData dxf(np);
- dxf_tesselate(ps, &dxf, 0, true, false, 0);
- dxf_border_to_ps(ps, &dxf);
- ps3->unlink();
+ delete ps3;
+ DxfData *dxf = np.convertToDxfData();
+ dxf_tesselate(ps, *dxf, 0, true, false, 0);
+ dxf_border_to_ps(ps, *dxf);
+ delete dxf;
}
cant_project_non_simple_polyhedron:
-
- this->cache.insert(cacheid, new cache_entry(ps->link()));
return ps;
}
-static void add_slice(PolySet *ps, DxfData::Path *pt, double rot1, double rot2, double h1, double h2)
+static void add_slice(PolySet *ps, const DxfData &dxf, DxfData::Path &path, double rot1, double rot2, double h1, double h2)
{
- for (int j = 1; j < pt->points.count(); j++)
+ for (size_t j = 1; j < path.indices.size(); j++)
{
int k = j - 1;
- double jx1 = (*pt->points[j])[0] * cos(rot1*M_PI/180) + (*pt->points[j])[1] * sin(rot1*M_PI/180);
- double jy1 = (*pt->points[j])[0] * -sin(rot1*M_PI/180) + (*pt->points[j])[1] * cos(rot1*M_PI/180);
+ double jx1 = dxf.points[path.indices[j]][0] * cos(rot1*M_PI/180) + dxf.points[path.indices[j]][1] * sin(rot1*M_PI/180);
+ double jy1 = dxf.points[path.indices[j]][0] * -sin(rot1*M_PI/180) + dxf.points[path.indices[j]][1] * cos(rot1*M_PI/180);
- double jx2 = (*pt->points[j])[0] * cos(rot2*M_PI/180) + (*pt->points[j])[1] * sin(rot2*M_PI/180);
- double jy2 = (*pt->points[j])[0] * -sin(rot2*M_PI/180) + (*pt->points[j])[1] * cos(rot2*M_PI/180);
+ double jx2 = dxf.points[path.indices[j]][0] * cos(rot2*M_PI/180) + dxf.points[path.indices[j]][1] * sin(rot2*M_PI/180);
+ double jy2 = dxf.points[path.indices[j]][0] * -sin(rot2*M_PI/180) + dxf.points[path.indices[j]][1] * cos(rot2*M_PI/180);
- double kx1 = (*pt->points[k])[0] * cos(rot1*M_PI/180) + (*pt->points[k])[1] * sin(rot1*M_PI/180);
- double ky1 = (*pt->points[k])[0] * -sin(rot1*M_PI/180) + (*pt->points[k])[1] * cos(rot1*M_PI/180);
+ double kx1 = dxf.points[path.indices[k]][0] * cos(rot1*M_PI/180) + dxf.points[path.indices[k]][1] * sin(rot1*M_PI/180);
+ double ky1 = dxf.points[path.indices[k]][0] * -sin(rot1*M_PI/180) + dxf.points[path.indices[k]][1] * cos(rot1*M_PI/180);
- double kx2 = (*pt->points[k])[0] * cos(rot2*M_PI/180) + (*pt->points[k])[1] * sin(rot2*M_PI/180);
- double ky2 = (*pt->points[k])[0] * -sin(rot2*M_PI/180) + (*pt->points[k])[1] * cos(rot2*M_PI/180);
+ double kx2 = dxf.points[path.indices[k]][0] * cos(rot2*M_PI/180) + dxf.points[path.indices[k]][1] * sin(rot2*M_PI/180);
+ double ky2 = dxf.points[path.indices[k]][0] * -sin(rot2*M_PI/180) + dxf.points[path.indices[k]][1] * cos(rot2*M_PI/180);
double dia1_len_sq = (jy1-ky2)*(jy1-ky2) + (jx1-kx2)*(jx1-kx2);
double dia2_len_sq = (jy2-ky1)*(jy2-ky1) + (jx2-kx1)*(jx2-kx1);
@@ -183,7 +203,7 @@ static void add_slice(PolySet *ps, DxfData::Path *pt, double rot1, double rot2,
if (dia1_len_sq > dia2_len_sq)
{
ps->append_poly();
- if (pt->is_inner) {
+ if (path.is_inner) {
ps->append_vertex(kx1, ky1, h1);
ps->append_vertex(jx1, jy1, h1);
ps->append_vertex(jx2, jy2, h2);
@@ -194,7 +214,7 @@ static void add_slice(PolySet *ps, DxfData::Path *pt, double rot1, double rot2,
}
ps->append_poly();
- if (pt->is_inner) {
+ if (path.is_inner) {
ps->append_vertex(kx2, ky2, h2);
ps->append_vertex(kx1, ky1, h1);
ps->append_vertex(jx2, jy2, h2);
@@ -207,7 +227,7 @@ static void add_slice(PolySet *ps, DxfData::Path *pt, double rot1, double rot2,
else
{
ps->append_poly();
- if (pt->is_inner) {
+ if (path.is_inner) {
ps->append_vertex(kx1, ky1, h1);
ps->append_vertex(jx1, jy1, h1);
ps->append_vertex(kx2, ky2, h2);
@@ -218,7 +238,7 @@ static void add_slice(PolySet *ps, DxfData::Path *pt, double rot1, double rot2,
}
ps->append_poly();
- if (pt->is_inner) {
+ if (path.is_inner) {
ps->append_vertex(jx2, jy2, h2);
ps->append_vertex(kx2, ky2, h2);
ps->append_vertex(jx1, jy1, h1);
@@ -231,29 +251,40 @@ static void add_slice(PolySet *ps, DxfData::Path *pt, double rot1, double rot2,
}
}
-PolySet *PolySetCGALEvaluator::evaluatePolySet(const DxfLinearExtrudeNode &node, AbstractPolyNode::render_mode_e)
+PolySet *PolySetCGALEvaluator::evaluatePolySet(const DxfLinearExtrudeNode &node)
{
- const string &cacheid = this->cgalevaluator.getTree().getString(node);
- if (this->cache.contains(cacheid)) return this->cache[cacheid]->ps->link();
-
DxfData *dxf;
- if (node.filename.isEmpty())
+ if (node.filename.empty())
{
// Before extruding, union all (2D) children nodes
// to a single DxfData, then tesselate this into a PolySet
- CGAL_Nef_polyhedron N;
- N.dim = 2;
- foreach (AbstractNode * v, node.getChildren()) {
+ CGAL_Nef_polyhedron sum;
+ BOOST_FOREACH (AbstractNode * v, node.getChildren()) {
if (v->modinst->tag_background) continue;
- N.p2 += this->cgalevaluator.evaluateCGALMesh(*v).p2;
+ CGAL_Nef_polyhedron N = this->cgalevaluator.evaluateCGALMesh(*v);
+ if (N.dim != 2) {
+ PRINT("ERROR: rotate_extrude() is not defined for 3D child objects!");
+ }
+ else {
+ if (sum.empty()) sum = N.copy();
+ else sum += N;
+ }
}
- dxf = new DxfData(N);
+ if (sum.empty()) return NULL;
+ dxf = sum.convertToDxfData();;
} else {
dxf = new DxfData(node.fn, node.fs, node.fa, node.filename, node.layername, node.origin_x, node.origin_y, node.scale);
}
+ PolySet *ps = extrudeDxfData(node, *dxf);
+ delete dxf;
+ return ps;
+}
+
+PolySet *PolySetCGALEvaluator::extrudeDxfData(const DxfLinearExtrudeNode &node, DxfData &dxf)
+{
PolySet *ps = new PolySet();
ps->convexity = node.convexity;
@@ -268,20 +299,20 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const DxfLinearExtrudeNode &node,
}
bool first_open_path = true;
- for (int i = 0; i < dxf->paths.count(); i++)
+ for (size_t i = 0; i < dxf.paths.size(); i++)
{
- if (dxf->paths[i].is_closed)
+ if (dxf.paths[i].is_closed)
continue;
if (first_open_path) {
PRINTF("WARNING: Open paths in dxf_linear_extrude(file = \"%s\", layer = \"%s\"):",
- node.filename.toAscii().data(), node.layername.toAscii().data());
+ node.filename.c_str(), node.layername.c_str());
first_open_path = false;
}
PRINTF(" %9.5f %10.5f ... %10.5f %10.5f",
- (*dxf->paths[i].points.first())[0] / node.scale + node.origin_x,
- (*dxf->paths[i].points.first())[1] / node.scale + node.origin_y,
- (*dxf->paths[i].points.last())[0] / node.scale + node.origin_x,
- (*dxf->paths[i].points.last())[1] / node.scale + node.origin_y);
+ dxf.points[dxf.paths[i].indices.front()][0] / node.scale + node.origin_x,
+ dxf.points[dxf.paths[i].indices.front()][1] / node.scale + node.origin_y,
+ dxf.points[dxf.paths[i].indices.back()][0] / node.scale + node.origin_x,
+ dxf.points[dxf.paths[i].indices.back()][1] / node.scale + node.origin_y);
}
@@ -295,11 +326,11 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const DxfLinearExtrudeNode &node,
double t2 = node.twist*(j+1) / node.slices;
double g1 = h1 + (h2-h1)*j / node.slices;
double g2 = h1 + (h2-h1)*(j+1) / node.slices;
- for (int i = 0; i < dxf->paths.count(); i++)
+ for (size_t i = 0; i < dxf.paths.size(); i++)
{
- if (!dxf->paths[i].is_closed)
+ if (!dxf.paths[i].is_closed)
continue;
- add_slice(ps, &dxf->paths[i], t1, t2, g1, g2);
+ add_slice(ps, dxf, dxf.paths[i], t1, t2, g1, g2);
}
}
}
@@ -307,52 +338,76 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const DxfLinearExtrudeNode &node,
{
dxf_tesselate(ps, dxf, 0, false, true, h1);
dxf_tesselate(ps, dxf, 0, true, true, h2);
- for (int i = 0; i < dxf->paths.count(); i++)
+ for (size_t i = 0; i < dxf.paths.size(); i++)
{
- if (!dxf->paths[i].is_closed)
+ if (!dxf.paths[i].is_closed)
continue;
- add_slice(ps, &dxf->paths[i], 0, 0, h1, h2);
+ add_slice(ps, dxf, dxf.paths[i], 0, 0, h1, h2);
}
}
- delete dxf;
-
- this->cache.insert(cacheid, new cache_entry(ps->link()));
return ps;
}
-PolySet *PolySetCGALEvaluator::evaluatePolySet(const DxfRotateExtrudeNode &node,
- AbstractPolyNode::render_mode_e)
+PolySet *PolySetCGALEvaluator::evaluatePolySet(const DxfRotateExtrudeNode &node)
{
- const string &cacheid = this->cgalevaluator.getTree().getString(node);
- if (this->cache.contains(cacheid)) return this->cache[cacheid]->ps->link();
-
DxfData *dxf;
- if (node.filename.isEmpty())
+ if (node.filename.empty())
{
// Before extruding, union all (2D) children nodes
// to a single DxfData, then tesselate this into a PolySet
- CGAL_Nef_polyhedron N;
- N.dim = 2;
- foreach (AbstractNode * v, node.getChildren()) {
+ CGAL_Nef_polyhedron sum;
+ BOOST_FOREACH (AbstractNode * v, node.getChildren()) {
if (v->modinst->tag_background) continue;
- N.p2 += this->cgalevaluator.evaluateCGALMesh(*v).p2;
+ CGAL_Nef_polyhedron N = this->cgalevaluator.evaluateCGALMesh(*v);
+ if (N.dim != 2) {
+ PRINT("ERROR: rotate_extrude() is not defined for 3D child objects!");
+ }
+ else {
+ if (sum.empty()) sum = N.copy();
+ else sum += N;
+ }
}
- dxf = new DxfData(N);
+ if (sum.empty()) return NULL;
+ dxf = sum.convertToDxfData();
} else {
dxf = new DxfData(node.fn, node.fs, node.fa, node.filename, node.layername, node.origin_x, node.origin_y, node.scale);
}
+ PolySet *ps = rotateDxfData(node, *dxf);
+ delete dxf;
+ return ps;
+}
+
+PolySet *PolySetCGALEvaluator::evaluatePolySet(const CgaladvNode &node)
+{
+ CGAL_Nef_polyhedron N = this->cgalevaluator.evaluateCGALMesh(node);
+ PolySet *ps = NULL;
+ if (!N.empty()) ps = N.convertToPolyset();
+
+ return ps;
+}
+
+PolySet *PolySetCGALEvaluator::evaluatePolySet(const RenderNode &node)
+{
+ CGAL_Nef_polyhedron N = this->cgalevaluator.evaluateCGALMesh(node);
+ PolySet *ps = NULL;
+ if (!N.empty()) ps = N.convertToPolyset();
+ return ps;
+}
+
+PolySet *PolySetCGALEvaluator::rotateDxfData(const DxfRotateExtrudeNode &node, DxfData &dxf)
+{
PolySet *ps = new PolySet();
ps->convexity = node.convexity;
- for (int i = 0; i < dxf->paths.count(); i++)
+ for (size_t i = 0; i < dxf.paths.size(); i++)
{
double max_x = 0;
- for (int j = 0; j < dxf->paths[i].points.count(); j++) {
- max_x = fmax(max_x, (*dxf->paths[i].points[j])[0]);
+ for (size_t j = 0; j < dxf.paths[i].indices.size(); j++) {
+ max_x = fmax(max_x, dxf.points[dxf.paths[i].indices[j]][0]);
}
int fragments = get_fragments_from_r(max_x, node.fn, node.fs, node.fa);
@@ -360,29 +415,29 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const DxfRotateExtrudeNode &node,
double ***points;
points = new double**[fragments];
for (int j=0; j < fragments; j++) {
- points[j] = new double*[dxf->paths[i].points.count()];
- for (int k=0; k < dxf->paths[i].points.count(); k++)
+ points[j] = new double*[dxf.paths[i].indices.size()];
+ for (size_t k=0; k < dxf.paths[i].indices.size(); k++)
points[j][k] = new double[3];
}
for (int j = 0; j < fragments; j++) {
double a = (j*2*M_PI) / fragments;
- for (int k = 0; k < dxf->paths[i].points.count(); k++) {
- if ((*dxf->paths[i].points[k])[0] == 0) {
+ for (size_t k = 0; k < dxf.paths[i].indices.size(); k++) {
+ if (dxf.points[dxf.paths[i].indices[k]][0] == 0) {
points[j][k][0] = 0;
points[j][k][1] = 0;
} else {
- points[j][k][0] = (*dxf->paths[i].points[k])[0] * sin(a);
- points[j][k][1] = (*dxf->paths[i].points[k])[0] * cos(a);
+ points[j][k][0] = dxf.points[dxf.paths[i].indices[k]][0] * sin(a);
+ points[j][k][1] = dxf.points[dxf.paths[i].indices[k]][0] * cos(a);
}
- points[j][k][2] = (*dxf->paths[i].points[k])[1];
+ points[j][k][2] = dxf.points[dxf.paths[i].indices[k]][1];
}
}
for (int j = 0; j < fragments; j++) {
int j1 = j + 1 < fragments ? j + 1 : 0;
- for (int k = 0; k < dxf->paths[i].points.count(); k++) {
- int k1 = k + 1 < dxf->paths[i].points.count() ? k + 1 : 0;
+ for (size_t k = 0; k < dxf.paths[i].indices.size(); k++) {
+ int k1 = k + 1 < dxf.paths[i].indices.size() ? k + 1 : 0;
if (points[j][k][0] != points[j1][k][0] ||
points[j][k][1] != points[j1][k][1] ||
points[j][k][2] != points[j1][k][2]) {
@@ -409,15 +464,12 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const DxfRotateExtrudeNode &node,
}
for (int j=0; j < fragments; j++) {
- for (int k=0; k < dxf->paths[i].points.count(); k++)
+ for (size_t k=0; k < dxf.paths[i].indices.size(); k++)
delete[] points[j][k];
delete[] points[j];
}
delete[] points;
}
-
- delete dxf;
-
- this->cache.insert(cacheid, new cache_entry(ps->link()));
+
return ps;
}
contact: Jan Huwald // Impressum