diff options
Diffstat (limited to 'source/blender/compositor/operations')
40 files changed, 125 insertions, 126 deletions
diff --git a/source/blender/compositor/operations/COM_AntiAliasOperation.h b/source/blender/compositor/operations/COM_AntiAliasOperation.h index 34243cd34b6..25781196b1f 100644 --- a/source/blender/compositor/operations/COM_AntiAliasOperation.h +++ b/source/blender/compositor/operations/COM_AntiAliasOperation.h @@ -26,14 +26,14 @@ #include "DNA_node_types.h" /** - * @brief AntiAlias operations + * \brief AntiAlias operations * it only supports anti aliasing on BW buffers. - * @ingroup operation + * \ingroup operation */ class AntiAliasOperation : public NodeOperation { protected: /** - * @brief Cached reference to the reader + * \brief Cached reference to the reader */ SocketReader *m_valueReader; public: diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.h b/source/blender/compositor/operations/COM_BokehImageOperation.h index c6ca7054352..d26f3f7066c 100644 --- a/source/blender/compositor/operations/COM_BokehImageOperation.h +++ b/source/blender/compositor/operations/COM_BokehImageOperation.h @@ -25,7 +25,7 @@ #include "COM_NodeOperation.h" /** - * @brief The BokehImageOperation class is an operation that creates an image useful to mimic the internals + * \brief The BokehImageOperation class is an operation that creates an image useful to mimic the internals *of a camera. * * features: @@ -53,91 +53,91 @@ class BokehImageOperation : public NodeOperation { private: /** - * @brief Settings of the bokeh image + * \brief Settings of the bokeh image */ NodeBokehImage *m_data; /** - * @brief precalced center of the image + * \brief precalced center of the image */ float m_center[2]; /** - * @brief 1.0-rounding + * \brief 1.0-rounding */ float m_inverseRounding; /** - * @brief distance of a full circle lens + * \brief distance of a full circle lens */ float m_circularDistance; /** - * @brief radius when the first flap starts + * \brief radius when the first flap starts */ float m_flapRad; /** - * @brief radians of a single flap + * \brief radians of a single flap */ float m_flapRadAdd; /** - * @brief should the m_data field by deleted when this operation is finished + * \brief should the m_data field by deleted when this operation is finished */ bool m_deleteData; /** - * @brief determine the coordinate of a flap cornder + * \brief determine the coordinate of a flap cornder * - * @param r result in bokehimage space are stored [x,y] - * @param flapNumber the flap number to calculate - * @param distance the lens distance is used to simulate lens shifts + * \param r result in bokehimage space are stored [x,y] + * \param flapNumber the flap number to calculate + * \param distance the lens distance is used to simulate lens shifts */ void detemineStartPointOfFlap(float r[2], int flapNumber, float distance); /** - * @brief Determine if a coordinate is inside the bokeh image + * \brief Determine if a coordinate is inside the bokeh image * - * @param distance the distance that will be used. This parameter is modified a bit to mimic lens shifts - * @param x the x coordinate of the pixel to evaluate - * @param y the y coordinate of the pixel to evaluate - * @return float range 0..1 0 is completely outside + * \param distance the distance that will be used. This parameter is modified a bit to mimic lens shifts + * \param x the x coordinate of the pixel to evaluate + * \param y the y coordinate of the pixel to evaluate + * \return float range 0..1 0 is completely outside */ float isInsideBokeh(float distance, float x, float y); public: BokehImageOperation(); /** - * @brief the inner loop of this program + * \brief the inner loop of this program */ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); /** - * @brief Initialize the execution + * \brief Initialize the execution */ void initExecution(); /** - * @brief Deinitialize the execution + * \brief Deinitialize the execution */ void deinitExecution(); /** - * @brief determine the resolution of this operation. currently fixed at [COM_BLUR_BOKEH_PIXELS, COM_BLUR_BOKEH_PIXELS] - * @param resolution - * @param preferredResolution + * \brief determine the resolution of this operation. currently fixed at [COM_BLUR_BOKEH_PIXELS, COM_BLUR_BOKEH_PIXELS] + * \param resolution + * \param preferredResolution */ void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); /** - * @brief set the node data - * @param data + * \brief set the node data + * \param data */ void setData(NodeBokehImage *data) { this->m_data = data; } /** - * @brief deleteDataOnFinish + * \brief deleteDataOnFinish * * There are cases that the compositor uses this operation on its own (see defocus node) * the deleteDataOnFinish must only be called when the data has been created by the compositor. diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.h b/source/blender/compositor/operations/COM_CalculateMeanOperation.h index 1872cb738b2..265057b6536 100644 --- a/source/blender/compositor/operations/COM_CalculateMeanOperation.h +++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.h @@ -26,13 +26,13 @@ #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 + * \brief Cached reference to the reader */ SocketReader *m_imageReader; diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h index 7089e40b210..2d357f30f7b 100644 --- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h +++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h @@ -26,8 +26,8 @@ #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: diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp index 16e33c908d6..24846f738dd 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cpp +++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp @@ -94,6 +94,7 @@ void CompositorOperation::deinitExecution() MEM_freeN(rv->rectz); } rv->rectz = this->m_depthBuffer; + rr->have_combined = true; } else { if (this->m_outputBuffer) { diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h index 19ed3180ace..1a3553d14b4 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.h +++ b/source/blender/compositor/operations/COM_CompositorOperation.h @@ -29,63 +29,63 @@ struct Scene; /** - * @brief Compositor output operation + * \brief Compositor output operation */ class CompositorOperation : public NodeOperation { private: const struct Scene *m_scene; /** - * @brief Scene name, used for getting the render output, includes 'SC' prefix. + * \brief Scene name, used for getting the render output, includes 'SC' prefix. */ char m_sceneName[MAX_ID_NAME]; /** - * @brief local reference to the scene + * \brief local reference to the scene */ const RenderData *m_rd; /** - * @brief reference to the output float buffer + * \brief reference to the output float buffer */ float *m_outputBuffer; /** - * @brief reference to the output depth float buffer + * \brief reference to the output depth float buffer */ float *m_depthBuffer; /** - * @brief local reference to the input image operation + * \brief local reference to the input image operation */ SocketReader *m_imageInput; /** - * @brief local reference to the input alpha operation + * \brief local reference to the input alpha operation */ SocketReader *m_alphaInput; /** - * @brief local reference to the depth operation + * \brief local reference to the depth operation */ SocketReader *m_depthInput; /** - * @brief Ignore any alpha input + * \brief Ignore any alpha input */ bool m_useAlphaInput; /** - * @brief operation is active for calculating final compo result + * \brief operation is active for calculating final compo result */ bool m_active; /** - * @brief View name, used for multiview + * \brief View name, used for multiview */ const char *m_viewName; public: CompositorOperation(); - const bool isActiveCompositorOutput() const { return this->m_active; } + bool isActiveCompositorOutput() const { return this->m_active; } void executeRegion(rcti *rect, unsigned int tileNumber); void setScene(const struct Scene *scene) { m_scene = scene; } void setSceneName(const char *sceneName) { BLI_strncpy(this->m_sceneName, sceneName, sizeof(this->m_sceneName)); } @@ -94,7 +94,7 @@ public: bool isOutputOperation(bool /*rendering*/) const { return this->isActiveCompositorOutput(); } void initExecution(); void deinitExecution(); - const CompositorPriority getRenderPriority() const { return COM_PRIORITY_MEDIUM; } + CompositorPriority getRenderPriority() const { return COM_PRIORITY_MEDIUM; } void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); void setUseAlphaInput(bool value) { this->m_useAlphaInput = value; } void setActive(bool active) { this->m_active = active; } diff --git a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h index 3dc7b67df8d..3b7272e86f6 100644 --- a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h +++ b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h @@ -37,17 +37,17 @@ private: SocketReader *m_inputOperation; /** - * @brief color profile where to convert from + * \brief color profile where to convert from */ int m_fromProfile; /** - * @brief color profile where to convert to + * \brief color profile where to convert to */ int m_toProfile; /** - * @brief is color predivided + * \brief is color predivided */ bool m_predivided; public: diff --git a/source/blender/compositor/operations/COM_DotproductOperation.cpp b/source/blender/compositor/operations/COM_DotproductOperation.cpp index e2e54ee4aa7..a0cde948d25 100644 --- a/source/blender/compositor/operations/COM_DotproductOperation.cpp +++ b/source/blender/compositor/operations/COM_DotproductOperation.cpp @@ -43,7 +43,7 @@ void DotproductOperation::deinitExecution() this->m_input2Operation = NULL; } -/** @todo: current implementation is the inverse of a dotproduct. not 'logically' correct +/** \todo: current implementation is the inverse of a dotproduct. not 'logically' correct */ void DotproductOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler) { diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp index d570424cb69..c3fc632c05d 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp @@ -128,7 +128,7 @@ void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src, float sigma, unsign if ((xy < 1) || (xy > 3)) xy = 3; // XXX The YVV macro defined below explicitly expects sources of at least 3x3 pixels, - // so just skiping blur along faulty direction if src's def is below that limit! + // so just skipping blur along faulty direction if src's def is below that limit! if (src_width < 3) xy &= ~1; if (src_height < 3) xy &= ~2; if (xy < 1) return; diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h index 985f56e3ef6..50b3d68426c 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h @@ -38,17 +38,17 @@ public: GaussianAlphaXBlurOperation(); /** - * @brief the inner loop of this program + * \brief the inner loop of this program */ void executePixel(float output[4], int x, int y, void *data); /** - * @brief initialize the execution + * \brief initialize the execution */ void initExecution(); /** - * @brief Deinitialize the execution + * \brief Deinitialize the execution */ void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h index 3935dcd6568..30672ad5ab2 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h @@ -43,7 +43,7 @@ public: void executePixel(float output[4], int x, int y, void *data); /** - * @brief initialize the execution + * \brief initialize the execution */ void initExecution(); diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h index 88d8ed44de6..6e7c9adbd9b 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h @@ -37,7 +37,7 @@ public: GaussianXBlurOperation(); /** - * @brief the inner loop of this program + * \brief the inner loop of this program */ void executePixel(float output[4], int x, int y, void *data); @@ -47,12 +47,12 @@ public: list<cl_kernel> *clKernelsToCleanUp); /** - * @brief initialize the execution + * \brief initialize the execution */ void initExecution(); /** - * @brief Deinitialize the execution + * \brief Deinitialize the execution */ void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h index 5df77eb28ce..00f9ebcd21f 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h @@ -47,7 +47,7 @@ public: list<cl_kernel> *clKernelsToCleanUp); /** - * @brief initialize the execution + * \brief initialize the execution */ void initExecution(); diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.h b/source/blender/compositor/operations/COM_GlareBaseOperation.h index 3fa676f4d31..413d495f670 100644 --- a/source/blender/compositor/operations/COM_GlareBaseOperation.h +++ b/source/blender/compositor/operations/COM_GlareBaseOperation.h @@ -39,12 +39,12 @@ typedef float fRGB[4]; class GlareBaseOperation : public SingleThreadedOperation { private: /** - * @brief Cached reference to the inputProgram + * \brief Cached reference to the inputProgram */ SocketReader *m_inputProgram; /** - * @brief settings of the glare node. + * \brief settings of the glare node. */ NodeGlare *m_settings; public: diff --git a/source/blender/compositor/operations/COM_GlareThresholdOperation.h b/source/blender/compositor/operations/COM_GlareThresholdOperation.h index 9a922a5889c..7934dd20524 100644 --- a/source/blender/compositor/operations/COM_GlareThresholdOperation.h +++ b/source/blender/compositor/operations/COM_GlareThresholdOperation.h @@ -28,12 +28,12 @@ class GlareThresholdOperation : public NodeOperation { private: /** - * @brief Cached reference to the inputProgram + * \brief Cached reference to the inputProgram */ SocketReader *m_inputProgram; /** - * @brief settings of the glare node. + * \brief settings of the glare node. */ NodeGlare *m_settings; public: diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h index 60172eb6413..40928484dbb 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.h +++ b/source/blender/compositor/operations/COM_ImageOperation.h @@ -35,7 +35,7 @@ extern "C" { } /** - * @brief Base class for all image operations + * \brief Base class for all image operations */ class BaseImageOperation : public NodeOperation { protected: diff --git a/source/blender/compositor/operations/COM_MapValueOperation.h b/source/blender/compositor/operations/COM_MapValueOperation.h index 33513c6f39c..c057ffe606a 100644 --- a/source/blender/compositor/operations/COM_MapValueOperation.h +++ b/source/blender/compositor/operations/COM_MapValueOperation.h @@ -58,7 +58,7 @@ public: void deinitExecution(); /** - * @brief set the TexMapping settings + * \brief set the TexMapping settings */ void setSettings(TexMapping *settings) { this->m_settings = settings; } diff --git a/source/blender/compositor/operations/COM_MaskOperation.cpp b/source/blender/compositor/operations/COM_MaskOperation.cpp index caafdfe8f0c..efc9f6edd5b 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.cpp +++ b/source/blender/compositor/operations/COM_MaskOperation.cpp @@ -54,7 +54,7 @@ void MaskOperation::initExecution() BKE_maskrasterize_handle_init(this->m_rasterMaskHandles[0], this->m_mask, this->m_maskWidth, this->m_maskHeight, - true, this->m_do_smooth, this->m_do_feather); + true, true, this->m_do_feather); } else { /* make a throw away copy of the mask */ @@ -88,7 +88,7 @@ void MaskOperation::initExecution() BKE_maskrasterize_handle_init(this->m_rasterMaskHandles[i], mask_temp, this->m_maskWidth, this->m_maskHeight, - true, this->m_do_smooth, this->m_do_feather); + true, true, this->m_do_feather); frame_iter += frame_step; } diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h index a586a91682e..02c0e61c31e 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.h +++ b/source/blender/compositor/operations/COM_MaskOperation.h @@ -48,7 +48,6 @@ protected: float m_frame_shutter; int m_frame_number; - bool m_do_smooth; bool m_do_feather; struct MaskRasterHandle *m_rasterMaskHandles[CMP_NODE_MASK_MBLUR_SAMPLES_MAX]; @@ -80,7 +79,6 @@ public: this->m_mask_px_ofs[1] = this->m_maskHeightInv * 0.5f; } void setFramenumber(int frame_number) { this->m_frame_number = frame_number; } - void setSmooth(bool smooth) { this->m_do_smooth = smooth; } void setFeather(bool feather) { this->m_do_feather = feather; } void setMotionBlurSamples(int samples) { this->m_rasterMaskHandleTot = min(max(1, samples), CMP_NODE_MASK_MBLUR_SAMPLES_MAX); } diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.h b/source/blender/compositor/operations/COM_NormalizeOperation.h index de1a23926f4..cebfad5dd17 100644 --- a/source/blender/compositor/operations/COM_NormalizeOperation.h +++ b/source/blender/compositor/operations/COM_NormalizeOperation.h @@ -25,18 +25,18 @@ #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 + * \brief Cached reference to the reader */ SocketReader *m_imageReader; /** - * @brief temporarily cache of the execution storage + * \brief temporarily cache of the execution storage * it stores x->min and y->mult */ NodeTwoFloats *m_cachedInstance; diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h index cc800ca222a..d230eefdd78 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.h +++ b/source/blender/compositor/operations/COM_OutputFileOperation.h @@ -57,7 +57,7 @@ public: bool isOutputOperation(bool /*rendering*/) const { return true; } void initExecution(); void deinitExecution(); - const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; } + CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; } bool isFileOutputOperation() const { return true; } }; @@ -99,7 +99,7 @@ public: bool isOutputOperation(bool /*rendering*/) const { return true; } void initExecution(); void deinitExecution(); - const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; } + CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; } bool isFileOutputOperation() const { return true; } }; diff --git a/source/blender/compositor/operations/COM_PixelateOperation.h b/source/blender/compositor/operations/COM_PixelateOperation.h index 5b08cb429f4..59337f11b54 100644 --- a/source/blender/compositor/operations/COM_PixelateOperation.h +++ b/source/blender/compositor/operations/COM_PixelateOperation.h @@ -26,7 +26,7 @@ #include "COM_NodeOperation.h" /** - * @brief Pixelate operation + * \brief Pixelate operation * * The Tile compositor is by default sub-pixel accurate. * For some setups you don want this. @@ -35,32 +35,32 @@ class PixelateOperation : public NodeOperation { private: /** - * @brief cached reference to the input operation + * \brief cached reference to the input operation */ SocketReader *m_inputOperation; public: /** - * @brief PixelateOperation - * @param dataType the datatype to create this operator for (saves datatype conversions) + * \brief PixelateOperation + * \param dataType the datatype to create this operator for (saves datatype conversions) */ PixelateOperation(DataType dataType); /** - * @brief initialization of the execution + * \brief initialization of the execution */ void initExecution(); /** - * @brief de-initialization of the execution + * \brief de-initialization of the execution */ void deinitExecution(); /** - * @brief executePixel - * @param output result - * @param x x-coordinate - * @param y y-coordinate - * @param sampler sampler + * \brief executePixel + * \param output result + * \param x x-coordinate + * \param y y-coordinate + * \param sampler sampler */ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cpp b/source/blender/compositor/operations/COM_PreviewOperation.cpp index 90e1bba3cd9..91f3dc4e643 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.cpp +++ b/source/blender/compositor/operations/COM_PreviewOperation.cpp @@ -142,7 +142,7 @@ void PreviewOperation::determineResolution(unsigned int resolution[2], unsigned resolution[1] = height; } -const CompositorPriority PreviewOperation::getRenderPriority() const +CompositorPriority PreviewOperation::getRenderPriority() const { return COM_PRIORITY_LOW; } diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h index 75317748897..350ecd5e314 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.h +++ b/source/blender/compositor/operations/COM_PreviewOperation.h @@ -33,7 +33,7 @@ protected: unsigned char *m_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 */ bNodePreview *m_preview; SocketReader *m_input; @@ -48,7 +48,7 @@ public: bool isOutputOperation(bool /*rendering*/) const { return !G.background; } void initExecution(); void deinitExecution(); - const CompositorPriority getRenderPriority() const; + CompositorPriority getRenderPriority() const; void executeRegion(rcti *rect, unsigned int tileNumber); void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.cpp b/source/blender/compositor/operations/COM_ReadBufferOperation.cpp index 6e7a32ba5a9..277b3606ff9 100644 --- a/source/blender/compositor/operations/COM_ReadBufferOperation.cpp +++ b/source/blender/compositor/operations/COM_ReadBufferOperation.cpp @@ -44,7 +44,7 @@ void ReadBufferOperation::determineResolution(unsigned int resolution[2], unsign operation->determineResolution(resolution, preferredResolution); operation->setResolution(resolution); - /// @todo: may not occur!, but does with blur node + /// \todo: may not occur!, but does with blur node if (this->m_memoryProxy->getExecutor()) { this->m_memoryProxy->getExecutor()->setResolution(resolution); } diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.h b/source/blender/compositor/operations/COM_ReadBufferOperation.h index c73acbaf300..4aa6eb7d492 100644 --- a/source/blender/compositor/operations/COM_ReadBufferOperation.h +++ b/source/blender/compositor/operations/COM_ReadBufferOperation.h @@ -44,7 +44,7 @@ public: void executePixelExtend(float output[4], float x, float y, PixelSampler sampler, MemoryBufferExtend extend_x, MemoryBufferExtend extend_y); void executePixelFiltered(float output[4], float x, float y, float dx[2], float dy[2]); - const bool isReadBufferOperation() const { return true; } + bool isReadBufferOperation() const { return true; } void setOffset(unsigned int offset) { this->m_offset = offset; } unsigned int getOffset() const { return this->m_offset; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.h b/source/blender/compositor/operations/COM_RenderLayersProg.h index 2a0f7efc9f8..b5946d44f74 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.h +++ b/source/blender/compositor/operations/COM_RenderLayersProg.h @@ -36,7 +36,7 @@ extern "C" { /** * Base class for all renderlayeroperations * - * @todo: rename to operation. + * \todo: rename to operation. */ class RenderLayersProg : public NodeOperation { protected: @@ -68,7 +68,7 @@ protected: int m_elementsize; /** - * @brief render data used for active rendering + * \brief render data used for active rendering */ const RenderData *m_rd; @@ -90,7 +90,7 @@ public: RenderLayersProg(const char *passName, DataType type, int elementsize); /** * setter for the scene field. Will be called from - * @see RenderLayerNode to set the actual scene where + * \see RenderLayerNode to set the actual scene where * the data will be retrieved from. */ void setScene(Scene *scene) { this->m_scene = scene; } diff --git a/source/blender/compositor/operations/COM_ScaleOperation.cpp b/source/blender/compositor/operations/COM_ScaleOperation.cpp index b498b359144..ff6b2438e9b 100644 --- a/source/blender/compositor/operations/COM_ScaleOperation.cpp +++ b/source/blender/compositor/operations/COM_ScaleOperation.cpp @@ -201,7 +201,7 @@ bool ScaleAbsoluteOperation::determineDependingAreaOfInterest(rcti *input, ReadB } -// Absolute fixed siez +// Absolute fixed size ScaleFixedSizeOperation::ScaleFixedSizeOperation() : BaseScaleOperation() { this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE); diff --git a/source/blender/compositor/operations/COM_SetColorOperation.h b/source/blender/compositor/operations/COM_SetColorOperation.h index 9a509f6fb0c..a3bd2e30749 100644 --- a/source/blender/compositor/operations/COM_SetColorOperation.h +++ b/source/blender/compositor/operations/COM_SetColorOperation.h @@ -39,13 +39,13 @@ public: */ SetColorOperation(); - const float getChannel1() { return this->m_color[0]; } + float getChannel1() { return this->m_color[0]; } void setChannel1(float value) { this->m_color[0] = value; } - const float getChannel2() { return this->m_color[1]; } + float getChannel2() { return this->m_color[1]; } void setChannel2(float value) { this->m_color[1] = value; } - const float getChannel3() { return this->m_color[2]; } + float getChannel3() { return this->m_color[2]; } void setChannel3(float value) { this->m_color[2] = value; } - const float getChannel4() { return this->m_color[3]; } + float getChannel4() { return this->m_color[3]; } void setChannel4(const float value) { this->m_color[3] = value; } void setChannels(const float value[4]) { diff --git a/source/blender/compositor/operations/COM_SetValueOperation.h b/source/blender/compositor/operations/COM_SetValueOperation.h index 4e274816f27..0dc7a4cd139 100644 --- a/source/blender/compositor/operations/COM_SetValueOperation.h +++ b/source/blender/compositor/operations/COM_SetValueOperation.h @@ -39,7 +39,7 @@ public: */ SetValueOperation(); - const float getValue() { return this->m_value; } + float getValue() { return this->m_value; } void setValue(float value) { this->m_value = value; } diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.h b/source/blender/compositor/operations/COM_SetVectorOperation.h index ca35784ff9a..98f5d918ec2 100644 --- a/source/blender/compositor/operations/COM_SetVectorOperation.h +++ b/source/blender/compositor/operations/COM_SetVectorOperation.h @@ -42,13 +42,13 @@ public: */ SetVectorOperation(); - const float getX() { return this->m_x; } + float getX() { return this->m_x; } void setX(float value) { this->m_x = value; } - const float getY() { return this->m_y; } + float getY() { return this->m_y; } void setY(float value) { this->m_y = value; } - const float getZ() { return this->m_z; } + float getZ() { return this->m_z; } void setZ(float value) { this->m_z = value; } - const float getW() { return this->m_w; } + float getW() { return this->m_w; } void setW(float value) { this->m_w = value; } /** diff --git a/source/blender/compositor/operations/COM_SunBeamsOperation.cpp b/source/blender/compositor/operations/COM_SunBeamsOperation.cpp index 40f2ee226ae..fc3dc6acca0 100644 --- a/source/blender/compositor/operations/COM_SunBeamsOperation.cpp +++ b/source/blender/compositor/operations/COM_SunBeamsOperation.cpp @@ -141,7 +141,7 @@ struct BufferLineAccumulator { /** * Perform the actual accumulation along a ray segment from source to pt. - * Only pixels withing dist_min..dist_max contribute. + * Only pixels within dist_min..dist_max contribute. * * The loop runs backwards(!) over the primary sector space axis u, i.e. increasing distance to pt. * After each step it decrements v by dv < 1, adding a buffer shift when necessary. diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h index 9f0f539800d..434f590a65d 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.h +++ b/source/blender/compositor/operations/COM_TextureOperation.h @@ -37,7 +37,7 @@ extern "C" { /** * Base class for all renderlayeroperations * - * @todo: rename to operation. + * \todo: rename to operation. */ class TextureBaseOperation : public NodeOperation { private: diff --git a/source/blender/compositor/operations/COM_TonemapOperation.h b/source/blender/compositor/operations/COM_TonemapOperation.h index 2b07ded7305..c205785b023 100644 --- a/source/blender/compositor/operations/COM_TonemapOperation.h +++ b/source/blender/compositor/operations/COM_TonemapOperation.h @@ -26,8 +26,8 @@ #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; @@ -38,23 +38,23 @@ 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 + * \brief Cached reference to the reader */ SocketReader *m_imageReader; /** - * @brief settings of the Tonemap + * \brief settings of the Tonemap */ NodeTonemap *m_data; /** - * @brief temporarily cache of the execution storage + * \brief temporarily cache of the execution storage */ AvgLogLum *m_cachedInstance; @@ -85,9 +85,9 @@ public: }; /** - * @brief class of tonemap, implementing the photoreceptor tonemap + * \brief class of tonemap, implementing the photoreceptor tonemap * most parts have already been done in TonemapOperation - * @ingroup operation + * \ingroup operation */ class PhotoreceptorTonemapOperation : public TonemapOperation { diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp index a252af053cc..b40051440af 100644 --- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp @@ -288,7 +288,7 @@ void InverseSearchRadiusOperation::initExecution() void *InverseSearchRadiusOperation::initializeTileData(rcti *rect) { - MemoryBuffer * data = new MemoryBuffer(COM_DT_COLOR, rect); + MemoryBuffer *data = new MemoryBuffer(COM_DT_COLOR, rect); float *buffer = data->getBuffer(); int x, y; int width = this->m_inputRadius->getWidth(); diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp index d14d745d049..76550bf4119 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp @@ -761,7 +761,7 @@ void zbuf_accumulate_vecblur( } /* blend with a falloff. this fixes the ugly effect you get with - * a fast moving object. then it looks like a solid object overlayed + * a fast moving object. then it looks like a solid object overlaid * over a very transparent moving version of itself. in reality, the * whole object should become transparent if it is moving fast, be * we don't know what is behind it so we don't do that. this hack diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.h b/source/blender/compositor/operations/COM_VectorBlurOperation.h index a33761166c6..fe8e9f20edb 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.h +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.h @@ -29,14 +29,14 @@ class VectorBlurOperation : public NodeOperation, public QualityStepHelper { private: /** - * @brief Cached reference to the inputProgram + * \brief Cached reference to the inputProgram */ SocketReader *m_inputImageProgram; SocketReader *m_inputSpeedProgram; SocketReader *m_inputZProgram; /** - * @brief settings of the glare node. + * \brief settings of the glare node. */ NodeBlurData *m_settings; diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp index 51fd5d4dc76..25167eeab9f 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cpp +++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp @@ -188,7 +188,7 @@ void ViewerOperation::updateImage(rcti *rect) this->updateDraw(); } -const CompositorPriority ViewerOperation::getRenderPriority() const +CompositorPriority ViewerOperation::getRenderPriority() const { if (this->isActiveViewerOutput()) { return COM_PRIORITY_HIGH; diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h index 43e305fb291..1eb3a1ad602 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.h +++ b/source/blender/compositor/operations/COM_ViewerOperation.h @@ -58,7 +58,7 @@ public: bool isOutputOperation(bool /*rendering*/) const { if (G.background) return false; return isActiveViewerOutput(); } void setImage(Image *image) { this->m_image = image; } void setImageUser(ImageUser *imageUser) { this->m_imageUser = imageUser; } - const bool isActiveViewerOutput() const { return this->m_active; } + bool isActiveViewerOutput() const { return this->m_active; } void setActive(bool active) { this->m_active = active; } void setCenterX(float centerX) { this->m_centerX = centerX;} void setCenterY(float centerY) { this->m_centerY = centerY;} @@ -66,7 +66,7 @@ public: float getCenterX() const { return this->m_centerX; } float getCenterY() const { return this->m_centerY; } OrderOfChunks getChunkOrder() const { return this->m_chunkOrder; } - const CompositorPriority getRenderPriority() const; + CompositorPriority getRenderPriority() const; bool isViewerOperation() const { return true; } void setUseAlphaInput(bool value) { this->m_useAlphaInput = value; } void setRenderData(const RenderData *rd) { this->m_rd = rd; } diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.h b/source/blender/compositor/operations/COM_WriteBufferOperation.h index 583d58e7b99..79e228c63fb 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.h +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.h @@ -27,8 +27,8 @@ #include "COM_MemoryProxy.h" #include "COM_SocketReader.h" /** - * @brief NodeOperation to write to a tile - * @ingroup Operation + * \brief NodeOperation to write to a tile + * \ingroup Operation */ class WriteBufferOperation : public NodeOperation { MemoryProxy *m_memoryProxy; @@ -39,7 +39,7 @@ public: ~WriteBufferOperation(); MemoryProxy *getMemoryProxy() { return this->m_memoryProxy; } void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); - const bool isWriteBufferOperation() const { return true; } + bool isWriteBufferOperation() const { return true; } bool isSingleValue() const { return m_single_value; } void executeRegion(rcti *rect, unsigned int tileNumber); |