Remove normal map from octree

CGAL · Jul 29, 2020 · d8f797d · d8f797d
1 parent d24931b
commit d8f797d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Efficient_RANSAC.h b/Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Efficient_RANSAC.h
@@ -359,13 +359,13 @@ class Efficient_RANSAC {
         m_direct_octrees[s] = new Direct_octree(
                 m_traits, last + 1,
                 last + subsetSize + 1,
-                m_point_pmap, m_normal_pmap,
+                m_point_pmap,
                 remainingPoints - subsetSize);
       } else
         m_direct_octrees[0] = new Direct_octree(
                 m_traits, m_input_iterator_first,
                 m_input_iterator_first + (subsetSize),
-                m_point_pmap, m_normal_pmap,
+                m_point_pmap,
                 0);
 
       m_available_octree_sizes[s] = subsetSize;
@@ -376,7 +376,8 @@ class Efficient_RANSAC {
 
     m_global_octree = new Indexed_octree(
             m_traits, m_input_iterator_first, m_input_iterator_beyond,
-            m_point_pmap, m_normal_pmap);
+            m_point_pmap
+            );
     m_global_octree->createTree(m_options.cluster_epsilon);
 
     return true;

diff --git a/Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Octree.h b/Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Octree.h
@@ -163,7 +163,6 @@ class Octree : public PointAccessor {
   typedef typename Sd_traits::Vector_3 Vector_3;
   typedef typename Sd_traits::FT FT;
   typedef typename Sd_traits::Point_map Point_map;
-  typedef typename Sd_traits::Normal_map Normal_map;
 
 public:
 
@@ -202,7 +201,6 @@ class Octree : public PointAccessor {
          const Input_iterator &first,
          const Input_iterator &beyond,
          Point_map &point_pmap,
-         Normal_map &normal_pmap,
          std::size_t offset = 0,
          std::size_t bucketSize = 20,
          std::size_t maxLevel = 10)
@@ -211,8 +209,8 @@ class Octree : public PointAccessor {
             m_root(nullptr),
             m_bucket_size(bucketSize),
             m_set_max_level(maxLevel),
-            m_point_pmap(point_pmap),
-            m_normal_pmap(normal_pmap) {}
+            m_point_pmap(point_pmap)
+            {}
 
   ~Octree() {
     if (!m_root)
@@ -463,7 +461,6 @@ class Octree : public PointAccessor {
   std::size_t m_set_max_level;
   std::size_t m_max_level;
   Point_map m_point_pmap;
-  Normal_map m_normal_pmap;
 
 private: