MAYA-127832 - Move mayaHydra code together into new directory stuctur…

…e. (#359) lib/mayaHydra/plugin -was lib/mayaUsd/render/mayaToHydra -render override code, builds mayaHydra.mll lib/mayaHydra/hydraExtensions /adapters /delegates /sceneIndex -was lib/usd/mayaHydraLib -builds mayaHydraLib.dll
Autodesk · Feb 21, 2023 · f76b2a6 · f76b2a6
1 parent bc07649
commit f76b2a6
Show file tree

Hide file tree

Showing 83 changed files with 5 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -241,8 +241,7 @@ if (BUILD_ADSK_PLUGIN)
 endif()
 
 if(BUILD_MAYAHYDRALIB)
-    add_subdirectory(lib/mayaUsd/render/mayaToHydra)
-    add_subdirectory(lib/usd/mayaHydraLib)
+    add_subdirectory(lib/mayaHydra)
 endif()
 
 #------------------------------------------------------------------------------

diff --git a/lib/mayaHydra/CMakeLists.txt b/lib/mayaHydra/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(plugin)
+add_subdirectory(hydraExtensions)
diff --git a/lib/usd/mayaHydraLib/CMakeLists.txt → lib/mayaHydra/hydraExtensions/CMakeLists.txt b/lib/usd/mayaHydraLib/CMakeLists.txt → lib/mayaHydra/hydraExtensions/CMakeLists.txt
diff --git a/lib/usd/mayaHydraLib/adapters/CMakeLists.txt → ...a/hydraExtensions/adapters/CMakeLists.txt b/lib/usd/mayaHydraLib/adapters/CMakeLists.txt → ...a/hydraExtensions/adapters/CMakeLists.txt
diff --git a/lib/usd/mayaHydraLib/adapters/adapter.cpp → ...ydra/hydraExtensions/adapters/adapter.cpp b/lib/usd/mayaHydraLib/adapters/adapter.cpp → ...ydra/hydraExtensions/adapters/adapter.cpp
diff --git a/lib/usd/mayaHydraLib/adapters/adapter.h → ...aHydra/hydraExtensions/adapters/adapter.h b/lib/usd/mayaHydraLib/adapters/adapter.h → ...aHydra/hydraExtensions/adapters/adapter.h
diff --git a/...yaHydraLib/adapters/adapterDebugCodes.cpp → ...Extensions/adapters/adapterDebugCodes.cpp b/...yaHydraLib/adapters/adapterDebugCodes.cpp → ...Extensions/adapters/adapterDebugCodes.cpp
diff --git a/...mayaHydraLib/adapters/adapterDebugCodes.h → ...raExtensions/adapters/adapterDebugCodes.h b/...mayaHydraLib/adapters/adapterDebugCodes.h → ...raExtensions/adapters/adapterDebugCodes.h
diff --git a/...mayaHydraLib/adapters/adapterRegistry.cpp → ...raExtensions/adapters/adapterRegistry.cpp b/...mayaHydraLib/adapters/adapterRegistry.cpp → ...raExtensions/adapters/adapterRegistry.cpp
diff --git a/...d/mayaHydraLib/adapters/adapterRegistry.h → ...ydraExtensions/adapters/adapterRegistry.h b/...d/mayaHydraLib/adapters/adapterRegistry.h → ...ydraExtensions/adapters/adapterRegistry.h
diff --git a/...draLib/adapters/aiSkydomeLightAdapter.cpp → ...nsions/adapters/aiSkydomeLightAdapter.cpp b/...draLib/adapters/aiSkydomeLightAdapter.cpp → ...nsions/adapters/aiSkydomeLightAdapter.cpp
diff --git a/...ayaHydraLib/adapters/areaLightAdapter.cpp → ...aExtensions/adapters/areaLightAdapter.cpp b/...ayaHydraLib/adapters/areaLightAdapter.cpp → ...aExtensions/adapters/areaLightAdapter.cpp
diff --git a/...d/mayaHydraLib/adapters/cameraAdapter.cpp → ...ydraExtensions/adapters/cameraAdapter.cpp b/...d/mayaHydraLib/adapters/cameraAdapter.cpp → ...ydraExtensions/adapters/cameraAdapter.cpp
diff --git a/...usd/mayaHydraLib/adapters/cameraAdapter.h → .../hydraExtensions/adapters/cameraAdapter.h b/...usd/mayaHydraLib/adapters/cameraAdapter.h → .../hydraExtensions/adapters/cameraAdapter.h
diff --git a/...aHydraLib/adapters/constantShadowMatrix.h → ...xtensions/adapters/constantShadowMatrix.h b/...aHydraLib/adapters/constantShadowMatrix.h → ...xtensions/adapters/constantShadowMatrix.h
diff --git a/lib/usd/mayaHydraLib/adapters/dagAdapter.cpp → ...a/hydraExtensions/adapters/dagAdapter.cpp b/lib/usd/mayaHydraLib/adapters/dagAdapter.cpp → ...a/hydraExtensions/adapters/dagAdapter.cpp
diff --git a/lib/usd/mayaHydraLib/adapters/dagAdapter.h → ...dra/hydraExtensions/adapters/dagAdapter.h b/lib/usd/mayaHydraLib/adapters/dagAdapter.h → ...dra/hydraExtensions/adapters/dagAdapter.h
diff --git a/...aLib/adapters/directionalLightAdapter.cpp → ...ions/adapters/directionalLightAdapter.cpp b/...aLib/adapters/directionalLightAdapter.cpp → ...ions/adapters/directionalLightAdapter.cpp
diff --git a/...sd/mayaHydraLib/adapters/lightAdapter.cpp → ...hydraExtensions/adapters/lightAdapter.cpp b/...sd/mayaHydraLib/adapters/lightAdapter.cpp → ...hydraExtensions/adapters/lightAdapter.cpp
diff --git a/lib/usd/mayaHydraLib/adapters/lightAdapter.h → ...a/hydraExtensions/adapters/lightAdapter.h b/lib/usd/mayaHydraLib/adapters/lightAdapter.h → ...a/hydraExtensions/adapters/lightAdapter.h
diff --git a/...mayaHydraLib/adapters/materialAdapter.cpp → ...raExtensions/adapters/materialAdapter.cpp b/...mayaHydraLib/adapters/materialAdapter.cpp → ...raExtensions/adapters/materialAdapter.cpp
diff --git a/...d/mayaHydraLib/adapters/materialAdapter.h → ...ydraExtensions/adapters/materialAdapter.h b/...d/mayaHydraLib/adapters/materialAdapter.h → ...ydraExtensions/adapters/materialAdapter.h
diff --git a/...Lib/adapters/materialNetworkConverter.cpp → ...ons/adapters/materialNetworkConverter.cpp b/...Lib/adapters/materialNetworkConverter.cpp → ...ons/adapters/materialNetworkConverter.cpp
diff --git a/...raLib/adapters/materialNetworkConverter.h → ...sions/adapters/materialNetworkConverter.h b/...raLib/adapters/materialNetworkConverter.h → ...sions/adapters/materialNetworkConverter.h
diff --git a/lib/usd/mayaHydraLib/adapters/mayaAttrs.cpp → ...ra/hydraExtensions/adapters/mayaAttrs.cpp b/lib/usd/mayaHydraLib/adapters/mayaAttrs.cpp → ...ra/hydraExtensions/adapters/mayaAttrs.cpp
diff --git a/lib/usd/mayaHydraLib/adapters/mayaAttrs.h → ...ydra/hydraExtensions/adapters/mayaAttrs.h b/lib/usd/mayaHydraLib/adapters/mayaAttrs.h → ...ydra/hydraExtensions/adapters/mayaAttrs.h
diff --git a/...usd/mayaHydraLib/adapters/meshAdapter.cpp → .../hydraExtensions/adapters/meshAdapter.cpp b/...usd/mayaHydraLib/adapters/meshAdapter.cpp → .../hydraExtensions/adapters/meshAdapter.cpp
diff --git a/...yaHydraLib/adapters/nurbsCurveAdapter.cpp → ...Extensions/adapters/nurbsCurveAdapter.cpp b/...yaHydraLib/adapters/nurbsCurveAdapter.cpp → ...Extensions/adapters/nurbsCurveAdapter.cpp
diff --git a/...yaHydraLib/adapters/pointLightAdapter.cpp → ...Extensions/adapters/pointLightAdapter.cpp b/...yaHydraLib/adapters/pointLightAdapter.cpp → ...Extensions/adapters/pointLightAdapter.cpp
diff --git a/...yaHydraLib/adapters/renderItemAdapter.cpp → ...Extensions/adapters/renderItemAdapter.cpp b/...yaHydraLib/adapters/renderItemAdapter.cpp → ...Extensions/adapters/renderItemAdapter.cpp
diff --git a/...mayaHydraLib/adapters/renderItemAdapter.h → ...raExtensions/adapters/renderItemAdapter.h b/...mayaHydraLib/adapters/renderItemAdapter.h → ...raExtensions/adapters/renderItemAdapter.h
diff --git a/...sd/mayaHydraLib/adapters/shapeAdapter.cpp → ...hydraExtensions/adapters/shapeAdapter.cpp b/...sd/mayaHydraLib/adapters/shapeAdapter.cpp → ...hydraExtensions/adapters/shapeAdapter.cpp
diff --git a/lib/usd/mayaHydraLib/adapters/shapeAdapter.h → ...a/hydraExtensions/adapters/shapeAdapter.h b/lib/usd/mayaHydraLib/adapters/shapeAdapter.h → ...a/hydraExtensions/adapters/shapeAdapter.h
diff --git a/...ayaHydraLib/adapters/spotLightAdapter.cpp → ...aExtensions/adapters/spotLightAdapter.cpp b/...ayaHydraLib/adapters/spotLightAdapter.cpp → ...aExtensions/adapters/spotLightAdapter.cpp
diff --git a/lib/usd/mayaHydraLib/adapters/tokens.cpp → ...Hydra/hydraExtensions/adapters/tokens.cpp b/lib/usd/mayaHydraLib/adapters/tokens.cpp → ...Hydra/hydraExtensions/adapters/tokens.cpp
diff --git a/lib/usd/mayaHydraLib/adapters/tokens.h → ...yaHydra/hydraExtensions/adapters/tokens.h b/lib/usd/mayaHydraLib/adapters/tokens.h → ...yaHydra/hydraExtensions/adapters/tokens.h
diff --git a/lib/usd/mayaHydraLib/api.h → lib/mayaHydra/hydraExtensions/api.h b/lib/usd/mayaHydraLib/api.h → lib/mayaHydra/hydraExtensions/api.h
diff --git a/lib/usd/mayaHydraLib/debugCodes.cpp → lib/mayaHydra/hydraExtensions/debugCodes.cpp b/lib/usd/mayaHydraLib/debugCodes.cpp → lib/mayaHydra/hydraExtensions/debugCodes.cpp
diff --git a/lib/usd/mayaHydraLib/debugCodes.h → lib/mayaHydra/hydraExtensions/debugCodes.h b/lib/usd/mayaHydraLib/debugCodes.h → lib/mayaHydra/hydraExtensions/debugCodes.h
diff --git a/...usd/mayaHydraLib/delegates/CMakeLists.txt → .../hydraExtensions/delegates/CMakeLists.txt b/...usd/mayaHydraLib/delegates/CMakeLists.txt → .../hydraExtensions/delegates/CMakeLists.txt
diff --git a/lib/usd/mayaHydraLib/delegates/delegate.cpp → ...ra/hydraExtensions/delegates/delegate.cpp b/lib/usd/mayaHydraLib/delegates/delegate.cpp → ...ra/hydraExtensions/delegates/delegate.cpp
diff --git a/lib/usd/mayaHydraLib/delegates/delegate.h → ...ydra/hydraExtensions/delegates/delegate.h b/lib/usd/mayaHydraLib/delegates/delegate.h → ...ydra/hydraExtensions/delegates/delegate.h
diff --git a/...sd/mayaHydraLib/delegates/delegateCtx.cpp → ...hydraExtensions/delegates/delegateCtx.cpp b/...sd/mayaHydraLib/delegates/delegateCtx.cpp → ...hydraExtensions/delegates/delegateCtx.cpp
diff --git a/lib/usd/mayaHydraLib/delegates/delegateCtx.h → ...a/hydraExtensions/delegates/delegateCtx.h b/lib/usd/mayaHydraLib/delegates/delegateCtx.h → ...a/hydraExtensions/delegates/delegateCtx.h
diff --git a/...HydraLib/delegates/delegateDebugCodes.cpp → ...tensions/delegates/delegateDebugCodes.cpp b/...HydraLib/delegates/delegateDebugCodes.cpp → ...tensions/delegates/delegateDebugCodes.cpp
diff --git a/...yaHydraLib/delegates/delegateDebugCodes.h → ...Extensions/delegates/delegateDebugCodes.h b/...yaHydraLib/delegates/delegateDebugCodes.h → ...Extensions/delegates/delegateDebugCodes.h
diff --git a/...yaHydraLib/delegates/delegateRegistry.cpp → ...Extensions/delegates/delegateRegistry.cpp b/...yaHydraLib/delegates/delegateRegistry.cpp → ...Extensions/delegates/delegateRegistry.cpp
diff --git a/...mayaHydraLib/delegates/delegateRegistry.h → ...raExtensions/delegates/delegateRegistry.h b/...mayaHydraLib/delegates/delegateRegistry.h → ...raExtensions/delegates/delegateRegistry.h
diff --git a/lib/usd/mayaHydraLib/delegates/params.h → ...aHydra/hydraExtensions/delegates/params.h b/lib/usd/mayaHydraLib/delegates/params.h → ...aHydra/hydraExtensions/delegates/params.h
diff --git a/.../mayaHydraLib/delegates/sceneDelegate.cpp → ...draExtensions/delegates/sceneDelegate.cpp b/.../mayaHydraLib/delegates/sceneDelegate.cpp → ...draExtensions/delegates/sceneDelegate.cpp
diff --git a/...sd/mayaHydraLib/delegates/sceneDelegate.h → ...hydraExtensions/delegates/sceneDelegate.h b/...sd/mayaHydraLib/delegates/sceneDelegate.h → ...hydraExtensions/delegates/sceneDelegate.h
diff --git a/...d/mayaHydraLib/delegates/testDelegate.cpp → ...ydraExtensions/delegates/testDelegate.cpp b/...d/mayaHydraLib/delegates/testDelegate.cpp → ...ydraExtensions/delegates/testDelegate.cpp
diff --git a/...usd/mayaHydraLib/delegates/testDelegate.h → .../hydraExtensions/delegates/testDelegate.h b/...usd/mayaHydraLib/delegates/testDelegate.h → .../hydraExtensions/delegates/testDelegate.h
diff --git a/lib/usd/mayaHydraLib/mayaHydra.h.src → ...mayaHydra/hydraExtensions/mayaHydra.h.src b/lib/usd/mayaHydraLib/mayaHydra.h.src → ...mayaHydra/hydraExtensions/mayaHydra.h.src
diff --git a/lib/usd/mayaHydraLib/plugInfo.json → lib/mayaHydra/hydraExtensions/plugInfo.json b/lib/usd/mayaHydraLib/plugInfo.json → lib/mayaHydra/hydraExtensions/plugInfo.json
diff --git a/...sd/mayaHydraLib/sceneIndex/CMakeLists.txt → ...hydraExtensions/sceneIndex/CMakeLists.txt b/...sd/mayaHydraLib/sceneIndex/CMakeLists.txt → ...hydraExtensions/sceneIndex/CMakeLists.txt
diff --git a/.../mayaHydraLib/sceneIndex/registration.cpp → ...draExtensions/sceneIndex/registration.cpp b/.../mayaHydraLib/sceneIndex/registration.cpp → ...draExtensions/sceneIndex/registration.cpp
diff --git a/...sd/mayaHydraLib/sceneIndex/registration.h → ...hydraExtensions/sceneIndex/registration.h b/...sd/mayaHydraLib/sceneIndex/registration.h → ...hydraExtensions/sceneIndex/registration.h
diff --git a/lib/usd/mayaHydraLib/shaderDefs.usda → ...mayaHydra/hydraExtensions/shaderDefs.usda b/lib/usd/mayaHydraLib/shaderDefs.usda → ...mayaHydra/hydraExtensions/shaderDefs.usda
diff --git a/lib/usd/mayaHydraLib/utils.cpp → lib/mayaHydra/hydraExtensions/utils.cpp b/lib/usd/mayaHydraLib/utils.cpp → lib/mayaHydra/hydraExtensions/utils.cpp
diff --git a/lib/usd/mayaHydraLib/utils.h → lib/mayaHydra/hydraExtensions/utils.h b/lib/usd/mayaHydraLib/utils.h → lib/mayaHydra/hydraExtensions/utils.h
diff --git a/...mayaUsd/render/mayaToHydra/CMakeLists.txt → lib/mayaHydra/plugin/CMakeLists.txt b/...mayaUsd/render/mayaToHydra/CMakeLists.txt → lib/mayaHydra/plugin/CMakeLists.txt
diff --git a/...nder/mayaToHydra/defaultLightDelegate.cpp → ...mayaHydra/plugin/defaultLightDelegate.cpp b/...nder/mayaToHydra/defaultLightDelegate.cpp → ...mayaHydra/plugin/defaultLightDelegate.cpp
diff --git a/...render/mayaToHydra/defaultLightDelegate.h → lib/mayaHydra/plugin/defaultLightDelegate.h b/...render/mayaToHydra/defaultLightDelegate.h → lib/mayaHydra/plugin/defaultLightDelegate.h
diff --git a/...render/mayaToHydra/plugRegistryHelper.cpp → lib/mayaHydra/plugin/plugRegistryHelper.cpp b/...render/mayaToHydra/plugRegistryHelper.cpp → lib/mayaHydra/plugin/plugRegistryHelper.cpp
diff --git a/...d/render/mayaToHydra/plugRegistryHelper.h → lib/mayaHydra/plugin/plugRegistryHelper.h b/...d/render/mayaToHydra/plugRegistryHelper.h → lib/mayaHydra/plugin/plugRegistryHelper.h
diff --git a/lib/mayaUsd/render/mayaToHydra/plugin.cpp → lib/mayaHydra/plugin/plugin.cpp b/lib/mayaUsd/render/mayaToHydra/plugin.cpp → lib/mayaHydra/plugin/plugin.cpp
diff --git a/...d/render/mayaToHydra/pluginDebugCodes.cpp → lib/mayaHydra/plugin/pluginDebugCodes.cpp b/...d/render/mayaToHydra/pluginDebugCodes.cpp → lib/mayaHydra/plugin/pluginDebugCodes.cpp
diff --git a/...Usd/render/mayaToHydra/pluginDebugCodes.h → lib/mayaHydra/plugin/pluginDebugCodes.h b/...Usd/render/mayaToHydra/pluginDebugCodes.h → lib/mayaHydra/plugin/pluginDebugCodes.h
diff --git a/...aUsd/render/mayaToHydra/renderGlobals.cpp → lib/mayaHydra/plugin/renderGlobals.cpp b/...aUsd/render/mayaToHydra/renderGlobals.cpp → lib/mayaHydra/plugin/renderGlobals.cpp
diff --git a/...ayaUsd/render/mayaToHydra/renderGlobals.h → lib/mayaHydra/plugin/renderGlobals.h b/...ayaUsd/render/mayaToHydra/renderGlobals.h → lib/mayaHydra/plugin/renderGlobals.h
diff --git a/...Usd/render/mayaToHydra/renderOverride.cpp → lib/mayaHydra/plugin/renderOverride.cpp b/...Usd/render/mayaToHydra/renderOverride.cpp → lib/mayaHydra/plugin/renderOverride.cpp
diff --git a/...yaUsd/render/mayaToHydra/renderOverride.h → lib/mayaHydra/plugin/renderOverride.h b/...yaUsd/render/mayaToHydra/renderOverride.h → lib/mayaHydra/plugin/renderOverride.h
diff --git a/.../render/mayaToHydra/renderOverrideUtils.h → lib/mayaHydra/plugin/renderOverrideUtils.h b/.../render/mayaToHydra/renderOverrideUtils.h → lib/mayaHydra/plugin/renderOverrideUtils.h
diff --git a/...ender/mayaToHydra/shadingModeExporter.cpp → lib/mayaHydra/plugin/shadingModeExporter.cpp b/...ender/mayaToHydra/shadingModeExporter.cpp → lib/mayaHydra/plugin/shadingModeExporter.cpp
diff --git a/lib/mayaUsd/render/mayaToHydra/tokens.cpp → lib/mayaHydra/plugin/tokens.cpp b/lib/mayaUsd/render/mayaToHydra/tokens.cpp → lib/mayaHydra/plugin/tokens.cpp
diff --git a/lib/mayaUsd/render/mayaToHydra/tokens.h → lib/mayaHydra/plugin/tokens.h b/lib/mayaUsd/render/mayaToHydra/tokens.h → lib/mayaHydra/plugin/tokens.h
diff --git a/lib/mayaUsd/render/mayaToHydra/utils.cpp → lib/mayaHydra/plugin/utils.cpp b/lib/mayaUsd/render/mayaToHydra/utils.cpp → lib/mayaHydra/plugin/utils.cpp
diff --git a/lib/mayaUsd/render/mayaToHydra/utils.h → lib/mayaHydra/plugin/utils.h b/lib/mayaUsd/render/mayaToHydra/utils.h → lib/mayaHydra/plugin/utils.h
diff --git a/...ayaUsd/render/mayaToHydra/viewCommand.cpp → lib/mayaHydra/plugin/viewCommand.cpp b/...ayaUsd/render/mayaToHydra/viewCommand.cpp → lib/mayaHydra/plugin/viewCommand.cpp
diff --git a/lib/mayaUsd/render/mayaToHydra/viewCommand.h → lib/mayaHydra/plugin/viewCommand.h b/lib/mayaUsd/render/mayaToHydra/viewCommand.h → lib/mayaHydra/plugin/viewCommand.h
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp
@@ -45,7 +45,7 @@
 #include <maya/MViewport2Renderer.h>
 
 #if defined(BUILD_MAYAHYDRALIB)
-#include <mayaUsd/render/mayaToHydra/utils.h>
+#include <mayaHydra/plugin/utils.h>
 #endif
 
 PXR_NAMESPACE_OPEN_SCOPE

diff --git a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
@@ -91,7 +91,7 @@
 #endif
 
 #if defined(BUILD_MAYAHYDRALIB)
-#include <mayaUsd/render/mayaToHydra/utils.h>
+#include <mayaHydra/plugin/utils.h>
 #endif
 
 PXR_NAMESPACE_OPEN_SCOPE
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		add_subdirectory(plugin)
		add_subdirectory(hydraExtensions)