From b70bbe4233389b879e49f1e8073672834553b111 Mon Sep 17 00:00:00 2001 From: JGamache-autodesk Date: Wed, 21 Oct 2020 09:15:29 -0400 Subject: [PATCH] MAYA-106489 - Rename InstanceSources to be Maya-specific --- lib/mayaUsd/fileio/jobs/writeJob.cpp | 2 +- lib/mayaUsd/fileio/writeJobContext.cpp | 4 +- plugin/al/docs/importExport.md | 22 ++--- .../AL_USDMaya/AL/usdmaya/fileio/Export.cpp | 2 +- .../ComplexScenario_optimized.usda | 22 ++--- .../ComplexScenario_unoptimized.usda | 24 ++--- .../SimpleScenario_optimized.usda | 8 +- .../SimpleScenario_unoptimized.usda | 8 +- .../UsdExportInstancesTest_optimized.usda | 12 +-- .../UsdExportInstancesTest_original.usda | 18 ++-- .../UsdExportInstancesTest_unoptimized.usda | 24 ++--- .../usd/translators/testUsdExportInstances.py | 34 +++---- .../testUsdExportShadingInstanced.py | 8 +- .../usd/translators/testUsdImportInstances.py | 98 +++++++++---------- 14 files changed, 143 insertions(+), 143 deletions(-) diff --git a/lib/mayaUsd/fileio/jobs/writeJob.cpp b/lib/mayaUsd/fileio/jobs/writeJob.cpp index f9921f4b0d..22911e8848 100644 --- a/lib/mayaUsd/fileio/jobs/writeJob.cpp +++ b/lib/mayaUsd/fileio/jobs/writeJob.cpp @@ -404,7 +404,7 @@ UsdMaya_WriteJob::_BeginWriting(const std::string& fileName, bool append) // Perform post-processing for instances, skel, etc. // We shouldn't be creating new instance masters after this point, and we - // want to cleanup the InstanceSources prim before writing model hierarchy. + // want to cleanup the MayaExportedInstanceSources prim before writing model hierarchy. if (!mJobCtx._PostProcess()) { return false; } diff --git a/lib/mayaUsd/fileio/writeJobContext.cpp b/lib/mayaUsd/fileio/writeJobContext.cpp index d3e866c634..8bd7711246 100644 --- a/lib/mayaUsd/fileio/writeJobContext.cpp +++ b/lib/mayaUsd/fileio/writeJobContext.cpp @@ -74,7 +74,7 @@ _GetRootOverridePath(const UsdMayaJobExportArgs& args, const SdfPath& path) return path; } -const SdfPath INSTANCES_SCOPE_PATH("/InstanceSources"); +const SdfPath INSTANCES_SCOPE_PATH("/MayaExportedInstanceSources"); } // anonymous namespace @@ -431,7 +431,7 @@ UsdMayaWriteJobContext::_PostProcess() if (_objectsToMasterWriters.empty()) { mStage->RemovePrim(mInstancesPrim.GetPrimPath()); } else { - // The InstanceSources group should be an over and moved to the + // The MayaExportedInstanceSources group should be an over and moved to the // end of the layer. mInstancesPrim.SetSpecifier(SdfSpecifierOver); diff --git a/plugin/al/docs/importExport.md b/plugin/al/docs/importExport.md index 418fe2cda9..f107f96920 100644 --- a/plugin/al/docs/importExport.md +++ b/plugin/al/docs/importExport.md @@ -118,7 +118,7 @@ AL_usdmaya_ExportCommand -f "" -mergeTransforms 0 -duplica ``` Which will generate the following instanced structure within the exported USD file: ``` -over "InstanceSources" +over "MayaExportedInstanceSources" { def Xform "pSphere1" { @@ -138,7 +138,7 @@ over "InstanceSources" def Xform "pSphere1" ( al_usdmaya_mergedTransform = "unmerged" instanceable = true - prepend references = + prepend references = ) { } @@ -146,7 +146,7 @@ def Xform "pSphere1" ( def Xform "pSphere2" ( al_usdmaya_mergedTransform = "unmerged" instanceable = true - prepend references = + prepend references = ) { float3 xformOp:translate:translate = (0, 0, 5) @@ -156,7 +156,7 @@ def Xform "pSphere2" ( def Xform "nurbsCircle1" ( al_usdmaya_mergedTransform = "unmerged" instanceable = true - prepend references = + prepend references = ) { float3 xformOp:translate:translate = (5, 0, 0) @@ -170,7 +170,7 @@ def Xform "parentTransform" ( def Xform "nurbsCircle2" ( al_usdmaya_mergedTransform = "unmerged" instanceable = true - prepend references = + prepend references = ) { float3 xformOp:translate:translate = (0, 0, 5) @@ -178,7 +178,7 @@ def Xform "parentTransform" ( } } ``` -All geometry prims of instanced shapes are gathered under an override prim ```InstanceSources``` with USD hierarchy: +All geometry prims of instanced shapes are gathered under an override prim ```MayaExportedInstanceSources``` with USD hierarchy: ``` --Xform --Mesh/NurbsCurves @@ -191,7 +191,7 @@ AL_usdmaya_ImportCommand -f "" ``` When "duplicateInstances" is disabled and "mergeTransforms" is on, exported USD file will look like: ``` -over "InstanceSources" +over "MayaExportedInstanceSources" { def Mesh "pSphere1_pSphereShape1" { @@ -203,13 +203,13 @@ over "InstanceSources" } def Mesh "pSphere1" ( - prepend references = + prepend references = ) { } def Mesh "pSphere2" ( - prepend references = + prepend references = ) { float3 xformOp:translate:translate = (0, 0, 5) @@ -217,7 +217,7 @@ def Mesh "pSphere2" ( } def NurbsCurves "nurbsCircle1" ( - prepend references = + prepend references = ) { float3 xformOp:translate:translate = (5, 0, 0) @@ -227,7 +227,7 @@ def NurbsCurves "nurbsCircle1" ( def Xform "parentTransform" { def NurbsCurves "nurbsCircle2" ( - prepend references = + prepend references = ) { float3 xformOp:translate:translate = (0, 0, 5) diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Export.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Export.cpp index d40e96b2a3..aa86bc6b45 100644 --- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Export.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Export.cpp @@ -293,7 +293,7 @@ struct Export::Impl void createInstancesPrim() { - m_instancesPrim = m_stage->OverridePrim(SdfPath("/InstanceSources")); + m_instancesPrim = m_stage->OverridePrim(SdfPath("/MayaExportedInstanceSources")); } void processInstances() diff --git a/test/lib/usd/translators/UsdImportInstancesTest/ComplexScenario_optimized.usda b/test/lib/usd/translators/UsdImportInstancesTest/ComplexScenario_optimized.usda index 1fdcda9598..eb14cbf7f8 100644 --- a/test/lib/usd/translators/UsdImportInstancesTest/ComplexScenario_optimized.usda +++ b/test/lib/usd/translators/UsdImportInstancesTest/ComplexScenario_optimized.usda @@ -8,7 +8,7 @@ def Xform "pCube1" ( kind = "component" instanceable = true - prepend references = + prepend references = ) { double3 xformOp:translate = (-4, 2, 0) @@ -18,7 +18,7 @@ def Xform "pCube1" ( def Xform "pCube4" ( kind = "component" instanceable = true - prepend references = + prepend references = ) { double3 xformOp:translate = (4, 2, 0) @@ -34,21 +34,21 @@ def Xform "pCube5" ( def Scope "pCubeShape1" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube2" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube3" ( instanceable = true - prepend references = + prepend references = ) { } @@ -67,7 +67,7 @@ def Xform "pCube5" ( } } -over "InstanceSources" +over "MayaExportedInstanceSources" { def Scope "pCube1_pCubeShape1" { @@ -86,7 +86,7 @@ over "InstanceSources" { def Xform "pCube2" ( instanceable = true - prepend references = + prepend references = ) { double3 xformOp:translate = (0, -3, 0) @@ -98,7 +98,7 @@ over "InstanceSources" { def Xform "pCube3" ( instanceable = true - prepend references = + prepend references = ) { double3 xformOp:translate = (0, -6, 0) @@ -110,21 +110,21 @@ over "InstanceSources" { def Scope "pCubeShape1" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube2" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube3" ( instanceable = true - prepend references = + prepend references = ) { } diff --git a/test/lib/usd/translators/UsdImportInstancesTest/ComplexScenario_unoptimized.usda b/test/lib/usd/translators/UsdImportInstancesTest/ComplexScenario_unoptimized.usda index d0f57582e0..64fe96842d 100644 --- a/test/lib/usd/translators/UsdImportInstancesTest/ComplexScenario_unoptimized.usda +++ b/test/lib/usd/translators/UsdImportInstancesTest/ComplexScenario_unoptimized.usda @@ -14,21 +14,21 @@ def Xform "pCube1" ( def Scope "pCubeShape1" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube2" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube3" ( instanceable = true - prepend references = + prepend references = ) { } @@ -43,21 +43,21 @@ def Xform "pCube4" ( def Scope "pCubeShape1" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube2" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube3" ( instanceable = true - prepend references = + prepend references = ) { } @@ -72,21 +72,21 @@ def Xform "pCube5" ( def Scope "pCubeShape1" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube2" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube3" ( instanceable = true - prepend references = + prepend references = ) { } @@ -105,7 +105,7 @@ def Xform "pCube5" ( } } -over "InstanceSources" +over "MayaExportedInstanceSources" { def Scope "pCube1_pCubeShape1" { @@ -129,7 +129,7 @@ over "InstanceSources" def Scope "pCubeShape2" ( instanceable = true - prepend references = + prepend references = ) { } @@ -145,7 +145,7 @@ over "InstanceSources" def Scope "pCubeShape2" ( instanceable = true - prepend references = + prepend references = ) { } diff --git a/test/lib/usd/translators/UsdImportInstancesTest/SimpleScenario_optimized.usda b/test/lib/usd/translators/UsdImportInstancesTest/SimpleScenario_optimized.usda index f7b6bd2bb6..261c76e43a 100644 --- a/test/lib/usd/translators/UsdImportInstancesTest/SimpleScenario_optimized.usda +++ b/test/lib/usd/translators/UsdImportInstancesTest/SimpleScenario_optimized.usda @@ -8,7 +8,7 @@ def Xform "pCube1" ( instanceable = true kind = "component" - prepend references = + prepend references = ) { double3 xformOp:translate = (-4, 2, 0) @@ -18,7 +18,7 @@ def Xform "pCube1" ( def Xform "pCube2" ( instanceable = true kind = "component" - prepend references = + prepend references = ) { double3 xformOp:translate = (0, 2, 0) @@ -28,14 +28,14 @@ def Xform "pCube2" ( def Xform "pCube3" ( instanceable = true kind = "component" - prepend references = + prepend references = ) { double3 xformOp:translate = (4, 2, 0) uniform token[] xformOpOrder = ["xformOp:translate"] } -over "InstanceSources" +over "MayaExportedInstanceSources" { def Xform "pCube1_instanceParent" { diff --git a/test/lib/usd/translators/UsdImportInstancesTest/SimpleScenario_unoptimized.usda b/test/lib/usd/translators/UsdImportInstancesTest/SimpleScenario_unoptimized.usda index 35bed96ed7..76dbce19b8 100644 --- a/test/lib/usd/translators/UsdImportInstancesTest/SimpleScenario_unoptimized.usda +++ b/test/lib/usd/translators/UsdImportInstancesTest/SimpleScenario_unoptimized.usda @@ -14,7 +14,7 @@ def Xform "pCube1" ( def Scope "pCubeShape1" ( instanceable = true - prepend references = + prepend references = ) { } @@ -29,7 +29,7 @@ def Xform "pCube2" ( def Scope "pCubeShape1" ( instanceable = true - prepend references = + prepend references = ) { } @@ -44,13 +44,13 @@ def Xform "pCube3" ( def Scope "pCubeShape1" ( instanceable = true - prepend references = + prepend references = ) { } } -over "InstanceSources" +over "MayaExportedInstanceSources" { def Scope "pCube1_pCubeShape1" { diff --git a/test/lib/usd/translators/UsdImportInstancesTest/UsdExportInstancesTest_optimized.usda b/test/lib/usd/translators/UsdImportInstancesTest/UsdExportInstancesTest_optimized.usda index a33c882070..b812d40c9e 100644 --- a/test/lib/usd/translators/UsdImportInstancesTest/UsdExportInstancesTest_optimized.usda +++ b/test/lib/usd/translators/UsdImportInstancesTest/UsdExportInstancesTest_optimized.usda @@ -8,7 +8,7 @@ def Xform "pCube1" ( kind = "component" instanceable = true - prepend references = + prepend references = ) { double3 xformOp:translate = (-4, 2, 0) @@ -18,7 +18,7 @@ def Xform "pCube1" ( def Xform "pCube4" ( kind = "component" instanceable = true - prepend references = + prepend references = ) { double3 xformOp:translate = (4, 2, 0) @@ -28,14 +28,14 @@ def Xform "pCube4" ( def Xform "pCube5" ( kind = "component" instanceable = true - prepend references = + prepend references = ) { double3 xformOp:translate = (0, 2, 0) uniform token[] xformOpOrder = ["xformOp:translate"] } -over "InstanceSources" +over "MayaExportedInstanceSources" { def Xform "pCube1_instanceParent" { @@ -51,7 +51,7 @@ over "InstanceSources" def Xform "pCube2" ( instanceable = true - prepend references = + prepend references = ) { double3 xformOp:translate = (0, -3, 0) @@ -60,7 +60,7 @@ over "InstanceSources" def Xform "pCube3" ( instanceable = true - prepend references = + prepend references = ) { double3 xformOp:translate = (0, -6, 0) diff --git a/test/lib/usd/translators/UsdImportInstancesTest/UsdExportInstancesTest_original.usda b/test/lib/usd/translators/UsdImportInstancesTest/UsdExportInstancesTest_original.usda index 56c2757351..6d1e8d72af 100644 --- a/test/lib/usd/translators/UsdImportInstancesTest/UsdExportInstancesTest_original.usda +++ b/test/lib/usd/translators/UsdImportInstancesTest/UsdExportInstancesTest_original.usda @@ -14,21 +14,21 @@ def Xform "pCube1" ( def Scope "pCubeShape1" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube2" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube3" ( instanceable = true - prepend references = + prepend references = ) { } @@ -43,27 +43,27 @@ def Xform "pCube4" ( def Scope "pCubeShape1" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube2" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube3" ( instanceable = true - prepend references = + prepend references = ) { } } -over "InstanceSources" +over "MayaExportedInstanceSources" { def Xform "pCube1_pCubeShape1" { @@ -85,7 +85,7 @@ over "InstanceSources" def Scope "pCubeShape2" ( instanceable = true - prepend references = + prepend references = ) { } @@ -111,7 +111,7 @@ over "InstanceSources" def Scope "pCubeShape2" ( instanceable = true - prepend references = + prepend references = ) { } diff --git a/test/lib/usd/translators/UsdImportInstancesTest/UsdExportInstancesTest_unoptimized.usda b/test/lib/usd/translators/UsdImportInstancesTest/UsdExportInstancesTest_unoptimized.usda index 58ee29b599..7ca328b1dc 100644 --- a/test/lib/usd/translators/UsdImportInstancesTest/UsdExportInstancesTest_unoptimized.usda +++ b/test/lib/usd/translators/UsdImportInstancesTest/UsdExportInstancesTest_unoptimized.usda @@ -14,21 +14,21 @@ def Xform "pCube1" ( def Scope "pCubeShape1" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube2" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube3" ( instanceable = true - prepend references = + prepend references = ) { } @@ -43,21 +43,21 @@ def Xform "pCube4" ( def Scope "pCubeShape1" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube2" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube3" ( instanceable = true - prepend references = + prepend references = ) { } @@ -72,27 +72,27 @@ def Xform "pCube5" ( def Scope "pCubeShape1" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube2" ( instanceable = true - prepend references = + prepend references = ) { } def Scope "pCube3" ( instanceable = true - prepend references = + prepend references = ) { } } -over "InstanceSources" +over "MayaExportedInstanceSources" { def Scope "pCube1_pCubeShape1" { @@ -116,7 +116,7 @@ over "InstanceSources" def Scope "pCubeShape2" ( instanceable = true - prepend references = + prepend references = ) { } @@ -132,7 +132,7 @@ over "InstanceSources" def Scope "pCubeShape2" ( instanceable = true - prepend references = + prepend references = ) { } diff --git a/test/lib/usd/translators/testUsdExportInstances.py b/test/lib/usd/translators/testUsdExportInstances.py index 8ddc191725..6c2bc2e3df 100644 --- a/test/lib/usd/translators/testUsdExportInstances.py +++ b/test/lib/usd/translators/testUsdExportInstances.py @@ -48,12 +48,12 @@ def testExportInstances(self): stage = Usd.Stage.Open(usdFile) - s = UsdGeom.Scope.Get(stage, '/InstanceSources') + s = UsdGeom.Scope.Get(stage, '/MayaExportedInstanceSources') self.assertTrue(s.GetPrim().IsValid()) expectedMeshPath = [ - '/InstanceSources/pCube1_pCubeShape1/pCubeShape1', - '/InstanceSources/pCube1_pCube2_pCubeShape2/pCubeShape2' + '/MayaExportedInstanceSources/pCube1_pCubeShape1/pCubeShape1', + '/MayaExportedInstanceSources/pCube1_pCube2_pCubeShape2/pCubeShape2' ] for each in expectedMeshPath: @@ -63,17 +63,17 @@ def testExportInstances(self): expectedXForm = [ ('/pCube1', None), - ('/pCube1/pCubeShape1', '/InstanceSources/pCube1_pCubeShape1'), - ('/pCube1/pCube2', '/InstanceSources/pCube1_pCube2'), - ('/pCube1/pCube3', '/InstanceSources/pCube1_pCube3'), + ('/pCube1/pCubeShape1', '/MayaExportedInstanceSources/pCube1_pCubeShape1'), + ('/pCube1/pCube2', '/MayaExportedInstanceSources/pCube1_pCube2'), + ('/pCube1/pCube3', '/MayaExportedInstanceSources/pCube1_pCube3'), ('/pCube4', None), - ('/pCube4/pCubeShape1', '/InstanceSources/pCube1_pCubeShape1'), - ('/pCube4/pCube2', '/InstanceSources/pCube1_pCube2'), - ('/pCube4/pCube3', '/InstanceSources/pCube1_pCube3'), - ('/InstanceSources/pCube1_pCube2/pCubeShape2', - '/InstanceSources/pCube1_pCube2_pCubeShape2'), - ('/InstanceSources/pCube1_pCube3/pCubeShape2', - '/InstanceSources/pCube1_pCube2_pCubeShape2'), + ('/pCube4/pCubeShape1', '/MayaExportedInstanceSources/pCube1_pCubeShape1'), + ('/pCube4/pCube2', '/MayaExportedInstanceSources/pCube1_pCube2'), + ('/pCube4/pCube3', '/MayaExportedInstanceSources/pCube1_pCube3'), + ('/MayaExportedInstanceSources/pCube1_pCube2/pCubeShape2', + '/MayaExportedInstanceSources/pCube1_pCube2_pCubeShape2'), + ('/MayaExportedInstanceSources/pCube1_pCube3/pCubeShape2', + '/MayaExportedInstanceSources/pCube1_pCube2_pCubeShape2'), ] layer = stage.GetLayerStack()[1] @@ -93,9 +93,9 @@ def testExportInstances(self): self.assertEqual(ref.assetPath, "") self.assertEqual(ref.primPath, i) - # Test that the InstanceSources prim is last in the layer's root prims. + # Test that the MayaExportedInstanceSources prim is last in the layer's root prims. rootPrims = list(layer.rootPrims.keys()) - self.assertEqual(rootPrims[-1], "InstanceSources") + self.assertEqual(rootPrims[-1], "MayaExportedInstanceSources") def testExportInstances_ModelHierarchyValidation(self): """Tests that model-hierarchy validation works with instances.""" @@ -106,14 +106,14 @@ def testExportInstances_ModelHierarchyValidation(self): shadingMode='none', kind='assembly', file=usdFile) def testExportInstances_NoKindForInstanceSources(self): - """Tests that the -kind export flag doesn't affect InstanceSources.""" + """Tests that the -kind export flag doesn't affect MayaExportedInstanceSources.""" usdFile = os.path.abspath('UsdExportInstances_instancesources.usda') cmds.usdExport(mergeTransformAndShape=True, exportInstances=True, shadingMode='none', kind='component', file=usdFile) stage = Usd.Stage.Open(usdFile) - instanceSources = Usd.ModelAPI.Get(stage, '/InstanceSources') + instanceSources = Usd.ModelAPI.Get(stage, '/MayaExportedInstanceSources') self.assertEqual(instanceSources.GetKind(), '') pCube1 = Usd.ModelAPI.Get(stage, '/pCube1') diff --git a/test/lib/usd/translators/testUsdExportShadingInstanced.py b/test/lib/usd/translators/testUsdExportShadingInstanced.py index 5219486045..5a09cc6e0c 100644 --- a/test/lib/usd/translators/testUsdExportShadingInstanced.py +++ b/test/lib/usd/translators/testUsdExportShadingInstanced.py @@ -76,8 +76,8 @@ def testInstancedGeom(self): bluePaths = [ "/World/blueCube", "/World/blueSphere", "/World/blueSphere2"] instanceMasters = [ - "/InstanceSources/World_redSphere_blueSphereMultiAssignShape", - "/InstanceSources/World_blueCube_blueCubeShape"] + "/MayaExportedInstanceSources/World_redSphere_blueSphereMultiAssignShape", + "/MayaExportedInstanceSources/World_blueCube_blueCubeShape"] for path in redPaths: prim = self._simpleStage.GetPrimAtPath(path) @@ -153,9 +153,9 @@ def testNestedInstancedGeom(self): "/World/ComplexB/NestedA/Base2/BaseShape1", "/World/ComplexB/NestedB/Base2/BaseShape1"] instanceMasters = [ - "/InstanceSources/World_ComplexA_NestedA_Base1_BaseShape1" + + "/MayaExportedInstanceSources/World_ComplexA_NestedA_Base1_BaseShape1" + "/BaseShape1", - "/InstanceSources/World_SimpleInstance1_SimpleInstanceShape1" + + "/MayaExportedInstanceSources/World_SimpleInstance1_SimpleInstanceShape1" + "/SimpleInstanceShape1"] for path in greenPaths: diff --git a/test/lib/usd/translators/testUsdImportInstances.py b/test/lib/usd/translators/testUsdImportInstances.py index 384ee7a4d3..ed90df0881 100644 --- a/test/lib/usd/translators/testUsdImportInstances.py +++ b/test/lib/usd/translators/testUsdImportInstances.py @@ -55,12 +55,12 @@ def testImportSimpleUnoptimized(self): scenario: pCube1 [Xform] - pCubeShape1 [Scope] (instance /InstanceSources/pCube1_pCubeShape1) + pCubeShape1 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCubeShape1) pCube2 [Xform] - pCubeShape1 [Scope] (instance /InstanceSources/pCube1_pCubeShape1) + pCubeShape1 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCubeShape1) pCube3 [Xform] - pCubeShape1 [Scope] (instance /InstanceSources/pCube1_pCubeShape1) - InstanceSources + pCubeShape1 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCubeShape1) + MayaExportedInstanceSources pCube1_pCubeShape1 [Scope] pCubeShape1 [Mesh] @@ -108,10 +108,10 @@ def testImportSimpleOptimized(self): """ Test importing the following optimized USD simple instancing scenario: - pCube1 [Xform] (instance /InstanceSources/pCube1_instanceParent) - pCube2 [Xform] (instance /InstanceSources/pCube1_instanceParent) - pCube3 [Xform] (instance /InstanceSources/pCube1_instanceParent) - InstanceSources + pCube1 [Xform] (instance /MayaExportedInstanceSources/pCube1_instanceParent) + pCube2 [Xform] (instance /MayaExportedInstanceSources/pCube1_instanceParent) + pCube3 [Xform] (instance /MayaExportedInstanceSources/pCube1_instanceParent) + MayaExportedInstanceSources pCube1_instanceParent [Xform] pCubeShape1 [Mesh] @@ -209,26 +209,26 @@ def testImportExportReworkUnoptimizedTest(self): be easier to re-read. We would export unoptimized to: pCube1 [Xform] - pCubeShape1 [Scope] (instance /InstanceSources/pCube1_pCubeShape1) - pCube2 [Scope] (instance /InstanceSources/pCube1_pCube2) - pCube3 [Scope] (instance /InstanceSources/pCube1_pCube3) + pCubeShape1 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCubeShape1) + pCube2 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube2) + pCube3 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube3) pCube4 [Xform] - pCubeShape1 [Scope] (instance /InstanceSources/pCube1_pCubeShape1) - pCube2 [Scope] (instance /InstanceSources/pCube1_pCube2) - pCube3 [Scope] (instance /InstanceSources/pCube1_pCube3) + pCubeShape1 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCubeShape1) + pCube2 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube2) + pCube3 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube3) pCube5 [Xform] - pCubeShape1 [Scope] (instance /InstanceSources/pCube1_pCubeShape1) - pCube2 [Scope] (instance /InstanceSources/pCube1_pCube2) - pCube3 [Scope] (instance /InstanceSources/pCube1_pCube3) - InstanceSources + pCubeShape1 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCubeShape1) + pCube2 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube2) + pCube3 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube3) + MayaExportedInstanceSources pCube1_pCubeShape1 [Scope] pCubeShape1 [Mesh] pCube1_pCube2 [Scope] pCube2 [Xform] - pCubeShape2 [Scope] (instance /InstanceSources/pCube1_pCube2_pCubeShape2) + pCubeShape2 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube2_pCubeShape2) pCube1_pCube3 [Scope] pCube3 [Xform] - pCubeShape2 [Scope] (instance /InstanceSources/pCube1_pCube2_pCubeShape2) + pCubeShape2 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube2_pCubeShape2) pCube1_pCube2_pCubeShape2 [Scope] pCubeShape2 [Mesh] @@ -301,14 +301,14 @@ def testImportExportReworkOptimizedTest(self): Testing another way testExportInstances could export to USD that would be easier to re-read. We would export optimized to: - pCube1 [Xform] (instance /InstanceSources/pCube1_instanceParent) - pCube4 [Xform] (instance /InstanceSources/pCube1_instanceParent) - pCube5 [Xform] (instance /InstanceSources/pCube1_instanceParent) - InstanceSources + pCube1 [Xform] (instance /MayaExportedInstanceSources/pCube1_instanceParent) + pCube4 [Xform] (instance /MayaExportedInstanceSources/pCube1_instanceParent) + pCube5 [Xform] (instance /MayaExportedInstanceSources/pCube1_instanceParent) + MayaExportedInstanceSources pCube1_instanceParent [Xform] pCubeShape1 [Mesh] - pCube2 [Xform] (instance /InstanceSources/pCube1_pCube2_instancedParent) - pCube3 [Xform] (instance /InstanceSources/pCube1_pCube2_instancedParent) + pCube2 [Xform] (instance /MayaExportedInstanceSources/pCube1_pCube2_instancedParent) + pCube3 [Xform] (instance /MayaExportedInstanceSources/pCube1_pCube2_instancedParent) pCube1_pCube2_instancedParent [Xform] pCubeShape2 [Mesh] @@ -390,27 +390,27 @@ def testImportComplexUnoptimizedTest(self): correctly: pCube1 [Xform] - pCubeShape1 [Scope] (instance /InstanceSources/pCube1_pCubeShape1) - pCube2 [Scope] (instance /InstanceSources/pCube1_pCube2) - pCube3 [Scope] (instance /InstanceSources/pCube1_pCube3) + pCubeShape1 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCubeShape1) + pCube2 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube2) + pCube3 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube3) pCube4 [Xform] - pCubeShape1 [Scope] (instance /InstanceSources/pCube1_pCubeShape1) - pCube2 [Scope] (instance /InstanceSources/pCube1_pCube2) - pCube3 [Scope] (instance /InstanceSources/pCube1_pCube3) + pCubeShape1 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCubeShape1) + pCube2 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube2) + pCube3 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube3) pCube5 [Xform] - pCubeShape1 [Scope] (instance /InstanceSources/pCube1_pCubeShape1) - pCube2 [Scope] (instance /InstanceSources/pCube1_pCube2) - pCube3 [Scope] (instance /InstanceSources/pCube1_pCube3) + pCubeShape1 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCubeShape1) + pCube2 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube2) + pCube3 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube3) someUniqueChildOf_pCube5 [Mesh] - InstanceSources + MayaExportedInstanceSources pCube1_pCubeShape1 [Scope] pCubeShape1 [Mesh] pCube1_pCube2 [Scope] pCube2 [Xform] - pCubeShape2 [Scope] (instance /InstanceSources/pCube1_pCube2_pCubeShape2) + pCubeShape2 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube2_pCubeShape2) pCube1_pCube3 [Scope] pCube3 [Xform] - pCubeShape2 [Scope] (instance /InstanceSources/pCube1_pCube2_pCubeShape2) + pCubeShape2 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube2_pCubeShape2) pCube1_pCube2_pCubeShape2 [Scope] pCubeShape2 [Mesh] @@ -486,24 +486,24 @@ def testImportComplexOptimizedTest(self): We would expect the following unoptimized USD export to reload correctly: - pCube1 [Xform] (instance /InstanceSources/pCube1_instanceParent) - pCube4 [Xform] (instance /InstanceSources/pCube1_instanceParent) + pCube1 [Xform] (instance /MayaExportedInstanceSources/pCube1_instanceParent) + pCube4 [Xform] (instance /MayaExportedInstanceSources/pCube1_instanceParent) pCube5 [Xform] - pCubeShape1 [Scope] (instance /InstanceSources/pCube1_pCubeShape1) - pCube2 [Scope] (instance /InstanceSources/pCube1_pCube2) - pCube3 [Scope] (instance /InstanceSources/pCube1_pCube3) + pCubeShape1 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCubeShape1) + pCube2 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube2) + pCube3 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube3) someUniqueChildOf_pCube5 [Xform] - InstanceSources + MayaExportedInstanceSources pCube1_pCubeShape1 [Scope] pCubeShape1 [Mesh] pCube1_pCube2 [Scope] - pCube2 [Xform] (instance /InstanceSources/pCube1_pCube2_instancedParent) + pCube2 [Xform] (instance /MayaExportedInstanceSources/pCube1_pCube2_instancedParent) pCube1_pCube3 [Scope] - pCube3 [Xform] (instance /InstanceSources/pCube1_pCube2_instancedParent) + pCube3 [Xform] (instance /MayaExportedInstanceSources/pCube1_pCube2_instancedParent) pCube1_instanceParent [Xform] - pCubeShape1 [Scope] (instance /InstanceSources/pCube1_pCubeShape1) - pCube2 [Scope] (instance /InstanceSources/pCube1_pCube2) - pCube3 [Scope] (instance /InstanceSources/pCube1_pCube3) + pCubeShape1 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCubeShape1) + pCube2 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube2) + pCube3 [Scope] (instance /MayaExportedInstanceSources/pCube1_pCube3) pCube1_pCube2_instancedParent [Xform] pCubeShape2 [Mesh]