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

Merge pull request #5274 from benlaurie/fp-fix 

Allow FT that isn't floating point.
This commit is contained in:
Laurent Rineau 2021-01-06 16:11:35 +01:00
parent 5175ad719b a7b6f61ca1
commit 3e6e12a66e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BGL/include/CGAL/boost/graph/generators.h
View File

@ -483,15 +483,15 @@ make_regular_prism(typename boost::graph_traits<Graph>::vertices_size_type nb_ve
for(typename boost::graph_traits<Graph>::vertices_size_type i=0; i < nb_vertices; ++i)
{
put(vpmap, vertices[i],
P(0.5*diameter * cos(i*precision*to_rad) + base_center.x(),
P(0.5*diameter * cos(to_double(FT(i)*precision*to_rad)) + base_center.x(),
height+base_center.y(),
-0.5*diameter * sin(i*precision*to_rad) + base_center.z()));
-0.5*diameter * sin(to_double(FT(i)*precision*to_rad)) + base_center.z()));
put(vpmap,
vertices[i+nb_vertices],
P(0.5*diameter * cos(i*precision*to_rad) + base_center.x(),
P(0.5*diameter * cos(to_double(FT(i)*precision*to_rad)) + base_center.x(),
base_center.y(),
-0.5*diameter * sin(i*precision*to_rad) + base_center.z()));
-0.5*diameter * sin(to_double(FT(i)*precision*to_rad)) + base_center.z()));
}
//fill faces
@ -589,9 +589,9 @@ make_pyramid(typename boost::graph_traits<Graph>::vertices_size_type nb_vertices
for(typename boost::graph_traits<Graph>::vertices_size_type i=0; i<nb_vertices; ++i)
{
put(vpmap, vertices[i],
P(0.5*diameter*cos(i*precision*to_rad)+base_center.x(),
P(0.5*diameter*cos(to_double(FT(i)*precision*to_rad))+base_center.x(),
base_center.y(),
-0.5*diameter*sin(i*precision*to_rad)+base_center.z()));
-0.5*diameter*sin(to_double(FT(i)*precision*to_rad))+base_center.z()));
}
//fill faces