blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: clang-format

This commit is contained in:
Ray molenkamp 2020-08-28 10:04:26 -06:00
parent 79e82dbc05
commit 285353c252
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/blenlib/BLI_math_boolean.hh
View File

@ -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);

2
source/blender/blenlib/intern/math_boolean.cc
View File

@ -2530,4 +2530,4 @@ int insphere_fast(
return sgn(robust_pred::inspherefast(a, b, c, d, e));
}
} // namespace blender
} // namespace blender

8
source/blender/blenlib/tests/BLI_mesh_intersect_test.cc
View File

@ -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