diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/intern/subdiv_inline.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenkernel/intern/subdiv_inline.h')
-rw-r--r-- | source/blender/blenkernel/intern/subdiv_inline.h | 117 |
1 files changed, 59 insertions, 58 deletions
diff --git a/source/blender/blenkernel/intern/subdiv_inline.h b/source/blender/blenkernel/intern/subdiv_inline.h index 566d54ef72b..f00c5cf7ff7 100644 --- a/source/blender/blenkernel/intern/subdiv_inline.h +++ b/source/blender/blenkernel/intern/subdiv_inline.h @@ -29,78 +29,79 @@ #include "BKE_subdiv.h" -BLI_INLINE void BKE_subdiv_ptex_face_uv_to_grid_uv( - const float ptex_u, const float ptex_v, - float *r_grid_u, float *r_grid_v) +BLI_INLINE void BKE_subdiv_ptex_face_uv_to_grid_uv(const float ptex_u, + const float ptex_v, + float *r_grid_u, + float *r_grid_v) { - *r_grid_u = 1.0f - ptex_v; - *r_grid_v = 1.0f - ptex_u; + *r_grid_u = 1.0f - ptex_v; + *r_grid_v = 1.0f - ptex_u; } -BLI_INLINE void BKE_subdiv_grid_uv_to_ptex_face_uv( - const float grid_u, const float grid_v, - float *r_ptex_u, float *r_ptex_v) +BLI_INLINE void BKE_subdiv_grid_uv_to_ptex_face_uv(const float grid_u, + const float grid_v, + float *r_ptex_u, + float *r_ptex_v) { - *r_ptex_u = 1.0f - grid_v; - *r_ptex_v = 1.0f - grid_u; + *r_ptex_u = 1.0f - grid_v; + *r_ptex_v = 1.0f - grid_u; } BLI_INLINE int BKE_subdiv_grid_size_from_level(const int level) { - return (1 << (level - 1)) + 1; + return (1 << (level - 1)) + 1; } -BLI_INLINE int BKE_subdiv_rotate_quad_to_corner( - const float quad_u, const float quad_v, - float *r_corner_u, float *r_corner_v) +BLI_INLINE int BKE_subdiv_rotate_quad_to_corner(const float quad_u, + const float quad_v, + float *r_corner_u, + float *r_corner_v) { - int corner; - if (quad_u <= 0.5f && quad_v <= 0.5f) { - corner = 0; - *r_corner_u = 2.0f * quad_u; - *r_corner_v = 2.0f * quad_v; - } - else if (quad_u > 0.5f && quad_v <= 0.5f) { - corner = 1; - *r_corner_u = 2.0f * quad_v; - *r_corner_v = 2.0f * (1.0f - quad_u); - } - else if (quad_u > 0.5f && quad_v > 0.5f) { - corner = 2; - *r_corner_u = 2.0f * (1.0f - quad_u); - *r_corner_v = 2.0f * (1.0f - quad_v); - } - else { - BLI_assert(quad_u <= 0.5f && quad_v >= 0.5f); - corner = 3; - *r_corner_u = 2.0f * (1.0f - quad_v); - *r_corner_v = 2.0f * quad_u; - } - return corner; + int corner; + if (quad_u <= 0.5f && quad_v <= 0.5f) { + corner = 0; + *r_corner_u = 2.0f * quad_u; + *r_corner_v = 2.0f * quad_v; + } + else if (quad_u > 0.5f && quad_v <= 0.5f) { + corner = 1; + *r_corner_u = 2.0f * quad_v; + *r_corner_v = 2.0f * (1.0f - quad_u); + } + else if (quad_u > 0.5f && quad_v > 0.5f) { + corner = 2; + *r_corner_u = 2.0f * (1.0f - quad_u); + *r_corner_v = 2.0f * (1.0f - quad_v); + } + else { + BLI_assert(quad_u <= 0.5f && quad_v >= 0.5f); + corner = 3; + *r_corner_u = 2.0f * (1.0f - quad_v); + *r_corner_v = 2.0f * quad_u; + } + return corner; } BLI_INLINE void BKE_subdiv_rotate_grid_to_quad( - const int corner, - const float grid_u, const float grid_v, - float *r_quad_u, float *r_quad_v) + const int corner, const float grid_u, const float grid_v, float *r_quad_u, float *r_quad_v) { - if (corner == 0) { - *r_quad_u = 0.5f - grid_v * 0.5f; - *r_quad_v = 0.5f - grid_u * 0.5f; - } - else if (corner == 1) { - *r_quad_u = 0.5f + grid_u * 0.5f; - *r_quad_v = 0.5f - grid_v * 0.5f; - } - else if (corner == 2) { - *r_quad_u = 0.5f + grid_v * 0.5f; - *r_quad_v = 0.5f + grid_u * 0.5f; - } - else { - BLI_assert(corner == 3); - *r_quad_u = 0.5f - grid_u * 0.5f; - *r_quad_v = 0.5f + grid_v * 0.5f; - } + if (corner == 0) { + *r_quad_u = 0.5f - grid_v * 0.5f; + *r_quad_v = 0.5f - grid_u * 0.5f; + } + else if (corner == 1) { + *r_quad_u = 0.5f + grid_u * 0.5f; + *r_quad_v = 0.5f - grid_v * 0.5f; + } + else if (corner == 2) { + *r_quad_u = 0.5f + grid_v * 0.5f; + *r_quad_v = 0.5f + grid_u * 0.5f; + } + else { + BLI_assert(corner == 3); + *r_quad_u = 0.5f - grid_u * 0.5f; + *r_quad_v = 0.5f + grid_v * 0.5f; + } } -#endif /* __SUBDIV_INLINE_H__ */ +#endif /* __SUBDIV_INLINE_H__ */ |