Blender Git Loki
Git Commits -> Revision 83617d2
Revision 83617d2 by Sergey Sharybin (master) February 13, 2014, 11:16 (GMT) |
Rework carve integration into boolean modifier Goal of this commit is to support NGons for boolean modifier (currently mesh is being tessellated before performing boolean operation) and also solve the limitation of loosing edge custom data layers after boolean operation is performed. Main idea is to make it so boolean modifier uses Carve library directly via it's C-API, avoiding BSP intermediate level which was doubling amount of memory needed for the operation and which also used quite reasonable amount of overhead time. Perhaps memory usage and CPU usage are the same after all the features are implemented but we've got support now: - ORIGINDEX for all the geometry - Interpolation of edge custom data (seams, crease) - NGons support Triangulation rule is changed now as well, so now non-flat polygons are not being merged back after Carve work. This is so because it's not so trivial to support for NGons and having different behavior for quads and NGons is even more creepy. Reviewers: lukastoenne, campbellbarton Differential Revision: https://developer.blender.org/D274 |
Commit Details:
Full Hash: 83617d24d536ec234bbe53b8b0fbcb76e7b5b3ee
Parent Commit: 51efa8a
Lines Changed: +2253, -4308
5 Added Paths:
/extern/carve/carve-capi.cc (+580, -0) (View)
/extern/carve/carve-capi.h (+164, -0) (View)
/extern/carve/carve-util.cc (+778, -0) (View)
/extern/carve/carve-util.h (+122, -0) (View)
/extern/carve/patches/interpolator_reorder.patch (+12, -0) (View)
/extern/carve/carve-capi.h (+164, -0) (View)
/extern/carve/carve-util.cc (+778, -0) (View)
/extern/carve/carve-util.h (+122, -0) (View)
/extern/carve/patches/interpolator_reorder.patch (+12, -0) (View)
14 Deleted Paths:
/intern/bsp/CMakeLists.txt (+0, -69)
/intern/bsp/extern/CSG_BooleanOps.h (+0, -361)
/intern/bsp/intern/BOP_CarveInterface.cpp (+0, -852)
/intern/bsp/intern/BOP_Interface.h (+0, -47)
/intern/bsp/intern/BSP_CSGException.h (+0, -59)
/intern/bsp/intern/BSP_CSGMesh.cpp (+0, -659)
/intern/bsp/intern/BSP_CSGMesh.h (+0, -249)
/intern/bsp/intern/BSP_CSGMesh_CFIterator.h (+0, -272)
/intern/bsp/intern/BSP_MeshPrimitives.cpp (+0, -298)
/intern/bsp/intern/BSP_MeshPrimitives.h (+0, -280)
/intern/bsp/intern/CSG_BooleanOps.cpp (+0, -180)
/intern/bsp/SConscript (+0, -49)
/intern/container/CTR_TaggedIndex.h (+0, -210)
/intern/container/CTR_TaggedSetOps.h (+0, -300)
/intern/bsp/extern/CSG_BooleanOps.h (+0, -361)
/intern/bsp/intern/BOP_CarveInterface.cpp (+0, -852)
/intern/bsp/intern/BOP_Interface.h (+0, -47)
/intern/bsp/intern/BSP_CSGException.h (+0, -59)
/intern/bsp/intern/BSP_CSGMesh.cpp (+0, -659)
/intern/bsp/intern/BSP_CSGMesh.h (+0, -249)
/intern/bsp/intern/BSP_CSGMesh_CFIterator.h (+0, -272)
/intern/bsp/intern/BSP_MeshPrimitives.cpp (+0, -298)
/intern/bsp/intern/BSP_MeshPrimitives.h (+0, -280)
/intern/bsp/intern/CSG_BooleanOps.cpp (+0, -180)
/intern/bsp/SConscript (+0, -49)
/intern/container/CTR_TaggedIndex.h (+0, -210)
/intern/container/CTR_TaggedSetOps.h (+0, -300)
13 Modified Paths:
/extern/carve/bundle.sh (+4, -0) (Diff)
/extern/carve/CMakeLists.txt (+4, -0) (Diff)
/extern/carve/include/carve/interpolator.hpp (+1, -1) (Diff)
/extern/carve/patches/series (+1, -0) (Diff)
/intern/CMakeLists.txt (+0, -4) (Diff)
/intern/container/CMakeLists.txt (+0, -2) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+0, -6) (Diff)
/source/blender/blenkernel/SConscript (+0, -1) (Diff)
/source/blender/blenlib/BLI_polyfill2d.h (+2, -0) (Diff)
/source/blender/modifiers/CMakeLists.txt (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_boolean.c (+0, -4) (Diff)
/source/blender/modifiers/intern/MOD_boolean_util.c (+584, -403) (Diff)
/source/blender/modifiers/SConscript (+0, -1) (Diff)
/extern/carve/CMakeLists.txt (+4, -0) (Diff)
/extern/carve/include/carve/interpolator.hpp (+1, -1) (Diff)
/extern/carve/patches/series (+1, -0) (Diff)
/intern/CMakeLists.txt (+0, -4) (Diff)
/intern/container/CMakeLists.txt (+0, -2) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+0, -6) (Diff)
/source/blender/blenkernel/SConscript (+0, -1) (Diff)
/source/blender/blenlib/BLI_polyfill2d.h (+2, -0) (Diff)
/source/blender/modifiers/CMakeLists.txt (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_boolean.c (+0, -4) (Diff)
/source/blender/modifiers/intern/MOD_boolean_util.c (+584, -403) (Diff)
/source/blender/modifiers/SConscript (+0, -1) (Diff)