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

Add min max parentheses for Windows

This commit is contained in:
Mael Rouxel-Labbé 2022-03-24 10:15:16 +01:00
parent 1dc4528ef3
commit aaec78d705
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,24 +335,25 @@ public:
{ {
// Input axis-aligned bounding box // Input axis-aligned bounding box
SC_Iso_cuboid_3 bbox = m_oracle.bbox(); SC_Iso_cuboid_3 bbox = m_oracle.bbox();
const SC_Point_3 bbox_centroid = midpoint(bbox.min(), bbox.max()); const SC_Point_3 bbox_centroid = midpoint((bbox.min)(), (bbox.max)());
// Scale a bit to create the initial points not too close to the input // Scale a bit to create the initial points not too close to the input
double scaling = 1.2; double scaling = 1.2;
CGAL::Aff_transformation_3<SC> scale(SCALING, scaling); CGAL::Aff_transformation_3<SC> scale(SCALING, scaling);
bbox = SC_Iso_cuboid_3(scale.transform(bbox.min()), scale.transform(bbox.max())); bbox = SC_Iso_cuboid_3(scale.transform((bbox.min)()), scale.transform((bbox.max)()));
// Translate bbox back to initial centroid // Translate bbox back to initial centroid
const SC_Point_3 bbox_transformed_centroid = midpoint(bbox.min(), bbox.max()); const SC_Point_3 bbox_transformed_centroid = midpoint((bbox.min)(), (bbox.max)());
const SC_Vector_3 diff_centroid = bbox_centroid - bbox_transformed_centroid; const SC_Vector_3 diff_centroid = bbox_centroid - bbox_transformed_centroid;
CGAL::Aff_transformation_3<SC> centroid_translate(TRANSLATION, diff_centroid); CGAL::Aff_transformation_3<SC> centroid_translate(TRANSLATION, diff_centroid);
bbox = SC_Iso_cuboid_3(centroid_translate.transform(bbox.min()), centroid_translate.transform(bbox.max())); bbox = SC_Iso_cuboid_3(centroid_translate.transform((bbox.min)()),
centroid_translate.transform((bbox.max)()));
// Add the offset // Add the offset
SC_Vector_3 offset_ext = std::sqrt(3.) * offset * SC_Vector_3(1, 1, 1); SC_Vector_3 offset_ext = std::sqrt(3.) * offset * SC_Vector_3(1, 1, 1);
CGAL::Aff_transformation_3<SC> translate_m(TRANSLATION, - offset_ext); CGAL::Aff_transformation_3<SC> translate_m(TRANSLATION, - offset_ext);
CGAL::Aff_transformation_3<SC> translate_M(TRANSLATION, offset_ext); CGAL::Aff_transformation_3<SC> translate_M(TRANSLATION, offset_ext);
bbox = SC_Iso_cuboid_3(translate_m.transform(bbox.min()), translate_M.transform(bbox.max())); bbox = SC_Iso_cuboid_3(translate_m.transform((bbox.min)()), translate_M.transform((bbox.max)()));
std::cout << "Bbox: " << bbox << std::endl; std::cout << "Bbox: " << bbox << std::endl;