diff options
Diffstat (limited to 'source/blender/compositor/operations')
123 files changed, 1364 insertions, 1374 deletions
diff --git a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h index d3077a05706..e5b1f56f06c 100644 --- a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h +++ b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h @@ -26,19 +26,19 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class AlphaOverKeyOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ AlphaOverKeyOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h index 92936a20b79..2807b3b489a 100644 --- a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h +++ b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h @@ -26,23 +26,23 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class AlphaOverMixedOperation : public MixBaseOperation { private: float x; public: /** - * Default constructor - */ + * Default constructor + */ AlphaOverMixedOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); - void setX(float x) {this->x = x;} + void setX(float x) { this->x = x; } }; #endif diff --git a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h index 2fe4422d03e..bba3b714f6b 100644 --- a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h +++ b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class AlphaOverPremultiplyOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ AlphaOverPremultiplyOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_AntiAliasOperation.h b/source/blender/compositor/operations/COM_AntiAliasOperation.h index fe160763828..906da598da1 100644 --- a/source/blender/compositor/operations/COM_AntiAliasOperation.h +++ b/source/blender/compositor/operations/COM_AntiAliasOperation.h @@ -26,35 +26,35 @@ #include "DNA_node_types.h" /** - * @brief AntiAlias operations - * it only supports anti aliasing on BW buffers. - * @ingroup operation - */ + * @brief AntiAlias operations + * it only supports anti aliasing on BW buffers. + * @ingroup operation + */ class AntiAliasOperation : public NodeOperation { protected: /** - * @brief Cached reference to the reader - */ - SocketReader * valueReader; + * @brief Cached reference to the reader + */ + SocketReader *valueReader; char *buffer; public: AntiAliasOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); }; diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.h b/source/blender/compositor/operations/COM_BilateralBlurOperation.h index 8ec1ba8df99..08b379dc4ea 100644 --- a/source/blender/compositor/operations/COM_BilateralBlurOperation.h +++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.h @@ -36,22 +36,22 @@ public: BilateralBlurOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void setData(NodeBilateralBlurData *data) {this->data = data;} + void setData(NodeBilateralBlurData *data) { this->data = data; } }; #endif diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.h b/source/blender/compositor/operations/COM_BlurBaseOperation.h index 24002588413..84fc243a5af 100644 --- a/source/blender/compositor/operations/COM_BlurBaseOperation.h +++ b/source/blender/compositor/operations/COM_BlurBaseOperation.h @@ -30,11 +30,11 @@ private: protected: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ SocketReader *inputProgram; SocketReader *inputSize; - NodeBlurData * data; + NodeBlurData *data; BlurBaseOperation(); float *make_gausstab(int rad); float size; @@ -43,19 +43,19 @@ protected: void updateSize(MemoryBuffer **memoryBuffers); public: /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeBlurData *data) {this->data = data;} - - void deleteDataWhenFinished() {this->deleteData = true;} + void setData(NodeBlurData *data) { this->data = data; } + + void deleteDataWhenFinished() { this->deleteData = true; } - void setSize(float size) {this->size = size; sizeavailable = true;} + void setSize(float size) { this->size = size; sizeavailable = true; } }; #endif diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.h b/source/blender/compositor/operations/COM_BokehBlurOperation.h index 3cdd995b1df..3ec61c5ce01 100644 --- a/source/blender/compositor/operations/COM_BokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_BokehBlurOperation.h @@ -39,23 +39,23 @@ public: void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void setSize(float size) {this->size = size;} + void setSize(float size) { this->size = size; } void executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp); }; diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.h b/source/blender/compositor/operations/COM_BokehImageOperation.h index 516cc1da4f0..8edd32a4f77 100644 --- a/source/blender/compositor/operations/COM_BokehImageOperation.h +++ b/source/blender/compositor/operations/COM_BokehImageOperation.h @@ -45,23 +45,23 @@ public: BokehImageOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - void setData(NodeBokehImage *data) {this->data = data;} - void deleteDataOnFinish() {this->deleteData = true;} + void setData(NodeBokehImage *data) { this->data = data; } + void deleteDataOnFinish() { this->deleteData = true; } }; #endif diff --git a/source/blender/compositor/operations/COM_BoxMaskOperation.h b/source/blender/compositor/operations/COM_BoxMaskOperation.h index c3af95578d4..65327abc9a6 100644 --- a/source/blender/compositor/operations/COM_BoxMaskOperation.h +++ b/source/blender/compositor/operations/COM_BoxMaskOperation.h @@ -28,10 +28,10 @@ class BoxMaskOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputMask; - SocketReader * inputValue; + * Cached reference to the inputProgram + */ + SocketReader *inputMask; + SocketReader *inputValue; float sine; float cosine; @@ -43,23 +43,23 @@ public: BoxMaskOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeBoxMask *data) {this->data = data;} - - void setMaskType(int maskType) {this->maskType = maskType;} + void setData(NodeBoxMask *data) { this->data = data; } + + void setMaskType(int maskType) { this->maskType = maskType; } }; #endif diff --git a/source/blender/compositor/operations/COM_BrightnessOperation.h b/source/blender/compositor/operations/COM_BrightnessOperation.h index 0c718a8b131..74c648fd8fb 100644 --- a/source/blender/compositor/operations/COM_BrightnessOperation.h +++ b/source/blender/compositor/operations/COM_BrightnessOperation.h @@ -28,8 +28,8 @@ class BrightnessOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ SocketReader *inputProgram; SocketReader *inputBrightnessProgram; SocketReader *inputContrastProgram; @@ -38,18 +38,18 @@ public: BrightnessOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.h b/source/blender/compositor/operations/COM_CalculateMeanOperation.h index b21743aa8bc..7a28eb3774a 100644 --- a/source/blender/compositor/operations/COM_CalculateMeanOperation.h +++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.h @@ -26,15 +26,15 @@ #include "DNA_node_types.h" /** - * @brief base class of CalculateMean, implementing the simple CalculateMean - * @ingroup operation - */ + * @brief base class of CalculateMean, implementing the simple CalculateMean + * @ingroup operation + */ class CalculateMeanOperation : public NodeOperation { protected: /** - * @brief Cached reference to the reader - */ - SocketReader * imageReader; + * @brief Cached reference to the reader + */ + SocketReader *imageReader; bool iscalculated; float result; @@ -44,24 +44,24 @@ public: CalculateMeanOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void setSetting(int setting) {this->setting = setting;} + void setSetting(int setting) { this->setting = setting; } protected: void calculateMean(MemoryBuffer *tile); diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h index 05c94401c86..d3163d4cc32 100644 --- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h +++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h @@ -26,9 +26,9 @@ #include "DNA_node_types.h" #include "COM_CalculateMeanOperation.h" /** - * @brief base class of CalculateStandardDeviation, implementing the simple CalculateStandardDeviation - * @ingroup operation - */ + * @brief base class of CalculateStandardDeviation, implementing the simple CalculateStandardDeviation + * @ingroup operation + */ class CalculateStandardDeviationOperation : public CalculateMeanOperation { protected: float standardDeviation; @@ -37,9 +37,9 @@ public: CalculateStandardDeviationOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); diff --git a/source/blender/compositor/operations/COM_ChangeHSVOperation.h b/source/blender/compositor/operations/COM_ChangeHSVOperation.h index a89487f9d7b..a2a6c034a82 100644 --- a/source/blender/compositor/operations/COM_ChangeHSVOperation.h +++ b/source/blender/compositor/operations/COM_ChangeHSVOperation.h @@ -26,12 +26,12 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ChangeHSVOperation : public NodeOperation { private: - SocketReader * inputOperation; + SocketReader *inputOperation; float hue; float saturation; @@ -39,21 +39,21 @@ private: public: /** - * Default constructor - */ + * Default constructor + */ ChangeHSVOperation(); void initExecution(); void deinitExecution(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); - - void setHue(float hue) {this->hue = hue;} - void setSaturation(float saturation) {this->saturation = saturation;} - void setValue(float value) {this->value = value;} + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); + + void setHue(float hue) { this->hue = hue; } + void setSaturation(float saturation) { this->saturation = saturation; } + void setValue(float value) { this->value = value; } }; #endif diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.h b/source/blender/compositor/operations/COM_ChannelMatteOperation.h index a4b5f454f92..17db0f9ffe2 100644 --- a/source/blender/compositor/operations/COM_ChannelMatteOperation.h +++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.h @@ -25,9 +25,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ChannelMatteOperation : public NodeOperation { private: SocketReader *inputImageProgram; @@ -42,24 +42,24 @@ private: float limit_range; /** ids to use for the operations (max and simple) - * alpha = in[ids[0]] - max(in[ids[1]], in[ids[2]]) - * the simple operation is using: - * alpha = in[ids[0]] - in[ids[1]] - * but to use the same formula and operation for both we do: - * ids[2] = ids[1] - * alpha = in[ids[0]] - max(in[ids[1]], in[ids[2]]) - */ + * alpha = in[ids[0]] - max(in[ids[1]], in[ids[2]]) + * the simple operation is using: + * alpha = in[ids[0]] - in[ids[1]] + * but to use the same formula and operation for both we do: + * ids[2] = ids[1] + * alpha = in[ids[0]] - max(in[ids[1]], in[ids[2]]) + */ int ids[3]; public: /** - * Default constructor - */ + * Default constructor + */ ChannelMatteOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_ChromaMatteOperation.h b/source/blender/compositor/operations/COM_ChromaMatteOperation.h index 9c5a5ff997b..a09203f29b3 100644 --- a/source/blender/compositor/operations/COM_ChromaMatteOperation.h +++ b/source/blender/compositor/operations/COM_ChromaMatteOperation.h @@ -25,9 +25,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ChromaMatteOperation : public NodeOperation { private: NodeChroma *settings; @@ -35,18 +35,18 @@ private: SocketReader *inputKeyProgram; public: /** - * Default constructor - */ + * Default constructor + */ ChromaMatteOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;} + void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; } }; #endif diff --git a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h index fb973e75c15..9e7db59d99d 100644 --- a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h +++ b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h @@ -24,18 +24,17 @@ #define _COM_ColorBalanceASCCDLOperation_h #include "COM_NodeOperation.h" - /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ColorBalanceASCCDLOperation : public NodeOperation { protected: /** - * Prefetched reference to the inputProgram - */ - SocketReader * inputValueOperation; - SocketReader * inputColorOperation; + * Prefetched reference to the inputProgram + */ + SocketReader *inputValueOperation; + SocketReader *inputColorOperation; float gain[3]; float lift[3]; @@ -43,39 +42,27 @@ protected: public: /** - * Default constructor - */ + * Default constructor + */ ColorBalanceASCCDLOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setGain(float gain[3]) { - this->gain[0] = gain[0]; - this->gain[1] = gain[1]; - this->gain[2] = gain[2]; - } - void setLift(float lift[3]) { - this->lift[0] = lift[0]; - this->lift[1] = lift[1]; - this->lift[2] = lift[2]; - } - void setGamma(float gamma[3]) { - this->gamma[0] = gamma[0]; - this->gamma[1] = gamma[1]; - this->gamma[2] = gamma[2]; - } + void setGain(float gain[3]) { copy_v3_v3(this->gain, gain); } + void setLift(float lift[3]) { copy_v3_v3(this->lift, lift); } + void setGamma(float gamma[3]) { copy_v3_v3(this->gamma, gamma); } }; #endif diff --git a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h index e0df76cf2c5..54cfb49327f 100644 --- a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h +++ b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h @@ -26,16 +26,16 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ColorBalanceLGGOperation : public NodeOperation { protected: /** - * Prefetched reference to the inputProgram - */ - SocketReader * inputValueOperation; - SocketReader * inputColorOperation; + * Prefetched reference to the inputProgram + */ + SocketReader *inputValueOperation; + SocketReader *inputColorOperation; float gain[3]; float lift[3]; @@ -43,23 +43,23 @@ protected: public: /** - * Default constructor - */ + * Default constructor + */ ColorBalanceLGGOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); void setGain(float gain[3]) { diff --git a/source/blender/compositor/operations/COM_ColorCorrectionOperation.h b/source/blender/compositor/operations/COM_ColorCorrectionOperation.h index 89107150ebd..c0c33f7f2fa 100644 --- a/source/blender/compositor/operations/COM_ColorCorrectionOperation.h +++ b/source/blender/compositor/operations/COM_ColorCorrectionOperation.h @@ -28,8 +28,8 @@ class ColorCorrectionOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ SocketReader *inputImage; SocketReader *inputMask; NodeColorCorrection *data; @@ -42,23 +42,23 @@ public: ColorCorrectionOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeColorCorrection * data) {this->data = data;} - void setRedChannelEnabled(bool enabled) {this->redChannelEnabled = enabled;} - void setGreenChannelEnabled(bool enabled) {this->greenChannelEnabled = enabled;} - void setBlueChannelEnabled(bool enabled) {this->blueChannelEnabled = enabled;} + void setData(NodeColorCorrection *data) { this->data = data; } + void setRedChannelEnabled(bool enabled) { this->redChannelEnabled = enabled; } + void setGreenChannelEnabled(bool enabled) { this->greenChannelEnabled = enabled; } + void setBlueChannelEnabled(bool enabled) { this->blueChannelEnabled = enabled; } }; #endif diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.h b/source/blender/compositor/operations/COM_ColorCurveOperation.h index 6ce5befb14a..fcd78be8372 100644 --- a/source/blender/compositor/operations/COM_ColorCurveOperation.h +++ b/source/blender/compositor/operations/COM_ColorCurveOperation.h @@ -29,38 +29,38 @@ class ColorCurveOperation : public CurveBaseOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputFacProgram; - SocketReader * inputImageProgram; - SocketReader * inputBlackProgram; - SocketReader * inputWhiteProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputFacProgram; + SocketReader *inputImageProgram; + SocketReader *inputBlackProgram; + SocketReader *inputWhiteProgram; public: ColorCurveOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; class ConstantLevelColorCurveOperation : public CurveBaseOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputFacProgram; - SocketReader * inputImageProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputFacProgram; + SocketReader *inputImageProgram; float black[3]; float white[3]; @@ -68,22 +68,22 @@ public: ConstantLevelColorCurveOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setBlackLevel(float black[3]) {this->black[0] =black[0];this->black[1] =black[1];this->black[2] =black[2]; } - void setWhiteLevel(float white[3]) {this->white[0] =white[0];this->white[1] =white[1];this->white[2] =white[2]; } + void setBlackLevel(float black[3]) { this->black[0] = black[0]; this->black[1] = black[1]; this->black[2] = black[2]; } + void setWhiteLevel(float white[3]) { this->white[0] = white[0]; this->white[1] = white[1]; this->white[2] = white[2]; } }; #endif diff --git a/source/blender/compositor/operations/COM_ColorMatteOperation.h b/source/blender/compositor/operations/COM_ColorMatteOperation.h index 904a51128c8..e5dd9efd820 100644 --- a/source/blender/compositor/operations/COM_ColorMatteOperation.h +++ b/source/blender/compositor/operations/COM_ColorMatteOperation.h @@ -25,9 +25,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ColorMatteOperation : public NodeOperation { private: NodeChroma *settings; @@ -35,18 +35,18 @@ private: SocketReader *inputKeyProgram; public: /** - * Default constructor - */ + * Default constructor + */ ColorMatteOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;} + void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; } }; #endif diff --git a/source/blender/compositor/operations/COM_ColorRampOperation.h b/source/blender/compositor/operations/COM_ColorRampOperation.h index 8b8635cc5cd..eef5321eb19 100644 --- a/source/blender/compositor/operations/COM_ColorRampOperation.h +++ b/source/blender/compositor/operations/COM_ColorRampOperation.h @@ -28,29 +28,31 @@ class ColorRampOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; ColorBand *colorBand; public: ColorRampOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setColorBand(ColorBand *colorBand) {this->colorBand = colorBand;} + void setColorBand(ColorBand *colorBand) { + this->colorBand = colorBand; + } }; diff --git a/source/blender/compositor/operations/COM_ColorSpillOperation.h b/source/blender/compositor/operations/COM_ColorSpillOperation.h index 69f51882496..e890a1e1564 100644 --- a/source/blender/compositor/operations/COM_ColorSpillOperation.h +++ b/source/blender/compositor/operations/COM_ColorSpillOperation.h @@ -25,9 +25,9 @@ #include "COM_NodeOperation.h" /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ColorSpillOperation : public NodeOperation { protected: NodeColorspill *settings; @@ -39,25 +39,25 @@ protected: float rmut, gmut, bmut; public: /** - * Default constructor - */ + * Default constructor + */ ColorSpillOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setSettings(NodeColorspill *nodeColorSpill) {this->settings = nodeColorSpill;} - void setSpillChannel(int channel) {this->spillChannel = channel;} + void setSettings(NodeColorspill *nodeColorSpill) { this->settings = nodeColorSpill; } + void setSpillChannel(int channel) { this->spillChannel = channel; } float calculateMapValue(float fac, float *input); }; -class ColorSpillAverageOperation: public ColorSpillOperation { +class ColorSpillAverageOperation : public ColorSpillOperation { public: float calculateMapValue(float fac, float *input); }; diff --git a/source/blender/compositor/operations/COM_CombineChannelsOperation.h b/source/blender/compositor/operations/COM_CombineChannelsOperation.h index 18dd1fd2ec9..d2977155e14 100644 --- a/source/blender/compositor/operations/COM_CombineChannelsOperation.h +++ b/source/blender/compositor/operations/COM_CombineChannelsOperation.h @@ -25,7 +25,7 @@ #include "COM_NodeOperation.h" -class CombineChannelsOperation: public NodeOperation { +class CombineChannelsOperation : public NodeOperation { private: SocketReader *inputChannel1Operation; SocketReader *inputChannel2Operation; @@ -33,7 +33,7 @@ private: SocketReader *inputChannel4Operation; public: CombineChannelsOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h index 1868de6d815..b11a06f7749 100644 --- a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h +++ b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h @@ -26,53 +26,53 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertColorProfileOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; /** - * @brief color profile where to convert from - */ + * @brief color profile where to convert from + */ int fromProfile; /** - * @brief color profile where to convert to - */ + * @brief color profile where to convert to + */ int toProfile; /** - * @brief is color predivided - */ + * @brief is color predivided + */ bool predivided; public: /** - * Default constructor - */ + * Default constructor + */ ConvertColorProfileOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setFromColorProfile(int colorProfile) {this->fromProfile = colorProfile;} - void setToColorProfile(int colorProfile) {this->toProfile = colorProfile;} - void setPredivided(bool predivided) {this->predivided = predivided;} + void setFromColorProfile(int colorProfile) { this->fromProfile = colorProfile; } + void setToColorProfile(int colorProfile) { this->toProfile = colorProfile; } + void setPredivided(bool predivided) { this->predivided = predivided; } }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h b/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h index 616cf0f2d01..814c0c2e808 100644 --- a/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h +++ b/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertColorToBWOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertColorToBWOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h b/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h index 11a1bf30a07..1167b565a8e 100644 --- a/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h +++ b/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertColorToVectorOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertColorToVectorOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertColourToValueProg.h b/source/blender/compositor/operations/COM_ConvertColourToValueProg.h index 7aa07dd46f2..9c43ec47604 100644 --- a/source/blender/compositor/operations/COM_ConvertColourToValueProg.h +++ b/source/blender/compositor/operations/COM_ConvertColourToValueProg.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertColourToValueProg : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertColourToValueProg(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h index c199ea87fe3..c6da6bc94a9 100644 --- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h +++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h @@ -26,15 +26,15 @@ #include "DNA_object_types.h" /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertDepthToRadiusOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; float fStop; float aspect; float maxRadius; @@ -45,28 +45,28 @@ private: Object *cameraObject; public: /** - * Default constructor - */ + * Default constructor + */ ConvertDepthToRadiusOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setfStop(float fStop) {this->fStop = fStop;} - void setMaxRadius(float maxRadius) {this->maxRadius = maxRadius;} - void setCameraObject(Object *camera) {this->cameraObject = camera;} + void setfStop(float fStop) { this->fStop = fStop; } + void setMaxRadius(float maxRadius) { this->maxRadius = maxRadius; } + void setCameraObject(Object *camera) { this->cameraObject = camera; } float determineFocalDistance(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h b/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h index 327b4089934..29c82361d12 100644 --- a/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h +++ b/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertHSVToRGBOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertHSVToRGBOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h b/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h index 1d5a1c1c4a6..fe0586f7a88 100644 --- a/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h +++ b/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h @@ -25,22 +25,22 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertKeyToPremulOperation : public NodeOperation { private: SocketReader *inputColor; public: /** - * Default constructor - */ + * Default constructor + */ ConvertKeyToPremulOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h b/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h index 17597fa8f15..093f28df3e5 100644 --- a/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h +++ b/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h @@ -25,22 +25,22 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertPremulToKeyOperation : public NodeOperation { private: SocketReader *inputColor; public: /** - * Default constructor - */ + * Default constructor + */ ConvertPremulToKeyOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h b/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h index 5064bd06993..61270539e70 100644 --- a/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h +++ b/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertRGBToHSVOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertRGBToHSVOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h b/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h index a952627893b..33075cda509 100644 --- a/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h +++ b/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h @@ -25,44 +25,44 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertRGBToYCCOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; /** - * YCbCr mode (Jpeg, ITU601, ITU709) - */ + * YCbCr mode (Jpeg, ITU601, ITU709) + */ int mode; public: /** - * Default constructor - */ + * Default constructor + */ ConvertRGBToYCCOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); /** - * Set the YCC mode - */ + * Set the YCC mode + */ void setMode(int mode); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h b/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h index 5bc763dde00..4fc525456f8 100644 --- a/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h +++ b/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h @@ -25,34 +25,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertRGBToYUVOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertRGBToYUVOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_ConvertValueToColourProg.h b/source/blender/compositor/operations/COM_ConvertValueToColourProg.h index 4956f7196f5..ff1d1aaeae7 100644 --- a/source/blender/compositor/operations/COM_ConvertValueToColourProg.h +++ b/source/blender/compositor/operations/COM_ConvertValueToColourProg.h @@ -28,25 +28,25 @@ class ConvertValueToColourProg : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ SocketReader *inputProgram; public: ConvertValueToColourProg(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h b/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h index 1e6a7d4b3e7..fbb294d6a26 100644 --- a/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h +++ b/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertValueToVectorOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertValueToVectorOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h b/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h index 45ffd0675bd..c26adc5a6b1 100644 --- a/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h +++ b/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertVectorToColorOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertVectorToColorOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h b/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h index 59bae18ed26..dd29d1bb9a9 100644 --- a/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h +++ b/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertVectorToValueOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertVectorToValueOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h b/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h index a13c2826a79..d7ddd910ed7 100644 --- a/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h +++ b/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h @@ -25,44 +25,44 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertYCCToRGBOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; /** - * YCbCr mode (Jpeg, ITU601, ITU709) - */ + * YCbCr mode (Jpeg, ITU601, ITU709) + */ int mode; public: /** - * Default constructor - */ + * Default constructor + */ ConvertYCCToRGBOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); /** - * Set the YCC mode - */ + * Set the YCC mode + */ void setMode(int mode); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h b/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h index 380510d0100..f77954606cf 100644 --- a/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h +++ b/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h @@ -25,34 +25,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertYUVToRGBOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertYUVToRGBOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h index a0f9c1b3452..92e45c7104f 100644 --- a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h +++ b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h @@ -25,10 +25,10 @@ #include "COM_ConvolutionFilterOperation.h" -class ConvolutionEdgeFilterOperation: public ConvolutionFilterOperation { +class ConvolutionEdgeFilterOperation : public ConvolutionFilterOperation { public: ConvolutionEdgeFilterOperation(); - void executePixel(float *color,int x, int y, MemoryBuffer *inputBuffers[], void *data); + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h index 3276038726b..f3347eb583a 100644 --- a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h +++ b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h @@ -25,7 +25,7 @@ #include "COM_NodeOperation.h" -class ConvolutionFilterOperation: public NodeOperation { +class ConvolutionFilterOperation : public NodeOperation { private: int filterWidth; int filterHeight; @@ -39,7 +39,7 @@ public: ConvolutionFilterOperation(); void set3x3Filter(float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void executePixel(float *color,int x, int y, MemoryBuffer *inputBuffers[], void *data); + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_CropOperation.h b/source/blender/compositor/operations/COM_CropOperation.h index e8edabf08ed..48e5ab7f75b 100644 --- a/source/blender/compositor/operations/COM_CropOperation.h +++ b/source/blender/compositor/operations/COM_CropOperation.h @@ -25,7 +25,7 @@ #include "COM_NodeOperation.h" -class CropBaseOperation: public NodeOperation { +class CropBaseOperation : public NodeOperation { protected: SocketReader *inputOperation; NodeTwoXYs *settings; @@ -40,24 +40,24 @@ public: CropBaseOperation(); void initExecution(); void deinitExecution(); - void setCropSettings(NodeTwoXYs *settings) {this->settings = settings;} - void setRelative(bool rel) {this->relative = rel;} + void setCropSettings(NodeTwoXYs *settings) { this->settings = settings; } + void setRelative(bool rel) { this->relative = rel; } }; -class CropOperation: public CropBaseOperation { +class CropOperation : public CropBaseOperation { private: public: CropOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class CropImageOperation: public CropBaseOperation { +class CropImageOperation : public CropBaseOperation { private: public: CropImageOperation(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); void determineResolution(unsigned int resolution[], unsigned int preferedResolution[]); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_CurveBaseOperation.h b/source/blender/compositor/operations/COM_CurveBaseOperation.h index 366af5b07cb..9cddb3be46b 100644 --- a/source/blender/compositor/operations/COM_CurveBaseOperation.h +++ b/source/blender/compositor/operations/COM_CurveBaseOperation.h @@ -28,8 +28,8 @@ class CurveBaseOperation : public NodeOperation { protected: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ CurveMapping *curveMapping; public: CurveBaseOperation(); @@ -39,6 +39,6 @@ public: */ void initExecution(); - void setCurveMapping(CurveMapping *mapping) {this->curveMapping = mapping;} + void setCurveMapping(CurveMapping *mapping) { this->curveMapping = mapping; } }; #endif diff --git a/source/blender/compositor/operations/COM_DifferenceMatteOperation.h b/source/blender/compositor/operations/COM_DifferenceMatteOperation.h index 95ebed6f63d..3bdc3384556 100644 --- a/source/blender/compositor/operations/COM_DifferenceMatteOperation.h +++ b/source/blender/compositor/operations/COM_DifferenceMatteOperation.h @@ -26,28 +26,28 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class DifferenceMatteOperation : public NodeOperation { private: NodeChroma *settings; - SocketReader * inputImage1Program; + SocketReader *inputImage1Program; SocketReader *inputImage2Program; public: /** - * Default constructor - */ + * Default constructor + */ DifferenceMatteOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;} + void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; } }; #endif diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.h b/source/blender/compositor/operations/COM_DilateErodeOperation.h index 63cee4c333a..b11356129b4 100644 --- a/source/blender/compositor/operations/COM_DilateErodeOperation.h +++ b/source/blender/compositor/operations/COM_DilateErodeOperation.h @@ -28,41 +28,41 @@ class DilateErodeThresholdOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; float distance; float _switch; float inset; /** - * determines the area of interest to track pixels - * keep this one as small as possible for speed gain. - */ + * determines the area of interest to track pixels + * keep this one as small as possible for speed gain. + */ int scope; public: DilateErodeThresholdOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setDistance(float distance) {this->distance = distance;} - void setSwitch(float sw) {this->_switch = sw;} - void setInset(float inset) {this->inset = inset;} + void setDistance(float distance) { this->distance = distance; } + void setSwitch(float sw) { this->_switch = sw; } + void setInset(float inset) { this->inset = inset; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); @@ -72,46 +72,46 @@ class DilateDistanceOperation : public NodeOperation { private: protected: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; float distance; int scope; public: DilateDistanceOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setDistance(float distance) {this->distance = distance;} + void setDistance(float distance) { this->distance = distance; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); void executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, - MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, - list<cl_kernel> *clKernelsToCleanUp); + MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, + list<cl_kernel> *clKernelsToCleanUp); }; class ErodeDistanceOperation : public DilateDistanceOperation { public: ErodeDistanceOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); void executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, @@ -122,9 +122,9 @@ public: class DilateStepOperation : public NodeOperation { protected: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; int iterations; @@ -133,22 +133,22 @@ public: DilateStepOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setIterations(int iterations) {this->iterations = iterations;} + void setIterations(int iterations) { this->iterations = iterations; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); }; diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h index 280e9247c1b..9cc0a4361f1 100644 --- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h +++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h @@ -38,22 +38,22 @@ public: DirectionalBlurOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void setData(NodeDBlurData *data) {this->data = data;} + void setData(NodeDBlurData *data) { this->data = data; } }; #endif diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.h b/source/blender/compositor/operations/COM_DisplaceOperation.h index 9c59c928854..82788e37e3a 100644 --- a/source/blender/compositor/operations/COM_DisplaceOperation.h +++ b/source/blender/compositor/operations/COM_DisplaceOperation.h @@ -41,14 +41,14 @@ public: DisplaceOperation(); /** - * we need a 2x2 differential filter for Vector Input and full buffer for the image - */ + * we need a 2x2 differential filter for Vector Input and full buffer for the image + */ bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); /** * the inner loop of this program */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** * Initialize the execution diff --git a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h index 0e3bcc1b1f0..1ebb238855b 100644 --- a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h +++ b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h @@ -41,14 +41,14 @@ public: DisplaceSimpleOperation(); /** - * we need a full buffer for the image - */ + * we need a full buffer for the image + */ bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); /** * the inner loop of this program */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** * Initialize the execution diff --git a/source/blender/compositor/operations/COM_DistanceMatteOperation.h b/source/blender/compositor/operations/COM_DistanceMatteOperation.h index 2a668f31f8f..cf1172a8c11 100644 --- a/source/blender/compositor/operations/COM_DistanceMatteOperation.h +++ b/source/blender/compositor/operations/COM_DistanceMatteOperation.h @@ -25,9 +25,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class DistanceMatteOperation : public NodeOperation { private: NodeChroma *settings; @@ -35,18 +35,18 @@ private: SocketReader *inputKeyProgram; public: /** - * Default constructor - */ + * Default constructor + */ DistanceMatteOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;} + void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; } }; #endif diff --git a/source/blender/compositor/operations/COM_DotproductOperation.h b/source/blender/compositor/operations/COM_DotproductOperation.h index 0244fffa110..849dc83a9cd 100644 --- a/source/blender/compositor/operations/COM_DotproductOperation.h +++ b/source/blender/compositor/operations/COM_DotproductOperation.h @@ -25,13 +25,13 @@ #include "COM_NodeOperation.h" -class DotproductOperation: public NodeOperation { +class DotproductOperation : public NodeOperation { private: SocketReader *input1Operation; SocketReader *input2Operation; public: DotproductOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h index 85c4fd9e5b7..a18d59ae5a2 100644 --- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h +++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h @@ -28,10 +28,10 @@ class DoubleEdgeMaskOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOuterMask; - SocketReader * inputInnerMask; + * Cached reference to the inputProgram + */ + SocketReader *inputOuterMask; + SocketReader *inputInnerMask; bool adjecentOnly; bool keepInside; float *cachedInstance; @@ -40,25 +40,25 @@ public: void doDoubleEdgeMask(float *inner, float *outer, float *res); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void setAdjecentOnly(bool adjecentOnly) {this->adjecentOnly = adjecentOnly;} - void setKeepInside(bool keepInside) {this->keepInside = keepInside;} + void setAdjecentOnly(bool adjecentOnly) { this->adjecentOnly = adjecentOnly; } + void setKeepInside(bool keepInside) { this->keepInside = keepInside; } }; #endif diff --git a/source/blender/compositor/operations/COM_EllipseMaskOperation.h b/source/blender/compositor/operations/COM_EllipseMaskOperation.h index bff94941190..61d724c2f15 100644 --- a/source/blender/compositor/operations/COM_EllipseMaskOperation.h +++ b/source/blender/compositor/operations/COM_EllipseMaskOperation.h @@ -28,10 +28,10 @@ class EllipseMaskOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputMask; - SocketReader * inputValue; + * Cached reference to the inputProgram + */ + SocketReader *inputMask; + SocketReader *inputValue; float sine; float cosine; @@ -43,23 +43,23 @@ public: EllipseMaskOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeEllipseMask *data) {this->data = data;} - - void setMaskType(int maskType) {this->maskType = maskType;} + void setData(NodeEllipseMask *data) { this->data = data; } + + void setMaskType(int maskType) { this->maskType = maskType; } }; #endif diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h index 1f71fe7f9ed..9c8973f6a3a 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h @@ -26,11 +26,11 @@ #include "COM_BlurBaseOperation.h" #include "DNA_node_types.h" -class FastGaussianBlurOperation: public BlurBaseOperation { +class FastGaussianBlurOperation : public BlurBaseOperation { private: float sx; float sy; - MemoryBuffer* iirgaus; + MemoryBuffer *iirgaus; public: FastGaussianBlurOperation(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); diff --git a/source/blender/compositor/operations/COM_FlipOperation.h b/source/blender/compositor/operations/COM_FlipOperation.h index 9774cfd7bcd..f83fa6ac3a8 100644 --- a/source/blender/compositor/operations/COM_FlipOperation.h +++ b/source/blender/compositor/operations/COM_FlipOperation.h @@ -25,7 +25,7 @@ #include "COM_NodeOperation.h" -class FlipOperation: public NodeOperation { +class FlipOperation : public NodeOperation { private: SocketReader *inputOperation; bool flipX; @@ -33,12 +33,12 @@ private: public: FlipOperation(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setFlipX(bool flipX) {this->flipX = flipX;} - void setFlipY(bool flipY) {this->flipY = flipY;} + void setFlipX(bool flipX) { this->flipX = flipX; } + void setFlipY(bool flipY) { this->flipY = flipY; } }; #endif diff --git a/source/blender/compositor/operations/COM_FogGlowImageOperation.h b/source/blender/compositor/operations/COM_FogGlowImageOperation.h index d0fc107638e..8330115718f 100644 --- a/source/blender/compositor/operations/COM_FogGlowImageOperation.h +++ b/source/blender/compositor/operations/COM_FogGlowImageOperation.h @@ -30,9 +30,9 @@ public: FogGlowImageOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); }; diff --git a/source/blender/compositor/operations/COM_GammaCorrectOperation.h b/source/blender/compositor/operations/COM_GammaCorrectOperation.h index 6132f04edba..4bf03eac0a1 100644 --- a/source/blender/compositor/operations/COM_GammaCorrectOperation.h +++ b/source/blender/compositor/operations/COM_GammaCorrectOperation.h @@ -28,52 +28,52 @@ class GammaCorrectOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; public: GammaCorrectOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; class GammaUncorrectOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; public: GammaUncorrectOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_GammaOperation.h b/source/blender/compositor/operations/COM_GammaOperation.h index 2f3d8cdf9f7..8c007d27843 100644 --- a/source/blender/compositor/operations/COM_GammaOperation.h +++ b/source/blender/compositor/operations/COM_GammaOperation.h @@ -28,27 +28,27 @@ class GammaOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; SocketReader *inputGammaProgram; public: GammaOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h index 78c6437eac6..616a6539ad4 100644 --- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h @@ -37,13 +37,13 @@ public: void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h index a957b8c12af..5dc896fafaa 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h @@ -34,18 +34,18 @@ public: GaussianXBlurOperation(); /** - *@brief the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + *@brief the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - *@brief initialize the execution - */ + *@brief initialize the execution + */ void initExecution(); /** - *@brief Deinitialize the execution - */ + *@brief Deinitialize the execution + */ void deinitExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h index f33d38de14e..e8d362e4c32 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h @@ -34,18 +34,18 @@ public: GaussianYBlurOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - *@brief initialize the execution - */ + * @brief initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.h b/source/blender/compositor/operations/COM_GlareBaseOperation.h index 0d20dd363c7..2ef413a936b 100644 --- a/source/blender/compositor/operations/COM_GlareBaseOperation.h +++ b/source/blender/compositor/operations/COM_GlareBaseOperation.h @@ -30,29 +30,31 @@ /* utility functions used by glare, tonemap and lens distortion */ /* soms macros for color handling */ typedef float fRGB[4]; + +/* TODO - replace with BLI_math_vector */ /* clear color */ -#define fRGB_clear(c) { c[0]=c[1]=c[2]=0.f; } (void)0 +#define fRGB_clear(c) { c[0] = c[1] = c[2] = 0.f; } (void)0 /* copy c2 to c1 */ -#define fRGB_copy(c1, c2) { c1[0]=c2[0]; c1[1]=c2[1]; c1[2]=c2[2]; c1[3]=c2[3]; } (void)0 +#define fRGB_copy(c1, c2) { c1[0] = c2[0]; c1[1] = c2[1]; c1[2] = c2[2]; c1[3] = c2[3]; } (void)0 /* add c2 to c1 */ -#define fRGB_add(c1, c2) { c1[0]+=c2[0]; c1[1]+=c2[1]; c1[2]+=c2[2]; } (void)0 +#define fRGB_add(c1, c2) { c1[0] += c2[0]; c1[1] += c2[1]; c1[2] += c2[2]; } (void)0 /* subtract c2 from c1 */ -#define fRGB_sub(c1, c2) { c1[0]-=c2[0]; c1[1]-=c2[1]; c1[2]-=c2[2]; } (void)0 +#define fRGB_sub(c1, c2) { c1[0] -= c2[0]; c1[1] -= c2[1]; c1[2] -= c2[2]; } (void)0 /* multiply c by float value s */ -#define fRGB_mult(c, s) { c[0]*=s; c[1]*=s; c[2]*=s; } (void)0 +#define fRGB_mult(c, s) { c[0] *= s; c[1] *= s; c[2] *= s; } (void)0 /* multiply c2 by s and add to c1 */ -#define fRGB_madd(c1, c2, s) { c1[0]+=c2[0]*s; c1[1]+=c2[1]*s; c1[2]+=c2[2]*s; } (void)0 +#define fRGB_madd(c1, c2, s) { c1[0] += c2[0] * s; c1[1] += c2[1] * s; c1[2] += c2[2] * s; } (void)0 /* multiply c2 by color c1 */ -#define fRGB_colormult(c, cs) { c[0]*=cs[0]; c[1]*=cs[1]; c[2]*=cs[2]; } (void)0 +#define fRGB_colormult(c, cs) { c[0] *= cs[0]; c[1] *= cs[1]; c[2] *= cs[2]; } (void)0 /* multiply c2 by color c3 and add to c1 */ -#define fRGB_colormadd(c1, c2, c3) { c1[0]+=c2[0]*c3[0]; c1[1]+=c2[1]*c3[1]; c1[2]+=c2[2]*c3[2]; } (void)0 +#define fRGB_colormadd(c1, c2, c3) { c1[0] += c2[0] * c3[0]; c1[1] += c2[1] * c3[1]; c1[2] += c2[2] * c3[2]; } (void)0 /* multiply c2 by color rgb, rgb as separate arguments */ -#define fRGB_rgbmult(c, r, g, b) { c[0]*=(r); c[1]*=(g); c[2]*=(b); } (void)0 +#define fRGB_rgbmult(c, r, g, b) { c[0] *= (r); c[1] *= (g); c[2] *= (b); } (void)0 /* swap colors c1 & c2 */ -#define fRGB_swap(c1, c2) { float _t=c1[0]; c1[0]=c2[0]; c2[0]=_t;\ - _t=c1[1]; c1[1]=c2[1]; c2[1]=_t;\ - _t=c1[2]; c1[2]=c2[2]; c2[2]=_t;\ - _t=c1[3]; c1[3]=c2[3]; c3[3]=_t;\ +#define fRGB_swap(c1, c2) { float _t = c1[0]; c1[0] = c2[0]; c2[0] = _t; \ + _t = c1[1]; c1[1] = c2[1]; c2[1] = _t; \ + _t = c1[2]; c1[2] = c2[2]; c2[2] = _t; \ + _t = c1[3]; c1[3] = c2[3]; c3[3] = _t; \ } (void)0 diff --git a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h index 860bb71a0f1..5ede0491773 100644 --- a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h +++ b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h @@ -28,25 +28,25 @@ class HueSaturationValueCorrectOperation : public CurveBaseOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; public: HueSaturationValueCorrectOperation(); /** - * the inner loop of this program - */ - void executePixel(float *Vector, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *Vector, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_IDMaskOperation.h b/source/blender/compositor/operations/COM_IDMaskOperation.h index 9f897c53d18..229e1b2dd82 100644 --- a/source/blender/compositor/operations/COM_IDMaskOperation.h +++ b/source/blender/compositor/operations/COM_IDMaskOperation.h @@ -28,8 +28,8 @@ class IDMaskOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ SocketReader *inputProgram; float objectIndex; @@ -37,21 +37,21 @@ public: IDMaskOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setObjectIndex(float objectIndex) {this->objectIndex = objectIndex;} + void setObjectIndex(float objectIndex) { this->objectIndex = objectIndex; } }; #endif diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h index 0bd112304a8..a4645c9d504 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.h +++ b/source/blender/compositor/operations/COM_ImageOperation.h @@ -36,8 +36,8 @@ extern "C" { } /** - * @brief Base class for all image operations - */ + * @brief Base class for all image operations + */ class BaseImageOperation : public NodeOperation { protected: ImBuf *buffer; @@ -52,8 +52,8 @@ protected: BaseImageOperation(); /** - * Determine the output resolution. The resolution is retrieved from the Renderer - */ + * Determine the output resolution. The resolution is retrieved from the Renderer + */ void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); virtual ImBuf *getImBuf(); @@ -62,33 +62,33 @@ public: void initExecution(); void deinitExecution(); - void setImage(Image *image) {this->image = image;} - void setImageUser(ImageUser *imageuser) {this->imageUser = imageuser;} - - void setFramenumber(int framenumber) {this->framenumber = framenumber;} + void setImage(Image *image) { this->image = image; } + void setImageUser(ImageUser *imageuser) { this->imageUser = imageuser; } + + void setFramenumber(int framenumber) { this->framenumber = framenumber; } }; -class ImageOperation: public BaseImageOperation { +class ImageOperation : public BaseImageOperation { public: /** - * Constructor - */ + * Constructor + */ ImageOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class ImageAlphaOperation: public BaseImageOperation { +class ImageAlphaOperation : public BaseImageOperation { public: /** - * Constructor - */ + * Constructor + */ ImageAlphaOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class ImageDepthOperation: public BaseImageOperation { +class ImageDepthOperation : public BaseImageOperation { public: /** - * Constructor - */ + * Constructor + */ ImageDepthOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_InvertOperation.h b/source/blender/compositor/operations/COM_InvertOperation.h index 27a995238c7..48432aecdd0 100644 --- a/source/blender/compositor/operations/COM_InvertOperation.h +++ b/source/blender/compositor/operations/COM_InvertOperation.h @@ -28,10 +28,10 @@ class InvertOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputValueProgram; - SocketReader * inputColorProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputValueProgram; + SocketReader *inputColorProgram; bool alpha; bool color; @@ -40,21 +40,21 @@ public: InvertOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setColor(bool color) {this->color = color;} - void setAlpha(bool alpha) {this->alpha = alpha;} + void setColor(bool color) { this->color = color; } + void setAlpha(bool alpha) { this->alpha = alpha; } }; #endif diff --git a/source/blender/compositor/operations/COM_LuminanceMatteOperation.h b/source/blender/compositor/operations/COM_LuminanceMatteOperation.h index 1c2cd2dca51..f44e32396a3 100644 --- a/source/blender/compositor/operations/COM_LuminanceMatteOperation.h +++ b/source/blender/compositor/operations/COM_LuminanceMatteOperation.h @@ -25,27 +25,27 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class LuminanceMatteOperation : public NodeOperation { private: NodeChroma *settings; SocketReader *inputImageProgram; public: /** - * Default constructor - */ + * Default constructor + */ LuminanceMatteOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;} + void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; } }; #endif diff --git a/source/blender/compositor/operations/COM_MapUVOperation.h b/source/blender/compositor/operations/COM_MapUVOperation.h index 4d7bc814dc2..22e3531e838 100644 --- a/source/blender/compositor/operations/COM_MapUVOperation.h +++ b/source/blender/compositor/operations/COM_MapUVOperation.h @@ -38,14 +38,14 @@ public: MapUVOperation(); /** - * we need a 3x3 differential filter for UV Input and full buffer for the image - */ + * we need a 3x3 differential filter for UV Input and full buffer for the image + */ bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); /** * the inner loop of this program */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** * Initialize the execution diff --git a/source/blender/compositor/operations/COM_MapValueOperation.h b/source/blender/compositor/operations/COM_MapValueOperation.h index ac320256fe4..5fae74e0a6a 100644 --- a/source/blender/compositor/operations/COM_MapValueOperation.h +++ b/source/blender/compositor/operations/COM_MapValueOperation.h @@ -26,41 +26,41 @@ #include "DNA_texture_types.h" /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MapValueOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; - TexMapping * settings; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; + TexMapping *settings; public: /** - * Default constructor - */ + * Default constructor + */ MapValueOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); /** - * @brief set the TexMapping settings - */ - void setSettings(TexMapping *settings) {this->settings = settings;} + * @brief set the TexMapping settings + */ + void setSettings(TexMapping *settings) { this->settings = settings; } }; #endif diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h index 8534cb20416..8507cb994c0 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.h +++ b/source/blender/compositor/operations/COM_MaskOperation.h @@ -32,20 +32,20 @@ #include "IMB_imbuf_types.h" /** - * Class with implementation of mask rasterization - */ + * Class with implementation of mask rasterization + */ class MaskOperation : public NodeOperation { protected: Mask *mask; int maskWidth; int maskHeight; int framenumber; - bool smooth; + bool smooth; float *rasterizedMask; /** - * Determine the output resolution. The resolution is retrieved from the Renderer - */ + * Determine the output resolution. The resolution is retrieved from the Renderer + */ void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); public: @@ -56,11 +56,11 @@ public: void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); - void setMask(Mask *mask) {this->mask = mask;} - void setMaskWidth(int width) {this->maskWidth = width;} - void setMaskHeight(int height) {this->maskHeight = height;} - void setFramenumber(int framenumber) {this->framenumber = framenumber;} - void setSmooth(bool smooth) {this->smooth = smooth;} + void setMask(Mask *mask) { this->mask = mask; } + void setMaskWidth(int width) { this->maskWidth = width; } + void setMaskHeight(int height) { this->maskHeight = height; } + void setFramenumber(int framenumber) { this->framenumber = framenumber; } + void setSmooth(bool smooth) { this->smooth = smooth; } void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); }; diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.h b/source/blender/compositor/operations/COM_MathBaseOperation.h index 64e8c4af88f..12dc5fa36c7 100644 --- a/source/blender/compositor/operations/COM_MathBaseOperation.h +++ b/source/blender/compositor/operations/COM_MathBaseOperation.h @@ -26,129 +26,129 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MathBaseOperation : public NodeOperation { protected: /** - * Prefetched reference to the inputProgram - */ - SocketReader * inputValue1Operation; - SocketReader * inputValue2Operation; + * Prefetched reference to the inputProgram + */ + SocketReader *inputValue1Operation; + SocketReader *inputValue2Operation; protected: /** - * Default constructor - */ + * Default constructor + */ MathBaseOperation(); public: /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) = 0; + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]) = 0; /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); /** - * Determine resolution - */ + * Determine resolution + */ void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); }; -class MathAddOperation: public MathBaseOperation { +class MathAddOperation : public MathBaseOperation { public: MathAddOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathSubtractOperation: public MathBaseOperation { +class MathSubtractOperation : public MathBaseOperation { public: MathSubtractOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathMultiplyOperation: public MathBaseOperation { +class MathMultiplyOperation : public MathBaseOperation { public: MathMultiplyOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathDivideOperation: public MathBaseOperation { +class MathDivideOperation : public MathBaseOperation { public: MathDivideOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathSineOperation: public MathBaseOperation { +class MathSineOperation : public MathBaseOperation { public: MathSineOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathCosineOperation: public MathBaseOperation { +class MathCosineOperation : public MathBaseOperation { public: MathCosineOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathTangentOperation: public MathBaseOperation { +class MathTangentOperation : public MathBaseOperation { public: MathTangentOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathArcSineOperation: public MathBaseOperation { +class MathArcSineOperation : public MathBaseOperation { public: MathArcSineOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathArcCosineOperation: public MathBaseOperation { +class MathArcCosineOperation : public MathBaseOperation { public: MathArcCosineOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathArcTangentOperation: public MathBaseOperation { +class MathArcTangentOperation : public MathBaseOperation { public: MathArcTangentOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathPowerOperation: public MathBaseOperation { +class MathPowerOperation : public MathBaseOperation { public: MathPowerOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathLogarithmOperation: public MathBaseOperation { +class MathLogarithmOperation : public MathBaseOperation { public: MathLogarithmOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathMinimumOperation: public MathBaseOperation { +class MathMinimumOperation : public MathBaseOperation { public: MathMinimumOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathMaximumOperation: public MathBaseOperation { +class MathMaximumOperation : public MathBaseOperation { public: MathMaximumOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathRoundOperation: public MathBaseOperation { +class MathRoundOperation : public MathBaseOperation { public: MathRoundOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathLessThanOperation: public MathBaseOperation { +class MathLessThanOperation : public MathBaseOperation { public: MathLessThanOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathGreaterThanOperation: public MathBaseOperation { +class MathGreaterThanOperation : public MathBaseOperation { public: MathGreaterThanOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixAddOperation.h b/source/blender/compositor/operations/COM_MixAddOperation.h index 99a6af67d7d..7b03802cf7e 100644 --- a/source/blender/compositor/operations/COM_MixAddOperation.h +++ b/source/blender/compositor/operations/COM_MixAddOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixAddOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixAddOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixBaseOperation.h b/source/blender/compositor/operations/COM_MixBaseOperation.h index b9bb94d58d8..3637cc9eacf 100644 --- a/source/blender/compositor/operations/COM_MixBaseOperation.h +++ b/source/blender/compositor/operations/COM_MixBaseOperation.h @@ -26,42 +26,42 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixBaseOperation : public NodeOperation { protected: /** - * Prefetched reference to the inputProgram - */ + * Prefetched reference to the inputProgram + */ SocketReader *inputValueOperation; SocketReader *inputColor1Operation; SocketReader *inputColor2Operation; bool valueAlphaMultiply; public: /** - * Default constructor - */ + * Default constructor + */ MixBaseOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - void setUseValueAlphaMultiply(const bool value) {this->valueAlphaMultiply = value;} - bool useValueAlphaMultiply() {return this->valueAlphaMultiply;} + void setUseValueAlphaMultiply(const bool value) { this->valueAlphaMultiply = value; } + bool useValueAlphaMultiply() { return this->valueAlphaMultiply; } }; #endif diff --git a/source/blender/compositor/operations/COM_MixBlendOperation.h b/source/blender/compositor/operations/COM_MixBlendOperation.h index da3342c0e4a..b906134f5cb 100644 --- a/source/blender/compositor/operations/COM_MixBlendOperation.h +++ b/source/blender/compositor/operations/COM_MixBlendOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixBlendOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixBlendOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixBurnOperation.h b/source/blender/compositor/operations/COM_MixBurnOperation.h index ff7de119605..af09772edde 100644 --- a/source/blender/compositor/operations/COM_MixBurnOperation.h +++ b/source/blender/compositor/operations/COM_MixBurnOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixBurnOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixBurnOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixColorOperation.h b/source/blender/compositor/operations/COM_MixColorOperation.h index 1a98e847ccd..9b0d93f934d 100644 --- a/source/blender/compositor/operations/COM_MixColorOperation.h +++ b/source/blender/compositor/operations/COM_MixColorOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixColorOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixColorOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixDarkenOperation.h b/source/blender/compositor/operations/COM_MixDarkenOperation.h index b1792d4930e..69fb4450458 100644 --- a/source/blender/compositor/operations/COM_MixDarkenOperation.h +++ b/source/blender/compositor/operations/COM_MixDarkenOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixDarkenOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixDarkenOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixDifferenceOperation.h b/source/blender/compositor/operations/COM_MixDifferenceOperation.h index 554d7b2f1fe..c71b22214cc 100644 --- a/source/blender/compositor/operations/COM_MixDifferenceOperation.h +++ b/source/blender/compositor/operations/COM_MixDifferenceOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixDifferenceOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixDifferenceOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixDivideOperation.h b/source/blender/compositor/operations/COM_MixDivideOperation.h index e9c4cf81cd3..375e7129e8b 100644 --- a/source/blender/compositor/operations/COM_MixDivideOperation.h +++ b/source/blender/compositor/operations/COM_MixDivideOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixDivideOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixDivideOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixDodgeOperation.h b/source/blender/compositor/operations/COM_MixDodgeOperation.h index 6baa73e8f6f..a4adf6fde47 100644 --- a/source/blender/compositor/operations/COM_MixDodgeOperation.h +++ b/source/blender/compositor/operations/COM_MixDodgeOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixDodgeOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixDodgeOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixHueOperation.h b/source/blender/compositor/operations/COM_MixHueOperation.h index d3d1717f448..56310e253c0 100644 --- a/source/blender/compositor/operations/COM_MixHueOperation.h +++ b/source/blender/compositor/operations/COM_MixHueOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixHueOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixHueOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixLightenOperation.h b/source/blender/compositor/operations/COM_MixLightenOperation.h index 73ac3e6e165..bb251a44653 100644 --- a/source/blender/compositor/operations/COM_MixLightenOperation.h +++ b/source/blender/compositor/operations/COM_MixLightenOperation.h @@ -26,19 +26,19 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixLightenOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixLightenOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixLinearLightOperation.h b/source/blender/compositor/operations/COM_MixLinearLightOperation.h index 7e26b25e5c0..39d5b6495d1 100644 --- a/source/blender/compositor/operations/COM_MixLinearLightOperation.h +++ b/source/blender/compositor/operations/COM_MixLinearLightOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixLinearLightOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixLinearLightOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixMultiplyOperation.h b/source/blender/compositor/operations/COM_MixMultiplyOperation.h index 5d4468e7271..2c12854bfa6 100644 --- a/source/blender/compositor/operations/COM_MixMultiplyOperation.h +++ b/source/blender/compositor/operations/COM_MixMultiplyOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixMultiplyOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixMultiplyOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixOverlayOperation.h b/source/blender/compositor/operations/COM_MixOverlayOperation.h index dd1d16a53d3..48d1d10a697 100644 --- a/source/blender/compositor/operations/COM_MixOverlayOperation.h +++ b/source/blender/compositor/operations/COM_MixOverlayOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixOverlayOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixOverlayOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixSaturationOperation.h b/source/blender/compositor/operations/COM_MixSaturationOperation.h index 7e746c02e09..ccb95e2f00f 100644 --- a/source/blender/compositor/operations/COM_MixSaturationOperation.h +++ b/source/blender/compositor/operations/COM_MixSaturationOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixSaturationOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixSaturationOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixScreenOperation.h b/source/blender/compositor/operations/COM_MixScreenOperation.h index 6522907f295..6b9fa302325 100644 --- a/source/blender/compositor/operations/COM_MixScreenOperation.h +++ b/source/blender/compositor/operations/COM_MixScreenOperation.h @@ -26,19 +26,19 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixScreenOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixScreenOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixSoftLightOperation.h b/source/blender/compositor/operations/COM_MixSoftLightOperation.h index fcbd8dab8b8..4189066de2c 100644 --- a/source/blender/compositor/operations/COM_MixSoftLightOperation.h +++ b/source/blender/compositor/operations/COM_MixSoftLightOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixSoftLightOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixSoftLightOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixSubtractOperation.h b/source/blender/compositor/operations/COM_MixSubtractOperation.h index 441857a8aca..b820fb1e5e1 100644 --- a/source/blender/compositor/operations/COM_MixSubtractOperation.h +++ b/source/blender/compositor/operations/COM_MixSubtractOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixSubtractOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixSubtractOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixValueOperation.h b/source/blender/compositor/operations/COM_MixValueOperation.h index 89461b3ba40..d12a2d2b3d6 100644 --- a/source/blender/compositor/operations/COM_MixValueOperation.h +++ b/source/blender/compositor/operations/COM_MixValueOperation.h @@ -26,19 +26,19 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixValueOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixValueOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h index aca2ec2eff7..b6e89fa345c 100644 --- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h +++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h @@ -32,30 +32,30 @@ typedef enum MovieClipAttribute { MCA_ANGLE } MovieClipAttribute; /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MovieClipAttributeOperation : public NodeOperation { private: - MovieClip * clip; + MovieClip *clip; float value; bool valueSet; int framenumber; MovieClipAttribute attribute; public: /** - * Default constructor - */ + * Default constructor + */ MovieClipAttributeOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - void setMovieClip(MovieClip *clip) {this->clip = clip;} - void setFramenumber(int framenumber) {this->framenumber = framenumber;} - void setAttribute(MovieClipAttribute attribute) {this->attribute = attribute;} + void setMovieClip(MovieClip *clip) { this->clip = clip; } + void setFramenumber(int framenumber) { this->framenumber = framenumber; } + void setAttribute(MovieClipAttribute attribute) { this->attribute = attribute; } }; #endif diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.h b/source/blender/compositor/operations/COM_MovieClipOperation.h index f52a9973fc5..454c442a167 100644 --- a/source/blender/compositor/operations/COM_MovieClipOperation.h +++ b/source/blender/compositor/operations/COM_MovieClipOperation.h @@ -31,10 +31,10 @@ #include "IMB_imbuf_types.h" /** - * Base class for all renderlayeroperations - * - * @todo: rename to operation. - */ + * Base class for all renderlayeroperations + * + * @todo: rename to operation. + */ class MovieClipOperation : public NodeOperation { protected: MovieClip *movieClip; @@ -45,8 +45,8 @@ protected: int framenumber; /** - * Determine the output resolution. The resolution is retrieved from the Renderer - */ + * Determine the output resolution. The resolution is retrieved from the Renderer + */ void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); public: @@ -54,11 +54,11 @@ public: void initExecution(); void deinitExecution(); - void setMovieClip(MovieClip *image) {this->movieClip = image;} - void setMovieClipUser(MovieClipUser *imageuser) {this->movieClipUser = imageuser;} - - void setFramenumber(int framenumber) {this->framenumber = framenumber;} - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void setMovieClip(MovieClip *image) { this->movieClip = image; } + void setMovieClipUser(MovieClipUser *imageuser) { this->movieClipUser = imageuser; } + + void setFramenumber(int framenumber) { this->framenumber = framenumber; } + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.h b/source/blender/compositor/operations/COM_MovieDistortionOperation.h index 5792248464a..9c7050e1da0 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.h +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.h @@ -57,28 +57,28 @@ public: this->calibration_width = calibration_width; this->calibration_height = calibration_height; this->inverted = inverted; - this->bufferCalculated = new int[this->width*this->height]; - this->buffer = new float[this->width*this->height*2]; - for (int i = 0 ; i < this->width*this->height ; i ++) { + this->bufferCalculated = new int[this->width * this->height]; + this->buffer = new float[this->width * this->height * 2]; + for (int i = 0; i < this->width * this->height; i++) { this->bufferCalculated[i] = 0; } } bool isCacheFor(MovieClip *movieclip, int width, int height, int calibration_width, int claibration_height, bool inverted) { return this->k1 == movieclip->tracking.camera.k1 && - this->k2 == movieclip->tracking.camera.k2 && - this->k3 == movieclip->tracking.camera.k3 && - this->principal_x == movieclip->tracking.camera.principal[0] && - this->principal_y == movieclip->tracking.camera.principal[1] && - this->pixel_aspect == movieclip->tracking.camera.pixel_aspect && - this->inverted == inverted && - this->width == width && - this->height == height && - this->calibration_width == calibration_width && - this->calibration_height == calibration_height; + this->k2 == movieclip->tracking.camera.k2 && + this->k3 == movieclip->tracking.camera.k3 && + this->principal_x == movieclip->tracking.camera.principal[0] && + this->principal_y == movieclip->tracking.camera.principal[1] && + this->pixel_aspect == movieclip->tracking.camera.pixel_aspect && + this->inverted == inverted && + this->width == width && + this->height == height && + this->calibration_width == calibration_width && + this->calibration_height == calibration_height; } - void getUV(MovieTracking *trackingData, int x, int y, float *u, float*v) { - if (x<0 || x >= this->width || y <0 || y >= this->height) { + void getUV(MovieTracking *trackingData, int x, int y, float *u, float *v) { + if (x < 0 || x >= this->width || y < 0 || y >= this->height) { *u = x; *v = y; } @@ -88,8 +88,8 @@ public: if (!bufferCalculated[offset]) { //float overscan = 0.0f; - float w = (float)this->width/* / (1 + overscan) */; - float h = (float)this->height/* / (1 + overscan) */; + float w = (float)this->width /* / (1 + overscan) */; + float h = (float)this->height /* / (1 + overscan) */; float aspx = (float)w / this->calibration_width; float aspy = (float)h / this->calibration_height; float in[2]; @@ -106,21 +106,21 @@ public: } buffer[offset2] = out[0] * aspx /* + 0.5 * overscan * w */; - buffer[offset2+1] = (out[1] * aspy /* + 0.5 * overscan * h */) * this->pixel_aspect; + buffer[offset2 + 1] = (out[1] * aspy /* + 0.5 * overscan * h */) * this->pixel_aspect; bufferCalculated[offset] = 1; } *u = buffer[offset2]; - *v = buffer[offset2+1]; + *v = buffer[offset2 + 1]; } } }; -class MovieDistortionOperation: public NodeOperation { +class MovieDistortionOperation : public NodeOperation { private: DistortionCache *cache; SocketReader *inputOperation; - MovieClip * movieClip; + MovieClip *movieClip; protected: bool distortion; @@ -129,13 +129,13 @@ protected: public: MovieDistortionOperation(bool distortion); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setMovieClip(MovieClip *clip) {this->movieClip = clip;} - void setFramenumber(int framenumber) {this->framenumber = framenumber;} + void setMovieClip(MovieClip *clip) { this->movieClip = clip; } + void setFramenumber(int framenumber) { this->framenumber = framenumber; } }; #endif diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.h b/source/blender/compositor/operations/COM_MultilayerImageOperation.h index 809253e532a..c33e65fc55b 100644 --- a/source/blender/compositor/operations/COM_MultilayerImageOperation.h +++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.h @@ -27,7 +27,7 @@ #include "COM_ImageOperation.h" -class MultilayerBaseOperation: public BaseImageOperation { +class MultilayerBaseOperation : public BaseImageOperation { private: int passId; RenderLayer *renderlayer; @@ -35,34 +35,34 @@ protected: ImBuf *getImBuf(); public: /** - * Constructor - */ + * Constructor + */ MultilayerBaseOperation(int pass); - void setRenderLayer(RenderLayer *renderlayer) {this->renderlayer = renderlayer;} + void setRenderLayer(RenderLayer *renderlayer) { this->renderlayer = renderlayer; } }; -class MultilayerColorOperation: public MultilayerBaseOperation { +class MultilayerColorOperation : public MultilayerBaseOperation { public: - MultilayerColorOperation(int pass): MultilayerBaseOperation(pass) { + MultilayerColorOperation(int pass) : MultilayerBaseOperation(pass) { this->addOutputSocket(COM_DT_COLOR); } - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MultilayerValueOperation: public MultilayerBaseOperation { +class MultilayerValueOperation : public MultilayerBaseOperation { public: - MultilayerValueOperation(int pass): MultilayerBaseOperation(pass) { + MultilayerValueOperation(int pass) : MultilayerBaseOperation(pass) { this->addOutputSocket(COM_DT_VALUE); } - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MultilayerVectorOperation: public MultilayerBaseOperation { +class MultilayerVectorOperation : public MultilayerBaseOperation { public: - MultilayerVectorOperation(int pass): MultilayerBaseOperation(pass) { + MultilayerVectorOperation(int pass) : MultilayerBaseOperation(pass) { this->addOutputSocket(COM_DT_VECTOR); } - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.h b/source/blender/compositor/operations/COM_NormalizeOperation.h index 765b8847384..de1c4d67bba 100644 --- a/source/blender/compositor/operations/COM_NormalizeOperation.h +++ b/source/blender/compositor/operations/COM_NormalizeOperation.h @@ -25,41 +25,41 @@ #include "DNA_node_types.h" /** - * @brief base class of normalize, implementing the simple normalize - * @ingroup operation - */ + * @brief base class of normalize, implementing the simple normalize + * @ingroup operation + */ class NormalizeOperation : public NodeOperation { protected: /** - * @brief Cached reference to the reader - */ - SocketReader * imageReader; + * @brief Cached reference to the reader + */ + SocketReader *imageReader; /** - * @brief temporarily cache of the execution storage - * it stores x->min and y->mult - */ - NodeTwoFloats * cachedInstance; + * @brief temporarily cache of the execution storage + * it stores x->min and y->mult + */ + NodeTwoFloats *cachedInstance; public: NormalizeOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h index 9b9fb023467..cfc5f7e41f2 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.h +++ b/source/blender/compositor/operations/COM_OutputFileOperation.h @@ -45,18 +45,18 @@ private: public: OutputSingleLayerOperation(const Scene *scene, const bNodeTree *tree, DataType datatype, ImageFormatData *format, const char *path); - void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers); - bool isOutputOperation(bool rendering) const {return true;} + void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers); + bool isOutputOperation(bool rendering) const { return true; } void initExecution(); void deinitExecution(); - const CompositorPriority getRenderPriority() const {return COM_PRIORITY_LOW;} + const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; } }; /* extra info for OpenEXR layers */ struct OutputOpenExrLayer { OutputOpenExrLayer(const char *name, DataType datatype); - char name[EXR_TOT_MAXNAME-2]; + char name[EXR_TOT_MAXNAME - 2]; float *outputBuffer; DataType datatype; SocketReader *imageInput; @@ -79,11 +79,11 @@ public: void add_layer(const char *name, DataType datatype); - void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers); - bool isOutputOperation(bool rendering) const {return true;} + void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers); + bool isOutputOperation(bool rendering) const { return true; } void initExecution(); void deinitExecution(); - const CompositorPriority getRenderPriority() const {return COM_PRIORITY_LOW;} + const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; } }; #endif diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h index 32c0b6ecc77..f9ce0c644a1 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.h +++ b/source/blender/compositor/operations/COM_PreviewOperation.h @@ -31,24 +31,24 @@ protected: unsigned char *outputBuffer; /** - * @brief holds reference to the SDNA bNode, where this nodes will render the preview image for - */ + * @brief holds reference to the SDNA bNode, where this nodes will render the preview image for + */ bNode *node; SocketReader *input; float divider; public: PreviewOperation(); - bool isOutputOperation(bool rendering) const {return true;} + bool isOutputOperation(bool rendering) const { return true; } void initExecution(); void deinitExecution(); const CompositorPriority getRenderPriority() const; void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - void setbNode(bNode *node) { this->node = node;} + void setbNode(bNode *node) { this->node = node; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - bool isPreviewOperation() {return true;} + bool isPreviewOperation() { return true; } }; #endif diff --git a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h index c8788e100c8..2e188617ab5 100644 --- a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h +++ b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h @@ -28,11 +28,11 @@ class ProjectorLensDistortionOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; - NodeLensDist * data; + NodeLensDist *data; float dispersion; float kr, kr2; @@ -40,23 +40,23 @@ public: ProjectorLensDistortionOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeLensDist *data) {this->data = data;} - void setDispertion(float dispersion) {this->dispersion = dispersion;} + void setData(NodeLensDist *data) { this->data = data; } + void setDispertion(float dispersion) { this->dispersion = dispersion; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); diff --git a/source/blender/compositor/operations/COM_QualityStepHelper.h b/source/blender/compositor/operations/COM_QualityStepHelper.h index 80b25684c5e..aef80e22e38 100644 --- a/source/blender/compositor/operations/COM_QualityStepHelper.h +++ b/source/blender/compositor/operations/COM_QualityStepHelper.h @@ -37,17 +37,17 @@ private: protected: /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(QualityHelper helper); - inline int getStep() const {return this->step;} - inline int getOffsetAdd() const {return this->offsetadd;} + inline int getStep() const { return this->step; } + inline int getOffsetAdd() const { return this->offsetadd; } public: QualityStepHelper(); - void setQuality(CompositorQuality quality) {this->quality = quality;} + void setQuality(CompositorQuality quality) { this->quality = quality; } }; #endif diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.h b/source/blender/compositor/operations/COM_ReadBufferOperation.h index 449b4a82618..576aa194bc5 100644 --- a/source/blender/compositor/operations/COM_ReadBufferOperation.h +++ b/source/blender/compositor/operations/COM_ReadBufferOperation.h @@ -26,25 +26,25 @@ #include "COM_NodeOperation.h" #include "COM_MemoryProxy.h" -class ReadBufferOperation: public NodeOperation { +class ReadBufferOperation : public NodeOperation { private: MemoryProxy *memoryProxy; unsigned int offset; public: ReadBufferOperation(); - int isBufferOperation() {return true;} - void setMemoryProxy(MemoryProxy *memoryProxy) {this->memoryProxy = memoryProxy;} - MemoryProxy *getMemoryProxy() {return this->memoryProxy;} + int isBufferOperation() { return true; } + void setMemoryProxy(MemoryProxy *memoryProxy) { this->memoryProxy = memoryProxy; } + MemoryProxy *getMemoryProxy() { return this->memoryProxy; } void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); - void executePixel(float *color, float x, float y, float dx, float dy, MemoryBuffer *inputBuffers[]); - const bool isReadBufferOperation() const {return true;} - void setOffset(unsigned int offset) {this->offset = offset;} - unsigned int getOffset() {return this->offset;} - bool determineDependingAreaOfInterest(rcti * input, ReadBufferOperation *readOperation, rcti *output); - MemoryBuffer *getInputMemoryBuffer(MemoryBuffer** memoryBuffers) {return memoryBuffers[offset];} + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); + void executePixel(float *color, float x, float y, float dx, float dy, MemoryBuffer * inputBuffers[]); + const bool isReadBufferOperation() const { return true; } + void setOffset(unsigned int offset) { this->offset = offset; } + unsigned int getOffset() { return this->offset; } + bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); + MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return memoryBuffers[offset]; } void readResolutionFromWriteBuffer(); }; diff --git a/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h b/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h index da808f49fdf..846e337c572 100644 --- a/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h +++ b/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h @@ -28,7 +28,7 @@ class RenderLayersAlphaProg : public RenderLayersBaseProg { public: RenderLayersAlphaProg(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; diff --git a/source/blender/compositor/operations/COM_RenderLayersBaseProg.h b/source/blender/compositor/operations/COM_RenderLayersBaseProg.h index 64e2496621f..ce2b8f767b6 100644 --- a/source/blender/compositor/operations/COM_RenderLayersBaseProg.h +++ b/source/blender/compositor/operations/COM_RenderLayersBaseProg.h @@ -36,64 +36,63 @@ extern "C" { } /** - * Base class for all renderlayeroperations - * - * @todo: rename to operation. - */ + * Base class for all renderlayeroperations + * + * @todo: rename to operation. + */ class RenderLayersBaseProg : public NodeOperation { private: /** - * Reference to the scene object. - */ + * Reference to the scene object. + */ Scene *scene; /** - * layerId of the layer where this operation needs to get its data from - */ + * layerId of the layer where this operation needs to get its data from + */ short layerId; /** - * cached instance to the float buffer inside the layer - */ + * cached instance to the float buffer inside the layer + */ float *inputBuffer; /** - * renderpass where this operation needs to get its data from - */ + * renderpass where this operation needs to get its data from + */ int renderpass; int elementsize; protected: /** - * Constructor - */ + * Constructor + */ RenderLayersBaseProg(int renderpass, int elementsize); /** - * Determine the output resolution. The resolution is retrieved from the Renderer - */ + * Determine the output resolution. The resolution is retrieved from the Renderer + */ void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); /** - * retrieve the reference to the float buffer of the renderer. - */ - inline float *getInputBuffer() {return this->inputBuffer;} + * retrieve the reference to the float buffer of the renderer. + */ + inline float *getInputBuffer() { return this->inputBuffer; } public: /** - * setter for the scene field. Will be called from - * @see RenderLayerNode to set the actual scene where - * the data will be retrieved from. - */ - void setScene(Scene *scene) {this->scene = scene;} - Scene *getScene() {return this->scene;} - void setLayerId(short layerId) {this->layerId = layerId;} - short getLayerId() {return this->layerId;} + * setter for the scene field. Will be called from + * @see RenderLayerNode to set the actual scene where + * the data will be retrieved from. + */ + void setScene(Scene *scene) { this->scene = scene; } + Scene *getScene() { return this->scene; } + void setLayerId(short layerId) { this->layerId = layerId; } + short getLayerId() { return this->layerId; } void initExecution(); void deinitExecution(); void executePixel(float *output, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); - }; #endif diff --git a/source/blender/compositor/operations/COM_RotateOperation.h b/source/blender/compositor/operations/COM_RotateOperation.h index 6afed39908b..bf7355da80e 100644 --- a/source/blender/compositor/operations/COM_RotateOperation.h +++ b/source/blender/compositor/operations/COM_RotateOperation.h @@ -25,7 +25,7 @@ #include "COM_NodeOperation.h" -class RotateOperation: public NodeOperation { +class RotateOperation : public NodeOperation { private: SocketReader *imageSocket; SocketReader *degreeSocket; @@ -38,10 +38,10 @@ private: public: RotateOperation(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setDoDegree2RadConversion(bool abool) {this->doDegree2RadConversion = abool;} + void setDoDegree2RadConversion(bool abool) { this->doDegree2RadConversion = abool; } void ensureDegree(); }; diff --git a/source/blender/compositor/operations/COM_ScaleOperation.h b/source/blender/compositor/operations/COM_ScaleOperation.h index 2c99cb63978..9e24ab3d1ca 100644 --- a/source/blender/compositor/operations/COM_ScaleOperation.h +++ b/source/blender/compositor/operations/COM_ScaleOperation.h @@ -70,8 +70,8 @@ public: void initExecution(); void deinitExecution(); - void setNewWidth(int width) {this->newWidth = width;} - void setNewHeight(int height) {this->newHeight = height;} + void setNewWidth(int width) { this->newWidth = width; } + void setNewHeight(int height) { this->newHeight = height; } }; #endif diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h index d2db55ea214..34656f38a09 100644 --- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h +++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h @@ -28,11 +28,11 @@ class ScreenLensDistortionOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ SocketReader *inputProgram; - NodeLensDist * data; + NodeLensDist *data; float dispersion; float distortion; @@ -46,24 +46,24 @@ public: ScreenLensDistortionOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeLensDist *data) {this->data = data;} - void setDispertion(float dispersion) {this->dispersion = dispersion;} - void setDistortion(float distortion) {this->distortion = distortion;} + void setData(NodeLensDist *data) { this->data = data; } + void setDispertion(float dispersion) { this->dispersion = dispersion; } + void setDistortion(float distortion) { this->distortion = distortion; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); diff --git a/source/blender/compositor/operations/COM_SeparateChannelOperation.h b/source/blender/compositor/operations/COM_SeparateChannelOperation.h index 3c1eed4bdd9..b1a38fd8294 100644 --- a/source/blender/compositor/operations/COM_SeparateChannelOperation.h +++ b/source/blender/compositor/operations/COM_SeparateChannelOperation.h @@ -25,18 +25,18 @@ #include "COM_NodeOperation.h" -class SeparateChannelOperation: public NodeOperation { +class SeparateChannelOperation : public NodeOperation { private: SocketReader *inputOperation; int channel; public: SeparateChannelOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setChannel(int channel) {this->channel = channel;} + void setChannel(int channel) { this->channel = channel; } }; #endif diff --git a/source/blender/compositor/operations/COM_SetAlphaOperation.h b/source/blender/compositor/operations/COM_SetAlphaOperation.h index 3d9caabf880..231b41f1697 100644 --- a/source/blender/compositor/operations/COM_SetAlphaOperation.h +++ b/source/blender/compositor/operations/COM_SetAlphaOperation.h @@ -26,9 +26,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class SetAlphaOperation : public NodeOperation { private: SocketReader *inputColor; @@ -36,14 +36,14 @@ private: public: /** - * Default constructor - */ + * Default constructor + */ SetAlphaOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_SetColorOperation.h b/source/blender/compositor/operations/COM_SetColorOperation.h index dad3cfd7fc9..9d28f1757db 100644 --- a/source/blender/compositor/operations/COM_SetColorOperation.h +++ b/source/blender/compositor/operations/COM_SetColorOperation.h @@ -26,9 +26,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class SetColorOperation : public NodeOperation { private: float channel1; @@ -38,8 +38,8 @@ private: public: /** - * Default constructor - */ + * Default constructor + */ SetColorOperation(); const float getChannel1() {return this->channel1;} @@ -53,12 +53,12 @@ public: void setChannels(float value[4]) {this->channel1 = value[0];this->channel2 = value[1];this->channel3 = value[2];this->channel4 = value[3];} /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - const bool isSetOperation() const {return true;} + const bool isSetOperation() const { return true; } }; #endif diff --git a/source/blender/compositor/operations/COM_SetSamplerOperation.h b/source/blender/compositor/operations/COM_SetSamplerOperation.h index 49bbae7e4ff..5dba0b3703f 100644 --- a/source/blender/compositor/operations/COM_SetSamplerOperation.h +++ b/source/blender/compositor/operations/COM_SetSamplerOperation.h @@ -26,25 +26,25 @@ /** - * this program converts an input colour to an output Sampler. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output Sampler. + * it assumes we are in sRGB colour space. + */ class SetSamplerOperation : public NodeOperation { private: PixelSampler sampler; SocketReader *reader; public: /** - * Default constructor - */ + * Default constructor + */ SetSamplerOperation(); - void setSampler(PixelSampler sampler) {this->sampler = sampler;} + void setSampler(PixelSampler sampler) { this->sampler = sampler; } /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_SetValueOperation.h b/source/blender/compositor/operations/COM_SetValueOperation.h index 25810cd7ee5..2f4a6ec0dc8 100644 --- a/source/blender/compositor/operations/COM_SetValueOperation.h +++ b/source/blender/compositor/operations/COM_SetValueOperation.h @@ -26,29 +26,29 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class SetValueOperation : public NodeOperation { private: float value; public: /** - * Default constructor - */ + * Default constructor + */ SetValueOperation(); - const float getValue() {return this->value;} - void setValue(float value) {this->value = value;} + const float getValue() { return this->value; } + void setValue(float value) { this->value = value; } /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - const bool isSetOperation() const {return true;} + const bool isSetOperation() const { return true; } }; #endif diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.h b/source/blender/compositor/operations/COM_SetVectorOperation.h index 9b5dd3ce674..49088027762 100644 --- a/source/blender/compositor/operations/COM_SetVectorOperation.h +++ b/source/blender/compositor/operations/COM_SetVectorOperation.h @@ -26,9 +26,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class SetVectorOperation : public NodeOperation { private: float x; @@ -38,26 +38,26 @@ private: public: /** - * Default constructor - */ + * Default constructor + */ SetVectorOperation(); - const float getX() {return this->x;} - void setX(float value) {this->x = value;} - const float getY() {return this->y;} - void setY(float value) {this->y = value;} - const float getZ() {return this->z;} - void setZ(float value) {this->z = value;} - const float getW() {return this->w;} - void setW(float value) {this->w = value;} + const float getX() { return this->x; } + void setX(float value) { this->x = value; } + const float getY() { return this->y; } + void setY(float value) { this->y = value; } + const float getZ() { return this->z; } + void setZ(float value) { this->z = value; } + const float getW() { return this->w; } + void setW(float value) { this->w = value; } /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - const bool isSetOperation() const {return true;} + const bool isSetOperation() const { return true; } void setVector(float vector[3]) { setX(vector[0]); diff --git a/source/blender/compositor/operations/COM_SocketProxyOperation.h b/source/blender/compositor/operations/COM_SocketProxyOperation.h index a86134c1ea9..701a5a8f693 100644 --- a/source/blender/compositor/operations/COM_SocketProxyOperation.h +++ b/source/blender/compositor/operations/COM_SocketProxyOperation.h @@ -25,12 +25,12 @@ #include "COM_NodeOperation.h" -class SocketProxyOperation: public NodeOperation { +class SocketProxyOperation : public NodeOperation { private: SocketReader *inputOperation; public: SocketProxyOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_SplitViewerOperation.h b/source/blender/compositor/operations/COM_SplitViewerOperation.h index 2c3163f0b0a..aba63ff190b 100644 --- a/source/blender/compositor/operations/COM_SplitViewerOperation.h +++ b/source/blender/compositor/operations/COM_SplitViewerOperation.h @@ -35,10 +35,10 @@ private: bool xSplit; public: SplitViewerOperation(); - void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers); + void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers); void initExecution(); void deinitExecution(); - void setSplitPercentage(float splitPercentage) {this->splitPercentage = splitPercentage;} - void setXSplit(bool xsplit) {this->xSplit = xsplit;} + void setSplitPercentage(float splitPercentage) { this->splitPercentage = splitPercentage; } + void setXSplit(bool xsplit) { this->xSplit = xsplit; } }; #endif diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h index de42b144730..e862a1f1910 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.h +++ b/source/blender/compositor/operations/COM_TextureOperation.h @@ -36,10 +36,10 @@ extern "C" { } /** - * Base class for all renderlayeroperations - * - * @todo: rename to operation. - */ + * Base class for all renderlayeroperations + * + * @todo: rename to operation. + */ class TextureBaseOperation : public NodeOperation { private: Tex *texture; @@ -50,33 +50,33 @@ private: protected: /** - * Determine the output resolution. The resolution is retrieved from the Renderer - */ + * Determine the output resolution. The resolution is retrieved from the Renderer + */ void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); /** - * Constructor - */ + * Constructor + */ TextureBaseOperation(); public: - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); - void setTexture(Tex *texture) {this->texture = texture;} + void setTexture(Tex *texture) { this->texture = texture; } void initExecution(); void deinitExecution(); - void setScene(const Scene *scene) {this->scene = scene;} + void setScene(const Scene *scene) { this->scene = scene; } }; -class TextureOperation:public TextureBaseOperation { +class TextureOperation : public TextureBaseOperation { public: TextureOperation(); }; -class TextureAlphaOperation:public TextureBaseOperation { +class TextureAlphaOperation : public TextureBaseOperation { public: TextureAlphaOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; diff --git a/source/blender/compositor/operations/COM_TonemapOperation.h b/source/blender/compositor/operations/COM_TonemapOperation.h index e7ea4f039f2..005f0862443 100644 --- a/source/blender/compositor/operations/COM_TonemapOperation.h +++ b/source/blender/compositor/operations/COM_TonemapOperation.h @@ -26,9 +26,9 @@ #include "DNA_node_types.h" /** - * @brief temporarily storage during execution of Tonemap - * @ingroup operation - */ + * @brief temporarily storage during execution of Tonemap + * @ingroup operation + */ typedef struct AvgLogLum { float al; float auto_key; @@ -38,48 +38,48 @@ typedef struct AvgLogLum { } AvgLogLum; /** - * @brief base class of tonemap, implementing the simple tonemap - * @ingroup operation - */ + * @brief base class of tonemap, implementing the simple tonemap + * @ingroup operation + */ class TonemapOperation : public NodeOperation { protected: /** - * @brief Cached reference to the reader - */ - SocketReader * imageReader; + * @brief Cached reference to the reader + */ + SocketReader *imageReader; /** - * @brief settings of the Tonemap - */ - NodeTonemap * data; + * @brief settings of the Tonemap + */ + NodeTonemap *data; /** - * @brief temporarily cache of the execution storage - */ - AvgLogLum * cachedInstance; + * @brief temporarily cache of the execution storage + */ + AvgLogLum *cachedInstance; public: TonemapOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeTonemap *data) {this->data = data;} + void setData(NodeTonemap *data) { this->data = data; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); @@ -87,17 +87,17 @@ public: }; /** - * @brief class of tonemap, implementing the photoreceptor tonemap - * most parts have already been done in TonemapOperation - * @ingroup operation - */ + * @brief class of tonemap, implementing the photoreceptor tonemap + * most parts have already been done in TonemapOperation + * @ingroup operation + */ class PhotoreceptorTonemapOperation : public TonemapOperation { public: /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); }; #endif diff --git a/source/blender/compositor/operations/COM_TranslateOperation.h b/source/blender/compositor/operations/COM_TranslateOperation.h index 63d6ee0d0b5..e512bd9318e 100644 --- a/source/blender/compositor/operations/COM_TranslateOperation.h +++ b/source/blender/compositor/operations/COM_TranslateOperation.h @@ -25,24 +25,24 @@ #include "COM_NodeOperation.h" -class TranslateOperation: public NodeOperation { +class TranslateOperation : public NodeOperation { private: SocketReader *inputOperation; - SocketReader*inputXOperation; - SocketReader*inputYOperation; + SocketReader *inputXOperation; + SocketReader *inputYOperation; float deltaX; float deltaY; float isDeltaSet; public: TranslateOperation(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - float getDeltaX() {return this->deltaX;} - float getDeltaY() {return this->deltaY;} + float getDeltaX() { return this->deltaX; } + float getDeltaY() { return this->deltaY; } inline void ensureDelta() { if (!isDeltaSet) { diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h index 9c2c4b4bf68..ede8f0333b4 100644 --- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h @@ -37,25 +37,25 @@ public: VariableSizeBokehBlurOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void setMaxBlur(int maxRadius) {this->maxBlur = maxRadius;} - - void setThreshold(float threshold) {this->threshold = threshold;} + void setMaxBlur(int maxRadius) { this->maxBlur = maxRadius; } + + void setThreshold(float threshold) { this->threshold = threshold; } }; diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.h b/source/blender/compositor/operations/COM_VectorBlurOperation.h index 2c45628726d..30821cdd8b2 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.h +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.h @@ -29,16 +29,16 @@ class VectorBlurOperation : public NodeOperation, public QualityStepHelper { private: /** - * @brief Cached reference to the inputProgram - */ - SocketReader * inputImageProgram; - SocketReader * inputSpeedProgram; - SocketReader * inputZProgram; + * @brief Cached reference to the inputProgram + */ + SocketReader *inputImageProgram; + SocketReader *inputSpeedProgram; + SocketReader *inputZProgram; /** - * @brief settings of the glare node. - */ - NodeBlurData * settings; + * @brief settings of the glare node. + */ + NodeBlurData *settings; float *cachedInstance; @@ -46,23 +46,23 @@ public: VectorBlurOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); - void setVectorBlurSettings(NodeBlurData * settings) {this->settings = settings;} + void setVectorBlurSettings(NodeBlurData *settings) { this->settings = settings; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); protected: diff --git a/source/blender/compositor/operations/COM_VectorCurveOperation.h b/source/blender/compositor/operations/COM_VectorCurveOperation.h index 759e265220f..41faee7acf6 100644 --- a/source/blender/compositor/operations/COM_VectorCurveOperation.h +++ b/source/blender/compositor/operations/COM_VectorCurveOperation.h @@ -28,25 +28,25 @@ class VectorCurveOperation : public CurveBaseOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; public: VectorCurveOperation(); /** - * the inner loop of this program - */ - void executePixel(float *Vector, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *Vector, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ViewerBaseOperation.h b/source/blender/compositor/operations/COM_ViewerBaseOperation.h index 8864894f0ed..2aaa7d20966 100644 --- a/source/blender/compositor/operations/COM_ViewerBaseOperation.h +++ b/source/blender/compositor/operations/COM_ViewerBaseOperation.h @@ -30,8 +30,8 @@ class ViewerBaseOperation : public NodeOperation { protected: float *outputBuffer; unsigned char *outputBufferDisplay; - Image * image; - ImageUser * imageUser; + Image *image; + ImageUser *imageUser; void *lock; bool active; float centerX; @@ -41,27 +41,27 @@ protected: bool doColorPredivide; public: - bool isOutputOperation(bool rendering) const {return isActiveViewerOutput();} + bool isOutputOperation(bool rendering) const { return isActiveViewerOutput(); } void initExecution(); void deinitExecution(); - void setImage(Image *image) {this->image = image;} - void setImageUser(ImageUser *imageUser) {this->imageUser = imageUser;} - const bool isActiveViewerOutput() const {return active;} - void setActive(bool active) {this->active = active;} - void setCenterX(float centerX) {this->centerX = centerX;} - void setCenterY(float centerY) {this->centerY = centerY;} - void setChunkOrder(OrderOfChunks tileOrder) {this->chunkOrder = tileOrder;} + void setImage(Image *image) { this->image = image; } + void setImageUser(ImageUser *imageUser) { this->imageUser = imageUser; } + const bool isActiveViewerOutput() const { return active; } + void setActive(bool active) { this->active = active; } + void setCenterX(float centerX) { this->centerX = centerX;} + void setCenterY(float centerY) { this->centerY = centerY;} + void setChunkOrder(OrderOfChunks tileOrder) { this->chunkOrder = tileOrder; } float getCenterX() { return this->centerX; } float getCenterY() { return this->centerY; } OrderOfChunks getChunkOrder() { return this->chunkOrder; } const CompositorPriority getRenderPriority() const; - void setColorManagement(bool doColorManagement) {this->doColorManagement = doColorManagement;} - void setColorPredivide(bool doColorPredivide) {this->doColorPredivide = doColorPredivide;} - bool isViewerOperation() {return true;} + void setColorManagement(bool doColorManagement) { this->doColorManagement = doColorManagement; } + void setColorPredivide(bool doColorPredivide) { this->doColorPredivide = doColorPredivide; } + bool isViewerOperation() { return true; } protected: ViewerBaseOperation(); - void updateImage(rcti*rect); + void updateImage(rcti *rect); private: void initImage(); diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h index 4ffae31c131..49ef5ad4bb7 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.h +++ b/source/blender/compositor/operations/COM_ViewerOperation.h @@ -34,7 +34,7 @@ private: public: ViewerOperation(); - void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers); + void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers); void initExecution(); void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.h b/source/blender/compositor/operations/COM_WriteBufferOperation.h index fff3212b410..321eed7240a 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.h +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.h @@ -27,24 +27,24 @@ #include "COM_MemoryProxy.h" #include "COM_SocketReader.h" /** - * @brief Operation to write to a tile - * @ingroup Operation - */ -class WriteBufferOperation: public NodeOperation { + * @brief Operation to write to a tile + * @ingroup Operation + */ +class WriteBufferOperation : public NodeOperation { MemoryProxy *memoryProxy; NodeOperation *input; public: WriteBufferOperation(); ~WriteBufferOperation(); - int isBufferOperation() {return true;} - MemoryProxy *getMemoryProxy() {return this->memoryProxy;} - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); - const bool isWriteBufferOperation() const {return true;} + int isBufferOperation() { return true; } + MemoryProxy *getMemoryProxy() { return this->memoryProxy; } + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); + const bool isWriteBufferOperation() const { return true; } - void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers); + void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers); void initExecution(); void deinitExecution(); - void executeOpenCLRegion(cl_context context, cl_program program, cl_command_queue queue, rcti *rect, unsigned int chunkNumber, MemoryBuffer** memoryBuffers, MemoryBuffer* outputBuffer); + void executeOpenCLRegion(cl_context context, cl_program program, cl_command_queue queue, rcti *rect, unsigned int chunkNumber, MemoryBuffer **memoryBuffers, MemoryBuffer *outputBuffer); void readResolutionFromInputSocket(); }; diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.h b/source/blender/compositor/operations/COM_ZCombineOperation.h index f9de916fce0..56ad950a3aa 100644 --- a/source/blender/compositor/operations/COM_ZCombineOperation.h +++ b/source/blender/compositor/operations/COM_ZCombineOperation.h @@ -26,9 +26,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ZCombineOperation : public NodeOperation { protected: SocketReader *image1Reader; @@ -37,21 +37,21 @@ protected: SocketReader *depth2Reader; public: /** - * Default constructor - */ + * Default constructor + */ ZCombineOperation(); void initExecution(); void deinitExecution(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class ZCombineAlphaOperation: public ZCombineOperation { - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); +class ZCombineAlphaOperation : public ZCombineOperation { + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif |