diff --git a/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt b/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt index 69e893a4c2..02e18af574 100644 --- a/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt +++ b/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt @@ -27,7 +27,7 @@ set(INTERACTIVE_TEST_SCRIPT_FILES testMayaDisplayLayers.py testMayaIsolateSelect.py testMayaLights.py - testUSDLights.py|skipOnPlatform:osx # HYDRA-1315 : Wire of DiskLight not showing on OSX + testUSDLights.py testUVandUDIM.py testArnoldLights.py|depOnPlugins:mtoa testLookThrough.py diff --git a/test/lib/mayaUsd/render/mayaToHydra/USDLightsTest/allLights.png b/test/lib/mayaUsd/render/mayaToHydra/USDLightsTest/allLights.png index bdeeb1606c..75e22e17d1 100644 Binary files a/test/lib/mayaUsd/render/mayaToHydra/USDLightsTest/allLights.png and b/test/lib/mayaUsd/render/mayaToHydra/USDLightsTest/allLights.png differ diff --git a/test/testSamples/testUSDLights/testUSDLights.ma b/test/testSamples/testUSDLights/testUSDLights.ma index e08805c80b..15c74a5595 100644 --- a/test/testSamples/testUSDLights/testUSDLights.ma +++ b/test/testSamples/testUSDLights/testUSDLights.ma @@ -201,8 +201,8 @@ createNode mayaUsdLayerManager -n "mayaUsdLayerManager1"; setAttr ".lyr[1].id" -type "string" "./UsdStageWithSphereMatXStdSurf.usda"; setAttr ".lyr[1].fid" -type "string" "usd"; setAttr ".lyr[1].szd" -type "string" ( - "#usda 1.0\n\ndef Sphere \"Sphere1\" (\n prepend apiSchemas = [\"MaterialBindingAPI\"]\n)\n{\n rel material:binding = \n double3 xformOp:translate = (0, 0, -2.3244301402269603)\n uniform token[] xformOpOrder = [\"xformOp:translate\"]\n}\n\ndef Scope \"mtl\"\n{\n def Material \"standard_surface1\"\n {\n token outputs:mtlx:surface.connect = \n\n def Shader \"standard_surface1\"\n {\n uniform token info:id = \"ND_standard_surface_surfaceshader\"\n token outputs:out\n }\n }\n}\n\ndef DistantLight \"DistantLight1\"\n{\n float inputs:angle = 0.53\n color3f inputs:shadow:color\n bool inputs:shadow:enable = 1\n token visibility = \"inherited\"\n float3 xformOp:rotateXYZ = (-90, 0, 0)\n double3 xformOp:translate = (0, 2, 0)\n uniform token[] xformOpOrder = [\"xformOp:translate\", \"xformOp:rotateXYZ\"]\n}\n\ndef DiskLight \"DiskLight1\"\n{\n float inputs:radius = 2.4875622\n token visibility = \"inherited\"\n float3 xformOp:rotateXYZ = (-90, 0, 0)\n" - + " double3 xformOp:translate = (0, 2, 0)\n uniform token[] xformOpOrder = [\"xformOp:translate\", \"xformOp:rotateXYZ\"]\n}\n\ndef DomeLight \"DomeLight1\"\n{\n asset inputs:texture:file = @sky.hdr@\n double3 xformOp:translate = (0, 2.329096001473479, 0)\n uniform token[] xformOpOrder = [\"xformOp:translate\"]\n}\n\n"); + "#usda 1.0\n\ndef Sphere \"Sphere1\" (\n prepend apiSchemas = [\"MaterialBindingAPI\"]\n)\n{\n rel material:binding = \n double3 xformOp:translate = (0, 0, -2.3244301402269603)\n uniform token[] xformOpOrder = [\"xformOp:translate\"]\n}\n\ndef Scope \"mtl\"\n{\n def Material \"standard_surface1\"\n {\n token outputs:mtlx:surface.connect = \n\n def Shader \"standard_surface1\"\n {\n uniform token info:id = \"ND_standard_surface_surfaceshader\"\n token outputs:out\n }\n }\n}\n\ndef DistantLight \"DistantLight1\"\n{\n float inputs:angle = 0.53\n color3f inputs:shadow:color\n bool inputs:shadow:enable = 1\n token visibility = \"inherited\"\n float3 xformOp:rotateXYZ = (-90, 0, 0)\n double3 xformOp:translate = (0, 8, 0)\n uniform token[] xformOpOrder = [\"xformOp:translate\", \"xformOp:rotateXYZ\"]\n}\n\ndef DiskLight \"DiskLight1\"\n{\n float inputs:radius = 2.4875622\n token visibility = \"inherited\"\n float3 xformOp:rotateXYZ = (-90, 0, 0)\n" + + " double3 xformOp:translate = (0, 8, 0)\n uniform token[] xformOpOrder = [\"xformOp:translate\", \"xformOp:rotateXYZ\"]\n}\n\ndef DomeLight \"DomeLight1\"\n{\n asset inputs:texture:file = @sky.hdr@\n double3 xformOp:translate = (0, 8.329096001473479, 0)\n uniform token[] xformOpOrder = [\"xformOp:translate\"]\n}\n\n"); select -ne :time1; setAttr ".o" 0; select -ne :hardwareRenderingGlobals;