Skip to content

Commit 9816613

Browse files
committed
conditional booleans
1 parent 677078f commit 9816613

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

modules/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,11 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/planarize)
44
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/isolines)
55
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/triangulation)
66
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/geodistance)
7-
# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/csgtree)
8-
# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/booleans)
7+
8+
if (WIN32)
9+
# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/booleans)
10+
# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/csgtree)
11+
else ()
12+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/booleans)
13+
# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/csgtree)
14+
endif ()

src/compas_libigl/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from __future__ import division
33
from __future__ import print_function
44

5-
# from .booleans import *
5+
from .booleans import *
66
from .geodistance import *
77
from .isolines import *
88
from .planarize import *

src/compas_libigl/booleans/__init__.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@
55
import numpy as np
66

77
try:
8-
from compas_libigl_booleans import mesh_union as _mesh_union
9-
from compas_libigl_booleans import mesh_difference as _mesh_difference
10-
from compas_libigl_booleans import mesh_symmetric_difference as _mesh_symmetric_difference
11-
from compas_libigl_booleans import mesh_intersection as _mesh_intersection
8+
import compas_libigl_booleans
129
except:
1310
pass
11+
else:
12+
from compas_libigl_booleans import mesh_union as _mesh_union
13+
from compas_libigl_booleans import mesh_difference as _mesh_difference
14+
from compas_libigl_booleans import mesh_symmetric_difference as _mesh_symmetric_difference
15+
from compas_libigl_booleans import mesh_intersection as _mesh_intersection
16+
1417

1518
def mesh_union(A, B):
1619
"""Compute the union of two meshes.

0 commit comments

Comments
 (0)