sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
1647725913
blender/extern/carve/patches/includes.patch

85 lines
2.1 KiB
Diff
Raw Normal View History

Carve booleans library integration ================================== 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.
2012-01-16 16:46:00 +00:00
diff -r c8cbec41cd35 include/carve/exact.hpp
--- a/include/carve/exact.hpp Thu Dec 01 15:51:44 2011 -0500
+++ b/include/carve/exact.hpp Wed Jan 11 18:48:16 2012 +0600
@@ -21,7 +21,7 @@
#include <vector>
#include <numeric>
-
+#include <algorithm>
namespace carve {
diff -r c8cbec41cd35 include/carve/geom2d.hpp
--- a/include/carve/geom2d.hpp Thu Dec 01 15:51:44 2011 -0500
+++ b/include/carve/geom2d.hpp Wed Jan 11 18:48:16 2012 +0600
@@ -25,6 +25,7 @@
#include <carve/geom.hpp>
#include <vector>
+#include <algorithm>
#include <math.h>
diff -r c8cbec41cd35 include/carve/mesh_impl.hpp
--- a/include/carve/mesh_impl.hpp Thu Dec 01 15:51:44 2011 -0500
+++ b/include/carve/mesh_impl.hpp Wed Jan 11 18:48:16 2012 +0600
@@ -24,6 +24,8 @@
#include <iostream>
#include <deque>
+#include <stddef.h>
+
namespace carve {
namespace mesh {
diff -r c8cbec41cd35 include/carve/polyhedron_base.hpp
--- a/include/carve/polyhedron_base.hpp Thu Dec 01 15:51:44 2011 -0500
+++ b/include/carve/polyhedron_base.hpp Wed Jan 11 18:48:16 2012 +0600
@@ -25,6 +25,8 @@
#include <carve/edge_decl.hpp>
#include <carve/face_decl.hpp>
+#include <stddef.h>
+
namespace carve {
namespace poly {
diff -r c8cbec41cd35 include/carve/rtree.hpp
--- a/include/carve/rtree.hpp Thu Dec 01 15:51:44 2011 -0500
+++ b/include/carve/rtree.hpp Wed Jan 11 18:48:16 2012 +0600
@@ -27,6 +27,10 @@
#include <cmath>
#include <limits>
+#if defined(HAVE_STDINT_H)
+# include <stdint.h>
+#endif
+
namespace carve {
namespace geom {
diff -r c8cbec41cd35 include/carve/vector.hpp
--- a/include/carve/vector.hpp Thu Dec 01 15:51:44 2011 -0500
+++ b/include/carve/vector.hpp Wed Jan 11 18:48:16 2012 +0600
@@ -24,6 +24,7 @@
#include <carve/geom3d.hpp>
#include <sstream>
+#include <algorithm>
#include <math.h>
diff -r c8cbec41cd35 src/extrude.cpp
--- a/src/extrude.cpp Thu Dec 01 15:51:44 2011 -0500
+++ b/src/extrude.cpp Wed Jan 11 18:48:16 2012 +0600
@@ -34,6 +34,8 @@
#include <cctype>
#include <stdexcept>
+#include <stdexcept>
+
template<unsigned ndim>
carve::geom::vector<ndim> lerp(
double t,
Copy Permalink