diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-30 16:32:23 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-02-13 15:16:53 +0400 |
commit | 83617d24d536ec234bbe53b8b0fbcb76e7b5b3ee (patch) | |
tree | 1db7504aefb527fefb9fa5c1beb7115fa16b5950 /intern/bsp/CMakeLists.txt | |
parent | 51efa8a1f53f230b72210289483dae66f01de51a (diff) |
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
Diffstat (limited to 'intern/bsp/CMakeLists.txt')
-rw-r--r-- | intern/bsp/CMakeLists.txt | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt deleted file mode 100644 index 5a2e3538e0a..00000000000 --- a/intern/bsp/CMakeLists.txt +++ /dev/null @@ -1,69 +0,0 @@ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# The Original Code is Copyright (C) 2006, Blender Foundation -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jacques Beaurain. -# -# ***** END GPL LICENSE BLOCK ***** - -set(INC - intern - ../container - ../guardedalloc - ../memutil -) - -set(INC_SYS - ../moto/include - ../../extern/carve/include -) - -set(SRC - intern/BOP_CarveInterface.cpp - intern/BSP_CSGMesh.cpp - intern/BSP_MeshPrimitives.cpp - intern/CSG_BooleanOps.cpp - - extern/CSG_BooleanOps.h - intern/BOP_Interface.h - intern/BSP_CSGException.h - intern/BSP_CSGMesh.h - intern/BSP_CSGMesh_CFIterator.h - intern/BSP_MeshPrimitives.h -) - -if(WITH_BOOST) - if(NOT MSVC) - # Boost is setting as preferred collections library in the Carve code when using MSVC compiler - add_definitions( - -DHAVE_BOOST_UNORDERED_COLLECTIONS - ) - endif() - - add_definitions( - -DCARVE_SYSTEM_BOOST - ) - - list(APPEND INC_SYS - ${BOOST_INCLUDE_DIR} - ) -endif() - -blender_add_lib(bf_intern_bsp "${SRC}" "${INC}" "${INC_SYS}") |