Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Exclude light gizmo impact for usdLight test #225

Merged
merged 1 commit into from
Dec 11, 2024
+3 −3
Merged

Exclude light gizmo impact for usdLight test #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified test/lib/mayaUsd/render/mayaToHydra/USDLightsTest/allLights.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions test/testSamples/testUSDLights/testUSDLights.ma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = </mtl/standard_surface1>\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 = </mtl/standard_surface1/standard_surface1.outputs:out>\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 = </mtl/standard_surface1>\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 = </mtl/standard_surface1/standard_surface1.outputs:out>\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;
Expand Down