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

Naming consistency

This commit is contained in:
Mael Rouxel-Labbé 2021-12-22 12:39:53 +01:00
parent b342e11967
commit d964ca4e48
4 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_policies.h → Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_plane_policies.h
View File

@ -10,8 +10,8 @@
// Mael Rouxel-Labbé,
// Julian Komaromy
#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_POLICIES_H
#define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_POLICIES_H
#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PLANE_POLICIES_H
#define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PLANE_POLICIES_H
#include <CGAL/license/Surface_mesh_simplification.h>
@ -78,7 +78,7 @@ public:
};
template<typename TriangleMesh, typename GeomTraits>
class GarlandHeckbert_policies
class GarlandHeckbert_plane_policies
: public internal::GarlandHeckbert_placement_base<
Plane_quadric_calculator<TriangleMesh, GeomTraits>, TriangleMesh, GeomTraits>,
public internal::GarlandHeckbert_cost_base<
@ -97,7 +97,7 @@ private:
typedef internal::GarlandHeckbert_quadrics_storage<
Quadric_calculator, TriangleMesh, GeomTraits> Quadrics_storage;
typedef GarlandHeckbert_policies<TriangleMesh, GeomTraits> Self;
typedef GarlandHeckbert_plane_policies<TriangleMesh, GeomTraits> Self;
public:
typedef Self Get_cost;
@ -106,8 +106,8 @@ public:
typedef typename GeomTraits::FT FT;
public:
GarlandHeckbert_policies(TriangleMesh& tmesh,
const FT dm = FT(100))
GarlandHeckbert_plane_policies(TriangleMesh& tmesh,
const FT dm = FT(100))
: Quadrics_storage(tmesh), Placement_base(), Cost_base(dm)
{ }
@ -119,7 +119,11 @@ public:
using Placement_base::operator();
};
// backward compatibility
template<typename TriangleMesh, typename GeomTraits>
using GarlandHeckbert_policies = GarlandHeckbert_plane_policies<TriangleMesh, GeomTraits>;
} // namespace Surface_mesh_simplification
} // namespace CGAL
#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_POLICIES_H
#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PLANE_POLICIES_H

21
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_policies.h → Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_plane_policies.h
View File

@ -10,8 +10,8 @@
// Mael Rouxel-Labbé,
// Julian Komaromy
#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_POLICIES_H
#define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_POLICIES_H
#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_PLANE_POLICIES_H
#define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_PLANE_POLICIES_H
#include <CGAL/license/Surface_mesh_simplification.h>
@ -125,7 +125,7 @@ public:
template<typename TriangleMesh,
typename GeomTraits,
typename FaceVarianceMap = CGAL::Default>
class GarlandHeckbert_probabilistic_policies
class GarlandHeckbert_probabilistic_plane_policies
: public internal::GarlandHeckbert_placement_base<
Probabilistic_plane_quadric_calculator<TriangleMesh, GeomTraits, FaceVarianceMap>,
TriangleMesh, GeomTraits>,
@ -148,7 +148,8 @@ private:
typedef internal::GarlandHeckbert_quadrics_storage<
Quadric_calculator, TriangleMesh, GeomTraits> Quadrics_storage;
typedef GarlandHeckbert_probabilistic_policies<TriangleMesh, GeomTraits> Self;
typedef GarlandHeckbert_probabilistic_plane_policies<
TriangleMesh, GeomTraits> Self;
public:
typedef Self Get_cost;
@ -158,15 +159,15 @@ public:
public:
// Only available if the quadric calculator is using the default (constant) variance property map
GarlandHeckbert_probabilistic_policies(TriangleMesh& tmesh,
const FT dm = FT(100))
GarlandHeckbert_probabilistic_plane_policies(TriangleMesh& tmesh,
const FT dm = FT(100))
: Quadrics_storage(tmesh, Quadric_calculator(tmesh)), Placement_base(), Cost_base(dm)
{ }
template <typename FVM>
GarlandHeckbert_probabilistic_policies(TriangleMesh& tmesh,
const FT dm,
const FVM fvm)
GarlandHeckbert_probabilistic_plane_policies(TriangleMesh& tmesh,
const FT dm,
const FVM fvm)
: Quadrics_storage(tmesh, Quadric_calculator(fvm)), Placement_base(), Cost_base(dm)
{ }
@ -181,4 +182,4 @@ public:
} // namespace Surface_mesh_simplification
} // namespace CGAL
#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_POLICIES_H
#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_PLANE_POLICIES_H

21
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_tri_policies.h → Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_triangle_policies.h
View File

@ -9,8 +9,8 @@
// Mael Rouxel-Labbé,
// Julian Komaromy
#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_TRI_POLICIES_H
#define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_TRI_POLICIES_H
#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_TRIANGLE_POLICIES_H
#define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_TRIANGLE_POLICIES_H
#include <CGAL/license/Surface_mesh_simplification.h>
@ -114,7 +114,7 @@ public:
template<typename TriangleMesh,
typename GeomTraits,
typename FaceVarianceMap = CGAL::Default>
class GarlandHeckbert_probabilistic_tri_policies
class GarlandHeckbert_probabilistic_triangle_policies
: public internal::GarlandHeckbert_placement_base<
Probabilistic_triangle_quadric_calculator<TriangleMesh, GeomTraits, FaceVarianceMap>,
TriangleMesh, GeomTraits>,
@ -136,7 +136,8 @@ private:
typedef internal::GarlandHeckbert_quadrics_storage<
Quadric_calculator, TriangleMesh, GeomTraits> Quadrics_storage;
typedef GarlandHeckbert_probabilistic_tri_policies<TriangleMesh, GeomTraits> Self;
typedef GarlandHeckbert_probabilistic_triangle_policies<
TriangleMesh, GeomTraits> Self;
public:
typedef Self Get_cost;
@ -146,15 +147,15 @@ public:
public:
// Only available if the quadric calculator is using the default (constant) variance property map
GarlandHeckbert_probabilistic_tri_policies(TriangleMesh& tmesh,
const FT dm = FT(100))
GarlandHeckbert_probabilistic_triangle_policies(TriangleMesh& tmesh,
const FT dm = FT(100))
: Quadrics_storage(tmesh, Quadric_calculator(tmesh)), Placement_base(), Cost_base(dm)
{ }
template <typename FVM>
GarlandHeckbert_probabilistic_tri_policies(TriangleMesh& tmesh,
const FT dm,
const FVM fvm)
GarlandHeckbert_probabilistic_triangle_policies(TriangleMesh& tmesh,
const FT dm,
const FVM fvm)
: Quadrics_storage(tmesh, Quadric_calculator(fvm)), Placement_base(), Cost_base(dm)
{ }
@ -169,4 +170,4 @@ public:
} // namespace Surface_mesh_simplification
} // namespace CGAL
#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_TRI_POLICIES_H
#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_TRIANGLE_POLICIES_H

2
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_triangle_policies.h
View File

@ -107,4 +107,4 @@ public:
} // namespace Surface_mesh_simplification
} // namespace CGAL
#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_POLICIES_H
#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_TRIANGLE_POLICIES_H