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 /intern/cycles/bvh/bvh_unaligned.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 'intern/cycles/bvh/bvh_unaligned.h')
-rw-r--r-- | intern/cycles/bvh/bvh_unaligned.h | 71 |
1 files changed, 32 insertions, 39 deletions
diff --git a/intern/cycles/bvh/bvh_unaligned.h b/intern/cycles/bvh/bvh_unaligned.h index bcfb6ed68da..e8a9a25daa8 100644 --- a/intern/cycles/bvh/bvh_unaligned.h +++ b/intern/cycles/bvh/bvh_unaligned.h @@ -30,51 +30,44 @@ class Object; /* Helper class to perform calculations needed for unaligned nodes. */ class BVHUnaligned { -public: - BVHUnaligned(const vector<Object*>& objects); + public: + BVHUnaligned(const vector<Object *> &objects); - /* Calculate alignment for the oriented node for a given range. */ - Transform compute_aligned_space( - const BVHObjectBinning& range, - const BVHReference *references) const; - Transform compute_aligned_space( - const BVHRange& range, - const BVHReference *references) const; + /* Calculate alignment for the oriented node for a given range. */ + Transform compute_aligned_space(const BVHObjectBinning &range, + const BVHReference *references) const; + Transform compute_aligned_space(const BVHRange &range, const BVHReference *references) const; - /* Calculate alignment for the oriented node for a given reference. - * - * Return true when space was calculated successfully. - */ - bool compute_aligned_space(const BVHReference& ref, - Transform *aligned_space) const; + /* Calculate alignment for the oriented node for a given reference. + * + * Return true when space was calculated successfully. + */ + bool compute_aligned_space(const BVHReference &ref, Transform *aligned_space) const; - /* Calculate primitive's bounding box in given space. */ - BoundBox compute_aligned_prim_boundbox( - const BVHReference& prim, - const Transform& aligned_space) const; + /* Calculate primitive's bounding box in given space. */ + BoundBox compute_aligned_prim_boundbox(const BVHReference &prim, + const Transform &aligned_space) const; - /* Calculate bounding box in given space. */ - BoundBox compute_aligned_boundbox( - const BVHObjectBinning& range, - const BVHReference *references, - const Transform& aligned_space, - BoundBox *cent_bounds = NULL) const; - BoundBox compute_aligned_boundbox( - const BVHRange& range, - const BVHReference *references, - const Transform& aligned_space, - BoundBox *cent_bounds = NULL) const; + /* Calculate bounding box in given space. */ + BoundBox compute_aligned_boundbox(const BVHObjectBinning &range, + const BVHReference *references, + const Transform &aligned_space, + BoundBox *cent_bounds = NULL) const; + BoundBox compute_aligned_boundbox(const BVHRange &range, + const BVHReference *references, + const Transform &aligned_space, + BoundBox *cent_bounds = NULL) const; - /* Calculate affine transform for node packing. - * Bounds will be in the range of 0..1. - */ - static Transform compute_node_transform(const BoundBox& bounds, - const Transform& aligned_space); -protected: - /* List of objects BVH is being created for. */ - const vector<Object*>& objects_; + /* Calculate affine transform for node packing. + * Bounds will be in the range of 0..1. + */ + static Transform compute_node_transform(const BoundBox &bounds, const Transform &aligned_space); + + protected: + /* List of objects BVH is being created for. */ + const vector<Object *> &objects_; }; CCL_NAMESPACE_END -#endif /* __BVH_UNALIGNED_H__ */ +#endif /* __BVH_UNALIGNED_H__ */ |