forked from bartvdbraak/blender
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.
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
diff -r 47dfdaff1dd5 include/carve/csg_triangulator.hpp
|
|
--- a/include/carve/csg_triangulator.hpp Thu Jan 12 15:49:04 2012 -0500
|
|
+++ b/include/carve/csg_triangulator.hpp Fri Jan 13 03:13:32 2012 +0600
|
|
@@ -174,6 +174,7 @@
|
|
|
|
double scoreQuad(edge_map_t::iterator i, edge_map_t &edge_map) {
|
|
if (!(*i).second.first || !(*i).second.second) return -1;
|
|
+ return 0;
|
|
}
|
|
|
|
carve::mesh::MeshSet<3>::face_t *mergeQuad(edge_map_t::iterator i, edge_map_t &edge_map) {
|
|
diff -r 47dfdaff1dd5 include/carve/exact.hpp
|
|
--- a/include/carve/exact.hpp Thu Jan 12 15:49:04 2012 -0500
|
|
+++ b/include/carve/exact.hpp Fri Jan 13 03:13:32 2012 +0600
|
|
@@ -379,7 +379,7 @@
|
|
prod_2_1(b, a, r);
|
|
}
|
|
|
|
- static inline double prod_4_1(const double *a, const double *b, double *r) {
|
|
+ static inline void prod_4_1(const double *a, const double *b, double *r) {
|
|
double b_sp[2]; split(b[0], b_sp);
|
|
double t1[2]; prod_1_1s(a+0, b, b_sp, t1);
|
|
r[0] = t1[0];
|
|
@@ -639,8 +639,9 @@
|
|
}
|
|
|
|
|
|
- exact_t operator+(const exact_t &a, const exact_t &b) {
|
|
- }
|
|
+ // XXX: not implemented yet
|
|
+ //exact_t operator+(const exact_t &a, const exact_t &b) {
|
|
+ //}
|
|
|
|
|
|
|
|
diff -r 47dfdaff1dd5 src/selfintersect.cpp
|
|
--- a/src/selfintersect.cpp Thu Jan 12 15:49:04 2012 -0500
|
|
+++ b/src/selfintersect.cpp Fri Jan 13 03:13:32 2012 +0600
|
|
@@ -465,6 +465,7 @@
|
|
|
|
// returns true if no intersection, based upon edge^a_i and edge^b_j separating axis.
|
|
bool sat_edge(const vec3 tri_a[3], const vec3 tri_b[3], unsigned i, unsigned j) {
|
|
+ return false;
|
|
}
|
|
|
|
|