Merge branch '0.59_maintenance'

Author: johnhaddon

Changes.md

@@ -115,6 +115,43 @@ Build
   - OpenVDB 7.2.2.
   - Cortex 10.2.0.0.
 
+0.59.x.x (relative to 0.59.7.0)
+========
+
+Features
+--------
+
+- Viewer : Added multiple color inspectors. <kbd>Ctrl</kbd>+click on an image
+  to create a pixel inspector, or <kbd>Ctrl</kbd>+drag to create an area
+  inspector. The image footer now shows the results from all your inspectors,
+  and allows you to add or delete them.
+- FilterQuery : Added a new node for querying the results of a filter at a specific location.
+
+Improvements
+------------
+
+- TabbedContainer : Added menu button to allow selection of tabs that are not
+  visible due to a lack of horizontal space.
+
+Fixes
+-----
+
+- Arnold : Fixed rendering of encapsulated objects for which automatic instancing
+  is not possible. Examples include curves with non-zero `ai:curves:min_pixel_width`
+  and meshes with non-zero `ai:polymesh:subdiv_adaptive_error`.
+- PlugValueWidget : Fixed bug that tried to update the widget before all graph edits were complete.
+- GraphEditor : Fixed framing of nodes dropped into the editor. This was incorrect when the editor was
+  not at the default zoom.
+- OSL Constant : Fixed usage as a surface shader in Arnold.
+
+API
+---
+
+- Context : Added forwards compatibility for methods added to provide enhanced
+  performance in Gaffer 0.60. This allows the same code to be compiled for both
+  Gaffer 0.60 and Gaffer 0.59 (but with only the Gaffer 0.60 build benefiting
+  from improved performance).
+
 0.59.7.0 (relative to 0.59.6.0)
 ========
 
@@ -579,6 +616,16 @@ Build
   - OpenSSL 1.1.1h
   - See https://github.com/GafferHQ/dependencies/releases/tag/2.1.1 for full details.
 
+0.58.6.x (relative to 0.58.6.5)
+========
+
+Fixes
+-----
+
+- Arnold : Fixed rendering of encapsulated objects for which automatic instancing
+  is not possible. Examples include curves with non-zero `ai:curves:min_pixel_width`
+  and meshes with non-zero `ai:polymesh:subdiv_adaptive_error`.
+
 0.58.6.5 (relative to 0.58.6.4)
 ========
 

SConstruct

@@ -818,7 +818,7 @@ libraries = {
 
 	"GafferImageUI" : {
 		"envAppends" : {
-			"LIBS" : [ "IECoreGL$CORTEX_LIB_SUFFIX", "Gaffer", "GafferImage", "GafferUI", "OpenColorIO$OCIO_LIB_SUFFIX" ],
+			"LIBS" : [ "IECoreGL$CORTEX_LIB_SUFFIX", "Gaffer", "GafferImage", "GafferUI", "OpenColorIO$OCIO_LIB_SUFFIX", "IECoreScene$CORTEX_LIB_SUFFIX" ],
 		},
 		"pythonEnvAppends" : {
 			"LIBS" : [ "GafferBindings", "GafferUI", "GafferImage", "GafferImageUI" ],

include/GafferImage/ImageStats.h

@@ -54,7 +54,7 @@ class GAFFERIMAGE_API ImageStats : public Gaffer::ComputeNode
 
 	public :
 
-		ImageStats( const std::string &name=staticTypeName() );
+		ImageStats( const std::string &name=defaultName<ImageStats>() );
 		~ImageStats() override;
 
 		GAFFER_NODE_DECLARE_TYPE( GafferImage::ImageStats, ImageStatsTypeId, Gaffer::ComputeNode );

include/GafferImageUI/ImageView.h

@@ -43,6 +43,8 @@
 
 #include "GafferUI/View.h"
 
+#include "Gaffer/BoxPlug.h"
+#include "Gaffer/CompoundNumericPlug.h"
 #include "Gaffer/NumericPlug.h"
 #include "Gaffer/TypedPlug.h"
 
@@ -115,6 +117,33 @@ class GAFFERIMAGEUI_API ImageView : public GafferUI::View
 		static void registeredDisplayTransforms( std::vector<std::string> &names );
 		static GafferImage::ImageProcessorPtr createDisplayTransform( const std::string &name );
 
+		class ColorInspectorPlug : public Gaffer::ValuePlug
+		{
+			public :
+				enum class Mode
+				{
+					Cursor,
+					Pixel,
+					Area
+				};
+
+				GAFFER_PLUG_DECLARE_TYPE( ColorInspectorPlug, ColorInspectorPlugTypeId, Gaffer::ValuePlug );
+
+				ColorInspectorPlug( const std::string &name = defaultName<ColorInspectorPlug>(), Direction direction=In, unsigned flags=Default );
+
+				Gaffer::IntPlug *modePlug();
+				const Gaffer::IntPlug *modePlug() const;
+
+				Gaffer::V2iPlug *pixelPlug();
+				const Gaffer::V2iPlug *pixelPlug() const;
+
+				Gaffer::Box2iPlug *areaPlug();
+				const Gaffer::Box2iPlug *areaPlug() const;
+
+				bool acceptsChild( const GraphComponent *potentialChild ) const override;
+				Gaffer::PlugPtr createCounterpart( const std::string &name, Plug::Direction direction ) const override;
+		};
+
 	protected :
 
 		/// May be called from a subclass constructor to add a converter

include/GafferImageUI/TypeIds.h

@@ -45,6 +45,10 @@ enum TypeId
 	ImageViewTypeId = 110850,
 	ImageGadgetTypeId = 110851,
 	V2fContextVariableTypeId = 110852,
+	Box2iContextVariableTypeId = 110853,
+	ColorInspectorPlugTypeId = 110854,
+	Box2iGadgetTypeId = 110855,
+	V2iGadgetTypeId = 110856,
 
 	LastTypeId = 110899
 };

include/GafferScene/FilterQuery.h

@@ -0,0 +1,110 @@
+//////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) 2021, Cinesite VFX Ltd. 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.
+//
+//////////////////////////////////////////////////////////////////////////
+
+#ifndef GAFFERSCENE_FILTERQUERY_H
+#define GAFFERSCENE_FILTERQUERY_H
+
+#include "GafferScene/Export.h"
+#include "GafferScene/TypeIds.h"
+
+#include "Gaffer/ComputeNode.h"
+#include "Gaffer/NumericPlug.h"
+#include "Gaffer/StringPlug.h"
+#include "Gaffer/TypedObjectPlug.h"
+
+namespace GafferScene
+{
+
+IE_CORE_FORWARDDECLARE( ScenePlug )
+IE_CORE_FORWARDDECLARE( FilterPlug )
+
+class GAFFERSCENE_API FilterQuery : public Gaffer::ComputeNode
+{
+
+	public :
+
+		FilterQuery( const std::string &name=defaultName<FilterQuery>() );
+		~FilterQuery() override;
+
+		GAFFER_NODE_DECLARE_TYPE( GafferScene::FilterQuery, FilterQueryTypeId, ComputeNode );
+
+		ScenePlug *scenePlug();
+		const ScenePlug *scenePlug() const;
+
+		FilterPlug *filterPlug();
+		const FilterPlug *filterPlug() const;
+
+		Gaffer::StringPlug *locationPlug();
+		const Gaffer::StringPlug *locationPlug() const;
+
+		Gaffer::BoolPlug *exactMatchPlug();
+		const Gaffer::BoolPlug *exactMatchPlug() const;
+
+		Gaffer::BoolPlug *descendantMatchPlug();
+		const Gaffer::BoolPlug *descendantMatchPlug() const;
+
+		Gaffer::BoolPlug *ancestorMatchPlug();
+		const Gaffer::BoolPlug *ancestorMatchPlug() const;
+
+		Gaffer::StringPlug *closestAncestorPlug();
+		const Gaffer::StringPlug *closestAncestorPlug() const;
+
+		void affects( const Gaffer::Plug *input, AffectedPlugsContainer &outputs ) const override;
+
+	protected :
+
+		Gaffer::IntPlug *matchPlug();
+		const Gaffer::IntPlug *matchPlug() const;
+
+		// Used in the computation of `ancestorMatchPlug()`. This uses
+		// `${scene:path}` rather than `locationPlug()` so can be used in
+		// recursive computes to inherit results from ancestor contexts.
+		Gaffer::StringPlug *closestAncestorInternalPlug();
+		const Gaffer::StringPlug *closestAncestorInternalPlug() const;
+
+		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;
+
+		static size_t g_firstPlugIndex;
+
+};
+
+IE_CORE_DECLAREPTR( FilterQuery )
+
+} // namespace GafferScene
+
+#endif // GAFFERSCENE_FILTERQUERY_H

include/GafferScene/TypeIds.h

@@ -159,6 +159,7 @@ enum TypeId
 	UnencapsulateTypeId = 110614,
 	MotionPathTypeId = 110615,
 	InstancerContextVariablePlugTypeId = 110616,
+	FilterQueryTypeId = 110617,
 
 	PreviewGeometryTypeId = 110648,
 	PreviewProceduralTypeId = 110649,

python/GafferArnoldTest/IECoreArnoldPreviewTest/RendererTest.py

@@ -2591,6 +2591,78 @@ def render( self, renderer ) :
 			self.assertIsNone( arnold.AiNodeLookUpUserParameter( sphere, "user:a" ) )
 			self.assertIsNone( arnold.AiNodeLookUpUserParameter( sphere, "user:b" ) )
 
+	def testProceduralWithCurves( self ) :
+
+		class CurvesProcedural( GafferScene.Private.IECoreScenePreview.Procedural ) :
+
+			def __init__( self, minPixelWidth ) :
+
+				GafferScene.Private.IECoreScenePreview.Procedural.__init__( self )
+
+				self.__minPixelWidth = minPixelWidth
+
+			def render( self, renderer ) :
+
+				curves = IECoreScene.CurvesPrimitive(
+					IECore.IntVectorData( [ 4 ] ),
+					IECore.CubicBasisf.catmullRom(),
+					False,
+					IECore.V3fVectorData( [
+						imath.V3f( 0, -1, 0 ),
+						imath.V3f( 0, -1, 0 ),
+						imath.V3f( 0, 1, 0 ),
+						imath.V3f( 0, 1, 0 ),
+					] )
+				)
+
+				renderer.object(
+					"/curves",
+					curves,
+					renderer.attributes( IECore.CompoundObject( {
+						"ai:curves:min_pixel_width" : IECore.FloatData( self.__minPixelWidth )
+					} ) ),
+				)
+
+		IECore.registerRunTimeTyped( CurvesProcedural )
+
+		# We repeat the test with and without a min pixel width.
+		# This exercises the instanced and non-instanced code paths
+		# in the procedural renderer backend.
+		for minPixelWidth in ( 0.0, 1.0 ) :
+
+			renderer = GafferScene.Private.IECoreScenePreview.Renderer.create(
+				"Arnold",
+				GafferScene.Private.IECoreScenePreview.Renderer.RenderType.Batch,
+			)
+
+			renderer.object(
+				"/procedural",
+				CurvesProcedural( minPixelWidth ),
+				renderer.attributes( IECore.CompoundObject() )
+			).transform( imath.M44f().translate( imath.V3f( 0, 0, -1 ) ) )
+
+			outputFileName = os.path.join( self.temporaryDirectory(), "beauty.exr" )
+			renderer.output(
+				"test",
+				IECoreScene.Output(
+					outputFileName,
+					"exr",
+					"rgba",
+					{
+					}
+				)
+			)
+
+			renderer.render()
+			del renderer
+
+			# We should find the curves visible in the centre pixel.
+			image = IECoreImage.ImageReader( outputFileName ).read()
+			dimensions = image.dataWindow.size() + imath.V2i( 1 )
+			centreIndex = dimensions.x * int( dimensions.y * 0.5 ) + int( dimensions.x * 0.5 )
+			color = imath.Color3f( image["R"][centreIndex], image["G"][centreIndex], image["B"][centreIndex] )
+			self.assertEqual( color, imath.Color3f( 1 ) )
+
 	@staticmethod
 	def __aovShaders() :