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/render/object.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/render/object.h')
-rw-r--r-- | intern/cycles/render/object.h | 182 |
1 files changed, 89 insertions, 93 deletions
diff --git a/intern/cycles/render/object.h b/intern/cycles/render/object.h index 134f0bc3577..2fd43900da1 100644 --- a/intern/cycles/render/object.h +++ b/intern/cycles/render/object.h @@ -43,105 +43,101 @@ class ObjectManager; /* Object */ class Object : public Node { -public: - NODE_DECLARE - - Mesh *mesh; - Transform tfm; - BoundBox bounds; - uint random_id; - int pass_id; - ustring asset_name; - vector<ParamValue> attributes; - uint visibility; - array<Transform> motion; - bool hide_on_missing_motion; - bool use_holdout; - bool is_shadow_catcher; - - float3 dupli_generated; - float2 dupli_uv; - - ParticleSystem *particle_system; - int particle_index; - - Object(); - ~Object(); - - void tag_update(Scene *scene); - - void compute_bounds(bool motion_blur); - void apply_transform(bool apply_to_motion); - - /* Convert between normalized -1..1 motion time and index - * in the motion array. */ - bool use_motion() const; - float motion_time(int step) const; - int motion_step(float time) const; - void update_motion(); - - /* Check whether object is traceable and it worth adding it to - * kernel scene. - */ - bool is_traceable() const; - - /* Combine object's visibility with all possible internal run-time - * determined flags which denotes trace-time visibility. - */ - uint visibility_for_tracing() const; - - /* Returns the index that is used in the kernel for this object. */ - int get_device_index() const; - -protected: - /* Specifies the position of the object in scene->objects and - * in the device vectors. Gets set in device_update. */ - int index; - - friend class ObjectManager; + public: + NODE_DECLARE + + Mesh *mesh; + Transform tfm; + BoundBox bounds; + uint random_id; + int pass_id; + ustring asset_name; + vector<ParamValue> attributes; + uint visibility; + array<Transform> motion; + bool hide_on_missing_motion; + bool use_holdout; + bool is_shadow_catcher; + + float3 dupli_generated; + float2 dupli_uv; + + ParticleSystem *particle_system; + int particle_index; + + Object(); + ~Object(); + + void tag_update(Scene *scene); + + void compute_bounds(bool motion_blur); + void apply_transform(bool apply_to_motion); + + /* Convert between normalized -1..1 motion time and index + * in the motion array. */ + bool use_motion() const; + float motion_time(int step) const; + int motion_step(float time) const; + void update_motion(); + + /* Check whether object is traceable and it worth adding it to + * kernel scene. + */ + bool is_traceable() const; + + /* Combine object's visibility with all possible internal run-time + * determined flags which denotes trace-time visibility. + */ + uint visibility_for_tracing() const; + + /* Returns the index that is used in the kernel for this object. */ + int get_device_index() const; + + protected: + /* Specifies the position of the object in scene->objects and + * in the device vectors. Gets set in device_update. */ + int index; + + friend class ObjectManager; }; /* Object Manager */ class ObjectManager { -public: - bool need_update; - bool need_flags_update; - - ObjectManager(); - ~ObjectManager(); - - void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress); - void device_update_transforms(DeviceScene *dscene, - Scene *scene, - Progress& progress); - - void device_update_flags(Device *device, - DeviceScene *dscene, - Scene *scene, - Progress& progress, - bool bounds_valid = true); - void device_update_mesh_offsets(Device *device, DeviceScene *dscene, Scene *scene); - - void device_free(Device *device, DeviceScene *dscene); - - void tag_update(Scene *scene); - - void apply_static_transforms(DeviceScene *dscene, Scene *scene, Progress& progress); - - string get_cryptomatte_objects(Scene *scene); - string get_cryptomatte_assets(Scene *scene); - -protected: - void device_update_object_transform(UpdateObjectTransformState *state, - Object *ob); - void device_update_object_transform_task(UpdateObjectTransformState *state); - bool device_update_object_transform_pop_work( - UpdateObjectTransformState *state, - int *start_index, - int *num_objects); + public: + bool need_update; + bool need_flags_update; + + ObjectManager(); + ~ObjectManager(); + + void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress &progress); + void device_update_transforms(DeviceScene *dscene, Scene *scene, Progress &progress); + + void device_update_flags(Device *device, + DeviceScene *dscene, + Scene *scene, + Progress &progress, + bool bounds_valid = true); + void device_update_mesh_offsets(Device *device, DeviceScene *dscene, Scene *scene); + + void device_free(Device *device, DeviceScene *dscene); + + void tag_update(Scene *scene); + + void apply_static_transforms(DeviceScene *dscene, Scene *scene, Progress &progress); + + string get_cryptomatte_objects(Scene *scene); + string get_cryptomatte_assets(Scene *scene); + + protected: + void device_update_object_transform(UpdateObjectTransformState *state, Object *ob); + void device_update_object_transform_task(UpdateObjectTransformState *state); + bool device_update_object_transform_pop_work(UpdateObjectTransformState *state, + int *start_index, + int *num_objects); }; CCL_NAMESPACE_END -#endif /* __OBJECT_H__ */ +#endif /* __OBJECT_H__ */ |