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 /source/blender/compositor/operations/COM_ZCombineOperation.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 'source/blender/compositor/operations/COM_ZCombineOperation.h')
-rw-r--r-- | source/blender/compositor/operations/COM_ZCombineOperation.h | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.h b/source/blender/compositor/operations/COM_ZCombineOperation.h index 9f9ecfa57e9..9a93d080a2f 100644 --- a/source/blender/compositor/operations/COM_ZCombineOperation.h +++ b/source/blender/compositor/operations/COM_ZCombineOperation.h @@ -20,50 +20,51 @@ #define __COM_ZCOMBINEOPERATION_H__ #include "COM_MixOperation.h" - /** * this program converts an input color to an output value. * it assumes we are in sRGB color space. */ class ZCombineOperation : public NodeOperation { -protected: - SocketReader *m_image1Reader; - SocketReader *m_depth1Reader; - SocketReader *m_image2Reader; - SocketReader *m_depth2Reader; -public: - /** - * Default constructor - */ - ZCombineOperation(); + protected: + SocketReader *m_image1Reader; + SocketReader *m_depth1Reader; + SocketReader *m_image2Reader; + SocketReader *m_depth2Reader; + + public: + /** + * Default constructor + */ + ZCombineOperation(); - void initExecution(); - void deinitExecution(); + void initExecution(); + void deinitExecution(); - /** - * the inner loop of this program - */ - void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); + /** + * the inner loop of this program + */ + void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; class ZCombineAlphaOperation : public ZCombineOperation { - void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); + void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; class ZCombineMaskOperation : public NodeOperation { -protected: - SocketReader *m_maskReader; - SocketReader *m_image1Reader; - SocketReader *m_image2Reader; -public: - ZCombineMaskOperation(); + protected: + SocketReader *m_maskReader; + SocketReader *m_image1Reader; + SocketReader *m_image2Reader; + + public: + ZCombineMaskOperation(); - void initExecution(); - void deinitExecution(); - void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); + void initExecution(); + void deinitExecution(); + void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; class ZCombineMaskAlphaOperation : public ZCombineMaskOperation { - void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); + void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; #endif |