songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6998 from sloriot/AW_3-AABB_GT 

Rename traits class to avoid confusion
This commit is contained in:
Laurent Rineau 2022-11-07 10:08:13 +01:00
parent 5cc489991a 9c2d913636
commit 3379f9bf9c
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/Alpha_wrap_3.h
View File

@ -29,7 +29,7 @@
#include <CGAL/license/Alpha_wrap_3.h> #include <CGAL/license/Alpha_wrap_3.h>
#include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_traits.h> #include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_geom_traits.h>
#include <CGAL/Alpha_wrap_3/internal/gate_priority_queue.h> #include <CGAL/Alpha_wrap_3/internal/gate_priority_queue.h>
#include <CGAL/Alpha_wrap_3/internal/geometry_utils.h> #include <CGAL/Alpha_wrap_3/internal/geometry_utils.h>
#include <CGAL/Alpha_wrap_3/internal/oracles.h> #include <CGAL/Alpha_wrap_3/internal/oracles.h>

10
Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_traits.h → Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_geom_traits.h
View File

@ -13,8 +13,8 @@
// Andreas Fabri // Andreas Fabri
// Michael Hemmer // Michael Hemmer
// //
#ifndef CGAL_ALPHA_WRAP_3_INTERNAL_ALPHA_WRAP_AABB_TRAITS_H #ifndef CGAL_ALPHA_WRAP_3_INTERNAL_ALPHA_WRAP_AABB_GEOM_TRAITS_H
#define CGAL_ALPHA_WRAP_3_INTERNAL_ALPHA_WRAP_AABB_TRAITS_H #define CGAL_ALPHA_WRAP_3_INTERNAL_ALPHA_WRAP_AABB_GEOM_TRAITS_H
#include <CGAL/license/Alpha_wrap_3.h> #include <CGAL/license/Alpha_wrap_3.h>
@ -89,14 +89,14 @@ public:
}; };
template <typename GT> template <typename GT>
class Alpha_wrap_AABB_traits class Alpha_wrap_AABB_geom_traits
: public GT : public GT
{ {
public: public:
using Ball_3 = internal::Ball_3<GT>; using Ball_3 = internal::Ball_3<GT>;
public: public:
Alpha_wrap_AABB_traits(const GT& gt = GT()) : GT(gt) { } Alpha_wrap_AABB_geom_traits(const GT& gt = GT()) : GT(gt) { }
public: public:
class Construct_ball_3 class Construct_ball_3
@ -295,4 +295,4 @@ public:
} // namespace Alpha_wraps_3 } // namespace Alpha_wraps_3
} // namespace CGAL } // namespace CGAL
#endif // CGAL_ALPHA_WRAP_3_INTERNAL_ALPHA_WRAP_AABB_TRAITS_H #endif // CGAL_ALPHA_WRAP_3_INTERNAL_ALPHA_WRAP_AABB_GEOM_TRAITS_H

4
Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/Point_set_oracle.h
View File

@ -14,7 +14,7 @@
#include <CGAL/license/Alpha_wrap_3.h> #include <CGAL/license/Alpha_wrap_3.h>
#include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_traits.h> #include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_geom_traits.h>
#include <CGAL/Alpha_wrap_3/internal/Oracle_base.h> #include <CGAL/Alpha_wrap_3/internal/Oracle_base.h>
#include <CGAL/AABB_primitive.h> #include <CGAL/AABB_primitive.h>
@ -38,7 +38,7 @@ namespace internal {
template <typename GT_> template <typename GT_>
struct PS_oracle_traits struct PS_oracle_traits
{ {
using Geom_traits = Alpha_wrap_AABB_traits<GT_>; // Wrap the kernel to add Ball_3 + custom Do_intersect_3 using Geom_traits = Alpha_wrap_AABB_geom_traits<GT_>; // Wrap the kernel to add Ball_3 + custom Do_intersect_3
using Points = std::vector<typename GT_::Point_3>; using Points = std::vector<typename GT_::Point_3>;
using PR_iterator = typename Points::const_iterator; using PR_iterator = typename Points::const_iterator;

4
Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/Segment_soup_oracle.h
View File

@ -14,7 +14,7 @@
#include <CGAL/license/Alpha_wrap_3.h> #include <CGAL/license/Alpha_wrap_3.h>
#include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_traits.h> #include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_geom_traits.h>
#include <CGAL/Alpha_wrap_3/internal/Oracle_base.h> #include <CGAL/Alpha_wrap_3/internal/Oracle_base.h>
#include <CGAL/AABB_traits.h> #include <CGAL/AABB_traits.h>
@ -38,7 +38,7 @@ namespace internal {
template <typename GT_> template <typename GT_>
struct SS_oracle_traits struct SS_oracle_traits
{ {
using Geom_traits = Alpha_wrap_AABB_traits<GT_>; // Wrap the kernel to add Ball_3 + custom Do_intersect_3 using Geom_traits = Alpha_wrap_AABB_geom_traits<GT_>; // Wrap the kernel to add Ball_3 + custom Do_intersect_3
using Segments = std::vector<typename GT_::Segment_3>; using Segments = std::vector<typename GT_::Segment_3>;
using SR_iterator = typename Segments::const_iterator; using SR_iterator = typename Segments::const_iterator;

4
Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/Triangle_mesh_oracle.h
View File

@ -14,7 +14,7 @@
#include <CGAL/license/Alpha_wrap_3.h> #include <CGAL/license/Alpha_wrap_3.h>
#include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_traits.h> #include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_geom_traits.h>
#include <CGAL/Alpha_wrap_3/internal/Oracle_base.h> #include <CGAL/Alpha_wrap_3/internal/Oracle_base.h>
#include <CGAL/Alpha_wrap_3/internal/splitting_helper.h> #include <CGAL/Alpha_wrap_3/internal/splitting_helper.h>
@ -37,7 +37,7 @@ namespace internal {
template <typename GT_> template <typename GT_>
struct TM_oracle_traits struct TM_oracle_traits
{ {
using Geom_traits = Alpha_wrap_AABB_traits<GT_>; // Wrap the kernel to add Ball_3 + custom Do_intersect_3 using Geom_traits = Alpha_wrap_AABB_geom_traits<GT_>; // Wrap the kernel to add Ball_3 + custom Do_intersect_3
using Point_3 = typename Geom_traits::Point_3; using Point_3 = typename Geom_traits::Point_3;
using AABB_traits = typename AABB_tree_splitter_traits<Point_3, Geom_traits>::AABB_traits; using AABB_traits = typename AABB_tree_splitter_traits<Point_3, Geom_traits>::AABB_traits;

4
Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/Triangle_soup_oracle.h
View File

@ -14,7 +14,7 @@
#include <CGAL/license/Alpha_wrap_3.h> #include <CGAL/license/Alpha_wrap_3.h>
#include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_traits.h> #include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_geom_traits.h>
#include <CGAL/Alpha_wrap_3/internal/Oracle_base.h> #include <CGAL/Alpha_wrap_3/internal/Oracle_base.h>
#include <CGAL/Alpha_wrap_3/internal/splitting_helper.h> #include <CGAL/Alpha_wrap_3/internal/splitting_helper.h>
@ -38,7 +38,7 @@ namespace internal {
template <typename GT_> template <typename GT_>
struct TS_oracle_traits struct TS_oracle_traits
{ {
using Geom_traits = Alpha_wrap_AABB_traits<GT_>; // Wrap the kernel to add Ball_3 + custom Do_intersect_3 using Geom_traits = Alpha_wrap_AABB_geom_traits<GT_>; // Wrap the kernel to add Ball_3 + custom Do_intersect_3
using Point_3 = typename Geom_traits::Point_3; using Point_3 = typename Geom_traits::Point_3;
using AABB_traits = typename AABB_tree_splitter_traits<Point_3, Geom_traits>::AABB_traits; using AABB_traits = typename AABB_tree_splitter_traits<Point_3, Geom_traits>::AABB_traits;
using AABB_tree = typename AABB_tree_splitter_traits<Point_3, Geom_traits>::AABB_tree; using AABB_tree = typename AABB_tree_splitter_traits<Point_3, Geom_traits>::AABB_tree;

2
Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/oracles.h
View File

@ -14,7 +14,7 @@
#include <CGAL/license/Alpha_wrap_3.h> #include <CGAL/license/Alpha_wrap_3.h>
#include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_traits.h> #include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_geom_traits.h>
#include <CGAL/Alpha_wrap_3/internal/offset_intersection.h> #include <CGAL/Alpha_wrap_3/internal/offset_intersection.h>
#include <CGAL/Alpha_wrap_3/internal/Triangle_mesh_oracle.h> #include <CGAL/Alpha_wrap_3/internal/Triangle_mesh_oracle.h>

2
Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/splitting_helper.h
View File

@ -14,7 +14,7 @@
#include <CGAL/license/Alpha_wrap_3.h> #include <CGAL/license/Alpha_wrap_3.h>
#include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_traits.h> #include <CGAL/Alpha_wrap_3/internal/Alpha_wrap_AABB_geom_traits.h>
#include <CGAL/AABB_tree/internal/AABB_traversal_traits.h> #include <CGAL/AABB_tree/internal/AABB_traversal_traits.h>
#include <CGAL/AABB_primitive.h> #include <CGAL/AABB_primitive.h>