bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix for carve memory leak, update carve to hg bf36d92ff093

Browse Source 
reported: http://code.google.com/p/carve/issues/detail?id=33
This commit is contained in:
Campbell Barton 2012-07-04 16:07:01 +00:00
parent 4149ea5f50
commit 7180551890
7 changed files with 231 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
extern/carve/include/carve/csg.hpp vendored
View File

@ -174,34 +174,34 @@ namespace carve {
void groupIntersections(); void groupIntersections();
void _generateVertexVertexIntersections(carve::mesh::MeshSet<3>::vertex_t *va, void _generateVertexVertexIntersections(meshset_t::vertex_t *va,
carve::mesh::MeshSet<3>::edge_t *eb); meshset_t::edge_t *eb);
void generateVertexVertexIntersections(carve::mesh::MeshSet<3>::face_t *a, void generateVertexVertexIntersections(meshset_t::face_t *a,
const std::vector<carve::mesh::MeshSet<3>::face_t *> &b); const std::vector<meshset_t::face_t *> &b);
void _generateVertexEdgeIntersections(carve::mesh::MeshSet<3>::vertex_t *va, void _generateVertexEdgeIntersections(meshset_t::vertex_t *va,
carve::mesh::MeshSet<3>::edge_t *eb); meshset_t::edge_t *eb);
void generateVertexEdgeIntersections(carve::mesh::MeshSet<3>::face_t *a, void generateVertexEdgeIntersections(meshset_t::face_t *a,
const std::vector<carve::mesh::MeshSet<3>::face_t *> &b); const std::vector<meshset_t::face_t *> &b);
void _generateEdgeEdgeIntersections(carve::mesh::MeshSet<3>::edge_t *ea, void _generateEdgeEdgeIntersections(meshset_t::edge_t *ea,
carve::mesh::MeshSet<3>::edge_t *eb); meshset_t::edge_t *eb);
void generateEdgeEdgeIntersections(carve::mesh::MeshSet<3>::face_t *a, void generateEdgeEdgeIntersections(meshset_t::face_t *a,
const std::vector<carve::mesh::MeshSet<3>::face_t *> &b); const std::vector<meshset_t::face_t *> &b);
void _generateVertexFaceIntersections(carve::mesh::MeshSet<3>::face_t *fa, void _generateVertexFaceIntersections(meshset_t::face_t *fa,
carve::mesh::MeshSet<3>::edge_t *eb); meshset_t::edge_t *eb);
void generateVertexFaceIntersections(carve::mesh::MeshSet<3>::face_t *a, void generateVertexFaceIntersections(meshset_t::face_t *a,
const std::vector<carve::mesh::MeshSet<3>::face_t *> &b); const std::vector<meshset_t::face_t *> &b);
void _generateEdgeFaceIntersections(carve::mesh::MeshSet<3>::face_t *fa, void _generateEdgeFaceIntersections(meshset_t::face_t *fa,
carve::mesh::MeshSet<3>::edge_t *eb); meshset_t::edge_t *eb);
void generateEdgeFaceIntersections(carve::mesh::MeshSet<3>::face_t *a, void generateEdgeFaceIntersections(meshset_t::face_t *a,
const std::vector<carve::mesh::MeshSet<3>::face_t *> &b); const std::vector<meshset_t::face_t *> &b);
void generateIntersectionCandidates(carve::mesh::MeshSet<3> *a, void generateIntersectionCandidates(meshset_t *a,
const face_rtree_t *a_node, const face_rtree_t *a_node,
carve::mesh::MeshSet<3> *b, meshset_t *b,
const face_rtree_t *b_node, const face_rtree_t *b_node,
face_pairs_t &face_pairs, face_pairs_t &face_pairs,
bool descend_a = true); bool descend_a = true);
@ -287,7 +287,7 @@ namespace carve {
* @param[out] out_loops A list of grouped face loops. * @param[out] out_loops A list of grouped face loops.
*/ */
void groupFaceLoops( void groupFaceLoops(
carve::mesh::MeshSet<3> *src, meshset_t *src,
FaceLoopList &face_loops, FaceLoopList &face_loops,
const detail::LoopEdges &loop_edges, const detail::LoopEdges &loop_edges,
const V2Set &no_cross, const V2Set &no_cross,

5
extern/carve/include/carve/polyline_decl.hpp vendored
View File

@ -138,6 +138,11 @@ namespace carve {
PolylineSet(const std::vector<carve::geom3d::Vector> &points); PolylineSet(const std::vector<carve::geom3d::Vector> &points);
PolylineSet() { PolylineSet() {
} }
~PolylineSet() {
for (line_iter i = lines.begin(); i != lines.end(); ++i) {
delete *i;
}
}
template<typename iter_t> template<typename iter_t>
void addPolyline(bool closed, iter_t begin, iter_t end); void addPolyline(bool closed, iter_t begin, iter_t end);

13
extern/carve/include/carve/rtree.hpp vendored
View File

@ -49,8 +49,6 @@ namespace carve {
aabb_t getAABB() const { return bbox; } aabb_t getAABB() const { return bbox; }
struct data_aabb_t { struct data_aabb_t {
aabb_t bbox; aabb_t bbox;
data_t data; data_t data;
@ -164,6 +162,17 @@ namespace carve {
_fill(begin, end, typename std::iterator_traits<iter_t>::value_type()); _fill(begin, end, typename std::iterator_traits<iter_t>::value_type());
} }
~RTreeNode() {
if (child) {
RTreeNode *next = child;
while (next) {
RTreeNode *curr = next;
next = next->sibling;
delete curr;
}
}
}
// functor for ordering nodes by increasing aabb midpoint, along a specified axis. // functor for ordering nodes by increasing aabb midpoint, along a specified axis.

4
extern/carve/lib/csg_data.hpp vendored
View File

@ -30,7 +30,7 @@ struct carve::csg::detail::Data {
VVMap vmap; VVMap vmap;
// map from intersected edge to intersection points. // map from intersected edge to intersection points.
EVSMap emap; EIntMap emap;
// map from intersected face to intersection points. // map from intersected face to intersection points.
FVSMap fmap; FVSMap fmap;
@ -39,7 +39,7 @@ struct carve::csg::detail::Data {
VFSMap fmap_rev; VFSMap fmap_rev;
// created by divideEdges(). // created by divideEdges().
// holds, for each edge, a // holds, for each edge, an ordered vector of inserted vertices.
EVVMap divided_edges; EVVMap divided_edges;
// created by faceSplitEdges. // created by faceSplitEdges.

30
extern/carve/lib/csg_detail.hpp vendored
View File

@ -24,30 +24,32 @@
namespace carve { namespace carve {
namespace csg { namespace csg {
namespace detail { namespace detail {
typedef std::map<carve::mesh::MeshSet<3>::vertex_t *,
std::set<std::pair<carve::mesh::MeshSet<3>::face_t *, double> > > EdgeIntInfo;
typedef std::unordered_set<carve::mesh::MeshSet<3>::vertex_t *> VSet; typedef std::unordered_set<carve::mesh::MeshSet<3>::vertex_t *> VSet;
typedef std::unordered_set<carve::mesh::MeshSet<3>::face_t *> FSet; typedef std::unordered_set<carve::mesh::MeshSet<3>::face_t *> FSet;
typedef std::set<carve::mesh::MeshSet<3>::vertex_t *> VSetSmall; typedef std::set<carve::mesh::MeshSet<3>::vertex_t *> VSetSmall;
typedef std::set<csg::V2> V2SetSmall; typedef std::set<csg::V2> V2SetSmall;
typedef std::set<carve::mesh::MeshSet<3>::face_t *> FSetSmall; typedef std::set<carve::mesh::MeshSet<3>::face_t *> FSetSmall;
typedef std::unordered_map<carve::mesh::MeshSet<3>::vertex_t *, VSetSmall> VVSMap; typedef std::unordered_map<carve::mesh::MeshSet<3>::vertex_t *, VSetSmall> VVSMap;
typedef std::unordered_map<carve::mesh::MeshSet<3>::edge_t *, VSetSmall> EVSMap; typedef std::unordered_map<carve::mesh::MeshSet<3>::edge_t *, EdgeIntInfo> EIntMap;
typedef std::unordered_map<carve::mesh::MeshSet<3>::face_t *, VSetSmall> FVSMap; typedef std::unordered_map<carve::mesh::MeshSet<3>::face_t *, VSetSmall> FVSMap;
typedef std::unordered_map<carve::mesh::MeshSet<3>::vertex_t *, FSetSmall> VFSMap; typedef std::unordered_map<carve::mesh::MeshSet<3>::vertex_t *, FSetSmall> VFSMap;
typedef std::unordered_map<carve::mesh::MeshSet<3>::face_t *, V2SetSmall> FV2SMap; typedef std::unordered_map<carve::mesh::MeshSet<3>::face_t *, V2SetSmall> FV2SMap;
typedef std::unordered_map< typedef std::unordered_map<
carve::mesh::MeshSet<3>::edge_t *, carve::mesh::MeshSet<3>::edge_t *,
std::vector<carve::mesh::MeshSet<3>::vertex_t *> > EVVMap; std::vector<carve::mesh::MeshSet<3>::vertex_t *> > EVVMap;
typedef std::unordered_map<carve::mesh::MeshSet<3>::vertex_t *, typedef std::unordered_map<carve::mesh::MeshSet<3>::vertex_t *,
std::vector<carve::mesh::MeshSet<3>::edge_t *> > VEVecMap; std::vector<carve::mesh::MeshSet<3>::edge_t *> > VEVecMap;
class LoopEdges : public std::unordered_map<V2, std::list<FaceLoop *> > { class LoopEdges : public std::unordered_map<V2, std::list<FaceLoop *> > {
typedef std::unordered_map<V2, std::list<FaceLoop *> > super; typedef std::unordered_map<V2, std::list<FaceLoop *> > super;
public: public:

291
extern/carve/lib/intersect.cpp vendored
View File

@ -41,6 +41,7 @@
#include <carve/timing.hpp> #include <carve/timing.hpp>
#include <carve/colour.hpp> #include <carve/colour.hpp>
#include <memory>
@ -114,7 +115,7 @@ namespace {
ordered_vertices.reserve(std::distance(beg, end)); ordered_vertices.reserve(std::distance(beg, end));
for (; beg != end; ++beg) { for (; beg != end; ++beg) {
carve::mesh::MeshSet<3>::vertex_t *v = (*beg); carve::mesh::MeshSet<3>::vertex_t *v = *beg;
ordered_vertices.push_back(std::make_pair(carve::geom::dot(v->v - base, dir), v)); ordered_vertices.push_back(std::make_pair(carve::geom::dot(v->v - base, dir), v));
} }
@ -130,6 +131,37 @@ namespace {
} }
} }
template<typename iter_t>
void orderEdgeIntersectionVertices(iter_t beg, const iter_t end,
const carve::mesh::MeshSet<3>::vertex_t::vector_t &dir,
const carve::mesh::MeshSet<3>::vertex_t::vector_t &base,
std::vector<carve::mesh::MeshSet<3>::vertex_t *> &out) {
typedef std::vector<std::pair<std::pair<double, double>, carve::mesh::MeshSet<3>::vertex_t *> > DVVector;
DVVector ordered_vertices;
ordered_vertices.reserve(std::distance(beg, end));
for (; beg != end; ++beg) {
carve::mesh::MeshSet<3>::vertex_t *v = (*beg).first;
double ovec = 0.0;
for (carve::csg::detail::EdgeIntInfo::mapped_type::const_iterator j = (*beg).second.begin(); j != (*beg).second.end(); ++j) {
ovec += (*j).second;
}
ordered_vertices.push_back(std::make_pair(std::make_pair(carve::geom::dot(v->v - base, dir), -ovec), v));
}
std::sort(ordered_vertices.begin(), ordered_vertices.end());
out.clear();
out.reserve(ordered_vertices.size());
for (DVVector::const_iterator
i = ordered_vertices.begin(), e = ordered_vertices.end();
i != e;
++i) {
out.push_back((*i).second);
}
}
/** /**
@ -346,7 +378,7 @@ bool carve::csg::CSG::Hooks::hasHook(unsigned hook_num) {
return hooks[hook_num].size() > 0; return hooks[hook_num].size() > 0;
} }
void carve::csg::CSG::Hooks::intersectionVertex(const carve::mesh::MeshSet<3>::vertex_t *vertex, void carve::csg::CSG::Hooks::intersectionVertex(const meshset_t::vertex_t *vertex,
const IObjPairSet &intersections) { const IObjPairSet &intersections) {
for (std::list<Hook *>::iterator j = hooks[INTERSECTION_VERTEX_HOOK].begin(); for (std::list<Hook *>::iterator j = hooks[INTERSECTION_VERTEX_HOOK].begin();
j != hooks[INTERSECTION_VERTEX_HOOK].end(); j != hooks[INTERSECTION_VERTEX_HOOK].end();
@ -355,8 +387,8 @@ void carve::csg::CSG::Hooks::intersectionVertex(const carve::mesh::MeshSet<3>::v
} }
} }
void carve::csg::CSG::Hooks::processOutputFace(std::vector<carve::mesh::MeshSet<3>::face_t *> &faces, void carve::csg::CSG::Hooks::processOutputFace(std::vector<meshset_t::face_t *> &faces,
const carve::mesh::MeshSet<3>::face_t *orig_face, const meshset_t::face_t *orig_face,
bool flipped) { bool flipped) {
for (std::list<Hook *>::iterator j = hooks[PROCESS_OUTPUT_FACE_HOOK].begin(); for (std::list<Hook *>::iterator j = hooks[PROCESS_OUTPUT_FACE_HOOK].begin();
j != hooks[PROCESS_OUTPUT_FACE_HOOK].end(); j != hooks[PROCESS_OUTPUT_FACE_HOOK].end();
@ -365,8 +397,8 @@ void carve::csg::CSG::Hooks::processOutputFace(std::vector<carve::mesh::MeshSet<
} }
} }
void carve::csg::CSG::Hooks::resultFace(const carve::mesh::MeshSet<3>::face_t *new_face, void carve::csg::CSG::Hooks::resultFace(const meshset_t::face_t *new_face,
const carve::mesh::MeshSet<3>::face_t *orig_face, const meshset_t::face_t *orig_face,
bool flipped) { bool flipped) {
for (std::list<Hook *>::iterator j = hooks[RESULT_FACE_HOOK].begin(); for (std::list<Hook *>::iterator j = hooks[RESULT_FACE_HOOK].begin();
j != hooks[RESULT_FACE_HOOK].end(); j != hooks[RESULT_FACE_HOOK].end();
@ -425,7 +457,7 @@ void carve::csg::CSG::makeVertexIntersections() {
j != je; j != je;
++j) { ++j) {
const IObj &i_tgt = ((*j).first); const IObj &i_tgt = ((*j).first);
carve::mesh::MeshSet<3>::vertex_t *i_pt = ((*j).second); meshset_t::vertex_t *i_pt = ((*j).second);
vertex_intersections[i_pt].insert(std::make_pair(i_src, i_tgt)); vertex_intersections[i_pt].insert(std::make_pair(i_src, i_tgt));
} }
@ -499,7 +531,7 @@ void carve::csg::CSG::groupIntersections() {
carve::TimingBlock block(GROUP_INTERSECTONS); carve::TimingBlock block(GROUP_INTERSECTONS);
std::vector<carve::mesh::MeshSet<3>::vertex_t *> vertices; std::vector<meshset_t::vertex_t *> vertices;
detail::VVSMap graph; detail::VVSMap graph;
#if defined(CARVE_DEBUG) #if defined(CARVE_DEBUG)
std::cerr << "groupIntersections()" << ": vertex_intersections.size()==" << vertex_intersections.size() << std::endl; std::cerr << "groupIntersections()" << ": vertex_intersections.size()==" << vertex_intersections.size() << std::endl;
@ -521,7 +553,7 @@ void carve::csg::CSG::groupIntersections() {
vertex_intersections_octree.addVertices(vertices); vertex_intersections_octree.addVertices(vertices);
std::vector<carve::mesh::MeshSet<3>::vertex_t *> out; std::vector<meshset_t::vertex_t *> out;
for (size_t i = 0, l = vertices.size(); i != l; ++i) { for (size_t i = 0, l = vertices.size(); i != l; ++i) {
// let's find all the vertices near this one. // let's find all the vertices near this one.
out.clear(); out.clear();
@ -546,7 +578,7 @@ void carve::csg::CSG::groupIntersections() {
open.insert((*i).first); open.insert((*i).first);
while (open.size()) { while (open.size()) {
detail::VSet::iterator t = open.begin(); detail::VSet::iterator t = open.begin();
const carve::mesh::MeshSet<3>::vertex_t *o = (*t); const meshset_t::vertex_t *o = (*t);
open.erase(t); open.erase(t);
i = graph.find(o); i = graph.find(o);
CARVE_ASSERT(i != graph.end()); CARVE_ASSERT(i != graph.end());
@ -568,6 +600,19 @@ void carve::csg::CSG::groupIntersections() {
} }
static void recordEdgeIntersectionInfo(carve::mesh::MeshSet<3>::vertex_t *intersection,
carve::mesh::MeshSet<3>::edge_t *edge,
const carve::csg::detail::VFSMap::mapped_type &intersected_faces,
carve::csg::detail::Data &data) {
carve::mesh::MeshSet<3>::vertex_t::vector_t edge_dir = edge->v2()->v - edge->v1()->v;
carve::csg::detail::EdgeIntInfo::mapped_type &eint_info = data.emap[edge][intersection];
for (carve::csg::detail::VFSMap::mapped_type::const_iterator i = intersected_faces.begin(); i != intersected_faces.end(); ++i) {
carve::mesh::MeshSet<3>::vertex_t::vector_t normal = (*i)->plane.N;
eint_info.insert(std::make_pair((*i), carve::geom::dot(edge_dir, normal)));
}
}
void carve::csg::CSG::intersectingFacePairs(detail::Data &data) { void carve::csg::CSG::intersectingFacePairs(detail::Data &data) {
static carve::TimingName FUNC_NAME("CSG::intersectingFacePairs()"); static carve::TimingName FUNC_NAME("CSG::intersectingFacePairs()");
@ -575,30 +620,36 @@ void carve::csg::CSG::intersectingFacePairs(detail::Data &data) {
// iterate over all intersection points. // iterate over all intersection points.
for (VertexIntersections::const_iterator i = vertex_intersections.begin(), ie = vertex_intersections.end(); i != ie; ++i) { for (VertexIntersections::const_iterator i = vertex_intersections.begin(), ie = vertex_intersections.end(); i != ie; ++i) {
carve::mesh::MeshSet<3>::vertex_t *i_pt = ((*i).first); meshset_t::vertex_t *i_pt = ((*i).first);
detail::VFSMap::mapped_type &face_set = (data.fmap_rev[i_pt]); detail::VFSMap::mapped_type &face_set = (data.fmap_rev[i_pt]);
detail::VFSMap::mapped_type src_face_set;
detail::VFSMap::mapped_type tgt_face_set;
// for all pairs of intersecting objects at this point // for all pairs of intersecting objects at this point
for (VertexIntersections::data_type::const_iterator j = (*i).second.begin(), je = (*i).second.end(); j != je; ++j) { for (VertexIntersections::data_type::const_iterator j = (*i).second.begin(), je = (*i).second.end(); j != je; ++j) {
const IObj &i_src = ((*j).first); const IObj &i_src = ((*j).first);
const IObj &i_tgt = ((*j).second); const IObj &i_tgt = ((*j).second);
// work out the faces involved. this updates fmap_rev. src_face_set.clear();
facesForObject(i_src, data.vert_to_edges, face_set); tgt_face_set.clear();
facesForObject(i_tgt, data.vert_to_edges, face_set); // work out the faces involved.
facesForObject(i_src, data.vert_to_edges, src_face_set);
facesForObject(i_tgt, data.vert_to_edges, tgt_face_set);
// this updates fmap_rev.
std::copy(src_face_set.begin(), src_face_set.end(), set_inserter(face_set));
std::copy(tgt_face_set.begin(), tgt_face_set.end(), set_inserter(face_set));
// record the intersection with respect to any involved vertex. // record the intersection with respect to any involved vertex.
if (i_src.obtype == IObj::OBTYPE_VERTEX) data.vmap[i_src.vertex] = i_pt; if (i_src.obtype == IObj::OBTYPE_VERTEX) data.vmap[i_src.vertex] = i_pt;
if (i_tgt.obtype == IObj::OBTYPE_VERTEX) data.vmap[i_tgt.vertex] = i_pt; if (i_tgt.obtype == IObj::OBTYPE_VERTEX) data.vmap[i_tgt.vertex] = i_pt;
// record the intersection with respect to any involved edge. // record the intersection with respect to any involved edge.
if (i_src.obtype == IObj::OBTYPE_EDGE) data.emap[i_src.edge].insert(i_pt); if (i_src.obtype == IObj::OBTYPE_EDGE) recordEdgeIntersectionInfo(i_pt, i_src.edge, tgt_face_set, data);
if (i_tgt.obtype == IObj::OBTYPE_EDGE) data.emap[i_tgt.edge].insert(i_pt); if (i_tgt.obtype == IObj::OBTYPE_EDGE) recordEdgeIntersectionInfo(i_pt, i_tgt.edge, src_face_set, data);
} }
// record the intersection with respect to each face. // record the intersection with respect to each face.
for (carve::csg::detail::VFSMap::mapped_type::const_iterator k = face_set.begin(), ke = face_set.end(); k != ke; ++k) { for (carve::csg::detail::VFSMap::mapped_type::const_iterator k = face_set.begin(), ke = face_set.end(); k != ke; ++k) {
carve::mesh::MeshSet<3>::face_t *f = (*k); meshset_t::face_t *f = (*k);
data.fmap[f].insert(i_pt); data.fmap[f].insert(i_pt);
} }
} }
@ -606,8 +657,8 @@ void carve::csg::CSG::intersectingFacePairs(detail::Data &data) {
void carve::csg::CSG::_generateVertexVertexIntersections(carve::mesh::MeshSet<3>::vertex_t *va, void carve::csg::CSG::_generateVertexVertexIntersections(meshset_t::vertex_t *va,
carve::mesh::MeshSet<3>::edge_t *eb) { meshset_t::edge_t *eb) {
if (intersections.intersects(va, eb->v1())) { if (intersections.intersects(va, eb->v1())) {
return; return;
} }
@ -621,14 +672,14 @@ void carve::csg::CSG::_generateVertexVertexIntersections(carve::mesh::MeshSet<3>
void carve::csg::CSG::generateVertexVertexIntersections(carve::mesh::MeshSet<3>::face_t *a, void carve::csg::CSG::generateVertexVertexIntersections(meshset_t::face_t *a,
const std::vector<carve::mesh::MeshSet<3>::face_t *> &b) { const std::vector<meshset_t::face_t *> &b) {
carve::mesh::MeshSet<3>::edge_t *ea, *eb; meshset_t::edge_t *ea, *eb;
ea = a->edge; ea = a->edge;
do { do {
for (size_t i = 0; i < b.size(); ++i) { for (size_t i = 0; i < b.size(); ++i) {
carve::mesh::MeshSet<3>::face_t *t = b[i]; meshset_t::face_t *t = b[i];
eb = t->edge; eb = t->edge;
do { do {
_generateVertexVertexIntersections(ea->v1(), eb); _generateVertexVertexIntersections(ea->v1(), eb);
@ -641,8 +692,8 @@ void carve::csg::CSG::generateVertexVertexIntersections(carve::mesh::MeshSet<3>:
void carve::csg::CSG::_generateVertexEdgeIntersections(carve::mesh::MeshSet<3>::vertex_t *va, void carve::csg::CSG::_generateVertexEdgeIntersections(meshset_t::vertex_t *va,
carve::mesh::MeshSet<3>::edge_t *eb) { meshset_t::edge_t *eb) {
if (intersections.intersects(va, eb)) { if (intersections.intersects(va, eb)) {
return; return;
} }
@ -665,14 +716,14 @@ void carve::csg::CSG::_generateVertexEdgeIntersections(carve::mesh::MeshSet<3>::
void carve::csg::CSG::generateVertexEdgeIntersections(carve::mesh::MeshSet<3>::face_t *a, void carve::csg::CSG::generateVertexEdgeIntersections(meshset_t::face_t *a,
const std::vector<carve::mesh::MeshSet<3>::face_t *> &b) { const std::vector<meshset_t::face_t *> &b) {
carve::mesh::MeshSet<3>::edge_t *ea, *eb; meshset_t::edge_t *ea, *eb;
ea = a->edge; ea = a->edge;
do { do {
for (size_t i = 0; i < b.size(); ++i) { for (size_t i = 0; i < b.size(); ++i) {
carve::mesh::MeshSet<3>::face_t *t = b[i]; meshset_t::face_t *t = b[i];
eb = t->edge; eb = t->edge;
do { do {
_generateVertexEdgeIntersections(ea->v1(), eb); _generateVertexEdgeIntersections(ea->v1(), eb);
@ -685,21 +736,21 @@ void carve::csg::CSG::generateVertexEdgeIntersections(carve::mesh::MeshSet<3>::f
void carve::csg::CSG::_generateEdgeEdgeIntersections(carve::mesh::MeshSet<3>::edge_t *ea, void carve::csg::CSG::_generateEdgeEdgeIntersections(meshset_t::edge_t *ea,
carve::mesh::MeshSet<3>::edge_t *eb) { meshset_t::edge_t *eb) {
if (intersections.intersects(ea, eb)) { if (intersections.intersects(ea, eb)) {
return; return;
} }
carve::mesh::MeshSet<3>::vertex_t *v1 = ea->v1(), *v2 = ea->v2(); meshset_t::vertex_t *v1 = ea->v1(), *v2 = ea->v2();
carve::mesh::MeshSet<3>::vertex_t *v3 = eb->v1(), *v4 = eb->v2(); meshset_t::vertex_t *v3 = eb->v1(), *v4 = eb->v2();
carve::geom::aabb<3> ea_aabb, eb_aabb; carve::geom::aabb<3> ea_aabb, eb_aabb;
ea_aabb.fit(v1->v, v2->v); ea_aabb.fit(v1->v, v2->v);
eb_aabb.fit(v3->v, v4->v); eb_aabb.fit(v3->v, v4->v);
if (ea_aabb.maxAxisSeparation(eb_aabb) > EPSILON) return; if (ea_aabb.maxAxisSeparation(eb_aabb) > EPSILON) return;
carve::mesh::MeshSet<3>::vertex_t::vector_t p1, p2; meshset_t::vertex_t::vector_t p1, p2;
double mu1, mu2; double mu1, mu2;
switch (carve::geom3d::rayRayIntersection(carve::geom3d::Ray(v2->v - v1->v, v1->v), switch (carve::geom3d::rayRayIntersection(carve::geom3d::Ray(v2->v - v1->v, v1->v),
@ -708,7 +759,7 @@ void carve::csg::CSG::_generateEdgeEdgeIntersections(carve::mesh::MeshSet<3>::ed
case carve::RR_INTERSECTION: { case carve::RR_INTERSECTION: {
// edges intersect // edges intersect
if (mu1 >= 0.0 && mu1 <= 1.0 && mu2 >= 0.0 && mu2 <= 1.0) { if (mu1 >= 0.0 && mu1 <= 1.0 && mu2 >= 0.0 && mu2 <= 1.0) {
carve::mesh::MeshSet<3>::vertex_t *p = vertex_pool.get((p1 + p2) / 2.0); meshset_t::vertex_t *p = vertex_pool.get((p1 + p2) / 2.0);
intersections.record(ea, eb, p); intersections.record(ea, eb, p);
if (ea->rev) intersections.record(ea->rev, eb, p); if (ea->rev) intersections.record(ea->rev, eb, p);
if (eb->rev) intersections.record(ea, eb->rev, p); if (eb->rev) intersections.record(ea, eb->rev, p);
@ -733,14 +784,14 @@ void carve::csg::CSG::_generateEdgeEdgeIntersections(carve::mesh::MeshSet<3>::ed
void carve::csg::CSG::generateEdgeEdgeIntersections(carve::mesh::MeshSet<3>::face_t *a, void carve::csg::CSG::generateEdgeEdgeIntersections(meshset_t::face_t *a,
const std::vector<carve::mesh::MeshSet<3>::face_t *> &b) { const std::vector<meshset_t::face_t *> &b) {
carve::mesh::MeshSet<3>::edge_t *ea, *eb; meshset_t::edge_t *ea, *eb;
ea = a->edge; ea = a->edge;
do { do {
for (size_t i = 0; i < b.size(); ++i) { for (size_t i = 0; i < b.size(); ++i) {
carve::mesh::MeshSet<3>::face_t *t = b[i]; meshset_t::face_t *t = b[i];
eb = t->edge; eb = t->edge;
do { do {
_generateEdgeEdgeIntersections(ea, eb); _generateEdgeEdgeIntersections(ea, eb);
@ -753,8 +804,8 @@ void carve::csg::CSG::generateEdgeEdgeIntersections(carve::mesh::MeshSet<3>::fac
void carve::csg::CSG::_generateVertexFaceIntersections(carve::mesh::MeshSet<3>::face_t *fa, void carve::csg::CSG::_generateVertexFaceIntersections(meshset_t::face_t *fa,
carve::mesh::MeshSet<3>::edge_t *eb) { meshset_t::edge_t *eb) {
if (intersections.intersects(eb->v1(), fa)) { if (intersections.intersects(eb->v1(), fa)) {
return; return;
} }
@ -769,12 +820,12 @@ void carve::csg::CSG::_generateVertexFaceIntersections(carve::mesh::MeshSet<3>::
void carve::csg::CSG::generateVertexFaceIntersections(carve::mesh::MeshSet<3>::face_t *a, void carve::csg::CSG::generateVertexFaceIntersections(meshset_t::face_t *a,
const std::vector<carve::mesh::MeshSet<3>::face_t *> &b) { const std::vector<meshset_t::face_t *> &b) {
carve::mesh::MeshSet<3>::edge_t *ea, *eb; meshset_t::edge_t *eb;
for (size_t i = 0; i < b.size(); ++i) { for (size_t i = 0; i < b.size(); ++i) {
carve::mesh::MeshSet<3>::face_t *t = b[i]; meshset_t::face_t *t = b[i];
eb = t->edge; eb = t->edge;
do { do {
_generateVertexFaceIntersections(a, eb); _generateVertexFaceIntersections(a, eb);
@ -785,15 +836,15 @@ void carve::csg::CSG::generateVertexFaceIntersections(carve::mesh::MeshSet<3>::f
void carve::csg::CSG::_generateEdgeFaceIntersections(carve::mesh::MeshSet<3>::face_t *fa, void carve::csg::CSG::_generateEdgeFaceIntersections(meshset_t::face_t *fa,
carve::mesh::MeshSet<3>::edge_t *eb) { meshset_t::edge_t *eb) {
if (intersections.intersects(eb, fa)) { if (intersections.intersects(eb, fa)) {
return; return;
} }
carve::mesh::MeshSet<3>::vertex_t::vector_t _p; meshset_t::vertex_t::vector_t _p;
if (fa->simpleLineSegmentIntersection(carve::geom3d::LineSegment(eb->v1()->v, eb->v2()->v), _p)) { if (fa->simpleLineSegmentIntersection(carve::geom3d::LineSegment(eb->v1()->v, eb->v2()->v), _p)) {
carve::mesh::MeshSet<3>::vertex_t *p = vertex_pool.get(_p); meshset_t::vertex_t *p = vertex_pool.get(_p);
intersections.record(eb, fa, p); intersections.record(eb, fa, p);
if (eb->rev) intersections.record(eb->rev, fa, p); if (eb->rev) intersections.record(eb->rev, fa, p);
} }
@ -801,12 +852,12 @@ void carve::csg::CSG::_generateEdgeFaceIntersections(carve::mesh::MeshSet<3>::fa
void carve::csg::CSG::generateEdgeFaceIntersections(carve::mesh::MeshSet<3>::face_t *a, void carve::csg::CSG::generateEdgeFaceIntersections(meshset_t::face_t *a,
const std::vector<carve::mesh::MeshSet<3>::face_t *> &b) { const std::vector<meshset_t::face_t *> &b) {
carve::mesh::MeshSet<3>::edge_t *ea, *eb; meshset_t::edge_t *eb;
for (size_t i = 0; i < b.size(); ++i) { for (size_t i = 0; i < b.size(); ++i) {
carve::mesh::MeshSet<3>::face_t *t = b[i]; meshset_t::face_t *t = b[i];
eb = t->edge; eb = t->edge;
do { do {
_generateEdgeFaceIntersections(a, eb); _generateEdgeFaceIntersections(a, eb);
@ -817,9 +868,9 @@ void carve::csg::CSG::generateEdgeFaceIntersections(carve::mesh::MeshSet<3>::fac
void carve::csg::CSG::generateIntersectionCandidates(carve::mesh::MeshSet<3> *a, void carve::csg::CSG::generateIntersectionCandidates(meshset_t *a,
const face_rtree_t *a_node, const face_rtree_t *a_node,
carve::mesh::MeshSet<3> *b, meshset_t *b,
const face_rtree_t *b_node, const face_rtree_t *b_node,
face_pairs_t &face_pairs, face_pairs_t &face_pairs,
bool descend_a) { bool descend_a) {
@ -837,12 +888,12 @@ void carve::csg::CSG::generateIntersectionCandidates(carve::mesh::MeshSet<3> *a,
} }
} else { } else {
for (size_t i = 0; i < a_node->data.size(); ++i) { for (size_t i = 0; i < a_node->data.size(); ++i) {
carve::mesh::MeshSet<3>::face_t *fa = a_node->data[i]; meshset_t::face_t *fa = a_node->data[i];
carve::geom::aabb<3> aabb_a = fa->getAABB(); carve::geom::aabb<3> aabb_a = fa->getAABB();
if (aabb_a.maxAxisSeparation(b_node->bbox) > carve::EPSILON) continue; if (aabb_a.maxAxisSeparation(b_node->bbox) > carve::EPSILON) continue;
for (size_t j = 0; j < b_node->data.size(); ++j) { for (size_t j = 0; j < b_node->data.size(); ++j) {
carve::mesh::MeshSet<3>::face_t *fb = b_node->data[j]; meshset_t::face_t *fb = b_node->data[j];
carve::geom::aabb<3> aabb_b = fb->getAABB(); carve::geom::aabb<3> aabb_b = fb->getAABB();
if (aabb_b.maxAxisSeparation(aabb_a) > carve::EPSILON) continue; if (aabb_b.maxAxisSeparation(aabb_a) > carve::EPSILON) continue;
@ -866,17 +917,17 @@ void carve::csg::CSG::generateIntersectionCandidates(carve::mesh::MeshSet<3> *a,
void carve::csg::CSG::generateIntersections(carve::mesh::MeshSet<3> *a, void carve::csg::CSG::generateIntersections(meshset_t *a,
const face_rtree_t *a_rtree, const face_rtree_t *a_rtree,
carve::mesh::MeshSet<3> *b, meshset_t *b,
const face_rtree_t *b_rtree, const face_rtree_t *b_rtree,
detail::Data &data) { detail::Data &data) {
face_pairs_t face_pairs; face_pairs_t face_pairs;
generateIntersectionCandidates(a, a_rtree, b, b_rtree, face_pairs); generateIntersectionCandidates(a, a_rtree, b, b_rtree, face_pairs);
for (face_pairs_t::const_iterator i = face_pairs.begin(); i != face_pairs.end(); ++i) { for (face_pairs_t::const_iterator i = face_pairs.begin(); i != face_pairs.end(); ++i) {
carve::mesh::MeshSet<3>::face_t *f = (*i).first; meshset_t::face_t *f = (*i).first;
carve::mesh::MeshSet<3>::edge_t *e = f->edge; meshset_t::edge_t *e = f->edge;
do { do {
data.vert_to_edges[e->v1()].push_back(e); data.vert_to_edges[e->v1()].push_back(e);
e = e->next; e = e->next;
@ -958,13 +1009,13 @@ void carve::csg::CSG::divideIntersectedEdges(detail::Data &data) {
static carve::TimingName FUNC_NAME("CSG::divideIntersectedEdges()"); static carve::TimingName FUNC_NAME("CSG::divideIntersectedEdges()");
carve::TimingBlock block(FUNC_NAME); carve::TimingBlock block(FUNC_NAME);
for (detail::EVSMap::const_iterator i = data.emap.begin(), ei = data.emap.end(); i != ei; ++i) { for (detail::EIntMap::const_iterator i = data.emap.begin(), ei = data.emap.end(); i != ei; ++i) {
carve::mesh::MeshSet<3>::edge_t *edge = (*i).first; meshset_t::edge_t *edge = (*i).first;
const detail::EVSMap::mapped_type &vertices = (*i).second; const detail::EIntMap::mapped_type &int_info = (*i).second;
std::vector<carve::mesh::MeshSet<3>::vertex_t *> &verts = data.divided_edges[edge]; std::vector<meshset_t::vertex_t *> &verts = data.divided_edges[edge];
orderVertices(vertices.begin(), vertices.end(), orderEdgeIntersectionVertices(int_info.begin(), int_info.end(),
edge->v2()->v - edge->v1()->v, edge->v1()->v, edge->v2()->v - edge->v1()->v, edge->v1()->v,
verts); verts);
} }
} }
@ -982,7 +1033,7 @@ void carve::csg::CSG::makeFaceEdges(carve::csg::EdgeClassification &eclass,
i = data.fmap.begin(), ie = data.fmap.end(); i = data.fmap.begin(), ie = data.fmap.end();
i != ie; i != ie;
++i) { ++i) {
carve::mesh::MeshSet<3>::face_t *face_a = (*i).first; meshset_t::face_t *face_a = (*i).first;
const detail::FVSMap::mapped_type &face_a_intersections = ((*i).second); const detail::FVSMap::mapped_type &face_a_intersections = ((*i).second);
face_b_set.clear(); face_b_set.clear();
@ -995,7 +1046,7 @@ void carve::csg::CSG::makeFaceEdges(carve::csg::EdgeClassification &eclass,
k = data.fmap_rev[*j].begin(), ke = data.fmap_rev[*j].end(); k = data.fmap_rev[*j].begin(), ke = data.fmap_rev[*j].end();
k != ke; k != ke;
++k) { ++k) {
carve::mesh::MeshSet<3>::face_t *face_b = (*k); meshset_t::face_t *face_b = (*k);
if (face_a != face_b && face_b->mesh->meshset != face_a->mesh->meshset) { if (face_a != face_b && face_b->mesh->meshset != face_a->mesh->meshset) {
face_b_set.insert(face_b); face_b_set.insert(face_b);
} }
@ -1007,10 +1058,10 @@ void carve::csg::CSG::makeFaceEdges(carve::csg::EdgeClassification &eclass,
j = face_b_set.begin(), je = face_b_set.end(); j = face_b_set.begin(), je = face_b_set.end();
j != je; j != je;
++j) { ++j) {
carve::mesh::MeshSet<3>::face_t *face_b = (*j); meshset_t::face_t *face_b = (*j);
const detail::FVSMap::mapped_type &face_b_intersections = (data.fmap[face_b]); const detail::FVSMap::mapped_type &face_b_intersections = (data.fmap[face_b]);
std::vector<carve::mesh::MeshSet<3>::vertex_t *> vertices; std::vector<meshset_t::vertex_t *> vertices;
vertices.reserve(std::min(face_a_intersections.size(), face_b_intersections.size())); vertices.reserve(std::min(face_a_intersections.size(), face_b_intersections.size()));
// record the points of intersection between face_a and face_b // record the points of intersection between face_a and face_b
@ -1024,7 +1075,7 @@ void carve::csg::CSG::makeFaceEdges(carve::csg::EdgeClassification &eclass,
std::cerr << "face pair: " std::cerr << "face pair: "
<< face_a << ":" << face_b << face_a << ":" << face_b
<< " N(verts) " << vertices.size() << std::endl; << " N(verts) " << vertices.size() << std::endl;
for (std::vector<carve::mesh::MeshSet<3>::vertex_t *>::const_iterator i = vertices.begin(), e = vertices.end(); i != e; ++i) { for (std::vector<meshset_t::vertex_t *>::const_iterator i = vertices.begin(), e = vertices.end(); i != e; ++i) {
std::cerr << (*i) << " " << (*i)->v << " (" std::cerr << (*i) << " " << (*i)->v << " ("
<< carve::geom::distance(face_a->plane, (*i)->v) << "," << carve::geom::distance(face_a->plane, (*i)->v) << ","
<< carve::geom::distance(face_b->plane, (*i)->v) << ")" << carve::geom::distance(face_b->plane, (*i)->v) << ")"
@ -1036,8 +1087,8 @@ void carve::csg::CSG::makeFaceEdges(carve::csg::EdgeClassification &eclass,
// if there are two points of intersection, then the added edge is simple to determine. // if there are two points of intersection, then the added edge is simple to determine.
if (vertices.size() == 2) { if (vertices.size() == 2) {
carve::mesh::MeshSet<3>::vertex_t *v1 = vertices[0]; meshset_t::vertex_t *v1 = vertices[0];
carve::mesh::MeshSet<3>::vertex_t *v2 = vertices[1]; meshset_t::vertex_t *v2 = vertices[1];
carve::geom3d::Vector c = (v1->v + v2->v) / 2; carve::geom3d::Vector c = (v1->v + v2->v) / 2;
// determine whether the midpoint of the implied edge is contained in face_a and face_b // determine whether the midpoint of the implied edge is contained in face_a and face_b
@ -1065,7 +1116,7 @@ void carve::csg::CSG::makeFaceEdges(carve::csg::EdgeClassification &eclass,
// otherwise, it's more complex. // otherwise, it's more complex.
carve::geom3d::Vector base, dir; carve::geom3d::Vector base, dir;
std::vector<carve::mesh::MeshSet<3>::vertex_t *> ordered; std::vector<meshset_t::vertex_t *> ordered;
// skip coplanar edges. this simplifies the resulting // skip coplanar edges. this simplifies the resulting
// mesh. eventually all coplanar face regions of two polyhedra // mesh. eventually all coplanar face regions of two polyhedra
@ -1080,8 +1131,8 @@ void carve::csg::CSG::makeFaceEdges(carve::csg::EdgeClassification &eclass,
// for each possible edge in the ordering, test the midpoint, // for each possible edge in the ordering, test the midpoint,
// and record if it's contained in face_a and face_b. // and record if it's contained in face_a and face_b.
for (int k = 0, ke = (int)ordered.size() - 1; k < ke; ++k) { for (int k = 0, ke = (int)ordered.size() - 1; k < ke; ++k) {
carve::mesh::MeshSet<3>::vertex_t *v1 = ordered[k]; meshset_t::vertex_t *v1 = ordered[k];
carve::mesh::MeshSet<3>::vertex_t *v2 = ordered[k + 1]; meshset_t::vertex_t *v2 = ordered[k + 1];
carve::geom3d::Vector c = (v1->v + v2->v) / 2; carve::geom3d::Vector c = (v1->v + v2->v) / 2;
#if defined(CARVE_DEBUG) #if defined(CARVE_DEBUG)
@ -1125,7 +1176,7 @@ void carve::csg::CSG::makeFaceEdges(carve::csg::EdgeClassification &eclass,
carve::line::PolylineSet intersection_graph; carve::line::PolylineSet intersection_graph;
intersection_graph.vertices.resize(vertices.size()); intersection_graph.vertices.resize(vertices.size());
std::map<const carve::mesh::MeshSet<3>::vertex_t *, size_t> vmap; std::map<const meshset_t::vertex_t *, size_t> vmap;
size_t j = 0; size_t j = 0;
for (detail::VSet::const_iterator i = vertices.begin(); i != vertices.end(); ++i) { for (detail::VSet::const_iterator i = vertices.begin(); i != vertices.end(); ++i) {
@ -1195,9 +1246,9 @@ static void checkFaceLoopIntegrity(carve::csg::FaceLoopList &fll) {
* @param b_edge_count * @param b_edge_count
* @param hooks * @param hooks
*/ */
void carve::csg::CSG::calc(carve::mesh::MeshSet<3> *a, void carve::csg::CSG::calc(meshset_t *a,
const face_rtree_t *a_rtree, const face_rtree_t *a_rtree,
carve::mesh::MeshSet<3> *b, meshset_t *b,
const face_rtree_t *b_rtree, const face_rtree_t *b_rtree,
carve::csg::VertexClassification &vclass, carve::csg::VertexClassification &vclass,
carve::csg::EdgeClassification &eclass, carve::csg::EdgeClassification &eclass,
@ -1260,12 +1311,12 @@ void carve::csg::CSG::calc(carve::mesh::MeshSet<3> *a,
#if defined(CARVE_DEBUG_WRITE_PLY_DATA) #if defined(CARVE_DEBUG_WRITE_PLY_DATA)
{ {
std::string out("/tmp/a_split.ply"); std::auto_ptr<carve::mesh::MeshSet<3> > poly(faceLoopsToPolyhedron(a_face_loops));
writePLY(out, faceLoopsToPolyhedron(a_face_loops), false); writePLY("/tmp/a_split.ply", poly.get(), false);
} }
{ {
std::string out("/tmp/b_split.ply"); std::auto_ptr<carve::mesh::MeshSet<3> > poly(faceLoopsToPolyhedron(b_face_loops));
writePLY(out, faceLoopsToPolyhedron(b_face_loops), false); writePLY("/tmp/b_split.ply", poly.get(), false);
} }
#endif #endif
@ -1276,11 +1327,11 @@ void carve::csg::CSG::calc(carve::mesh::MeshSet<3> *a,
std::cerr << "classify" << std::endl; std::cerr << "classify" << std::endl;
#endif #endif
// initialize some classification information. // initialize some classification information.
for (std::vector<carve::mesh::MeshSet<3>::vertex_t>::iterator for (std::vector<meshset_t::vertex_t>::iterator
i = a->vertex_storage.begin(), e = a->vertex_storage.end(); i != e; ++i) { i = a->vertex_storage.begin(), e = a->vertex_storage.end(); i != e; ++i) {
vclass[map_vertex(data.vmap, &(*i))].cls[0] = POINT_ON; vclass[map_vertex(data.vmap, &(*i))].cls[0] = POINT_ON;
} }
for (std::vector<carve::mesh::MeshSet<3>::vertex_t>::iterator for (std::vector<meshset_t::vertex_t>::iterator
i = b->vertex_storage.begin(), e = b->vertex_storage.end(); i != e; ++i) { i = b->vertex_storage.begin(), e = b->vertex_storage.end(); i != e; ++i) {
vclass[map_vertex(data.vmap, &(*i))].cls[1] = POINT_ON; vclass[map_vertex(data.vmap, &(*i))].cls[1] = POINT_ON;
} }
@ -1351,8 +1402,8 @@ void returnSharedEdges(carve::csg::V2Set &shared_edges,
* *
* @return * @return
*/ */
carve::mesh::MeshSet<3> *carve::csg::CSG::compute(carve::mesh::MeshSet<3> *a, carve::mesh::MeshSet<3> *carve::csg::CSG::compute(meshset_t *a,
carve::mesh::MeshSet<3> *b, meshset_t *b,
carve::csg::CSG::Collector &collector, carve::csg::CSG::Collector &collector,
carve::csg::V2Set *shared_edges_ptr, carve::csg::V2Set *shared_edges_ptr,
CLASSIFY_TYPE classify_type) { CLASSIFY_TYPE classify_type) {
@ -1371,13 +1422,13 @@ carve::mesh::MeshSet<3> *carve::csg::CSG::compute(carve::mesh::MeshSet<3> *a,
size_t a_edge_count; size_t a_edge_count;
size_t b_edge_count; size_t b_edge_count;
face_rtree_t *a_rtree = face_rtree_t::construct_STR(a->faceBegin(), a->faceEnd(), 4, 4); std::auto_ptr<face_rtree_t> a_rtree(face_rtree_t::construct_STR(a->faceBegin(), a->faceEnd(), 4, 4));
face_rtree_t *b_rtree = face_rtree_t::construct_STR(b->faceBegin(), b->faceEnd(), 4, 4); std::auto_ptr<face_rtree_t> b_rtree(face_rtree_t::construct_STR(b->faceBegin(), b->faceEnd(), 4, 4));
{ {
static carve::TimingName FUNC_NAME("CSG::compute - calc()"); static carve::TimingName FUNC_NAME("CSG::compute - calc()");
carve::TimingBlock block(FUNC_NAME); carve::TimingBlock block(FUNC_NAME);
calc(a, a_rtree, b, b_rtree, vclass, eclass,a_face_loops, b_face_loops, a_edge_count, b_edge_count); calc(a, a_rtree.get(), b, b_rtree.get(), vclass, eclass,a_face_loops, b_face_loops, a_edge_count, b_edge_count);
} }
detail::LoopEdges a_edge_map; detail::LoopEdges a_edge_map;
@ -1445,11 +1496,11 @@ carve::mesh::MeshSet<3> *carve::csg::CSG::compute(carve::mesh::MeshSet<3> *a,
classifyFaceGroupsEdge(shared_edges, classifyFaceGroupsEdge(shared_edges,
vclass, vclass,
a, a,
a_rtree, a_rtree.get(),
a_loops_grouped, a_loops_grouped,
a_edge_map, a_edge_map,
b, b,
b_rtree, b_rtree.get(),
b_loops_grouped, b_loops_grouped,
b_edge_map, b_edge_map,
collector); collector);
@ -1458,20 +1509,20 @@ carve::mesh::MeshSet<3> *carve::csg::CSG::compute(carve::mesh::MeshSet<3> *a,
classifyFaceGroups(shared_edges, classifyFaceGroups(shared_edges,
vclass, vclass,
a, a,
a_rtree, a_rtree.get(),
a_loops_grouped, a_loops_grouped,
a_edge_map, a_edge_map,
b, b,
b_rtree, b_rtree.get(),
b_loops_grouped, b_loops_grouped,
b_edge_map, b_edge_map,
collector); collector);
break; break;
} }
carve::mesh::MeshSet<3> *result = collector.done(hooks); meshset_t *result = collector.done(hooks);
if (result != NULL && shared_edges_ptr != NULL) { if (result != NULL && shared_edges_ptr != NULL) {
std::list<carve::mesh::MeshSet<3> *> result_list; std::list<meshset_t *> result_list;
result_list.push_back(result); result_list.push_back(result);
returnSharedEdges(shared_edges, result_list, shared_edges_ptr); returnSharedEdges(shared_edges, result_list, shared_edges_ptr);
} }
@ -1492,15 +1543,15 @@ carve::mesh::MeshSet<3> *carve::csg::CSG::compute(carve::mesh::MeshSet<3> *a,
* *
* @return * @return
*/ */
carve::mesh::MeshSet<3> *carve::csg::CSG::compute(carve::mesh::MeshSet<3> *a, carve::mesh::MeshSet<3> *carve::csg::CSG::compute(meshset_t *a,
carve::mesh::MeshSet<3> *b, meshset_t *b,
carve::csg::CSG::OP op, carve::csg::CSG::OP op,
carve::csg::V2Set *shared_edges, carve::csg::V2Set *shared_edges,
CLASSIFY_TYPE classify_type) { CLASSIFY_TYPE classify_type) {
Collector *coll = makeCollector(op, a, b); Collector *coll = makeCollector(op, a, b);
if (!coll) return NULL; if (!coll) return NULL;
carve::mesh::MeshSet<3> *result = compute(a, b, *coll, shared_edges, classify_type); meshset_t *result = compute(a, b, *coll, shared_edges, classify_type);
delete coll; delete coll;
@ -1521,9 +1572,9 @@ carve::mesh::MeshSet<3> *carve::csg::CSG::compute(carve::mesh::MeshSet<3> *a,
* *
* @return * @return
*/ */
bool carve::csg::CSG::sliceAndClassify(carve::mesh::MeshSet<3> *closed, bool carve::csg::CSG::sliceAndClassify(meshset_t *closed,
carve::mesh::MeshSet<3> *open, meshset_t *open,
std::list<std::pair<FaceClass, carve::mesh::MeshSet<3> *> > &result, std::list<std::pair<FaceClass, meshset_t *> > &result,
carve::csg::V2Set *shared_edges_ptr) { carve::csg::V2Set *shared_edges_ptr) {
if (!closed->isClosed()) return false; if (!closed->isClosed()) return false;
carve::csg::VertexClassification vclass; carve::csg::VertexClassification vclass;
@ -1538,10 +1589,10 @@ bool carve::csg::CSG::sliceAndClassify(carve::mesh::MeshSet<3> *closed,
size_t a_edge_count; size_t a_edge_count;
size_t b_edge_count; size_t b_edge_count;
face_rtree_t *closed_rtree = face_rtree_t::construct_STR(closed->faceBegin(), closed->faceEnd(), 4, 4); std::auto_ptr<face_rtree_t> closed_rtree(face_rtree_t::construct_STR(closed->faceBegin(), closed->faceEnd(), 4, 4));
face_rtree_t *open_rtree = face_rtree_t::construct_STR(open->faceBegin(), open->faceEnd(), 4, 4); std::auto_ptr<face_rtree_t> open_rtree(face_rtree_t::construct_STR(open->faceBegin(), open->faceEnd(), 4, 4));
calc(closed, closed_rtree, open, open_rtree, vclass, eclass,a_face_loops, b_face_loops, a_edge_count, b_edge_count); calc(closed, closed_rtree.get(), open, open_rtree.get(), vclass, eclass,a_face_loops, b_face_loops, a_edge_count, b_edge_count);
detail::LoopEdges a_edge_map; detail::LoopEdges a_edge_map;
detail::LoopEdges b_edge_map; detail::LoopEdges b_edge_map;
@ -1559,18 +1610,18 @@ bool carve::csg::CSG::sliceAndClassify(carve::mesh::MeshSet<3> *closed,
halfClassifyFaceGroups(shared_edges, halfClassifyFaceGroups(shared_edges,
vclass, vclass,
closed, closed,
closed_rtree, closed_rtree.get(),
a_loops_grouped, a_loops_grouped,
a_edge_map, a_edge_map,
open, open,
open_rtree, open_rtree.get(),
b_loops_grouped, b_loops_grouped,
b_edge_map, b_edge_map,
result); result);
if (shared_edges_ptr != NULL) { if (shared_edges_ptr != NULL) {
std::list<carve::mesh::MeshSet<3> *> result_list; std::list<meshset_t *> result_list;
for (std::list<std::pair<FaceClass, carve::mesh::MeshSet<3> *> >::iterator it = result.begin(); it != result.end(); it++) { for (std::list<std::pair<FaceClass, meshset_t *> >::iterator it = result.begin(); it != result.end(); it++) {
result_list.push_back(it->second); result_list.push_back(it->second);
} }
returnSharedEdges(shared_edges, result_list, shared_edges_ptr); returnSharedEdges(shared_edges, result_list, shared_edges_ptr);
@ -1590,10 +1641,10 @@ bool carve::csg::CSG::sliceAndClassify(carve::mesh::MeshSet<3> *closed,
* @param hooks * @param hooks
* @param shared_edges_ptr * @param shared_edges_ptr
*/ */
void carve::csg::CSG::slice(carve::mesh::MeshSet<3> *a, void carve::csg::CSG::slice(meshset_t *a,
carve::mesh::MeshSet<3> *b, meshset_t *b,
std::list<carve::mesh::MeshSet<3> *> &a_sliced, std::list<meshset_t *> &a_sliced,
std::list<carve::mesh::MeshSet<3> *> &b_sliced, std::list<meshset_t *> &b_sliced,
carve::csg::V2Set *shared_edges_ptr) { carve::csg::V2Set *shared_edges_ptr) {
carve::csg::VertexClassification vclass; carve::csg::VertexClassification vclass;
carve::csg::EdgeClassification eclass; carve::csg::EdgeClassification eclass;
@ -1607,10 +1658,10 @@ void carve::csg::CSG::slice(carve::mesh::MeshSet<3> *a,
size_t a_edge_count; size_t a_edge_count;
size_t b_edge_count; size_t b_edge_count;
face_rtree_t *a_rtree = face_rtree_t::construct_STR(a->faceBegin(), a->faceEnd(), 4, 4); std::auto_ptr<face_rtree_t> a_rtree(face_rtree_t::construct_STR(a->faceBegin(), a->faceEnd(), 4, 4));
face_rtree_t *b_rtree = face_rtree_t::construct_STR(b->faceBegin(), b->faceEnd(), 4, 4); std::auto_ptr<face_rtree_t> b_rtree(face_rtree_t::construct_STR(b->faceBegin(), b->faceEnd(), 4, 4));
calc(a, a_rtree, b, b_rtree, vclass, eclass,a_face_loops, b_face_loops, a_edge_count, b_edge_count); calc(a, a_rtree.get(), b, b_rtree.get(), vclass, eclass,a_face_loops, b_face_loops, a_edge_count, b_edge_count);
detail::LoopEdges a_edge_map; detail::LoopEdges a_edge_map;
detail::LoopEdges b_edge_map; detail::LoopEdges b_edge_map;
@ -1645,7 +1696,7 @@ void carve::csg::CSG::slice(carve::mesh::MeshSet<3> *a,
delete all; delete all;
} }
if (shared_edges_ptr != NULL) { if (shared_edges_ptr != NULL) {
std::list<carve::mesh::MeshSet<3> *> result_list; std::list<meshset_t *> result_list;
result_list.insert(result_list.end(), a_sliced.begin(), a_sliced.end()); result_list.insert(result_list.end(), a_sliced.begin(), a_sliced.end());
result_list.insert(result_list.end(), b_sliced.begin(), b_sliced.end()); result_list.insert(result_list.end(), b_sliced.begin(), b_sliced.end());
returnSharedEdges(shared_edges, result_list, shared_edges_ptr); returnSharedEdges(shared_edges, result_list, shared_edges_ptr);

6
extern/carve/patches/strict_flags.patch vendored
View File

@ -9,9 +9,9 @@ diff -r 47dfdaff1dd5 include/carve/csg_triangulator.hpp
} }
carve::mesh::MeshSet<3>::face_t *mergeQuad(edge_map_t::iterator i, edge_map_t &edge_map) { carve::mesh::MeshSet<3>::face_t *mergeQuad(edge_map_t::iterator i, edge_map_t &edge_map) {
diff -r 47dfdaff1dd5 src/selfintersect.cpp diff -r 47dfdaff1dd5 lib/selfintersect.cpp
--- a/src/selfintersect.cpp Thu Jan 12 15:49:04 2012 -0500 --- a/lib/selfintersect.cpp Thu Jan 12 15:49:04 2012 -0500
+++ b/src/selfintersect.cpp Fri Jan 13 03:13:32 2012 +0600 +++ b/lib/selfintersect.cpp Fri Jan 13 03:13:32 2012 +0600
@@ -465,6 +465,7 @@ @@ -465,6 +465,7 @@
// returns true if no intersection, based upon edge^a_i and edge^b_j separating axis. // returns true if no intersection, based upon edge^a_i and edge^b_j separating axis.