Merge branch 'dev' into tremblp/HYDRA-821/point_instance_pick

Autodesk · Mar 22, 2024 · 7def2fe · 7def2fe
2 parents 1e39197 + 731757f
commit 7def2fe
Show file tree

Hide file tree

Showing 19 changed files with 904 additions and 8 deletions.
diff --git a/lib/flowViewport/API/perViewportSceneIndicesData/fvpFilteringSceneIndicesChainManager.cpp b/lib/flowViewport/API/perViewportSceneIndicesData/fvpFilteringSceneIndicesChainManager.cpp
@@ -63,7 +63,7 @@ HdSceneIndexBaseRefPtr FilteringSceneIndicesChainManager::createFilteringSceneIn
         return nullptr;//Not an empty filtering scene indices chain
     }
 
-    //Append the filtering scene indices chain tp the merging scene index from renderIndexProxy
+    //Append the filtering scene indices chain to the merging scene index from renderIndexProxy
     _AppendFilteringSceneIndicesChain(viewportInformationAndSceneIndicesPerViewportData, inputSceneIndex);
 
     if (viewportInformationAndSceneIndicesPerViewportData.GetLastFilteringSceneIndex() == nullptr){

diff --git a/lib/flowViewport/API/samples/fvpDataProducerSceneIndexExample.cpp b/lib/flowViewport/API/samples/fvpDataProducerSceneIndexExample.cpp
@@ -41,6 +41,7 @@
 #include <pxr/imaging/hd/xformSchema.h>
 #include <pxr/imaging/hd/instancerTopologySchema.h>
 #include <pxr/imaging/hd/containerDataSourceEditor.h>
+#include <pxr/imaging/hd/extentSchema.h>
 
 //TBB headers to use multithreading
 #include <tbb/parallel_for.h>
@@ -484,6 +485,9 @@ HdRetainedSceneIndex::AddedPrimEntry DataProducerSceneIndexExample::_CreateCubeP
                 .Build()
         );
 
+    const GfRange3d cubeRange ({-halfSize, -halfSize, -halfSize},     
+                               { halfSize,  halfSize,  halfSize});
+
     //Add the cube primitive
     HdRetainedSceneIndex::AddedPrimEntry addedPrim;
     addedPrim.primPath      = cubePath;
@@ -505,6 +509,14 @@ HdRetainedSceneIndex::AddedPrimEntry DataProducerSceneIndexExample::_CreateCubeP
                                 .SetResetXformStack(HdRetainedTypedSampledDataSource<bool>::New(true)) //Mark the transform of prototype not inherit from parent
                                 .Build(),
 
+                        //Create an extent attribute to support the viewport bounding box display style, 
+                        //if no extent attribute is added, it will not be displayed at all in bounding box display style
+                        HdExtentSchemaTokens->extent,
+                        HdExtentSchema::Builder()
+                            .SetMin(HdRetainedTypedSampledDataSource<GfVec3d>::New(cubeRange.GetMin()))
+                            .SetMax(HdRetainedTypedSampledDataSource<GfVec3d>::New(cubeRange.GetMax()))
+                            .Build(),
+
                         //create a mesh
                         HdMeshSchemaTokens->mesh,
                         meshDs,
@@ -524,6 +536,13 @@ HdRetainedSceneIndex::AddedPrimEntry DataProducerSceneIndexExample::_CreateCubeP
                                 .SetMatrix(HdRetainedTypedSampledDataSource<GfMatrix4d>::New(
                                 transform)).Build(),
 
+                        //create an extent attribute to easily compute the bounding box from it
+                        HdExtentSchemaTokens->extent,
+                        HdExtentSchema::Builder()
+                            .SetMin(HdRetainedTypedSampledDataSource<GfVec3d>::New(cubeRange.GetMin()))
+                            .SetMax(HdRetainedTypedSampledDataSource<GfVec3d>::New(cubeRange.GetMax()))
+                            .Build(),
+
                         //create a mesh
                         HdMeshSchemaTokens->mesh,
                         meshDs,

diff --git a/lib/flowViewport/sceneIndex/CMakeLists.txt b/lib/flowViewport/sceneIndex/CMakeLists.txt
@@ -10,6 +10,7 @@ target_sources(${TARGET_NAME}
     fvpSceneIndexUtils.cpp
     fvpSelectionSceneIndex.cpp
     fvpWireframeSelectionHighlightSceneIndex.cpp
+    fvpBBoxSceneIndex.cpp
 )
 
 set(HEADERS
@@ -21,6 +22,7 @@ set(HEADERS
     fvpSceneIndexUtils.h
     fvpSelectionSceneIndex.h
     fvpWireframeSelectionHighlightSceneIndex.h
+    fvpBBoxSceneIndex.h
 )
 
 # -----------------------------------------------------------------------------