Merge pull request #2 from andrewkaufman/smallFixes

Small fixes for examples files
Toolchefs · Dec 18, 2018 · d624571 · d624571
2 parents ec3e0c0 + 704b634
commit d624571
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,5 +45,7 @@ install( DIRECTORY startup DESTINATION . FILES_MATCHING PATTERN "*.py" )
 install( FILES ${ATOMS_ICONS_PATH}/logo_new.png DESTINATION graphics RENAME atoms_logo.png )
 
 # build the examples
-file( GLOB AtomsGafferExamples examples/scripts/*.gfr )
-install( FILES ${AtomsGafferExamples} DESTINATION examples/scripts )
+file( GLOB AtomsGafferExampleScripts examples/scripts/*.gfr )
+install( FILES ${AtomsGafferExampleScripts} DESTINATION examples/scripts )
+install( DIRECTORY examples/assets DESTINATION examples )
+
diff --git a/examples/scripts/atomsExampleScene.gfr b/examples/scripts/atomsExampleScene.gfr
@@ -236,7 +236,7 @@ __children["robot1_material"]["parameters"]["base_color"]["r"].setInput( __child
 __children["robot1_material"]["parameters"]["base_color"]["g"].setInput( __children["image"]["out"]["g"] )
 __children["robot1_material"]["parameters"]["base_color"]["b"].setInput( __children["image"]["out"]["b"] )
 __children["robot1_material"]["__uiPosition"].setValue( imath.V2f( -8.01374531, 107.712708 ) )
-__children["image"]["parameters"]["filename"].setValue( '/opt/Toolchefs/AtomsGaffer/examples/assets/atomsRobot/preview/atomsRobot/robot1_material_diff.jpg' )
+__children["image"]["parameters"]["filename"].setValue( '${ATOMS_GAFFER_ROOT}/examples/assets/atomsRobot/preview/atomsRobot/robot1_material_diff.jpg' )
 __children["image"]["__uiPosition"].setValue( imath.V2f( -21.0827217, 112.51236 ) )
 __children["PathFilter"]["paths"].setValue( IECore.StringVectorData( [ '/atomsRobot/Robot1' ] ) )
 __children["PathFilter"]["__uiPosition"].setValue( imath.V2f( 22.939579, 113.795319 ) )
@@ -249,7 +249,7 @@ __children["robot2_material"]["parameters"]["base_color"]["r"].setInput( __child
 __children["robot2_material"]["parameters"]["base_color"]["g"].setInput( __children["image1"]["out"]["g"] )
 __children["robot2_material"]["parameters"]["base_color"]["b"].setInput( __children["image1"]["out"]["b"] )
 __children["robot2_material"]["__uiPosition"].setValue( imath.V2f( -8.34950352, 88.6360016 ) )
-__children["image1"]["parameters"]["filename"].setValue( '/opt/Toolchefs/AtomsGaffer/examples/assets/atomsRobot/preview/atomsRobot/robot2_material_diff.jpg' )
+__children["image1"]["parameters"]["filename"].setValue( '${ATOMS_GAFFER_ROOT}/examples/assets/atomsRobot/preview/atomsRobot/robot2_material_diff.jpg' )
 __children["image1"]["__uiPosition"].setValue( imath.V2f( -21.7571201, 93.4352722 ) )
 __children["PathFilter1"]["paths"].setValue( IECore.StringVectorData( [ '/atomsRobot/Robot2' ] ) )
 __children["PathFilter1"]["__uiPosition"].setValue( imath.V2f( 23.2556305, 94.7194366 ) )
@@ -292,7 +292,7 @@ __children["purple_robot_material"]["parameters"]["base_color"]["r"].setInput( _
 __children["purple_robot_material"]["parameters"]["base_color"]["g"].setInput( __children["image2"]["out"]["g"] )
 __children["purple_robot_material"]["parameters"]["base_color"]["b"].setInput( __children["image2"]["out"]["b"] )
 __children["purple_robot_material"]["__uiPosition"].setValue( imath.V2f( -10.0755529, 69.5622787 ) )
-__children["image2"]["parameters"]["filename"].setValue( '/opt/Toolchefs/AtomsGaffer/examples/assets/atomsRobot/preview/atoms2Robot/purple_material_diff.jpg' )
+__children["image2"]["parameters"]["filename"].setValue( '${ATOMS_GAFFER_ROOT}/examples/assets/atomsRobot/preview/atoms2Robot/purple_material_diff.jpg' )
 __children["image2"]["__uiPosition"].setValue( imath.V2f( -25.205471, 74.3614502 ) )
 __children["PathFilter2"]["paths"].setValue( IECore.StringVectorData( [ '/atoms2Robot/PurpleRobot' ] ) )
 __children["PathFilter2"]["__uiPosition"].setValue( imath.V2f( 23.2432022, 75.6459503 ) )
@@ -305,7 +305,7 @@ __children["red_robot_material"]["parameters"]["base_color"]["r"].setInput( __ch
 __children["red_robot_material"]["parameters"]["base_color"]["g"].setInput( __children["image3"]["out"]["g"] )
 __children["red_robot_material"]["parameters"]["base_color"]["b"].setInput( __children["image3"]["out"]["b"] )
 __children["red_robot_material"]["__uiPosition"].setValue( imath.V2f( -9.18983364, 50.4922485 ) )
-__children["image3"]["parameters"]["filename"].setValue( '/opt/Toolchefs/AtomsGaffer/examples/assets/atomsRobot/preview/atoms2Robot/red_material_diff.jpg' )
+__children["image3"]["parameters"]["filename"].setValue( '${ATOMS_GAFFER_ROOT}/examples/assets/atomsRobot/preview/atoms2Robot/red_material_diff.jpg' )
 __children["image3"]["__uiPosition"].setValue( imath.V2f( -23.4377823, 55.2916107 ) )
 __children["PathFilter3"]["paths"].setValue( IECore.StringVectorData( [ '/atoms2Robot/RedRobot' ] ) )
 __children["PathFilter3"]["__uiPosition"].setValue( imath.V2f( 23.2502632, 56.5754852 ) )
@@ -318,7 +318,7 @@ __children["yellow_robot_material"]["parameters"]["base_color"]["r"].setInput( _
 __children["yellow_robot_material"]["parameters"]["base_color"]["g"].setInput( __children["image4"]["out"]["g"] )
 __children["yellow_robot_material"]["parameters"]["base_color"]["b"].setInput( __children["image4"]["out"]["b"] )
 __children["yellow_robot_material"]["__uiPosition"].setValue( imath.V2f( -10.1013918, 33.3922005 ) )
-__children["image4"]["parameters"]["filename"].setValue( '/opt/Toolchefs/AtomsGaffer/examples/assets/atomsRobot/preview/atoms2Robot/yellow_material_diff.jpg' )
+__children["image4"]["parameters"]["filename"].setValue( '${ATOMS_GAFFER_ROOT}/examples/assets/atomsRobot/preview/atoms2Robot/yellow_material_diff.jpg' )
 __children["image4"]["__uiPosition"].setValue( imath.V2f( -25.27071, 38.1921616 ) )
 __children["PathFilter4"]["paths"].setValue( IECore.StringVectorData( [ '/atoms2Robot/YellowRobot' ] ) )
 __children["PathFilter4"]["__uiPosition"].setValue( imath.V2f( 23.2760048, 37.5072174 ) )