e81f2853c8
==================================
Merging Carve library integration project into the trunk.
This commit switches Boolean modifier to another library which handles
mesh boolean operations in much stable and faster way, resolving old
well-known limitations of intern boolop library.
Carve is integrating as alternative interface for boolop library and
which makes it totally transparent for blender sources to switch between
old-fashioned boolop and new Carve backends.
Detailed changes in this commit:
- Integrated needed subset of Carve library sources into extern/
Added script for re-bundling it (currently works only if repo
was cloned by git-svn).
- Added BOP_CarveInterface for boolop library which can be used by
Boolean modifier.
- Carve backend is enabled by default, can be disabled by WITH_BF_CARVE
SCons option and WITH_CARVE CMake option.
- If Boost library is found in build environment it'll be used for
unordered collections. If Boost isn't found, it'll fallback to TR1
implementation for GCC compilers. Boost is obligatory if MSVC is used.
Tested on Linux 64bit and Windows 7 64bit.
NOTE: behavior of flat objects was changed. E.g. Plane-Sphere now gives
plane with circle hole, not plane with semisphere. Don't think
it's really issue because it's not actually defined behavior in
such situations and both of ways might be useful. Since it's
only known "regression" think it's OK to deal with it.
Details are there http://wiki.blender.org/index.php/User:Nazg-gul/CarveBooleans
Special thanks to:
- Ken Hughes: author of original carve integration patch.
- Campbell Barton: help in project development, review tests.
- Tobias Sargeant: author of Carve library, help in resolving some
merge stoppers, bug fixing.
152 lines
3.8 KiB
C++
152 lines
3.8 KiB
C++
// Begin License:
|
|
// Copyright (C) 2006-2011 Tobias Sargeant (tobias.sargeant@gmail.com).
|
|
// All rights reserved.
|
|
//
|
|
// This file is part of the Carve CSG Library (http://carve-csg.com/)
|
|
//
|
|
// This file may be used under the terms of the GNU General Public
|
|
// License version 2.0 as published by the Free Software Foundation
|
|
// and appearing in the file LICENSE.GPL2 included in the packaging of
|
|
// this file.
|
|
//
|
|
// This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
|
|
// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
|
|
// A PARTICULAR PURPOSE.
|
|
// End:
|
|
|
|
#pragma once
|
|
|
|
#include <iterator>
|
|
#include <list>
|
|
#include <iterator>
|
|
#include <limits>
|
|
|
|
#include <carve/carve.hpp>
|
|
#include <carve/tag.hpp>
|
|
#include <carve/geom.hpp>
|
|
#include <carve/kd_node.hpp>
|
|
#include <carve/geom3d.hpp>
|
|
#include <carve/aabb.hpp>
|
|
|
|
namespace carve {
|
|
namespace line {
|
|
|
|
struct PolylineEdge;
|
|
struct Polyline;
|
|
struct polyline_vertex_const_iter;
|
|
struct polyline_vertex_iter;
|
|
struct polyline_edge_const_iter;
|
|
struct polyline_edge_iter;
|
|
|
|
|
|
|
|
struct Vertex : public tagable {
|
|
carve::geom3d::Vector v;
|
|
std::list<std::pair<PolylineEdge *, PolylineEdge *> > edge_pairs;
|
|
|
|
void addEdgePair(PolylineEdge *in, PolylineEdge *out) {
|
|
edge_pairs.push_back(std::make_pair(in, out));
|
|
}
|
|
};
|
|
|
|
|
|
|
|
struct vec_adapt_vertex_ptr {
|
|
const carve::geom3d::Vector &operator()(const Vertex * const &v) { return v->v; }
|
|
carve::geom3d::Vector &operator()(Vertex *&v) { return v->v; }
|
|
};
|
|
|
|
|
|
|
|
struct PolylineEdge : public tagable {
|
|
Polyline *parent;
|
|
unsigned edgenum;
|
|
Vertex *v1, *v2;
|
|
|
|
PolylineEdge(Polyline *_parent, int _edgenum, Vertex *_v1, Vertex *_v2);
|
|
|
|
carve::geom3d::AABB aabb() const;
|
|
|
|
inline PolylineEdge *prevEdge() const;
|
|
inline PolylineEdge *nextEdge() const;
|
|
};
|
|
|
|
|
|
|
|
struct Polyline {
|
|
bool closed;
|
|
std::vector<PolylineEdge *> edges;
|
|
|
|
Polyline();
|
|
|
|
size_t vertexCount() const;
|
|
|
|
size_t edgeCount() const;
|
|
|
|
const PolylineEdge *edge(size_t e) const;
|
|
|
|
PolylineEdge *edge(size_t e);
|
|
|
|
const Vertex *vertex(size_t v) const;
|
|
|
|
Vertex *vertex(size_t v);
|
|
|
|
bool isClosed() const;
|
|
|
|
polyline_vertex_const_iter vbegin() const;
|
|
polyline_vertex_const_iter vend() const;
|
|
polyline_vertex_iter vbegin();
|
|
polyline_vertex_iter vend();
|
|
|
|
polyline_edge_const_iter ebegin() const;
|
|
polyline_edge_const_iter eend() const;
|
|
polyline_edge_iter ebegin();
|
|
polyline_edge_iter eend();
|
|
|
|
carve::geom3d::AABB aabb() const;
|
|
|
|
template<typename iter_t>
|
|
void _init(bool c, iter_t begin, iter_t end, std::vector<Vertex> &vertices);
|
|
|
|
template<typename iter_t>
|
|
void _init(bool closed, iter_t begin, iter_t end, std::vector<Vertex> &vertices, std::forward_iterator_tag);
|
|
|
|
template<typename iter_t>
|
|
void _init(bool closed, iter_t begin, iter_t end, std::vector<Vertex> &vertices, std::random_access_iterator_tag);
|
|
|
|
template<typename iter_t>
|
|
Polyline(bool closed, iter_t begin, iter_t end, std::vector<Vertex> &vertices);
|
|
|
|
~Polyline() {
|
|
for (size_t i = 0; i < edges.size(); ++i) {
|
|
delete edges[i];
|
|
}
|
|
}
|
|
};
|
|
|
|
|
|
|
|
struct PolylineSet {
|
|
typedef std::list<Polyline *> line_list;
|
|
typedef line_list::iterator line_iter;
|
|
typedef line_list::const_iterator const_line_iter;
|
|
|
|
std::vector<Vertex> vertices;
|
|
line_list lines;
|
|
carve::geom3d::AABB aabb;
|
|
|
|
PolylineSet(const std::vector<carve::geom3d::Vector> &points);
|
|
PolylineSet() {
|
|
}
|
|
|
|
template<typename iter_t>
|
|
void addPolyline(bool closed, iter_t begin, iter_t end);
|
|
|
|
void sortVertices(const carve::geom3d::Vector &axis);
|
|
|
|
size_t vertexToIndex_fast(const Vertex *v) const;
|
|
};
|
|
|
|
}
|
|
}
|