fixup! 3Delight ShaderNetworkAlgo : Convert <UDIM> tokens to UDIM

Simplify UDIM test
GafferHQ · Apr 26, 2024 · aa17cc7 · aa17cc7
1 parent 95db579
commit aa17cc7
Showing 1 changed file with 31 additions and 33 deletions.
diff --git a/python/IECoreDelightTest/ShaderNetworkAlgoTest.py b/python/IECoreDelightTest/ShaderNetworkAlgoTest.py
@@ -520,42 +520,40 @@ def testConvertUSDPrimvarReader( self ) :
 
 	def testConvertUSDUVTextureUDIM( self ) :
 
-		for uvPrimvar in ( "st", "customUV" ) :
-
-			network = IECoreScene.ShaderNetwork(
-				shaders = {
-					"previewSurface" : IECoreScene.Shader( "UsdPreviewSurface" ),
-					"texture" : IECoreScene.Shader(
-						"UsdUVTexture", "shader",
-						{
-							"file" : "test.<UDIM>.png",
-							"wrapS" : "useMetadata",
-							"wrapT" : "repeat",
-							"sourceColorSpace" : "sRGB",
-						}
-					),
-					"uvReader" : IECoreScene.Shader(
-						"UsdPrimvarReader_float2", "shader",
-						{
-							"varname" : uvPrimvar,
-						}
-					),
-				},
-				connections = [
-					( ( "uvReader", "result" ), ( "texture", "st" ) ),
-					( ( "texture", "rgb" ), ( "previewSurface", "diffuseColor" ) ),
-				],
-				output = "previewSurface",
-			)
+		network = IECoreScene.ShaderNetwork(
+			shaders = {
+				"previewSurface" : IECoreScene.Shader( "UsdPreviewSurface" ),
+				"texture" : IECoreScene.Shader(
+					"UsdUVTexture", "shader",
+					{
+						"file" : "test.<UDIM>.png",
+						"wrapS" : "useMetadata",
+						"wrapT" : "repeat",
+						"sourceColorSpace" : "sRGB",
+					}
+				),
+				"uvReader" : IECoreScene.Shader(
+					"UsdPrimvarReader_float2", "shader",
+					{
+						"varname" : "st",
+					}
+				),
+			},
+			connections = [
+				( ( "uvReader", "result" ), ( "texture", "st" ) ),
+				( ( "texture", "rgb" ), ( "previewSurface", "diffuseColor" ) ),
+			],
+			output = "previewSurface",
+		)
 
-			IECoreDelight.ShaderNetworkAlgo.convertUSDShaders( network )
+		IECoreDelight.ShaderNetworkAlgo.convertUSDShaders( network )
 
-			self.assertEqual( network.input( ( "previewSurface", "base_color" ) ), ( "texture", "rgb" ) )
+		self.assertEqual( network.input( ( "previewSurface", "base_color" ) ), ( "texture", "rgb" ) )
 
-			texture = network.getShader( "texture" )
-			self.assertEqual( texture.name, "__usd/__usdUVTexture" )
-			self.assertEqual( texture.parameters["file"].value, "test.UDIM.png" )
-			self.assertEqual( texture.parameters["file_meta_colorspace"].value, "sRGB" )
+		texture = network.getShader( "texture" )
+		self.assertEqual( texture.name, "__usd/__usdUVTexture" )
+		self.assertEqual( texture.parameters["file"].value, "test.UDIM.png" )
+		self.assertEqual( texture.parameters["file_meta_colorspace"].value, "sRGB" )
 
 if __name__ == "__main__":
 	unittest.main()