[usdImagingGL] Preserve UsdImagingGLEngine root xform/visibility acro…

…ss renderer change. (Internal change: 2289099)
PixarAnimationStudios · Aug 3, 2023 · 55a02f3 · 55a02f3
1 parent cacd722
commit 55a02f3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/pxr/usdImaging/usdImaging/rootOverridesSceneIndex.cpp b/pxr/usdImaging/usdImaging/rootOverridesSceneIndex.cpp
@@ -145,6 +145,12 @@ UsdImagingRootOverridesSceneIndex::SetRootTransform(
     _SendPrimsDirtied(entries);
 }
 
+const GfMatrix4d&
+UsdImagingRootOverridesSceneIndex::GetRootTransform() const
+{
+    return _rootOverlayInfo->transform;
+}
+
 void
 UsdImagingRootOverridesSceneIndex::SetRootVisibility(
     const bool visibility)
@@ -164,6 +170,12 @@ UsdImagingRootOverridesSceneIndex::SetRootVisibility(
     _SendPrimsDirtied(entries);
 }
 
+const bool
+UsdImagingRootOverridesSceneIndex::GetRootVisibility() const
+{
+    return _rootOverlayInfo->visibility;
+}
+
 HdSceneIndexPrim
 UsdImagingRootOverridesSceneIndex::GetPrim(
     const SdfPath &primPath) const

diff --git a/pxr/usdImaging/usdImaging/rootOverridesSceneIndex.h b/pxr/usdImaging/usdImaging/rootOverridesSceneIndex.h
@@ -59,9 +59,15 @@ class UsdImagingRootOverridesSceneIndex
     USDIMAGING_API
     void SetRootTransform(const GfMatrix4d &);
 
+    USDIMAGING_API
+    const GfMatrix4d& GetRootTransform() const;
+
     USDIMAGING_API
     void SetRootVisibility(bool);
 
+    USDIMAGING_API
+    const bool GetRootVisibility() const;
+
 protected:
     void _PrimsAdded(
         const HdSceneIndexBase&,

diff --git a/pxr/usdImaging/usdImagingGL/engine.cpp b/pxr/usdImaging/usdImagingGL/engine.cpp
@@ -999,7 +999,10 @@ UsdImagingGLEngine::_SetRenderDelegateAndRestoreState(
     bool rootVisibility = true;
 
     if (_GetUseSceneIndices()) {
-        // XXX(USD-7115): root transform, visibility...
+        if (_rootOverridesSceneIndex) {
+            rootTransform = _rootOverridesSceneIndex->GetRootTransform();
+            rootVisibility = _rootOverridesSceneIndex->GetRootVisibility();
+        }
     } else {
         if (_sceneDelegate) {
             rootTransform = _sceneDelegate->GetRootTransform();
@@ -1014,10 +1017,11 @@ UsdImagingGLEngine::_SetRenderDelegateAndRestoreState(
 
     // Reload saved state.
     if (_GetUseSceneIndices()) {
-        // XXX(USD-7115): root transform, visibility...
+        _rootOverridesSceneIndex->SetRootTransform(rootTransform);
+        _rootOverridesSceneIndex->SetRootVisibility(rootVisibility);
     } else {
-        _sceneDelegate->SetRootVisibility(rootVisibility);
         _sceneDelegate->SetRootTransform(rootTransform);
+        _sceneDelegate->SetRootVisibility(rootVisibility);
     }
     _selTracker->SetSelection(selection);
     _taskController->SetSelectionColor(_selectionColor);