diff options
author | Ray Molenkamp <github@lazydodo.com> | 2020-08-28 19:04:26 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2020-08-28 19:04:26 +0300 |
commit | 285353c25289c83942af009ead88d2f74ff9f3d8 (patch) | |
tree | 4e94b24b833b970cf7297203040652fd7dbc7802 /source | |
parent | 79e82dbc0574abe97f7316dc23441472594a3f57 (diff) |
Cleanup: clang-format
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenlib/BLI_math_boolean.hh | 19 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_boolean.cc | 2 | ||||
-rw-r--r-- | source/blender/blenlib/tests/BLI_mesh_intersect_test.cc | 8 |
3 files changed, 15 insertions, 14 deletions
diff --git a/source/blender/blenlib/BLI_math_boolean.hh b/source/blender/blenlib/BLI_math_boolean.hh index da79e9eeaba..79b1483bfb8 100644 --- a/source/blender/blenlib/BLI_math_boolean.hh +++ b/source/blender/blenlib/BLI_math_boolean.hh @@ -25,24 +25,23 @@ #include "BLI_double3.hh" #ifdef WITH_GMP -#include "BLI_math_mpq.hh" -#include "BLI_mpq2.hh" -#include "BLI_mpq3.hh" +# include "BLI_math_mpq.hh" +# include "BLI_mpq2.hh" +# include "BLI_mpq3.hh" #endif namespace blender { /* #orient2d gives the exact result, using multi-precision arithmetic when result -* is close to zero. orient3d_fast just uses double arithmetic, so may be -* wrong if the answer is very close to zero. -* Similarly, for #incircle and #incircle_fast. */ + * is close to zero. orient3d_fast just uses double arithmetic, so may be + * wrong if the answer is very close to zero. + * Similarly, for #incircle and #incircle_fast. */ int orient2d(const double2 &a, const double2 &b, const double2 &c); int orient2d_fast(const double2 &a, const double2 &b, const double2 &c); int incircle(const double2 &a, const double2 &b, const double2 &c, const double2 &d); int incircle_fast(const double2 &a, const double2 &b, const double2 &c, const double2 &d); - /* #orient3d gives the exact result, using multi-precision arithmetic when result * is close to zero. orient3d_fast just uses double arithmetic, so may be * wrong if the answer is very close to zero. @@ -50,8 +49,10 @@ int incircle_fast(const double2 &a, const double2 &b, const double2 &c, const do int orient3d(const double3 &a, const double3 &b, const double3 &c, const double3 &d); int orient3d_fast(const double3 &a, const double3 &b, const double3 &c, const double3 &d); -int insphere(const double3 &a, const double3 &b, const double3 &c, const double3 &d, const double3 &e); -int insphere_fast(const double3 &a, const double3 &b, const double3 &c, const double3 &d, const double3 &e); +int insphere( + const double3 &a, const double3 &b, const double3 &c, const double3 &d, const double3 &e); +int insphere_fast( + const double3 &a, const double3 &b, const double3 &c, const double3 &d, const double3 &e); #ifdef WITH_GMP int orient2d(const mpq2 &a, const mpq2 &b, const mpq2 &c); diff --git a/source/blender/blenlib/intern/math_boolean.cc b/source/blender/blenlib/intern/math_boolean.cc index fc6d117fa1d..2210911ad9c 100644 --- a/source/blender/blenlib/intern/math_boolean.cc +++ b/source/blender/blenlib/intern/math_boolean.cc @@ -2530,4 +2530,4 @@ int insphere_fast( return sgn(robust_pred::inspherefast(a, b, c, d, e)); } -} // namespace blender +} // namespace blender diff --git a/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc b/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc index f3890bcebb2..a9b916f6489 100644 --- a/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc +++ b/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc @@ -157,7 +157,7 @@ static int find_edge_pos_in_tri(const Vert *v0, const Vert *v1, const Face *f) return -1; } -#if DO_REGULAR_TESTS +# if DO_REGULAR_TESTS TEST(mesh_intersect, Mesh) { Vector<const Vert *> verts; @@ -703,9 +703,9 @@ TEST(mesh_intersect, CubeCubeStep) write_obj_mesh(out2, "test_cubecubestep_nary"); } } -#endif +# endif -#if DO_PERF_TESTS +# if DO_PERF_TESTS static void get_sphere_params( int nrings, int nsegs, bool triangulate, int *r_num_verts, int *r_num_faces) @@ -1068,7 +1068,7 @@ TEST(mesh_intersect_perf, SphereGrid) spheregrid_test(64, 4, 0.1, false); } -#endif +# endif } // namespace blender::meshintersect::tests #endif |