Updated for code review feedback.

Autodesk · Jun 21, 2024 · 5214878 · 5214878
1 parent bfe06dc
commit 5214878
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 9 deletions.
diff --git a/lib/flowViewport/sceneIndex/fvpSelectionSceneIndex.cpp b/lib/flowViewport/sceneIndex/fvpSelectionSceneIndex.cpp
@@ -271,11 +271,18 @@ PrimSelections SelectionSceneIndex::UfePathToPrimSelections(const Ufe::Path& app
         // Try path mapper registry.
         auto mapper = Fvp::PathMapperRegistry::Instance().GetMapper(appPath);
 
-        if (!mapper) {
+        auto warnEmptyPath = [](const Ufe::Path& appPath) {
             TF_WARN("SelectionSceneIndex::UfePathToPrimSelections(%s) returned no path, Hydra selection will be incorrect", Ufe::PathString::string(appPath).c_str());
+        };
+
+        if (!mapper) {
+            warnEmptyPath(appPath);
         }
         else {
             primSelections = mapper->UfePathToPrimSelections(appPath);
+            if (primSelections.empty()) {
+                warnEmptyPath(appPath);
+            }
         }
     }
 

diff --git a/lib/flowViewport/selection/fvpPathMapperFwd.h b/lib/flowViewport/selection/fvpPathMapperFwd.h
@@ -13,8 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#ifndef FVP_PATH_MAPPER_FWD_H
-#define FVP_PATH_MAPPER_FWD_H
+#ifndef FVP_SELECTION_PATH_MAPPER_FWD_H
+#define FVP_SELECTION_PATH_MAPPER_FWD_H
 
 #include <flowViewport/api.h>
 

diff --git a/lib/mayaHydra/flowViewportAPIExamples/flowViewportAPILocator/mhFlowViewportAPILocator.cpp b/lib/mayaHydra/flowViewportAPIExamples/flowViewportAPILocator/mhFlowViewportAPILocator.cpp
@@ -26,7 +26,7 @@
 #include <flowViewport/selection/fvpPathMapperRegistry.h>
 
 //Maya Hydra headers
-#include "mayaHydraLib/mixedUtils.h"
+#include <mayaHydraLib/mixedUtils.h>
 #include <mayaHydraLib/mayaUtils.h>
 #include <mayaHydraLib/mayaHydraLibInterface.h>
 #include <mayaHydraLib/pick/mhPickHandler.h>
@@ -130,7 +130,7 @@ class MhFlowViewportAPILocator : public MPxLocatorNode
     // Get sparse list of hidden cubes.
     HiddenCubes hiddenCubes() const;
 
-    // Set sparce list of hidden cubes.
+    // Set sparse list of hidden cubes.
     void hideCubes(const HiddenCubes& hidden);
 
     // Get sparse list of transformed cubes.

diff --git a/lib/mayaHydra/hydraExtensions/pick/mhPickHandlerRegistry.cpp b/lib/mayaHydra/hydraExtensions/pick/mhPickHandlerRegistry.cpp
@@ -46,8 +46,8 @@ PickHandlerRegistry& PickHandlerRegistry::Instance()
 
 bool PickHandlerRegistry::Register(const SdfPath& prefix, const PickHandlerConstPtr& pickHandler)
 {
-    // Can't register an empty path.
-    if (prefix.IsEmpty()) {
+    // Can't register an empty path, or an absolute root path prefix.
+    if (prefix.IsEmpty() || prefix.IsAbsoluteRootPath()) {
         return false;
     }
 

diff --git a/lib/mayaHydra/hydraExtensions/pick/mhPickHandlerRegistry.h b/lib/mayaHydra/hydraExtensions/pick/mhPickHandlerRegistry.h
@@ -40,7 +40,8 @@ class PickHandlerRegistry {
     static PickHandlerRegistry& Instance();
 
     //! Register a pick handler to deal with all Hydra scene index prims
-    //! under prefix.
+    //! under prefix.  An empty prefix, or a prefix that is the absolute
+    //! root, are illegal.
     /*!
       \return False if an ancestor, descendant, or prefix itself is found in the registry, true otherwise.
     */

diff --git a/lib/mayaHydra/ufeExtensions/CMakeLists.txt b/lib/mayaHydra/ufeExtensions/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(${TARGET_NAME} SHARED)
 # -----------------------------------------------------------------------------
 target_sources(${TARGET_NAME} 
     PRIVATE
-        cvtTypeUtils.h
+        cvtTypeUtils.cpp
         Global.cpp
 )
 

diff --git a/lib/mayaHydra/ufeExtensions/cvtTypeUtils.h b/lib/mayaHydra/ufeExtensions/cvtTypeUtils.h
@@ -28,6 +28,8 @@
 
 #include <cstring> // memcpy
 
+// Type conversion utilities.
+
 namespace UfeExtensions {
 
 //! Copy the argument matrix into the return matrix.

diff --git a/test/lib/mayaUsd/render/mayaToHydra/cpp/testPickHandlerRegistry.cpp b/test/lib/mayaUsd/render/mayaToHydra/cpp/testPickHandlerRegistry.cpp
@@ -50,6 +50,9 @@ TEST(TestPickHandlerRegistry, testRegistry)
     // Can't register for an empty prefix.
     ASSERT_FALSE(r.Register(SdfPath(), dummy));
 
+    // Can't register for an absolute root prefix.
+    ASSERT_FALSE(r.Register(SdfPath::AbsoluteRootPath(), dummy));
+
     std::vector<SdfPath> registered;
     auto fooBarH = TestPickHandler::create();
     SdfPath fooBarP("/foo/bar");