Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /intern/cycles/bvh/bvh4.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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/bvh4.h')
-rw-r--r--intern/cycles/bvh/bvh4.h70
1 files changed, 33 insertions, 37 deletions
diff --git a/intern/cycles/bvh/bvh4.h b/intern/cycles/bvh/bvh4.h
index caa0e2c8182..38b0961d3df 100644
--- a/intern/cycles/bvh/bvh4.h
+++ b/intern/cycles/bvh/bvh4.h
@@ -34,8 +34,8 @@ class LeafNode;
class Object;
class Progress;
-#define BVH_QNODE_SIZE 8
-#define BVH_QNODE_LEAF_SIZE 1
+#define BVH_QNODE_SIZE 8
+#define BVH_QNODE_LEAF_SIZE 1
#define BVH_UNALIGNED_QNODE_SIZE 14
/* BVH4
@@ -43,48 +43,44 @@ class Progress;
* Quad BVH, with each node having four children, to use with SIMD instructions.
*/
class BVH4 : public BVH {
-protected:
- /* constructor */
- friend class BVH;
- BVH4(const BVHParams& params, const vector<Object*>& objects);
+ protected:
+ /* constructor */
+ friend class BVH;
+ BVH4(const BVHParams &params, const vector<Object *> &objects);
- /* Building process. */
- virtual BVHNode *widen_children_nodes(const BVHNode *root) override;
+ /* Building process. */
+ virtual BVHNode *widen_children_nodes(const BVHNode *root) override;
- /* pack */
- void pack_nodes(const BVHNode *root) override;
+ /* pack */
+ void pack_nodes(const BVHNode *root) override;
- void pack_leaf(const BVHStackEntry& e, const LeafNode *leaf);
- void pack_inner(const BVHStackEntry& e, const BVHStackEntry *en, int num);
+ void pack_leaf(const BVHStackEntry &e, const LeafNode *leaf);
+ void pack_inner(const BVHStackEntry &e, const BVHStackEntry *en, int num);
- void pack_aligned_inner(const BVHStackEntry& e,
- const BVHStackEntry *en,
- int num);
- void pack_aligned_node(int idx,
- const BoundBox *bounds,
- const int *child,
- const uint visibility,
- const float time_from,
- const float time_to,
- const int num);
+ void pack_aligned_inner(const BVHStackEntry &e, const BVHStackEntry *en, int num);
+ void pack_aligned_node(int idx,
+ const BoundBox *bounds,
+ const int *child,
+ const uint visibility,
+ const float time_from,
+ const float time_to,
+ const int num);
- void pack_unaligned_inner(const BVHStackEntry& e,
- const BVHStackEntry *en,
- int num);
- void pack_unaligned_node(int idx,
- const Transform *aligned_space,
- const BoundBox *bounds,
- const int *child,
- const uint visibility,
- const float time_from,
- const float time_to,
- const int num);
+ void pack_unaligned_inner(const BVHStackEntry &e, const BVHStackEntry *en, int num);
+ void pack_unaligned_node(int idx,
+ const Transform *aligned_space,
+ const BoundBox *bounds,
+ const int *child,
+ const uint visibility,
+ const float time_from,
+ const float time_to,
+ const int num);
- /* refit */
- void refit_nodes() override;
- void refit_node(int idx, bool leaf, BoundBox& bbox, uint& visibility);
+ /* refit */
+ void refit_nodes() override;
+ void refit_node(int idx, bool leaf, BoundBox &bbox, uint &visibility);
};
CCL_NAMESPACE_END
-#endif /* __BVH4_H__ */
+#endif /* __BVH4_H__ */