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/particles.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/particles.h')
-rw-r--r-- | intern/cycles/render/particles.h | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/intern/cycles/render/particles.h b/intern/cycles/render/particles.h index 27821907af0..65663c31c37 100644 --- a/intern/cycles/render/particles.h +++ b/intern/cycles/render/particles.h @@ -30,42 +30,45 @@ class Scene; /* Particle System */ struct Particle { - int index; - float age; - float lifetime; - float3 location; - float4 rotation; - float size; - float3 velocity; - float3 angular_velocity; + int index; + float age; + float lifetime; + float3 location; + float4 rotation; + float size; + float3 velocity; + float3 angular_velocity; }; class ParticleSystem { -public: - ParticleSystem(); - ~ParticleSystem(); + public: + ParticleSystem(); + ~ParticleSystem(); - void tag_update(Scene *scene); + void tag_update(Scene *scene); - array<Particle> particles; + array<Particle> particles; }; /* ParticleSystem Manager */ class ParticleSystemManager { -public: - bool need_update; + public: + bool need_update; - ParticleSystemManager(); - ~ParticleSystemManager(); + ParticleSystemManager(); + ~ParticleSystemManager(); - void device_update_particles(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress); - void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress); - void device_free(Device *device, DeviceScene *dscene); + void device_update_particles(Device *device, + DeviceScene *dscene, + Scene *scene, + Progress &progress); + void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress &progress); + void device_free(Device *device, DeviceScene *dscene); - void tag_update(Scene *scene); + void tag_update(Scene *scene); }; CCL_NAMESPACE_END -#endif /* __PARTICLES_H__ */ +#endif /* __PARTICLES_H__ */ |