Cleanup: Add override keyword.

This commit is contained in:
Jeroen Bakker 2021-03-24 15:30:36 +01:00
parent 9ad3d1d36b
commit e2d362757f
197 changed files with 773 additions and 665 deletions

View File

@ -36,23 +36,23 @@ class SingleThreadedOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
void executePixel(float output[4], int x, int y, void *data);
void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
void initExecution();
void initExecution() override;
/**
* Deinitialize the execution
*/
void deinitExecution();
void deinitExecution() override;
void *initializeTileData(rcti *rect);
void *initializeTileData(rcti *rect) override;
virtual MemoryBuffer *createMemoryBuffer(rcti *rect) = 0;
int isSingleThreaded()
int isSingleThreaded() override
{
return true;
}

View File

@ -29,5 +29,6 @@ class AlphaOverNode : public Node {
AlphaOverNode(bNode *editorNode) : Node(editorNode)
{
}
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class BilateralBlurNode : public Node {
public:
BilateralBlurNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class BlurNode : public Node {
public:
BlurNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class BokehBlurNode : public Node {
public:
BokehBlurNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class BokehImageNode : public Node {
public:
BokehImageNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class BoxMaskNode : public Node {
public:
BoxMaskNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class BrightnessNode : public Node {
public:
BrightnessNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ChannelMatteNode : public Node {
public:
ChannelMatteNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ChromaMatteNode : public Node {
public:
ChromaMatteNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ColorBalanceNode : public Node {
public:
ColorBalanceNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ColorCorrectionNode : public Node {
public:
ColorCorrectionNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ColorCurveNode : public Node {
public:
ColorCurveNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ExposureNode : public Node {
public:
ExposureNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ColorMatteNode : public Node {
public:
ColorMatteNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ColorNode : public Node {
public:
ColorNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ColorRampNode : public Node {
public:
ColorRampNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ColorSpillNode : public Node {
public:
ColorSpillNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ColorToBWNode : public Node {
public:
ColorToBWNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -23,7 +23,8 @@
class CombineColorNode : public Node {
public:
CombineColorNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
protected:
virtual NodeOperation *getColorConverter(const CompositorContext &context) const = 0;
@ -35,7 +36,7 @@ class CombineRGBANode : public CombineColorNode {
{
}
NodeOperation *getColorConverter(const CompositorContext &context) const;
NodeOperation *getColorConverter(const CompositorContext &context) const override;
};
class CombineHSVANode : public CombineColorNode {
@ -44,7 +45,7 @@ class CombineHSVANode : public CombineColorNode {
{
}
NodeOperation *getColorConverter(const CompositorContext &context) const;
NodeOperation *getColorConverter(const CompositorContext &context) const override;
};
class CombineYCCANode : public CombineColorNode {
@ -53,7 +54,7 @@ class CombineYCCANode : public CombineColorNode {
{
}
NodeOperation *getColorConverter(const CompositorContext &context) const;
NodeOperation *getColorConverter(const CompositorContext &context) const override;
};
class CombineYUVANode : public CombineColorNode {
@ -62,5 +63,5 @@ class CombineYUVANode : public CombineColorNode {
{
}
NodeOperation *getColorConverter(const CompositorContext &context) const;
NodeOperation *getColorConverter(const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class CompositorNode : public Node {
public:
CompositorNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -29,5 +29,6 @@ class ConvertAlphaNode : public Node {
ConvertAlphaNode(bNode *editorNode) : Node(editorNode)
{
}
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -28,5 +28,6 @@
class CornerPinNode : public Node {
public:
CornerPinNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class CropNode : public Node {
public:
CropNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -36,7 +36,8 @@ class CryptomatteBaseNode : public Node {
}
public:
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
protected:
virtual CryptomatteOperation *create_cryptomatte_operation(

View File

@ -27,5 +27,6 @@
class DefocusNode : public Node {
public:
DefocusNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class DenoiseNode : public Node {
public:
DenoiseNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class DespeckleNode : public Node {
public:
DespeckleNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class DifferenceMatteNode : public Node {
public:
DifferenceMatteNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -30,5 +30,6 @@ class DilateErodeNode : public Node {
public:
DilateErodeNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class DirectionalBlurNode : public Node {
public:
DirectionalBlurNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class DisplaceNode : public Node {
public:
DisplaceNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class DistanceMatteNode : public Node {
public:
DistanceMatteNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class DoubleEdgeMaskNode : public Node {
public:
DoubleEdgeMaskNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class EllipseMaskNode : public Node {
public:
EllipseMaskNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class FilterNode : public Node {
public:
FilterNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class FlipNode : public Node {
public:
FlipNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class GammaNode : public Node {
public:
GammaNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class GlareNode : public Node {
public:
GlareNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class HueSaturationValueCorrectNode : public Node {
public:
HueSaturationValueCorrectNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class HueSaturationValueNode : public Node {
public:
HueSaturationValueNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class IDMaskNode : public Node {
public:
IDMaskNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -44,5 +44,6 @@ class ImageNode : public Node {
public:
ImageNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class InpaintNode : public Node {
public:
InpaintNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class InvertNode : public Node {
public:
InvertNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -55,5 +55,6 @@ class KeyingNode : public Node {
public:
KeyingNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -28,5 +28,6 @@
class KeyingScreenNode : public Node {
public:
KeyingScreenNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class LensDistortionNode : public Node {
public:
LensDistortionNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class LuminanceMatteNode : public Node {
public:
LuminanceMatteNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class MapRangeNode : public Node {
public:
MapRangeNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class MapUVNode : public Node {
public:
MapUVNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class MapValueNode : public Node {
public:
MapValueNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -28,5 +28,6 @@
class MaskNode : public Node {
public:
MaskNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -29,5 +29,6 @@ class MathNode : public Node {
MathNode(bNode *editorNode) : Node(editorNode)
{
}
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class MixNode : public Node {
public:
MixNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -28,5 +28,6 @@
class MovieClipNode : public Node {
public:
MovieClipNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class MovieDistortionNode : public Node {
public:
MovieDistortionNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class NormalNode : public Node {
public:
NormalNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class NormalizeNode : public Node {
public:
NormalizeNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -28,5 +28,6 @@
class OutputFileNode : public Node {
public:
OutputFileNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class PixelateNode : public Node {
public:
PixelateNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -30,5 +30,6 @@
class PlaneTrackDeformNode : public Node {
public:
PlaneTrackDeformNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -31,7 +31,8 @@ struct Render;
class RenderLayersNode : public Node {
public:
RenderLayersNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
private:
void testSocketLink(NodeConverter &converter,

View File

@ -27,5 +27,6 @@
class RotateNode : public Node {
public:
RotateNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ScaleNode : public Node {
public:
ScaleNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -23,7 +23,8 @@
class SeparateColorNode : public Node {
public:
SeparateColorNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
protected:
virtual NodeOperation *getColorConverter(const CompositorContext &context) const = 0;
@ -35,7 +36,7 @@ class SeparateRGBANode : public SeparateColorNode {
{
}
NodeOperation *getColorConverter(const CompositorContext &context) const;
NodeOperation *getColorConverter(const CompositorContext &context) const override;
};
class SeparateHSVANode : public SeparateColorNode {
@ -44,7 +45,7 @@ class SeparateHSVANode : public SeparateColorNode {
{
}
NodeOperation *getColorConverter(const CompositorContext &context) const;
NodeOperation *getColorConverter(const CompositorContext &context) const override;
};
class SeparateYCCANode : public SeparateColorNode {
@ -53,7 +54,7 @@ class SeparateYCCANode : public SeparateColorNode {
{
}
NodeOperation *getColorConverter(const CompositorContext &context) const;
NodeOperation *getColorConverter(const CompositorContext &context) const override;
};
class SeparateYUVANode : public SeparateColorNode {
@ -62,5 +63,5 @@ class SeparateYUVANode : public SeparateColorNode {
{
}
NodeOperation *getColorConverter(const CompositorContext &context) const;
NodeOperation *getColorConverter(const CompositorContext &context) const override;
};

View File

@ -29,5 +29,6 @@ class SetAlphaNode : public Node {
SetAlphaNode(bNode *editorNode) : Node(editorNode)
{
}
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -30,7 +30,8 @@ class SocketProxyNode : public Node {
bNodeSocket *editorInput,
bNodeSocket *editorOutput,
bool use_conversion);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
bool getUseConversion() const
{
@ -49,5 +50,6 @@ class SocketProxyNode : public Node {
class SocketBufferNode : public Node {
public:
SocketBufferNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class SplitViewerNode : public Node {
public:
SplitViewerNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -28,5 +28,6 @@
class Stabilize2dNode : public Node {
public:
Stabilize2dNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -26,5 +26,6 @@
class SunBeamsNode : public Node {
public:
SunBeamsNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -28,5 +28,6 @@
class SwitchNode : public Node {
public:
SwitchNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -28,5 +28,6 @@
class SwitchViewNode : public Node {
public:
SwitchViewNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -28,5 +28,6 @@
class TextureNode : public Node {
public:
TextureNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class TimeNode : public Node {
public:
TimeNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class TonemapNode : public Node {
public:
TonemapNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -28,5 +28,6 @@
class TrackPositionNode : public Node {
public:
TrackPositionNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -28,5 +28,6 @@
class TransformNode : public Node {
public:
TransformNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class TranslateNode : public Node {
public:
TranslateNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ValueNode : public Node {
public:
ValueNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class VectorBlurNode : public Node {
public:
VectorBlurNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class VectorCurveNode : public Node {
public:
VectorCurveNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ViewLevelsNode : public Node {
public:
ViewLevelsNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -27,5 +27,6 @@
class ViewerNode : public Node {
public:
ViewerNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -29,5 +29,6 @@ class ZCombineNode : public Node {
ZCombineNode(bNode *editorNode) : Node(editorNode)
{
}
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};

View File

@ -34,5 +34,5 @@ class AlphaOverKeyOperation : public MixBaseOperation {
/**
* The inner loop of this operation.
*/
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};

View File

@ -37,7 +37,7 @@ class AlphaOverMixedOperation : public MixBaseOperation {
/**
* The inner loop of this operation.
*/
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
void setX(float x)
{

View File

@ -34,5 +34,5 @@ class AlphaOverPremultiplyOperation : public MixBaseOperation {
/**
* The inner loop of this operation.
*/
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};

View File

@ -39,20 +39,20 @@ class AntiAliasOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
void executePixel(float output[4], int x, int y, void *data);
void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
void initExecution();
void initExecution() override;
void *initializeTileData(rcti *rect);
void *initializeTileData(rcti *rect) override;
/**
* Deinitialize the execution
*/
void deinitExecution();
void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
rcti *output);
rcti *output) override;
};

View File

@ -34,21 +34,21 @@ class BilateralBlurOperation : public NodeOperation, public QualityStepHelper {
/**
* The inner loop of this operation.
*/
void executePixel(float output[4], int x, int y, void *data);
void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
void initExecution();
void initExecution() override;
/**
* Deinitialize the execution
*/
void deinitExecution();
void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
rcti *output);
rcti *output) override;
void setData(NodeBilateralBlurData *data)
{

View File

@ -53,12 +53,12 @@ class BlurBaseOperation : public NodeOperation, public QualityStepHelper {
/**
* Initialize the execution
*/
void initExecution();
void initExecution() override;
/**
* Deinitialize the execution
*/
void deinitExecution();
void deinitExecution() override;
void setData(const NodeBlurData *data);
@ -73,5 +73,6 @@ class BlurBaseOperation : public NodeOperation, public QualityStepHelper {
this->m_extend_bounds = extend_bounds;
}
void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
void determineResolution(unsigned int resolution[2],
unsigned int preferredResolution[2]) override;
};

View File

@ -37,25 +37,25 @@ class BokehBlurOperation : public NodeOperation, public QualityStepHelper {
public:
BokehBlurOperation();
void *initializeTileData(rcti *rect);
void *initializeTileData(rcti *rect) override;
/**
* The inner loop of this operation.
*/
void executePixel(float output[4], int x, int y, void *data);
void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
void initExecution();
void initExecution() override;
/**
* Deinitialize the execution
*/
void deinitExecution();
void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
rcti *output);
rcti *output) override;
void setSize(float size)
{
@ -68,12 +68,13 @@ class BokehBlurOperation : public NodeOperation, public QualityStepHelper {
cl_mem clOutputBuffer,
MemoryBuffer **inputMemoryBuffers,
std::list<cl_mem> *clMemToCleanUp,
std::list<cl_kernel> *clKernelsToCleanUp);
std::list<cl_kernel> *clKernelsToCleanUp) override;
void setExtendBounds(bool extend_bounds)
{
this->m_extend_bounds = extend_bounds;
}
void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
void determineResolution(unsigned int resolution[2],
unsigned int preferredResolution[2]) override;
};

View File

@ -110,23 +110,24 @@ class BokehImageOperation : public NodeOperation {
/**
* \brief The inner loop of this operation.
*/
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* \brief Initialize the execution
*/
void initExecution();
void initExecution() override;
/**
* \brief Deinitialize the execution
*/
void deinitExecution();
void deinitExecution() override;
/**
* \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]);
void determineResolution(unsigned int resolution[2],
unsigned int preferredResolution[2]) override;
/**
* \brief set the node data

View File

@ -41,17 +41,17 @@ class BoxMaskOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
void initExecution();
void initExecution() override;
/**
* Deinitialize the execution
*/
void deinitExecution();
void deinitExecution() override;
void setData(NodeBoxMask *data)
{

View File

@ -37,17 +37,17 @@ class BrightnessOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
void initExecution();
void initExecution() override;
/**
* Deinitialize the execution
*/
void deinitExecution();
void deinitExecution() override;
void setUsePremultiply(bool use_premultiply);
};

View File

@ -42,23 +42,23 @@ class CalculateMeanOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
void executePixel(float output[4], int x, int y, void *data);
void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
void initExecution();
void initExecution() override;
void *initializeTileData(rcti *rect);
void *initializeTileData(rcti *rect) override;
/**
* Deinitialize the execution
*/
void deinitExecution();
void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
rcti *output);
rcti *output) override;
void setSetting(int setting)
{
this->m_setting = setting;

View File

@ -36,7 +36,7 @@ class CalculateStandardDeviationOperation : public CalculateMeanOperation {
/**
* The inner loop of this operation.
*/
void executePixel(float output[4], int x, int y, void *data);
void executePixel(float output[4], int x, int y, void *data) override;
void *initializeTileData(rcti *rect);
void *initializeTileData(rcti *rect) override;
};

View File

@ -37,11 +37,11 @@ class ChangeHSVOperation : public NodeOperation {
*/
ChangeHSVOperation();
void initExecution();
void deinitExecution();
void initExecution() override;
void deinitExecution() override;
/**
* The inner loop of this operation.
*/
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};

View File

@ -56,10 +56,10 @@ class ChannelMatteOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
void initExecution();
void deinitExecution();
void initExecution() override;
void deinitExecution() override;
void setSettings(NodeChroma *nodeChroma, const int custom2)
{

View File

@ -39,10 +39,10 @@ class ChromaMatteOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
void initExecution();
void deinitExecution();
void initExecution() override;
void deinitExecution() override;
void setSettings(NodeChroma *nodeChroma)
{

Some files were not shown because too many files have changed in this diff Show More