Docs : Replace Appleseed shader with Cycles shader

Author: johnhaddon

doc/source/WorkingWithTheNodeGraph/BoxNode/scripts/illustrationBoxReferences.gfr

@@ -1,20 +1,19 @@
 import Gaffer
+import GafferCycles
 import GafferImage
-import GafferOSL
 import GafferScene
-import IECore
 import imath
 
-Gaffer.Metadata.registerValue( parent, "serialiser:milestoneVersion", 0, persistent=False )
-Gaffer.Metadata.registerValue( parent, "serialiser:majorVersion", 54, persistent=False )
+Gaffer.Metadata.registerValue( parent, "serialiser:milestoneVersion", 1, persistent=False )
+Gaffer.Metadata.registerValue( parent, "serialiser:majorVersion", 3, persistent=False )
 Gaffer.Metadata.registerValue( parent, "serialiser:minorVersion", 0, persistent=False )
 Gaffer.Metadata.registerValue( parent, "serialiser:patchVersion", 0, persistent=False )
 
 __children = {}
 
-parent["variables"].addChild( Gaffer.NameValuePlug( "image:catalogue:port", Gaffer.IntPlug( "value", defaultValue = 0, flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "imageCataloguePort" ) )
-parent["variables"].addChild( Gaffer.NameValuePlug( "project:name", Gaffer.StringPlug( "value", defaultValue = 'default', flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "projectName" ) )
-parent["variables"].addChild( Gaffer.NameValuePlug( "project:rootDirectory", Gaffer.StringPlug( "value", defaultValue = '$HOME/gaffer/projects/${project:name}', flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "projectRootDirectory" ) )
+parent["variables"].addChild( Gaffer.NameValuePlug( "image:catalogue:port", Gaffer.IntPlug( "value", defaultValue = 0, flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "imageCataloguePort", Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic ) )
+parent["variables"].addChild( Gaffer.NameValuePlug( "project:name", Gaffer.StringPlug( "value", defaultValue = 'default', flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "projectName", Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic ) )
+parent["variables"].addChild( Gaffer.NameValuePlug( "project:rootDirectory", Gaffer.StringPlug( "value", defaultValue = '$HOME/gaffer/projects/${project:name}', flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "projectRootDirectory", Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic ) )
 __children["mySurfaceShaders"] = Gaffer.Box( "mySurfaceShaders" )
 parent.addChild( __children["mySurfaceShaders"] )
 __children["mySurfaceShaders"].addChild( Gaffer.BoxIn( "BoxIn" ) )
@@ -40,15 +39,12 @@ __children["mySurfaceShaders"]["BoxIn2"].setup( Gaffer.Color3fPlug( "out", defau
 __children["mySurfaceShaders"]["BoxIn2"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
 __children["mySurfaceShaders"].addChild( Gaffer.Color3fPlug( "textures", defaultValue = imath.Color3f( 0.5, 0.5, 0.5 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
 __children["mySurfaceShaders"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
-__children["mySurfaceShaders"].addChild( GafferOSL.OSLShader( "as_disney_material" ) )
-__children["mySurfaceShaders"]["as_disney_material"].loadShader( "as_disney_material" )
-__children["mySurfaceShaders"]["as_disney_material"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
-__children["mySurfaceShaders"].addChild( GafferOSL.OSLShader( "as_closure2surface" ) )
-__children["mySurfaceShaders"]["as_closure2surface"].loadShader( "as_closure2surface" )
-__children["mySurfaceShaders"]["as_closure2surface"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
+__children["mySurfaceShaders"].addChild( GafferCycles.CyclesShader( "principled_bsdf" ) )
+__children["mySurfaceShaders"]["principled_bsdf"].loadShader( "principled_bsdf" )
+__children["mySurfaceShaders"]["principled_bsdf"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
 __children["defaultFormat"] = GafferImage.FormatPlug( "defaultFormat", defaultValue = GafferImage.Format( 1920, 1080, 1.000 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, )
 parent.addChild( __children["defaultFormat"] )
-parent["variables"]["imageCataloguePort"]["value"].setValue( 45739 )
+parent["variables"]["imageCataloguePort"]["value"].setValue( 38132 )
 Gaffer.Metadata.registerValue( parent["variables"]["imageCataloguePort"], 'readOnly', True )
 Gaffer.Metadata.registerValue( parent["variables"]["projectName"]["name"], 'readOnly', True )
 Gaffer.Metadata.registerValue( parent["variables"]["projectRootDirectory"]["name"], 'readOnly', True )
@@ -77,11 +73,11 @@ Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["out"], 'descripti
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["out"], 'plugValueWidget:type', '' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["out"], 'noduleLayout:spacing', 2.0 )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["out"], 'noduleLayout:section', 'bottom' )
-__children["mySurfaceShaders"]["Group"]["in"]["in0"].setInput( __children["mySurfaceShaders"]["BoxIn"]["out"] )
+__children["mySurfaceShaders"]["Group"]["in"][0].setInput( __children["mySurfaceShaders"]["BoxIn"]["out"] )
 __children["mySurfaceShaders"]["Group"]["__uiPosition"].setValue( imath.V2f( -6.91914892, -3.59166431 ) )
 __children["mySurfaceShaders"]["ShaderAssignment"]["in"].setInput( __children["mySurfaceShaders"]["Group"]["out"] )
 __children["mySurfaceShaders"]["ShaderAssignment"]["filter"].setInput( __children["mySurfaceShaders"]["BoxIn1"]["out"] )
-__children["mySurfaceShaders"]["ShaderAssignment"]["shader"].setInput( __children["mySurfaceShaders"]["as_closure2surface"]["out"] )
+__children["mySurfaceShaders"]["ShaderAssignment"]["shader"].setInput( __children["mySurfaceShaders"]["principled_bsdf"]["out"]["BSDF"] )
 __children["mySurfaceShaders"]["ShaderAssignment"]["__uiPosition"].setValue( imath.V2f( -6.91914892, -11.7557259 ) )
 __children["mySurfaceShaders"]["BoxIn1"]["name"].setValue( 'filter' )
 __children["mySurfaceShaders"]["BoxIn1"]["__in"].setInput( __children["mySurfaceShaders"]["filter"] )
@@ -109,22 +105,16 @@ Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"],
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"], 'plugValueWidget:type', None )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"], 'nodule:type', 'GafferUI::StandardNodule' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"], 'noduleLayout:visible', True )
-__children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"].setInput( __children["mySurfaceShaders"]["textures"]["r"] )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"], 'nodule:color', imath.Color3f( 0.246700004, 0.376199991, 0.469999999 ) )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"], 'noduleLayout:section', 'left' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"], 'userDefault', None )
-__children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"].setInput( __children["mySurfaceShaders"]["textures"]["g"] )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"], 'nodule:color', imath.Color3f( 0.246700004, 0.376199991, 0.469999999 ) )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"], 'noduleLayout:section', 'left' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"], 'userDefault', None )
-__children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"].setInput( __children["mySurfaceShaders"]["textures"]["b"] )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"], 'nodule:color', imath.Color3f( 0.246700004, 0.376199991, 0.469999999 ) )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"], 'noduleLayout:section', 'left' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"], 'userDefault', None )
-__children["mySurfaceShaders"]["BoxIn2"]["out"]["r"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"] )
-__children["mySurfaceShaders"]["BoxIn2"]["out"]["g"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"] )
-__children["mySurfaceShaders"]["BoxIn2"]["out"]["b"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"] )
-__children["mySurfaceShaders"]["BoxIn2"]["__uiPosition"].setValue( imath.V2f( -52.9208488, 1.69414592 ) )
+__children["mySurfaceShaders"]["BoxIn2"]["__uiPosition"].setValue( imath.V2f( -55.1208496, 6.99414587 ) )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"], 'noduleLayout:section', 'left' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"], 'userDefault', None )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"], 'nodule:color', imath.Color3f( 0.689999998, 0.537800014, 0.228300005 ) )
@@ -144,13 +134,8 @@ Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"]["g"],
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"]["b"], 'noduleLayout:section', 'left' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"]["b"], 'userDefault', None )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"]["b"], 'nodule:color', imath.Color3f( 0.246700004, 0.376199991, 0.469999999 ) )
-__children["mySurfaceShaders"]["as_disney_material"]["parameters"]["in_color"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"] )
-__children["mySurfaceShaders"]["as_disney_material"]["parameters"]["in_color"]["r"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"]["r"] )
-__children["mySurfaceShaders"]["as_disney_material"]["parameters"]["in_color"]["g"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"]["g"] )
-__children["mySurfaceShaders"]["as_disney_material"]["parameters"]["in_color"]["b"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"]["b"] )
-__children["mySurfaceShaders"]["as_disney_material"]["__uiPosition"].setValue( imath.V2f( -42.1361732, -12.9558535 ) )
-__children["mySurfaceShaders"]["as_closure2surface"]["parameters"]["in_input"].setInput( __children["mySurfaceShaders"]["as_disney_material"]["out"]["out_outColor"] )
-__children["mySurfaceShaders"]["as_closure2surface"]["__uiPosition"].setValue( imath.V2f( -24.5216961, -11.7557735 ) )
+__children["mySurfaceShaders"]["principled_bsdf"]["parameters"]["base_color"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"] )
+__children["mySurfaceShaders"]["principled_bsdf"]["__uiPosition"].setValue( imath.V2f( -31.1645927, -11.7557268 ) )
 
 
 del __children