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

Use CGAL_PI and add dependencies file in the documentation

This commit is contained in:
Andreas Fabri 2022-11-23 12:07:11 +00:00
parent 35ad0e0b50
commit 79acf4f993
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Isosurfacing_3/doc/Isosurfacing_3/dependencies
View File

@ -4,3 +4,6 @@ STL_Extension
Algebraic_foundations Algebraic_foundations
Circulator Circulator
Stream_support Stream_support
AABB_tree
CGAL_ImageIO
Polygon_mesh_processing

21
Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_implicit_iwp.cpp
View File

@ -12,28 +12,25 @@ typedef typename Kernel::Point_3 Point;
typedef std::vector<Point> Point_range; typedef std::vector<Point> Point_range;
typedef std::vector<std::vector<std::size_t>> Polygon_range; typedef std::vector<std::vector<std::size_t>> Polygon_range;
#ifndef M_PI
#define M_PI 3.141592653589793238462643383279502884L
#endif
int main() { int main() {
const FT alpha = 5.01; const FT alpha = 5.01;
auto iwp_value = [alpha](const Point& point) { auto iwp_value = [alpha](const Point& point) {
const FT x = alpha * (point.x() + 1) * M_PI; const FT x = alpha * (point.x() + 1) * CGAL_PI;
const FT y = alpha * (point.y() + 1) * M_PI; const FT y = alpha * (point.y() + 1) * CGAL_PI;
const FT z = alpha * (point.z() + 1) * M_PI; const FT z = alpha * (point.z() + 1) * CGAL_PI;
return cos(x) * cos(y) + cos(y) * cos(z) + cos(z) * cos(x) - cos(x) * cos(y) * cos(z); // iso-value = 0 return cos(x) * cos(y) + cos(y) * cos(z) + cos(z) * cos(x) - cos(x) * cos(y) * cos(z); // iso-value = 0
}; };
auto iwp_gradient = [alpha](const Point& point) { auto iwp_gradient = [alpha](const Point& point) {
const FT x = alpha * (point.x() + 1) * M_PI; const FT x = alpha * (point.x() + 1) * CGAL_PI;
const FT y = alpha * (point.y() + 1) * M_PI; const FT y = alpha * (point.y() + 1) * CGAL_PI;
const FT z = alpha * (point.z() + 1) * M_PI; const FT z = alpha * (point.z() + 1) * CGAL_PI;
const FT gx = M_PI * alpha * sin(x) * (cos(y) * (cos(z) - 1.0) - cos(z)); const FT gx = CGAL_PI * alpha * sin(x) * (cos(y) * (cos(z) - 1.0) - cos(z));
const FT gy = M_PI * alpha * sin(y) * (cos(x) * (cos(z) - 1.0) - cos(z)); const FT gy = CGAL_PI * alpha * sin(y) * (cos(x) * (cos(z) - 1.0) - cos(z));
const FT gz = M_PI * alpha * sin(z) * (cos(x) * (cos(y) - 1.0) - cos(y)); const FT gz = CGAL_PI * alpha * sin(z) * (cos(x) * (cos(y) - 1.0) - cos(y));
return Vector(gx, gy, gz); return Vector(gx, gy, gz);
}; };