Skip to content

Commit 74936c7

Browse files
committed
Update shape dependency
1 parent 51c5409 commit 74936c7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

extern/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ set(SHAPE_BUILD_TEST OFF)
3838
FetchContent_Declare(
3939
shape
4040
GIT_REPOSITORY https://github.com/fontanf/shape.git
41-
GIT_TAG 7bc0f882b672ad6bc5763dddb494572f370e66d4
41+
GIT_TAG 98ecaa44761765455f7754aaecb6a0fe1f3a70a2
4242
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../shape/"
4343
EXCLUDE_FROM_ALL)
4444
FetchContent_MakeAvailable(shape)

src/irregular/branching_scheme.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -984,19 +984,19 @@ BranchingScheme::Node BranchingScheme::child_tmp(
984984
supporting_shape_element_pos < supporting_shape.elements.size();
985985
++supporting_shape_element_pos) {
986986
const ShapeElement& supporting_shape_element = supporting_shape.elements[supporting_shape_element_pos];
987-
if (!shape::compute_intersections(supporting_shape_element, element_1, false).empty()) {
987+
if (shape::intersect(supporting_shape_element, element_1, false)) {
988988
//std::cout << "supporting_shape_element " << supporting_shape_element.to_string() << std::endl;
989989
//std::cout << "element_1 " << element_1.to_string() << std::endl;
990990
add_to_skyline = true;
991991
break;
992992
}
993-
if (!shape::compute_intersections(supporting_shape_element, element_2, false).empty()) {
993+
if (shape::intersect(supporting_shape_element, element_2, false)) {
994994
//std::cout << "supporting_shape_element " << supporting_shape_element.to_string() << std::endl;
995995
//std::cout << "element_2 " << element_2.to_string() << std::endl;
996996
add_to_skyline = true;
997997
break;
998998
}
999-
if (!shape::compute_intersections(supporting_shape_element, element_3, false).empty()) {
999+
if (shape::intersect(supporting_shape_element, element_3, false)) {
10001000
//std::cout << "supporting_shape_element " << supporting_shape_element.to_string() << std::endl;
10011001
//std::cout << "element_3 " << element_3.to_string() << std::endl;
10021002
add_to_skyline = true;

0 commit comments

Comments
 (0)