First commit for Scene delegate code removal

Autodesk · Mar 12, 2024 · cdab016 · cdab016
1 parent cbc1440
commit cdab016
Show file tree

Hide file tree

Showing 34 changed files with 106 additions and 3,779 deletions.
diff --git a/doc/mayaHydraDetails.md b/doc/mayaHydraDetails.md
@@ -71,9 +71,6 @@ The maya-usd plugin provides access to USD data files inside Maya by injecting t
 
 Experimentally, we have separated the two plugins so that they no longer link together.  We use USD's HdSceneIndexPluginRegistry interface to query for a registered HdSceneIndex provider for a Maya node, using a naming convention based on the node type name.  Our hope is that this can also be the entry point for third-party plugins to control the viewport rendering of custom node types (MPxLocatorNode or MPxSurfaceShape) purely through the Hydra API instead of through Maya's various viewport APIs.  This could potentially replace the Maya APIs MPxSubsceneOverride, MPxDrawOverride, and MPxGeometryOverride.  
 
-### Scene Delegate vs Scene Index
-MayaHydra's long term plan is to migrate to using Scene Index completely and remove dependency on SceneDelegates. This aligns with the Pixar's recommendation as Hydra will eventually deprecate Scene Delegate support. During this transition phase, we are supporting both Scene Delegate and Scene Indices. By default, Scene Index is used but it can be overridden to use Scene Delegate using the environment variable ```MAYA_HYDRA_ENABLE_NATIVE_SCENE_INDEX``` to 0. Please note that Scene Delegate mode will not be actively supported and the Scene Index mode is the recommended one.
-
 ### Plugin initialization, render loop and data flow through the plugin.
 As described in the section above, the plugin hooks into Maya Viewport through the MRenderOverride API. 
 

diff --git a/lib/mayaHydra/hydraExtensions/CMakeLists.txt b/lib/mayaHydra/hydraExtensions/CMakeLists.txt
@@ -20,6 +20,7 @@ set(HEADERS
     api.h
     debugCodes.h
     hydraUtils.h
+    mayaHydraParams.h
     mayaHydraLibInterface.h
     mayaHydraLibInterfaceImp.h
     mayaUtils.h
@@ -200,5 +201,4 @@ endif()
 # subdirectories
 # -----------------------------------------------------------------------------
 add_subdirectory(adapters)
-add_subdirectory(delegates)
 add_subdirectory(sceneIndex)
diff --git a/lib/mayaHydra/hydraExtensions/adapters/adapter.h b/lib/mayaHydra/hydraExtensions/adapters/adapter.h
@@ -19,12 +19,26 @@
 #define MAYAHYDRALIB_ADAPTER_H
 
 #include <mayaHydraLib/api.h>
-#include <mayaHydraLib/delegates/delegateCtx.h>
 
+#include <pxr/imaging/hd/sceneDelegate.h>
 #include <pxr/pxr.h>
 #include <pxr/usd/sdf/path.h>
+#include <pxr/base/arch/hints.h>
+#include <pxr/base/gf/interval.h>
+#include <pxr/imaging/hd/engine.h>
+#include <pxr/imaging/hd/renderIndex.h>
+#include <pxr/imaging/hd/rendererPlugin.h>
+#include <pxr/imaging/hd/selection.h>
+#include <pxr/imaging/hdx/pickTask.h>
+#include <pxr/imaging/hdx/taskController.h>
 
 #include <maya/MMessage.h>
+#include <maya/MAnimControl.h>
+#include <maya/MDGContextGuard.h>
+#include <maya/MDrawContext.h>
+#include <maya/MPointArray.h>
+#include <maya/MSelectionContext.h>
+#include <maya/MSelectionList.h>
 
 #include <vector>
 

diff --git a/lib/mayaHydra/hydraExtensions/adapters/adapterRegistry.h b/lib/mayaHydra/hydraExtensions/adapters/adapterRegistry.h
@@ -21,7 +21,6 @@
 #include <mayaHydraLib/adapters/materialAdapter.h>
 #include <mayaHydraLib/adapters/renderItemAdapter.h>
 #include <mayaHydraLib/adapters/shapeAdapter.h>
-#include <mayaHydraLib/delegates/delegateCtx.h>
 
 #include <pxr/base/tf/singleton.h>
 #include <pxr/pxr.h>

diff --git a/lib/mayaHydra/hydraExtensions/adapters/renderItemAdapter.cpp b/lib/mayaHydra/hydraExtensions/adapters/renderItemAdapter.cpp
@@ -20,7 +20,6 @@
 #include <mayaHydraLib/adapters/adapterRegistry.h>
 #include <mayaHydraLib/adapters/mayaAttrs.h>
 #include <mayaHydraLib/adapters/tokens.h>
-#include <mayaHydraLib/delegates/sceneDelegate.h>
 #include <mayaHydraLib/mayaHydraSceneProducer.h>
 
 #include <pxr/base/plug/plugin.h>

diff --git a/lib/mayaHydra/hydraExtensions/delegates/CMakeLists.txt b/lib/mayaHydra/hydraExtensions/delegates/CMakeLists.txt
diff --git a/lib/mayaHydra/hydraExtensions/delegates/defaultLightDelegate.cpp b/lib/mayaHydra/hydraExtensions/delegates/defaultLightDelegate.cpp