Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-23 17:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

CGAL 6 compatibility regarding aabb_traits_3 and stdlib usage

Browse Source
This commit is contained in:
Thomas Krijnen
2024-11-14 13:30:19 +01:00
parent e7d88ba851
commit 54eb83f080
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcconvert/validation_utils.h
+20 -6
View File
@@ -8,13 +8,23 @@
#include <CGAL/minkowski_sum_3.h> #include <CGAL/minkowski_sum_3.h>
#include <CGAL/AABB_tree.h> #include <CGAL/AABB_tree.h>
#if CGAL_VERSION_NR >= 1060000000
#include <CGAL/AABB_traits_3.h>
#else
#include <CGAL/AABB_traits.h> #include <CGAL/AABB_traits.h>
#endif
#include <CGAL/Polyhedron_3.h> #include <CGAL/Polyhedron_3.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h> #include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#if CGAL_VERSION_NR >= 1060000000
#define variant_get std::get_if
#else
#define variant_get boost::get
#endif
template <typename T> template <typename T>
T enlarge(const T& t, double d = 1.e-5) { T enlarge(const T& t, double d = 1.e-5) {
typename T::NT min[3]; typename T::NT min[3];
@@ -163,8 +173,12 @@ struct remove_thickness {
typedef CGAL::Polyhedron_3<Kernel_> Polyhedron; typedef CGAL::Polyhedron_3<Kernel_> Polyhedron;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive; typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<Kernel_, Primitive> Traits; #if CGAL_VERSION_NR >= 1060000000
typedef CGAL::AABB_tree<Traits> Tree; typedef CGAL::AABB_traits_3<Kernel_, Primitive> AAbbTraits;
#else
typedef CGAL::AABB_traits<Kernel_, Primitive> AAbbTraits;
#endif
typedef CGAL::AABB_tree<AAbbTraits> Tree;
typedef boost::optional<Tree::Intersection_and_primitive_id<Ray>::Type> Ray_intersection; typedef boost::optional<Tree::Intersection_and_primitive_id<Ray>::Type> Ray_intersection;
cgal_shape_t polyhedron, polyhedron2, flattened; cgal_shape_t polyhedron, polyhedron2, flattened;
@@ -223,8 +237,8 @@ struct remove_thickness {
double N = std::numeric_limits<double>::infinity(); double N = std::numeric_limits<double>::infinity();
Point P; Point P;
for (auto& intersection : intersections) { for (auto& intersection : intersections) {
if (boost::get<Point>(&(intersection->first))) { if (variant_get<Point>(&(intersection->first))) {
const Point* p = boost::get<Point>(&(intersection->first)); const Point* p = variant_get<Point>(&(intersection->first));
const double d = std::sqrt(CGAL::to_double((*p - O).squared_length())); const double d = std::sqrt(CGAL::to_double((*p - O).squared_length()));
if (d > 1.e-20 && d < N) { if (d > 1.e-20 && d < N) {
N = d; N = d;
@@ -354,8 +368,8 @@ struct remove_thickness {
if (intersections.size()) { if (intersections.size()) {
for (auto& intersection : intersections) { for (auto& intersection : intersections) {
if (boost::get<Point>(&(intersection->first))) { if (variant_get<Point>(&(intersection->first))) {
const Point* p = boost::get<Point>(&(intersection->first)); const Point* p = variant_get<Point>(&(intersection->first));
const double d = std::sqrt(CGAL::to_double((*p - O).squared_length())); const double d = std::sqrt(CGAL::to_double((*p - O).squared_length()));
if (d < N && d > 1.e-20) { if (d < N && d > 1.e-20) {
N = d; N = d;