Merge branch '1.3_maintenance' into main

GafferHQ · Dec 6, 2023 · a05ea6e · a05ea6e
2 parents 77b4094 + a6d160c
commit a05ea6e
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 0 deletions.
diff --git a/Changes.md b/Changes.md
@@ -31,7 +31,15 @@ Breaking Changes
 1.3.x.x (relative to 1.3.8.0)
 =======
 
+Fixes
+-----
+
+- AttributeQuery, OptionQuery, PrimitiveVariableQuery, ShaderQuery : Added support for querying values of all numeric data types, whereas before queries were limited to `bool`, `int` and `float` values.
+
+API
+---
 
+- PlugAlgo : `setPlugFromData()` now supports conversions from all numeric data types to `BoolPlug`, `IntPlug` and `FloatPlug` values.
 
 1.3.8.0 (relative to 1.3.7.0)
 =======

diff --git a/python/GafferSceneTest/AttributeQueryTest.py b/python/GafferSceneTest/AttributeQueryTest.py
@@ -1334,6 +1334,22 @@ def testShaderOutput( self ) :
 
 		self.assertEqual( q["value"].getValue(), v.attributes()["test:shader"] )
 
+	def testQueryDoubleData( self ) :
+
+		sphere = GafferScene.Sphere()
+
+		attributes = GafferScene.CustomAttributes()
+		attributes["in"].setInput( sphere["out"] )
+		attributes["extraAttributes"].setValue( IECore.CompoundObject( { "test" : IECore.DoubleData( 2.5 ) } ) )
+
+		query = GafferScene.AttributeQuery()
+		query.setup( Gaffer.FloatPlug() )
+		query["scene"].setInput( attributes["out"] )
+		query["location"].setValue( "/sphere" )
+		query["attribute"].setValue( "test" )
+
+		self.assertTrue( query["exists"].getValue() )
+		self.assertEqual( query["value"].getValue(), 2.5 )
 
 if __name__ == "__main__":
 	unittest.main()
diff --git a/python/GafferTest/PlugAlgoTest.py b/python/GafferTest/PlugAlgoTest.py
@@ -1070,5 +1070,34 @@ def testFindSource( self ) :
 			).isSame( node2["product"] )
 		)
 
+	def testNumericDataConversions( self ) :
+
+		for data in [
+			IECore.HalfData( 2.5 ),
+			IECore.DoubleData( 2.5 ),
+			IECore.CharData( "a" ),
+			IECore.UCharData( 11 ),
+			IECore.ShortData( -101 ),
+			IECore.UShortData( 102 ),
+			IECore.UIntData( 405 ),
+			IECore.Int64Data( -1001 ),
+			IECore.UInt64Data( 1002 ),
+		] :
+
+			for plugType in [
+				Gaffer.IntPlug,
+				Gaffer.FloatPlug,
+				Gaffer.BoolPlug,
+			] :
+
+				with self.subTest( data = data, plugType = plugType ) :
+
+					plug = plugType()
+					self.assertTrue( Gaffer.PlugAlgo.canSetValueFromData( plug, data ) )
+
+					Gaffer.PlugAlgo.setValueFromData( plug, data )
+					value = ord( data.value ) if isinstance( data, IECore.CharData ) else data.value
+					self.assertEqual( plug.getValue(), plugType.ValueType( value ) )
+
 if __name__ == "__main__":
 	unittest.main()
diff --git a/src/Gaffer/PlugAlgo.cpp b/src/Gaffer/PlugAlgo.cpp
@@ -554,12 +554,39 @@ bool setNumericPlugValue( PlugType *plug, const Data *value )
 {
 	switch( value->typeId() )
 	{
+		case HalfDataTypeId :
+			plug->setValue( static_cast<const HalfData *>( value )->readable() );
+			return true;
 		case FloatDataTypeId :
 			plug->setValue( static_cast<const FloatData *>( value )->readable() );
 			return true;
+		case DoubleDataTypeId :
+			plug->setValue( static_cast<const DoubleData *>( value )->readable() );
+			return true;
+		case CharDataTypeId :
+			plug->setValue( static_cast<const CharData *>( value )->readable() );
+			return true;
+		case UCharDataTypeId :
+			plug->setValue( static_cast<const UCharData *>( value )->readable() );
+			return true;
+		case ShortDataTypeId :
+			plug->setValue( static_cast<const ShortData *>( value )->readable() );
+			return true;
+		case UShortDataTypeId :
+			plug->setValue( static_cast<const UShortData *>( value )->readable() );
+			return true;
 		case IntDataTypeId :
 			plug->setValue( static_cast<const IntData *>( value )->readable() );
 			return true;
+		case UIntDataTypeId :
+			plug->setValue( static_cast<const UIntData *>( value )->readable() );
+			return true;
+		case Int64DataTypeId :
+			plug->setValue( static_cast<const Int64Data *>( value )->readable() );
+			return true;
+		case UInt64DataTypeId :
+			plug->setValue( static_cast<const UInt64Data *>( value )->readable() );
+			return true;
 		case BoolDataTypeId :
 			plug->setValue( static_cast<const BoolData *>( value )->readable() );
 			return true;
@@ -706,8 +733,17 @@ bool canSetNumericPlugValue( const Data *value )
 
 	switch( value->typeId() )
 	{
+		case HalfDataTypeId :
 		case FloatDataTypeId :
+		case DoubleDataTypeId :
+		case CharDataTypeId :
+		case UCharDataTypeId :
+		case ShortDataTypeId :
+		case UShortDataTypeId :
 		case IntDataTypeId :
+		case UIntDataTypeId :
+		case Int64DataTypeId :
+		case UInt64DataTypeId :
 		case BoolDataTypeId :
 			return true;
 		default :