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_embree.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_embree.h')
-rw-r--r-- | intern/cycles/bvh/bvh_embree.h | 103 |
1 files changed, 53 insertions, 50 deletions
diff --git a/intern/cycles/bvh/bvh_embree.h b/intern/cycles/bvh/bvh_embree.h index 983b6dc07da..60702713583 100644 --- a/intern/cycles/bvh/bvh_embree.h +++ b/intern/cycles/bvh/bvh_embree.h @@ -19,65 +19,68 @@ #ifdef WITH_EMBREE -#include <embree3/rtcore.h> -#include <embree3/rtcore_scene.h> +# include <embree3/rtcore.h> +# include <embree3/rtcore_scene.h> -#include "bvh/bvh.h" -#include "bvh/bvh_params.h" +# include "bvh/bvh.h" +# include "bvh/bvh_params.h" -#include "util/util_thread.h" -#include "util/util_types.h" -#include "util/util_vector.h" +# include "util/util_thread.h" +# include "util/util_types.h" +# include "util/util_vector.h" CCL_NAMESPACE_BEGIN class Mesh; -class BVHEmbree : public BVH -{ -public: - virtual void build(Progress& progress, Stats *stats) override; - virtual ~BVHEmbree(); - RTCScene scene; - static void destroy(RTCScene); - - /* Building process. */ - virtual BVHNode *widen_children_nodes(const BVHNode *root) override; - -protected: - friend class BVH; - BVHEmbree(const BVHParams& params, const vector<Object*>& objects); - - virtual void pack_nodes(const BVHNode*) override; - virtual void refit_nodes() override; - - void add_object(Object *ob, int i); - void add_instance(Object *ob, int i); - void add_curves(Object *ob, int i); - void add_triangles(Object *ob, int i); - - ssize_t mem_used; - - void add_delayed_delete_scene(RTCScene scene) { delayed_delete_scenes.push_back(scene); } - BVHEmbree *top_level; -private: - void delete_rtcScene(); - void update_tri_vertex_buffer(RTCGeometry geom_id, const Mesh* mesh); - void update_curve_vertex_buffer(RTCGeometry geom_id, const Mesh* mesh); - - static RTCDevice rtc_shared_device; - static int rtc_shared_users; - static thread_mutex rtc_shared_mutex; - - Stats *stats; - vector<RTCScene> delayed_delete_scenes; - int curve_subdivisions; - enum RTCBuildQuality build_quality; - bool use_curves, use_ribbons, dynamic_scene; +class BVHEmbree : public BVH { + public: + virtual void build(Progress &progress, Stats *stats) override; + virtual ~BVHEmbree(); + RTCScene scene; + static void destroy(RTCScene); + + /* Building process. */ + virtual BVHNode *widen_children_nodes(const BVHNode *root) override; + + protected: + friend class BVH; + BVHEmbree(const BVHParams ¶ms, const vector<Object *> &objects); + + virtual void pack_nodes(const BVHNode *) override; + virtual void refit_nodes() override; + + void add_object(Object *ob, int i); + void add_instance(Object *ob, int i); + void add_curves(Object *ob, int i); + void add_triangles(Object *ob, int i); + + ssize_t mem_used; + + void add_delayed_delete_scene(RTCScene scene) + { + delayed_delete_scenes.push_back(scene); + } + BVHEmbree *top_level; + + private: + void delete_rtcScene(); + void update_tri_vertex_buffer(RTCGeometry geom_id, const Mesh *mesh); + void update_curve_vertex_buffer(RTCGeometry geom_id, const Mesh *mesh); + + static RTCDevice rtc_shared_device; + static int rtc_shared_users; + static thread_mutex rtc_shared_mutex; + + Stats *stats; + vector<RTCScene> delayed_delete_scenes; + int curve_subdivisions; + enum RTCBuildQuality build_quality; + bool use_curves, use_ribbons, dynamic_scene; }; CCL_NAMESPACE_END -#endif /* WITH_EMBREE */ +#endif /* WITH_EMBREE */ -#endif /* __BVH_EMBREE_H__ */ +#endif /* __BVH_EMBREE_H__ */ |