From 64693a4a8264c49d28727c71ed81a11bc91063e8 Mon Sep 17 00:00:00 2001 From: Dan McGarry Date: Wed, 27 Jul 2022 12:50:04 -0700 Subject: [PATCH 1/2] Removing UsdImagingGL Legacy engine Cleaning up code that assumed the potential existence of the UsdImagingGL Legacy engine as this has now been removed. --- .../AL_USDMaya/AL/usdmaya/nodes/Engine.cpp | 3 - .../TestProxyShapeAnonymousLayer/foo.ma | 167 ++++++++++++++++++ 2 files changed, 167 insertions(+), 3 deletions(-) create mode 100644 plugin/al/plugin/AL_USDMayaTestPlugin/py/testProxyShapeOutput/TestProxyShapeAnonymousLayer/foo.ma diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.cpp index e4ff6b98e4..f9ae06de14 100644 --- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.cpp @@ -71,9 +71,6 @@ bool Engine::TestIntersectionBatch( MProfilingScope profilerScope( _enginProfilerCategory, MProfiler::kColorE_L3, "Test intersection batch"); - if (ARCH_UNLIKELY(_legacyImpl)) { - return false; - } _UpdateHydraCollection(&_intersectCollection, paths, params); TfTokenVector renderTags; diff --git a/plugin/al/plugin/AL_USDMayaTestPlugin/py/testProxyShapeOutput/TestProxyShapeAnonymousLayer/foo.ma b/plugin/al/plugin/AL_USDMayaTestPlugin/py/testProxyShapeOutput/TestProxyShapeAnonymousLayer/foo.ma new file mode 100644 index 0000000000..0460943a6d --- /dev/null +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/py/testProxyShapeOutput/TestProxyShapeAnonymousLayer/foo.ma @@ -0,0 +1,167 @@ +//Maya ASCII 2023 scene +//Name: foo.ma +//Last modified: Wed, Jul 27, 2022 12:48:22 PM +//Codeset: UTF-8 +requires maya "2023"; +requires -nodeType "AL_usdmaya_ProxyShape" -nodeType "AL_usdmaya_LayerManager" -dataType "pxrUsdStageData" + "AL_USDMayaPlugin" "3.0.0"; +currentUnit -l centimeter -a degree -t film; +fileInfo "application" "maya"; +fileInfo "product" "Maya 2023"; +fileInfo "version" "2023"; +fileInfo "cutIdentifier" "202205052215-234554116d"; +fileInfo "osv" "Linux 3.10.0-1160.66.1.el7.x86_64 #1 SMP Wed Apr 27 20:34:34 UTC 2022 x86_64"; +fileInfo "UUID" "7467DC80-0000-765D-62E1-968600000228"; +createNode transform -s -n "persp"; + rename -uid "7467DC80-0000-765D-62E1-968600000214"; + setAttr ".v" no; + setAttr ".t" -type "double3" 28 21 28 ; + setAttr ".r" -type "double3" -27.938352729602379 44.999999999999972 -5.172681101354183e-14 ; +createNode camera -s -n "perspShape" -p "persp"; + rename -uid "7467DC80-0000-765D-62E1-968600000215"; + setAttr -k off ".v" no; + setAttr ".fl" 34.999999999999993; + setAttr ".coi" 44.82186966202994; + setAttr ".imn" -type "string" "persp"; + setAttr ".den" -type "string" "persp_depth"; + setAttr ".man" -type "string" "persp_mask"; + setAttr ".hc" -type "string" "viewSet -p %camera"; +createNode transform -s -n "top"; + rename -uid "7467DC80-0000-765D-62E1-968600000216"; + setAttr ".v" no; + setAttr ".t" -type "double3" 0 1000.1 0 ; + setAttr ".r" -type "double3" -89.999999999999986 0 0 ; +createNode camera -s -n "topShape" -p "top"; + rename -uid "7467DC80-0000-765D-62E1-968600000217"; + setAttr -k off ".v" no; + setAttr ".rnd" no; + setAttr ".coi" 1000.1; + setAttr ".ow" 30; + setAttr ".imn" -type "string" "top"; + setAttr ".den" -type "string" "top_depth"; + setAttr ".man" -type "string" "top_mask"; + setAttr ".hc" -type "string" "viewSet -t %camera"; + setAttr ".o" yes; +createNode transform -s -n "front"; + rename -uid "7467DC80-0000-765D-62E1-968600000218"; + setAttr ".v" no; + setAttr ".t" -type "double3" 0 0 1000.1 ; +createNode camera -s -n "frontShape" -p "front"; + rename -uid "7467DC80-0000-765D-62E1-968600000219"; + setAttr -k off ".v" no; + setAttr ".rnd" no; + setAttr ".coi" 1000.1; + setAttr ".ow" 30; + setAttr ".imn" -type "string" "front"; + setAttr ".den" -type "string" "front_depth"; + setAttr ".man" -type "string" "front_mask"; + setAttr ".hc" -type "string" "viewSet -f %camera"; + setAttr ".o" yes; +createNode transform -s -n "side"; + rename -uid "7467DC80-0000-765D-62E1-96860000021A"; + setAttr ".v" no; + setAttr ".t" -type "double3" 1000.1 0 0 ; + setAttr ".r" -type "double3" 0 89.999999999999986 0 ; +createNode camera -s -n "sideShape" -p "side"; + rename -uid "7467DC80-0000-765D-62E1-96860000021B"; + setAttr -k off ".v" no; + setAttr ".rnd" no; + setAttr ".coi" 1000.1; + setAttr ".ow" 30; + setAttr ".imn" -type "string" "side"; + setAttr ".den" -type "string" "side_depth"; + setAttr ".man" -type "string" "side_mask"; + setAttr ".hc" -type "string" "viewSet -s %camera"; + setAttr ".o" yes; +createNode transform -n "anonymousShape"; + rename -uid "7467DC80-0000-765D-62E1-968600000225"; +createNode AL_usdmaya_ProxyShape -n "anonymousShapeShape" -p "anonymousShape"; + rename -uid "7467DC80-0000-765D-62E1-968600000226"; + addAttr -r false -ci true -h true -sn "forceCompute" -ln "forceCompute" -min 0 + -max 1 -at "bool"; + addAttr -ci true -h true -sn "usdStageLoadRules" -ln "usdStageLoadRules" -dt "string"; + setAttr -k off ".v"; + setAttr ".vir" yes; + setAttr ".vif" yes; + setAttr ".covm[0]" 0 1 1; + setAttr ".cdvm[0]" 0 1 1; + setAttr ".fp" -type "string" "anon:0x8fa6c50:tmp.usda"; + setAttr ".usdStageLoadRules" -type "string" ""; +createNode lightLinker -s -n "lightLinker1"; + rename -uid "7467DC80-0000-765D-62E1-96860000021C"; + setAttr -s 2 ".lnk"; + setAttr -s 2 ".slnk"; +createNode displayLayerManager -n "layerManager"; + rename -uid "7467DC80-0000-765D-62E1-96860000021D"; +createNode displayLayer -n "defaultLayer"; + rename -uid "7467DC80-0000-765D-62E1-96860000021E"; +createNode renderLayerManager -n "renderLayerManager"; + rename -uid "7467DC80-0000-765D-62E1-96860000021F"; +createNode renderLayer -n "defaultRenderLayer"; + rename -uid "7467DC80-0000-765D-62E1-968600000220"; + setAttr ".g" yes; +createNode shapeEditorManager -n "shapeEditorManager"; + rename -uid "7467DC80-0000-765D-62E1-968600000221"; +createNode poseInterpolatorManager -n "poseInterpolatorManager"; + rename -uid "7467DC80-0000-765D-62E1-968600000222"; +createNode AL_usdmaya_LayerManager -n "AL_usdmaya_LayerManager1"; + rename -uid "7467DC80-0000-765D-62E1-968600000227"; + setAttr ".lyr[0].id" -type "string" "anon:0x8fa6c50:tmp.usda"; + setAttr ".lyr[0].fid" -type "string" "usda"; + setAttr ".lyr[0].szd" -type "string" "#usda 1.0\n\ndef \"root\"\n{\n def \"GEO\"\n {\n def Xform \"sphere_hrc\"\n {\n double3 xformOp:translate = (0, 1, 0)\n uniform token[] xformOpOrder = [\"xformOp:translate\"]\n\n def Sphere \"sphere\"\n {\n double radius = 5\n }\n }\n }\n}\n\n"; + setAttr ".lyr[0].ann" yes; +createNode script -n "uiConfigurationScriptNode"; + rename -uid "7467DC80-0000-765D-62E1-968600000229"; + setAttr ".b" -type "string" "// Maya Mel UI Configuration File.\n// No UI generated in batch mode.\n"; + setAttr ".st" 3; +createNode script -n "sceneConfigurationScriptNode"; + rename -uid "7467DC80-0000-765D-62E1-96860000022A"; + setAttr ".b" -type "string" "playbackOptions -min 1 -max 120 -ast 1 -aet 200 "; + setAttr ".st" 6; +select -ne :time1; + setAttr ".o" 1; + setAttr ".unw" 1; +select -ne :hardwareRenderingGlobals; + setAttr ".otfna" -type "stringArray" 22 "NURBS Curves" "NURBS Surfaces" "Polygons" "Subdiv Surface" "Particles" "Particle Instance" "Fluids" "Strokes" "Image Planes" "UI" "Lights" "Cameras" "Locators" "Joints" "IK Handles" "Deformers" "Motion Trails" "Components" "Hair Systems" "Follicles" "Misc. UI" "Ornaments" ; + setAttr ".otfva" -type "Int32Array" 22 0 1 1 1 1 1 + 1 1 1 0 0 0 0 0 0 0 0 0 + 0 0 0 0 ; + setAttr ".fprt" yes; +select -ne :renderPartition; + setAttr -s 2 ".st"; +select -ne :renderGlobalsList1; +select -ne :defaultShaderList1; + setAttr -s 5 ".s"; +select -ne :postProcessList1; + setAttr -s 2 ".p"; +select -ne :defaultRenderingList1; +select -ne :initialShadingGroup; + setAttr ".ro" yes; +select -ne :initialParticleSE; + setAttr ".ro" yes; +select -ne :defaultRenderGlobals; + addAttr -ci true -h true -sn "dss" -ln "defaultSurfaceShader" -dt "string"; + setAttr ".dss" -type "string" "lambert1"; +select -ne :defaultResolution; + setAttr ".pa" 1; +select -ne :defaultColorMgtGlobals; + setAttr ".cfe" yes; + setAttr ".cfp" -type "string" "/OCIO-configs/Maya2022-default/config.ocio"; + setAttr ".vtn" -type "string" "ACES 1.0 SDR-video (sRGB)"; + setAttr ".vn" -type "string" "ACES 1.0 SDR-video"; + setAttr ".dn" -type "string" "sRGB"; + setAttr ".wsn" -type "string" "ACEScg"; + setAttr ".otn" -type "string" "ACES 1.0 SDR-video (sRGB)"; + setAttr ".potn" -type "string" "ACES 1.0 SDR-video (sRGB)"; +select -ne :hardwareRenderGlobals; + setAttr ".ctrs" 256; + setAttr ".btrs" 512; +connectAttr ":time1.o" "anonymousShapeShape.tm"; +relationship "link" ":lightLinker1" ":initialShadingGroup.message" ":defaultLightSet.message"; +relationship "link" ":lightLinker1" ":initialParticleSE.message" ":defaultLightSet.message"; +relationship "shadowLink" ":lightLinker1" ":initialShadingGroup.message" ":defaultLightSet.message"; +relationship "shadowLink" ":lightLinker1" ":initialParticleSE.message" ":defaultLightSet.message"; +connectAttr "layerManager.dli[0]" "defaultLayer.id"; +connectAttr "renderLayerManager.rlmi[0]" "defaultRenderLayer.rlid"; +connectAttr "defaultRenderLayer.msg" ":defaultRenderingList1.r" -na; +// End of foo.ma From 0fee11ab6b91400a823670c629b18a19c4e31a86 Mon Sep 17 00:00:00 2001 From: Dan McGarry Date: Wed, 27 Jul 2022 12:51:57 -0700 Subject: [PATCH 2/2] Removing leftover file from running tests --- .../TestProxyShapeAnonymousLayer/foo.ma | 167 ------------------ 1 file changed, 167 deletions(-) delete mode 100644 plugin/al/plugin/AL_USDMayaTestPlugin/py/testProxyShapeOutput/TestProxyShapeAnonymousLayer/foo.ma diff --git a/plugin/al/plugin/AL_USDMayaTestPlugin/py/testProxyShapeOutput/TestProxyShapeAnonymousLayer/foo.ma b/plugin/al/plugin/AL_USDMayaTestPlugin/py/testProxyShapeOutput/TestProxyShapeAnonymousLayer/foo.ma deleted file mode 100644 index 0460943a6d..0000000000 --- a/plugin/al/plugin/AL_USDMayaTestPlugin/py/testProxyShapeOutput/TestProxyShapeAnonymousLayer/foo.ma +++ /dev/null @@ -1,167 +0,0 @@ -//Maya ASCII 2023 scene -//Name: foo.ma -//Last modified: Wed, Jul 27, 2022 12:48:22 PM -//Codeset: UTF-8 -requires maya "2023"; -requires -nodeType "AL_usdmaya_ProxyShape" -nodeType "AL_usdmaya_LayerManager" -dataType "pxrUsdStageData" - "AL_USDMayaPlugin" "3.0.0"; -currentUnit -l centimeter -a degree -t film; -fileInfo "application" "maya"; -fileInfo "product" "Maya 2023"; -fileInfo "version" "2023"; -fileInfo "cutIdentifier" "202205052215-234554116d"; -fileInfo "osv" "Linux 3.10.0-1160.66.1.el7.x86_64 #1 SMP Wed Apr 27 20:34:34 UTC 2022 x86_64"; -fileInfo "UUID" "7467DC80-0000-765D-62E1-968600000228"; -createNode transform -s -n "persp"; - rename -uid "7467DC80-0000-765D-62E1-968600000214"; - setAttr ".v" no; - setAttr ".t" -type "double3" 28 21 28 ; - setAttr ".r" -type "double3" -27.938352729602379 44.999999999999972 -5.172681101354183e-14 ; -createNode camera -s -n "perspShape" -p "persp"; - rename -uid "7467DC80-0000-765D-62E1-968600000215"; - setAttr -k off ".v" no; - setAttr ".fl" 34.999999999999993; - setAttr ".coi" 44.82186966202994; - setAttr ".imn" -type "string" "persp"; - setAttr ".den" -type "string" "persp_depth"; - setAttr ".man" -type "string" "persp_mask"; - setAttr ".hc" -type "string" "viewSet -p %camera"; -createNode transform -s -n "top"; - rename -uid "7467DC80-0000-765D-62E1-968600000216"; - setAttr ".v" no; - setAttr ".t" -type "double3" 0 1000.1 0 ; - setAttr ".r" -type "double3" -89.999999999999986 0 0 ; -createNode camera -s -n "topShape" -p "top"; - rename -uid "7467DC80-0000-765D-62E1-968600000217"; - setAttr -k off ".v" no; - setAttr ".rnd" no; - setAttr ".coi" 1000.1; - setAttr ".ow" 30; - setAttr ".imn" -type "string" "top"; - setAttr ".den" -type "string" "top_depth"; - setAttr ".man" -type "string" "top_mask"; - setAttr ".hc" -type "string" "viewSet -t %camera"; - setAttr ".o" yes; -createNode transform -s -n "front"; - rename -uid "7467DC80-0000-765D-62E1-968600000218"; - setAttr ".v" no; - setAttr ".t" -type "double3" 0 0 1000.1 ; -createNode camera -s -n "frontShape" -p "front"; - rename -uid "7467DC80-0000-765D-62E1-968600000219"; - setAttr -k off ".v" no; - setAttr ".rnd" no; - setAttr ".coi" 1000.1; - setAttr ".ow" 30; - setAttr ".imn" -type "string" "front"; - setAttr ".den" -type "string" "front_depth"; - setAttr ".man" -type "string" "front_mask"; - setAttr ".hc" -type "string" "viewSet -f %camera"; - setAttr ".o" yes; -createNode transform -s -n "side"; - rename -uid "7467DC80-0000-765D-62E1-96860000021A"; - setAttr ".v" no; - setAttr ".t" -type "double3" 1000.1 0 0 ; - setAttr ".r" -type "double3" 0 89.999999999999986 0 ; -createNode camera -s -n "sideShape" -p "side"; - rename -uid "7467DC80-0000-765D-62E1-96860000021B"; - setAttr -k off ".v" no; - setAttr ".rnd" no; - setAttr ".coi" 1000.1; - setAttr ".ow" 30; - setAttr ".imn" -type "string" "side"; - setAttr ".den" -type "string" "side_depth"; - setAttr ".man" -type "string" "side_mask"; - setAttr ".hc" -type "string" "viewSet -s %camera"; - setAttr ".o" yes; -createNode transform -n "anonymousShape"; - rename -uid "7467DC80-0000-765D-62E1-968600000225"; -createNode AL_usdmaya_ProxyShape -n "anonymousShapeShape" -p "anonymousShape"; - rename -uid "7467DC80-0000-765D-62E1-968600000226"; - addAttr -r false -ci true -h true -sn "forceCompute" -ln "forceCompute" -min 0 - -max 1 -at "bool"; - addAttr -ci true -h true -sn "usdStageLoadRules" -ln "usdStageLoadRules" -dt "string"; - setAttr -k off ".v"; - setAttr ".vir" yes; - setAttr ".vif" yes; - setAttr ".covm[0]" 0 1 1; - setAttr ".cdvm[0]" 0 1 1; - setAttr ".fp" -type "string" "anon:0x8fa6c50:tmp.usda"; - setAttr ".usdStageLoadRules" -type "string" ""; -createNode lightLinker -s -n "lightLinker1"; - rename -uid "7467DC80-0000-765D-62E1-96860000021C"; - setAttr -s 2 ".lnk"; - setAttr -s 2 ".slnk"; -createNode displayLayerManager -n "layerManager"; - rename -uid "7467DC80-0000-765D-62E1-96860000021D"; -createNode displayLayer -n "defaultLayer"; - rename -uid "7467DC80-0000-765D-62E1-96860000021E"; -createNode renderLayerManager -n "renderLayerManager"; - rename -uid "7467DC80-0000-765D-62E1-96860000021F"; -createNode renderLayer -n "defaultRenderLayer"; - rename -uid "7467DC80-0000-765D-62E1-968600000220"; - setAttr ".g" yes; -createNode shapeEditorManager -n "shapeEditorManager"; - rename -uid "7467DC80-0000-765D-62E1-968600000221"; -createNode poseInterpolatorManager -n "poseInterpolatorManager"; - rename -uid "7467DC80-0000-765D-62E1-968600000222"; -createNode AL_usdmaya_LayerManager -n "AL_usdmaya_LayerManager1"; - rename -uid "7467DC80-0000-765D-62E1-968600000227"; - setAttr ".lyr[0].id" -type "string" "anon:0x8fa6c50:tmp.usda"; - setAttr ".lyr[0].fid" -type "string" "usda"; - setAttr ".lyr[0].szd" -type "string" "#usda 1.0\n\ndef \"root\"\n{\n def \"GEO\"\n {\n def Xform \"sphere_hrc\"\n {\n double3 xformOp:translate = (0, 1, 0)\n uniform token[] xformOpOrder = [\"xformOp:translate\"]\n\n def Sphere \"sphere\"\n {\n double radius = 5\n }\n }\n }\n}\n\n"; - setAttr ".lyr[0].ann" yes; -createNode script -n "uiConfigurationScriptNode"; - rename -uid "7467DC80-0000-765D-62E1-968600000229"; - setAttr ".b" -type "string" "// Maya Mel UI Configuration File.\n// No UI generated in batch mode.\n"; - setAttr ".st" 3; -createNode script -n "sceneConfigurationScriptNode"; - rename -uid "7467DC80-0000-765D-62E1-96860000022A"; - setAttr ".b" -type "string" "playbackOptions -min 1 -max 120 -ast 1 -aet 200 "; - setAttr ".st" 6; -select -ne :time1; - setAttr ".o" 1; - setAttr ".unw" 1; -select -ne :hardwareRenderingGlobals; - setAttr ".otfna" -type "stringArray" 22 "NURBS Curves" "NURBS Surfaces" "Polygons" "Subdiv Surface" "Particles" "Particle Instance" "Fluids" "Strokes" "Image Planes" "UI" "Lights" "Cameras" "Locators" "Joints" "IK Handles" "Deformers" "Motion Trails" "Components" "Hair Systems" "Follicles" "Misc. UI" "Ornaments" ; - setAttr ".otfva" -type "Int32Array" 22 0 1 1 1 1 1 - 1 1 1 0 0 0 0 0 0 0 0 0 - 0 0 0 0 ; - setAttr ".fprt" yes; -select -ne :renderPartition; - setAttr -s 2 ".st"; -select -ne :renderGlobalsList1; -select -ne :defaultShaderList1; - setAttr -s 5 ".s"; -select -ne :postProcessList1; - setAttr -s 2 ".p"; -select -ne :defaultRenderingList1; -select -ne :initialShadingGroup; - setAttr ".ro" yes; -select -ne :initialParticleSE; - setAttr ".ro" yes; -select -ne :defaultRenderGlobals; - addAttr -ci true -h true -sn "dss" -ln "defaultSurfaceShader" -dt "string"; - setAttr ".dss" -type "string" "lambert1"; -select -ne :defaultResolution; - setAttr ".pa" 1; -select -ne :defaultColorMgtGlobals; - setAttr ".cfe" yes; - setAttr ".cfp" -type "string" "/OCIO-configs/Maya2022-default/config.ocio"; - setAttr ".vtn" -type "string" "ACES 1.0 SDR-video (sRGB)"; - setAttr ".vn" -type "string" "ACES 1.0 SDR-video"; - setAttr ".dn" -type "string" "sRGB"; - setAttr ".wsn" -type "string" "ACEScg"; - setAttr ".otn" -type "string" "ACES 1.0 SDR-video (sRGB)"; - setAttr ".potn" -type "string" "ACES 1.0 SDR-video (sRGB)"; -select -ne :hardwareRenderGlobals; - setAttr ".ctrs" 256; - setAttr ".btrs" 512; -connectAttr ":time1.o" "anonymousShapeShape.tm"; -relationship "link" ":lightLinker1" ":initialShadingGroup.message" ":defaultLightSet.message"; -relationship "link" ":lightLinker1" ":initialParticleSE.message" ":defaultLightSet.message"; -relationship "shadowLink" ":lightLinker1" ":initialShadingGroup.message" ":defaultLightSet.message"; -relationship "shadowLink" ":lightLinker1" ":initialParticleSE.message" ":defaultLightSet.message"; -connectAttr "layerManager.dli[0]" "defaultLayer.id"; -connectAttr "renderLayerManager.rlmi[0]" "defaultRenderLayer.rlid"; -connectAttr "defaultRenderLayer.msg" ":defaultRenderingList1.r" -na; -// End of foo.ma