MAYA-104213 - add a new USD stage to an empty scene #478

seando-adsk · 2020-05-04T14:26:19Z

MAYA-104213 - As a user, I'd like to add a new USD stage to an empty scene

New USD notice type for stage invalidate. Send this notice when certain attributes (like filepath) are changed. From the StagesSubject receiver of this notice we also send the new Ufe::ObjectInvalidate() notification.
When proxy shape compute is called if no filepath was attached, we create an in memory stage.
Added dirty state to UsdStageMap. When dirty it will rebuild when a new request for stage info is made.
Cleanup: renamed "UsdMayaProxyStageSetNotice" -> "MayaUsdProxyStageSetNotice".
Added new menu item "Stage with New Layer".

…scene * New USD notice type for stage invalidate. Send this notice when certain attributes (like filepath) are changed. From the StagesSubject receiver of this notice we also send the new Ufe::ObjectInvalidate() notification. * When proxy shape compute is called if no filepath was attached, we create an in memory stage. * Added dirty state to UsdStageMap. When dirty it will rebuild when a new request for stage info is made. * Cleanup: renamed "UsdMayaProxyStageSetNotice" -> "MayaUsdProxyStageSetNotice". * Added new menu item "Stage with New Layer".

seando-adsk · 2020-05-04T14:28:01Z

lib/mayaUsd/listeners/proxyShapeNotice.h

@@ -27,11 +27,11 @@ PXR_NAMESPACE_OPEN_SCOPE
 class MayaUsdProxyShapeBase;

 /// Notice sent when the ProxyShape loads a new stage
-class UsdMayaProxyStageSetNotice : public TfNotice
+class MayaUsdProxyStageBaseNotice : public TfNotice


Renamed this one "UsdMaya" -> "MayaUsd" and made it a base notice class. Below created this existing one (deriving from this base) and new one for stage invalidate.

seando-adsk · 2020-05-04T14:29:56Z

lib/mayaUsd/nodes/proxyShapeBase.cpp

+        else if (!usdStage) {
+            // Create a new stage in memory with an anonymous root layer.
+            UsdStageCacheContext ctx(UsdMayaStageCache::Get());
+            usdStage = UsdStage::CreateInMemory("", loadSet);


The empty string is for the identifier, which is used when naming the root layer. Here we just want it named as the default "anon", rather than "tmp.usda"

seando-adsk · 2020-05-04T14:30:29Z

lib/mayaUsd/nodes/proxyShapeBase.cpp

@@ -797,6 +802,7 @@ MayaUsdProxyShapeBase::setDependentsDirty(const MPlug& plug, MPlugArray& plugArr
        plug == loadPayloadsAttr ||
        plug == inStageDataAttr) {
        _IncreaseUsdStageVersion();
+        MayaUsdProxyStageInvalidateNotice(*this).Send();


Send the new stage invalidate notice whenever one of the plugs that affects outStageDataAttr changes.

seando-adsk · 2020-05-04T14:31:17Z

lib/mayaUsd/ufe/StagesSubject.cpp

-	StagesSubject::Ptr me(this);
-	for (auto stage : ProxyShapeHandler::getAllStages())
-	{
-		fStageListeners[stage] = TfNotice::Register(
-			me, &StagesSubject::stageChanged, stage);
-	}


We should not get the stages here as that will pull, but the new stage may not be ready yet.

seando-adsk · 2020-05-04T14:32:01Z

lib/mayaUsd/ufe/StagesSubject.cpp

-	g_StageMap.clear();
-	auto proxyShapeNames = ProxyShapeHandler::getAllNames();
-	for (const auto& psn : proxyShapeNames)
-	{
-		MDagPath dag = nameToDagPath(psn);
-		Ufe::Path ufePath = dagPathToUfe(dag);
-		auto stage = ProxyShapeHandler::dagPathToStage(psn);
-		g_StageMap.addItem(ufePath, stage);
-	}


All this code was moved into the stage map. We just set it dirty now. It will be rebuilt when queried.

seando-adsk · 2020-05-04T14:33:18Z

lib/mayaUsd/ufe/StagesSubject.cpp

+#if UFE_PREVIEW_VERSION_NUM >= 2014
+	Ufe::SceneItem::Ptr sceneItem = Ufe::Hierarchy::createItem(notice.GetProxyShape().ufePath());
+	auto notification = Ufe::SubtreeInvalidate(sceneItem);
+	Ufe::Scene::notifySubtreeInvalidate(notification);
+#endif


Send a new UFE subtree invalidate notice when the stage is invalidated. Clients like the Outliner can use this to re-build.

seando-adsk · 2020-05-04T14:34:08Z

lib/mayaUsd/ufe/UsdStageMap.cpp

+UsdStageWeakPtr UsdStageMap::stage(const Ufe::Path& path)
 {
+	rebuildIfDirty();


All the query methods on the stage map, will now rebuild first if the map is flagged as dirty.

seando-adsk · 2020-05-04T14:34:32Z

lib/mayaUsd/ufe/UsdStageMap.cpp

+	auto proxyShapeNames = ProxyShapeHandler::getAllNames();
+	for (const auto& psn : proxyShapeNames)
+	{
+		MDagPath dag = nameToDagPath(psn);
+		Ufe::Path ufePath = dagPathToUfe(dag);
+		auto stage = ProxyShapeHandler::dagPathToStage(psn);
+		addItem(ufePath, stage);
+	}


This code was moved from the StagesSubject.

seando-adsk · 2020-05-04T14:34:58Z

plugin/adsk/scripts/mayaUsdMenu.mel

@@ -103,6 +112,7 @@ global proc mayaUsdMenu_createMenuCallback() {
                -label "Universal Scene Description (USD)" 
                -annotation "Create a USD stage" 
                -version $mayaVersion`;
+            menuItem -runTimeCommand mayaUsdCreateStageWithNewLayer;


New menu item to create a new empty USD stage.

seando-adsk · 2020-05-04T14:35:49Z

plugin/adsk/scripts/mayaUsd_createStageWithNewLayer.py

+    # Simply create a proxy shape. Since it does not have a USD file associated
+    # (in the .filePath attribute), the proxy shape base will create an empty
+    # stage in memory. This will create the session and root layer as well.
+    shapeNode = cmds.createNode('mayaUsdProxyShape', name='stageShape')


Because of the changes in the proxyshapebase (to create stage in memory when no file attr) we simply need to create a proxy shape node here. That will create the stage, which will create the root layer and session layer.

seando-adsk · 2020-05-04T17:27:57Z

@pilarmolinalopez Would you be available to review these changes?

kxl-adsk

LGTM!

pilarmolinalopez

Looks good to me!

…y_scene

kxl-adsk

The following tests FAILED:
12 - testObject3d (Failed)
15 - testTransform3dTranslate (Failed)
99 - TestPxrUsdTranslators (Failed)

…scene * Fix broken unitttests: 12 - testObject3d (Failed) 15 - testTransform3dTranslate (Failed) 99 - TestPxrUsdTranslators (Failed)

seando-adsk · 2020-05-06T17:37:31Z

@kxl-adsk I fixed the three failing tests with c5bc21d.

kxl-adsk · 2020-05-06T20:30:57Z

plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.cpp

@@ -398,6 +398,18 @@ MStatus ProxyShape::setDependentsDirty(const MPlug& plugBeingDirtied, MPlugArray
  {
    MHWRender::MRenderer::setGeometryDrawDirty(thisMObject(), true);
  }
+
+  if (plugBeingDirtied == outStageData() ||


ProxyShapeBase is a base class...shouldn't we just forward it to the base class instead of making a copy?

Changes: 1.fix light transform and material binding issues due to usd 23.08 2.make mayaHydraSceneIndex derive from HdRetainedScneIndex in usd 23.08

seando-adsk commented May 4, 2020

View reviewed changes

seando-adsk requested review from kxl-adsk and pilarmolinalopez May 4, 2020 14:36

kxl-adsk added proxy Related to base proxy shape workflows Related to in-context workflows labels May 4, 2020

kxl-adsk approved these changes May 4, 2020

View reviewed changes

pilarmolinalopez approved these changes May 5, 2020

View reviewed changes

Merge branch 'dev' into donnels/MAYA-104213/add_new_usd_stage_to_empt…

6a0f1f2

…y_scene

kxl-adsk suggested changes May 5, 2020

View reviewed changes

MAYA-104213 - As a user, I'd like to add a new USD stage to an empty …

c5bc21d

…scene * Fix broken unitttests: 12 - testObject3d (Failed) 15 - testTransform3dTranslate (Failed) 99 - TestPxrUsdTranslators (Failed)

kxl-adsk requested a review from robthebloke May 6, 2020 20:29

kxl-adsk reviewed May 6, 2020

View reviewed changes

kxl-adsk mentioned this pull request May 6, 2020

Fix leak of UsdImagingDelegate #470

Merged

kxl-adsk approved these changes May 12, 2020

View reviewed changes

kxl-adsk merged commit 2fbabab into dev May 12, 2020

kxl-adsk deleted the donnels/MAYA-104213/add_new_usd_stage_to_empty_scene branch May 12, 2020 14:20

ppt-adsk pushed a commit that referenced this pull request Sep 27, 2023

Lilike/hydra 494/fix scene index with usd 2308 (#478)

d002c66

Changes: 1.fix light transform and material binding issues due to usd 23.08 2.make mayaHydraSceneIndex derive from HdRetainedScneIndex in usd 23.08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MAYA-104213 - add a new USD stage to an empty scene #478

MAYA-104213 - add a new USD stage to an empty scene #478

seando-adsk commented May 4, 2020

seando-adsk May 4, 2020

seando-adsk May 4, 2020

seando-adsk May 4, 2020

seando-adsk May 4, 2020

seando-adsk May 4, 2020

seando-adsk May 4, 2020

seando-adsk May 4, 2020

seando-adsk May 4, 2020

seando-adsk May 4, 2020

seando-adsk May 4, 2020

seando-adsk commented May 4, 2020

kxl-adsk left a comment

pilarmolinalopez left a comment

kxl-adsk left a comment

seando-adsk commented May 6, 2020

kxl-adsk May 6, 2020

MAYA-104213 - add a new USD stage to an empty scene #478

MAYA-104213 - add a new USD stage to an empty scene #478

Conversation

seando-adsk commented May 4, 2020

MAYA-104213 - As a user, I'd like to add a new USD stage to an empty scene

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

seando-adsk commented May 4, 2020

kxl-adsk left a comment

Choose a reason for hiding this comment

pilarmolinalopez left a comment

Choose a reason for hiding this comment

kxl-adsk left a comment

Choose a reason for hiding this comment

seando-adsk commented May 6, 2020

Choose a reason for hiding this comment