mirror of https://github.com/CGAL/cgal
Apply suggestions from review
This commit is contained in:
parent
bbc6238843
commit
ee1de0fdb9
|
|
@ -38,7 +38,7 @@ struct GH_helper{
|
||||||
typedef typename GT::FT FT;
|
typedef typename GT::FT FT;
|
||||||
|
|
||||||
typedef dynamic_vertex_property_t<Vector_3> Vertex_normal_tag;
|
typedef dynamic_vertex_property_t<Vector_3> Vertex_normal_tag;
|
||||||
typedef typename boost::property_map<TriangleMesh, Vertex_normal_tag>::const_type Vertex_normal_dmap;
|
typedef typename boost::property_map<TriangleMesh, Vertex_normal_tag>::type Vertex_normal_dmap;
|
||||||
typedef typename internal_np::Lookup_named_param_def<internal_np::vertex_normal_map_t,
|
typedef typename internal_np::Lookup_named_param_def<internal_np::vertex_normal_map_t,
|
||||||
NamedParameters,
|
NamedParameters,
|
||||||
Vertex_normal_dmap>::type Vertex_normal_map;
|
Vertex_normal_dmap>::type Vertex_normal_map;
|
||||||
|
|
@ -46,7 +46,7 @@ struct GH_helper{
|
||||||
const NamedParameters &np;
|
const NamedParameters &np;
|
||||||
GH_helper(const NamedParameters &np_):np(np_){ }
|
GH_helper(const NamedParameters &np_):np(np_){ }
|
||||||
|
|
||||||
Vertex_normal_map vnm(const TriangleMesh& tmesh) const{
|
Vertex_normal_map vnm(TriangleMesh& tmesh) const{
|
||||||
using parameters::choose_parameter;
|
using parameters::choose_parameter;
|
||||||
using parameters::is_default_parameter;
|
using parameters::is_default_parameter;
|
||||||
using parameters::get_parameter;
|
using parameters::get_parameter;
|
||||||
|
|
@ -66,7 +66,7 @@ struct GH_helper{
|
||||||
return choose_parameter(get_parameter(np, internal_np::line_policies_weight), 0.01);
|
return choose_parameter(get_parameter(np, internal_np::line_policies_weight), 0.01);
|
||||||
}
|
}
|
||||||
|
|
||||||
FT dm() const{
|
double dm() const{
|
||||||
using parameters::choose_parameter;
|
using parameters::choose_parameter;
|
||||||
using parameters::get_parameter;
|
using parameters::get_parameter;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -121,15 +121,15 @@ public:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
GarlandHeckbert_composed_policies(TriangleMesh& tmesh,
|
GarlandHeckbert_composed_policies(TriangleMesh& tmesh,
|
||||||
double w1=1., double w2=1.,const FT dm = FT(100))
|
double w1=1., double w2=1.,const double dm = 100)
|
||||||
: Base(tmesh, Quadric_calculator(w1, w2), dm)
|
: Base(tmesh, Quadric_calculator(w1, w2), FT(dm))
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
GarlandHeckbert_composed_policies(TriangleMesh& tmesh,
|
GarlandHeckbert_composed_policies(TriangleMesh& tmesh,
|
||||||
GH_policies_1 ghp1,
|
GH_policies_1 ghp1,
|
||||||
GH_policies_2 ghp2,
|
GH_policies_2 ghp2,
|
||||||
double w1=1., double w2=1.,const FT dm = FT(100))
|
double w1=1., double w2=1.,const double dm = 100)
|
||||||
: Base(tmesh, Quadric_calculator(ghp1.quadric_calculator(), ghp2.quadric_calculator(), w1, w2), dm)
|
: Base(tmesh, Quadric_calculator(ghp1.quadric_calculator(), ghp2.quadric_calculator(), w1, w2), FT(dm))
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
|
||||||
|
|
@ -94,7 +94,7 @@ public:
|
||||||
template<typename TriangleMesh,
|
template<typename TriangleMesh,
|
||||||
typename GeomTraits,
|
typename GeomTraits,
|
||||||
typename VertexNormalMap = typename boost::property_map<TriangleMesh,
|
typename VertexNormalMap = typename boost::property_map<TriangleMesh,
|
||||||
CGAL::dynamic_vertex_property_t<typename GeomTraits::Vector_3> >::const_type >
|
CGAL::dynamic_vertex_property_t<typename GeomTraits::Vector_3> >::type >
|
||||||
class GarlandHeckbert_line_policies
|
class GarlandHeckbert_line_policies
|
||||||
: public internal::GarlandHeckbert_cost_and_placement<
|
: public internal::GarlandHeckbert_cost_and_placement<
|
||||||
internal::Line_quadric_calculator<TriangleMesh, GeomTraits>, TriangleMesh, GeomTraits>
|
internal::Line_quadric_calculator<TriangleMesh, GeomTraits>, TriangleMesh, GeomTraits>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue