Added DiskBlur

Author: danieldresser-ie

Changes.md

@@ -1,6 +1,11 @@
 1.6.x.x (relative to 1.6.0.0a2)
 =======
 
+Features
+--------
+
+- DiskBlur : Added image node for doing fast variable-radius blur. Will be used as core of upcoming focal blur node.
+
 Improvements
 ------------
 

include/GafferImage/DiskBlur.h

@@ -0,0 +1,118 @@
+//////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) 2025, Image Engine Design Inc. All rights reserved.
+//
+//  Redistribution and use in source and binary forms, with or without
+//  modification, are permitted provided that the following conditions are
+//  met:
+//
+//      * Redistributions of source code must retain the above
+//        copyright notice, this list of conditions and the following
+//        disclaimer.
+//
+//      * Redistributions in binary form must reproduce the above
+//        copyright notice, this list of conditions and the following
+//        disclaimer in the documentation and/or other materials provided with
+//        the distribution.
+//
+//      * Neither the name of John Haddon nor the names of
+//        any other contributors to this software may be used to endorse or
+//        promote products derived from this software without specific prior
+//        written permission.
+//
+//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+//  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+//  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+//  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+//  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+//////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "GafferImage/ImageProcessor.h"
+
+#include "Gaffer/StringPlug.h"
+
+#include "IECore/Object.h"
+
+#include "Gaffer/TypedObjectPlug.h"
+
+
+
+namespace GafferImage
+{
+
+class GAFFERIMAGE_API DiskBlur : public ImageProcessor
+{
+	public :
+
+		explicit DiskBlur( const std::string &name=defaultName<DiskBlur>() );
+		~DiskBlur() override;
+
+		GAFFER_NODE_DECLARE_TYPE( GafferImage::DiskBlur, DiskBlurTypeId, ImageProcessor );
+
+		Gaffer::FloatPlug *radiusPlug();
+		const Gaffer::FloatPlug *radiusPlug() const;
+
+		Gaffer::StringPlug *radiusChannelPlug();
+		const Gaffer::StringPlug *radiusChannelPlug() const;
+
+		Gaffer::FloatPlug *approximationThresholdPlug();
+		const Gaffer::FloatPlug *approximationThresholdPlug() const;
+
+		Gaffer::IntPlug *maxRadiusPlug();
+		const Gaffer::IntPlug *maxRadiusPlug() const;
+
+		Gaffer::FloatVectorDataPlug *layerBoundariesPlug();
+		const Gaffer::FloatVectorDataPlug *layerBoundariesPlug() const;
+
+		void affects( const Gaffer::Plug *input, AffectedPlugsContainer &outputs ) const override;
+
+	protected :
+
+		void hash( const Gaffer::ValuePlug *output, const Gaffer::Context *context, IECore::MurmurHash &h ) const override;
+		void compute( Gaffer::ValuePlug *output, const Gaffer::Context *context ) const override;
+
+		Gaffer::ValuePlug::CachePolicy computeCachePolicy( const Gaffer::ValuePlug *output ) const override;
+
+		void hashChannelData( const GafferImage::ImagePlug *parent, const Gaffer::Context *context, IECore::MurmurHash &h ) const override;
+		IECore::ConstFloatVectorDataPtr computeChannelData( const std::string &channelName, const Imath::V2i &tileOrigin, const Gaffer::Context *context, const ImagePlug *parent ) const override;
+
+	private :
+
+		Gaffer::ObjectVectorPlug *tileBoundPlug();
+		const Gaffer::ObjectVectorPlug *tileBoundPlug() const;
+
+		Gaffer::ObjectVectorPlug *scanlinesLUTPlug();
+		const Gaffer::ObjectVectorPlug *scanlinesLUTPlug() const;
+
+		Gaffer::BoolPlug *useReferenceImplementationPlug();
+		const Gaffer::BoolPlug *useReferenceImplementationPlug() const;
+
+		Gaffer::ObjectVectorPlug *layerWeightsPlug();
+		const Gaffer::ObjectVectorPlug *layerWeightsPlug() const;
+
+		void hashScanlinesLUT( const Gaffer::Context *context, IECore::MurmurHash &h ) const;
+		IECore::ConstObjectVectorPtr computeScanlinesLUT( const Gaffer::Context *context ) const;
+
+		void hashTileBound( const Gaffer::Context *context, IECore::MurmurHash &h ) const;
+		IECore::ConstObjectVectorPtr computeTileBound( const Imath::V2i &tileOrigin, const Gaffer::Context *context ) const;
+
+		void hashLayerWeights( const Gaffer::Context *context, IECore::MurmurHash &h ) const;
+		IECore::ConstObjectVectorPtr computeLayerWeights( const Imath::V2i &tileOrigin, const Gaffer::Context *context ) const;
+
+
+		static size_t g_firstPlugIndex;
+
+};
+
+IE_CORE_DECLAREPTR( DiskBlur )
+
+} // namespace GafferImage

include/GafferImage/TypeIds.h

@@ -121,6 +121,7 @@ enum TypeId
 	DeepRecolorTypeId = 121476,
 	SaturationTypeId = 121477,
 	DeepSliceTypeId = 121478,
+	DiskBlurTypeId = 121479,
 
 	LastTypeId = 121999
 };