From dfc4e31b2e4a5cdff5340bebfe3754ed10ebeb47 Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Fri, 27 Mar 2020 07:40:48 -0400 Subject: [PATCH 1/6] Fix include directives and order under lib/mayaUsd. --- lib/mayaUsd/base/api.h | 2 +- lib/mayaUsd/base/debugCodes.cpp | 4 +- lib/mayaUsd/base/debugCodes.h | 4 +- lib/mayaUsd/fileio/chaser/chaser.cpp | 2 +- lib/mayaUsd/fileio/chaser/chaser.h | 12 ++- lib/mayaUsd/fileio/chaser/chaserRegistry.cpp | 10 +-- lib/mayaUsd/fileio/chaser/chaserRegistry.h | 20 ++--- lib/mayaUsd/fileio/fallbackPrimReader.cpp | 7 +- lib/mayaUsd/fileio/fallbackPrimReader.h | 6 +- lib/mayaUsd/fileio/functorPrimReader.cpp | 2 +- lib/mayaUsd/fileio/functorPrimReader.h | 16 ++-- lib/mayaUsd/fileio/functorPrimWriter.cpp | 27 +++--- lib/mayaUsd/fileio/functorPrimWriter.h | 21 ++--- lib/mayaUsd/fileio/importData.cpp | 2 +- lib/mayaUsd/fileio/importData.h | 8 +- lib/mayaUsd/fileio/instancedNodeWriter.cpp | 23 +++-- lib/mayaUsd/fileio/instancedNodeWriter.h | 19 ++-- lib/mayaUsd/fileio/jobs/jobArgs.cpp | 29 +++---- lib/mayaUsd/fileio/jobs/jobArgs.h | 16 ++-- .../fileio/jobs/modelKindProcessor.cpp | 8 +- lib/mayaUsd/fileio/jobs/modelKindProcessor.h | 15 ++-- lib/mayaUsd/fileio/jobs/readJob.cpp | 60 +++++++------ lib/mayaUsd/fileio/jobs/readJob.h | 21 ++--- lib/mayaUsd/fileio/jobs/writeJob.cpp | 84 +++++++++--------- lib/mayaUsd/fileio/jobs/writeJob.h | 17 ++-- lib/mayaUsd/fileio/primReader.cpp | 2 +- lib/mayaUsd/fileio/primReader.h | 10 +-- lib/mayaUsd/fileio/primReaderArgs.cpp | 3 +- lib/mayaUsd/fileio/primReaderArgs.h | 15 ++-- lib/mayaUsd/fileio/primReaderContext.cpp | 3 +- lib/mayaUsd/fileio/primReaderContext.h | 12 +-- lib/mayaUsd/fileio/primReaderRegistry.cpp | 26 +++--- lib/mayaUsd/fileio/primReaderRegistry.h | 16 ++-- lib/mayaUsd/fileio/primUpdater.cpp | 2 +- lib/mayaUsd/fileio/primUpdater.h | 12 +-- lib/mayaUsd/fileio/primUpdaterContext.cpp | 2 +- lib/mayaUsd/fileio/primUpdaterContext.h | 9 +- lib/mayaUsd/fileio/primUpdaterRegistry.cpp | 28 +++--- lib/mayaUsd/fileio/primUpdaterRegistry.h | 17 ++-- lib/mayaUsd/fileio/primWriter.cpp | 52 ++++++----- lib/mayaUsd/fileio/primWriter.h | 29 +++---- lib/mayaUsd/fileio/primWriterArgs.cpp | 6 +- lib/mayaUsd/fileio/primWriterArgs.h | 13 ++- lib/mayaUsd/fileio/primWriterContext.cpp | 3 +- lib/mayaUsd/fileio/primWriterContext.h | 12 +-- lib/mayaUsd/fileio/primWriterRegistry.cpp | 25 +++--- lib/mayaUsd/fileio/primWriterRegistry.h | 20 ++--- lib/mayaUsd/fileio/registryHelper.cpp | 24 +++-- lib/mayaUsd/fileio/registryHelper.h | 10 +-- lib/mayaUsd/fileio/shaderWriter.cpp | 17 ++-- lib/mayaUsd/fileio/shaderWriter.h | 19 ++-- .../shading/shadingModeDisplayColor.cpp | 65 +++++++------- .../fileio/shading/shadingModeExporter.cpp | 39 ++++----- .../fileio/shading/shadingModeExporter.h | 18 ++-- .../shading/shadingModeExporterContext.cpp | 45 +++++----- .../shading/shadingModeExporterContext.h | 29 +++---- .../fileio/shading/shadingModeImporter.cpp | 17 ++-- .../fileio/shading/shadingModeImporter.h | 25 +++--- .../fileio/shading/shadingModePxrRis.cpp | 63 +++++++------- .../shading/shadingModePxrRis_rfm_map.h | 5 +- .../fileio/shading/shadingModeRegistry.cpp | 21 ++--- .../fileio/shading/shadingModeRegistry.h | 26 +++--- .../fileio/shading/shadingModeUseRegistry.cpp | 51 ++++++----- lib/mayaUsd/fileio/transformWriter.cpp | 46 +++++----- lib/mayaUsd/fileio/transformWriter.h | 31 +++---- .../translators/skelBindingsProcessor.cpp | 13 ++- .../translators/skelBindingsProcessor.h | 17 ++-- .../fileio/translators/translatorCamera.cpp | 34 ++++---- .../fileio/translators/translatorCamera.h | 15 ++-- .../fileio/translators/translatorCurves.cpp | 13 ++- .../fileio/translators/translatorCurves.h | 15 ++-- .../fileio/translators/translatorGprim.cpp | 7 +- .../fileio/translators/translatorGprim.h | 15 ++-- .../fileio/translators/translatorMaterial.cpp | 52 ++++++----- .../fileio/translators/translatorMaterial.h | 22 ++--- .../translators/translatorMayaReference.cpp | 23 +++-- .../translators/translatorMayaReference.h | 16 ++-- .../fileio/translators/translatorMesh.cpp | 23 +++-- .../fileio/translators/translatorMesh.h | 16 ++-- .../translators/translatorNurbsPatch.cpp | 19 ++-- .../fileio/translators/translatorNurbsPatch.h | 16 ++-- .../fileio/translators/translatorPrim.cpp | 13 ++- .../fileio/translators/translatorPrim.h | 15 ++-- .../fileio/translators/translatorRfMLight.cpp | 69 +++++++-------- .../fileio/translators/translatorRfMLight.h | 15 ++-- .../fileio/translators/translatorSkel.cpp | 22 +++-- .../fileio/translators/translatorSkel.h | 15 ++-- .../fileio/translators/translatorUtil.cpp | 25 +++--- .../fileio/translators/translatorUtil.h | 11 +-- .../translators/translatorXformable.cpp | 39 ++++----- .../fileio/translators/translatorXformable.h | 16 ++-- .../translatorXformable_decompose.cpp | 13 ++- lib/mayaUsd/fileio/utils/adaptor.cpp | 22 ++--- lib/mayaUsd/fileio/utils/adaptor.h | 22 ++--- lib/mayaUsd/fileio/utils/meshUtil.cpp | 33 ++++--- lib/mayaUsd/fileio/utils/meshUtil.h | 20 ++--- lib/mayaUsd/fileio/utils/readUtil.cpp | 26 +++--- lib/mayaUsd/fileio/utils/readUtil.h | 13 ++- lib/mayaUsd/fileio/utils/roundTripUtil.cpp | 21 ++--- lib/mayaUsd/fileio/utils/roundTripUtil.h | 13 +-- lib/mayaUsd/fileio/utils/shadingUtil.cpp | 18 ++-- lib/mayaUsd/fileio/utils/shadingUtil.h | 22 ++--- .../fileio/utils/userTaggedAttribute.cpp | 25 +++--- .../fileio/utils/userTaggedAttribute.h | 21 ++--- lib/mayaUsd/fileio/utils/writeUtil.cpp | 59 ++++++------- lib/mayaUsd/fileio/utils/writeUtil.h | 29 +++---- lib/mayaUsd/fileio/utils/xformStack.cpp | 9 +- lib/mayaUsd/fileio/utils/xformStack.h | 15 ++-- lib/mayaUsd/fileio/writeJobContext.cpp | 62 +++++++------ lib/mayaUsd/fileio/writeJobContext.h | 18 ++-- lib/mayaUsd/listeners/notice.cpp | 7 +- lib/mayaUsd/listeners/notice.h | 8 +- lib/mayaUsd/listeners/proxyShapeNotice.cpp | 4 +- lib/mayaUsd/listeners/proxyShapeNotice.h | 8 +- lib/mayaUsd/listeners/stageNoticeListener.cpp | 13 ++- lib/mayaUsd/listeners/stageNoticeListener.h | 18 ++-- lib/mayaUsd/nodes/hdImagingShape.cpp | 23 +++-- lib/mayaUsd/nodes/hdImagingShape.h | 13 +-- lib/mayaUsd/nodes/pointBasedDeformerNode.cpp | 32 ++++--- lib/mayaUsd/nodes/pointBasedDeformerNode.h | 11 +-- lib/mayaUsd/nodes/proxyShapeBase.cpp | 80 +++++++++-------- lib/mayaUsd/nodes/proxyShapeBase.h | 28 +++--- lib/mayaUsd/nodes/proxyShapePlugin.cpp | 27 +++--- lib/mayaUsd/nodes/proxyShapePlugin.h | 8 +- lib/mayaUsd/nodes/stageData.cpp | 13 ++- lib/mayaUsd/nodes/stageData.h | 16 ++-- lib/mayaUsd/nodes/stageNode.cpp | 30 +++---- lib/mayaUsd/nodes/stageNode.h | 11 +-- lib/mayaUsd/nodes/usdPrimProvider.cpp | 5 +- lib/mayaUsd/nodes/usdPrimProvider.h | 8 +- lib/mayaUsd/python/module.cpp | 5 +- lib/mayaUsd/python/moduleDeps.cpp | 9 +- lib/mayaUsd/python/wrapAdaptor.cpp | 13 ++- .../wrapBlockSceneModificationContext.cpp | 7 +- lib/mayaUsd/python/wrapColorSpace.cpp | 13 ++- lib/mayaUsd/python/wrapDiagnosticDelegate.cpp | 3 +- lib/mayaUsd/python/wrapMeshUtil.cpp | 20 ++--- lib/mayaUsd/python/wrapQuery.cpp | 4 +- lib/mayaUsd/python/wrapReadUtil.cpp | 12 +-- lib/mayaUsd/python/wrapRoundTripUtil.cpp | 11 ++- lib/mayaUsd/python/wrapStageCache.cpp | 4 +- .../python/wrapUserTaggedAttribute.cpp | 23 +++-- lib/mayaUsd/python/wrapWriteUtil.cpp | 14 ++- lib/mayaUsd/python/wrapXformStack.cpp | 18 ++-- .../mayaToHydra/defaultLightDelegate.cpp | 5 +- .../render/mayaToHydra/defaultLightDelegate.h | 6 +- lib/mayaUsd/render/mayaToHydra/plugin.cpp | 12 ++- .../render/mayaToHydra/pluginDebugCodes.cpp | 2 +- .../render/mayaToHydra/pluginDebugCodes.h | 1 - .../render/mayaToHydra/renderGlobals.cpp | 15 ++-- .../render/mayaToHydra/renderGlobals.h | 20 ++--- .../render/mayaToHydra/renderOverride.cpp | 55 ++++++------ .../render/mayaToHydra/renderOverride.h | 37 ++++---- .../mayaToHydra/shadingModeExporter.cpp | 11 ++- lib/mayaUsd/render/mayaToHydra/tokens.cpp | 2 +- lib/mayaUsd/render/mayaToHydra/utils.cpp | 4 +- lib/mayaUsd/render/mayaToHydra/utils.h | 7 +- .../render/mayaToHydra/viewCommand.cpp | 16 ++-- lib/mayaUsd/render/mayaToHydra/viewCommand.h | 4 +- lib/mayaUsd/render/px_vp20/glslProgram.cpp | 12 ++- lib/mayaUsd/render/px_vp20/glslProgram.h | 7 +- lib/mayaUsd/render/px_vp20/utils.cpp | 41 ++++----- lib/mayaUsd/render/px_vp20/utils.h | 20 ++--- lib/mayaUsd/render/px_vp20/utils_legacy.cpp | 8 +- lib/mayaUsd/render/px_vp20/utils_legacy.h | 8 +- .../render/pxrUsdMayaGL/batchRenderer.cpp | 87 +++++++++---------- .../render/pxrUsdMayaGL/batchRenderer.h | 63 +++++++------- .../render/pxrUsdMayaGL/debugCodes.cpp | 10 +-- lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.h | 8 +- .../hdImagingShapeDrawOverride.cpp | 25 +++--- .../pxrUsdMayaGL/hdImagingShapeDrawOverride.h | 4 +- .../render/pxrUsdMayaGL/hdImagingShapeUI.cpp | 24 +++-- .../render/pxrUsdMayaGL/hdImagingShapeUI.h | 17 ++-- .../render/pxrUsdMayaGL/hdRenderer.cpp | 18 ++-- lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h | 20 ++--- .../render/pxrUsdMayaGL/instancerImager.cpp | 14 ++- .../render/pxrUsdMayaGL/instancerImager.h | 15 ++-- .../pxrUsdMayaGL/instancerShapeAdapter.cpp | 67 ++++++-------- .../pxrUsdMayaGL/instancerShapeAdapter.h | 18 ++-- .../render/pxrUsdMayaGL/proxyDrawOverride.cpp | 27 +++--- .../render/pxrUsdMayaGL/proxyDrawOverride.h | 7 +- .../pxrUsdMayaGL/proxyShapeDelegate.cpp | 29 +++---- .../render/pxrUsdMayaGL/proxyShapeUI.cpp | 27 +++--- .../render/pxrUsdMayaGL/proxyShapeUI.h | 7 +- .../render/pxrUsdMayaGL/renderParams.h | 11 +-- .../render/pxrUsdMayaGL/sceneDelegate.cpp | 77 ++++++++-------- .../render/pxrUsdMayaGL/sceneDelegate.h | 37 ++++---- .../render/pxrUsdMayaGL/shapeAdapter.cpp | 37 ++++---- .../render/pxrUsdMayaGL/shapeAdapter.h | 21 +++-- .../render/pxrUsdMayaGL/softSelectHelper.cpp | 8 +- .../render/pxrUsdMayaGL/softSelectHelper.h | 10 +-- .../pxrUsdMayaGL/usdProxyShapeAdapter.cpp | 60 +++++++------ .../pxrUsdMayaGL/usdProxyShapeAdapter.h | 21 ++--- lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp | 7 +- lib/mayaUsd/render/pxrUsdMayaGL/userData.h | 10 +-- .../render/vp2RenderDelegate/basisCurves.cpp | 33 +++---- .../render/vp2RenderDelegate/basisCurves.h | 16 ++-- .../render/vp2RenderDelegate/bboxGeom.cpp | 6 +- .../render/vp2RenderDelegate/bboxGeom.h | 8 +- .../render/vp2RenderDelegate/debugCodes.cpp | 5 +- .../render/vp2RenderDelegate/debugCodes.h | 5 +- .../render/vp2RenderDelegate/draw_item.cpp | 6 +- .../render/vp2RenderDelegate/draw_item.h | 13 +-- .../render/vp2RenderDelegate/instancer.cpp | 25 +++--- .../render/vp2RenderDelegate/instancer.h | 14 ++- .../render/vp2RenderDelegate/material.cpp | 44 +++++----- .../render/vp2RenderDelegate/material.h | 6 +- lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp | 32 +++---- lib/mayaUsd/render/vp2RenderDelegate/mesh.h | 6 +- .../vp2RenderDelegate/proxyRenderDelegate.cpp | 38 ++++---- .../vp2RenderDelegate/proxyRenderDelegate.h | 17 ++-- .../vp2RenderDelegate/render_delegate.cpp | 37 ++++---- .../vp2RenderDelegate/render_delegate.h | 14 +-- .../render/vp2RenderDelegate/render_param.cpp | 2 +- .../render/vp2RenderDelegate/render_param.h | 9 +- .../render/vp2RenderDelegate/render_pass.h | 5 +- .../vp2RenderDelegate/resource_registry.h | 2 +- .../render/vp2RenderDelegate/sampler.cpp | 2 +- .../render/vp2RenderDelegate/sampler.h | 32 ++++--- .../render/vp2RenderDelegate/tokens.cpp | 2 +- lib/mayaUsd/render/vp2RenderDelegate/tokens.h | 5 +- .../vp2ShaderFragments/shaderFragments.cpp | 10 +-- .../vp2ShaderFragments/shaderFragments.h | 2 +- lib/mayaUsd/ufe/Global.cpp | 27 +++--- lib/mayaUsd/ufe/Global.h | 2 +- lib/mayaUsd/ufe/ProxyShapeHandler.cpp | 4 +- lib/mayaUsd/ufe/ProxyShapeHandler.h | 8 +- lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp | 8 +- lib/mayaUsd/ufe/ProxyShapeHierarchy.h | 4 +- .../ufe/ProxyShapeHierarchyHandler.cpp | 7 +- lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h | 2 +- lib/mayaUsd/ufe/StagesSubject.cpp | 21 ++--- lib/mayaUsd/ufe/StagesSubject.h | 12 +-- lib/mayaUsd/ufe/UsdAttribute.cpp | 12 +-- lib/mayaUsd/ufe/UsdAttribute.h | 2 +- lib/mayaUsd/ufe/UsdAttributes.cpp | 2 +- lib/mayaUsd/ufe/UsdAttributes.h | 9 +- lib/mayaUsd/ufe/UsdAttributesHandler.cpp | 5 +- lib/mayaUsd/ufe/UsdAttributesHandler.h | 5 +- lib/mayaUsd/ufe/UsdContextOps.cpp | 12 +-- lib/mayaUsd/ufe/UsdContextOps.h | 5 +- lib/mayaUsd/ufe/UsdContextOpsHandler.cpp | 2 +- lib/mayaUsd/ufe/UsdContextOpsHandler.h | 4 +- lib/mayaUsd/ufe/UsdHierarchy.cpp | 19 ++-- lib/mayaUsd/ufe/UsdHierarchy.h | 5 +- lib/mayaUsd/ufe/UsdHierarchyHandler.cpp | 6 +- lib/mayaUsd/ufe/UsdHierarchyHandler.h | 6 +- lib/mayaUsd/ufe/UsdObject3d.cpp | 12 +-- lib/mayaUsd/ufe/UsdObject3d.h | 6 +- lib/mayaUsd/ufe/UsdObject3dHandler.cpp | 5 +- lib/mayaUsd/ufe/UsdObject3dHandler.h | 6 +- lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp | 5 +- lib/mayaUsd/ufe/UsdRootChildHierarchy.h | 4 +- ...UsdRotatePivotTranslateUndoableCommand.cpp | 4 +- .../UsdRotatePivotTranslateUndoableCommand.h | 2 +- lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp | 5 +- lib/mayaUsd/ufe/UsdRotateUndoableCommand.h | 6 +- lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp | 7 +- lib/mayaUsd/ufe/UsdScaleUndoableCommand.h | 2 +- lib/mayaUsd/ufe/UsdSceneItem.cpp | 2 +- lib/mayaUsd/ufe/UsdSceneItem.h | 2 +- lib/mayaUsd/ufe/UsdSceneItemOps.cpp | 11 +-- lib/mayaUsd/ufe/UsdSceneItemOps.h | 4 +- lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp | 2 +- lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h | 4 +- lib/mayaUsd/ufe/UsdStageMap.cpp | 8 +- lib/mayaUsd/ufe/UsdStageMap.h | 8 +- lib/mayaUsd/ufe/UsdTransform3d.cpp | 14 +-- lib/mayaUsd/ufe/UsdTransform3d.h | 4 +- lib/mayaUsd/ufe/UsdTransform3dHandler.cpp | 5 +- lib/mayaUsd/ufe/UsdTransform3dHandler.h | 4 +- .../ufe/UsdTranslateUndoableCommand.cpp | 7 +- lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h | 2 +- lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp | 2 +- lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h | 4 +- lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp | 2 +- lib/mayaUsd/ufe/UsdUndoDeleteCommand.h | 4 +- lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp | 5 +- lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h | 5 +- lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp | 7 +- lib/mayaUsd/ufe/UsdUndoRenameCommand.h | 4 +- lib/mayaUsd/ufe/Utils.cpp | 26 +++--- lib/mayaUsd/ufe/Utils.h | 9 +- lib/mayaUsd/ufe/private/InPathChange.h | 2 +- lib/mayaUsd/ufe/private/Utils.cpp | 8 +- lib/mayaUsd/ufe/private/Utils.h | 2 +- lib/mayaUsd/ufe/wrapUtils.cpp | 10 +-- .../utils/blockSceneModificationContext.cpp | 8 +- .../utils/blockSceneModificationContext.h | 7 +- lib/mayaUsd/utils/colorSpace.cpp | 4 +- lib/mayaUsd/utils/colorSpace.h | 9 +- lib/mayaUsd/utils/diagnosticDelegate.cpp | 13 ++- lib/mayaUsd/utils/diagnosticDelegate.h | 16 ++-- lib/mayaUsd/utils/query.cpp | 21 ++--- lib/mayaUsd/utils/query.h | 14 ++- lib/mayaUsd/utils/stageCache.cpp | 25 +++--- lib/mayaUsd/utils/stageCache.h | 13 +-- lib/mayaUsd/utils/undoHelperCommand.cpp | 6 +- lib/mayaUsd/utils/undoHelperCommand.h | 14 ++- lib/mayaUsd/utils/util.cpp | 52 ++++++----- lib/mayaUsd/utils/util.h | 46 +++++----- lib/mayaUsd/utils/utilFileSystem.cpp | 23 ++++- lib/mayaUsd/utils/utilFileSystem.h | 24 ++++- 303 files changed, 2294 insertions(+), 2735 deletions(-) diff --git a/lib/mayaUsd/base/api.h b/lib/mayaUsd/base/api.h index 6a7b6b84b7..c428da35c8 100644 --- a/lib/mayaUsd/base/api.h +++ b/lib/mayaUsd/base/api.h @@ -14,7 +14,7 @@ // limitations under the License. // -#include "pxr/base/arch/export.h" +#include #if defined _WIN32 || defined __CYGWIN__ diff --git a/lib/mayaUsd/base/debugCodes.cpp b/lib/mayaUsd/base/debugCodes.cpp index 9166057c84..d564895fba 100644 --- a/lib/mayaUsd/base/debugCodes.cpp +++ b/lib/mayaUsd/base/debugCodes.cpp @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "debugCodes.h" +#include -#include "pxr/base/tf/registryManager.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/base/debugCodes.h b/lib/mayaUsd/base/debugCodes.h index 12f737713e..c0a9d8bf63 100644 --- a/lib/mayaUsd/base/debugCodes.h +++ b/lib/mayaUsd/base/debugCodes.h @@ -16,8 +16,8 @@ #ifndef PXRUSDMAYA_DEBUGCODES_H #define PXRUSDMAYA_DEBUGCODES_H -#include "pxr/pxr.h" -#include "pxr/base/tf/debug.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/chaser/chaser.cpp b/lib/mayaUsd/fileio/chaser/chaser.cpp index 5b92794d70..bc7fa789ae 100644 --- a/lib/mayaUsd/fileio/chaser/chaser.cpp +++ b/lib/mayaUsd/fileio/chaser/chaser.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "chaser.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/chaser/chaser.h b/lib/mayaUsd/fileio/chaser/chaser.h index 66d125a059..5a201d1c95 100644 --- a/lib/mayaUsd/fileio/chaser/chaser.h +++ b/lib/mayaUsd/fileio/chaser/chaser.h @@ -16,16 +16,14 @@ #ifndef PXRUSDMAYA_CHASER_H #define PXRUSDMAYA_CHASER_H -/// \file usdMaya/chaser.h +#include -#include "../../base/api.h" +#include -#include "pxr/pxr.h" +#include +#include -#include "pxr/base/tf/declarePtrs.h" -#include "pxr/base/tf/refPtr.h" - -#include "pxr/usd/usd/timeCode.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp b/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp index 21fc882d0d..cee9ab202b 100644 --- a/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp +++ b/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp @@ -13,15 +13,15 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "chaserRegistry.h" +#include -#include "../../base/debugCodes.h" -#include "../registryHelper.h" - -#include "pxr/base/tf/instantiateSingleton.h" +#include +#include #include +#include + PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/chaser/chaserRegistry.h b/lib/mayaUsd/fileio/chaser/chaserRegistry.h index cb69fc0027..d974b6d1a2 100644 --- a/lib/mayaUsd/fileio/chaser/chaserRegistry.h +++ b/lib/mayaUsd/fileio/chaser/chaserRegistry.h @@ -16,20 +16,18 @@ #ifndef PXRUSDMAYA_CHASER_REGISTRY_H #define PXRUSDMAYA_CHASER_REGISTRY_H -/// \file usdMaya/chaserRegistry.h +#include +#include +#include +#include -#include "../../base/api.h" -#include "chaser.h" -#include "../jobs/jobArgs.h" -#include "../../utils/util.h" +#include -#include "pxr/pxr.h" +#include +#include +#include -#include "pxr/base/tf/declarePtrs.h" -#include "pxr/base/tf/registryManager.h" -#include "pxr/base/tf/singleton.h" - -#include "pxr/usd/usd/stage.h" +#include #include diff --git a/lib/mayaUsd/fileio/fallbackPrimReader.cpp b/lib/mayaUsd/fileio/fallbackPrimReader.cpp index cfcb96ca6a..8509d81d78 100644 --- a/lib/mayaUsd/fileio/fallbackPrimReader.cpp +++ b/lib/mayaUsd/fileio/fallbackPrimReader.cpp @@ -13,11 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "fallbackPrimReader.h" +#include +#include -#include "translators/translatorUtil.h" - -#include "pxr/usd/usdGeom/imageable.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/fallbackPrimReader.h b/lib/mayaUsd/fileio/fallbackPrimReader.h index 7034c42a56..d3dc4ac842 100644 --- a/lib/mayaUsd/fileio/fallbackPrimReader.h +++ b/lib/mayaUsd/fileio/fallbackPrimReader.h @@ -16,10 +16,8 @@ #ifndef PXRUSDMAYA_FALLBACK_PRIM_READER_H #define PXRUSDMAYA_FALLBACK_PRIM_READER_H -/// \file usdMaya/fallbackPrimReader.h - -#include "primReader.h" -#include "primReaderRegistry.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/functorPrimReader.cpp b/lib/mayaUsd/fileio/functorPrimReader.cpp index 305aa13a62..bade892fa8 100644 --- a/lib/mayaUsd/fileio/functorPrimReader.cpp +++ b/lib/mayaUsd/fileio/functorPrimReader.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "functorPrimReader.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/functorPrimReader.h b/lib/mayaUsd/fileio/functorPrimReader.h index 79f5d5c2c5..03c1ff62d8 100644 --- a/lib/mayaUsd/fileio/functorPrimReader.h +++ b/lib/mayaUsd/fileio/functorPrimReader.h @@ -16,18 +16,16 @@ #ifndef PXRUSDMAYA_FUNCTORPRIMREADER_H #define PXRUSDMAYA_FUNCTORPRIMREADER_H -/// \file usdMaya/functorPrimReader.h - -#include "../base/api.h" -#include "primReader.h" -#include "primReaderArgs.h" -#include "primReaderContext.h" -#include "primReaderRegistry.h" - -#include "pxr/pxr.h" +#include +#include +#include +#include +#include #include +#include + PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMaya_FunctorPrimReader diff --git a/lib/mayaUsd/fileio/functorPrimWriter.cpp b/lib/mayaUsd/fileio/functorPrimWriter.cpp index 9499f8a575..07cf71ee47 100644 --- a/lib/mayaUsd/fileio/functorPrimWriter.cpp +++ b/lib/mayaUsd/fileio/functorPrimWriter.cpp @@ -13,28 +13,25 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "functorPrimWriter.h" +#include +#include +#include +#include +#include +#include +#include -#include "primWriter.h" -#include "primWriterArgs.h" -#include "primWriterContext.h" -#include "primWriterRegistry.h" -#include "transformWriter.h" -#include "writeJobContext.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usd/timeCode.h" +#include #include -#include - +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - UsdMaya_FunctorPrimWriter::UsdMaya_FunctorPrimWriter( const MFnDependencyNode& depNodeFn, const SdfPath& usdPath, diff --git a/lib/mayaUsd/fileio/functorPrimWriter.h b/lib/mayaUsd/fileio/functorPrimWriter.h index ce9c9745f5..2eb1c83906 100644 --- a/lib/mayaUsd/fileio/functorPrimWriter.h +++ b/lib/mayaUsd/fileio/functorPrimWriter.h @@ -16,26 +16,21 @@ #ifndef PXRUSDMAYA_FUNCTOR_PRIM_WRITER_H #define PXRUSDMAYA_FUNCTOR_PRIM_WRITER_H -/// \file usdMaya/functorPrimWriter.h +#include +#include +#include +#include -#include "pxr/pxr.h" -#include "transformWriter.h" - -#include "primWriter.h" -#include "primWriterRegistry.h" -#include "writeJobContext.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/timeCode.h" +#include #include -#include - +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// \class UsdMaya_FunctorPrimWriter /// \brief This class is scaffolding to hold bare prim writer functions and /// adapt them to the UsdMayaPrimWriter or UsdMayaTransformWriter interface diff --git a/lib/mayaUsd/fileio/importData.cpp b/lib/mayaUsd/fileio/importData.cpp index a364323195..dbd7104154 100644 --- a/lib/mayaUsd/fileio/importData.cpp +++ b/lib/mayaUsd/fileio/importData.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "importData.h" +#include #include diff --git a/lib/mayaUsd/fileio/importData.h b/lib/mayaUsd/fileio/importData.h index 9f6a25d59c..b70bbf1c50 100644 --- a/lib/mayaUsd/fileio/importData.h +++ b/lib/mayaUsd/fileio/importData.h @@ -16,15 +16,15 @@ #pragma once -#include "../base/api.h" +#include + +#include +#include #include #include #include -#include -#include - PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/fileio/instancedNodeWriter.cpp b/lib/mayaUsd/fileio/instancedNodeWriter.cpp index 27f72a4986..b6cb0aca44 100644 --- a/lib/mayaUsd/fileio/instancedNodeWriter.cpp +++ b/lib/mayaUsd/fileio/instancedNodeWriter.cpp @@ -13,29 +13,26 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "instancedNodeWriter.h" +#include -#include "primWriter.h" -#include "../utils/util.h" -#include "writeJobContext.h" +#include +#include +#include -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/references.h" -#include "pxr/usd/usd/timeCode.h" +#include +#include #include #include - #include -#include -#include - +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// Assuming that \p instance1 and \p instance2 are instances of one another, /// replaces the prefix \p instance1 in \p dagPath with \p instance2. static diff --git a/lib/mayaUsd/fileio/instancedNodeWriter.h b/lib/mayaUsd/fileio/instancedNodeWriter.h index 58643277d9..469a19ffea 100644 --- a/lib/mayaUsd/fileio/instancedNodeWriter.h +++ b/lib/mayaUsd/fileio/instancedNodeWriter.h @@ -16,25 +16,20 @@ #ifndef PXRUSDMAYA_INSTANCED_NODE_WRITER_H #define PXRUSDMAYA_INSTANCED_NODE_WRITER_H -/// \file usdMaya/instancedNodeWriter.h +#include +#include +#include -#include "pxr/pxr.h" -#include "primWriter.h" - -#include "../utils/util.h" -#include "writeJobContext.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/timeCode.h" +#include #include -#include - +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// This is a "helper" prim writer used internally by UsdMayaWriteJobContext to /// author nodes that are directly instanced in Maya. class UsdMaya_InstancedNodeWriter : public UsdMayaPrimWriter diff --git a/lib/mayaUsd/fileio/jobs/jobArgs.cpp b/lib/mayaUsd/fileio/jobs/jobArgs.cpp index 9465c3c207..3d3cee9040 100644 --- a/lib/mayaUsd/fileio/jobs/jobArgs.cpp +++ b/lib/mayaUsd/fileio/jobs/jobArgs.cpp @@ -13,30 +13,29 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "jobArgs.h" +#include -#include "../registryHelper.h" -#include "../shading/shadingModeRegistry.h" +#include +#include -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/envSetting.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/dictionary.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/sdf/schema.h" -#include "pxr/usd/usdGeom/tokens.h" -#include "pxr/usd/usdUtils/pipeline.h" +#include +#include #include #include #include #include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/jobs/jobArgs.h b/lib/mayaUsd/fileio/jobs/jobArgs.h index f638c9bb15..eb0d666b22 100644 --- a/lib/mayaUsd/fileio/jobs/jobArgs.h +++ b/lib/mayaUsd/fileio/jobs/jobArgs.h @@ -16,17 +16,15 @@ #ifndef PXRUSDMAYA_JOB_ARGS_H #define PXRUSDMAYA_JOB_ARGS_H -/// \file usdMaya/jobArgs.h +#include +#include -#include "../../base/api.h" -#include "../../utils/util.h" +#include -#include "pxr/pxr.h" +#include +#include -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/token.h" - -#include "pxr/usd/sdf/path.h" +#include #include @@ -36,10 +34,8 @@ #include #include - PXR_NAMESPACE_OPEN_SCOPE - #define PXRUSDMAYA_TRANSLATOR_TOKENS \ ((UsdFileExtensionDefault, "usd")) \ ((UsdFileExtensionASCII, "usda")) \ diff --git a/lib/mayaUsd/fileio/jobs/modelKindProcessor.cpp b/lib/mayaUsd/fileio/jobs/modelKindProcessor.cpp index c4568ebfb0..1656a06c48 100644 --- a/lib/mayaUsd/fileio/jobs/modelKindProcessor.cpp +++ b/lib/mayaUsd/fileio/jobs/modelKindProcessor.cpp @@ -13,14 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "modelKindProcessor.h" +#include -#include "pxr/usd/kind/registry.h" -#include "pxr/usd/usd/modelAPI.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE - UsdMaya_ModelKindProcessor::UsdMaya_ModelKindProcessor( const UsdMayaJobExportArgs& args) : _args(args), @@ -28,7 +27,6 @@ UsdMaya_ModelKindProcessor::UsdMaya_ModelKindProcessor( { } - /// Returns the root-most ancestor of prim, which is either a component /// or a root-level prim. static SdfPath diff --git a/lib/mayaUsd/fileio/jobs/modelKindProcessor.h b/lib/mayaUsd/fileio/jobs/modelKindProcessor.h index 654d0c1d24..4cfcd699d6 100644 --- a/lib/mayaUsd/fileio/jobs/modelKindProcessor.h +++ b/lib/mayaUsd/fileio/jobs/modelKindProcessor.h @@ -16,20 +16,17 @@ #ifndef PXRUSDMAYA_MODEL_KIND_PROCESSOR_H #define PXRUSDMAYA_MODEL_KIND_PROCESSOR_H -/// \file usdMaya/modelKindProcessor.h - -#include "jobArgs.h" -#include "../primWriter.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/stage.h" +#include +#include #include #include #include +#include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/jobs/readJob.cpp b/lib/mayaUsd/fileio/jobs/readJob.cpp index d2492796a5..d34e1f9828 100644 --- a/lib/mayaUsd/fileio/jobs/readJob.cpp +++ b/lib/mayaUsd/fileio/jobs/readJob.cpp @@ -13,31 +13,20 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "readJob.h" - -#include "../primReaderRegistry.h" -#include "../../utils/stageCache.h" -#include "../../nodes/stageNode.h" -#include "../translators/translatorMaterial.h" -#include "../translators/translatorXformable.h" -#include "../../utils/util.h" - -#include "pxr/base/tf/token.h" - -#include "pxr/usd/sdf/layer.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/primFlags.h" -#include "pxr/usd/usd/primRange.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usd/stageCacheContext.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usd/variantSets.h" -#include "pxr/usd/usdGeom/metrics.h" -#include "pxr/usd/usdGeom/xform.h" -#include "pxr/usd/usdGeom/xformCommonAPI.h" -#include "pxr/usd/usdUtils/pipeline.h" -#include "pxr/usd/usdUtils/stageCache.h" +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include #include #include @@ -49,12 +38,21 @@ #include #include -#include -#include -#include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/jobs/readJob.h b/lib/mayaUsd/fileio/jobs/readJob.h index 3399bae383..4293374646 100644 --- a/lib/mayaUsd/fileio/jobs/readJob.h +++ b/lib/mayaUsd/fileio/jobs/readJob.h @@ -16,23 +16,20 @@ #ifndef PXRUSDMAYA_READ_JOB_H #define PXRUSDMAYA_READ_JOB_H -/// \file usdMaya/readJob.h +#include +#include +#include -#include "jobArgs.h" -#include "../primReaderContext.h" -#include "../importData.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/primRange.h" +#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/jobs/writeJob.cpp b/lib/mayaUsd/fileio/jobs/writeJob.cpp index 82cdb407e2..0857dedb1f 100644 --- a/lib/mayaUsd/fileio/jobs/writeJob.cpp +++ b/lib/mayaUsd/fileio/jobs/writeJob.cpp @@ -13,45 +13,22 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "writeJob.h" - -#include "jobArgs.h" -#include "modelKindProcessor.h" -#include "../primWriter.h" -#include "../primWriterRegistry.h" -#include "../shading/shadingModeExporterContext.h" -#include "../transformWriter.h" -#include "../translators/translatorMaterial.h" -#include "../../utils/util.h" - -#include "../chaser/chaser.h" -#include "../chaser/chaserRegistry.h" - -#include "pxr/base/tf/fileUtils.h" -#include "pxr/base/tf/hash.h" -#include "pxr/base/tf/hashset.h" -#include "pxr/base/tf/pathUtils.h" -#include "pxr/base/tf/stl.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/usd/ar/resolver.h" -#include "pxr/usd/kind/registry.h" -#include "pxr/usd/sdf/layer.h" -#include "pxr/usd/sdf/primSpec.h" -// Needed for directly removing a UsdVariant via Sdf -// Remove when UsdVariantSet::RemoveVariant() is exposed -// XXX [bug 75864] -#include "pxr/usd/sdf/variantSetSpec.h" -#include "pxr/usd/sdf/variantSpec.h" -#include "pxr/usd/usd/modelAPI.h" -#include "pxr/usd/usd/variantSets.h" -#include "pxr/usd/usd/editContext.h" -#include "pxr/usd/usd/primRange.h" -#include "pxr/usd/usd/usdcFileFormat.h" -#include "pxr/usd/usdGeom/metrics.h" -#include "pxr/usd/usdGeom/xform.h" -#include "pxr/usd/usdUtils/pipeline.h" -#include "pxr/usd/usdUtils/dependencies.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include #include #include @@ -65,13 +42,34 @@ #include #include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +// Needed for directly removing a UsdVariant via Sdf +// Remove when UsdVariantSet::RemoveVariant() is exposed +// XXX [bug 75864] +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - UsdMaya_WriteJob::UsdMaya_WriteJob(const UsdMayaJobExportArgs& iArgs) : mJobCtx(iArgs), _modelKindProcessor(new UsdMaya_ModelKindProcessor(iArgs)) diff --git a/lib/mayaUsd/fileio/jobs/writeJob.h b/lib/mayaUsd/fileio/jobs/writeJob.h index 0d3583a0de..1610c943a5 100644 --- a/lib/mayaUsd/fileio/jobs/writeJob.h +++ b/lib/mayaUsd/fileio/jobs/writeJob.h @@ -16,21 +16,18 @@ #ifndef PXRUSDMAYA_WRITE_JOB_H #define PXRUSDMAYA_WRITE_JOB_H -/// \file usdMaya/writeJob.h +#include -#include "../../base/api.h" +#include +#include +#include -#include "../chaser/chaser.h" -#include "../../utils/util.h" -#include "../writeJobContext.h" - -#include "pxr/pxr.h" - -#include "pxr/base/tf/hashmap.h" +#include #include -#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primReader.cpp b/lib/mayaUsd/fileio/primReader.cpp index 107ae54c62..b550968490 100644 --- a/lib/mayaUsd/fileio/primReader.cpp +++ b/lib/mayaUsd/fileio/primReader.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "primReader.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primReader.h b/lib/mayaUsd/fileio/primReader.h index 0b9f2a6ec8..174473021c 100644 --- a/lib/mayaUsd/fileio/primReader.h +++ b/lib/mayaUsd/fileio/primReader.h @@ -16,13 +16,11 @@ #ifndef PXRUSDMAYA_MAYAPRIMREADER_H #define PXRUSDMAYA_MAYAPRIMREADER_H -/// \file usdMaya/primReader.h +#include +#include +#include -#include "../base/api.h" -#include "primReaderArgs.h" -#include "primReaderContext.h" - -#include "pxr/pxr.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primReaderArgs.cpp b/lib/mayaUsd/fileio/primReaderArgs.cpp index 9206c6fb43..6749adc600 100644 --- a/lib/mayaUsd/fileio/primReaderArgs.cpp +++ b/lib/mayaUsd/fileio/primReaderArgs.cpp @@ -13,11 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "primReaderArgs.h" +#include PXR_NAMESPACE_OPEN_SCOPE - UsdMayaPrimReaderArgs::UsdMayaPrimReaderArgs( const UsdPrim& prim, const UsdMayaJobImportArgs& jobArgs) diff --git a/lib/mayaUsd/fileio/primReaderArgs.h b/lib/mayaUsd/fileio/primReaderArgs.h index 415be098cc..d23bc8b7d0 100644 --- a/lib/mayaUsd/fileio/primReaderArgs.h +++ b/lib/mayaUsd/fileio/primReaderArgs.h @@ -16,20 +16,15 @@ #ifndef PXRUSDMAYA_PRIMREADERARGS_H #define PXRUSDMAYA_PRIMREADERARGS_H -/// \file usdMaya/primReaderArgs.h +#include +#include -#include "../base/api.h" -#include "jobs/jobArgs.h" - -#include "pxr/pxr.h" - -#include "pxr/base/gf/interval.h" - -#include "pxr/usd/usd/prim.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// \class UsdMayaPrimReaderArgs /// \brief This class holds read-only arguments that are passed into reader plugins for /// the usdMaya library. diff --git a/lib/mayaUsd/fileio/primReaderContext.cpp b/lib/mayaUsd/fileio/primReaderContext.cpp index 679661501f..3a4aa02ebc 100644 --- a/lib/mayaUsd/fileio/primReaderContext.cpp +++ b/lib/mayaUsd/fileio/primReaderContext.cpp @@ -13,11 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "primReaderContext.h" +#include PXR_NAMESPACE_OPEN_SCOPE - UsdMayaPrimReaderContext::UsdMayaPrimReaderContext( ObjectRegistry* pathNodeMap) : diff --git a/lib/mayaUsd/fileio/primReaderContext.h b/lib/mayaUsd/fileio/primReaderContext.h index 76364c16fa..c6fe395451 100644 --- a/lib/mayaUsd/fileio/primReaderContext.h +++ b/lib/mayaUsd/fileio/primReaderContext.h @@ -16,18 +16,14 @@ #ifndef PXRUSDMAYA_PRIMREADERCONTEXT_H #define PXRUSDMAYA_PRIMREADERCONTEXT_H -/// \file usdMaya/primReaderContext.h - -#include "../base/api.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usd/prim.h" +#include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMayaPrimReaderContext /// \brief This class provides an interface for reader plugins to communicate diff --git a/lib/mayaUsd/fileio/primReaderRegistry.cpp b/lib/mayaUsd/fileio/primReaderRegistry.cpp index d259426ca9..0f55bd8d35 100644 --- a/lib/mayaUsd/fileio/primReaderRegistry.cpp +++ b/lib/mayaUsd/fileio/primReaderRegistry.cpp @@ -13,29 +13,27 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "primReaderRegistry.h" +#include -#include "../base/debugCodes.h" -#include "fallbackPrimReader.h" -#include "functorPrimReader.h" -#include "registryHelper.h" - -#include "pxr/base/plug/registry.h" -#include "pxr/base/tf/registryManager.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stl.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/tf/type.h" -#include "pxr/usd/usd/schemaBase.h" +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PRIVATE_TOKENS(_tokens, (UsdMaya) (PrimReader) diff --git a/lib/mayaUsd/fileio/primReaderRegistry.h b/lib/mayaUsd/fileio/primReaderRegistry.h index fd7b556c2e..9c8d969d19 100644 --- a/lib/mayaUsd/fileio/primReaderRegistry.h +++ b/lib/mayaUsd/fileio/primReaderRegistry.h @@ -16,20 +16,16 @@ #ifndef PXRUSDMAYA_PRIMREADERREGISTRY_H #define PXRUSDMAYA_PRIMREADERREGISTRY_H -/// \file usdMaya/primReaderRegistry.h +#include +#include +#include +#include -#include "../base/api.h" -#include "primReader.h" -#include "primReaderArgs.h" -#include "primReaderContext.h" - -#include "pxr/pxr.h" - -#include "pxr/base/tf/registryManager.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// \class UsdMayaPrimReaderRegistry /// \brief Provides functionality to register and lookup usd Maya reader /// plugins. diff --git a/lib/mayaUsd/fileio/primUpdater.cpp b/lib/mayaUsd/fileio/primUpdater.cpp index 6b6a785e7b..f0ab5849c1 100644 --- a/lib/mayaUsd/fileio/primUpdater.cpp +++ b/lib/mayaUsd/fileio/primUpdater.cpp @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "primUpdater.h" +#include #include #include diff --git a/lib/mayaUsd/fileio/primUpdater.h b/lib/mayaUsd/fileio/primUpdater.h index 4115ab74cc..10a0b78f5e 100644 --- a/lib/mayaUsd/fileio/primUpdater.h +++ b/lib/mayaUsd/fileio/primUpdater.h @@ -17,17 +17,17 @@ #ifndef PXRUSDMAYA_MAYAPRIMUPDATER_H #define PXRUSDMAYA_MAYAPRIMUPDATER_H -#include "../base/api.h" -#include "primUpdaterContext.h" -#include "../utils/util.h" - -#include "pxr/pxr.h" -#include "pxr/usd/sdf/path.h" +#include +#include +#include #include #include #include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE class UsdMayaPrimUpdater diff --git a/lib/mayaUsd/fileio/primUpdaterContext.cpp b/lib/mayaUsd/fileio/primUpdaterContext.cpp index 1e21210f33..ca990be6a4 100644 --- a/lib/mayaUsd/fileio/primUpdaterContext.cpp +++ b/lib/mayaUsd/fileio/primUpdaterContext.cpp @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "primUpdaterContext.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primUpdaterContext.h b/lib/mayaUsd/fileio/primUpdaterContext.h index c01f0cad7f..251d17e108 100644 --- a/lib/mayaUsd/fileio/primUpdaterContext.h +++ b/lib/mayaUsd/fileio/primUpdaterContext.h @@ -17,12 +17,11 @@ #ifndef PXRUSDMAYA_PRIMUPDATERCONTEXT_H #define PXRUSDMAYA_PRIMUPDATERCONTEXT_H -#include "../base/api.h" +#include -#include "pxr/pxr.h" - -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usd/timeCode.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primUpdaterRegistry.cpp b/lib/mayaUsd/fileio/primUpdaterRegistry.cpp index a2bb16d683..582a909078 100644 --- a/lib/mayaUsd/fileio/primUpdaterRegistry.cpp +++ b/lib/mayaUsd/fileio/primUpdaterRegistry.cpp @@ -14,30 +14,26 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "primUpdaterRegistry.h" - -#include "../base/debugCodes.h" -#include "registryHelper.h" - -#include "pxr/base/plug/registry.h" -#include "pxr/base/tf/debug.h" -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/registryManager.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stl.h" -#include "pxr/base/tf/token.h" - -#include "pxr/usd/usd/schemaBase.h" +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PRIVATE_TOKENS(_tokens, (UsdMaya) (PrimUpdater) diff --git a/lib/mayaUsd/fileio/primUpdaterRegistry.h b/lib/mayaUsd/fileio/primUpdaterRegistry.h index 37ae0be759..6fb9ecbaed 100644 --- a/lib/mayaUsd/fileio/primUpdaterRegistry.h +++ b/lib/mayaUsd/fileio/primUpdaterRegistry.h @@ -17,22 +17,19 @@ #ifndef PXRUSDMAYA_PRIM_UPDATER_REGISTRY_H #define PXRUSDMAYA_PRIM_UPDATER_REGISTRY_H -#include "pxr/pxr.h" -#include "../base/api.h" - -#include "primUpdater.h" -#include "primUpdaterContext.h" - -#include "pxr/usd/sdf/path.h" - -#include +#include +#include +#include #include #include +#include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMayaPrimUpdaterRegistry /// \brief Provides functionality to register and lookup USD updater plugins diff --git a/lib/mayaUsd/fileio/primWriter.cpp b/lib/mayaUsd/fileio/primWriter.cpp index 4d03253d37..fcc8a2909a 100644 --- a/lib/mayaUsd/fileio/primWriter.cpp +++ b/lib/mayaUsd/fileio/primWriter.cpp @@ -13,28 +13,18 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "primWriter.h" - -#include "utils/adaptor.h" -#include "jobs/jobArgs.h" -#include "translators/translatorGprim.h" -#include "../utils//util.h" -#include "writeJobContext.h" -#include "utils/writeUtil.h" - -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/value.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usdGeom/gprim.h" -#include "pxr/usd/usdGeom/imageable.h" -#include "pxr/usd/usdGeom/tokens.h" -#include "pxr/usd/usdUtils/sparseValueWriter.h" +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include #include #include @@ -43,14 +33,22 @@ #include #include -#include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - PXRUSDMAYA_REGISTER_ADAPTOR_ATTRIBUTE_ALIAS( UsdGeomTokens->purpose, "USD_purpose"); diff --git a/lib/mayaUsd/fileio/primWriter.h b/lib/mayaUsd/fileio/primWriter.h index 85949468b9..2e9bba9648 100644 --- a/lib/mayaUsd/fileio/primWriter.h +++ b/lib/mayaUsd/fileio/primWriter.h @@ -16,35 +16,30 @@ #ifndef PXRUSDMAYA_PRIM_WRITER_H #define PXRUSDMAYA_PRIM_WRITER_H -/// \file usdMaya/primWriter.h +#include -#include "pxr/pxr.h" -#include "../base/api.h" +#include +#include -#include "jobs/jobArgs.h" -#include "../utils/util.h" - -#include "pxr/base/vt/value.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usdUtils/sparseValueWriter.h" +#include #include #include #include -#include - +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - class UsdMayaWriteJobContext; - /// Base class for all built-in and user-defined prim writers. Translates Maya /// node data into USD prim(s). /// diff --git a/lib/mayaUsd/fileio/primWriterArgs.cpp b/lib/mayaUsd/fileio/primWriterArgs.cpp index 77ca96696b..ca4e6f7036 100644 --- a/lib/mayaUsd/fileio/primWriterArgs.cpp +++ b/lib/mayaUsd/fileio/primWriterArgs.cpp @@ -13,15 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "primWriterArgs.h" - -#include "utils/writeUtil.h" +#include +#include #include PXR_NAMESPACE_OPEN_SCOPE - UsdMayaPrimWriterArgs::UsdMayaPrimWriterArgs( const MDagPath& dagPath, const bool exportRefsAsInstanceable) : diff --git a/lib/mayaUsd/fileio/primWriterArgs.h b/lib/mayaUsd/fileio/primWriterArgs.h index 7e50806793..976aa07e5c 100644 --- a/lib/mayaUsd/fileio/primWriterArgs.h +++ b/lib/mayaUsd/fileio/primWriterArgs.h @@ -16,19 +16,16 @@ #ifndef PXRUSDMAYA_PRIMWRITERERARGS_H #define PXRUSDMAYA_PRIMWRITERERARGS_H -/// \file usdMaya/primWriterArgs.h - -#include "../base/api.h" - -#include "pxr/pxr.h" -#include "pxr/base/vt/array.h" -#include "pxr/base/gf/vec3f.h" +#include #include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +#include +PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMayaPrimWriterArgs /// \brief This class holds read-only arguments that are passed into the writer diff --git a/lib/mayaUsd/fileio/primWriterContext.cpp b/lib/mayaUsd/fileio/primWriterContext.cpp index b1d06a21bc..5e437e22e6 100644 --- a/lib/mayaUsd/fileio/primWriterContext.cpp +++ b/lib/mayaUsd/fileio/primWriterContext.cpp @@ -13,11 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "primWriterContext.h" +#include PXR_NAMESPACE_OPEN_SCOPE - UsdMayaPrimWriterContext::UsdMayaPrimWriterContext( const UsdTimeCode& timeCode, const SdfPath& authorPath, diff --git a/lib/mayaUsd/fileio/primWriterContext.h b/lib/mayaUsd/fileio/primWriterContext.h index 15a97f4cd3..2233e45f7f 100644 --- a/lib/mayaUsd/fileio/primWriterContext.h +++ b/lib/mayaUsd/fileio/primWriterContext.h @@ -16,18 +16,14 @@ #ifndef PXRUSDMAYA_PRIMWRITERCONTEXT_H #define PXRUSDMAYA_PRIMWRITERCONTEXT_H -/// \file usdMaya/primWriterContext.h +#include -#include "../base/api.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usd/timeCode.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// \class UsdMayaPrimReaderContext /// \brief This class provides an interface for writer plugins to communicate /// state back to the core usd maya logic. diff --git a/lib/mayaUsd/fileio/primWriterRegistry.cpp b/lib/mayaUsd/fileio/primWriterRegistry.cpp index ec7df249e2..e085ba4fce 100644 --- a/lib/mayaUsd/fileio/primWriterRegistry.cpp +++ b/lib/mayaUsd/fileio/primWriterRegistry.cpp @@ -13,28 +13,25 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "primWriterRegistry.h" - -#include "../base/debugCodes.h" -#include "functorPrimWriter.h" -#include "registryHelper.h" - -#include "pxr/base/tf/debug.h" -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/registryManager.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stl.h" -#include "pxr/base/tf/token.h" +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PRIVATE_TOKENS(_tokens, (UsdMaya) (PrimWriter) diff --git a/lib/mayaUsd/fileio/primWriterRegistry.h b/lib/mayaUsd/fileio/primWriterRegistry.h index 0f08c6c4f5..e0eace2bed 100644 --- a/lib/mayaUsd/fileio/primWriterRegistry.h +++ b/lib/mayaUsd/fileio/primWriterRegistry.h @@ -16,26 +16,22 @@ #ifndef PXRUSDMAYA_PRIM_WRITER_REGISTRY_H #define PXRUSDMAYA_PRIM_WRITER_REGISTRY_H -/// \file usdMaya/primWriterRegistry.h +#include +#include +#include +#include -#include "pxr/pxr.h" -#include "../base/api.h" - -#include "primWriter.h" -#include "primWriterArgs.h" -#include "primWriterContext.h" - -#include "pxr/usd/sdf/path.h" +#include +#include #include -#include -#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// \class UsdMayaPrimWriterRegistry /// \brief Provides functionality to register and lookup USD writer plugins /// for Maya nodes. diff --git a/lib/mayaUsd/fileio/registryHelper.cpp b/lib/mayaUsd/fileio/registryHelper.cpp index c48d375fae..991e816740 100644 --- a/lib/mayaUsd/fileio/registryHelper.cpp +++ b/lib/mayaUsd/fileio/registryHelper.cpp @@ -13,26 +13,24 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "registryHelper.h" +#include +#include -#include "base/debugCodes.h" - -#include "pxr/base/js/converter.h" -#include "pxr/base/plug/plugin.h" -#include "pxr/base/plug/registry.h" -#include "pxr/base/tf/scriptModuleLoader.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stl.h" -#include "pxr/base/tf/stringUtils.h" +#include +#include #include -#include -#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PRIVATE_TOKENS(_tokens, (mayaPlugin) (providesTranslator) diff --git a/lib/mayaUsd/fileio/registryHelper.h b/lib/mayaUsd/fileio/registryHelper.h index 9220b71806..9b14c4032a 100644 --- a/lib/mayaUsd/fileio/registryHelper.h +++ b/lib/mayaUsd/fileio/registryHelper.h @@ -16,18 +16,14 @@ #ifndef PXRUSDMAYA_REGISTRYHELPER_H #define PXRUSDMAYA_REGISTRYHELPER_H -/// \file usdMaya/registryHelper.h - -#include "pxr/pxr.h" - -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/dictionary.h" +#include +#include +#include #include PXR_NAMESPACE_OPEN_SCOPE - /// private helper so that both reader/writer registries can share the same /// plugin discovery/load mechanism. struct UsdMaya_RegistryHelper diff --git a/lib/mayaUsd/fileio/shaderWriter.cpp b/lib/mayaUsd/fileio/shaderWriter.cpp index 4345dc84f1..d94b5cfb39 100644 --- a/lib/mayaUsd/fileio/shaderWriter.cpp +++ b/lib/mayaUsd/fileio/shaderWriter.cpp @@ -13,22 +13,19 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "shaderWriter.h" - -#include "writeJobContext.h" - -#include "pxr/base/tf/token.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usd/prim.h" +#include +#include #include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - UsdMayaShaderWriter::UsdMayaShaderWriter( const MFnDependencyNode& depNodeFn, const SdfPath& usdPath, diff --git a/lib/mayaUsd/fileio/shaderWriter.h b/lib/mayaUsd/fileio/shaderWriter.h index 81b2129a5d..eddac2a0f5 100644 --- a/lib/mayaUsd/fileio/shaderWriter.h +++ b/lib/mayaUsd/fileio/shaderWriter.h @@ -16,22 +16,17 @@ #ifndef PXRUSDMAYA_SHADER_WRITER_H #define PXRUSDMAYA_SHADER_WRITER_H -/// \file usdMaya/shaderWriter.h +#include +#include +#include -#include "pxr/pxr.h" -#include "../base/api.h" - -#include "primWriter.h" - -#include "writeJobContext.h" - -#include "pxr/base/tf/token.h" -#include "pxr/usd/sdf/path.h" +#include #include -#include - +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp b/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp index 1731a002ba..58eeaf1d4a 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp @@ -13,37 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../../utils/colorSpace.h" -#include "./shadingModeExporter.h" -#include "./shadingModeExporterContext.h" -#include "./shadingModeRegistry.h" -#include "../translators/translatorMaterial.h" - -#include "pxr/pxr.h" - -#include "pxr/base/gf/gamma.h" -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/tf/registryManager.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/array.h" -#include "pxr/base/vt/types.h" -#include "pxr/base/vt/value.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/sdf/valueTypeName.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usdGeom/gprim.h" -#include "pxr/usd/usdGeom/primvar.h" -#include "pxr/usd/usdRi/materialAPI.h" -#include "pxr/usd/usdShade/connectableAPI.h" -#include "pxr/usd/usdShade/input.h" -#include "pxr/usd/usdShade/material.h" -#include "pxr/usd/usdShade/output.h" -#include "pxr/usd/usdShade/shader.h" -#include "pxr/usd/usdShade/tokens.h" +#include + +#include +#include +#include +#include + +#include #include #include @@ -54,12 +31,32 @@ #include #include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PRIVATE_TOKENS( _tokens, (displayColor) diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp b/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp index ee79a34abd..1d9fed3150 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp @@ -13,41 +13,38 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "shadingModeExporter.h" - -#include "../jobs/jobArgs.h" -#include "shadingModeExporterContext.h" -#include "../../utils/util.h" -#include "../writeJobContext.h" - -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/token.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/collectionAPI.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usdShade/material.h" -#include "pxr/usd/usdShade/materialBindingAPI.h" -#include "pxr/usd/usdUtils/authoring.h" +#include -#include -#include +#include +#include +#include +#include #include #include #include +#include +#include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS( _tokens, ((materialNamespace, "material:")) ); - UsdMayaShadingModeExporter::UsdMayaShadingModeExporter() { } diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporter.h b/lib/mayaUsd/fileio/shading/shadingModeExporter.h index a858f67f4a..1b80f70f8d 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeExporter.h +++ b/lib/mayaUsd/fileio/shading/shadingModeExporter.h @@ -16,24 +16,20 @@ #ifndef PXRUSDMAYA_SHADING_MODE_EXPORTER_H #define PXRUSDMAYA_SHADING_MODE_EXPORTER_H -/// \file usdMaya/shadingModeExporter.h - -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "shadingModeExporterContext.h" -#include "../../utils/util.h" -#include "../writeJobContext.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usdShade/material.h" +#include +#include +#include +#include #include #include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - class UsdMayaShadingModeExporter { public: diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp index 06d8f90b6f..71d7a0798f 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp @@ -13,26 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "shadingModeExporterContext.h" - -#include "../jobs/jobArgs.h" -#include "../../utils/util.h" -#include "../writeJobContext.h" - -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/envSetting.h" -#include "pxr/base/tf/iterator.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/types.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usdGeom/scope.h" -#include "pxr/usd/usdGeom/subset.h" -#include "pxr/usd/usdShade/material.h" -#include "pxr/usd/usdShade/materialBindingAPI.h" -#include "pxr/usd/usdShade/shader.h" +#include + +#include +#include +#include + +#include +#include #include #include @@ -47,9 +35,20 @@ #include #include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h index a6b49c1213..cf30554d50 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h +++ b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h @@ -16,30 +16,27 @@ #ifndef PXRUSDMAYA_SHADING_MODE_EXPORTER_CONTEXT_H #define PXRUSDMAYA_SHADING_MODE_EXPORTER_CONTEXT_H -/// \file usdMaya/shadingModeExporterContext.h +#include -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "../jobs/jobArgs.h" -#include "../../utils/util.h" -#include "../writeJobContext.h" - -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/types.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/stage.h" - -#include -#include +#include +#include +#include #include #include #include +#include +#include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +#include +#include +#include +#include +PXR_NAMESPACE_OPEN_SCOPE class UsdMayaShadingModeExportContext { diff --git a/lib/mayaUsd/fileio/shading/shadingModeImporter.cpp b/lib/mayaUsd/fileio/shading/shadingModeImporter.cpp index 8a1fb9fdd4..7454bc941f 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeImporter.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeImporter.cpp @@ -13,25 +13,22 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "shadingModeImporter.h" - -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/token.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" +#include #include #include #include #include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PUBLIC_TOKENS(UsdMayaShadingModeImporterTokens, PXRUSDMAYA_SHADING_MODE_IMPORTER_TOKENS); diff --git a/lib/mayaUsd/fileio/shading/shadingModeImporter.h b/lib/mayaUsd/fileio/shading/shadingModeImporter.h index 0f619993e2..d7c37ede41 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeImporter.h +++ b/lib/mayaUsd/fileio/shading/shadingModeImporter.h @@ -16,29 +16,24 @@ #ifndef PXRUSDMAYA_SHADING_MODE_IMPORTER_H #define PXRUSDMAYA_SHADING_MODE_IMPORTER_H -/// \file usdMaya/shadingModeImporter.h +#include +#include -#include "../../base/api.h" -#include "../primReaderContext.h" - -#include "pxr/pxr.h" - -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/token.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usdGeom/gprim.h" -#include "pxr/usd/usdShade/material.h" +#include #include -#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - #define PXRUSDMAYA_SHADING_MODE_IMPORTER_TOKENS \ ((MayaMaterialNamespace, "USD_Materials")) diff --git a/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp b/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp index 1e379f7fb6..a88d7a45c5 100644 --- a/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp @@ -13,37 +13,19 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../utils/roundTripUtil.h" -#include "shadingModeExporter.h" -#include "shadingModeExporterContext.h" -#include "shadingModeImporter.h" +#include +#include +#include +#include + // Defines the RenderMan for Maya mapping between Pxr objects and Maya internal nodes -#include "shadingModePxrRis_rfm_map.h" -#include "shadingModeRegistry.h" -#include "../translators/translatorUtil.h" -#include "../../utils/util.h" -#include "../utils/writeUtil.h" - -#include "pxr/pxr.h" - -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/value.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/sdf/valueTypeName.h" -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usdGeom/gprim.h" -#include "pxr/usd/usdRi/materialAPI.h" -#include "pxr/usd/usdShade/connectableAPI.h" -#include "pxr/usd/usdShade/input.h" -#include "pxr/usd/usdShade/material.h" -#include "pxr/usd/usdShade/output.h" -#include "pxr/usd/usdShade/shader.h" -#include "pxr/usd/usdShade/tokens.h" +#include +#include +#include +#include +#include + +#include #include #include @@ -54,12 +36,27 @@ #include #include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PRIVATE_TOKENS( _tokens, diff --git a/lib/mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h b/lib/mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h index 817d23b4e3..8b17d968c6 100644 --- a/lib/mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h +++ b/lib/mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h @@ -19,13 +19,12 @@ // We use this table both for export and for import when RIS mode is active. // XXX This should probably live in a xml or json file that can be easily updated without recompile -#include "pxr/pxr.h" - -#include "pxr/base/tf/token.h" +#include #include #include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp b/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp index cdfffbdf4f..3b4c6cd026 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp @@ -13,30 +13,27 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "shadingModeRegistry.h" +#include -#include "../registryHelper.h" -#include "shadingModeExporter.h" -#include "shadingModeExporterContext.h" -#include "shadingModeImporter.h" - -#include "pxr/base/tf/instantiateSingleton.h" -#include "pxr/base/tf/registryManager.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/token.h" +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PUBLIC_TOKENS(UsdMayaShadingModeTokens, PXRUSDMAYA_SHADINGMODE_TOKENS); - typedef std::map _ExportRegistry; static _ExportRegistry _exportReg; diff --git a/lib/mayaUsd/fileio/shading/shadingModeRegistry.h b/lib/mayaUsd/fileio/shading/shadingModeRegistry.h index a4c5164754..050f3e618d 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeRegistry.h +++ b/lib/mayaUsd/fileio/shading/shadingModeRegistry.h @@ -16,29 +16,25 @@ #ifndef PXRUSDMAYA_SHADING_MODE_REGISTRY_H #define PXRUSDMAYA_SHADING_MODE_REGISTRY_H -/// \file usdMaya/shadingModeRegistry.h +#include -#include "../../base/api.h" -#include "shadingModeExporter.h" -#include "shadingModeExporterContext.h" -#include "shadingModeImporter.h" +#include +#include +#include -#include "pxr/pxr.h" - -#include "pxr/base/tf/registryManager.h" -#include "pxr/base/tf/singleton.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/tf/weakBase.h" +#include #include -#include - +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - #define PXRUSDMAYA_SHADINGMODE_TOKENS \ (none) \ (displayColor) diff --git a/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp b/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp index 1ed04c7bd1..cdcf3c3af7 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp @@ -13,28 +13,17 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "../primWriter.h" -#include "../shaderWriter.h" -#include "shadingModeExporter.h" -#include "shadingModeExporterContext.h" -#include "shadingModeRegistry.h" -#include "../utils/shadingUtil.h" -#include "../../utils/util.h" - -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/token.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/sdf/types.h" -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usdShade/connectableAPI.h" -#include "pxr/usd/usdShade/input.h" -#include "pxr/usd/usdShade/material.h" -#include "pxr/usd/usdShade/output.h" -#include "pxr/usd/usdShade/shader.h" -#include "pxr/usd/usdShade/tokens.h" +#include +#include +#include +#include + +#include +#include +#include + +#include +#include #include #include @@ -45,13 +34,23 @@ #include #include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - namespace { using _NodeHandleToShaderWriterMap = diff --git a/lib/mayaUsd/fileio/transformWriter.cpp b/lib/mayaUsd/fileio/transformWriter.cpp index 771de453ba..4ee941539a 100644 --- a/lib/mayaUsd/fileio/transformWriter.cpp +++ b/lib/mayaUsd/fileio/transformWriter.cpp @@ -13,43 +13,39 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "transformWriter.h" - -#include "utils/adaptor.h" -#include "primWriterRegistry.h" -#include "../utils/util.h" -#include "writeJobContext.h" -#include "utils/xformStack.h" - -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/vec3d.h" -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/value.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usdGeom/xform.h" -#include "pxr/usd/usdGeom/xformOp.h" -#include "pxr/usd/usdGeom/xformable.h" -#include "pxr/usd/usdGeom/xformCommonAPI.h" -#include "pxr/usd/usdUtils/sparseValueWriter.h" +#include +#include +#include +#include +#include +#include + +#include #include #include #include #include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - PXRUSDMAYA_REGISTER_WRITER(transform, UsdMayaTransformWriter); PXRUSDMAYA_REGISTER_ADAPTOR_SCHEMA(transform, UsdGeomXform); - // Given an Op, value and time, set the Op value based on op type and precision static void diff --git a/lib/mayaUsd/fileio/transformWriter.h b/lib/mayaUsd/fileio/transformWriter.h index 2062f3541b..ff7d43aa5f 100644 --- a/lib/mayaUsd/fileio/transformWriter.h +++ b/lib/mayaUsd/fileio/transformWriter.h @@ -16,21 +16,12 @@ #ifndef PXRUSDMAYA_TRANSFORM_WRITER_H #define PXRUSDMAYA_TRANSFORM_WRITER_H -/// \file usdMaya/transformWriter.h +#include +#include +#include -#include "pxr/pxr.h" -#include "../base/api.h" - -#include "primWriter.h" -#include "writeJobContext.h" - -#include "pxr/base/gf/vec3d.h" -#include "pxr/base/tf/token.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usdGeom/xformOp.h" -#include "pxr/usd/usdGeom/xformable.h" -#include "pxr/usd/usdUtils/sparseValueWriter.h" +#include +#include #include #include @@ -38,13 +29,17 @@ #include #include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// Writes transforms and serves as the base class for custom transform writers. /// Handles the conversion of Maya transformation data into USD xformOps. class UsdMayaTransformWriter : public UsdMayaPrimWriter diff --git a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp index d456fee5cb..e43ad3b02f 100644 --- a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp +++ b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp @@ -13,14 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "skelBindingsProcessor.h" +#include +#include -#include "pxr/usd/usdGeom/xform.h" -#include "pxr/usd/usdSkel/bindingAPI.h" -#include "pxr/usd/usdSkel/root.h" -#include "pxr/usd/usdUtils/authoring.h" - -#include "translatorUtil.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h index 92ef4f22b0..75248f5377 100644 --- a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h +++ b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h @@ -16,23 +16,20 @@ #ifndef PXRUSDMAYA_SKEL_BINDINGS_PROCESSOR_H #define PXRUSDMAYA_SKEL_BINDINGS_PROCESSOR_H -/// \file usdMaya/skelBindingsProcessor.h +#include +#include -#include "../../base/api.h" -#include "../../utils/util.h" - -#include "pxr/pxr.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/sdf/pathTable.h" +#include +#include #include -#include -#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// This class encapsulates all of the logic for writing or modifying /// SkelRoot prims for all scopes that have skel bindings. class UsdMaya_SkelBindingsProcessor diff --git a/lib/mayaUsd/fileio/translators/translatorCamera.cpp b/lib/mayaUsd/fileio/translators/translatorCamera.cpp index 254bb3ca4a..a2c54b2ca0 100644 --- a/lib/mayaUsd/fileio/translators/translatorCamera.cpp +++ b/lib/mayaUsd/fileio/translators/translatorCamera.cpp @@ -13,23 +13,16 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "translatorCamera.h" +#include -#include "../jobs/jobArgs.h" -#include "../primReaderArgs.h" -#include "../primReaderContext.h" -#include "translatorUtil.h" -#include "../../utils/util.h" +#include +#include +#include +#include +#include -#include "pxr/base/gf/vec2f.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/tf/type.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usdGeom/camera.h" -#include "pxr/usd/usdGeom/tokens.h" +#include +#include #include #include @@ -37,12 +30,17 @@ #include #include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - static bool _ReadToCamera( const UsdGeomCamera& usdCamera, MFnCamera& cameraObject, diff --git a/lib/mayaUsd/fileio/translators/translatorCamera.h b/lib/mayaUsd/fileio/translators/translatorCamera.h index af0633e56f..351bce6b9b 100644 --- a/lib/mayaUsd/fileio/translators/translatorCamera.h +++ b/lib/mayaUsd/fileio/translators/translatorCamera.h @@ -16,21 +16,18 @@ #ifndef PXRUSDMAYA_TRANSLATOR_CAMERA_H #define PXRUSDMAYA_TRANSLATOR_CAMERA_H -/// \file usdMaya/translatorCamera.h +#include -#include "../../base/api.h" -#include "../primReaderArgs.h" -#include "../primReaderContext.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usdGeom/camera.h" +#include +#include #include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +PXR_NAMESPACE_OPEN_SCOPE /// \brief Provides helper functions for translating to/from UsdGeomCamera struct UsdMayaTranslatorCamera diff --git a/lib/mayaUsd/fileio/translators/translatorCurves.cpp b/lib/mayaUsd/fileio/translators/translatorCurves.cpp index 75650af97a..a24c61e91c 100644 --- a/lib/mayaUsd/fileio/translators/translatorCurves.cpp +++ b/lib/mayaUsd/fileio/translators/translatorCurves.cpp @@ -13,12 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "translatorCurves.h" - -#include "translatorUtil.h" - -#include "pxr/usd/usdGeom/basisCurves.h" -#include "pxr/usd/usdGeom/nurbsCurves.h" +#include +#include #include #include @@ -31,9 +27,10 @@ #include #include -PXR_NAMESPACE_OPEN_SCOPE - +#include +#include +PXR_NAMESPACE_OPEN_SCOPE /* static */ bool diff --git a/lib/mayaUsd/fileio/translators/translatorCurves.h b/lib/mayaUsd/fileio/translators/translatorCurves.h index eb80f48661..f4b930c250 100644 --- a/lib/mayaUsd/fileio/translators/translatorCurves.h +++ b/lib/mayaUsd/fileio/translators/translatorCurves.h @@ -16,20 +16,17 @@ #ifndef PXRUSDMAYA_TRANSLATOR_CURVES_H #define PXRUSDMAYA_TRANSLATOR_CURVES_H -/// \file usdMaya/translatorCurves.h +#include -#include "../../base/api.h" -#include "../primReaderArgs.h" -#include "../primReaderContext.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usdGeom/curves.h" +#include +#include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +PXR_NAMESPACE_OPEN_SCOPE /// \brief Provides helper functions for creating UsdCurves struct UsdMayaTranslatorCurves diff --git a/lib/mayaUsd/fileio/translators/translatorGprim.cpp b/lib/mayaUsd/fileio/translators/translatorGprim.cpp index e437f0a7f8..8df141946e 100644 --- a/lib/mayaUsd/fileio/translators/translatorGprim.cpp +++ b/lib/mayaUsd/fileio/translators/translatorGprim.cpp @@ -13,14 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "translatorGprim.h" - -#include "../../utils/util.h" +#include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +PXR_NAMESPACE_OPEN_SCOPE void UsdMayaTranslatorGprim::Read( diff --git a/lib/mayaUsd/fileio/translators/translatorGprim.h b/lib/mayaUsd/fileio/translators/translatorGprim.h index 8d2765a292..b155575525 100644 --- a/lib/mayaUsd/fileio/translators/translatorGprim.h +++ b/lib/mayaUsd/fileio/translators/translatorGprim.h @@ -16,20 +16,17 @@ #ifndef PXRUSDMAYA_TRANSLATOR_GPRIM_H #define PXRUSDMAYA_TRANSLATOR_GPRIM_H -/// \file translatorGprim.h +#include -#include "../../base/api.h" -#include "../primReaderContext.h" -#include "../primWriterContext.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usdGeom/gprim.h" +#include +#include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +PXR_NAMESPACE_OPEN_SCOPE /// \brief Provides helper functions for reading UsdGeomGprim. struct UsdMayaTranslatorGprim diff --git a/lib/mayaUsd/fileio/translators/translatorMaterial.cpp b/lib/mayaUsd/fileio/translators/translatorMaterial.cpp index c7da9e427d..3d3cf9d302 100644 --- a/lib/mayaUsd/fileio/translators/translatorMaterial.cpp +++ b/lib/mayaUsd/fileio/translators/translatorMaterial.cpp @@ -13,28 +13,18 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "translatorMaterial.h" - -#include "../primReaderContext.h" -#include "../shading/shadingModeExporter.h" -#include "../shading/shadingModeImporter.h" -#include "../shading/shadingModeRegistry.h" -#include "../../utils/util.h" -#include "../writeJobContext.h" - -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/envSetting.h" -#include "pxr/base/tf/iterator.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/types.h" -#include "pxr/usd/sdf/assetPath.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usdGeom/gprim.h" -#include "pxr/usd/usdGeom/mesh.h" -#include "pxr/usd/usdGeom/subset.h" -#include "pxr/usd/usdShade/material.h" -#include "pxr/usd/usdShade/materialBindingAPI.h" +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include #include #include @@ -45,14 +35,22 @@ #include #include -#include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /* static */ MObject UsdMayaTranslatorMaterial::Read( diff --git a/lib/mayaUsd/fileio/translators/translatorMaterial.h b/lib/mayaUsd/fileio/translators/translatorMaterial.h index 5acd22f618..bf5ce41885 100644 --- a/lib/mayaUsd/fileio/translators/translatorMaterial.h +++ b/lib/mayaUsd/fileio/translators/translatorMaterial.h @@ -16,25 +16,21 @@ #ifndef PXRUSDMAYA_TRANSLATOR_MATERIAL_H #define PXRUSDMAYA_TRANSLATOR_MATERIAL_H -/// \file usdMaya/translatorMaterial.h - -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "../primReaderContext.h" -#include "../../utils/util.h" -#include "..//writeJobContext.h" - -#include "pxr/base/tf/token.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usdGeom/gprim.h" -#include "pxr/usd/usdShade/material.h" +#include +#include +#include +#include #include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// \brief Provides helper functions for reading UsdShadeMaterial struct UsdMayaTranslatorMaterial { diff --git a/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp b/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp index 8585aa6713..d415182ba0 100644 --- a/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp +++ b/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp @@ -30,25 +30,24 @@ // limitations under the License. // -#include "translatorMayaReference.h" +#include -#include "../../utils/util.h" -#include "../../base/debugCodes.h" +#include +#include -#include -#include #include -#include -#include +#include +#include +#include #include #include -#include #include -#include -#include +#include +#include #include - -#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorMayaReference.h b/lib/mayaUsd/fileio/translators/translatorMayaReference.h index 03565ea901..e6dc4e8786 100644 --- a/lib/mayaUsd/fileio/translators/translatorMayaReference.h +++ b/lib/mayaUsd/fileio/translators/translatorMayaReference.h @@ -33,21 +33,17 @@ #ifndef PXRUSDMAYA_TRANSLATOR_GPRIM_H #define PXRUSDMAYA_TRANSLATOR_GPRIM_H -/// \file translatorReference.h - -#include "../../base/api.h" -#include "../primReaderContext.h" -#include "../primWriterContext.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usd/prim.h" +#include +#include +#include #include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +PXR_NAMESPACE_OPEN_SCOPE /// \brief Provides helper functions for reading UsdGeomGprim. struct UsdMayaTranslatorMayaReference diff --git a/lib/mayaUsd/fileio/translators/translatorMesh.cpp b/lib/mayaUsd/fileio/translators/translatorMesh.cpp index 597d05e437..38b4e1ba53 100644 --- a/lib/mayaUsd/fileio/translators/translatorMesh.cpp +++ b/lib/mayaUsd/fileio/translators/translatorMesh.cpp @@ -13,16 +13,15 @@ // See the License for the specific language governing permissions and // limitations under the License. // -// Modifications copyright (C) 2020 Autodesk -// - -#include "translatorMesh.h" +#include +#include +#include +#include +#include +#include -#include "../../nodes/pointBasedDeformerNode.h" -#include "../../nodes/stageNode.h" -#include "../../utils/util.h" -#include "../utils/meshUtil.h" -#include "../utils/readUtil.h" +#include +#include #include #include @@ -44,9 +43,6 @@ #include #include -#include -#include - MAYAUSD_NS_DEF { TranslatorMeshRead::TranslatorMeshRead(const UsdGeomMesh& mesh, @@ -181,7 +177,7 @@ TranslatorMeshRead::TranslatorMeshRead(const UsdGeomMesh& mesh, return; } - // store the path + // store the path m_shapePath = prim.GetPath().AppendChild(TfToken(shapeName)); // Set normals if supplied @@ -491,3 +487,4 @@ TranslatorMeshRead::shapePath() const } // namespace MayaUsd + diff --git a/lib/mayaUsd/fileio/translators/translatorMesh.h b/lib/mayaUsd/fileio/translators/translatorMesh.h index f9fa2c320e..54a5b861ae 100644 --- a/lib/mayaUsd/fileio/translators/translatorMesh.h +++ b/lib/mayaUsd/fileio/translators/translatorMesh.h @@ -18,24 +18,20 @@ #pragma once -#include "../../base/api.h" - -#include "pxr/pxr.h" -#include "pxr/usd/usdGeom/mesh.h" +#include #include #include +#include +#include + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { -// -// \class MayaUsd::TranslatorMeshRead -// -// This class is used to translate a UsdGeomMesh prim -// using schema mesh utilities into a Maya mesh. -// +/// Provides helper functions for translating UsdGeomMesh prims into Maya +/// meshes. class MAYAUSD_CORE_PUBLIC TranslatorMeshRead { public: diff --git a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp index 28f1d6c3d6..b09f0bbc0c 100644 --- a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp +++ b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp @@ -13,15 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "translatorNurbsPatch.h" - -#include "../primReaderArgs.h" -#include "../primReaderContext.h" -#include "translatorGprim.h" -#include "translatorMaterial.h" -#include "translatorUtil.h" - -#include "pxr/usd/usdGeom/nurbsPatch.h" +#include +#include +#include +#include +#include +#include #include #include @@ -38,9 +35,9 @@ #include #include -PXR_NAMESPACE_OPEN_SCOPE - +#include +PXR_NAMESPACE_OPEN_SCOPE /* static */ bool diff --git a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h index eda3cf1662..bd2ea946d8 100644 --- a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h +++ b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h @@ -16,21 +16,17 @@ #ifndef PXRUSDMAYA_TRANSLATOR_NURBSPATCH_H #define PXRUSDMAYA_TRANSLATOR_NURBSPATCH_H -/// \file usdMaya/translatorNurbsPatch.h +#include -#include "../../base/api.h" -#include "../primReaderArgs.h" -#include "../primReaderContext.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usdGeom/nurbsPatch.h" +#include +#include #include -PXR_NAMESPACE_OPEN_SCOPE - +#include +#include +PXR_NAMESPACE_OPEN_SCOPE struct UsdMayaTranslatorNurbsPatch { diff --git a/lib/mayaUsd/fileio/translators/translatorPrim.cpp b/lib/mayaUsd/fileio/translators/translatorPrim.cpp index c4d3ca6ae3..1e051914cc 100644 --- a/lib/mayaUsd/fileio/translators/translatorPrim.cpp +++ b/lib/mayaUsd/fileio/translators/translatorPrim.cpp @@ -13,19 +13,18 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "translatorPrim.h" +#include -#include "../utils/readUtil.h" -#include "translatorUtil.h" -#include "../../utils/util.h" - -#include "pxr/usd/usdGeom/imageable.h" +#include +#include +#include #include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +PXR_NAMESPACE_OPEN_SCOPE void UsdMayaTranslatorPrim::Read( diff --git a/lib/mayaUsd/fileio/translators/translatorPrim.h b/lib/mayaUsd/fileio/translators/translatorPrim.h index e118c62d72..11a90a4076 100644 --- a/lib/mayaUsd/fileio/translators/translatorPrim.h +++ b/lib/mayaUsd/fileio/translators/translatorPrim.h @@ -16,20 +16,17 @@ #ifndef PXRUSDMAYA_TRANSLATOR_PRIM_H #define PXRUSDMAYA_TRANSLATOR_PRIM_H -/// \file usdMaya/translatorPrim.h +#include -#include "../../base/api.h" -#include "../primReaderArgs.h" -#include "../primReaderContext.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usd/prim.h" +#include +#include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +PXR_NAMESPACE_OPEN_SCOPE /// \brief Provides helper functions for reading UsdPrim. This should more /// accurately take a UsdGeomImageable. diff --git a/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp b/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp index d74371f4f6..b9972da212 100644 --- a/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp +++ b/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp @@ -13,39 +13,18 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "translatorRfMLight.h" - -#include "../primReaderArgs.h" -#include "../primReaderContext.h" -#include "../primReaderRegistry.h" -#include "../primWriterArgs.h" -#include "../primWriterContext.h" -#include "../primWriterRegistry.h" -#include "translatorUtil.h" -#include "translatorXformable.h" -#include "../../utils/util.h" - -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/value.h" -#include "pxr/usd/sdf/assetPath.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usdLux/light.h" -#include "pxr/usd/usdLux/cylinderLight.h" -#include "pxr/usd/usdLux/diskLight.h" -#include "pxr/usd/usdLux/distantLight.h" -#include "pxr/usd/usdLux/domeLight.h" -#include "pxr/usd/usdLux/geometryLight.h" -#include "pxr/usd/usdLux/rectLight.h" -#include "pxr/usd/usdLux/shadowAPI.h" -#include "pxr/usd/usdLux/shapingAPI.h" -#include "pxr/usd/usdLux/sphereLight.h" -#include "pxr/usd/usdRi/pxrAovLight.h" -#include "pxr/usd/usdRi/pxrEnvDayLight.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include @@ -54,12 +33,30 @@ #include #include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PRIVATE_TOKENS( _tokens, diff --git a/lib/mayaUsd/fileio/translators/translatorRfMLight.h b/lib/mayaUsd/fileio/translators/translatorRfMLight.h index 6583f36f6d..72b6d74e7f 100644 --- a/lib/mayaUsd/fileio/translators/translatorRfMLight.h +++ b/lib/mayaUsd/fileio/translators/translatorRfMLight.h @@ -16,20 +16,17 @@ #ifndef PXRUSDMAYA_TRANSLATOR_RFM_LIGHT_H #define PXRUSDMAYA_TRANSLATOR_RFM_LIGHT_H -/// \file usdMaya/translatorRfMLight.h +#include -#include "pxr/pxr.h" - -#include "../../base/api.h" -#include "../primReaderArgs.h" -#include "../primReaderContext.h" -#include "../primWriterArgs.h" -#include "../primWriterContext.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - struct UsdMayaTranslatorRfMLight { /// Exports a UsdLux schema prim when provided args and a context that diff --git a/lib/mayaUsd/fileio/translators/translatorSkel.cpp b/lib/mayaUsd/fileio/translators/translatorSkel.cpp index 5e1beb4447..2e917f3cda 100644 --- a/lib/mayaUsd/fileio/translators/translatorSkel.cpp +++ b/lib/mayaUsd/fileio/translators/translatorSkel.cpp @@ -13,19 +13,19 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "translatorSkel.h" +#include -#include "translatorUtil.h" -#include "translatorXformable.h" -#include "../../utils/util.h" +#include +#include +#include -#include "pxr/base/tf/staticData.h" -#include "pxr/base/tf/staticTokens.h" +#include +#include -#include "pxr/usd/usdSkel/skeleton.h" -#include "pxr/usd/usdSkel/skeletonQuery.h" -#include "pxr/usd/usdSkel/skinningQuery.h" -#include "pxr/usd/usdSkel/topology.h" +#include +#include +#include +#include #include #include @@ -44,10 +44,8 @@ #include #include - PXR_NAMESPACE_OPEN_SCOPE - // There are a lot of nodes and connections that go into a basic skinning rig. // The following is an overview of everything that must be rigged up: // diff --git a/lib/mayaUsd/fileio/translators/translatorSkel.h b/lib/mayaUsd/fileio/translators/translatorSkel.h index 45fe034d9a..8b29b6348b 100644 --- a/lib/mayaUsd/fileio/translators/translatorSkel.h +++ b/lib/mayaUsd/fileio/translators/translatorSkel.h @@ -13,28 +13,23 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -/// \file usdMaya/translatorSkel.h - #ifndef PXRUSDMAYA_TRANSLATOR_SKEL_H #define PXRUSDMAYA_TRANSLATOR_SKEL_H -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "../primReaderArgs.h" -#include "../primReaderContext.h" +#include -#include "pxr/base/vt/array.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - class UsdSkelSkeleton; class UsdSkelSkeletonQuery; class UsdSkelSkinningQuery; - struct UsdMayaTranslatorSkel { /// Returns true if \p joint is being used to identify the root of diff --git a/lib/mayaUsd/fileio/translators/translatorUtil.cpp b/lib/mayaUsd/fileio/translators/translatorUtil.cpp index 4aa3d9780b..379c960dab 100644 --- a/lib/mayaUsd/fileio/translators/translatorUtil.cpp +++ b/lib/mayaUsd/fileio/translators/translatorUtil.cpp @@ -13,19 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "translatorUtil.h" +#include -#include "../utils/adaptor.h" -#include "../primReaderArgs.h" -#include "../primReaderContext.h" -#include "translatorXformable.h" -#include "../../utils/util.h" -#include "../utils/xformStack.h" - -#include "pxr/usd/sdf/schema.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usdGeom/xformable.h" +#include +#include +#include +#include +#include +#include #include #include @@ -37,13 +32,15 @@ #include #include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - const MString _DEFAULT_TRANSFORM_TYPE("transform"); - /* static */ bool UsdMayaTranslatorUtil::CreateTransformNode( diff --git a/lib/mayaUsd/fileio/translators/translatorUtil.h b/lib/mayaUsd/fileio/translators/translatorUtil.h index 33474315ca..88bfc2a902 100644 --- a/lib/mayaUsd/fileio/translators/translatorUtil.h +++ b/lib/mayaUsd/fileio/translators/translatorUtil.h @@ -16,16 +16,17 @@ #ifndef PXRUSDMAYA_TRANSLATOR_UTIL_H #define PXRUSDMAYA_TRANSLATOR_UTIL_H -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "../primReaderArgs.h" -#include "../primReaderContext.h" +#include -#include "pxr/usd/usd/prim.h" +#include +#include #include #include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE enum class UsdMayaShadingNodeType { diff --git a/lib/mayaUsd/fileio/translators/translatorXformable.cpp b/lib/mayaUsd/fileio/translators/translatorXformable.cpp index d07e287705..20abfc4db7 100644 --- a/lib/mayaUsd/fileio/translators/translatorXformable.cpp +++ b/lib/mayaUsd/fileio/translators/translatorXformable.cpp @@ -13,22 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "translatorXformable.h" - -#include "translatorPrim.h" -#include "translatorUtil.h" -#include "../utils/xformStack.h" - -#include "pxr/base/gf/math.h" -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/vec3d.h" -#include "pxr/base/tf/token.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usdGeom/xform.h" -#include "pxr/usd/usdGeom/xformCommonAPI.h" -#include "pxr/usd/usdGeom/xformable.h" +#include +#include +#include +#include + +#include +#include +#include #include #include @@ -43,14 +35,19 @@ #include #include -#include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - // This function retrieves a value for a given xformOp and given time sample. It // knows how to deal with different type of ops and angle conversion static bool _getXformOpAsVec3d( diff --git a/lib/mayaUsd/fileio/translators/translatorXformable.h b/lib/mayaUsd/fileio/translators/translatorXformable.h index 52582dfe33..da59b15f2b 100644 --- a/lib/mayaUsd/fileio/translators/translatorXformable.h +++ b/lib/mayaUsd/fileio/translators/translatorXformable.h @@ -16,19 +16,19 @@ #ifndef PXRUSDMAYA_TRANSLATOR_XFORMABLE_H #define PXRUSDMAYA_TRANSLATOR_XFORMABLE_H -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/vec3d.h" -#include "pxr/usd/usdGeom/xformable.h" +#include -#include "../primReaderContext.h" -#include "../primReaderArgs.h" +#include +#include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +#include +#include +PXR_NAMESPACE_OPEN_SCOPE /// \brief Provides helper functions for reading UsdGeomXformable. struct UsdMayaTranslatorXformable diff --git a/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp b/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp index 98145a66f9..4bc0774375 100644 --- a/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp +++ b/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp @@ -13,17 +13,16 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "translatorXformable.h" - -#include "pxr/base/gf/math.h" -#include "pxr/base/gf/matrix3d.h" -#include "pxr/base/gf/transform.h" +#include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +#include +#include +PXR_NAMESPACE_OPEN_SCOPE // XXX: // This implementation is ported from MfTransformablePrim:: diff --git a/lib/mayaUsd/fileio/utils/adaptor.cpp b/lib/mayaUsd/fileio/utils/adaptor.cpp index 1794306682..691bb516d3 100644 --- a/lib/mayaUsd/fileio/utils/adaptor.cpp +++ b/lib/mayaUsd/fileio/utils/adaptor.cpp @@ -13,23 +13,23 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "adaptor.h" +#include -#include "../primWriterRegistry.h" -#include "readUtil.h" -#include "../registryHelper.h" -#include "../../utils/util.h" -#include "writeUtil.h" - -#include "pxr/usd/sdf/schema.h" -#include "pxr/usd/usd/apiSchemaBase.h" -#include "pxr/usd/usd/schemaBase.h" -#include "pxr/usd/usd/tokens.h" +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE static std::string diff --git a/lib/mayaUsd/fileio/utils/adaptor.h b/lib/mayaUsd/fileio/utils/adaptor.h index e3b9decd6e..8e6e104c1b 100644 --- a/lib/mayaUsd/fileio/utils/adaptor.h +++ b/lib/mayaUsd/fileio/utils/adaptor.h @@ -16,24 +16,20 @@ #ifndef PXRUSDMAYA_ADAPTOR_H #define PXRUSDMAYA_ADAPTOR_H -/// \file usdMaya/adaptor.h - -#include "../../base/api.h" - -#include "pxr/pxr.h" - -#include "pxr/base/tf/registryManager.h" -#include "pxr/base/vt/value.h" - -#include "pxr/usd/sdf/attributeSpec.h" -#include "pxr/usd/sdf/primSpec.h" -#include "pxr/usd/usd/common.h" -#include "pxr/usd/usd/schemaRegistry.h" +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMayaAdaptor diff --git a/lib/mayaUsd/fileio/utils/meshUtil.cpp b/lib/mayaUsd/fileio/utils/meshUtil.cpp index 3e59b6d9bc..8dd22562b4 100644 --- a/lib/mayaUsd/fileio/utils/meshUtil.cpp +++ b/lib/mayaUsd/fileio/utils/meshUtil.cpp @@ -15,23 +15,12 @@ // // Modifications copyright (C) 2020 Autodesk // -#include "meshUtil.h" -#include "roundTripUtil.h" -#include "readUtil.h" -#include "adaptor.h" - -#include "../../base/debugCodes.h" -#include "../../utils/util.h" -#include "../../utils/colorSpace.h" - -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/array.h" -#include "pxr/usd/usdGeom/mesh.h" -#include "pxr/usd/usdGeom/tokens.h" -#include "pxr/usd/usdUtils/pipeline.h" +#include +#include +#include +#include +#include +#include #include #include @@ -50,8 +39,16 @@ #include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +#include +#include +#include +#include +#include +#include +PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PUBLIC_TOKENS(UsdMayaMeshColorSetTokens, PXRUSDMAYA_MESH_COLOR_SET_TOKENS); diff --git a/lib/mayaUsd/fileio/utils/meshUtil.h b/lib/mayaUsd/fileio/utils/meshUtil.h index a87670d92d..824fa03b64 100644 --- a/lib/mayaUsd/fileio/utils/meshUtil.h +++ b/lib/mayaUsd/fileio/utils/meshUtil.h @@ -19,21 +19,21 @@ #ifndef PXRUSDMAYA_MESH_UTIL_H #define PXRUSDMAYA_MESH_UTIL_H -#include "../../base/api.h" - -#include "pxr/pxr.h" -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/array.h" -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usdGeom/mesh.h" +#include #include -#include #include +#include #include +#include +#include +#include +#include +#include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE class UsdGeomMesh; diff --git a/lib/mayaUsd/fileio/utils/readUtil.cpp b/lib/mayaUsd/fileio/utils/readUtil.cpp index f6f754b499..0f9c63e265 100644 --- a/lib/mayaUsd/fileio/utils/readUtil.cpp +++ b/lib/mayaUsd/fileio/utils/readUtil.cpp @@ -13,20 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "readUtil.h" - -#include "adaptor.h" -#include "../../utils/colorSpace.h" -#include "../../utils/util.h" - -#include "pxr/base/gf/gamma.h" -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/tf/envSetting.h" -#include "pxr/base/vt/array.h" - -#include "pxr/usd/sdf/assetPath.h" -#include "pxr/usd/sdf/listOp.h" -#include "pxr/usd/usd/tokens.h" +#include +#include +#include +#include #include #include @@ -48,6 +38,14 @@ #include #include +#include +#include +#include +#include +#include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_ENV_SETTING( diff --git a/lib/mayaUsd/fileio/utils/readUtil.h b/lib/mayaUsd/fileio/utils/readUtil.h index 1ad271e9a0..3299def8d9 100644 --- a/lib/mayaUsd/fileio/utils/readUtil.h +++ b/lib/mayaUsd/fileio/utils/readUtil.h @@ -14,27 +14,24 @@ // limitations under the License. // -/// \file usdMaya/readUtil.h - #ifndef PXRUSDMAYA_READUTIL_H #define PXRUSDMAYA_READUTIL_H -#include "../../base/api.h" +#include -#include "pxr/pxr.h" -#include "pxr/usd/sdf/attributeSpec.h" -#include "pxr/usd/usd/attribute.h" +#include #include #include #include #include -#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// This struct contains helpers for reading USD (thus writing Maya data). struct UsdMayaReadUtil { diff --git a/lib/mayaUsd/fileio/utils/roundTripUtil.cpp b/lib/mayaUsd/fileio/utils/roundTripUtil.cpp index 8e753a4adf..ccf89e2c56 100644 --- a/lib/mayaUsd/fileio/utils/roundTripUtil.cpp +++ b/lib/mayaUsd/fileio/utils/roundTripUtil.cpp @@ -13,22 +13,19 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "roundTripUtil.h" - -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stl.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/dictionary.h" -#include "pxr/base/vt/value.h" - -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usdGeom/primvar.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PRIVATE_TOKENS( _tokens, diff --git a/lib/mayaUsd/fileio/utils/roundTripUtil.h b/lib/mayaUsd/fileio/utils/roundTripUtil.h index 405d9bed22..18c11b83a7 100644 --- a/lib/mayaUsd/fileio/utils/roundTripUtil.h +++ b/lib/mayaUsd/fileio/utils/roundTripUtil.h @@ -16,19 +16,14 @@ #ifndef PXRUSDMAYA_ROUND_TRIP_UTIL_H #define PXRUSDMAYA_ROUND_TRIP_UTIL_H -/// \file usdMaya/roundTripUtil.h - -#include "../../base/api.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usdGeom/primvar.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// This holds some utility functions for dealing with data from Maya to Usd /// and back. struct UsdMayaRoundTripUtil diff --git a/lib/mayaUsd/fileio/utils/shadingUtil.cpp b/lib/mayaUsd/fileio/utils/shadingUtil.cpp index 1e26517644..9bd8b56800 100644 --- a/lib/mayaUsd/fileio/utils/shadingUtil.cpp +++ b/lib/mayaUsd/fileio/utils/shadingUtil.cpp @@ -13,20 +13,18 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "shadingUtil.h" - -#include "pxr/base/tf/token.h" -#include "pxr/usd/sdf/valueTypeName.h" -#include "pxr/usd/usdShade/input.h" -#include "pxr/usd/usdShade/material.h" -#include "pxr/usd/usdShade/output.h" -#include "pxr/usd/usdShade/shader.h" +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_USING_DIRECTIVE - UsdShadeInput UsdMayaShadingUtil::CreateMaterialInputAndConnectShader( UsdShadeMaterial& material, diff --git a/lib/mayaUsd/fileio/utils/shadingUtil.h b/lib/mayaUsd/fileio/utils/shadingUtil.h index ba3da5310a..38c18e5c02 100644 --- a/lib/mayaUsd/fileio/utils/shadingUtil.h +++ b/lib/mayaUsd/fileio/utils/shadingUtil.h @@ -16,26 +16,20 @@ #ifndef PXRUSDMAYA_SHADING_UTIL_H #define PXRUSDMAYA_SHADING_UTIL_H -/// \file usdMaya/shadingUtil.h - -#include "pxr/pxr.h" -#include "../../base/api.h" - -#include "pxr/base/tf/token.h" -#include "pxr/usd/sdf/valueTypeName.h" -#include "pxr/usd/usdShade/input.h" -#include "pxr/usd/usdShade/material.h" -#include "pxr/usd/usdShade/output.h" -#include "pxr/usd/usdShade/shader.h" +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - namespace UsdMayaShadingUtil { - - /// Create an input on the given material and shader and create a connection /// between them. /// diff --git a/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp b/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp index f0a5c6a39a..915b9e3616 100644 --- a/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp +++ b/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp @@ -13,16 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "userTaggedAttribute.h" +#include +#include -#include "../../utils/util.h" - -#include "pxr/base/js/json.h" -#include "pxr/base/js/value.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/token.h" -#include "pxr/usd/usdGeom/tokens.h" +#include +#include +#include #include #include @@ -30,14 +26,15 @@ #include #include -#include -#include -#include - +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PUBLIC_TOKENS( UsdMayaUserTaggedAttributeTokens, PXRUSDMAYA_ATTR_TOKENS); diff --git a/lib/mayaUsd/fileio/utils/userTaggedAttribute.h b/lib/mayaUsd/fileio/utils/userTaggedAttribute.h index dfc9eaf484..c63b50ffc8 100644 --- a/lib/mayaUsd/fileio/utils/userTaggedAttribute.h +++ b/lib/mayaUsd/fileio/utils/userTaggedAttribute.h @@ -13,29 +13,24 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -/// \file usdMaya/userTaggedAttribute.h - #ifndef PXRUSDMAYA_USER_TAGGED_ATTRIBUTE_H #define PXRUSDMAYA_USER_TAGGED_ATTRIBUTE_H -#include "pxr/pxr.h" -#include "../../base/api.h" - -#include "pxr/base/tf/iterator.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/tf/staticTokens.h" - -#include -#include +#include #include #include #include +#include +#include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +#include +#include +PXR_NAMESPACE_OPEN_SCOPE #define PXRUSDMAYA_ATTR_TOKENS \ ((USDAttrTypePrimvar, "primvar")) \ diff --git a/lib/mayaUsd/fileio/utils/writeUtil.cpp b/lib/mayaUsd/fileio/utils/writeUtil.cpp index e98f9cde8a..8095aff8ea 100644 --- a/lib/mayaUsd/fileio/utils/writeUtil.cpp +++ b/lib/mayaUsd/fileio/utils/writeUtil.cpp @@ -13,34 +13,17 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "writeUtil.h" - -#include "adaptor.h" -#include "../../utils/colorSpace.h" -#include "../translators/translatorUtil.h" -#include "userTaggedAttribute.h" - -#include "pxr/base/gf/gamma.h" -#include "pxr/base/gf/rotation.h" -#include "pxr/base/tf/envSetting.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/types.h" -#include "pxr/base/vt/value.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/sdf/valueTypeName.h" -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usd/inherits.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/property.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usdGeom/imageable.h" -#include "pxr/usd/usdGeom/primvar.h" -#include "pxr/usd/usdGeom/tokens.h" -#include "pxr/usd/usdRi/statementsAPI.h" -#include "pxr/usd/usdUtils/sparseValueWriter.h" +#include +#include +#include +#include +#include + +#include +#include #include +#include #include #include #include @@ -55,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -65,13 +47,28 @@ #include #include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_ENV_SETTING( PIXMAYA_WRITE_UV_AS_FLOAT2, true, diff --git a/lib/mayaUsd/fileio/utils/writeUtil.h b/lib/mayaUsd/fileio/utils/writeUtil.h index cd32bdad18..7522cf49c3 100644 --- a/lib/mayaUsd/fileio/utils/writeUtil.h +++ b/lib/mayaUsd/fileio/utils/writeUtil.h @@ -13,25 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -/// \file usdMaya/writeUtil.h - #ifndef PXRUSDMAYA_WRITEUTIL_H #define PXRUSDMAYA_WRITEUTIL_H -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "userTaggedAttribute.h" +#include +#include -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/types.h" -#include "pxr/usd/sdf/valueTypeName.h" -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usdGeom/imageable.h" -#include "pxr/usd/usdGeom/pointInstancer.h" -#include "pxr/usd/usdGeom/primvar.h" +#include #include #include @@ -39,7 +27,16 @@ #include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/xformStack.cpp b/lib/mayaUsd/fileio/utils/xformStack.cpp index 72c5663fd8..ccc7c8624e 100644 --- a/lib/mayaUsd/fileio/utils/xformStack.cpp +++ b/lib/mayaUsd/fileio/utils/xformStack.cpp @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include "xformStack.h" - -#include "pxr/base/tf/declarePtrs.h" -#include "pxr/base/tf/stringUtils.h" +#include #include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PUBLIC_TOKENS(UsdMayaXformStackTokens, diff --git a/lib/mayaUsd/fileio/utils/xformStack.h b/lib/mayaUsd/fileio/utils/xformStack.h index ed44d190b4..05016a01a5 100644 --- a/lib/mayaUsd/fileio/utils/xformStack.h +++ b/lib/mayaUsd/fileio/utils/xformStack.h @@ -16,18 +16,19 @@ #ifndef PXRUSDMAYA_XFORM_STACK_H #define PXRUSDMAYA_XFORM_STACK_H -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "pxr/base/tf/refPtr.h" -#include "pxr/base/tf/token.h" -#include "pxr/usd/usdGeom/xformOp.h" - -#include +#include #include #include #include +#include + +#include +#include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE // Note: pivotTranslate is currently not used in MayaXformStack, diff --git a/lib/mayaUsd/fileio/writeJobContext.cpp b/lib/mayaUsd/fileio/writeJobContext.cpp index 081f7b4433..12abecb250 100644 --- a/lib/mayaUsd/fileio/writeJobContext.cpp +++ b/lib/mayaUsd/fileio/writeJobContext.cpp @@ -13,30 +13,21 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "writeJobContext.h" - -#include "instancedNodeWriter.h" -#include "jobs/jobArgs.h" -#include "primWriter.h" -#include "primWriterRegistry.h" -#include "translators/skelBindingsProcessor.h" -#include "../utils/stageCache.h" -#include "transformWriter.h" -#include "../utils/util.h" - -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/token.h" -#include "pxr/usd/ar/resolver.h" -#include "pxr/usd/ar/resolverContext.h" -#include "pxr/usd/sdf/layer.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usdGeom/scope.h" -#include "pxr/usd/usdGeom/xform.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include #include #include @@ -46,27 +37,32 @@ #include #include #include +#include #include #include -#include - -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PRIVATE_TOKENS( _tokens, (Shape) ); - namespace { inline diff --git a/lib/mayaUsd/fileio/writeJobContext.h b/lib/mayaUsd/fileio/writeJobContext.h index ce9bd6093f..054c7a837c 100644 --- a/lib/mayaUsd/fileio/writeJobContext.h +++ b/lib/mayaUsd/fileio/writeJobContext.h @@ -16,27 +16,23 @@ #ifndef PXRUSDMAYA_WRITE_JOB_CONTEXT_H #define PXRUSDMAYA_WRITE_JOB_CONTEXT_H -/// \file usdMaya/writeJobContext.h +#include -#include "../base/api.h" -#include "jobs/jobArgs.h" -#include "primWriter.h" -#include "primWriterRegistry.h" +#include +#include +#include -#include "pxr/pxr.h" - -#include "pxr/usd/sdf/path.h" +#include #include #include #include -#include - +#include +#include PXR_NAMESPACE_OPEN_SCOPE - class UsdMaya_SkelBindingsProcessor; class UsdMaya_WriteJob; diff --git a/lib/mayaUsd/listeners/notice.cpp b/lib/mayaUsd/listeners/notice.cpp index badd984b53..ef7760a4b0 100644 --- a/lib/mayaUsd/listeners/notice.cpp +++ b/lib/mayaUsd/listeners/notice.cpp @@ -13,15 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "notice.h" - -#include "pxr/base/tf/instantiateType.h" +#include #include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +PXR_NAMESPACE_OPEN_SCOPE namespace { diff --git a/lib/mayaUsd/listeners/notice.h b/lib/mayaUsd/listeners/notice.h index 5fe84749bb..3c1e0d61a6 100644 --- a/lib/mayaUsd/listeners/notice.h +++ b/lib/mayaUsd/listeners/notice.h @@ -16,15 +16,13 @@ #ifndef USDMAYA_NOTICE_H #define USDMAYA_NOTICE_H -/// \file usdMaya/notice.h - -#include "pxr/base/tf/notice.h" - -#include "../base/api.h" +#include #include #include +#include + PXR_NAMESPACE_OPEN_SCOPE /// Notice sent when the Maya scene resets, either by opening a new scene or diff --git a/lib/mayaUsd/listeners/proxyShapeNotice.cpp b/lib/mayaUsd/listeners/proxyShapeNotice.cpp index db6caa8e20..20a21638d3 100644 --- a/lib/mayaUsd/listeners/proxyShapeNotice.cpp +++ b/lib/mayaUsd/listeners/proxyShapeNotice.cpp @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "proxyShapeNotice.h" +#include -#include "pxr/base/tf/instantiateType.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/listeners/proxyShapeNotice.h b/lib/mayaUsd/listeners/proxyShapeNotice.h index b5f6733c59..b8cb468514 100644 --- a/lib/mayaUsd/listeners/proxyShapeNotice.h +++ b/lib/mayaUsd/listeners/proxyShapeNotice.h @@ -16,14 +16,12 @@ #ifndef USDMAYA_PROXYSTAGE_NOTICE_H #define USDMAYA_PROXYSTAGE_NOTICE_H -/// \file usdMaya/proxyShapeNotice.h - -#include "pxr/base/tf/notice.h" - -#include "../base/api.h" +#include #include +#include + PXR_NAMESPACE_OPEN_SCOPE class MayaUsdProxyShapeBase; diff --git a/lib/mayaUsd/listeners/stageNoticeListener.cpp b/lib/mayaUsd/listeners/stageNoticeListener.cpp index 9bbc0d841a..6d04d0b521 100644 --- a/lib/mayaUsd/listeners/stageNoticeListener.cpp +++ b/lib/mayaUsd/listeners/stageNoticeListener.cpp @@ -13,18 +13,15 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "stageNoticeListener.h" - -#include "pxr/base/tf/notice.h" -#include "pxr/base/tf/weakBase.h" - -#include "pxr/usd/usd/notice.h" -#include "pxr/usd/usd/stage.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - UsdMayaStageNoticeListener::UsdMayaStageNoticeListener() : TfWeakBase() { } diff --git a/lib/mayaUsd/listeners/stageNoticeListener.h b/lib/mayaUsd/listeners/stageNoticeListener.h index 6039715eb9..63c296b0a2 100644 --- a/lib/mayaUsd/listeners/stageNoticeListener.h +++ b/lib/mayaUsd/listeners/stageNoticeListener.h @@ -16,24 +16,18 @@ #ifndef PXRUSDMAYA_STAGE_NOTICE_LISTENER_H #define PXRUSDMAYA_STAGE_NOTICE_LISTENER_H -/// \file usdMaya/stageNoticeListener.h - -#include "../base/api.h" - -#include "pxr/pxr.h" - -#include "pxr/base/tf/notice.h" -#include "pxr/base/tf/weakBase.h" - -#include "pxr/usd/usd/notice.h" -#include "pxr/usd/usd/stage.h" +#include #include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// A notice listener that can invoke callbacks in response to notices about a /// specific USD stage. /// diff --git a/lib/mayaUsd/nodes/hdImagingShape.cpp b/lib/mayaUsd/nodes/hdImagingShape.cpp index 83663938e5..34e26cb62f 100644 --- a/lib/mayaUsd/nodes/hdImagingShape.cpp +++ b/lib/mayaUsd/nodes/hdImagingShape.cpp @@ -13,17 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "hdImagingShape.h" +#include +#include +#include +#include -#include "../utils/blockSceneModificationContext.h" -#include "../fileio/translators/translatorUtil.h" -#include "../utils/util.h" - -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/envSetting.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stringUtils.h" +#include #include #include @@ -47,12 +42,14 @@ #include #include -#include - +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_ENV_SETTING( PXRMAYAHD_DEFAULT_SELECTION_RESOLUTION, 256, diff --git a/lib/mayaUsd/nodes/hdImagingShape.h b/lib/mayaUsd/nodes/hdImagingShape.h index 21170eb251..a97ed368d6 100644 --- a/lib/mayaUsd/nodes/hdImagingShape.h +++ b/lib/mayaUsd/nodes/hdImagingShape.h @@ -16,14 +16,8 @@ #ifndef PXRUSDMAYA_HD_IMAGING_SHAPE_H #define PXRUSDMAYA_HD_IMAGING_SHAPE_H -/// \file usdMaya/hdImagingShape.h - -#include "pxr/pxr.h" - -#include "../base/api.h" -#include "../utils/util.h" - -#include "pxr/base/tf/staticTokens.h" +#include +#include #include #include @@ -37,10 +31,11 @@ #include #include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - #define PXRUSDMAYA_HD_IMAGING_SHAPE_TOKENS \ ((MayaTypeName, "pxrHdImagingShape")) diff --git a/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp b/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp index b9a07eccde..aa9de9b610 100644 --- a/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp +++ b/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp @@ -13,24 +13,24 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pointBasedDeformerNode.h" +#include -#include "stageData.h" +#include -#include "pxr/base/gf/math.h" -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/array.h" -#include "pxr/base/vt/types.h" +#include +#include +#include +#include +#include +#include +#include -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usdGeom/pointBased.h" +#include +#include +#include +#include +#include +#include #include #include @@ -52,10 +52,8 @@ #include - PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PUBLIC_TOKENS(UsdMayaPointBasedDeformerNodeTokens, PXRUSDMAYA_POINT_BASED_DEFORMER_NODE_TOKENS); diff --git a/lib/mayaUsd/nodes/pointBasedDeformerNode.h b/lib/mayaUsd/nodes/pointBasedDeformerNode.h index 211279508a..6645c87399 100644 --- a/lib/mayaUsd/nodes/pointBasedDeformerNode.h +++ b/lib/mayaUsd/nodes/pointBasedDeformerNode.h @@ -16,13 +16,7 @@ #ifndef PXRUSDMAYA_POINT_BASED_DEFORMER_NODE_H #define PXRUSDMAYA_POINT_BASED_DEFORMER_NODE_H -/// \file usdMaya/pointBasedDeformerNode.h - -#include "../base/api.h" - -#include "pxr/pxr.h" - -#include "pxr/base/tf/staticTokens.h" +#include #include #include @@ -33,10 +27,11 @@ #include #include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - #define PXRUSDMAYA_POINT_BASED_DEFORMER_NODE_TOKENS \ ((MayaTypeName, "pxrUsdPointBasedDeformerNode")) diff --git a/lib/mayaUsd/nodes/proxyShapeBase.cpp b/lib/mayaUsd/nodes/proxyShapeBase.cpp index 85dbae1fd5..bb3b446116 100644 --- a/lib/mayaUsd/nodes/proxyShapeBase.cpp +++ b/lib/mayaUsd/nodes/proxyShapeBase.cpp @@ -13,40 +13,18 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "proxyShapeBase.h" - -#include "../base/debugCodes.h" -#include "../listeners/proxyShapeNotice.h" -#include "../utils/query.h" -#include "../utils/stageCache.h" -#include "../utils/utilFileSystem.h" -#include "stageData.h" - -#include "pxr/base/gf/bbox3d.h" -#include "pxr/base/gf/range3d.h" -#include "pxr/base/gf/ray.h" -#include "pxr/base/gf/vec3d.h" -#include "pxr/base/tf/envSetting.h" -#include "pxr/base/tf/fileUtils.h" -#include "pxr/base/tf/hash.h" -#include "pxr/base/tf/pathUtils.h" -#include "pxr/base/tf/staticData.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/trace/trace.h" - -#include "pxr/usd/ar/resolver.h" -#include "pxr/usd/sdf/layer.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usd/stageCacheContext.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usdGeom/bboxCache.h" -#include "pxr/usd/usdGeom/imageable.h" -#include "pxr/usd/usdGeom/tokens.h" -#include "pxr/usd/usdUtils/stageCache.h" +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include #include #include @@ -54,18 +32,18 @@ #include #include #include -#include -#include #include -#include #include +#include #include #include #include #include +#include #include #include #include +#include #include #include #include @@ -77,10 +55,30 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #if defined(WANT_UFE_BUILD) #include diff --git a/lib/mayaUsd/nodes/proxyShapeBase.h b/lib/mayaUsd/nodes/proxyShapeBase.h index 03936323ed..c56217eea5 100644 --- a/lib/mayaUsd/nodes/proxyShapeBase.h +++ b/lib/mayaUsd/nodes/proxyShapeBase.h @@ -16,22 +16,11 @@ #ifndef PXRUSDMAYA_PROXY_SHAPE_BASE_H #define PXRUSDMAYA_PROXY_SHAPE_BASE_H -/// \file usdMaya/proxyShapeBase.h +#include +#include +#include -#include "../base/api.h" -#include "../listeners/stageNoticeListener.h" -#include "usdPrimProvider.h" - -#include "pxr/pxr.h" - -#include "pxr/base/gf/ray.h" -#include "pxr/base/gf/vec3d.h" -#include "pxr/base/tf/staticTokens.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/notice.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/timeCode.h" +#include #include #include @@ -47,7 +36,14 @@ #include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include #if defined(WANT_UFE_BUILD) #include diff --git a/lib/mayaUsd/nodes/proxyShapePlugin.cpp b/lib/mayaUsd/nodes/proxyShapePlugin.cpp index da4323a2c4..c8628d1fe7 100644 --- a/lib/mayaUsd/nodes/proxyShapePlugin.cpp +++ b/lib/mayaUsd/nodes/proxyShapePlugin.cpp @@ -13,26 +13,25 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "proxyShapePlugin.h" - -#include "../render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h" -#include "../render/pxrUsdMayaGL/hdImagingShapeUI.h" -#include "../render/pxrUsdMayaGL/proxyDrawOverride.h" -#include "../render/pxrUsdMayaGL/proxyShapeUI.h" -#include "../render/vp2RenderDelegate/proxyRenderDelegate.h" -#include "../render/vp2ShaderFragments/shaderFragments.h" - -#include "stageData.h" -#include "hdImagingShape.h" -#include "proxyShapeBase.h" - -#include "pxr/base/tf/envSetting.h" +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include #include #include #include #include +#include + PXR_NAMESPACE_USING_DIRECTIVE namespace { diff --git a/lib/mayaUsd/nodes/proxyShapePlugin.h b/lib/mayaUsd/nodes/proxyShapePlugin.h index 42e7f2cc5c..9b9a036243 100644 --- a/lib/mayaUsd/nodes/proxyShapePlugin.h +++ b/lib/mayaUsd/nodes/proxyShapePlugin.h @@ -16,14 +16,12 @@ #ifndef PXRUSDMAYA_PROXY_SHAPE_PLUGIN_H #define PXRUSDMAYA_PROXY_SHAPE_PLUGIN_H -/// \file usdMaya/proxyShapePlugin.h - -#include "../base/api.h" - -#include "pxr/pxr.h" +#include #include +#include + PXR_NAMESPACE_OPEN_SCOPE /// \class MayaUsdProxyShapePlugin diff --git a/lib/mayaUsd/nodes/stageData.cpp b/lib/mayaUsd/nodes/stageData.cpp index caf689113d..55652257d8 100644 --- a/lib/mayaUsd/nodes/stageData.cpp +++ b/lib/mayaUsd/nodes/stageData.cpp @@ -13,23 +13,20 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "stageData.h" - -#include "pxr/base/gf/bbox3d.h" -#include "pxr/base/tf/staticTokens.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/stage.h" +#include #include #include #include #include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PUBLIC_TOKENS(MayaUsdStageDataTokens, PXRMAYAUSD_STAGE_DATA_TOKENS); diff --git a/lib/mayaUsd/nodes/stageData.h b/lib/mayaUsd/nodes/stageData.h index 6891021fd2..ad2c94b0cf 100644 --- a/lib/mayaUsd/nodes/stageData.h +++ b/lib/mayaUsd/nodes/stageData.h @@ -16,16 +16,7 @@ #ifndef PXRUSDMAYA_STAGE_DATA_H #define PXRUSDMAYA_STAGE_DATA_H -/// \file usdMaya/stageData.h - -#include "../base/api.h" - -#include "pxr/pxr.h" - -#include "pxr/base/tf/staticTokens.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/stage.h" +#include #include #include @@ -33,10 +24,13 @@ #include #include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - #define PXRMAYAUSD_STAGE_DATA_TOKENS \ ((MayaTypeName, "pxrUsdStageData")) diff --git a/lib/mayaUsd/nodes/stageNode.cpp b/lib/mayaUsd/nodes/stageNode.cpp index 53df5bd390..e8989a8417 100644 --- a/lib/mayaUsd/nodes/stageNode.cpp +++ b/lib/mayaUsd/nodes/stageNode.cpp @@ -13,21 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "stageNode.h" +#include +#include +#include -#include "../utils/stageCache.h" -#include "stageData.h" - -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/token.h" - -#include "pxr/usd/ar/resolver.h" -#include "pxr/usd/sdf/layer.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usd/stageCacheContext.h" +#include #include #include @@ -42,12 +32,18 @@ #include #include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PUBLIC_TOKENS(UsdMayaStageNodeTokens, PXRUSDMAYA_STAGE_NODE_TOKENS); diff --git a/lib/mayaUsd/nodes/stageNode.h b/lib/mayaUsd/nodes/stageNode.h index aeb929d9a4..b2db69d5e6 100644 --- a/lib/mayaUsd/nodes/stageNode.h +++ b/lib/mayaUsd/nodes/stageNode.h @@ -16,13 +16,7 @@ #ifndef PXRUSDMAYA_STAGE_NODE_H #define PXRUSDMAYA_STAGE_NODE_H -/// \file usdMaya/stageNode.h - -#include "../base/api.h" - -#include "pxr/pxr.h" - -#include "pxr/base/tf/staticTokens.h" +#include #include #include @@ -32,10 +26,11 @@ #include #include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - #define PXRUSDMAYA_STAGE_NODE_TOKENS \ ((MayaTypeName, "pxrUsdStageNode")) diff --git a/lib/mayaUsd/nodes/usdPrimProvider.cpp b/lib/mayaUsd/nodes/usdPrimProvider.cpp index 479b6b4f58..f5ba624bb7 100644 --- a/lib/mayaUsd/nodes/usdPrimProvider.cpp +++ b/lib/mayaUsd/nodes/usdPrimProvider.cpp @@ -13,8 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "usdPrimProvider.h" +#include + +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/nodes/usdPrimProvider.h b/lib/mayaUsd/nodes/usdPrimProvider.h index 2dab51d245..1e43d59945 100644 --- a/lib/mayaUsd/nodes/usdPrimProvider.h +++ b/lib/mayaUsd/nodes/usdPrimProvider.h @@ -16,12 +16,12 @@ #ifndef PXRUSDMAYA_USD_PRIM_PROVIDER_H #define PXRUSDMAYA_USD_PRIM_PROVIDER_H -#include "pxr/pxr.h" -#include "../base/api.h" -#include "pxr/usd/usd/prim.h" +#include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +PXR_NAMESPACE_OPEN_SCOPE // interface class class UsdMayaUsdPrimProvider diff --git a/lib/mayaUsd/python/module.cpp b/lib/mayaUsd/python/module.cpp index 8c1c56423c..3dca1f51e9 100644 --- a/lib/mayaUsd/python/module.cpp +++ b/lib/mayaUsd/python/module.cpp @@ -13,8 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "pxr/base/tf/pyModule.h" +#include + +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/python/moduleDeps.cpp b/lib/mayaUsd/python/moduleDeps.cpp index 4ab212b654..fe5b1249d6 100644 --- a/lib/mayaUsd/python/moduleDeps.cpp +++ b/lib/mayaUsd/python/moduleDeps.cpp @@ -13,13 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "pxr/base/tf/registryManager.h" -#include "pxr/base/tf/scriptModuleLoader.h" -#include "pxr/base/tf/token.h" #include +#include +#include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE TF_REGISTRY_FUNCTION(TfScriptModuleLoader) { diff --git a/lib/mayaUsd/python/wrapAdaptor.cpp b/lib/mayaUsd/python/wrapAdaptor.cpp index 3e8f992d45..2fc302f057 100644 --- a/lib/mayaUsd/python/wrapAdaptor.cpp +++ b/lib/mayaUsd/python/wrapAdaptor.cpp @@ -13,20 +13,19 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include "pxr/pxr.h" #include #include #include -#include "pxr/base/tf/pyResultConversions.h" -#include "pxr/usd/usdGeom/primvar.h" -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usd/pyConversions.h" +#include #include -#include +#include +#include +#include +#include +#include using namespace boost::python; diff --git a/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp b/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp index fe3fd6dadb..ed1f02f0c1 100644 --- a/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp +++ b/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp @@ -13,19 +13,18 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" #include +#include + #include -#include +#include using namespace boost::python; - PXR_NAMESPACE_USING_DIRECTIVE; - namespace { // This exposes UsdMayaBlockSceneModificationContext as a Python "context diff --git a/lib/mayaUsd/python/wrapColorSpace.cpp b/lib/mayaUsd/python/wrapColorSpace.cpp index 5641339c5e..e14ba83a59 100644 --- a/lib/mayaUsd/python/wrapColorSpace.cpp +++ b/lib/mayaUsd/python/wrapColorSpace.cpp @@ -13,18 +13,17 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" #include -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/gf/vec3d.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/gf/vec4d.h" - #include #include -#include "pxr/base/tf/pyResultConversions.h" +#include +#include +#include +#include +#include +#include using namespace std; using namespace boost::python; diff --git a/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp b/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp index f15663ced9..3a2944fdc2 100644 --- a/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp +++ b/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp @@ -14,12 +14,13 @@ // limitations under the License. // -#include "pxr/pxr.h" #include #include #include +#include + using namespace boost::python; PXR_NAMESPACE_USING_DIRECTIVE; diff --git a/lib/mayaUsd/python/wrapMeshUtil.cpp b/lib/mayaUsd/python/wrapMeshUtil.cpp index e5b77b718c..c18eeabdae 100644 --- a/lib/mayaUsd/python/wrapMeshUtil.cpp +++ b/lib/mayaUsd/python/wrapMeshUtil.cpp @@ -13,31 +13,29 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" #include #include -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/tf/pyResultConversions.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/array.h" - -#include -#include -#include +#include #include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace boost::python; PXR_NAMESPACE_USING_DIRECTIVE - namespace { static diff --git a/lib/mayaUsd/python/wrapQuery.cpp b/lib/mayaUsd/python/wrapQuery.cpp index 3fb69cc4ba..20559839db 100644 --- a/lib/mayaUsd/python/wrapQuery.cpp +++ b/lib/mayaUsd/python/wrapQuery.cpp @@ -13,13 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" #include #include #include -#include "pxr/base/tf/pyResultConversions.h" +#include +#include using namespace std; using namespace boost::python; diff --git a/lib/mayaUsd/python/wrapReadUtil.cpp b/lib/mayaUsd/python/wrapReadUtil.cpp index 6db3bb06df..ac3f539c87 100644 --- a/lib/mayaUsd/python/wrapReadUtil.cpp +++ b/lib/mayaUsd/python/wrapReadUtil.cpp @@ -14,17 +14,17 @@ // limitations under the License. // -#include "pxr/pxr.h" -#include #include +#include -#include "pxr/base/tf/pyResultConversions.h" -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usd/pyConversions.h" +#include #include -#include +#include +#include +#include +#include using namespace boost::python; diff --git a/lib/mayaUsd/python/wrapRoundTripUtil.cpp b/lib/mayaUsd/python/wrapRoundTripUtil.cpp index 3a4994d8a2..776402b588 100644 --- a/lib/mayaUsd/python/wrapRoundTripUtil.cpp +++ b/lib/mayaUsd/python/wrapRoundTripUtil.cpp @@ -13,16 +13,15 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include "pxr/pxr.h" #include -#include "pxr/usd/usdGeom/primvar.h" -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usd/pyConversions.h" - #include +#include +#include +#include +#include + using namespace std; using namespace boost::python; using namespace boost; diff --git a/lib/mayaUsd/python/wrapStageCache.cpp b/lib/mayaUsd/python/wrapStageCache.cpp index 5ced7aac53..7015a1b918 100644 --- a/lib/mayaUsd/python/wrapStageCache.cpp +++ b/lib/mayaUsd/python/wrapStageCache.cpp @@ -13,14 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" #include #include #include #include -#include "pxr/base/tf/pyResultConversions.h" +#include +#include using namespace std; using namespace boost::python; diff --git a/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp b/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp index 5f9c78fe50..2ebc163a7c 100644 --- a/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp +++ b/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp @@ -13,31 +13,28 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" #include - #include -#include "pxr/base/tf/pyContainerConversions.h" -#include "pxr/base/tf/pyResultConversions.h" -#include "pxr/base/tf/pyStaticTokens.h" -#include "pxr/base/tf/token.h" +#include +#include + +#include +#include #include #include #include #include -#include -#include - -#include -#include - +#include +#include +#include +#include +#include PXR_NAMESPACE_USING_DIRECTIVE - namespace { static diff --git a/lib/mayaUsd/python/wrapWriteUtil.cpp b/lib/mayaUsd/python/wrapWriteUtil.cpp index 9c2003499e..710e7c6f77 100644 --- a/lib/mayaUsd/python/wrapWriteUtil.cpp +++ b/lib/mayaUsd/python/wrapWriteUtil.cpp @@ -13,18 +13,16 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include "pxr/pxr.h" -#include #include +#include -#include "pxr/base/tf/pyResultConversions.h" -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usd/pyConversions.h" - +#include #include -#include +#include +#include +#include +#include using namespace boost::python; diff --git a/lib/mayaUsd/python/wrapXformStack.cpp b/lib/mayaUsd/python/wrapXformStack.cpp index 4219c95c86..2579a37d3c 100644 --- a/lib/mayaUsd/python/wrapXformStack.cpp +++ b/lib/mayaUsd/python/wrapXformStack.cpp @@ -13,22 +13,22 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "../fileio/utils/xformStack.h" +#include -#include "pxr/base/tf/pyContainerConversions.h" -#include "pxr/base/tf/pyEnum.h" -#include "pxr/base/tf/pyResultConversions.h" -#include "pxr/base/tf/stringUtils.h" - -#include -#include +#include +#include +#include +#include +#include #include #include #include #include +#include +#include + using namespace std; using boost::python::object; using boost::python::class_; diff --git a/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.cpp b/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.cpp index 3307994e0a..300e5e0eb2 100644 --- a/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.cpp +++ b/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.cpp @@ -13,13 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "defaultLightDelegate.h" +#include -#include "../../usd/hdMaya/delegates/delegateDebugCodes.h" +#include #include #include - #include #include #include diff --git a/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.h b/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.h index 908de0df7e..6960a85e33 100644 --- a/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.h +++ b/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.h @@ -16,18 +16,16 @@ #ifndef MTOH_DEFAULT_LIGHT_DELEGATE_H #define MTOH_DEFAULT_LIGHT_DELEGATE_H -#include +#include +#include #include #include #include - #include #include -#include "../../usd/hdMaya/delegates/delegateCtx.h" - PXR_NAMESPACE_OPEN_SCOPE class MtohDefaultLightDelegate : public HdSceneDelegate, public HdMayaDelegate { diff --git a/lib/mayaUsd/render/mayaToHydra/plugin.cpp b/lib/mayaUsd/render/mayaToHydra/plugin.cpp index 5fb0a0e16f..0f5db673bc 100644 --- a/lib/mayaUsd/render/mayaToHydra/plugin.cpp +++ b/lib/mayaUsd/render/mayaToHydra/plugin.cpp @@ -14,23 +14,21 @@ // limitations under the License. // #include - -#include "renderGlobals.h" -#include "renderOverride.h" -#include "viewCommand.h" +#include +#include +#include #include #include +#include + #include #include #include -#include "../../usd/hdMaya/adapters/adapter.h" - PXR_NAMESPACE_USING_DIRECTIVE - PLUGIN_EXPORT MStatus initializePlugin(MObject obj) { MStatus ret = MS::kSuccess; diff --git a/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.cpp b/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.cpp index be56e0d132..92cb8e78c2 100644 --- a/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.cpp +++ b/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pluginDebugCodes.h" +#include #include diff --git a/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.h b/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.h index 960e811e06..39ea56e005 100644 --- a/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.h +++ b/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.h @@ -17,7 +17,6 @@ #define HDMAYA_PLUGIN_DEBUG_CODES_H #include - #include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/mayaToHydra/renderGlobals.cpp b/lib/mayaUsd/render/mayaToHydra/renderGlobals.cpp index 3f5b750a9a..e29834e06e 100644 --- a/lib/mayaUsd/render/mayaToHydra/renderGlobals.cpp +++ b/lib/mayaUsd/render/mayaToHydra/renderGlobals.cpp @@ -13,11 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "renderGlobals.h" +#include +#include -#include -#include -#include +#include +#include #include #include @@ -28,10 +28,9 @@ #include #include -#include "utils.h" - -#include -#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/mayaToHydra/renderGlobals.h b/lib/mayaUsd/render/mayaToHydra/renderGlobals.h index 933f69f2a9..4a53db783e 100644 --- a/lib/mayaUsd/render/mayaToHydra/renderGlobals.h +++ b/lib/mayaUsd/render/mayaToHydra/renderGlobals.h @@ -16,21 +16,21 @@ #ifndef MTOH_RENDER_GLOBALS_H #define MTOH_RENDER_GLOBALS_H -#include - -#include -#include -#include - -#include +#include +#include -#include "tokens.h" -#include "utils.h" -#include "../../usd/hdMaya/delegates/params.h" +#include #include #include +#include + +#include +#include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE struct MtohRenderGlobals { diff --git a/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp b/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp index 80a3480e4b..d2d2ada992 100644 --- a/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp +++ b/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp @@ -13,13 +13,36 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "renderOverride.h" +#include -#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include - #include #include @@ -38,32 +61,6 @@ PXR_NAMESPACE_CLOSE_SCOPE #include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "mayaUsd/render/px_vp20/utils.h" -#include "../../usd/hdMaya/delegates/delegateRegistry.h" -#include "../../usd/hdMaya/delegates/sceneDelegate.h" - -#include "../../usd/hdMaya/utils.h" - -#include "pluginDebugCodes.h" -#include "renderOverrideUtils.h" -#include "tokens.h" -#include "utils.h" - #if WANT_UFE_BUILD #include #include diff --git a/lib/mayaUsd/render/mayaToHydra/renderOverride.h b/lib/mayaUsd/render/mayaToHydra/renderOverride.h index 4797220ab1..21a8003037 100644 --- a/lib/mayaUsd/render/mayaToHydra/renderOverride.h +++ b/lib/mayaUsd/render/mayaToHydra/renderOverride.h @@ -16,9 +16,25 @@ #ifndef MTOH_VIEW_OVERRIDE_H #define MTOH_VIEW_OVERRIDE_H -#include -#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include #include #if USD_VERSION_NUM > 2002 @@ -39,23 +55,6 @@ PXR_NAMESPACE_CLOSE_SCOPE #endif #include -#include -#include -#include -#include - -#include "../../usd/hdMaya/delegates/delegate.h" -#include "../../usd/hdMaya/delegates/params.h" - -#include "defaultLightDelegate.h" -#include "renderGlobals.h" -#include "utils.h" - -#include -#include -#include -#include - #if WANT_UFE_BUILD #include #endif // WANT_UFE_BUILD diff --git a/lib/mayaUsd/render/mayaToHydra/shadingModeExporter.cpp b/lib/mayaUsd/render/mayaToHydra/shadingModeExporter.cpp index eab2faa971..7c94d4d9a8 100644 --- a/lib/mayaUsd/render/mayaToHydra/shadingModeExporter.cpp +++ b/lib/mayaUsd/render/mayaToHydra/shadingModeExporter.cpp @@ -13,17 +13,16 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include +#include + +#include +#include #include #include #include -#include "../../fileio/shading/shadingModeExporter.h" -#include "../../fileio/shading/shadingModeRegistry.h" - -#include "../../usd/hdMaya/adapters/materialNetworkConverter.h" - PXR_NAMESPACE_OPEN_SCOPE // clang-format off diff --git a/lib/mayaUsd/render/mayaToHydra/tokens.cpp b/lib/mayaUsd/render/mayaToHydra/tokens.cpp index 4cc78edb95..253020a3cb 100644 --- a/lib/mayaUsd/render/mayaToHydra/tokens.cpp +++ b/lib/mayaUsd/render/mayaToHydra/tokens.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "tokens.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/mayaToHydra/utils.cpp b/lib/mayaUsd/render/mayaToHydra/utils.cpp index 75c7e1592f..1fcc3d0ebd 100644 --- a/lib/mayaUsd/render/mayaToHydra/utils.cpp +++ b/lib/mayaUsd/render/mayaToHydra/utils.cpp @@ -13,8 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "utils.h" -#include "tokens.h" +#include +#include #include diff --git a/lib/mayaUsd/render/mayaToHydra/utils.h b/lib/mayaUsd/render/mayaToHydra/utils.h index 1f46de69a3..469477a786 100644 --- a/lib/mayaUsd/render/mayaToHydra/utils.h +++ b/lib/mayaUsd/render/mayaToHydra/utils.h @@ -16,14 +16,13 @@ #ifndef MTOH_UTILS_H #define MTOH_UTILS_H -#include +#include +#include +#include #include #include -#include -#include - PXR_NAMESPACE_OPEN_SCOPE struct MtohRendererDescription { diff --git a/lib/mayaUsd/render/mayaToHydra/viewCommand.cpp b/lib/mayaUsd/render/mayaToHydra/viewCommand.cpp index 01d8457cdf..e9e048c7db 100644 --- a/lib/mayaUsd/render/mayaToHydra/viewCommand.cpp +++ b/lib/mayaUsd/render/mayaToHydra/viewCommand.cpp @@ -13,19 +13,19 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "viewCommand.h" +#include + +#include +#include +#include +#include + +#include #include #include #include -#include "../../usd/hdMaya/delegates/delegateRegistry.h" -#include "renderOverride.h" - -#include "renderGlobals.h" -#include "renderOverride.h" -#include "utils.h" - PXR_NAMESPACE_OPEN_SCOPE const MString MtohViewCmd::name("mtoh"); diff --git a/lib/mayaUsd/render/mayaToHydra/viewCommand.h b/lib/mayaUsd/render/mayaToHydra/viewCommand.h index 9060db63d3..b6bf58fcfb 100644 --- a/lib/mayaUsd/render/mayaToHydra/viewCommand.h +++ b/lib/mayaUsd/render/mayaToHydra/viewCommand.h @@ -16,10 +16,10 @@ #ifndef MTOH_CMD_H #define MTOH_CMD_H -#include - #include +#include + PXR_NAMESPACE_OPEN_SCOPE class MtohViewCmd : public MPxCommand { diff --git a/lib/mayaUsd/render/px_vp20/glslProgram.cpp b/lib/mayaUsd/render/px_vp20/glslProgram.cpp index 790bcd27ad..b36b282340 100644 --- a/lib/mayaUsd/render/px_vp20/glslProgram.cpp +++ b/lib/mayaUsd/render/px_vp20/glslProgram.cpp @@ -15,20 +15,18 @@ // // glew must be included before any other GL header. -#include "pxr/imaging/glf/glew.h" +#include -#include "./glslProgram.h" - -#include "pxr/pxr.h" -#include "pxr/base/tf/diagnostic.h" -#include "pxr/imaging/garch/gl.h" +#include #include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - PxrMayaGLSLProgram::PxrMayaGLSLProgram() : mProgramId(0) { } diff --git a/lib/mayaUsd/render/px_vp20/glslProgram.h b/lib/mayaUsd/render/px_vp20/glslProgram.h index 78c4780690..1312b6d146 100644 --- a/lib/mayaUsd/render/px_vp20/glslProgram.h +++ b/lib/mayaUsd/render/px_vp20/glslProgram.h @@ -20,16 +20,15 @@ #ifndef __PX_VP20_GLSL_PROGRAM_H__ #define __PX_VP20_GLSL_PROGRAM_H__ -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "pxr/imaging/garch/gl.h" +#include #include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// \class PxrMayaGLSLProgram /// /// A convenience class that abstracts away the OpenGL API details of diff --git a/lib/mayaUsd/render/px_vp20/utils.cpp b/lib/mayaUsd/render/px_vp20/utils.cpp index 24288932ce..d32acfcdbd 100644 --- a/lib/mayaUsd/render/px_vp20/utils.cpp +++ b/lib/mayaUsd/render/px_vp20/utils.cpp @@ -14,24 +14,15 @@ // limitations under the License. // // glew must be included before any other GL header. -#include "pxr/imaging/glf/glew.h" +#include -#include "./utils.h" +#include +#include -#include "./glslProgram.h" - -#include "pxr/base/gf/math.h" -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/matrix4f.h" -#include "pxr/base/gf/vec2f.h" -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/imaging/garch/gl.h" -#include "pxr/imaging/glf/simpleLight.h" -#include "pxr/imaging/glf/simpleLightingContext.h" -#include "pxr/imaging/glf/simpleMaterial.h" -#include "pxr/imaging/hdx/version.h" +#include +#include +#include +#include #include #include @@ -52,15 +43,21 @@ #include #include -#include -#include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /* static */ bool px_vp20Utils::setupLightingGL(const MHWRender::MDrawContext& context) diff --git a/lib/mayaUsd/render/px_vp20/utils.h b/lib/mayaUsd/render/px_vp20/utils.h index 75d213e9fa..49ed6249f6 100644 --- a/lib/mayaUsd/render/px_vp20/utils.h +++ b/lib/mayaUsd/render/px_vp20/utils.h @@ -18,14 +18,10 @@ /// \file px_vp20/utils.h -#include "pxr/pxr.h" -#include "../../base/api.h" +#include -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/matrix4f.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/imaging/garch/gl.h" -#include "pxr/imaging/glf/simpleLightingContext.h" +#include +#include #include #include @@ -34,13 +30,15 @@ #include #include -#include -#include - +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - class px_vp20Utils { public: diff --git a/lib/mayaUsd/render/px_vp20/utils_legacy.cpp b/lib/mayaUsd/render/px_vp20/utils_legacy.cpp index 86dc958a8b..81d0810467 100644 --- a/lib/mayaUsd/render/px_vp20/utils_legacy.cpp +++ b/lib/mayaUsd/render/px_vp20/utils_legacy.cpp @@ -13,10 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "./utils_legacy.h" - -#include "pxr/base/gf/matrix4d.h" +#include #include #include @@ -24,10 +21,11 @@ #include #include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /* static */ bool px_LegacyViewportUtils::GetSelectionMatrices( diff --git a/lib/mayaUsd/render/px_vp20/utils_legacy.h b/lib/mayaUsd/render/px_vp20/utils_legacy.h index a9e448ffb5..5fdf139957 100644 --- a/lib/mayaUsd/render/px_vp20/utils_legacy.h +++ b/lib/mayaUsd/render/px_vp20/utils_legacy.h @@ -18,17 +18,15 @@ /// \file px_vp20/utils_legacy.h -#include "pxr/pxr.h" -#include "../../base/api.h" +#include -#include "pxr/base/gf/matrix4d.h" +#include +#include #include - PXR_NAMESPACE_OPEN_SCOPE - /// This class contains helper methods and utilities to help with the /// transition from the Maya legacy viewport to Viewport 2.0. class px_LegacyViewportUtils diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp index f6a5bc9192..c9e2582e52 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp @@ -15,49 +15,16 @@ // // glew needs to be included before any other OpenGL headers. -#include "pxr/imaging/glf/glew.h" - -#include "pxr/pxr.h" -#include "./batchRenderer.h" -#include "./debugCodes.h" -#include "./userData.h" - -#include "mayaUsd/render/px_vp20/utils.h" -#include "mayaUsd/render/px_vp20/utils_legacy.h" - -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/vec2i.h" -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/gf/vec4d.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/tf/debug.h" -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/getenv.h" -#include "pxr/base/tf/instantiateSingleton.h" -#include "pxr/base/tf/singleton.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/stl.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/trace/trace.h" -#include "pxr/base/vt/types.h" -#include "pxr/base/vt/value.h" -#include "pxr/imaging/glf/contextCaps.h" -#include "pxr/imaging/hd/renderIndex.h" -#include "pxr/imaging/hd/rprimCollection.h" -#include "pxr/imaging/hd/task.h" -#include "pxr/imaging/hd/tokens.h" -#include "pxr/imaging/hdx/selectionTracker.h" -#include "pxr/imaging/hdx/tokens.h" -#if USD_VERSION_NUM > 2002 -#include "pxr/imaging/hgi/hgi.h" -#include "pxr/imaging/hgi/tokens.h" -#endif -#include "pxr/usd/sdf/path.h" +#include -#if USD_VERSION_NUM < 1911 -#include "pxr/usd/usdGeom/tokens.h" -#endif +#include +#include +#include +#include +#include + +#include +#include #include #include @@ -81,13 +48,43 @@ #include #include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#if USD_VERSION_NUM > 2002 +#include +#include +#endif +#include +#if USD_VERSION_NUM < 1911 +#include +#endif PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PRIVATE_TOKENS( _tokens, diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h index c4eac861e8..1598b30339 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h @@ -17,53 +17,50 @@ #define PXRUSDMAYAGL_BATCH_RENDERER_H /// \file pxrUsdMayaGL/batchRenderer.h +#include +#include +#include +#include +#include +#include +#include +#include -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "./renderParams.h" -#include "./sceneDelegate.h" -#include "./shapeAdapter.h" -#include "./softSelectHelper.h" -#include "../../utils/diagnosticDelegate.h" -#include "../../listeners/notice.h" -#include "../../utils/util.h" - -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/vec2i.h" -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/gf/vec4d.h" -#include "pxr/base/tf/singleton.h" -#include "pxr/base/tf/weakBase.h" -#if USD_VERSION_NUM > 2002 -#include "pxr/imaging/hd/driver.h" -#endif -#include "pxr/imaging/hd/engine.h" -#include "pxr/imaging/hd/renderIndex.h" -#include "pxr/imaging/hd/rprimCollection.h" -#include "pxr/imaging/hdSt/renderDelegate.h" -#include "pxr/imaging/hdx/selectionTracker.h" -#include "pxr/imaging/hdx/pickTask.h" -#include "pxr/usd/sdf/path.h" +#include +#include +#include +#include #include #include #include -#include #include +#include #include #include #include #include -#include -#include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#if USD_VERSION_NUM > 2002 +#include +#endif +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// UsdMayaGLBatchRenderer is a singleton that shapes can use to get consistent /// batched drawing via Hydra in Maya, regardless of legacy viewport or /// Viewport 2.0 usage. diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.cpp index 24c53c119c..52b188f0c8 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.cpp @@ -13,16 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "./debugCodes.h" - -#include "pxr/pxr.h" -#include "pxr/base/tf/debug.h" -#include "pxr/base/tf/registryManager.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_REGISTRY_FUNCTION(TfDebug) { TF_DEBUG_ENVIRONMENT_SYMBOL( diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.h b/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.h index 7456baf4b8..b68d73d5b5 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.h @@ -18,13 +18,11 @@ /// \file pxrUsdMayaGL/debugCodes.h -#include "pxr/pxr.h" -#include "pxr/base/tf/debug.h" - +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEBUG_CODES( PXRUSDMAYAGL_BATCHED_DRAWING, PXRUSDMAYAGL_BATCHED_SELECTION, @@ -33,8 +31,6 @@ TF_DEBUG_CODES( PXRUSDMAYAGL_SHAPE_ADAPTER_LIFECYCLE ); - PXR_NAMESPACE_CLOSE_SCOPE - #endif diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp index f43da25176..cf530257b5 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp @@ -13,20 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "./hdImagingShapeDrawOverride.h" +#include +#include -#include "./batchRenderer.h" -#include "./debugCodes.h" -#include "./instancerImager.h" -#include "./userData.h" - -#include "../../nodes/hdImagingShape.h" - -#include "pxr/base/gf/vec2i.h" -#include "pxr/base/tf/debug.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/trace/trace.h" +#include +#include +#include +#include #include #include @@ -43,10 +36,14 @@ #include #include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - const MString PxrMayaHdImagingShapeDrawOverride::drawDbClassification( TfStringPrintf("drawdb/geometry/pxrUsdMayaGL/%s", PxrMayaHdImagingShapeTokens->MayaTypeName.GetText()).c_str()); diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h index 7f69ffbf39..8f3cba7d99 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h @@ -18,8 +18,7 @@ /// \file pxrUsdMayaGL/hdImagingShapeDrawOverride.h -#include "pxr/pxr.h" -#include "../../base/api.h" +#include #include #include @@ -32,6 +31,7 @@ #include #include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp index 47184903c6..0a7358e519 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp @@ -13,19 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "./hdImagingShapeUI.h" - -#include "./batchRenderer.h" -#include "./debugCodes.h" -#include "./instancerImager.h" -#include "./userData.h" - -#include "../../nodes/hdImagingShape.h" - -#include "pxr/base/gf/vec2i.h" -#include "pxr/base/tf/debug.h" -#include "pxr/base/trace/trace.h" +#include +#include +#include +#include +#include +#include #include #include @@ -40,10 +33,13 @@ #include #include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /* static */ void* PxrMayaHdImagingShapeUI::creator() diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h index 53c67cea90..7ba1ba8f69 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h @@ -18,14 +18,7 @@ /// \file pxrUsdMayaGL/hdImagingShapeUI.h -#include "pxr/pxr.h" -#include "../../base/api.h" - -// XXX: On Linux, some Maya headers (notably M3dView.h) end up indirectly -// including X11/Xlib.h, which #define's "Bool" as int. This can cause -// compilation issues if sdf/types.h is included afterwards, so to fix -// this, we ensure that it gets included first. -#include "pxr/usd/sdf/types.h" +#include #include #include @@ -33,9 +26,15 @@ #include #include +#include -PXR_NAMESPACE_OPEN_SCOPE +// XXX: On Linux, some Maya headers (notably M3dView.h) end up indirectly +// including X11/Xlib.h, which #define's "Bool" as int. This can cause +// compilation issues if sdf/types.h is included afterwards, so to fix +// this, we ensure that it gets included first. +#include +PXR_NAMESPACE_OPEN_SCOPE /// Class for drawing the pxrHdImagingShape node in the legacy viewport /// diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp index d40462f81f..5d25386b6b 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp @@ -15,16 +15,18 @@ // // Some header #define's Bool as int, which breaks stuff in sdf/types.h. // Include it first to sidestep the problem. :-/ -#include "pxr/pxr.h" -#include "pxr/usd/sdf/types.h" +#include +#include // Make sure to include glew first before any header that might include // gl.h -#include "pxr/imaging/glf/glew.h" +#include -#include "./hdRenderer.h" -#include "../px_vp20/utils.h" -#include "../px_vp20/utils_legacy.h" +#include +#include +#include + +#include #include #include @@ -39,12 +41,8 @@ #include #include -#include - - PXR_NAMESPACE_OPEN_SCOPE - void UsdMayaGLHdRenderer::CheckRendererSetup( const UsdPrim& usdPrim, diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h index 82ec386b14..8147a800bb 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h @@ -18,14 +18,10 @@ /// \file pxrUsdMayaGL/hdRenderer.h -#include "pxr/pxr.h" -#include "../../base/api.h" +#include -#include "pxr/base/gf/vec3d.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usdImaging/usdImagingGL/engine.h" +#include +#include #include #include @@ -36,13 +32,15 @@ #include #include -#include -#include - +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// Simple implementation of a Hydra renderer for a Maya shape. /// /// This class is mainly intended as a "reference" implementation of how diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp index 0078e7aee9..2d4e2267ad 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp @@ -13,14 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "./instancerImager.h" - -#include "./batchRenderer.h" -#include "./debugCodes.h" - -#include "../../nodes/hdImagingShape.h" - -#include "pxr/base/tf/instantiateSingleton.h" +#include +#include +#include +#include #include #include @@ -29,6 +25,8 @@ #include #include +#include + PXR_NAMESPACE_OPEN_SCOPE TF_INSTANTIATE_SINGLETON(UsdMayaGL_InstancerImager); diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h index 67e6653e69..064019759d 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h @@ -18,20 +18,19 @@ /// \file pxrUsdMayaGL/instancerImager.h -#include "../../base/api.h" -#include "./instancerShapeAdapter.h" +#include +#include +#include +#include -#include "pxr/base/tf/singleton.h" -#include "pxr/base/tf/weakBase.h" - -#include "../../listeners/notice.h" -#include "../../utils/util.h" +#include #include #include #include -#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp index 38ea86254e..1de17bb44f 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp @@ -13,42 +13,17 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "./instancerShapeAdapter.h" +#include +#include +#include +#include +#include +#include +#include -#include "./batchRenderer.h" -#include "./debugCodes.h" -#include "./renderParams.h" -#include "./shapeAdapter.h" - -#include "../../utils/util.h" -#include "../../fileio/utils/writeUtil.h" - -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/gf/matrix4d.h" - -#include "pxr/base/tf/debug.h" -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/token.h" - -#include "pxr/imaging/hd/enums.h" -#include "pxr/imaging/hd/renderIndex.h" -#include "pxr/imaging/hd/repr.h" -#include "pxr/imaging/hd/rprimCollection.h" -#include "pxr/imaging/hd/tokens.h" - -#include "pxr/usd/kind/registry.h" - -#include "pxr/usd/sdf/path.h" - -#include "pxr/usd/usd/modelAPI.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/timeCode.h" - -#include "pxr/usd/usdGeom/pointInstancer.h" +#include -#include "pxr/usdImaging/usdImaging/delegate.h" +#include #include #include @@ -64,14 +39,28 @@ #include #include -#include - -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PRIVATE_TOKENS( _tokens, ((NativeInstancerType, "instancer")) diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h index b8d4220673..1df6c56991 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h @@ -18,23 +18,21 @@ /// \file pxrUsdMayaGL/instancerShapeAdapter.h -#include "../../base/api.h" -#include "./shapeAdapter.h" +#include +#include -#include "pxr/base/gf/matrix4d.h" -#include "pxr/imaging/hd/renderIndex.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usdImaging/usdImaging/delegate.h" +#include #include -#include - +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// Class to manage translation of native Maya instancers into /// UsdGeomPointInstancers for imaging with Hydra. /// This adapter will translate instancer prototypes that are USD reference diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp index 89ecc82cfe..e9207e8a43 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp @@ -13,21 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "./proxyDrawOverride.h" - -#include "./batchRenderer.h" -#include "./renderParams.h" -#include "./usdProxyShapeAdapter.h" - -#include "../px_vp20/utils.h" - -#include "../../nodes/proxyShapeBase.h" - -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/trace/trace.h" +#include +#include +#include +#include +#include +#include #include #include @@ -46,10 +37,14 @@ #include #include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - const MString UsdMayaProxyDrawOverride::drawDbClassification( TfStringPrintf("drawdb/geometry/pxrUsdMayaGL/%s", MayaUsdProxyShapeBaseTokens->MayaTypeName.GetText()).c_str()); diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h index 67c71ab827..519e5abd5b 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h @@ -18,9 +18,8 @@ /// \file pxrUsdMayaGL/proxyDrawOverride.h -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "./usdProxyShapeAdapter.h" +#include +#include #include #include @@ -35,10 +34,10 @@ #include #include +#include PXR_NAMESPACE_OPEN_SCOPE - class UsdMayaProxyDrawOverride : public MHWRender::MPxDrawOverride { public: diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp index 97ecc01817..4d078fab5a 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp @@ -14,26 +14,23 @@ // limitations under the License. // -#include "pxr/imaging/glf/glew.h" // This header must absolutely come first. +#include // This header must absolutely come first. -#include "./batchRenderer.h" - -#include "../../nodes/proxyShapeBase.h" - -#include "pxr/base/gf/rotation.h" -#include "pxr/base/gf/frustum.h" -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/range1d.h" -#include "pxr/base/gf/ray.h" -#include "pxr/base/gf/vec3d.h" - -#include "pxr/base/tf/registryManager.h" - -#include "pxr/imaging/glf/drawTarget.h" -#include "pxr/imaging/glf/glContext.h" +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE static PxrMayaHdPrimFilter _sharedPrimFilter = { diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp index 12a46a7d34..e3f4f7aa75 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp @@ -13,20 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "./proxyShapeUI.h" - -#include "./batchRenderer.h" -#include "./renderParams.h" -#include "./usdProxyShapeAdapter.h" -#include "../../nodes/proxyShapeBase.h" - -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/trace/trace.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/timeCode.h" +#include +#include +#include +#include +#include #include #include @@ -46,10 +37,16 @@ #include #include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /* static */ void* UsdMayaProxyShapeUI::creator() diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h index 36f3ee9d16..7e7d2e9511 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h @@ -18,9 +18,8 @@ /// \file pxrUsdMayaGL/proxyShapeUI.h -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "./usdProxyShapeAdapter.h" +#include +#include #include #include @@ -33,10 +32,10 @@ #include #include +#include PXR_NAMESPACE_OPEN_SCOPE - class UsdMayaProxyShapeUI : public MPxSurfaceShapeUI { public: diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h b/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h index a13537e7e0..16d71d1a10 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h @@ -18,19 +18,16 @@ /// \file pxrUsdMayaGL/renderParams.h -#include "pxr/pxr.h" - -#include "../../base/api.h" - -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/tf/token.h" +#include #include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - struct PxrMayaHdRenderParams { // Raster Params diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp index 3d63fb770c..8761940b9a 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp @@ -13,44 +13,45 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "./sceneDelegate.h" - -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "./renderParams.h" - -#include "../px_vp20/utils.h" - -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/vec2f.h" -#include "pxr/base/gf/vec4d.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stl.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/value.h" -#include "pxr/imaging/cameraUtil/conformWindow.h" -#include "pxr/imaging/glf/simpleLight.h" -#include "pxr/imaging/glf/simpleLightingContext.h" -#include "pxr/imaging/hd/renderIndex.h" -#include "pxr/imaging/hd/repr.h" -#include "pxr/imaging/hd/rprimCollection.h" -#include "pxr/imaging/hd/sceneDelegate.h" -#include "pxr/imaging/hd/task.h" -#include "pxr/imaging/hd/tokens.h" -#include "pxr/imaging/hd/camera.h" -#include "pxr/imaging/hdSt/light.h" -#include "pxr/imaging/hdx/pickTask.h" -#include "pxr/imaging/hdx/renderSetupTask.h" -#include "pxr/imaging/hdx/renderTask.h" -#include "pxr/imaging/hdx/selectionTask.h" -#include "pxr/imaging/hdx/shadowMatrixComputation.h" -#include "pxr/imaging/hdx/shadowTask.h" -#include "pxr/imaging/hdx/simpleLightTask.h" -#include "pxr/imaging/hdx/tokens.h" -#include "pxr/usd/sdf/path.h" +#include + +#include + +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h index 2a6a7427f9..4c0e0e4cb8 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h @@ -17,30 +17,27 @@ #define PXRUSDMAYAGL_SCENE_DELEGATE_H /// \file pxrUsdMayaGL/sceneDelegate.h - -#include "pxr/pxr.h" - -#include "../../base/api.h" -#include "./renderParams.h" - -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/vec4d.h" -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/hashmap.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/value.h" -#include "pxr/imaging/glf/simpleLightingContext.h" -#include "pxr/imaging/hd/renderIndex.h" -#include "pxr/imaging/hd/rprimCollection.h" -#include "pxr/imaging/hd/sceneDelegate.h" -#include "pxr/imaging/hd/task.h" -#include "pxr/usd/sdf/path.h" - -#include +#include +#include #include #include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp index 8bee32e0a1..4c0f079e29 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp @@ -13,25 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "./shapeAdapter.h" - -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "./batchRenderer.h" -#include "./debugCodes.h" -#include "./renderParams.h" -#include "./softSelectHelper.h" -#include "./userData.h" - -#include "pxr/base/gf/gamma.h" -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/tf/debug.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/token.h" -#include "pxr/imaging/hd/repr.h" -#include "pxr/imaging/hd/rprimCollection.h" -#include "pxr/usd/sdf/path.h" +#include +#include +#include +#include +#include +#include +#include #include #include @@ -49,10 +37,19 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - // Helper function that converts M3dView::DisplayStyle (legacy viewport) into // MHWRender::MFrameContext::DisplayStyle (Viewport 2.0). // diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h index da53ef5ef5..c03ca39293 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h @@ -18,23 +18,22 @@ /// \file pxrUsdMayaGL/shapeAdapter.h -#include "pxr/pxr.h" +#include +#include +#include -#include "../../base/api.h" -#include "./renderParams.h" -#include "./userData.h" - -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/tf/token.h" -#include "pxr/imaging/hd/repr.h" -#include "pxr/imaging/hd/rprimCollection.h" -#include "pxr/usd/sdf/path.h" +#include +#include +#include +#include +#include +#include // XXX: On Linux, some Maya headers (notably M3dView.h) end up indirectly // including X11/Xlib.h, which #define's "Bool" as int. This can cause // compilation issues if sdf/types.h is included afterwards, so to fix // this, we ensure that it gets included first. -#include "pxr/usd/sdf/types.h" +#include #include #undef Always // Defined in /usr/lib/X11/X.h (eventually included by M3dView.h) - breaks pxr/usd/lib/usdUtils/registeredVariantSet.h diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.cpp index e476b61605..ba377eac91 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.cpp @@ -13,11 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include -#include "pxr/pxr.h" -#include "./softSelectHelper.h" - -#include "pxr/base/tf/stl.h" +#include +#include #include #include @@ -26,7 +25,6 @@ PXR_NAMESPACE_OPEN_SCOPE - UsdMayaGLSoftSelectHelper::UsdMayaGLSoftSelectHelper() : _populated(false) { diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h index b8c72241b8..b7e4fff168 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h @@ -18,22 +18,20 @@ /// \file pxrUsdMayaGL/softSelectHelper.h -#include "pxr/pxr.h" -#include "../../base/api.h" +#include -#include "pxr/base/tf/hash.h" +#include #include #include #include #include -#include - +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// \class UsdMayaGLSoftSelectHelper /// \brief Helper class to store soft ("rich") selection state while /// computing render params for a frame. diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp index 24915ceb71..7b37fd7f79 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp @@ -13,33 +13,17 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "./usdProxyShapeAdapter.h" - -#include "pxr/pxr.h" -#include "../../base/api.h" -#include "./batchRenderer.h" -#include "./debugCodes.h" -#include "./renderParams.h" -#include "./shapeAdapter.h" -#include "../../nodes/proxyShapeBase.h" - -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/tf/debug.h" -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/trace/trace.h" -#include "pxr/imaging/hd/enums.h" -#include "pxr/imaging/hd/renderIndex.h" -#include "pxr/imaging/hd/repr.h" -#include "pxr/imaging/hd/rprimCollection.h" -#include "pxr/imaging/hd/tokens.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usd/timeCode.h" -#include "pxr/usd/usdGeom/tokens.h" -#include "pxr/usdImaging/usdImaging/delegate.h" +#include +#include +#include +#include +#include +#include +#include + +#include + +#include #include #include @@ -54,10 +38,24 @@ #include #include -#include - -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h index c152d30c4b..9adfae05d7 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h @@ -18,27 +18,24 @@ /// \file pxrUsdMayaGL/usdProxyShapeAdapter.h -#include "pxr/pxr.h" +#include +#include -#include "../../base/api.h" -#include "./shapeAdapter.h" - -#include "pxr/base/gf/matrix4d.h" -#include "pxr/imaging/hd/renderIndex.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" -#include "pxr/usdImaging/usdImaging/delegate.h" +#include #include #include #include -#include - +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - class UsdMayaProxyDrawOverride; class UsdMayaProxyShapeUI; diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp index 49f8c7c0ad..4f28c8cad0 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp @@ -13,17 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "./userData.h" - -#include "pxr/pxr.h" -#include "../../base/api.h" +#include #include +#include PXR_NAMESPACE_OPEN_SCOPE - /// Note that we set deleteAfterUse=false when calling the MUserData /// constructor. This ensures that the draw data survives across multiple draw /// passes in Viewport 2.0 (e.g. a shadow pass and a color pass). diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/userData.h b/lib/mayaUsd/render/pxrUsdMayaGL/userData.h index 2f4603addd..5e65f7e42d 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/userData.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/userData.h @@ -18,20 +18,18 @@ /// \file pxrUsdMayaGL/userData.h -#include "pxr/pxr.h" -#include "../../base/api.h" +#include -#include "pxr/base/gf/vec4f.h" +#include #include #include -#include - +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// Container for all of the information needed for a draw request in the /// legacy viewport or Viewport 2.0, without requiring shape querying at draw /// time. diff --git a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp index b12f6b1580..71635f2078 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp @@ -15,27 +15,28 @@ // limitations under the License. // -#include "basisCurves.h" -#include "bboxGeom.h" -#include "debugCodes.h" -#include "draw_item.h" -#include "material.h" -#include "instancer.h" -#include "render_delegate.h" -#include "tokens.h" - -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/matrix4f.h" -#include "pxr/base/vt/value.h" - -#include "pxr/imaging/hd/repr.h" -#include "pxr/imaging/hd/sceneDelegate.h" -#include "pxr/imaging/hd/tokens.h" +#include + +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include + +#include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE namespace { diff --git a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h index 4c901fdc86..d147947f6f 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h @@ -17,17 +17,17 @@ #ifndef HDVP2_BASIS_CURVES_H #define HDVP2_BASIS_CURVES_H -#include "pxr/pxr.h" -#include "pxr/base/vt/array.h" -#include "pxr/imaging/hd/basisCurves.h" -#include "pxr/imaging/hd/enums.h" -#include "pxr/usd/sdf/path.h" +#include -#include +#include -#include "proxyRenderDelegate.h" +#include -#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.cpp b/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.cpp index a6c169707a..68605b8b63 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.cpp @@ -14,10 +14,10 @@ // limitations under the License. // -#include "bboxGeom.h" +#include -#include "pxr/base/arch/threads.h" -#include "pxr/base/tf/diagnostic.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.h b/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.h index c7fa5e8622..4fd69cd154 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.h @@ -17,13 +17,13 @@ #ifndef HD_VP2_BBOX_GEOM #define HD_VP2_BBOX_GEOM -#include "maya/MHWGeometry.h" - -#include "pxr/pxr.h" -#include "pxr/base/gf/range3d.h" +#include #include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE /*! \brief Geometry used for bounding box display in VP2. diff --git a/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.cpp b/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.cpp index f0b5ca52db..ff73e65c5a 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.cpp @@ -13,10 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include -#include "debugCodes.h" - -#include "pxr/base/tf/registryManager.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.h b/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.h index 77aa94e580..5afea72c4d 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.h @@ -17,8 +17,9 @@ #ifndef HD_VP2_DEBUGCODES_H #define HD_VP2_DEBUGCODES_H -#include "pxr/pxr.h" -#include "pxr/base/tf/debug.h" +#include + +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp b/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp index 09bdb58235..50bf49b09d 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp @@ -14,10 +14,10 @@ // limitations under the License. // -#include "pxr/imaging/hd/mesh.h" +#include +#include -#include "draw_item.h" -#include "render_delegate.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.h b/lib/mayaUsd/render/vp2RenderDelegate/draw_item.h index 2cbd72e56b..74598c7a30 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/draw_item.h @@ -17,12 +17,13 @@ #ifndef HD_VP2_DRAW_ITEM #define HD_VP2_DRAW_ITEM -#include "pxr/pxr.h" -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/vt/array.h" -#include "pxr/imaging/hd/drawItem.h" -#include "pxr/imaging/hd/mesh.h" -#include "pxr/usd/usd/timeCode.h" +#include + +#include +#include +#include +#include +#include #include #include diff --git a/lib/mayaUsd/render/vp2RenderDelegate/instancer.cpp b/lib/mayaUsd/render/vp2RenderDelegate/instancer.cpp index 5e3f5e60dc..fb836fd295 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/instancer.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/instancer.cpp @@ -15,19 +15,18 @@ // // Modifications copyright (C) 2019 Autodesk // -#include "pxr/imaging/glf/glew.h" - -#include "instancer.h" -#include "sampler.h" - -#include "pxr/imaging/hd/sceneDelegate.h" - -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/rotation.h" -#include "pxr/base/gf/quaternion.h" -#include "pxr/base/tf/staticTokens.h" +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/instancer.h b/lib/mayaUsd/render/vp2RenderDelegate/instancer.h index c1807fedf6..4cda3e674c 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/instancer.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/instancer.h @@ -18,16 +18,14 @@ #ifndef HD_VP2_INSTANCER #define HD_VP2_INSTANCER -#include "pxr/pxr.h" - -#include "pxr/imaging/hd/instancer.h" -#include "pxr/imaging/hd/vtBufferSource.h" - -#include "pxr/base/tf/hashmap.h" -#include "pxr/base/tf/token.h" - #include +#include +#include +#include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE /*! \brief VP2 instancing of prototype geometry with varying transforms diff --git a/lib/mayaUsd/render/vp2RenderDelegate/material.cpp b/lib/mayaUsd/render/vp2RenderDelegate/material.cpp index 33b1e135e9..94f30e261b 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/material.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/material.cpp @@ -14,23 +14,15 @@ // limitations under the License. // -#include "debugCodes.h" -#include "material.h" -#include "render_delegate.h" - -#include "pxr/imaging/glf/image.h" -#include "pxr/imaging/hd/sceneDelegate.h" -#include "pxr/usd/ar/packageUtils.h" -#include "pxr/usd/sdf/assetPath.h" -#include "pxr/usd/usdHydra/tokens.h" -#include "pxr/usdImaging/usdImaging/tokens.h" - -#include "pxr/base/gf/vec2f.h" -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/matrix4f.h" -#include "pxr/base/tf/diagnostic.h" +#include + +#include +#include + +#include +#include + +#include #include #include @@ -42,11 +34,19 @@ #include #include -#include - -#include -#include - +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/material.h b/lib/mayaUsd/render/vp2RenderDelegate/material.h index ea66c7c7fb..af5291be5f 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/material.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/material.h @@ -17,12 +17,12 @@ #ifndef HD_VP2_MATERIAL #define HD_VP2_MATERIAL -#include "pxr/pxr.h" -#include "pxr/imaging/hd/material.h" +#include #include -#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp b/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp index 96836ca7d7..c1e7aeb143 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp @@ -13,28 +13,28 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include -#include "mesh.h" -#include "bboxGeom.h" -#include "debugCodes.h" -#include "draw_item.h" -#include "material.h" -#include "instancer.h" -#include "proxyRenderDelegate.h" -#include "render_delegate.h" -#include "tokens.h" - -#include "pxr/base/gf/matrix4d.h" -#include "pxr/imaging/hd/sceneDelegate.h" -#include "pxr/imaging/hd/meshUtil.h" -#include "pxr/imaging/hd/smoothNormals.h" -#include "pxr/imaging/hd/vertexAdjacency.h" +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include #include -#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mesh.h b/lib/mayaUsd/render/vp2RenderDelegate/mesh.h index 6c39d83bb9..d1cec7b1e9 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/mesh.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/mesh.h @@ -17,12 +17,12 @@ #ifndef HD_VP2_MESH #define HD_VP2_MESH -#include "pxr/pxr.h" -#include "pxr/imaging/hd/mesh.h" +#include #include -#include "proxyRenderDelegate.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp index 76b5a7ca34..40ceb9240c 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp @@ -13,26 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include "proxyRenderDelegate.h" -#include "render_delegate.h" -#include "tokens.h" - -#include "pxr/base/tf/diagnostic.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/usdImaging/usdImaging/delegate.h" -#include "pxr/imaging/hdx/renderTask.h" -#include "pxr/imaging/hdx/selectionTracker.h" -#include "pxr/imaging/hdx/taskController.h" -#include "pxr/imaging/hd/basisCurves.h" -#include "pxr/imaging/hd/enums.h" -#include "pxr/imaging/hd/mesh.h" -#include "pxr/imaging/hd/repr.h" -#include "pxr/imaging/hd/rprimCollection.h" - -#include "../../nodes/proxyShapeBase.h" -#include "../../nodes/stageData.h" -#include "../../utils/util.h" +#include +#include +#include +#include +#include +#include #include #include @@ -41,6 +27,18 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #if defined(WANT_UFE_BUILD) #include #include diff --git a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h index 43c3cc8a8f..f063bd00f8 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h @@ -17,15 +17,9 @@ #ifndef PROXY_RENDER_DELEGATE #define PROXY_RENDER_DELEGATE -#include "pxr/pxr.h" +#include -#include "pxr/imaging/hd/engine.h" -#include "pxr/imaging/hd/selection.h" -#include "pxr/imaging/hd/task.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/prim.h" - -#include "../../base/api.h" +#include #include #include @@ -35,7 +29,12 @@ #include #include -#include +#include +#include +#include +#include +#include +#include #if defined(WANT_UFE_BUILD) #include diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp index 7cf91c912a..70a4ee57ac 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp @@ -13,32 +13,29 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include "render_delegate.h" - -#include "basisCurves.h" -#include "bboxGeom.h" -#include "material.h" -#include "mesh.h" - -#include "render_pass.h" -#include "instancer.h" - -#include "pxr/imaging/hd/bprim.h" -#include "pxr/imaging/hd/camera.h" -#include "pxr/imaging/hd/instancer.h" -#include "pxr/imaging/hd/resourceRegistry.h" -#include "pxr/imaging/hd/rprim.h" -#include "pxr/imaging/hd/tokens.h" - -#include +#include +#include +#include +#include +#include +#include +#include #include -#include "tbb/spin_rw_mutex.h" +#include #include #include +#include + +#include +#include +#include +#include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE namespace diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h index 0cf7736df9..64d91b07c6 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h @@ -17,18 +17,18 @@ #ifndef HD_VP2_RENDER_DELEGATE #define HD_VP2_RENDER_DELEGATE -#include "pxr/pxr.h" -#include "pxr/imaging/hd/renderDelegate.h" -#include "pxr/imaging/hd/resourceRegistry.h" +#include +#include -#include "render_param.h" -#include "resource_registry.h" +#include +#include #include #include -#include -#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp b/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp index 3aa1f99ded..1c506064e8 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp @@ -14,7 +14,7 @@ // limitations under the License. // -#include "render_param.h" +#include #include diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_param.h b/lib/mayaUsd/render/vp2RenderDelegate/render_param.h index 47cc8413c7..d2e07d88ca 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/render_param.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/render_param.h @@ -17,13 +17,12 @@ #ifndef HD_VP2_RENDER_PARAM #define HD_VP2_RENDER_PARAM -#include "pxr/pxr.h" - -#include "pxr/imaging/hd/renderDelegate.h" -#include "pxr/usd/usd/timeCode.h" - #include +#include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE class ProxyRenderDelegate; diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_pass.h b/lib/mayaUsd/render/vp2RenderDelegate/render_pass.h index 5b0c4236a6..c808b4fd38 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/render_pass.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/render_pass.h @@ -17,8 +17,9 @@ #ifndef HD_VP2_RENDER_PASS #define HD_VP2_RENDER_PASS -#include "pxr/pxr.h" -#include "pxr/imaging/hd/renderPass.h" +#include + +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h b/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h index afc52e59aa..de8fb01b87 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h @@ -17,7 +17,7 @@ #ifndef HD_VP2_RESOURCE_REGISTRY #define HD_VP2_RESOURCE_REGISTRY -#include "task_commit.h" +#include #include #include diff --git a/lib/mayaUsd/render/vp2RenderDelegate/sampler.cpp b/lib/mayaUsd/render/vp2RenderDelegate/sampler.cpp index a9e5d60475..2b14b73fd0 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/sampler.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/sampler.cpp @@ -15,7 +15,7 @@ // // Modifications copyright (C) 2019 Autodesk // -#include "sampler.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/sampler.h b/lib/mayaUsd/render/vp2RenderDelegate/sampler.h index 342a1e2737..274547f2df 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/sampler.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/sampler.h @@ -18,25 +18,23 @@ #ifndef HD_VP2_SAMPLER_H #define HD_VP2_SAMPLER_H -#include "pxr/pxr.h" #include -#include "pxr/imaging/glf/glew.h" - -#include "pxr/imaging/hd/enums.h" -#include "pxr/imaging/hd/vtBufferSource.h" - -#include "pxr/base/gf/matrix4d.h" -#include "pxr/base/gf/matrix4f.h" -#include "pxr/base/gf/vec2d.h" -#include "pxr/base/gf/vec2f.h" -#include "pxr/base/gf/vec2i.h" -#include "pxr/base/gf/vec3d.h" -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/gf/vec3i.h" -#include "pxr/base/gf/vec4d.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/gf/vec4i.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/tokens.cpp b/lib/mayaUsd/render/vp2RenderDelegate/tokens.cpp index 1b7f485be6..49debc035f 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/tokens.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/tokens.cpp @@ -14,7 +14,7 @@ // limitations under the License. // -#include "tokens.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/tokens.h b/lib/mayaUsd/render/vp2RenderDelegate/tokens.h index 59780b8f7b..6fd970e4c6 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/tokens.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/tokens.h @@ -17,8 +17,9 @@ #ifndef HD_VP2_TOKENS_H #define HD_VP2_TOKENS_H -#include "pxr/pxr.h" -#include "pxr/base/tf/staticTokens.h" +#include + +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp b/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp index 8e74e71991..20818d014a 100644 --- a/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp +++ b/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp @@ -14,13 +14,13 @@ // limitations under the License. // -#include "shaderFragments.h" +#include -#include "pxr/base/plug/plugin.h" -#include "pxr/base/plug/thisPlugin.h" -#include "pxr/base/tf/stringUtils.h" +#include +#include +#include -#include "pxr/usdImaging/usdImaging/tokens.h" +#include #include #include diff --git a/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.h b/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.h index 7c4db7a285..f2f842f47c 100644 --- a/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.h +++ b/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.h @@ -17,7 +17,7 @@ #ifndef HD_VP2_SHADER_FRAGMENTS #define HD_VP2_SHADER_FRAGMENTS -#include "pxr/pxr.h" +#include #include diff --git a/lib/mayaUsd/ufe/Global.cpp b/lib/mayaUsd/ufe/Global.cpp index 98973309df..0d06f8e694 100644 --- a/lib/mayaUsd/ufe/Global.cpp +++ b/lib/mayaUsd/ufe/Global.cpp @@ -14,27 +14,28 @@ // limitations under the License. // -#include "Global.h" -#include "ProxyShapeHandler.h" -#include "StagesSubject.h" -#include "private/InPathChange.h" -#include "UsdHierarchyHandler.h" -#include "UsdTransform3dHandler.h" -#include "UsdSceneItemOpsHandler.h" +#include + +#include +#include +#include +#include +#include +#include +#include -#include #include -#include +#include #ifdef UFE_V2_FEATURES_AVAILABLE // Note: must come after include of ufe files so we have the define. -#include "UsdAttributesHandler.h" -#include "UsdObject3dHandler.h" +#include +#include #if UFE_PREVIEW_VERSION_NUM >= 2009 -#include "UsdContextOpsHandler.h" +#include #endif #else -#include "UfeVersionCompat.h" +#include #endif #include diff --git a/lib/mayaUsd/ufe/Global.h b/lib/mayaUsd/ufe/Global.h index 2179b522fe..ac35f7a178 100644 --- a/lib/mayaUsd/ufe/Global.h +++ b/lib/mayaUsd/ufe/Global.h @@ -15,7 +15,7 @@ // #pragma once -#include "../base/api.h" +#include #include diff --git a/lib/mayaUsd/ufe/ProxyShapeHandler.cpp b/lib/mayaUsd/ufe/ProxyShapeHandler.cpp index a78c009f6c..0ade53e621 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHandler.cpp +++ b/lib/mayaUsd/ufe/ProxyShapeHandler.cpp @@ -14,9 +14,9 @@ // limitations under the License. // -#include "ProxyShapeHandler.h" +#include -#include "../utils/query.h" +#include #include #include diff --git a/lib/mayaUsd/ufe/ProxyShapeHandler.h b/lib/mayaUsd/ufe/ProxyShapeHandler.h index 941ec0fc04..f58f4d9c84 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHandler.h +++ b/lib/mayaUsd/ufe/ProxyShapeHandler.h @@ -15,14 +15,14 @@ // #pragma once -#include "../base/api.h" - -#include -#include +#include #include #include +#include +#include + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp b/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp index 1ca4ff52f1..8b5ecab96e 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp +++ b/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp @@ -14,18 +14,18 @@ // limitations under the License. // -#include "ProxyShapeHierarchy.h" -#include "Utils.h" +#include +#include #include #include #include #include -#include - #include +#include + MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchy.h b/lib/mayaUsd/ufe/ProxyShapeHierarchy.h index 61f25dfa84..c35a07dbcc 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHierarchy.h +++ b/lib/mayaUsd/ufe/ProxyShapeHierarchy.h @@ -15,9 +15,9 @@ // #pragma once -#include "../base/api.h" +#include -#include "UsdSceneItem.h" +#include #include #include diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp index 9c62e9e369..828ae47a7a 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp +++ b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp @@ -14,10 +14,9 @@ // limitations under the License. // -#include "ProxyShapeHierarchyHandler.h" -#include "Utils.h" - -#include +#include +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h index 62f129e5b3..4ff1bfa7e3 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h +++ b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h @@ -15,7 +15,7 @@ // #pragma once -#include "../base/api.h" +#include #include diff --git a/lib/mayaUsd/ufe/StagesSubject.cpp b/lib/mayaUsd/ufe/StagesSubject.cpp index 287bc97c2d..26e5a49221 100644 --- a/lib/mayaUsd/ufe/StagesSubject.cpp +++ b/lib/mayaUsd/ufe/StagesSubject.cpp @@ -14,11 +14,12 @@ // limitations under the License. // -#include "StagesSubject.h" -#include "Utils.h" -#include "UsdStageMap.h" -#include "ProxyShapeHandler.h" -#include "private/InPathChange.h" +#include + +#include +#include +#include +#include #ifdef UFE_V2_FEATURES_AVAILABLE #include @@ -35,17 +36,17 @@ #endif #endif +#include + +#ifdef UFE_V2_FEATURES_AVAILABLE +#include + #include #include #include #include -#include - -#ifdef UFE_V2_FEATURES_AVAILABLE -#include - namespace { // The attribute change notification guard is not meant to be nested, but diff --git a/lib/mayaUsd/ufe/StagesSubject.h b/lib/mayaUsd/ufe/StagesSubject.h index 840658398f..dc10642197 100644 --- a/lib/mayaUsd/ufe/StagesSubject.h +++ b/lib/mayaUsd/ufe/StagesSubject.h @@ -15,8 +15,12 @@ // #pragma once -#include "../base/api.h" -#include "../listeners/proxyShapeNotice.h" +#include +#include + +#include + +#include // For UFE_V2_FEATURES_AVAILABLE #include #include @@ -24,10 +28,6 @@ #include #include -#include - -#include // For UFE_V2_FEATURES_AVAILABLE - PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdAttribute.cpp b/lib/mayaUsd/ufe/UsdAttribute.cpp index 86b948a659..176064c9bf 100644 --- a/lib/mayaUsd/ufe/UsdAttribute.cpp +++ b/lib/mayaUsd/ufe/UsdAttribute.cpp @@ -14,8 +14,12 @@ // limitations under the License. // -#include "UsdAttribute.h" -#include "StagesSubject.h" +#include +#include + +#include +#include +#include #include #include @@ -27,10 +31,6 @@ #define UFE_ENABLE_ASSERTS #include -#include -#include -#include - // Note: normally we would use this using directive, but here we cannot because // our class is called UsdAttribute which is exactly the same as the one // in USD. diff --git a/lib/mayaUsd/ufe/UsdAttribute.h b/lib/mayaUsd/ufe/UsdAttribute.h index 46e77a44cb..9427cbd5ac 100644 --- a/lib/mayaUsd/ufe/UsdAttribute.h +++ b/lib/mayaUsd/ufe/UsdAttribute.h @@ -15,7 +15,7 @@ // #pragma once -#include "UsdSceneItem.h" +#include #include diff --git a/lib/mayaUsd/ufe/UsdAttributes.cpp b/lib/mayaUsd/ufe/UsdAttributes.cpp index a8dbfd0e70..4007d39554 100644 --- a/lib/mayaUsd/ufe/UsdAttributes.cpp +++ b/lib/mayaUsd/ufe/UsdAttributes.cpp @@ -14,7 +14,7 @@ // limitations under the License. // -#include "UsdAttributes.h" +#include #include diff --git a/lib/mayaUsd/ufe/UsdAttributes.h b/lib/mayaUsd/ufe/UsdAttributes.h index caff395025..13c7c95e39 100644 --- a/lib/mayaUsd/ufe/UsdAttributes.h +++ b/lib/mayaUsd/ufe/UsdAttributes.h @@ -15,17 +15,16 @@ // #pragma once -#include "../base/api.h" +#include +#include +#include -#include "UsdSceneItem.h" -#include "UsdAttribute.h" +#include #include #include -#include - MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdAttributesHandler.cpp b/lib/mayaUsd/ufe/UsdAttributesHandler.cpp index 0366ba1971..c8de991918 100644 --- a/lib/mayaUsd/ufe/UsdAttributesHandler.cpp +++ b/lib/mayaUsd/ufe/UsdAttributesHandler.cpp @@ -14,8 +14,9 @@ // limitations under the License. // -#include "UsdAttributesHandler.h" -#include "UsdSceneItem.h" +#include + +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdAttributesHandler.h b/lib/mayaUsd/ufe/UsdAttributesHandler.h index 1fd6acec73..ae3d6bd9c5 100644 --- a/lib/mayaUsd/ufe/UsdAttributesHandler.h +++ b/lib/mayaUsd/ufe/UsdAttributesHandler.h @@ -15,9 +15,8 @@ // #pragma once -#include "../base/api.h" - -#include "UsdAttributes.h" +#include +#include #include diff --git a/lib/mayaUsd/ufe/UsdContextOps.cpp b/lib/mayaUsd/ufe/UsdContextOps.cpp index 8e62320917..cae0b44559 100644 --- a/lib/mayaUsd/ufe/UsdContextOps.cpp +++ b/lib/mayaUsd/ufe/UsdContextOps.cpp @@ -14,8 +14,12 @@ // limitations under the License. // -#include "UsdContextOps.h" -#include "Utils.h" +#include +#include + +#include + +#include #include #include @@ -24,10 +28,6 @@ #include #include -#include - -#include - namespace { //! \brief Undoable command for variant selection change diff --git a/lib/mayaUsd/ufe/UsdContextOps.h b/lib/mayaUsd/ufe/UsdContextOps.h index deaf98464b..cf61c21528 100644 --- a/lib/mayaUsd/ufe/UsdContextOps.h +++ b/lib/mayaUsd/ufe/UsdContextOps.h @@ -15,9 +15,8 @@ // #pragma once -#include "../base/api.h" - -#include "UsdSceneItem.h" +#include +#include #include #include diff --git a/lib/mayaUsd/ufe/UsdContextOpsHandler.cpp b/lib/mayaUsd/ufe/UsdContextOpsHandler.cpp index 4430c3262f..38d5ca350d 100644 --- a/lib/mayaUsd/ufe/UsdContextOpsHandler.cpp +++ b/lib/mayaUsd/ufe/UsdContextOpsHandler.cpp @@ -14,7 +14,7 @@ // limitations under the License. // -#include "UsdContextOpsHandler.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdContextOpsHandler.h b/lib/mayaUsd/ufe/UsdContextOpsHandler.h index 7f5a601532..2c4d5ebd8d 100644 --- a/lib/mayaUsd/ufe/UsdContextOpsHandler.h +++ b/lib/mayaUsd/ufe/UsdContextOpsHandler.h @@ -15,9 +15,9 @@ // #pragma once -#include "../base/api.h" +#include -#include "UsdContextOps.h" +#include #include diff --git a/lib/mayaUsd/ufe/UsdHierarchy.cpp b/lib/mayaUsd/ufe/UsdHierarchy.cpp index 37266ca503..99ff8e186e 100644 --- a/lib/mayaUsd/ufe/UsdHierarchy.cpp +++ b/lib/mayaUsd/ufe/UsdHierarchy.cpp @@ -14,14 +14,18 @@ // limitations under the License. // -#include "UsdHierarchy.h" -#include "UsdUndoCreateGroupCommand.h" -#include "private/Utils.h" -#include "Utils.h" -#include "private/InPathChange.h" +#include + +#include +#include + +#include +#include +#include +#include -#include #include +#include #include #include @@ -30,9 +34,6 @@ #include #include -#include -#include - namespace { UsdPrimSiblingRange filteredChildren( const UsdPrim& prim ) { diff --git a/lib/mayaUsd/ufe/UsdHierarchy.h b/lib/mayaUsd/ufe/UsdHierarchy.h index a6dcbc7c94..11a4e18978 100644 --- a/lib/mayaUsd/ufe/UsdHierarchy.h +++ b/lib/mayaUsd/ufe/UsdHierarchy.h @@ -15,8 +15,9 @@ // #pragma once -#include "../base/api.h" -#include "UsdSceneItem.h" +#include + +#include #include #include diff --git a/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp b/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp index 240ed3ff94..469f0acfa3 100644 --- a/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp +++ b/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include -#include "UsdHierarchyHandler.h" -#include "UsdSceneItem.h" -#include "Utils.h" +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdHierarchyHandler.h b/lib/mayaUsd/ufe/UsdHierarchyHandler.h index 0ef2f67ff0..f8ea8f5d92 100644 --- a/lib/mayaUsd/ufe/UsdHierarchyHandler.h +++ b/lib/mayaUsd/ufe/UsdHierarchyHandler.h @@ -15,10 +15,10 @@ // #pragma once -#include "../base/api.h" +#include -#include "UsdHierarchy.h" -#include "UsdRootChildHierarchy.h" +#include +#include #include diff --git a/lib/mayaUsd/ufe/UsdObject3d.cpp b/lib/mayaUsd/ufe/UsdObject3d.cpp index 9c8d7a1f5b..f16fd3240e 100644 --- a/lib/mayaUsd/ufe/UsdObject3d.cpp +++ b/lib/mayaUsd/ufe/UsdObject3d.cpp @@ -6,18 +6,18 @@ // otherwise accompanies this software in either electronic or hard copy form. // =========================================================================== -#include "UsdObject3d.h" -#include "Utils.h" +#include +#include -#include "ufe/attributes.h" -#include "ufe/types.h" +#include +#include + +#include #include #include #include -#include - namespace { Ufe::Vector3d toVector3d(const GfVec3d& v) { diff --git a/lib/mayaUsd/ufe/UsdObject3d.h b/lib/mayaUsd/ufe/UsdObject3d.h index cd5e3bbe66..5977f9b56a 100644 --- a/lib/mayaUsd/ufe/UsdObject3d.h +++ b/lib/mayaUsd/ufe/UsdObject3d.h @@ -7,10 +7,10 @@ // =========================================================================== #pragma once -#include "../base/api.h" -#include "UsdSceneItem.h" +#include +#include -#include "ufe/object3d.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdObject3dHandler.cpp b/lib/mayaUsd/ufe/UsdObject3dHandler.cpp index 0fcbb8b81b..5b38906bbd 100644 --- a/lib/mayaUsd/ufe/UsdObject3dHandler.cpp +++ b/lib/mayaUsd/ufe/UsdObject3dHandler.cpp @@ -6,8 +6,9 @@ // otherwise accompanies this software in either electronic or hard copy form. // =========================================================================== -#include "UsdObject3dHandler.h" -#include "UsdSceneItem.h" +#include + +#include #include diff --git a/lib/mayaUsd/ufe/UsdObject3dHandler.h b/lib/mayaUsd/ufe/UsdObject3dHandler.h index 448705637e..d18b555fca 100644 --- a/lib/mayaUsd/ufe/UsdObject3dHandler.h +++ b/lib/mayaUsd/ufe/UsdObject3dHandler.h @@ -7,11 +7,11 @@ // =========================================================================== #pragma once -#include "../base/api.h" +#include -#include "UsdObject3d.h" +#include -#include "ufe/object3dHandler.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp b/lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp index 2231b6555b..261ba53705 100644 --- a/lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp +++ b/lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp @@ -13,13 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include -#include "UsdRootChildHierarchy.h" +#include #include -#include - MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdRootChildHierarchy.h b/lib/mayaUsd/ufe/UsdRootChildHierarchy.h index ab63f2215c..ddbf85ad10 100644 --- a/lib/mayaUsd/ufe/UsdRootChildHierarchy.h +++ b/lib/mayaUsd/ufe/UsdRootChildHierarchy.h @@ -15,9 +15,9 @@ // #pragma once -#include "../base/api.h" +#include -#include "UsdHierarchy.h" +#include //PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp index 68eb56bb72..c848e2662d 100644 --- a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include -#include "UsdRotatePivotTranslateUndoableCommand.h" -#include "private/Utils.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h index b223e5af76..3945767798 100644 --- a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h @@ -15,7 +15,7 @@ // #pragma once -#include "../base/api.h" +#include #include diff --git a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp index ea5663d074..3f81e31f3a 100644 --- a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp @@ -14,8 +14,9 @@ // limitations under the License. // -#include "UsdRotateUndoableCommand.h" -#include "private/Utils.h" +#include + +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h index 60b53cf56c..268050a1e3 100644 --- a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h @@ -15,14 +15,14 @@ // #pragma once -#include "../base/api.h" +#include #include -#include - #include +#include + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp index ee4f93156f..d5fffe5b48 100644 --- a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp @@ -14,9 +14,10 @@ // limitations under the License. // -#include "UsdScaleUndoableCommand.h" -#include "private/Utils.h" -#include "Utils.h" +#include + +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h index e5a26f7474..4a8fb925af 100644 --- a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h @@ -15,7 +15,7 @@ // #pragma once -#include "../base/api.h" +#include #include diff --git a/lib/mayaUsd/ufe/UsdSceneItem.cpp b/lib/mayaUsd/ufe/UsdSceneItem.cpp index b3e8782a37..18b0c4b556 100644 --- a/lib/mayaUsd/ufe/UsdSceneItem.cpp +++ b/lib/mayaUsd/ufe/UsdSceneItem.cpp @@ -14,7 +14,7 @@ // limitations under the License. // -#include "UsdSceneItem.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdSceneItem.h b/lib/mayaUsd/ufe/UsdSceneItem.h index cb7e73758e..47230c84df 100644 --- a/lib/mayaUsd/ufe/UsdSceneItem.h +++ b/lib/mayaUsd/ufe/UsdSceneItem.h @@ -15,7 +15,7 @@ // #pragma once -#include "../base/api.h" +#include #include diff --git a/lib/mayaUsd/ufe/UsdSceneItemOps.cpp b/lib/mayaUsd/ufe/UsdSceneItemOps.cpp index 60b7895f47..96c7179e51 100644 --- a/lib/mayaUsd/ufe/UsdSceneItemOps.cpp +++ b/lib/mayaUsd/ufe/UsdSceneItemOps.cpp @@ -14,11 +14,12 @@ // limitations under the License. // -#include "UsdSceneItemOps.h" -#include "UsdUndoDeleteCommand.h" -#include "UsdUndoDuplicateCommand.h" -#include "UsdUndoRenameCommand.h" -#include "Utils.h" +#include + +#include +#include +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdSceneItemOps.h b/lib/mayaUsd/ufe/UsdSceneItemOps.h index 290c9bc8d9..a3a9a0ce90 100644 --- a/lib/mayaUsd/ufe/UsdSceneItemOps.h +++ b/lib/mayaUsd/ufe/UsdSceneItemOps.h @@ -15,9 +15,9 @@ // #pragma once -#include "../base/api.h" +#include -#include "UsdSceneItem.h" +#include #include #include diff --git a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp index f305034fd8..b5bbfcd78c 100644 --- a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp +++ b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp @@ -14,7 +14,7 @@ // limitations under the License. // -#include "UsdSceneItemOpsHandler.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h index 2ed85c24b5..190669004c 100644 --- a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h +++ b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h @@ -15,9 +15,9 @@ // #pragma once -#include "../base/api.h" +#include -#include "UsdSceneItemOps.h" +#include #include diff --git a/lib/mayaUsd/ufe/UsdStageMap.cpp b/lib/mayaUsd/ufe/UsdStageMap.cpp index 97b7f6d57d..8ca1e872f0 100644 --- a/lib/mayaUsd/ufe/UsdStageMap.cpp +++ b/lib/mayaUsd/ufe/UsdStageMap.cpp @@ -14,13 +14,13 @@ // limitations under the License. // -#include "UsdStageMap.h" -#include "Utils.h" - -#include +#include +#include #include +#include + namespace { MObjectHandle proxyShapeHandle(const Ufe::Path& path) diff --git a/lib/mayaUsd/ufe/UsdStageMap.h b/lib/mayaUsd/ufe/UsdStageMap.h index 954eb640e9..63ae8db709 100644 --- a/lib/mayaUsd/ufe/UsdStageMap.h +++ b/lib/mayaUsd/ufe/UsdStageMap.h @@ -15,16 +15,16 @@ // #pragma once -#include "../base/api.h" +#include #include -#include -#include +#include #include -#include +#include +#include // Allow for use of MObjectHandle with std::unordered_map. namespace std { diff --git a/lib/mayaUsd/ufe/UsdTransform3d.cpp b/lib/mayaUsd/ufe/UsdTransform3d.cpp index bc13ac28d8..67d22a49fd 100644 --- a/lib/mayaUsd/ufe/UsdTransform3d.cpp +++ b/lib/mayaUsd/ufe/UsdTransform3d.cpp @@ -14,13 +14,13 @@ // limitations under the License. // -#include "UsdTransform3d.h" -#include "UsdTranslateUndoableCommand.h" -#include "UsdRotateUndoableCommand.h" -#include "UsdScaleUndoableCommand.h" -#include "UsdRotatePivotTranslateUndoableCommand.h" -#include "private/Utils.h" -#include "Utils.h" +#include +#include +#include +#include +#include +#include +#include #include diff --git a/lib/mayaUsd/ufe/UsdTransform3d.h b/lib/mayaUsd/ufe/UsdTransform3d.h index 82d1d27f3e..0a92ec318b 100644 --- a/lib/mayaUsd/ufe/UsdTransform3d.h +++ b/lib/mayaUsd/ufe/UsdTransform3d.h @@ -15,9 +15,9 @@ // #pragma once -#include "../base/api.h" +#include -#include "UsdSceneItem.h" +#include #include #include diff --git a/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp b/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp index a47957f456..ad97707517 100644 --- a/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp +++ b/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp @@ -14,8 +14,9 @@ // limitations under the License. // -#include "UsdTransform3dHandler.h" -#include "UsdSceneItem.h" +#include + +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdTransform3dHandler.h b/lib/mayaUsd/ufe/UsdTransform3dHandler.h index 2e56ab2d5a..5706a1e3de 100644 --- a/lib/mayaUsd/ufe/UsdTransform3dHandler.h +++ b/lib/mayaUsd/ufe/UsdTransform3dHandler.h @@ -15,9 +15,9 @@ // #pragma once -#include "../base/api.h" +#include -#include "UsdTransform3d.h" +#include #include diff --git a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp index 7ba15e63ce..dbcb027a69 100644 --- a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp @@ -14,9 +14,10 @@ // limitations under the License. // -#include "UsdTranslateUndoableCommand.h" -#include "private/Utils.h" -#include "Utils.h" +#include + +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h index eb31034cd5..131620d967 100644 --- a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h @@ -15,7 +15,7 @@ // #pragma once -#include "../base/api.h" +#include #include diff --git a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp index f942b8deb8..2cbf461f12 100644 --- a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp +++ b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp @@ -14,7 +14,7 @@ // limitations under the License. // -#include "UsdUndoCreateGroupCommand.h" +#include #include #include diff --git a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h index be48c5ec3e..a49003be2a 100644 --- a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h +++ b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h @@ -15,9 +15,9 @@ // #pragma once -#include "../base/api.h" +#include -#include "UsdSceneItem.h" +#include #include #include diff --git a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp index f8835070dc..2c2024f3d3 100644 --- a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp +++ b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp @@ -14,7 +14,7 @@ // limitations under the License. // -#include "UsdUndoDeleteCommand.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h index f964016dcc..5c27e5c491 100644 --- a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h +++ b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h @@ -15,9 +15,9 @@ // #pragma once -#include "../base/api.h" +#include -#include "UsdSceneItem.h" +#include #include diff --git a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp index 61382faee2..2e676efdd1 100644 --- a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp +++ b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp @@ -14,8 +14,9 @@ // limitations under the License. // -#include "UsdUndoDuplicateCommand.h" -#include "Utils.h" +#include + +#include #include #include diff --git a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h index 82780f5385..c0dcd51081 100644 --- a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h +++ b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h @@ -15,9 +15,8 @@ // #pragma once -#include "../base/api.h" - -#include "UsdSceneItem.h" +#include +#include #include #include diff --git a/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp b/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp index 679623fbdf..21efdf3419 100644 --- a/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp +++ b/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp @@ -14,9 +14,10 @@ // limitations under the License. // -#include "UsdUndoRenameCommand.h" -#include "Utils.h" -#include "private/InPathChange.h" +#include + +#include +#include #include #include diff --git a/lib/mayaUsd/ufe/UsdUndoRenameCommand.h b/lib/mayaUsd/ufe/UsdUndoRenameCommand.h index c22b2c28aa..09462ca125 100644 --- a/lib/mayaUsd/ufe/UsdUndoRenameCommand.h +++ b/lib/mayaUsd/ufe/UsdUndoRenameCommand.h @@ -15,9 +15,9 @@ // #pragma once -#include "../base/api.h" +#include -#include "UsdSceneItem.h" +#include #include #include diff --git a/lib/mayaUsd/ufe/Utils.cpp b/lib/mayaUsd/ufe/Utils.cpp index fe424ad2c6..e7831f9c9b 100644 --- a/lib/mayaUsd/ufe/Utils.cpp +++ b/lib/mayaUsd/ufe/Utils.cpp @@ -14,19 +14,11 @@ // limitations under the License. // -#include "Utils.h" -#include "private/Utils.h" -#include "UsdStageMap.h" -#include "ProxyShapeHandler.h" -#include "../nodes/proxyShapeBase.h" - -#include -#include - -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -35,6 +27,14 @@ #include #include +#include +#include +#include +#include + +#include +#include + PXR_NAMESPACE_USING_DIRECTIVE #ifndef MAYA_MSTRINGARRAY_ITERATOR_CATEGORY diff --git a/lib/mayaUsd/ufe/Utils.h b/lib/mayaUsd/ufe/Utils.h index 1785a58f00..c0ebdfd38c 100644 --- a/lib/mayaUsd/ufe/Utils.h +++ b/lib/mayaUsd/ufe/Utils.h @@ -15,20 +15,19 @@ // #pragma once -#include "../base/api.h" - -#include "UsdSceneItem.h" +#include +#include #include #include +#include + #include #include #include #include -#include - PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/private/InPathChange.h b/lib/mayaUsd/ufe/private/InPathChange.h index bd9e1d173f..81205d70a2 100644 --- a/lib/mayaUsd/ufe/private/InPathChange.h +++ b/lib/mayaUsd/ufe/private/InPathChange.h @@ -15,7 +15,7 @@ // #pragma once -#include "../../base/api.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/private/Utils.cpp b/lib/mayaUsd/ufe/private/Utils.cpp index f5fd8af502..b6b8c1a510 100644 --- a/lib/mayaUsd/ufe/private/Utils.cpp +++ b/lib/mayaUsd/ufe/private/Utils.cpp @@ -14,16 +14,16 @@ // limitations under the License. // -#include "Utils.h" +#include + +#include +#include #include #include #include -#include -#include - PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/private/Utils.h b/lib/mayaUsd/ufe/private/Utils.h index 7d6ce11506..b51aede730 100644 --- a/lib/mayaUsd/ufe/private/Utils.h +++ b/lib/mayaUsd/ufe/private/Utils.h @@ -15,7 +15,7 @@ // #pragma once -#include "../../base/api.h" +#include #include diff --git a/lib/mayaUsd/ufe/wrapUtils.cpp b/lib/mayaUsd/ufe/wrapUtils.cpp index a42bd88b5a..765a00d583 100644 --- a/lib/mayaUsd/ufe/wrapUtils.cpp +++ b/lib/mayaUsd/ufe/wrapUtils.cpp @@ -14,15 +14,15 @@ // limitations under the License. // -#include - -#include "UsdSceneItem.h" -#include "Utils.h" -#include "Global.h" +#include +#include +#include #include #include +#include + #include using namespace MayaUsd; diff --git a/lib/mayaUsd/utils/blockSceneModificationContext.cpp b/lib/mayaUsd/utils/blockSceneModificationContext.cpp index 7a070d3526..2bd5db21df 100644 --- a/lib/mayaUsd/utils/blockSceneModificationContext.cpp +++ b/lib/mayaUsd/utils/blockSceneModificationContext.cpp @@ -13,19 +13,17 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "pxr/pxr.h" -#include "blockSceneModificationContext.h" - -#include "pxr/base/tf/stringUtils.h" +#include #include #include #include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - UsdMayaBlockSceneModificationContext::UsdMayaBlockSceneModificationContext() { const MString fileModifiedCmd("file -query -modified"); diff --git a/lib/mayaUsd/utils/blockSceneModificationContext.h b/lib/mayaUsd/utils/blockSceneModificationContext.h index fe3428ae33..f47a5727dc 100644 --- a/lib/mayaUsd/utils/blockSceneModificationContext.h +++ b/lib/mayaUsd/utils/blockSceneModificationContext.h @@ -16,15 +16,12 @@ #ifndef PXRUSDMAYA_BLOCK_SCENE_MODIFICATION_CONTEXT_H #define PXRUSDMAYA_BLOCK_SCENE_MODIFICATION_CONTEXT_H -/// \file usdMaya/blockSceneModificationContext.h - -#include "pxr/pxr.h" -#include "../base/api.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// Utility class for wrapping a scope of Maya operations such that the /// modification status of the Maya scene is preserved. class UsdMayaBlockSceneModificationContext diff --git a/lib/mayaUsd/utils/colorSpace.cpp b/lib/mayaUsd/utils/colorSpace.cpp index 4d19f915a6..cad23a890a 100644 --- a/lib/mayaUsd/utils/colorSpace.cpp +++ b/lib/mayaUsd/utils/colorSpace.cpp @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "colorSpace.h" +#include -#include "pxr/base/tf/envSetting.h" +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/utils/colorSpace.h b/lib/mayaUsd/utils/colorSpace.h index eb3b6f9772..0406c6aca7 100644 --- a/lib/mayaUsd/utils/colorSpace.h +++ b/lib/mayaUsd/utils/colorSpace.h @@ -16,13 +16,10 @@ #ifndef PXRUSDMAYA_COLORSPACE_H #define PXRUSDMAYA_COLORSPACE_H -/// \file usdMaya/colorSpace.h +#include -#include "../base/api.h" - -#include "pxr/pxr.h" - -#include "pxr/base/gf/gamma.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/diagnosticDelegate.cpp b/lib/mayaUsd/utils/diagnosticDelegate.cpp index 19c9101347..471c3f68ae 100644 --- a/lib/mayaUsd/utils/diagnosticDelegate.cpp +++ b/lib/mayaUsd/utils/diagnosticDelegate.cpp @@ -13,17 +13,16 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "./diagnosticDelegate.h" +#include -#include "../base/debugCodes.h" - -#include "pxr/base/arch/threads.h" -#include "pxr/base/tf/envSetting.h" -#include "pxr/base/tf/stackTrace.h" +#include #include +#include -#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/diagnosticDelegate.h b/lib/mayaUsd/utils/diagnosticDelegate.h index 9f00a3a6cb..cbc6101d22 100644 --- a/lib/mayaUsd/utils/diagnosticDelegate.h +++ b/lib/mayaUsd/utils/diagnosticDelegate.h @@ -16,20 +16,16 @@ #ifndef PXRUSDMAYA_DIAGNOSTICDELEGATE_H #define PXRUSDMAYA_DIAGNOSTICDELEGATE_H -/// \file usdMaya/diagnosticDelegate.h +#include -#include "../base/api.h" - -#include "pxr/pxr.h" - -#include "pxr/base/tf/diagnosticMgr.h" - -#include "pxr/usd/usdUtils/coalescingDiagnosticDelegate.h" +#include +#include #include -#include -#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/query.cpp b/lib/mayaUsd/utils/query.cpp index 2afefa934e..6e91c6f1f9 100644 --- a/lib/mayaUsd/utils/query.cpp +++ b/lib/mayaUsd/utils/query.cpp @@ -13,17 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "query.h" +#include -#include "../nodes/usdPrimProvider.h" -#include "util.h" +#include +#include -#include "pxr/base/arch/systemInfo.h" - -#include "pxr/usd/ar/resolver.h" -#include "pxr/usd/ar/resolverContext.h" -#include "pxr/usd/ar/resolverContextBinder.h" -#include "pxr/usd/usd/prim.h" +#include #include #include @@ -31,12 +26,14 @@ #include #include -#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - - UsdPrim UsdMayaQuery::GetPrim(const std::string& shapeName) { diff --git a/lib/mayaUsd/utils/query.h b/lib/mayaUsd/utils/query.h index 6916cf65a0..253c8f7dc9 100644 --- a/lib/mayaUsd/utils/query.h +++ b/lib/mayaUsd/utils/query.h @@ -16,20 +16,16 @@ #ifndef PXRUSDMAYA_QUERY_H #define PXRUSDMAYA_QUERY_H -/// \file usdMaya/query.h - -#include "../base/api.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usd/prim.h" +#include #include #include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +#include +PXR_NAMESPACE_OPEN_SCOPE struct UsdMayaQuery { diff --git a/lib/mayaUsd/utils/stageCache.cpp b/lib/mayaUsd/utils/stageCache.cpp index f0b13c07b6..a7aa3796ae 100644 --- a/lib/mayaUsd/utils/stageCache.cpp +++ b/lib/mayaUsd/utils/stageCache.cpp @@ -13,19 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "stageCache.h" - -#include "../listeners/notice.h" - -#include "pxr/usd/sdf/attributeSpec.h" -#include "pxr/usd/sdf/layer.h" -#include "pxr/usd/sdf/primSpec.h" -#include "pxr/usd/sdf/relationshipSpec.h" -#include "pxr/usd/usd/stageCache.h" -#include "pxr/usd/usdGeom/tokens.h" - -#include -#include +#include +#include #include #include @@ -33,9 +22,17 @@ #include #include +#include +#include -PXR_NAMESPACE_OPEN_SCOPE +#include +#include +#include +#include +#include +#include +PXR_NAMESPACE_OPEN_SCOPE namespace { diff --git a/lib/mayaUsd/utils/stageCache.h b/lib/mayaUsd/utils/stageCache.h index 61d59141d6..099ee0f882 100644 --- a/lib/mayaUsd/utils/stageCache.h +++ b/lib/mayaUsd/utils/stageCache.h @@ -16,21 +16,16 @@ #ifndef PXRUSDMAYA_STAGECACHE_H #define PXRUSDMAYA_STAGECACHE_H -/// \file usdMaya/stageCache.h - -#include "../base/api.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/stageCache.h" +#include #include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - class UsdMayaStageCache { public: diff --git a/lib/mayaUsd/utils/undoHelperCommand.cpp b/lib/mayaUsd/utils/undoHelperCommand.cpp index 23ba81f6bf..7374f52d60 100644 --- a/lib/mayaUsd/utils/undoHelperCommand.cpp +++ b/lib/mayaUsd/utils/undoHelperCommand.cpp @@ -13,12 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "undoHelperCommand.h" - -#include "pxr/base/tf/errorMark.h" +#include #include +#include + // This is added to prevent multiple definitions of the MApiVersion string. #define MNoVersionString #include diff --git a/lib/mayaUsd/utils/undoHelperCommand.h b/lib/mayaUsd/utils/undoHelperCommand.h index 0aeaaa1ba2..103944ec95 100644 --- a/lib/mayaUsd/utils/undoHelperCommand.h +++ b/lib/mayaUsd/utils/undoHelperCommand.h @@ -16,19 +16,17 @@ #ifndef PXRUSDMAYA_UNDO_HELPER_CMD_H #define PXRUSDMAYA_UNDO_HELPER_CMD_H -/// \file usdMaya/undoHelperCommand.h - -#include "pxr/pxr.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/value.h" - -#include "../base/api.h" +#include #include +#include // For MFnPlugin #include #include #include -#include // For MFnPlugin + +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/util.cpp b/lib/mayaUsd/utils/util.cpp index 17094ce285..02e32cd838 100644 --- a/lib/mayaUsd/utils/util.cpp +++ b/lib/mayaUsd/utils/util.cpp @@ -14,25 +14,15 @@ // limitations under the License. // -#include "util.h" - -#include "colorSpace.h" - -#include "pxr/base/gf/gamma.h" -#include "pxr/base/gf/vec2f.h" -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/tf/hashmap.h" -#include "pxr/base/tf/staticTokens.h" -#include "pxr/base/tf/stringUtils.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/array.h" -#include "pxr/base/vt/types.h" -#include "pxr/base/vt/value.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/sdf/tokens.h" -#include "pxr/usd/usdGeom/mesh.h" -#include "pxr/usd/usdGeom/metrics.h" +#include +#include + +#include +#include +#include +#include + +#include #include #include @@ -40,8 +30,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -67,13 +57,21 @@ #include #include -#include - -#include -#include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/utils/util.h b/lib/mayaUsd/utils/util.h index 13537167c2..44c613acc4 100644 --- a/lib/mayaUsd/utils/util.h +++ b/lib/mayaUsd/utils/util.h @@ -16,23 +16,14 @@ #ifndef PXRUSDMAYA_UTIL_H #define PXRUSDMAYA_UTIL_H -/// \file usdMaya/util.h - -#include "pxr/pxr.h" -#include "../base/api.h" - -#include "pxr/base/gf/vec2f.h" -#include "pxr/base/gf/vec3f.h" -#include "pxr/base/gf/vec4f.h" -#include "pxr/base/tf/declarePtrs.h" -#include "pxr/base/tf/refPtr.h" -#include "pxr/base/tf/token.h" -#include "pxr/base/vt/dictionary.h" -#include "pxr/base/vt/types.h" -#include "pxr/base/vt/value.h" -#include "pxr/usd/sdf/path.h" -#include "pxr/usd/usd/attribute.h" -#include "pxr/usd/usd/timeCode.h" +#include + +#include +#include +#include +#include +#include +#include #include #include @@ -50,17 +41,22 @@ #include #include -#include -#include -#include -#include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE - /// General utilities for working with the Maya API. namespace UsdMayaUtil { diff --git a/lib/mayaUsd/utils/utilFileSystem.cpp b/lib/mayaUsd/utils/utilFileSystem.cpp index 57be2519c6..12ec7dca01 100644 --- a/lib/mayaUsd/utils/utilFileSystem.cpp +++ b/lib/mayaUsd/utils/utilFileSystem.cpp @@ -1,12 +1,27 @@ - -#include "utilFileSystem.h" -#include "../base/debugCodes.h" +// +// Copyright 2019 Autodesk +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include + +#include #include #include #include -#include "pxr/usd/ar/resolver.h" +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/utils/utilFileSystem.h b/lib/mayaUsd/utils/utilFileSystem.h index 9241c1c224..afd1ab8451 100644 --- a/lib/mayaUsd/utils/utilFileSystem.h +++ b/lib/mayaUsd/utils/utilFileSystem.h @@ -1,12 +1,28 @@ -#include "pxr/pxr.h" +// +// Copyright 2019 Autodesk +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include -#include "../base/api.h" - -#include #include #include +#include + +#include + PXR_NAMESPACE_OPEN_SCOPE namespace UsdMayaUtilFileSystem From 210a2ab080ed005dc9ca4fdb158f092a47ba9bfe Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Sat, 28 Mar 2020 08:46:36 -0400 Subject: [PATCH 2/6] feedback: Fix header inclusion. --- lib/mayaUsd/ufe/StagesSubject.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/mayaUsd/ufe/StagesSubject.cpp b/lib/mayaUsd/ufe/StagesSubject.cpp index 26e5a49221..6f005e199a 100644 --- a/lib/mayaUsd/ufe/StagesSubject.cpp +++ b/lib/mayaUsd/ufe/StagesSubject.cpp @@ -34,13 +34,11 @@ #if UFE_PREVIEW_VERSION_NUM >= 2010 #include #endif +#include #endif #include -#ifdef UFE_V2_FEATURES_AVAILABLE -#include - #include #include From c05eb7fa96931c4e4077e9bf97312c17ee7a4823 Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Sat, 28 Mar 2020 09:41:12 -0400 Subject: [PATCH 3/6] put back the missing #ifdef. --- lib/mayaUsd/ufe/StagesSubject.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/mayaUsd/ufe/StagesSubject.cpp b/lib/mayaUsd/ufe/StagesSubject.cpp index 6f005e199a..5d722dd65f 100644 --- a/lib/mayaUsd/ufe/StagesSubject.cpp +++ b/lib/mayaUsd/ufe/StagesSubject.cpp @@ -45,6 +45,7 @@ #include #include +#ifdef UFE_V2_FEATURES_AVAILABLE namespace { // The attribute change notification guard is not meant to be nested, but From fb592d112c5e34488455db19515520501eaf16ca Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Sat, 28 Mar 2020 18:07:51 -0400 Subject: [PATCH 4/6] Private project's header files should be #include'd using the file name when in the same folder. Private headers may live in sub-directories, but they should never be included using "." or ".." as part of a relative paths. For example: #include "privateUtils.h" #include "pvt/helperFunctions.h" --- lib/mayaUsd/ufe/Global.cpp | 3 ++- lib/mayaUsd/ufe/StagesSubject.cpp | 3 ++- lib/mayaUsd/ufe/UsdHierarchy.cpp | 5 +++-- .../UsdRotatePivotTranslateUndoableCommand.cpp | 2 +- lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp | 2 +- lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp | 3 ++- lib/mayaUsd/ufe/UsdTransform3d.cpp | 4 +++- lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp | 3 ++- lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp | 3 ++- lib/mayaUsd/ufe/Utils.cpp | 4 +++- lib/mayaUsd/ufe/private/CMakeLists.txt | 16 ---------------- lib/mayaUsd/ufe/private/Utils.cpp | 2 +- 12 files changed, 22 insertions(+), 28 deletions(-) diff --git a/lib/mayaUsd/ufe/Global.cpp b/lib/mayaUsd/ufe/Global.cpp index 0d06f8e694..8e22a73416 100644 --- a/lib/mayaUsd/ufe/Global.cpp +++ b/lib/mayaUsd/ufe/Global.cpp @@ -16,7 +16,8 @@ #include -#include +#include "private/InPathChange.h" + #include #include #include diff --git a/lib/mayaUsd/ufe/StagesSubject.cpp b/lib/mayaUsd/ufe/StagesSubject.cpp index 5d722dd65f..f34c6c8a41 100644 --- a/lib/mayaUsd/ufe/StagesSubject.cpp +++ b/lib/mayaUsd/ufe/StagesSubject.cpp @@ -16,7 +16,8 @@ #include -#include +#include "private/InPathChange.h" + #include #include #include diff --git a/lib/mayaUsd/ufe/UsdHierarchy.cpp b/lib/mayaUsd/ufe/UsdHierarchy.cpp index 99ff8e186e..c51520e1bb 100644 --- a/lib/mayaUsd/ufe/UsdHierarchy.cpp +++ b/lib/mayaUsd/ufe/UsdHierarchy.cpp @@ -19,8 +19,9 @@ #include #include -#include -#include +#include "private/InPathChange.h" +#include "private/Utils.h" + #include #include diff --git a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp index c848e2662d..ce0176b280 100644 --- a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp @@ -15,7 +15,7 @@ // #include -#include +#include "private/Utils.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp index 3f81e31f3a..4e1b5106bc 100644 --- a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp @@ -16,7 +16,7 @@ #include -#include +#include "private/Utils.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp index d5fffe5b48..acb11be343 100644 --- a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp @@ -16,7 +16,8 @@ #include -#include +#include "private/Utils.h" + #include MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdTransform3d.cpp b/lib/mayaUsd/ufe/UsdTransform3d.cpp index 67d22a49fd..26a0aa6a6c 100644 --- a/lib/mayaUsd/ufe/UsdTransform3d.cpp +++ b/lib/mayaUsd/ufe/UsdTransform3d.cpp @@ -15,7 +15,9 @@ // #include -#include + +#include "private/Utils.h" + #include #include #include diff --git a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp index dbcb027a69..903542fddf 100644 --- a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp @@ -16,7 +16,8 @@ #include -#include +#include "private/Utils.h" + #include MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp b/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp index 21efdf3419..fea51dffd1 100644 --- a/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp +++ b/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp @@ -16,7 +16,8 @@ #include -#include +#include "private/InPathChange.h" + #include #include diff --git a/lib/mayaUsd/ufe/Utils.cpp b/lib/mayaUsd/ufe/Utils.cpp index e7831f9c9b..f5cedca78a 100644 --- a/lib/mayaUsd/ufe/Utils.cpp +++ b/lib/mayaUsd/ufe/Utils.cpp @@ -15,8 +15,10 @@ // #include + +#include "private/Utils.h" + #include -#include #include #include diff --git a/lib/mayaUsd/ufe/private/CMakeLists.txt b/lib/mayaUsd/ufe/private/CMakeLists.txt index 469081491e..e8059b5897 100644 --- a/lib/mayaUsd/ufe/private/CMakeLists.txt +++ b/lib/mayaUsd/ufe/private/CMakeLists.txt @@ -6,19 +6,3 @@ target_sources(${PROJECT_NAME} Utils.cpp ) -set(headers - Utils.h - InPathChange.h -) - -# ----------------------------------------------------------------------------- -# promoted headers -# ----------------------------------------------------------------------------- -mayaUsd_promoteHeaderList(HEADERS ${headers} SUBDIR ufe/private) - -# ----------------------------------------------------------------------------- -# install -# ----------------------------------------------------------------------------- -install(FILES ${headers} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}/ufe/private -) \ No newline at end of file diff --git a/lib/mayaUsd/ufe/private/Utils.cpp b/lib/mayaUsd/ufe/private/Utils.cpp index b6b8c1a510..0ca9efcbe8 100644 --- a/lib/mayaUsd/ufe/private/Utils.cpp +++ b/lib/mayaUsd/ufe/private/Utils.cpp @@ -14,7 +14,7 @@ // limitations under the License. // -#include +#include "Utils.h" #include #include From 886119f576405e96acf84eb27b6419fc9fd993d4 Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Wed, 1 Apr 2020 17:00:18 -0400 Subject: [PATCH 5/6] UPDATE: include directives and orders under lib/mayaUsd according to code guideline. --- lib/mayaUsd/base/api.h | 1 - lib/mayaUsd/base/debugCodes.cpp | 4 +-- lib/mayaUsd/base/debugCodes.h | 2 -- lib/mayaUsd/fileio/chaser/chaser.cpp | 2 +- lib/mayaUsd/fileio/chaser/chaser.h | 7 ++-- lib/mayaUsd/fileio/chaser/chaserRegistry.cpp | 9 +++-- lib/mayaUsd/fileio/chaser/chaserRegistry.h | 13 +++---- lib/mayaUsd/fileio/fallbackPrimReader.cpp | 5 +-- lib/mayaUsd/fileio/fallbackPrimReader.h | 4 +-- lib/mayaUsd/fileio/functorPrimReader.cpp | 2 +- lib/mayaUsd/fileio/functorPrimReader.h | 12 +++---- lib/mayaUsd/fileio/functorPrimWriter.cpp | 15 ++++---- lib/mayaUsd/fileio/functorPrimWriter.h | 10 +++--- lib/mayaUsd/fileio/importData.cpp | 4 +-- lib/mayaUsd/fileio/importData.h | 4 +-- lib/mayaUsd/fileio/instancedNodeWriter.cpp | 10 +++--- lib/mayaUsd/fileio/instancedNodeWriter.h | 8 ++--- lib/mayaUsd/fileio/jobs/jobArgs.cpp | 9 +++-- lib/mayaUsd/fileio/jobs/jobArgs.h | 16 ++++----- .../fileio/jobs/modelKindProcessor.cpp | 2 +- lib/mayaUsd/fileio/jobs/modelKindProcessor.h | 7 ++-- lib/mayaUsd/fileio/jobs/readJob.cpp | 16 ++++----- lib/mayaUsd/fileio/jobs/readJob.h | 8 ++--- lib/mayaUsd/fileio/jobs/writeJob.cpp | 25 +++++++------ lib/mayaUsd/fileio/jobs/writeJob.h | 11 +++--- lib/mayaUsd/fileio/primReader.cpp | 2 +- lib/mayaUsd/fileio/primReader.h | 8 ++--- lib/mayaUsd/fileio/primReaderArgs.cpp | 2 +- lib/mayaUsd/fileio/primReaderArgs.h | 6 ++-- lib/mayaUsd/fileio/primReaderContext.cpp | 2 +- lib/mayaUsd/fileio/primReaderContext.h | 4 +-- lib/mayaUsd/fileio/primReaderRegistry.cpp | 12 +++---- lib/mayaUsd/fileio/primReaderRegistry.h | 10 +++--- lib/mayaUsd/fileio/primUpdater.cpp | 2 +- lib/mayaUsd/fileio/primUpdater.h | 8 ++--- lib/mayaUsd/fileio/primUpdaterContext.cpp | 2 +- lib/mayaUsd/fileio/primUpdaterContext.h | 5 ++- lib/mayaUsd/fileio/primUpdaterRegistry.cpp | 7 ++-- lib/mayaUsd/fileio/primUpdaterRegistry.h | 8 ++--- lib/mayaUsd/fileio/primWriter.cpp | 16 ++++----- lib/mayaUsd/fileio/primWriter.h | 9 +++-- lib/mayaUsd/fileio/primWriterArgs.cpp | 5 +-- lib/mayaUsd/fileio/primWriterArgs.h | 4 +-- lib/mayaUsd/fileio/primWriterContext.cpp | 2 +- lib/mayaUsd/fileio/primWriterContext.h | 4 +-- lib/mayaUsd/fileio/primWriterRegistry.cpp | 9 ++--- lib/mayaUsd/fileio/primWriterRegistry.h | 9 +++-- lib/mayaUsd/fileio/registryHelper.cpp | 5 +-- lib/mayaUsd/fileio/registryHelper.h | 6 ++-- lib/mayaUsd/fileio/shaderWriter.cpp | 5 +-- lib/mayaUsd/fileio/shaderWriter.h | 10 +++--- .../shading/shadingModeDisplayColor.cpp | 13 ++++--- .../fileio/shading/shadingModeExporter.cpp | 12 +++---- .../fileio/shading/shadingModeExporter.h | 10 +++--- .../shading/shadingModeExporterContext.cpp | 10 +++--- .../shading/shadingModeExporterContext.h | 10 +++--- .../fileio/shading/shadingModeImporter.cpp | 2 +- .../fileio/shading/shadingModeImporter.h | 7 ++-- .../fileio/shading/shadingModePxrRis.cpp | 28 +++++++-------- .../shading/shadingModePxrRis_rfm_map.h | 3 +- .../fileio/shading/shadingModeRegistry.cpp | 12 +++---- .../fileio/shading/shadingModeRegistry.h | 11 +++--- .../fileio/shading/shadingModeUseRegistry.cpp | 17 +++++---- lib/mayaUsd/fileio/transformWriter.cpp | 13 +++---- lib/mayaUsd/fileio/transformWriter.h | 10 +++--- .../translators/skelBindingsProcessor.cpp | 5 +-- .../translators/skelBindingsProcessor.h | 6 ++-- .../fileio/translators/translatorCamera.cpp | 14 ++++---- .../fileio/translators/translatorCamera.h | 9 +++-- .../fileio/translators/translatorCurves.cpp | 5 +-- .../fileio/translators/translatorCurves.h | 9 +++-- .../fileio/translators/translatorGprim.cpp | 4 +-- .../fileio/translators/translatorGprim.h | 9 +++-- .../fileio/translators/translatorMaterial.cpp | 16 ++++----- .../fileio/translators/translatorMaterial.h | 10 +++--- .../translators/translatorMayaReference.cpp | 9 +++-- .../translators/translatorMayaReference.h | 9 +++-- .../fileio/translators/translatorMesh.cpp | 13 +++---- .../fileio/translators/translatorMesh.h | 2 +- .../translators/translatorNurbsPatch.cpp | 13 +++---- .../fileio/translators/translatorNurbsPatch.h | 9 +++-- .../fileio/translators/translatorPrim.cpp | 10 +++--- .../fileio/translators/translatorPrim.h | 9 +++-- .../fileio/translators/translatorRfMLight.cpp | 23 ++++++------ .../fileio/translators/translatorRfMLight.h | 11 +++--- .../fileio/translators/translatorSkel.cpp | 11 +++--- .../fileio/translators/translatorSkel.h | 6 ++-- .../fileio/translators/translatorUtil.cpp | 16 ++++----- .../fileio/translators/translatorUtil.h | 6 ++-- .../translators/translatorXformable.cpp | 11 +++--- .../fileio/translators/translatorXformable.h | 8 ++--- .../translatorXformable_decompose.cpp | 4 +-- lib/mayaUsd/fileio/utils/adaptor.cpp | 14 ++++---- lib/mayaUsd/fileio/utils/adaptor.h | 4 +-- lib/mayaUsd/fileio/utils/meshUtil.cpp | 13 +++---- lib/mayaUsd/fileio/utils/meshUtil.h | 5 ++- lib/mayaUsd/fileio/utils/readUtil.cpp | 9 ++--- lib/mayaUsd/fileio/utils/readUtil.h | 5 ++- lib/mayaUsd/fileio/utils/roundTripUtil.cpp | 2 +- lib/mayaUsd/fileio/utils/roundTripUtil.h | 4 +-- lib/mayaUsd/fileio/utils/shadingUtil.cpp | 2 +- lib/mayaUsd/fileio/utils/shadingUtil.h | 4 +-- .../fileio/utils/userTaggedAttribute.cpp | 5 +-- .../fileio/utils/userTaggedAttribute.h | 4 +-- lib/mayaUsd/fileio/utils/writeUtil.cpp | 11 +++--- lib/mayaUsd/fileio/utils/writeUtil.h | 6 ++-- lib/mayaUsd/fileio/utils/xformStack.cpp | 2 +- lib/mayaUsd/fileio/utils/xformStack.h | 7 ++-- lib/mayaUsd/fileio/writeJobContext.cpp | 19 +++++----- lib/mayaUsd/fileio/writeJobContext.h | 11 +++--- lib/mayaUsd/listeners/notice.cpp | 4 +-- lib/mayaUsd/listeners/notice.h | 4 +-- lib/mayaUsd/listeners/proxyShapeNotice.cpp | 2 +- lib/mayaUsd/listeners/proxyShapeNotice.h | 4 +-- lib/mayaUsd/listeners/stageNoticeListener.cpp | 2 +- lib/mayaUsd/listeners/stageNoticeListener.h | 4 +-- lib/mayaUsd/nodes/hdImagingShape.cpp | 11 +++--- lib/mayaUsd/nodes/hdImagingShape.h | 6 ++-- lib/mayaUsd/nodes/pointBasedDeformerNode.cpp | 36 +++++++++---------- lib/mayaUsd/nodes/pointBasedDeformerNode.h | 4 +-- lib/mayaUsd/nodes/proxyShapeBase.cpp | 15 ++++---- lib/mayaUsd/nodes/proxyShapeBase.h | 9 ++--- lib/mayaUsd/nodes/proxyShapePlugin.cpp | 9 ++--- lib/mayaUsd/nodes/proxyShapePlugin.h | 4 +-- lib/mayaUsd/nodes/stageData.cpp | 2 +- lib/mayaUsd/nodes/stageData.h | 4 +-- lib/mayaUsd/nodes/stageNode.cpp | 7 ++-- lib/mayaUsd/nodes/stageNode.h | 4 +-- lib/mayaUsd/nodes/usdPrimProvider.cpp | 2 +- lib/mayaUsd/nodes/usdPrimProvider.h | 4 +-- lib/mayaUsd/python/moduleDeps.cpp | 1 - lib/mayaUsd/python/wrapAdaptor.cpp | 8 ++--- .../wrapBlockSceneModificationContext.cpp | 4 +-- lib/mayaUsd/python/wrapColorSpace.cpp | 4 +-- lib/mayaUsd/python/wrapDiagnosticDelegate.cpp | 5 ++- lib/mayaUsd/python/wrapMeshUtil.cpp | 7 ++-- lib/mayaUsd/python/wrapQuery.cpp | 4 +-- lib/mayaUsd/python/wrapReadUtil.cpp | 7 ++-- lib/mayaUsd/python/wrapRoundTripUtil.cpp | 4 +-- lib/mayaUsd/python/wrapStageCache.cpp | 4 +-- .../python/wrapUserTaggedAttribute.cpp | 6 ++-- lib/mayaUsd/python/wrapWriteUtil.cpp | 7 ++-- lib/mayaUsd/python/wrapXformStack.cpp | 16 ++++----- .../mayaToHydra/defaultLightDelegate.cpp | 6 ++-- .../render/mayaToHydra/defaultLightDelegate.h | 5 ++- lib/mayaUsd/render/mayaToHydra/plugin.cpp | 13 +++---- .../render/mayaToHydra/pluginDebugCodes.cpp | 2 +- .../render/mayaToHydra/renderGlobals.cpp | 5 +-- .../render/mayaToHydra/renderGlobals.h | 10 +++--- .../render/mayaToHydra/renderOverride.cpp | 24 ++++++------- .../render/mayaToHydra/renderOverride.h | 14 ++++---- .../mayaToHydra/shadingModeExporter.cpp | 10 +++--- lib/mayaUsd/render/mayaToHydra/tokens.cpp | 2 +- lib/mayaUsd/render/mayaToHydra/utils.cpp | 5 +-- .../render/mayaToHydra/viewCommand.cpp | 16 ++++----- lib/mayaUsd/render/px_vp20/glslProgram.cpp | 2 +- lib/mayaUsd/render/px_vp20/glslProgram.h | 5 ++- lib/mayaUsd/render/px_vp20/utils.cpp | 8 +++-- lib/mayaUsd/render/px_vp20/utils.h | 2 +- lib/mayaUsd/render/px_vp20/utils_legacy.cpp | 2 +- lib/mayaUsd/render/px_vp20/utils_legacy.h | 4 +-- .../render/pxrUsdMayaGL/batchRenderer.cpp | 17 +++++---- .../render/pxrUsdMayaGL/batchRenderer.h | 30 ++++++++-------- .../render/pxrUsdMayaGL/debugCodes.cpp | 2 +- .../hdImagingShapeDrawOverride.cpp | 16 ++++----- .../pxrUsdMayaGL/hdImagingShapeDrawOverride.h | 5 ++- .../render/pxrUsdMayaGL/hdImagingShapeUI.cpp | 15 ++++---- .../render/pxrUsdMayaGL/hdImagingShapeUI.h | 16 ++++----- .../render/pxrUsdMayaGL/hdRenderer.cpp | 8 ++--- lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h | 4 +-- .../render/pxrUsdMayaGL/instancerImager.cpp | 9 ++--- .../render/pxrUsdMayaGL/instancerImager.h | 11 +++--- .../pxrUsdMayaGL/instancerShapeAdapter.cpp | 18 +++++----- .../pxrUsdMayaGL/instancerShapeAdapter.h | 8 ++--- .../render/pxrUsdMayaGL/proxyDrawOverride.cpp | 14 ++++---- .../render/pxrUsdMayaGL/proxyDrawOverride.h | 5 +-- .../pxrUsdMayaGL/proxyShapeDelegate.cpp | 9 +++-- .../render/pxrUsdMayaGL/proxyShapeUI.cpp | 13 +++---- .../render/pxrUsdMayaGL/proxyShapeUI.h | 7 ++-- .../render/pxrUsdMayaGL/renderParams.h | 4 +-- .../render/pxrUsdMayaGL/sceneDelegate.cpp | 21 +++++------ .../render/pxrUsdMayaGL/sceneDelegate.h | 6 ++-- .../render/pxrUsdMayaGL/shapeAdapter.cpp | 18 +++++----- .../render/pxrUsdMayaGL/shapeAdapter.h | 8 ++--- .../render/pxrUsdMayaGL/softSelectHelper.cpp | 8 ++--- .../render/pxrUsdMayaGL/softSelectHelper.h | 4 +-- .../pxrUsdMayaGL/usdProxyShapeAdapter.cpp | 15 ++++---- .../pxrUsdMayaGL/usdProxyShapeAdapter.h | 7 ++-- lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp | 2 +- lib/mayaUsd/render/pxrUsdMayaGL/userData.h | 2 +- .../render/vp2RenderDelegate/CMakeLists.txt | 15 -------- .../render/vp2RenderDelegate/basisCurves.cpp | 20 +++++------ .../render/vp2RenderDelegate/basisCurves.h | 5 ++- .../render/vp2RenderDelegate/bboxGeom.cpp | 3 +- .../render/vp2RenderDelegate/bboxGeom.h | 1 - .../render/vp2RenderDelegate/debugCodes.cpp | 2 +- .../render/vp2RenderDelegate/debugCodes.h | 1 - .../render/vp2RenderDelegate/draw_item.cpp | 6 ++-- .../render/vp2RenderDelegate/draw_item.h | 12 +++---- .../render/vp2RenderDelegate/instancer.cpp | 5 +-- .../render/vp2RenderDelegate/material.cpp | 26 +++++++------- .../render/vp2RenderDelegate/material.h | 1 - lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp | 23 ++++++------ lib/mayaUsd/render/vp2RenderDelegate/mesh.h | 5 ++- .../vp2RenderDelegate/proxyRenderDelegate.cpp | 14 ++++---- .../vp2RenderDelegate/proxyRenderDelegate.h | 5 ++- .../vp2RenderDelegate/render_delegate.cpp | 16 +++++---- .../vp2RenderDelegate/render_delegate.h | 7 ++-- .../render/vp2RenderDelegate/render_param.cpp | 3 +- .../render/vp2RenderDelegate/render_param.h | 1 - .../render/vp2RenderDelegate/render_pass.h | 1 - .../vp2RenderDelegate/resource_registry.h | 5 ++- .../render/vp2RenderDelegate/sampler.cpp | 2 +- .../render/vp2RenderDelegate/task_commit.h | 1 - .../render/vp2RenderDelegate/tokens.cpp | 3 +- lib/mayaUsd/render/vp2RenderDelegate/tokens.h | 1 - .../vp2ShaderFragments/shaderFragments.cpp | 12 +++---- .../vp2ShaderFragments/shaderFragments.h | 1 - lib/mayaUsd/ufe/Global.cpp | 30 ++++++++-------- lib/mayaUsd/ufe/Global.h | 4 +-- lib/mayaUsd/ufe/ProxyShapeHandler.cpp | 7 ++-- lib/mayaUsd/ufe/ProxyShapeHandler.h | 4 +-- lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp | 8 ++--- lib/mayaUsd/ufe/ProxyShapeHierarchy.h | 8 ++--- .../ufe/ProxyShapeHierarchyHandler.cpp | 6 ++-- lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h | 2 +- lib/mayaUsd/ufe/StagesSubject.cpp | 14 ++++---- lib/mayaUsd/ufe/StagesSubject.h | 6 ++-- lib/mayaUsd/ufe/UsdAttribute.cpp | 10 +++--- lib/mayaUsd/ufe/UsdAttribute.h | 4 +-- lib/mayaUsd/ufe/UsdAttributes.cpp | 5 ++- lib/mayaUsd/ufe/UsdAttributes.h | 9 ++--- lib/mayaUsd/ufe/UsdAttributesHandler.cpp | 5 ++- lib/mayaUsd/ufe/UsdAttributesHandler.h | 7 ++-- lib/mayaUsd/ufe/UsdContextOps.cpp | 6 ++-- lib/mayaUsd/ufe/UsdContextOps.h | 7 ++-- lib/mayaUsd/ufe/UsdContextOpsHandler.cpp | 3 +- lib/mayaUsd/ufe/UsdContextOpsHandler.h | 6 ++-- lib/mayaUsd/ufe/UsdHierarchy.cpp | 14 ++++---- lib/mayaUsd/ufe/UsdHierarchy.h | 8 ++--- lib/mayaUsd/ufe/UsdHierarchyHandler.cpp | 6 ++-- lib/mayaUsd/ufe/UsdHierarchyHandler.h | 8 ++--- lib/mayaUsd/ufe/UsdObject3d.cpp | 26 +++++++++----- lib/mayaUsd/ufe/UsdObject3d.h | 7 ++-- lib/mayaUsd/ufe/UsdObject3dHandler.cpp | 6 ++-- lib/mayaUsd/ufe/UsdObject3dHandler.h | 6 ++-- lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp | 2 +- lib/mayaUsd/ufe/UsdRootChildHierarchy.h | 4 +-- ...UsdRotatePivotTranslateUndoableCommand.cpp | 2 +- .../UsdRotatePivotTranslateUndoableCommand.h | 4 +-- lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp | 3 +- lib/mayaUsd/ufe/UsdRotateUndoableCommand.h | 6 ++-- lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp | 5 ++- lib/mayaUsd/ufe/UsdScaleUndoableCommand.h | 4 +-- lib/mayaUsd/ufe/UsdSceneItem.cpp | 3 +- lib/mayaUsd/ufe/UsdSceneItem.h | 4 +-- lib/mayaUsd/ufe/UsdSceneItemOps.cpp | 11 +++--- lib/mayaUsd/ufe/UsdSceneItemOps.h | 8 ++--- lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp | 3 +- lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h | 6 ++-- lib/mayaUsd/ufe/UsdStageMap.cpp | 6 ++-- lib/mayaUsd/ufe/UsdStageMap.h | 2 +- lib/mayaUsd/ufe/UsdTransform3d.cpp | 16 ++++----- lib/mayaUsd/ufe/UsdTransform3d.h | 8 ++--- lib/mayaUsd/ufe/UsdTransform3dHandler.cpp | 5 ++- lib/mayaUsd/ufe/UsdTransform3dHandler.h | 6 ++-- .../ufe/UsdTranslateUndoableCommand.cpp | 5 ++- lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h | 4 +-- lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp | 5 ++- lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h | 8 ++--- lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp | 3 +- lib/mayaUsd/ufe/UsdUndoDeleteCommand.h | 6 ++-- lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp | 7 ++-- lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h | 7 ++-- lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp | 11 +++--- lib/mayaUsd/ufe/UsdUndoRenameCommand.h | 8 ++--- lib/mayaUsd/ufe/Utils.cpp | 21 ++++++----- lib/mayaUsd/ufe/Utils.h | 7 ++-- lib/mayaUsd/ufe/private/InPathChange.h | 2 +- lib/mayaUsd/ufe/private/Utils.cpp | 3 +- lib/mayaUsd/ufe/private/Utils.h | 4 +-- lib/mayaUsd/ufe/wrapUtils.cpp | 11 +++--- .../utils/blockSceneModificationContext.cpp | 2 +- .../utils/blockSceneModificationContext.h | 4 +-- lib/mayaUsd/utils/colorSpace.cpp | 2 +- lib/mayaUsd/utils/colorSpace.h | 4 +-- lib/mayaUsd/utils/diagnosticDelegate.cpp | 5 +-- lib/mayaUsd/utils/diagnosticDelegate.h | 4 +-- lib/mayaUsd/utils/query.cpp | 8 ++--- lib/mayaUsd/utils/query.h | 4 +-- lib/mayaUsd/utils/stageCache.cpp | 5 +-- lib/mayaUsd/utils/stageCache.h | 4 +-- lib/mayaUsd/utils/undoHelperCommand.cpp | 6 ++-- lib/mayaUsd/utils/undoHelperCommand.h | 6 ++-- lib/mayaUsd/utils/util.cpp | 6 ++-- lib/mayaUsd/utils/util.h | 4 +-- lib/mayaUsd/utils/utilFileSystem.cpp | 6 ++-- lib/mayaUsd/utils/utilFileSystem.h | 4 +-- 298 files changed, 1117 insertions(+), 1167 deletions(-) diff --git a/lib/mayaUsd/base/api.h b/lib/mayaUsd/base/api.h index c428da35c8..43a3dc65ab 100644 --- a/lib/mayaUsd/base/api.h +++ b/lib/mayaUsd/base/api.h @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #include #if defined _WIN32 || defined __CYGWIN__ diff --git a/lib/mayaUsd/base/debugCodes.cpp b/lib/mayaUsd/base/debugCodes.cpp index d564895fba..de64cba321 100644 --- a/lib/mayaUsd/base/debugCodes.cpp +++ b/lib/mayaUsd/base/debugCodes.cpp @@ -13,13 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "debugCodes.h" #include PXR_NAMESPACE_OPEN_SCOPE - TF_REGISTRY_FUNCTION(TfDebug) { TF_DEBUG_ENVIRONMENT_SYMBOL(PXRUSDMAYA_REGISTRY, @@ -33,4 +32,3 @@ TF_REGISTRY_FUNCTION(TfDebug) } PXR_NAMESPACE_CLOSE_SCOPE - diff --git a/lib/mayaUsd/base/debugCodes.h b/lib/mayaUsd/base/debugCodes.h index c0a9d8bf63..d98425addf 100644 --- a/lib/mayaUsd/base/debugCodes.h +++ b/lib/mayaUsd/base/debugCodes.h @@ -21,7 +21,6 @@ PXR_NAMESPACE_OPEN_SCOPE - TF_DEBUG_CODES( PXRUSDMAYA_REGISTRY, PXRUSDMAYA_DIAGNOSTICS, @@ -29,7 +28,6 @@ TF_DEBUG_CODES( USDMAYA_PROXYSHAPEBASE ); - PXR_NAMESPACE_CLOSE_SCOPE #endif diff --git a/lib/mayaUsd/fileio/chaser/chaser.cpp b/lib/mayaUsd/fileio/chaser/chaser.cpp index bc7fa789ae..5b92794d70 100644 --- a/lib/mayaUsd/fileio/chaser/chaser.cpp +++ b/lib/mayaUsd/fileio/chaser/chaser.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "chaser.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/chaser/chaser.h b/lib/mayaUsd/fileio/chaser/chaser.h index 5a201d1c95..4d6036b572 100644 --- a/lib/mayaUsd/fileio/chaser/chaser.h +++ b/lib/mayaUsd/fileio/chaser/chaser.h @@ -16,17 +16,14 @@ #ifndef PXRUSDMAYA_CHASER_H #define PXRUSDMAYA_CHASER_H -#include - #include - #include #include - #include -PXR_NAMESPACE_OPEN_SCOPE +#include "mayaUsd/base/api.h" +PXR_NAMESPACE_OPEN_SCOPE TF_DECLARE_REF_PTRS(UsdMayaChaser); diff --git a/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp b/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp index cee9ab202b..360bb33bf0 100644 --- a/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp +++ b/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp @@ -13,17 +13,16 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include +#include "chaserRegistry.h" #include #include -PXR_NAMESPACE_OPEN_SCOPE +#include "mayaUsd/base/debugCodes.h" +#include "mayaUsd/fileio/registryHelper.h" +PXR_NAMESPACE_OPEN_SCOPE UsdMayaChaserRegistry::FactoryContext::FactoryContext( const UsdStagePtr& stage, diff --git a/lib/mayaUsd/fileio/chaser/chaserRegistry.h b/lib/mayaUsd/fileio/chaser/chaserRegistry.h index d974b6d1a2..5de8189c34 100644 --- a/lib/mayaUsd/fileio/chaser/chaserRegistry.h +++ b/lib/mayaUsd/fileio/chaser/chaserRegistry.h @@ -16,24 +16,21 @@ #ifndef PXRUSDMAYA_CHASER_REGISTRY_H #define PXRUSDMAYA_CHASER_REGISTRY_H -#include -#include -#include -#include +#include #include - #include #include #include - #include -#include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/chaser/chaser.h" +#include "mayaUsd/fileio/jobs/jobArgs.h" +#include "mayaUsd/utils/util.h" PXR_NAMESPACE_OPEN_SCOPE - TF_DECLARE_WEAK_PTRS(UsdMayaChaserRegistry); /// \class UsdMayaChaserRegistry diff --git a/lib/mayaUsd/fileio/fallbackPrimReader.cpp b/lib/mayaUsd/fileio/fallbackPrimReader.cpp index 8509d81d78..8144d2c17c 100644 --- a/lib/mayaUsd/fileio/fallbackPrimReader.cpp +++ b/lib/mayaUsd/fileio/fallbackPrimReader.cpp @@ -13,11 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include +#include "fallbackPrimReader.h" #include +#include "mayaUsd/fileio/translators/translatorUtil.h" + PXR_NAMESPACE_OPEN_SCOPE UsdMaya_FallbackPrimReader::UsdMaya_FallbackPrimReader( diff --git a/lib/mayaUsd/fileio/fallbackPrimReader.h b/lib/mayaUsd/fileio/fallbackPrimReader.h index d3dc4ac842..4f774f97ac 100644 --- a/lib/mayaUsd/fileio/fallbackPrimReader.h +++ b/lib/mayaUsd/fileio/fallbackPrimReader.h @@ -16,8 +16,8 @@ #ifndef PXRUSDMAYA_FALLBACK_PRIM_READER_H #define PXRUSDMAYA_FALLBACK_PRIM_READER_H -#include -#include +#include "mayaUsd/fileio/primReader.h" +#include "mayaUsd/fileio/primReaderRegistry.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/functorPrimReader.cpp b/lib/mayaUsd/fileio/functorPrimReader.cpp index bade892fa8..305aa13a62 100644 --- a/lib/mayaUsd/fileio/functorPrimReader.cpp +++ b/lib/mayaUsd/fileio/functorPrimReader.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "functorPrimReader.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/functorPrimReader.h b/lib/mayaUsd/fileio/functorPrimReader.h index 03c1ff62d8..44f5d66114 100644 --- a/lib/mayaUsd/fileio/functorPrimReader.h +++ b/lib/mayaUsd/fileio/functorPrimReader.h @@ -16,16 +16,16 @@ #ifndef PXRUSDMAYA_FUNCTORPRIMREADER_H #define PXRUSDMAYA_FUNCTORPRIMREADER_H -#include -#include -#include -#include -#include - #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primReader.h" +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" +#include "mayaUsd/fileio/primReaderRegistry.h" + PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMaya_FunctorPrimReader diff --git a/lib/mayaUsd/fileio/functorPrimWriter.cpp b/lib/mayaUsd/fileio/functorPrimWriter.cpp index 07cf71ee47..ba4c24fab7 100644 --- a/lib/mayaUsd/fileio/functorPrimWriter.cpp +++ b/lib/mayaUsd/fileio/functorPrimWriter.cpp @@ -13,13 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include -#include +#include "functorPrimWriter.h" #include @@ -30,6 +24,13 @@ #include #include +#include "mayaUsd/fileio/primWriter.h" +#include "mayaUsd/fileio/primWriterArgs.h" +#include "mayaUsd/fileio/primWriterContext.h" +#include "mayaUsd/fileio/primWriterRegistry.h" +#include "mayaUsd/fileio/transformWriter.h" +#include "mayaUsd/fileio/writeJobContext.h" + PXR_NAMESPACE_OPEN_SCOPE UsdMaya_FunctorPrimWriter::UsdMaya_FunctorPrimWriter( diff --git a/lib/mayaUsd/fileio/functorPrimWriter.h b/lib/mayaUsd/fileio/functorPrimWriter.h index 2eb1c83906..9e103e9bc2 100644 --- a/lib/mayaUsd/fileio/functorPrimWriter.h +++ b/lib/mayaUsd/fileio/functorPrimWriter.h @@ -16,11 +16,6 @@ #ifndef PXRUSDMAYA_FUNCTOR_PRIM_WRITER_H #define PXRUSDMAYA_FUNCTOR_PRIM_WRITER_H -#include -#include -#include -#include - #include #include @@ -29,6 +24,11 @@ #include #include +#include "mayaUsd/fileio/primWriter.h" +#include "mayaUsd/fileio/primWriterRegistry.h" +#include "mayaUsd/fileio/transformWriter.h" +#include "mayaUsd/fileio/writeJobContext.h" + PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMaya_FunctorPrimWriter diff --git a/lib/mayaUsd/fileio/importData.cpp b/lib/mayaUsd/fileio/importData.cpp index dbd7104154..bf460d7af9 100644 --- a/lib/mayaUsd/fileio/importData.cpp +++ b/lib/mayaUsd/fileio/importData.cpp @@ -12,8 +12,8 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. - -#include +// +#include "importData.h" #include diff --git a/lib/mayaUsd/fileio/importData.h b/lib/mayaUsd/fileio/importData.h index b70bbf1c50..3c4d3ea17e 100644 --- a/lib/mayaUsd/fileio/importData.h +++ b/lib/mayaUsd/fileio/importData.h @@ -16,8 +16,6 @@ #pragma once -#include - #include #include @@ -25,6 +23,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/fileio/instancedNodeWriter.cpp b/lib/mayaUsd/fileio/instancedNodeWriter.cpp index b6cb0aca44..e2ea800574 100644 --- a/lib/mayaUsd/fileio/instancedNodeWriter.cpp +++ b/lib/mayaUsd/fileio/instancedNodeWriter.cpp @@ -13,11 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include +#include "instancedNodeWriter.h" #include #include @@ -31,6 +27,10 @@ #include #include +#include "mayaUsd/fileio/primWriter.h" +#include "mayaUsd/fileio/writeJobContext.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE /// Assuming that \p instance1 and \p instance2 are instances of one another, diff --git a/lib/mayaUsd/fileio/instancedNodeWriter.h b/lib/mayaUsd/fileio/instancedNodeWriter.h index 469a19ffea..4508c62209 100644 --- a/lib/mayaUsd/fileio/instancedNodeWriter.h +++ b/lib/mayaUsd/fileio/instancedNodeWriter.h @@ -16,10 +16,6 @@ #ifndef PXRUSDMAYA_INSTANCED_NODE_WRITER_H #define PXRUSDMAYA_INSTANCED_NODE_WRITER_H -#include -#include -#include - #include #include @@ -28,6 +24,10 @@ #include #include +#include "mayaUsd/fileio/primWriter.h" +#include "mayaUsd/fileio/writeJobContext.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE /// This is a "helper" prim writer used internally by UsdMayaWriteJobContext to diff --git a/lib/mayaUsd/fileio/jobs/jobArgs.cpp b/lib/mayaUsd/fileio/jobs/jobArgs.cpp index 3d3cee9040..fa423add3f 100644 --- a/lib/mayaUsd/fileio/jobs/jobArgs.cpp +++ b/lib/mayaUsd/fileio/jobs/jobArgs.cpp @@ -13,10 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include +#include "jobArgs.h" #include #include @@ -31,12 +28,14 @@ #include #include #include - #include #include #include #include +#include "mayaUsd/fileio/registryHelper.h" +#include "mayaUsd/fileio/shading/shadingModeRegistry.h" + PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/jobs/jobArgs.h b/lib/mayaUsd/fileio/jobs/jobArgs.h index eb0d666b22..ab91ff56e9 100644 --- a/lib/mayaUsd/fileio/jobs/jobArgs.h +++ b/lib/mayaUsd/fileio/jobs/jobArgs.h @@ -16,23 +16,21 @@ #ifndef PXRUSDMAYA_JOB_ARGS_H #define PXRUSDMAYA_JOB_ARGS_H -#include -#include +#include +#include +#include +#include +#include #include - #include #include - #include #include -#include -#include -#include -#include -#include +#include "mayaUsd/base/api.h" +#include "mayaUsd/utils/util.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/jobs/modelKindProcessor.cpp b/lib/mayaUsd/fileio/jobs/modelKindProcessor.cpp index 1656a06c48..1b9611ba80 100644 --- a/lib/mayaUsd/fileio/jobs/modelKindProcessor.cpp +++ b/lib/mayaUsd/fileio/jobs/modelKindProcessor.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "modelKindProcessor.h" #include #include diff --git a/lib/mayaUsd/fileio/jobs/modelKindProcessor.h b/lib/mayaUsd/fileio/jobs/modelKindProcessor.h index 4cfcd699d6..a5aa00c9c7 100644 --- a/lib/mayaUsd/fileio/jobs/modelKindProcessor.h +++ b/lib/mayaUsd/fileio/jobs/modelKindProcessor.h @@ -16,9 +16,6 @@ #ifndef PXRUSDMAYA_MODEL_KIND_PROCESSOR_H #define PXRUSDMAYA_MODEL_KIND_PROCESSOR_H -#include -#include - #include #include #include @@ -27,8 +24,10 @@ #include #include -PXR_NAMESPACE_OPEN_SCOPE +#include "mayaUsd/fileio/jobs/jobArgs.h" +#include "mayaUsd/fileio/primWriter.h" +PXR_NAMESPACE_OPEN_SCOPE /// This class encapsulates all of the logic for writing model kinds from /// UsdMaya_WriteJob. It is a "black box" that reads each newly-written prim, one diff --git a/lib/mayaUsd/fileio/jobs/readJob.cpp b/lib/mayaUsd/fileio/jobs/readJob.cpp index d34e1f9828..f07a906385 100644 --- a/lib/mayaUsd/fileio/jobs/readJob.cpp +++ b/lib/mayaUsd/fileio/jobs/readJob.cpp @@ -13,14 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include -#include -#include +#include "readJob.h" #include #include @@ -54,6 +47,13 @@ #include #include +#include "mayaUsd/fileio/primReaderRegistry.h" +#include "mayaUsd/fileio/translators/translatorMaterial.h" +#include "mayaUsd/fileio/translators/translatorXformable.h" +#include "mayaUsd/nodes/stageNode.h" +#include "mayaUsd/utils/stageCache.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE UsdMaya_ReadJob::UsdMaya_ReadJob( diff --git a/lib/mayaUsd/fileio/jobs/readJob.h b/lib/mayaUsd/fileio/jobs/readJob.h index 4293374646..ddc81aca91 100644 --- a/lib/mayaUsd/fileio/jobs/readJob.h +++ b/lib/mayaUsd/fileio/jobs/readJob.h @@ -16,10 +16,6 @@ #ifndef PXRUSDMAYA_READ_JOB_H #define PXRUSDMAYA_READ_JOB_H -#include -#include -#include - #include #include #include @@ -31,6 +27,10 @@ #include #include +#include "mayaUsd/fileio/importData.h" +#include "mayaUsd/fileio/jobs/jobArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdMayaPrimReaderArgs; diff --git a/lib/mayaUsd/fileio/jobs/writeJob.cpp b/lib/mayaUsd/fileio/jobs/writeJob.cpp index 0857dedb1f..aeddd9760f 100644 --- a/lib/mayaUsd/fileio/jobs/writeJob.cpp +++ b/lib/mayaUsd/fileio/jobs/writeJob.cpp @@ -13,18 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "writeJob.h" #include #include @@ -68,6 +57,17 @@ #include #include +#include "mayaUsd/fileio/chaser/chaser.h" +#include "mayaUsd/fileio/chaser/chaserRegistry.h" +#include "mayaUsd/fileio/jobs/jobArgs.h" +#include "mayaUsd/fileio/jobs/modelKindProcessor.h" +#include "mayaUsd/fileio/primWriter.h" +#include "mayaUsd/fileio/primWriterRegistry.h" +#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" +#include "mayaUsd/fileio/transformWriter.h" +#include "mayaUsd/fileio/translators/translatorMaterial.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE UsdMaya_WriteJob::UsdMaya_WriteJob(const UsdMayaJobExportArgs& iArgs) @@ -76,7 +76,6 @@ UsdMaya_WriteJob::UsdMaya_WriteJob(const UsdMayaJobExportArgs& iArgs) { } - UsdMaya_WriteJob::~UsdMaya_WriteJob() { } diff --git a/lib/mayaUsd/fileio/jobs/writeJob.h b/lib/mayaUsd/fileio/jobs/writeJob.h index 1610c943a5..14f5deeb9f 100644 --- a/lib/mayaUsd/fileio/jobs/writeJob.h +++ b/lib/mayaUsd/fileio/jobs/writeJob.h @@ -16,12 +16,6 @@ #ifndef PXRUSDMAYA_WRITE_JOB_H #define PXRUSDMAYA_WRITE_JOB_H -#include - -#include -#include -#include - #include #include @@ -29,6 +23,11 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/chaser/chaser.h" +#include "mayaUsd/fileio/writeJobContext.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdMaya_ModelKindProcessor; diff --git a/lib/mayaUsd/fileio/primReader.cpp b/lib/mayaUsd/fileio/primReader.cpp index b550968490..107ae54c62 100644 --- a/lib/mayaUsd/fileio/primReader.cpp +++ b/lib/mayaUsd/fileio/primReader.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "primReader.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primReader.h b/lib/mayaUsd/fileio/primReader.h index 174473021c..7398ce094d 100644 --- a/lib/mayaUsd/fileio/primReader.h +++ b/lib/mayaUsd/fileio/primReader.h @@ -16,12 +16,12 @@ #ifndef PXRUSDMAYA_MAYAPRIMREADER_H #define PXRUSDMAYA_MAYAPRIMREADER_H -#include -#include -#include - #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdMayaPrimReader diff --git a/lib/mayaUsd/fileio/primReaderArgs.cpp b/lib/mayaUsd/fileio/primReaderArgs.cpp index 6749adc600..5b680842f7 100644 --- a/lib/mayaUsd/fileio/primReaderArgs.cpp +++ b/lib/mayaUsd/fileio/primReaderArgs.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "primReaderArgs.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primReaderArgs.h b/lib/mayaUsd/fileio/primReaderArgs.h index d23bc8b7d0..16cb27608b 100644 --- a/lib/mayaUsd/fileio/primReaderArgs.h +++ b/lib/mayaUsd/fileio/primReaderArgs.h @@ -16,13 +16,13 @@ #ifndef PXRUSDMAYA_PRIMREADERARGS_H #define PXRUSDMAYA_PRIMREADERARGS_H -#include -#include - #include #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/jobs/jobArgs.h" + PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMayaPrimReaderArgs diff --git a/lib/mayaUsd/fileio/primReaderContext.cpp b/lib/mayaUsd/fileio/primReaderContext.cpp index 3a4aa02ebc..14aa0244d3 100644 --- a/lib/mayaUsd/fileio/primReaderContext.cpp +++ b/lib/mayaUsd/fileio/primReaderContext.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "primReaderContext.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primReaderContext.h b/lib/mayaUsd/fileio/primReaderContext.h index c6fe395451..81356661db 100644 --- a/lib/mayaUsd/fileio/primReaderContext.h +++ b/lib/mayaUsd/fileio/primReaderContext.h @@ -16,13 +16,13 @@ #ifndef PXRUSDMAYA_PRIMREADERCONTEXT_H #define PXRUSDMAYA_PRIMREADERCONTEXT_H -#include - #include #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMayaPrimReaderContext diff --git a/lib/mayaUsd/fileio/primReaderRegistry.cpp b/lib/mayaUsd/fileio/primReaderRegistry.cpp index 0f55bd8d35..f0a6a4f2dd 100644 --- a/lib/mayaUsd/fileio/primReaderRegistry.cpp +++ b/lib/mayaUsd/fileio/primReaderRegistry.cpp @@ -13,12 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include +#include "primReaderRegistry.h" #include #include @@ -32,6 +27,11 @@ #include #include +#include "mayaUsd/base/debugCodes.h" +#include "mayaUsd/fileio/fallbackPrimReader.h" +#include "mayaUsd/fileio/functorPrimReader.h" +#include "mayaUsd/fileio/registryHelper.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS(_tokens, diff --git a/lib/mayaUsd/fileio/primReaderRegistry.h b/lib/mayaUsd/fileio/primReaderRegistry.h index 9c8d969d19..caccdfc6cc 100644 --- a/lib/mayaUsd/fileio/primReaderRegistry.h +++ b/lib/mayaUsd/fileio/primReaderRegistry.h @@ -16,14 +16,14 @@ #ifndef PXRUSDMAYA_PRIMREADERREGISTRY_H #define PXRUSDMAYA_PRIMREADERREGISTRY_H -#include -#include -#include -#include - #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primReader.h" +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" + PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMayaPrimReaderRegistry diff --git a/lib/mayaUsd/fileio/primUpdater.cpp b/lib/mayaUsd/fileio/primUpdater.cpp index f0ab5849c1..6b6a785e7b 100644 --- a/lib/mayaUsd/fileio/primUpdater.cpp +++ b/lib/mayaUsd/fileio/primUpdater.cpp @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "primUpdater.h" #include #include diff --git a/lib/mayaUsd/fileio/primUpdater.h b/lib/mayaUsd/fileio/primUpdater.h index 10a0b78f5e..54b46ff43d 100644 --- a/lib/mayaUsd/fileio/primUpdater.h +++ b/lib/mayaUsd/fileio/primUpdater.h @@ -17,10 +17,6 @@ #ifndef PXRUSDMAYA_MAYAPRIMUPDATER_H #define PXRUSDMAYA_MAYAPRIMUPDATER_H -#include -#include -#include - #include #include #include @@ -28,6 +24,10 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primUpdaterContext.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdMayaPrimUpdater diff --git a/lib/mayaUsd/fileio/primUpdaterContext.cpp b/lib/mayaUsd/fileio/primUpdaterContext.cpp index ca990be6a4..1e21210f33 100644 --- a/lib/mayaUsd/fileio/primUpdaterContext.cpp +++ b/lib/mayaUsd/fileio/primUpdaterContext.cpp @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "primUpdaterContext.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primUpdaterContext.h b/lib/mayaUsd/fileio/primUpdaterContext.h index 251d17e108..8d13d0b0a5 100644 --- a/lib/mayaUsd/fileio/primUpdaterContext.h +++ b/lib/mayaUsd/fileio/primUpdaterContext.h @@ -17,14 +17,13 @@ #ifndef PXRUSDMAYA_PRIMUPDATERCONTEXT_H #define PXRUSDMAYA_PRIMUPDATERCONTEXT_H -#include - #include #include #include -PXR_NAMESPACE_OPEN_SCOPE +#include "mayaUsd/base/api.h" +PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMayaPrimUpdaterContext /// \brief This class provides an interface for updater plugins to communicate diff --git a/lib/mayaUsd/fileio/primUpdaterRegistry.cpp b/lib/mayaUsd/fileio/primUpdaterRegistry.cpp index 582a909078..99bcb4252c 100644 --- a/lib/mayaUsd/fileio/primUpdaterRegistry.cpp +++ b/lib/mayaUsd/fileio/primUpdaterRegistry.cpp @@ -14,9 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include +#include "primUpdaterRegistry.h" #include #include @@ -32,6 +30,9 @@ #include #include +#include "mayaUsd/fileio/registryHelper.h" +#include "mayaUsd/base/debugCodes.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS(_tokens, diff --git a/lib/mayaUsd/fileio/primUpdaterRegistry.h b/lib/mayaUsd/fileio/primUpdaterRegistry.h index 6fb9ecbaed..4eeb117fc4 100644 --- a/lib/mayaUsd/fileio/primUpdaterRegistry.h +++ b/lib/mayaUsd/fileio/primUpdaterRegistry.h @@ -17,10 +17,6 @@ #ifndef PXRUSDMAYA_PRIM_UPDATER_REGISTRY_H #define PXRUSDMAYA_PRIM_UPDATER_REGISTRY_H -#include -#include -#include - #include #include @@ -29,6 +25,10 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primUpdater.h" +#include "mayaUsd/fileio/primUpdaterContext.h" + PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMayaPrimUpdaterRegistry diff --git a/lib/mayaUsd/fileio/primWriter.cpp b/lib/mayaUsd/fileio/primWriter.cpp index fcc8a2909a..a608723d6f 100644 --- a/lib/mayaUsd/fileio/primWriter.cpp +++ b/lib/mayaUsd/fileio/primWriter.cpp @@ -13,14 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include -#include -#include +#include "primWriter.h" #include #include @@ -47,6 +40,13 @@ #include #include +#include "mayaUsd/fileio/jobs/jobArgs.h" +#include "mayaUsd/fileio/translators/translatorGprim.h" +#include "mayaUsd/fileio/utils/adaptor.h" +#include "mayaUsd/fileio/utils/writeUtil.h" +#include "mayaUsd/fileio/writeJobContext.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE PXRUSDMAYA_REGISTER_ADAPTOR_ATTRIBUTE_ALIAS( diff --git a/lib/mayaUsd/fileio/primWriter.h b/lib/mayaUsd/fileio/primWriter.h index 2e9bba9648..7c2c2193ee 100644 --- a/lib/mayaUsd/fileio/primWriter.h +++ b/lib/mayaUsd/fileio/primWriter.h @@ -16,11 +16,6 @@ #ifndef PXRUSDMAYA_PRIM_WRITER_H #define PXRUSDMAYA_PRIM_WRITER_H -#include - -#include -#include - #include #include @@ -36,6 +31,10 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/jobs/jobArgs.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdMayaWriteJobContext; diff --git a/lib/mayaUsd/fileio/primWriterArgs.cpp b/lib/mayaUsd/fileio/primWriterArgs.cpp index ca4e6f7036..040b37e444 100644 --- a/lib/mayaUsd/fileio/primWriterArgs.cpp +++ b/lib/mayaUsd/fileio/primWriterArgs.cpp @@ -13,11 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include +#include "primWriterArgs.h" #include +#include "mayaUsd/fileio/utils/writeUtil.h" + PXR_NAMESPACE_OPEN_SCOPE UsdMayaPrimWriterArgs::UsdMayaPrimWriterArgs( diff --git a/lib/mayaUsd/fileio/primWriterArgs.h b/lib/mayaUsd/fileio/primWriterArgs.h index 976aa07e5c..793770e95c 100644 --- a/lib/mayaUsd/fileio/primWriterArgs.h +++ b/lib/mayaUsd/fileio/primWriterArgs.h @@ -16,8 +16,6 @@ #ifndef PXRUSDMAYA_PRIMWRITERERARGS_H #define PXRUSDMAYA_PRIMWRITERERARGS_H -#include - #include #include @@ -25,6 +23,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMayaPrimWriterArgs diff --git a/lib/mayaUsd/fileio/primWriterContext.cpp b/lib/mayaUsd/fileio/primWriterContext.cpp index 5e437e22e6..4b71ddc0ab 100644 --- a/lib/mayaUsd/fileio/primWriterContext.cpp +++ b/lib/mayaUsd/fileio/primWriterContext.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "primWriterContext.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primWriterContext.h b/lib/mayaUsd/fileio/primWriterContext.h index 2233e45f7f..b5e6ed1f41 100644 --- a/lib/mayaUsd/fileio/primWriterContext.h +++ b/lib/mayaUsd/fileio/primWriterContext.h @@ -16,12 +16,12 @@ #ifndef PXRUSDMAYA_PRIMWRITERCONTEXT_H #define PXRUSDMAYA_PRIMWRITERCONTEXT_H -#include - #include #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMayaPrimReaderContext diff --git a/lib/mayaUsd/fileio/primWriterRegistry.cpp b/lib/mayaUsd/fileio/primWriterRegistry.cpp index e085ba4fce..5eae3c0dc4 100644 --- a/lib/mayaUsd/fileio/primWriterRegistry.cpp +++ b/lib/mayaUsd/fileio/primWriterRegistry.cpp @@ -13,10 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include +#include "primWriterRegistry.h" #include #include @@ -30,6 +27,10 @@ #include #include +#include "mayaUsd/base/debugCodes.h" +#include "mayaUsd/fileio/functorPrimWriter.h" +#include "mayaUsd/fileio/registryHelper.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS(_tokens, diff --git a/lib/mayaUsd/fileio/primWriterRegistry.h b/lib/mayaUsd/fileio/primWriterRegistry.h index e0eace2bed..41c6e9cc79 100644 --- a/lib/mayaUsd/fileio/primWriterRegistry.h +++ b/lib/mayaUsd/fileio/primWriterRegistry.h @@ -16,11 +16,6 @@ #ifndef PXRUSDMAYA_PRIM_WRITER_REGISTRY_H #define PXRUSDMAYA_PRIM_WRITER_REGISTRY_H -#include -#include -#include -#include - #include #include @@ -29,6 +24,10 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primWriter.h" +#include "mayaUsd/fileio/primWriterArgs.h" +#include "mayaUsd/fileio/primWriterContext.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/registryHelper.cpp b/lib/mayaUsd/fileio/registryHelper.cpp index 991e816740..8f1a203d9f 100644 --- a/lib/mayaUsd/fileio/registryHelper.cpp +++ b/lib/mayaUsd/fileio/registryHelper.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include +#include "registryHelper.h" #include #include @@ -29,6 +28,8 @@ #include #include +#include "mayaUsd/base/debugCodes.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS(_tokens, diff --git a/lib/mayaUsd/fileio/registryHelper.h b/lib/mayaUsd/fileio/registryHelper.h index 9b14c4032a..09e8aa7d9b 100644 --- a/lib/mayaUsd/fileio/registryHelper.h +++ b/lib/mayaUsd/fileio/registryHelper.h @@ -16,11 +16,11 @@ #ifndef PXRUSDMAYA_REGISTRYHELPER_H #define PXRUSDMAYA_REGISTRYHELPER_H +#include + +#include #include #include -#include - -#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shaderWriter.cpp b/lib/mayaUsd/fileio/shaderWriter.cpp index d94b5cfb39..65a6c8fcc2 100644 --- a/lib/mayaUsd/fileio/shaderWriter.cpp +++ b/lib/mayaUsd/fileio/shaderWriter.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include +#include "shaderWriter.h" #include @@ -24,6 +23,8 @@ #include #include +#include "mayaUsd/fileio/writeJobContext.h" + PXR_NAMESPACE_OPEN_SCOPE UsdMayaShaderWriter::UsdMayaShaderWriter( diff --git a/lib/mayaUsd/fileio/shaderWriter.h b/lib/mayaUsd/fileio/shaderWriter.h index eddac2a0f5..3a679ed63b 100644 --- a/lib/mayaUsd/fileio/shaderWriter.h +++ b/lib/mayaUsd/fileio/shaderWriter.h @@ -16,18 +16,18 @@ #ifndef PXRUSDMAYA_SHADER_WRITER_H #define PXRUSDMAYA_SHADER_WRITER_H -#include -#include -#include - #include #include -#include #include +#include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primWriter.h" +#include "mayaUsd/fileio/writeJobContext.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdAttribute; diff --git a/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp b/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp index 58eeaf1d4a..1fa7e34090 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp @@ -13,13 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include - #include #include @@ -55,6 +48,12 @@ #include #include +#include "mayaUsd/fileio/shading/shadingModeExporter.h" +#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" +#include "mayaUsd/fileio/shading/shadingModeRegistry.h" +#include "mayaUsd/fileio/translators/translatorMaterial.h" +#include "mayaUsd/utils/colorSpace.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS( diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp b/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp index 1d9fed3150..e58002d515 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp @@ -13,12 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include +#include "shadingModeExporter.h" #include #include @@ -38,6 +33,11 @@ #include #include +#include "mayaUsd/fileio/jobs/jobArgs.h" +#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" +#include "mayaUsd/fileio/writeJobContext.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS( diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporter.h b/lib/mayaUsd/fileio/shading/shadingModeExporter.h index 1b80f70f8d..b5f7c9b814 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeExporter.h +++ b/lib/mayaUsd/fileio/shading/shadingModeExporter.h @@ -16,11 +16,6 @@ #ifndef PXRUSDMAYA_SHADING_MODE_EXPORTER_H #define PXRUSDMAYA_SHADING_MODE_EXPORTER_H -#include -#include -#include -#include - #include #include @@ -28,6 +23,11 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" +#include "mayaUsd/utils/util.h" +#include "mayaUsd/fileio/writeJobContext.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdMayaShadingModeExporter diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp index 71d7a0798f..fcc56fe70c 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp @@ -13,11 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include +#include "shadingModeExporterContext.h" #include #include @@ -50,6 +46,10 @@ #include #include +#include "mayaUsd/fileio/jobs/jobArgs.h" +#include "mayaUsd/fileio/writeJobContext.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h index cf30554d50..bff374d9fa 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h +++ b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h @@ -16,11 +16,7 @@ #ifndef PXRUSDMAYA_SHADING_MODE_EXPORTER_CONTEXT_H #define PXRUSDMAYA_SHADING_MODE_EXPORTER_CONTEXT_H -#include - -#include -#include -#include +#include "mayaUsd/base/api.h" #include #include @@ -36,6 +32,10 @@ #include #include +#include "mayaUsd/fileio/jobs/jobArgs.h" +#include "mayaUsd/fileio/writeJobContext.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdMayaShadingModeExportContext diff --git a/lib/mayaUsd/fileio/shading/shadingModeImporter.cpp b/lib/mayaUsd/fileio/shading/shadingModeImporter.cpp index 7454bc941f..8e7daa2ae0 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeImporter.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeImporter.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "shadingModeImporter.h" #include #include diff --git a/lib/mayaUsd/fileio/shading/shadingModeImporter.h b/lib/mayaUsd/fileio/shading/shadingModeImporter.h index d7c37ede41..395993d590 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeImporter.h +++ b/lib/mayaUsd/fileio/shading/shadingModeImporter.h @@ -16,9 +16,6 @@ #ifndef PXRUSDMAYA_SHADING_MODE_IMPORTER_H #define PXRUSDMAYA_SHADING_MODE_IMPORTER_H -#include -#include - #include #include @@ -26,12 +23,14 @@ #include #include #include - #include #include #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primReaderContext.h" + PXR_NAMESPACE_OPEN_SCOPE #define PXRUSDMAYA_SHADING_MODE_IMPORTER_TOKENS \ diff --git a/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp b/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp index a88d7a45c5..81bb4d81c5 100644 --- a/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp @@ -13,28 +13,16 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include - -// Defines the RenderMan for Maya mapping between Pxr objects and Maya internal nodes -#include -#include -#include -#include -#include - #include #include #include #include +#include #include #include #include #include -#include #include #include @@ -55,6 +43,19 @@ #include #include +#include "mayaUsd/fileio/shading/shadingModeExporter.h" +#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" +#include "mayaUsd/fileio/shading/shadingModeImporter.h" + +// Defines the RenderMan for Maya mapping between Pxr objects and Maya internal nodes +#include "mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h" + +#include "mayaUsd/fileio/shading/shadingModeRegistry.h" +#include "mayaUsd/fileio/translators/translatorUtil.h" +#include "mayaUsd/fileio/utils/roundTripUtil.h" +#include "mayaUsd/fileio/utils/writeUtil.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS( @@ -69,7 +70,6 @@ TF_DEFINE_PRIVATE_TOKENS( ((RmanVolumeShaderPlugName, "volumeShader")) ); - namespace { struct _ShadingPlugs { diff --git a/lib/mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h b/lib/mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h index 8b17d968c6..fe854a6aca 100644 --- a/lib/mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h +++ b/lib/mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h @@ -19,11 +19,10 @@ // We use this table both for export and for import when RIS mode is active. // XXX This should probably live in a xml or json file that can be easily updated without recompile -#include - #include #include +#include #include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp b/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp index 3b4c6cd026..0e11b6bc44 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp @@ -13,12 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include +#include "shadingModeRegistry.h" #include #include @@ -29,6 +24,11 @@ #include #include +#include "mayaUsd/fileio/registryHelper.h" +#include "mayaUsd/fileio/shading/shadingModeExporter.h" +#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" +#include "mayaUsd/fileio/shading/shadingModeImporter.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PUBLIC_TOKENS(UsdMayaShadingModeTokens, diff --git a/lib/mayaUsd/fileio/shading/shadingModeRegistry.h b/lib/mayaUsd/fileio/shading/shadingModeRegistry.h index 050f3e618d..b6d5d09d17 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeRegistry.h +++ b/lib/mayaUsd/fileio/shading/shadingModeRegistry.h @@ -16,12 +16,6 @@ #ifndef PXRUSDMAYA_SHADING_MODE_REGISTRY_H #define PXRUSDMAYA_SHADING_MODE_REGISTRY_H -#include - -#include -#include -#include - #include #include @@ -33,6 +27,11 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/shading/shadingModeExporter.h" +#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" +#include "mayaUsd/fileio/shading/shadingModeImporter.h" + PXR_NAMESPACE_OPEN_SCOPE #define PXRUSDMAYA_SHADINGMODE_TOKENS \ diff --git a/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp b/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp index cdcf3c3af7..c75d8fe0da 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp @@ -13,15 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include - -#include -#include -#include - #include #include @@ -49,6 +40,14 @@ #include #include +#include "mayaUsd/fileio/primWriter.h" +#include "mayaUsd/fileio/shaderWriter.h" +#include "mayaUsd/fileio/shading/shadingModeExporter.h" +#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" +#include "mayaUsd/fileio/shading/shadingModeRegistry.h" +#include "mayaUsd/fileio/utils/shadingUtil.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE namespace { diff --git a/lib/mayaUsd/fileio/transformWriter.cpp b/lib/mayaUsd/fileio/transformWriter.cpp index 4ee941539a..46f97e3f9a 100644 --- a/lib/mayaUsd/fileio/transformWriter.cpp +++ b/lib/mayaUsd/fileio/transformWriter.cpp @@ -13,12 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include +#include "transformWriter.h" #include @@ -41,6 +36,12 @@ #include #include +#include "mayaUsd/fileio/primWriterRegistry.h" +#include "mayaUsd/fileio/utils/adaptor.h" +#include "mayaUsd/fileio/utils/xformStack.h" +#include "mayaUsd/fileio/writeJobContext.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE PXRUSDMAYA_REGISTER_WRITER(transform, UsdMayaTransformWriter); diff --git a/lib/mayaUsd/fileio/transformWriter.h b/lib/mayaUsd/fileio/transformWriter.h index ff7d43aa5f..f7f6636e98 100644 --- a/lib/mayaUsd/fileio/transformWriter.h +++ b/lib/mayaUsd/fileio/transformWriter.h @@ -16,15 +16,11 @@ #ifndef PXRUSDMAYA_TRANSFORM_WRITER_H #define PXRUSDMAYA_TRANSFORM_WRITER_H -#include -#include -#include - #include #include -#include #include +#include #include #include #include @@ -38,6 +34,10 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primWriter.h" +#include "mayaUsd/fileio/writeJobContext.h" + PXR_NAMESPACE_OPEN_SCOPE /// Writes transforms and serves as the base class for custom transform writers. diff --git a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp index e43ad3b02f..2289b260e8 100644 --- a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp +++ b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp @@ -13,14 +13,15 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include +#include "skelBindingsProcessor.h" #include #include #include #include +#include "mayaUsd/fileio/translators/translatorUtil.h" + PXR_NAMESPACE_OPEN_SCOPE UsdMaya_SkelBindingsProcessor::UsdMaya_SkelBindingsProcessor() diff --git a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h index 75248f5377..532e5dba44 100644 --- a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h +++ b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h @@ -16,9 +16,6 @@ #ifndef PXRUSDMAYA_SKEL_BINDINGS_PROCESSOR_H #define PXRUSDMAYA_SKEL_BINDINGS_PROCESSOR_H -#include -#include - #include #include @@ -28,6 +25,9 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE /// This class encapsulates all of the logic for writing or modifying diff --git a/lib/mayaUsd/fileio/translators/translatorCamera.cpp b/lib/mayaUsd/fileio/translators/translatorCamera.cpp index a2c54b2ca0..9cd2a6870d 100644 --- a/lib/mayaUsd/fileio/translators/translatorCamera.cpp +++ b/lib/mayaUsd/fileio/translators/translatorCamera.cpp @@ -13,13 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include -#include +#include "translatorCamera.h" #include #include @@ -39,6 +33,12 @@ #include #include +#include "mayaUsd/fileio/jobs/jobArgs.h" +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" +#include "mayaUsd/fileio/translators/translatorUtil.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE static bool _ReadToCamera( diff --git a/lib/mayaUsd/fileio/translators/translatorCamera.h b/lib/mayaUsd/fileio/translators/translatorCamera.h index 351bce6b9b..0327d7c367 100644 --- a/lib/mayaUsd/fileio/translators/translatorCamera.h +++ b/lib/mayaUsd/fileio/translators/translatorCamera.h @@ -16,17 +16,16 @@ #ifndef PXRUSDMAYA_TRANSLATOR_CAMERA_H #define PXRUSDMAYA_TRANSLATOR_CAMERA_H -#include - -#include -#include - #include #include #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" + PXR_NAMESPACE_OPEN_SCOPE /// \brief Provides helper functions for translating to/from UsdGeomCamera diff --git a/lib/mayaUsd/fileio/translators/translatorCurves.cpp b/lib/mayaUsd/fileio/translators/translatorCurves.cpp index a24c61e91c..8dbd743153 100644 --- a/lib/mayaUsd/fileio/translators/translatorCurves.cpp +++ b/lib/mayaUsd/fileio/translators/translatorCurves.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include +#include "translatorCurves.h" #include #include @@ -30,6 +29,8 @@ #include #include +#include "mayaUsd/fileio/translators/translatorUtil.h" + PXR_NAMESPACE_OPEN_SCOPE /* static */ diff --git a/lib/mayaUsd/fileio/translators/translatorCurves.h b/lib/mayaUsd/fileio/translators/translatorCurves.h index f4b930c250..c10c8e5700 100644 --- a/lib/mayaUsd/fileio/translators/translatorCurves.h +++ b/lib/mayaUsd/fileio/translators/translatorCurves.h @@ -16,16 +16,15 @@ #ifndef PXRUSDMAYA_TRANSLATOR_CURVES_H #define PXRUSDMAYA_TRANSLATOR_CURVES_H -#include - -#include -#include - #include #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" + PXR_NAMESPACE_OPEN_SCOPE /// \brief Provides helper functions for creating UsdCurves diff --git a/lib/mayaUsd/fileio/translators/translatorGprim.cpp b/lib/mayaUsd/fileio/translators/translatorGprim.cpp index 8df141946e..4e3cd66ed2 100644 --- a/lib/mayaUsd/fileio/translators/translatorGprim.cpp +++ b/lib/mayaUsd/fileio/translators/translatorGprim.cpp @@ -13,11 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "translatorGprim.h" #include -#include +#include "mayaUsd/utils/util.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorGprim.h b/lib/mayaUsd/fileio/translators/translatorGprim.h index b155575525..4b6e170311 100644 --- a/lib/mayaUsd/fileio/translators/translatorGprim.h +++ b/lib/mayaUsd/fileio/translators/translatorGprim.h @@ -16,16 +16,15 @@ #ifndef PXRUSDMAYA_TRANSLATOR_GPRIM_H #define PXRUSDMAYA_TRANSLATOR_GPRIM_H -#include - -#include -#include - #include #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primReaderContext.h" +#include "mayaUsd/fileio/primWriterContext.h" + PXR_NAMESPACE_OPEN_SCOPE /// \brief Provides helper functions for reading UsdGeomGprim. diff --git a/lib/mayaUsd/fileio/translators/translatorMaterial.cpp b/lib/mayaUsd/fileio/translators/translatorMaterial.cpp index 3d3cf9d302..8207bb2ffa 100644 --- a/lib/mayaUsd/fileio/translators/translatorMaterial.cpp +++ b/lib/mayaUsd/fileio/translators/translatorMaterial.cpp @@ -13,14 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include -#include -#include +#include "translatorMaterial.h" #include #include @@ -49,6 +42,13 @@ #include #include +#include "mayaUsd/fileio/primReaderContext.h" +#include "mayaUsd/fileio/shading/shadingModeExporter.h" +#include "mayaUsd/fileio/shading/shadingModeImporter.h" +#include "mayaUsd/fileio/shading/shadingModeRegistry.h" +#include "mayaUsd/fileio/writeJobContext.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE /* static */ diff --git a/lib/mayaUsd/fileio/translators/translatorMaterial.h b/lib/mayaUsd/fileio/translators/translatorMaterial.h index bf5ce41885..d9f5fce77f 100644 --- a/lib/mayaUsd/fileio/translators/translatorMaterial.h +++ b/lib/mayaUsd/fileio/translators/translatorMaterial.h @@ -16,11 +16,6 @@ #ifndef PXRUSDMAYA_TRANSLATOR_MATERIAL_H #define PXRUSDMAYA_TRANSLATOR_MATERIAL_H -#include -#include -#include -#include - #include #include @@ -29,6 +24,11 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primReaderContext.h" +#include "mayaUsd/fileio/writeJobContext.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE /// \brief Provides helper functions for reading UsdShadeMaterial diff --git a/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp b/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp index d415182ba0..f58b0fd3fb 100644 --- a/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp +++ b/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp @@ -29,11 +29,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include - -#include -#include +#include "translatorMayaReference.h" #include #include @@ -49,6 +45,9 @@ #include #include +#include "mayaUsd/base/debugCodes.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE namespace { diff --git a/lib/mayaUsd/fileio/translators/translatorMayaReference.h b/lib/mayaUsd/fileio/translators/translatorMayaReference.h index e6dc4e8786..aabcacb58f 100644 --- a/lib/mayaUsd/fileio/translators/translatorMayaReference.h +++ b/lib/mayaUsd/fileio/translators/translatorMayaReference.h @@ -29,20 +29,19 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef PXRUSDMAYA_TRANSLATOR_GPRIM_H #define PXRUSDMAYA_TRANSLATOR_GPRIM_H -#include -#include -#include - #include #include #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primReaderContext.h" +#include "mayaUsd/fileio/primWriterContext.h" + PXR_NAMESPACE_OPEN_SCOPE /// \brief Provides helper functions for reading UsdGeomGprim. diff --git a/lib/mayaUsd/fileio/translators/translatorMesh.cpp b/lib/mayaUsd/fileio/translators/translatorMesh.cpp index 38b4e1ba53..82d9dcb0e4 100644 --- a/lib/mayaUsd/fileio/translators/translatorMesh.cpp +++ b/lib/mayaUsd/fileio/translators/translatorMesh.cpp @@ -13,12 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include +#include "translatorMesh.h" #include #include @@ -43,6 +38,12 @@ #include #include +#include "mayaUsd/fileio/utils/meshUtil.h" +#include "mayaUsd/fileio/utils/readUtil.h" +#include "mayaUsd/nodes/pointBasedDeformerNode.h" +#include "mayaUsd/nodes/stageNode.h" +#include "mayaUsd/utils/util.h" + MAYAUSD_NS_DEF { TranslatorMeshRead::TranslatorMeshRead(const UsdGeomMesh& mesh, diff --git a/lib/mayaUsd/fileio/translators/translatorMesh.h b/lib/mayaUsd/fileio/translators/translatorMesh.h index 54a5b861ae..2a97c2f2d4 100644 --- a/lib/mayaUsd/fileio/translators/translatorMesh.h +++ b/lib/mayaUsd/fileio/translators/translatorMesh.h @@ -18,7 +18,7 @@ #pragma once -#include +#include "mayaUsd/base/api.h" #include #include diff --git a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp index b09f0bbc0c..069ec8291b 100644 --- a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp +++ b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp @@ -13,12 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include +#include "translatorNurbsPatch.h" #include #include @@ -37,6 +32,12 @@ #include +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" +#include "mayaUsd/fileio/translators/translatorGprim.h" +#include "mayaUsd/fileio/translators/translatorMaterial.h" +#include "mayaUsd/fileio/translators/translatorUtil.h" + PXR_NAMESPACE_OPEN_SCOPE /* static */ diff --git a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h index bd2ea946d8..b72c45ba85 100644 --- a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h +++ b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h @@ -16,16 +16,15 @@ #ifndef PXRUSDMAYA_TRANSLATOR_NURBSPATCH_H #define PXRUSDMAYA_TRANSLATOR_NURBSPATCH_H -#include - -#include -#include - #include #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" + PXR_NAMESPACE_OPEN_SCOPE struct UsdMayaTranslatorNurbsPatch diff --git a/lib/mayaUsd/fileio/translators/translatorPrim.cpp b/lib/mayaUsd/fileio/translators/translatorPrim.cpp index 1e051914cc..9c147e0954 100644 --- a/lib/mayaUsd/fileio/translators/translatorPrim.cpp +++ b/lib/mayaUsd/fileio/translators/translatorPrim.cpp @@ -13,17 +13,17 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include +#include "translatorPrim.h" #include #include #include +#include "mayaUsd/fileio/translators/translatorUtil.h" +#include "mayaUsd/fileio/utils/readUtil.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE void diff --git a/lib/mayaUsd/fileio/translators/translatorPrim.h b/lib/mayaUsd/fileio/translators/translatorPrim.h index 11a90a4076..50c96963c1 100644 --- a/lib/mayaUsd/fileio/translators/translatorPrim.h +++ b/lib/mayaUsd/fileio/translators/translatorPrim.h @@ -16,16 +16,15 @@ #ifndef PXRUSDMAYA_TRANSLATOR_PRIM_H #define PXRUSDMAYA_TRANSLATOR_PRIM_H -#include - -#include -#include - #include #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" + PXR_NAMESPACE_OPEN_SCOPE /// \brief Provides helper functions for reading UsdPrim. This should more diff --git a/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp b/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp index b9972da212..61dccad89f 100644 --- a/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp +++ b/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp @@ -13,16 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "translatorRfMLight.h" #include @@ -42,12 +33,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include #include @@ -55,6 +46,16 @@ #include #include +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" +#include "mayaUsd/fileio/primReaderRegistry.h" +#include "mayaUsd/fileio/primWriterArgs.h" +#include "mayaUsd/fileio/primWriterContext.h" +#include "mayaUsd/fileio/primWriterRegistry.h" +#include "mayaUsd/fileio/translators/translatorUtil.h" +#include "mayaUsd/fileio/translators/translatorXformable.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS( diff --git a/lib/mayaUsd/fileio/translators/translatorRfMLight.h b/lib/mayaUsd/fileio/translators/translatorRfMLight.h index 72b6d74e7f..878a181029 100644 --- a/lib/mayaUsd/fileio/translators/translatorRfMLight.h +++ b/lib/mayaUsd/fileio/translators/translatorRfMLight.h @@ -16,14 +16,13 @@ #ifndef PXRUSDMAYA_TRANSLATOR_RFM_LIGHT_H #define PXRUSDMAYA_TRANSLATOR_RFM_LIGHT_H -#include - #include -#include -#include -#include -#include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" +#include "mayaUsd/fileio/primWriterArgs.h" +#include "mayaUsd/fileio/primWriterContext.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorSkel.cpp b/lib/mayaUsd/fileio/translators/translatorSkel.cpp index 2e917f3cda..c3279384fc 100644 --- a/lib/mayaUsd/fileio/translators/translatorSkel.cpp +++ b/lib/mayaUsd/fileio/translators/translatorSkel.cpp @@ -13,15 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include +#include "translatorSkel.h" #include #include - #include #include #include @@ -44,6 +39,10 @@ #include #include +#include "mayaUsd/fileio/translators/translatorUtil.h" +#include "mayaUsd/fileio/translators/translatorXformable.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE // There are a lot of nodes and connections that go into a basic skinning rig. diff --git a/lib/mayaUsd/fileio/translators/translatorSkel.h b/lib/mayaUsd/fileio/translators/translatorSkel.h index 8b29b6348b..d701dd5b10 100644 --- a/lib/mayaUsd/fileio/translators/translatorSkel.h +++ b/lib/mayaUsd/fileio/translators/translatorSkel.h @@ -16,10 +16,10 @@ #ifndef PXRUSDMAYA_TRANSLATOR_SKEL_H #define PXRUSDMAYA_TRANSLATOR_SKEL_H -#include +#include "mayaUsd/base/api.h" -#include -#include +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" #include #include diff --git a/lib/mayaUsd/fileio/translators/translatorUtil.cpp b/lib/mayaUsd/fileio/translators/translatorUtil.cpp index 379c960dab..7a737ff30a 100644 --- a/lib/mayaUsd/fileio/translators/translatorUtil.cpp +++ b/lib/mayaUsd/fileio/translators/translatorUtil.cpp @@ -13,14 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include -#include -#include +#include "translatorUtil.h" #include #include @@ -37,6 +30,13 @@ #include #include +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" +#include "mayaUsd/fileio/translators/translatorXformable.h" +#include "mayaUsd/fileio/utils/adaptor.h" +#include "mayaUsd/fileio/utils/xformStack.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE const MString _DEFAULT_TRANSFORM_TYPE("transform"); diff --git a/lib/mayaUsd/fileio/translators/translatorUtil.h b/lib/mayaUsd/fileio/translators/translatorUtil.h index 88bfc2a902..ecb7123539 100644 --- a/lib/mayaUsd/fileio/translators/translatorUtil.h +++ b/lib/mayaUsd/fileio/translators/translatorUtil.h @@ -16,10 +16,10 @@ #ifndef PXRUSDMAYA_TRANSLATOR_UTIL_H #define PXRUSDMAYA_TRANSLATOR_UTIL_H -#include +#include "mayaUsd/base/api.h" -#include -#include +#include "mayaUsd/fileio/primReaderContext.h" +#include "mayaUsd/fileio/primReaderArgs.h" #include #include diff --git a/lib/mayaUsd/fileio/translators/translatorXformable.cpp b/lib/mayaUsd/fileio/translators/translatorXformable.cpp index 20abfc4db7..2c89fd5a07 100644 --- a/lib/mayaUsd/fileio/translators/translatorXformable.cpp +++ b/lib/mayaUsd/fileio/translators/translatorXformable.cpp @@ -13,10 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include +#include "translatorXformable.h" #include #include @@ -35,17 +32,21 @@ #include #include +#include #include #include #include #include -#include #include #include #include #include #include +#include "mayaUsd/fileio/translators/translatorPrim.h" +#include "mayaUsd/fileio/translators/translatorUtil.h" +#include "mayaUsd/fileio/utils/xformStack.h" + PXR_NAMESPACE_OPEN_SCOPE // This function retrieves a value for a given xformOp and given time sample. It diff --git a/lib/mayaUsd/fileio/translators/translatorXformable.h b/lib/mayaUsd/fileio/translators/translatorXformable.h index da59b15f2b..3078ea0434 100644 --- a/lib/mayaUsd/fileio/translators/translatorXformable.h +++ b/lib/mayaUsd/fileio/translators/translatorXformable.h @@ -16,10 +16,7 @@ #ifndef PXRUSDMAYA_TRANSLATOR_XFORMABLE_H #define PXRUSDMAYA_TRANSLATOR_XFORMABLE_H -#include - -#include -#include +#include "mayaUsd/base/api.h" #include @@ -28,6 +25,9 @@ #include #include +#include "mayaUsd/fileio/primReaderArgs.h" +#include "mayaUsd/fileio/primReaderContext.h" + PXR_NAMESPACE_OPEN_SCOPE /// \brief Provides helper functions for reading UsdGeomXformable. diff --git a/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp b/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp index 4bc0774375..dc16ca37e8 100644 --- a/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp +++ b/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp @@ -13,8 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - #include #include @@ -22,6 +20,8 @@ #include #include +#include "mayaUsd/fileio/translators/translatorXformable.h" + PXR_NAMESPACE_OPEN_SCOPE // XXX: diff --git a/lib/mayaUsd/fileio/utils/adaptor.cpp b/lib/mayaUsd/fileio/utils/adaptor.cpp index 691bb516d3..d6f3523699 100644 --- a/lib/mayaUsd/fileio/utils/adaptor.cpp +++ b/lib/mayaUsd/fileio/utils/adaptor.cpp @@ -13,13 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include -#include +#include "adaptor.h" #include #include @@ -30,6 +24,12 @@ #include #include +#include "mayaUsd/fileio/primWriterRegistry.h" +#include "mayaUsd/fileio/registryHelper.h" +#include "mayaUsd/fileio/utils/readUtil.h" +#include "mayaUsd/fileio/utils/writeUtil.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE static std::string diff --git a/lib/mayaUsd/fileio/utils/adaptor.h b/lib/mayaUsd/fileio/utils/adaptor.h index 8e6e104c1b..e9bc2388a0 100644 --- a/lib/mayaUsd/fileio/utils/adaptor.h +++ b/lib/mayaUsd/fileio/utils/adaptor.h @@ -16,8 +16,6 @@ #ifndef PXRUSDMAYA_ADAPTOR_H #define PXRUSDMAYA_ADAPTOR_H -#include - #include #include #include @@ -30,6 +28,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMayaAdaptor diff --git a/lib/mayaUsd/fileio/utils/meshUtil.cpp b/lib/mayaUsd/fileio/utils/meshUtil.cpp index 8dd22562b4..1c228510e1 100644 --- a/lib/mayaUsd/fileio/utils/meshUtil.cpp +++ b/lib/mayaUsd/fileio/utils/meshUtil.cpp @@ -15,12 +15,7 @@ // // Modifications copyright (C) 2020 Autodesk // -#include -#include -#include -#include -#include -#include +#include "meshUtil.h" #include #include @@ -48,6 +43,12 @@ #include #include +#include "mayaUsd/fileio/utils/adaptor.h" +#include "mayaUsd/fileio/utils/readUtil.h" +#include "mayaUsd/fileio/utils/roundTripUtil.h" +#include "mayaUsd/utils/colorSpace.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PUBLIC_TOKENS(UsdMayaMeshColorSetTokens, diff --git a/lib/mayaUsd/fileio/utils/meshUtil.h b/lib/mayaUsd/fileio/utils/meshUtil.h index 824fa03b64..3298c8741f 100644 --- a/lib/mayaUsd/fileio/utils/meshUtil.h +++ b/lib/mayaUsd/fileio/utils/meshUtil.h @@ -15,12 +15,9 @@ // // Modifications copyright (C) 2020 Autodesk // - #ifndef PXRUSDMAYA_MESH_UTIL_H #define PXRUSDMAYA_MESH_UTIL_H -#include - #include #include #include @@ -34,6 +31,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdGeomMesh; diff --git a/lib/mayaUsd/fileio/utils/readUtil.cpp b/lib/mayaUsd/fileio/utils/readUtil.cpp index 0f9c63e265..87c52957bd 100644 --- a/lib/mayaUsd/fileio/utils/readUtil.cpp +++ b/lib/mayaUsd/fileio/utils/readUtil.cpp @@ -13,10 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include +#include "readUtil.h" #include #include @@ -46,6 +43,10 @@ #include #include +#include "mayaUsd/fileio/utils/adaptor.h" +#include "mayaUsd/utils/colorSpace.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_ENV_SETTING( diff --git a/lib/mayaUsd/fileio/utils/readUtil.h b/lib/mayaUsd/fileio/utils/readUtil.h index 3299def8d9..fe0301339b 100644 --- a/lib/mayaUsd/fileio/utils/readUtil.h +++ b/lib/mayaUsd/fileio/utils/readUtil.h @@ -13,12 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef PXRUSDMAYA_READUTIL_H #define PXRUSDMAYA_READUTIL_H -#include - #include #include @@ -30,6 +27,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// This struct contains helpers for reading USD (thus writing Maya data). diff --git a/lib/mayaUsd/fileio/utils/roundTripUtil.cpp b/lib/mayaUsd/fileio/utils/roundTripUtil.cpp index ccf89e2c56..0d358e7fcf 100644 --- a/lib/mayaUsd/fileio/utils/roundTripUtil.cpp +++ b/lib/mayaUsd/fileio/utils/roundTripUtil.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "roundTripUtil.h" #include #include diff --git a/lib/mayaUsd/fileio/utils/roundTripUtil.h b/lib/mayaUsd/fileio/utils/roundTripUtil.h index 18c11b83a7..3d975d2dda 100644 --- a/lib/mayaUsd/fileio/utils/roundTripUtil.h +++ b/lib/mayaUsd/fileio/utils/roundTripUtil.h @@ -16,12 +16,12 @@ #ifndef PXRUSDMAYA_ROUND_TRIP_UTIL_H #define PXRUSDMAYA_ROUND_TRIP_UTIL_H -#include - #include #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// This holds some utility functions for dealing with data from Maya to Usd diff --git a/lib/mayaUsd/fileio/utils/shadingUtil.cpp b/lib/mayaUsd/fileio/utils/shadingUtil.cpp index 9bd8b56800..99e9d57e22 100644 --- a/lib/mayaUsd/fileio/utils/shadingUtil.cpp +++ b/lib/mayaUsd/fileio/utils/shadingUtil.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "shadingUtil.h" #include #include diff --git a/lib/mayaUsd/fileio/utils/shadingUtil.h b/lib/mayaUsd/fileio/utils/shadingUtil.h index 38c18e5c02..670f39643b 100644 --- a/lib/mayaUsd/fileio/utils/shadingUtil.h +++ b/lib/mayaUsd/fileio/utils/shadingUtil.h @@ -16,8 +16,6 @@ #ifndef PXRUSDMAYA_SHADING_UTIL_H #define PXRUSDMAYA_SHADING_UTIL_H -#include - #include #include #include @@ -26,6 +24,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE namespace UsdMayaShadingUtil diff --git a/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp b/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp index 915b9e3616..4e9d125f6c 100644 --- a/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp +++ b/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include +#include "userTaggedAttribute.h" #include #include @@ -33,6 +32,8 @@ #include #include +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PUBLIC_TOKENS( diff --git a/lib/mayaUsd/fileio/utils/userTaggedAttribute.h b/lib/mayaUsd/fileio/utils/userTaggedAttribute.h index c63b50ffc8..436085e003 100644 --- a/lib/mayaUsd/fileio/utils/userTaggedAttribute.h +++ b/lib/mayaUsd/fileio/utils/userTaggedAttribute.h @@ -16,8 +16,6 @@ #ifndef PXRUSDMAYA_USER_TAGGED_ATTRIBUTE_H #define PXRUSDMAYA_USER_TAGGED_ATTRIBUTE_H -#include - #include #include #include @@ -30,6 +28,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE #define PXRUSDMAYA_ATTR_TOKENS \ diff --git a/lib/mayaUsd/fileio/utils/writeUtil.cpp b/lib/mayaUsd/fileio/utils/writeUtil.cpp index 8095aff8ea..d3428d0caa 100644 --- a/lib/mayaUsd/fileio/utils/writeUtil.cpp +++ b/lib/mayaUsd/fileio/utils/writeUtil.cpp @@ -13,11 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include +#include "writeUtil.h" #include #include @@ -67,6 +63,11 @@ #include #include +#include "mayaUsd/fileio/translators/translatorUtil.h" +#include "mayaUsd/fileio/utils/adaptor.h" +#include "mayaUsd/fileio/utils/userTaggedAttribute.h" +#include "mayaUsd/utils/colorSpace.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_ENV_SETTING( diff --git a/lib/mayaUsd/fileio/utils/writeUtil.h b/lib/mayaUsd/fileio/utils/writeUtil.h index 7522cf49c3..b0a547c4eb 100644 --- a/lib/mayaUsd/fileio/utils/writeUtil.h +++ b/lib/mayaUsd/fileio/utils/writeUtil.h @@ -16,9 +16,6 @@ #ifndef PXRUSDMAYA_WRITEUTIL_H #define PXRUSDMAYA_WRITEUTIL_H -#include -#include - #include #include @@ -38,6 +35,9 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/utils/userTaggedAttribute.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdUtilsSparseValueWriter; diff --git a/lib/mayaUsd/fileio/utils/xformStack.cpp b/lib/mayaUsd/fileio/utils/xformStack.cpp index ccc7c8624e..9fd636dd4a 100644 --- a/lib/mayaUsd/fileio/utils/xformStack.cpp +++ b/lib/mayaUsd/fileio/utils/xformStack.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "xformStack.h" #include diff --git a/lib/mayaUsd/fileio/utils/xformStack.h b/lib/mayaUsd/fileio/utils/xformStack.h index 05016a01a5..ed5f509380 100644 --- a/lib/mayaUsd/fileio/utils/xformStack.h +++ b/lib/mayaUsd/fileio/utils/xformStack.h @@ -12,15 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef PXRUSDMAYA_XFORM_STACK_H #define PXRUSDMAYA_XFORM_STACK_H -#include - #include -#include #include +#include #include @@ -29,6 +26,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE // Note: pivotTranslate is currently not used in MayaXformStack, diff --git a/lib/mayaUsd/fileio/writeJobContext.cpp b/lib/mayaUsd/fileio/writeJobContext.cpp index 12abecb250..5e6e2bc71a 100644 --- a/lib/mayaUsd/fileio/writeJobContext.cpp +++ b/lib/mayaUsd/fileio/writeJobContext.cpp @@ -13,15 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "writeJobContext.h" #include #include @@ -55,6 +47,15 @@ #include #include +#include "mayaUsd/fileio/instancedNodeWriter.h" +#include "mayaUsd/fileio/jobs/jobArgs.h" +#include "mayaUsd/fileio/primWriter.h" +#include "mayaUsd/fileio/primWriterRegistry.h" +#include "mayaUsd/fileio/transformWriter.h" +#include "mayaUsd/fileio/translators/skelBindingsProcessor.h" +#include "mayaUsd/utils/stageCache.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS( diff --git a/lib/mayaUsd/fileio/writeJobContext.h b/lib/mayaUsd/fileio/writeJobContext.h index 054c7a837c..46278468d1 100644 --- a/lib/mayaUsd/fileio/writeJobContext.h +++ b/lib/mayaUsd/fileio/writeJobContext.h @@ -16,12 +16,6 @@ #ifndef PXRUSDMAYA_WRITE_JOB_CONTEXT_H #define PXRUSDMAYA_WRITE_JOB_CONTEXT_H -#include - -#include -#include -#include - #include #include @@ -31,6 +25,11 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/jobs/jobArgs.h" +#include "mayaUsd/fileio/primWriter.h" +#include "mayaUsd/fileio/primWriterRegistry.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdMaya_SkelBindingsProcessor; diff --git a/lib/mayaUsd/listeners/notice.cpp b/lib/mayaUsd/listeners/notice.cpp index ef7760a4b0..b6687f0e59 100644 --- a/lib/mayaUsd/listeners/notice.cpp +++ b/lib/mayaUsd/listeners/notice.cpp @@ -13,13 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - #include #include #include +#include "mayaUsd/listeners/notice.h" + PXR_NAMESPACE_OPEN_SCOPE namespace { diff --git a/lib/mayaUsd/listeners/notice.h b/lib/mayaUsd/listeners/notice.h index 3c1e0d61a6..8db253e6d8 100644 --- a/lib/mayaUsd/listeners/notice.h +++ b/lib/mayaUsd/listeners/notice.h @@ -16,13 +16,13 @@ #ifndef USDMAYA_NOTICE_H #define USDMAYA_NOTICE_H -#include - #include #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// Notice sent when the Maya scene resets, either by opening a new scene or diff --git a/lib/mayaUsd/listeners/proxyShapeNotice.cpp b/lib/mayaUsd/listeners/proxyShapeNotice.cpp index 20a21638d3..c7c6194089 100644 --- a/lib/mayaUsd/listeners/proxyShapeNotice.cpp +++ b/lib/mayaUsd/listeners/proxyShapeNotice.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "proxyShapeNotice.h" #include diff --git a/lib/mayaUsd/listeners/proxyShapeNotice.h b/lib/mayaUsd/listeners/proxyShapeNotice.h index b8cb468514..a40da65c74 100644 --- a/lib/mayaUsd/listeners/proxyShapeNotice.h +++ b/lib/mayaUsd/listeners/proxyShapeNotice.h @@ -16,12 +16,12 @@ #ifndef USDMAYA_PROXYSTAGE_NOTICE_H #define USDMAYA_PROXYSTAGE_NOTICE_H -#include - #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE class MayaUsdProxyShapeBase; diff --git a/lib/mayaUsd/listeners/stageNoticeListener.cpp b/lib/mayaUsd/listeners/stageNoticeListener.cpp index 6d04d0b521..e0f4b67a94 100644 --- a/lib/mayaUsd/listeners/stageNoticeListener.cpp +++ b/lib/mayaUsd/listeners/stageNoticeListener.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "stageNoticeListener.h" #include #include diff --git a/lib/mayaUsd/listeners/stageNoticeListener.h b/lib/mayaUsd/listeners/stageNoticeListener.h index 63c296b0a2..af2eb9d18d 100644 --- a/lib/mayaUsd/listeners/stageNoticeListener.h +++ b/lib/mayaUsd/listeners/stageNoticeListener.h @@ -16,8 +16,6 @@ #ifndef PXRUSDMAYA_STAGE_NOTICE_LISTENER_H #define PXRUSDMAYA_STAGE_NOTICE_LISTENER_H -#include - #include #include @@ -26,6 +24,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// A notice listener that can invoke callbacks in response to notices about a diff --git a/lib/mayaUsd/nodes/hdImagingShape.cpp b/lib/mayaUsd/nodes/hdImagingShape.cpp index 34e26cb62f..4cf7df4019 100644 --- a/lib/mayaUsd/nodes/hdImagingShape.cpp +++ b/lib/mayaUsd/nodes/hdImagingShape.cpp @@ -13,17 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include +#include "hdImagingShape.h" #include #include -#include #include #include +#include #include #include #include @@ -48,6 +45,10 @@ #include #include +#include "mayaUsd/fileio/translators/translatorUtil.h" +#include "mayaUsd/utils/blockSceneModificationContext.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_ENV_SETTING( diff --git a/lib/mayaUsd/nodes/hdImagingShape.h b/lib/mayaUsd/nodes/hdImagingShape.h index a97ed368d6..a6d4eaf604 100644 --- a/lib/mayaUsd/nodes/hdImagingShape.h +++ b/lib/mayaUsd/nodes/hdImagingShape.h @@ -16,9 +16,6 @@ #ifndef PXRUSDMAYA_HD_IMAGING_SHAPE_H #define PXRUSDMAYA_HD_IMAGING_SHAPE_H -#include -#include - #include #include #include @@ -34,6 +31,9 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE #define PXRUSDMAYA_HD_IMAGING_SHAPE_TOKENS \ diff --git a/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp b/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp index aa9de9b610..f731104682 100644 --- a/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp +++ b/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp @@ -13,24 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "pointBasedDeformerNode.h" -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include +#include #include #include @@ -50,7 +35,22 @@ #include #include -#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "mayaUsd/nodes/stageData.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/nodes/pointBasedDeformerNode.h b/lib/mayaUsd/nodes/pointBasedDeformerNode.h index 6645c87399..eb17fbafb3 100644 --- a/lib/mayaUsd/nodes/pointBasedDeformerNode.h +++ b/lib/mayaUsd/nodes/pointBasedDeformerNode.h @@ -16,8 +16,6 @@ #ifndef PXRUSDMAYA_POINT_BASED_DEFORMER_NODE_H #define PXRUSDMAYA_POINT_BASED_DEFORMER_NODE_H -#include - #include #include #include @@ -30,6 +28,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE #define PXRUSDMAYA_POINT_BASED_DEFORMER_NODE_TOKENS \ diff --git a/lib/mayaUsd/nodes/proxyShapeBase.cpp b/lib/mayaUsd/nodes/proxyShapeBase.cpp index bb3b446116..6ffc0f371c 100644 --- a/lib/mayaUsd/nodes/proxyShapeBase.cpp +++ b/lib/mayaUsd/nodes/proxyShapeBase.cpp @@ -13,13 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include -#include +#include "proxyShapeBase.h" #include #include @@ -84,6 +78,13 @@ #include #endif +#include "mayaUsd/base/debugCodes.h" +#include "mayaUsd/listeners/proxyShapeNotice.h" +#include "mayaUsd/nodes/stageData.h" +#include "mayaUsd/utils/query.h" +#include "mayaUsd/utils/stageCache.h" +#include "mayaUsd/utils/utilFileSystem.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PUBLIC_TOKENS(MayaUsdProxyShapeBaseTokens, diff --git a/lib/mayaUsd/nodes/proxyShapeBase.h b/lib/mayaUsd/nodes/proxyShapeBase.h index c56217eea5..424bb66692 100644 --- a/lib/mayaUsd/nodes/proxyShapeBase.h +++ b/lib/mayaUsd/nodes/proxyShapeBase.h @@ -16,10 +16,6 @@ #ifndef PXRUSDMAYA_PROXY_SHAPE_BASE_H #define PXRUSDMAYA_PROXY_SHAPE_BASE_H -#include -#include -#include - #include #include @@ -58,10 +54,12 @@ constexpr int USD_UFE_RUNTIME_ID = 2; constexpr char USD_UFE_SEPARATOR = '/'; #endif +#include "mayaUsd/base/api.h" +#include "mayaUsd/listeners/stageNoticeListener.h" +#include "mayaUsd/nodes/usdPrimProvider.h" PXR_NAMESPACE_OPEN_SCOPE - #define MAYAUSD_PROXY_SHAPE_BASE_TOKENS \ ((MayaTypeName, "mayaUsdProxyShapeBase")) @@ -69,7 +67,6 @@ TF_DECLARE_PUBLIC_TOKENS(MayaUsdProxyShapeBaseTokens, MAYAUSD_CORE_PUBLIC, MAYAUSD_PROXY_SHAPE_BASE_TOKENS); - class MayaUsdProxyShapeBase : public MPxSurfaceShape, public UsdMayaUsdPrimProvider { diff --git a/lib/mayaUsd/nodes/proxyShapePlugin.cpp b/lib/mayaUsd/nodes/proxyShapePlugin.cpp index c8628d1fe7..8b803a7fbf 100644 --- a/lib/mayaUsd/nodes/proxyShapePlugin.cpp +++ b/lib/mayaUsd/nodes/proxyShapePlugin.cpp @@ -13,10 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include +#include "proxyShapePlugin.h" #include #include @@ -32,6 +29,10 @@ #include +#include "mayaUsd/nodes/hdImagingShape.h" +#include "mayaUsd/nodes/proxyShapeBase.h" +#include "mayaUsd/nodes/stageData.h" + PXR_NAMESPACE_USING_DIRECTIVE namespace { diff --git a/lib/mayaUsd/nodes/proxyShapePlugin.h b/lib/mayaUsd/nodes/proxyShapePlugin.h index 9b9a036243..86a390cfb6 100644 --- a/lib/mayaUsd/nodes/proxyShapePlugin.h +++ b/lib/mayaUsd/nodes/proxyShapePlugin.h @@ -16,12 +16,12 @@ #ifndef PXRUSDMAYA_PROXY_SHAPE_PLUGIN_H #define PXRUSDMAYA_PROXY_SHAPE_PLUGIN_H -#include - #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// \class MayaUsdProxyShapePlugin diff --git a/lib/mayaUsd/nodes/stageData.cpp b/lib/mayaUsd/nodes/stageData.cpp index 55652257d8..135a0e0242 100644 --- a/lib/mayaUsd/nodes/stageData.cpp +++ b/lib/mayaUsd/nodes/stageData.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "stageData.h" #include #include diff --git a/lib/mayaUsd/nodes/stageData.h b/lib/mayaUsd/nodes/stageData.h index ad2c94b0cf..672b7fff6f 100644 --- a/lib/mayaUsd/nodes/stageData.h +++ b/lib/mayaUsd/nodes/stageData.h @@ -16,8 +16,6 @@ #ifndef PXRUSDMAYA_STAGE_DATA_H #define PXRUSDMAYA_STAGE_DATA_H -#include - #include #include #include @@ -29,6 +27,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE #define PXRMAYAUSD_STAGE_DATA_TOKENS \ diff --git a/lib/mayaUsd/nodes/stageNode.cpp b/lib/mayaUsd/nodes/stageNode.cpp index e8989a8417..1658027290 100644 --- a/lib/mayaUsd/nodes/stageNode.cpp +++ b/lib/mayaUsd/nodes/stageNode.cpp @@ -13,9 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include +#include "stageNode.h" #include @@ -42,6 +40,9 @@ #include #include +#include "mayaUsd/nodes/stageData.h" +#include "mayaUsd/utils/stageCache.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PUBLIC_TOKENS(UsdMayaStageNodeTokens, diff --git a/lib/mayaUsd/nodes/stageNode.h b/lib/mayaUsd/nodes/stageNode.h index b2db69d5e6..c8cc9e23a4 100644 --- a/lib/mayaUsd/nodes/stageNode.h +++ b/lib/mayaUsd/nodes/stageNode.h @@ -16,8 +16,6 @@ #ifndef PXRUSDMAYA_STAGE_NODE_H #define PXRUSDMAYA_STAGE_NODE_H -#include - #include #include #include @@ -29,6 +27,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE #define PXRUSDMAYA_STAGE_NODE_TOKENS \ diff --git a/lib/mayaUsd/nodes/usdPrimProvider.cpp b/lib/mayaUsd/nodes/usdPrimProvider.cpp index f5ba624bb7..463bc044a1 100644 --- a/lib/mayaUsd/nodes/usdPrimProvider.cpp +++ b/lib/mayaUsd/nodes/usdPrimProvider.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "usdPrimProvider.h" #include diff --git a/lib/mayaUsd/nodes/usdPrimProvider.h b/lib/mayaUsd/nodes/usdPrimProvider.h index 1e43d59945..fa53bb0e01 100644 --- a/lib/mayaUsd/nodes/usdPrimProvider.h +++ b/lib/mayaUsd/nodes/usdPrimProvider.h @@ -16,11 +16,11 @@ #ifndef PXRUSDMAYA_USD_PRIM_PROVIDER_H #define PXRUSDMAYA_USD_PRIM_PROVIDER_H -#include - #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE // interface class diff --git a/lib/mayaUsd/python/moduleDeps.cpp b/lib/mayaUsd/python/moduleDeps.cpp index fe5b1249d6..d4bc421308 100644 --- a/lib/mayaUsd/python/moduleDeps.cpp +++ b/lib/mayaUsd/python/moduleDeps.cpp @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #include #include diff --git a/lib/mayaUsd/python/wrapAdaptor.cpp b/lib/mayaUsd/python/wrapAdaptor.cpp index 2fc302f057..ca82e640e1 100644 --- a/lib/mayaUsd/python/wrapAdaptor.cpp +++ b/lib/mayaUsd/python/wrapAdaptor.cpp @@ -13,10 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include - #include #include @@ -27,6 +23,10 @@ #include #include +#include +#include +#include + using namespace boost::python; PXR_NAMESPACE_USING_DIRECTIVE; diff --git a/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp b/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp index ed1f02f0c1..ae6c60a0a1 100644 --- a/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp +++ b/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp @@ -13,14 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - #include #include #include +#include + using namespace boost::python; PXR_NAMESPACE_USING_DIRECTIVE; diff --git a/lib/mayaUsd/python/wrapColorSpace.cpp b/lib/mayaUsd/python/wrapColorSpace.cpp index e14ba83a59..97b02de4e3 100644 --- a/lib/mayaUsd/python/wrapColorSpace.cpp +++ b/lib/mayaUsd/python/wrapColorSpace.cpp @@ -13,8 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - #include #include @@ -25,6 +23,8 @@ #include #include +#include + using namespace std; using namespace boost::python; using namespace boost; diff --git a/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp b/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp index 3a2944fdc2..0f5e9750ba 100644 --- a/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp +++ b/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp @@ -13,14 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include - #include #include #include +#include + using namespace boost::python; PXR_NAMESPACE_USING_DIRECTIVE; diff --git a/lib/mayaUsd/python/wrapMeshUtil.cpp b/lib/mayaUsd/python/wrapMeshUtil.cpp index c18eeabdae..304aa736ef 100644 --- a/lib/mayaUsd/python/wrapMeshUtil.cpp +++ b/lib/mayaUsd/python/wrapMeshUtil.cpp @@ -13,10 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include -#include - #include #include @@ -32,6 +28,9 @@ #include #include +#include +#include + using namespace boost::python; PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/python/wrapQuery.cpp b/lib/mayaUsd/python/wrapQuery.cpp index 20559839db..5ef7df9515 100644 --- a/lib/mayaUsd/python/wrapQuery.cpp +++ b/lib/mayaUsd/python/wrapQuery.cpp @@ -13,14 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - #include #include #include #include +#include + using namespace std; using namespace boost::python; using namespace boost; diff --git a/lib/mayaUsd/python/wrapReadUtil.cpp b/lib/mayaUsd/python/wrapReadUtil.cpp index ac3f539c87..3afed7d846 100644 --- a/lib/mayaUsd/python/wrapReadUtil.cpp +++ b/lib/mayaUsd/python/wrapReadUtil.cpp @@ -13,10 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include -#include - #include #include @@ -26,6 +22,9 @@ #include #include +#include +#include + using namespace boost::python; PXR_NAMESPACE_USING_DIRECTIVE; diff --git a/lib/mayaUsd/python/wrapRoundTripUtil.cpp b/lib/mayaUsd/python/wrapRoundTripUtil.cpp index 776402b588..8c790ecdc0 100644 --- a/lib/mayaUsd/python/wrapRoundTripUtil.cpp +++ b/lib/mayaUsd/python/wrapRoundTripUtil.cpp @@ -13,8 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - #include #include @@ -22,6 +20,8 @@ #include #include +#include + using namespace std; using namespace boost::python; using namespace boost; diff --git a/lib/mayaUsd/python/wrapStageCache.cpp b/lib/mayaUsd/python/wrapStageCache.cpp index 7015a1b918..f74a641c7e 100644 --- a/lib/mayaUsd/python/wrapStageCache.cpp +++ b/lib/mayaUsd/python/wrapStageCache.cpp @@ -13,8 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - #include #include #include @@ -22,6 +20,8 @@ #include #include +#include + using namespace std; using namespace boost::python; using namespace boost; diff --git a/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp b/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp index 2ebc163a7c..50d1958bef 100644 --- a/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp +++ b/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp @@ -13,9 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include - #include #include @@ -33,6 +30,9 @@ #include #include +#include +#include + PXR_NAMESPACE_USING_DIRECTIVE namespace { diff --git a/lib/mayaUsd/python/wrapWriteUtil.cpp b/lib/mayaUsd/python/wrapWriteUtil.cpp index 710e7c6f77..4d83035ec6 100644 --- a/lib/mayaUsd/python/wrapWriteUtil.cpp +++ b/lib/mayaUsd/python/wrapWriteUtil.cpp @@ -13,10 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include - #include + #include #include @@ -24,6 +22,9 @@ #include #include +#include +#include + using namespace boost::python; PXR_NAMESPACE_USING_DIRECTIVE; diff --git a/lib/mayaUsd/python/wrapXformStack.cpp b/lib/mayaUsd/python/wrapXformStack.cpp index 2579a37d3c..e79ca3442d 100644 --- a/lib/mayaUsd/python/wrapXformStack.cpp +++ b/lib/mayaUsd/python/wrapXformStack.cpp @@ -13,14 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include -#include - #include #include #include @@ -29,6 +21,14 @@ #include #include +#include +#include +#include +#include +#include + +#include + using namespace std; using boost::python::object; using boost::python::class_; diff --git a/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.cpp b/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.cpp index 300e5e0eb2..3cdb9d0352 100644 --- a/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.cpp +++ b/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.cpp @@ -13,9 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include +#include "defaultLightDelegate.h" #include #include @@ -23,6 +21,8 @@ #include #include +#include + PXR_NAMESPACE_OPEN_SCOPE // clang-format off diff --git a/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.h b/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.h index 6960a85e33..6a5c389e52 100644 --- a/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.h +++ b/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.h @@ -16,16 +16,15 @@ #ifndef MTOH_DEFAULT_LIGHT_DELEGATE_H #define MTOH_DEFAULT_LIGHT_DELEGATE_H -#include - #include #include #include - #include #include #include +#include + PXR_NAMESPACE_OPEN_SCOPE class MtohDefaultLightDelegate : public HdSceneDelegate, public HdMayaDelegate { diff --git a/lib/mayaUsd/render/mayaToHydra/plugin.cpp b/lib/mayaUsd/render/mayaToHydra/plugin.cpp index 0f5db673bc..e89878f27f 100644 --- a/lib/mayaUsd/render/mayaToHydra/plugin.cpp +++ b/lib/mayaUsd/render/mayaToHydra/plugin.cpp @@ -13,20 +13,21 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include - #include #include -#include +#include #include #include #include +#include + +#include "renderGlobals.h" +#include "renderOverride.h" +#include "viewCommand.h" + PXR_NAMESPACE_USING_DIRECTIVE PLUGIN_EXPORT MStatus initializePlugin(MObject obj) { diff --git a/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.cpp b/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.cpp index 92cb8e78c2..be56e0d132 100644 --- a/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.cpp +++ b/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "pluginDebugCodes.h" #include diff --git a/lib/mayaUsd/render/mayaToHydra/renderGlobals.cpp b/lib/mayaUsd/render/mayaToHydra/renderGlobals.cpp index e29834e06e..d688bd90a2 100644 --- a/lib/mayaUsd/render/mayaToHydra/renderGlobals.cpp +++ b/lib/mayaUsd/render/mayaToHydra/renderGlobals.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include +#include "renderGlobals.h" #include #include @@ -32,6 +31,8 @@ #include #include +#include "utils.h" + PXR_NAMESPACE_OPEN_SCOPE // clang-format off diff --git a/lib/mayaUsd/render/mayaToHydra/renderGlobals.h b/lib/mayaUsd/render/mayaToHydra/renderGlobals.h index 4a53db783e..cfed597fe4 100644 --- a/lib/mayaUsd/render/mayaToHydra/renderGlobals.h +++ b/lib/mayaUsd/render/mayaToHydra/renderGlobals.h @@ -16,11 +16,6 @@ #ifndef MTOH_RENDER_GLOBALS_H #define MTOH_RENDER_GLOBALS_H -#include -#include - -#include - #include #include @@ -31,6 +26,11 @@ #include #include +#include + +#include "tokens.h" +#include "utils.h" + PXR_NAMESPACE_OPEN_SCOPE struct MtohRenderGlobals { diff --git a/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp b/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp index d2d2ada992..7eb0f1d5d8 100644 --- a/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp +++ b/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp @@ -13,17 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include -#include - -#include -#include -#include +#include "renderOverride.h" #include #include @@ -44,7 +34,6 @@ #include #include #include - #include #if USD_VERSION_NUM >= 1911 #include @@ -68,6 +57,17 @@ PXR_NAMESPACE_CLOSE_SCOPE #include #endif // WANT_UFE_BUILD +#include +#include +#include + +#include + +#include "pluginDebugCodes.h" +#include "renderOverrideUtils.h" +#include "tokens.h" +#include "utils.h" + PXR_NAMESPACE_OPEN_SCOPE namespace { diff --git a/lib/mayaUsd/render/mayaToHydra/renderOverride.h b/lib/mayaUsd/render/mayaToHydra/renderOverride.h index 21a8003037..1b311ccf75 100644 --- a/lib/mayaUsd/render/mayaToHydra/renderOverride.h +++ b/lib/mayaUsd/render/mayaToHydra/renderOverride.h @@ -16,13 +16,6 @@ #ifndef MTOH_VIEW_OVERRIDE_H #define MTOH_VIEW_OVERRIDE_H -#include -#include -#include - -#include -#include - #include #include #include @@ -59,6 +52,13 @@ PXR_NAMESPACE_CLOSE_SCOPE #include #endif // WANT_UFE_BUILD +#include +#include + +#include "defaultLightDelegate.h" +#include "renderGlobals.h" +#include "utils.h" + PXR_NAMESPACE_OPEN_SCOPE class MtohRenderOverride : public MHWRender::MRenderOverride { diff --git a/lib/mayaUsd/render/mayaToHydra/shadingModeExporter.cpp b/lib/mayaUsd/render/mayaToHydra/shadingModeExporter.cpp index 7c94d4d9a8..e642dd2b25 100644 --- a/lib/mayaUsd/render/mayaToHydra/shadingModeExporter.cpp +++ b/lib/mayaUsd/render/mayaToHydra/shadingModeExporter.cpp @@ -13,16 +13,16 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include - -#include - #include #include #include #include +#include +#include + +#include + PXR_NAMESPACE_OPEN_SCOPE // clang-format off diff --git a/lib/mayaUsd/render/mayaToHydra/tokens.cpp b/lib/mayaUsd/render/mayaToHydra/tokens.cpp index 253020a3cb..4cc78edb95 100644 --- a/lib/mayaUsd/render/mayaToHydra/tokens.cpp +++ b/lib/mayaUsd/render/mayaToHydra/tokens.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "tokens.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/mayaToHydra/utils.cpp b/lib/mayaUsd/render/mayaToHydra/utils.cpp index 1fcc3d0ebd..db1dc0a36d 100644 --- a/lib/mayaUsd/render/mayaToHydra/utils.cpp +++ b/lib/mayaUsd/render/mayaToHydra/utils.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include +#include "utils.h" #include @@ -31,6 +30,8 @@ PXR_NAMESPACE_CLOSE_SCOPE #include +#include "tokens.h" + PXR_NAMESPACE_OPEN_SCOPE namespace { diff --git a/lib/mayaUsd/render/mayaToHydra/viewCommand.cpp b/lib/mayaUsd/render/mayaToHydra/viewCommand.cpp index e9e048c7db..1d69d5a69c 100644 --- a/lib/mayaUsd/render/mayaToHydra/viewCommand.cpp +++ b/lib/mayaUsd/render/mayaToHydra/viewCommand.cpp @@ -13,19 +13,19 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include - -#include +#include "viewCommand.h" #include #include #include +#include + +#include "renderGlobals.h" +#include "renderOverride.h" +#include "renderOverride.h" +#include "utils.h" + PXR_NAMESPACE_OPEN_SCOPE const MString MtohViewCmd::name("mtoh"); diff --git a/lib/mayaUsd/render/px_vp20/glslProgram.cpp b/lib/mayaUsd/render/px_vp20/glslProgram.cpp index b36b282340..7ee285f6e2 100644 --- a/lib/mayaUsd/render/px_vp20/glslProgram.cpp +++ b/lib/mayaUsd/render/px_vp20/glslProgram.cpp @@ -17,7 +17,7 @@ // glew must be included before any other GL header. #include -#include +#include "glslProgram.h" #include diff --git a/lib/mayaUsd/render/px_vp20/glslProgram.h b/lib/mayaUsd/render/px_vp20/glslProgram.h index 1312b6d146..9f55a1ad7f 100644 --- a/lib/mayaUsd/render/px_vp20/glslProgram.h +++ b/lib/mayaUsd/render/px_vp20/glslProgram.h @@ -16,17 +16,16 @@ /// \file glslProgram.h - #ifndef __PX_VP20_GLSL_PROGRAM_H__ #define __PX_VP20_GLSL_PROGRAM_H__ -#include - #include #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// \class PxrMayaGLSLProgram diff --git a/lib/mayaUsd/render/px_vp20/utils.cpp b/lib/mayaUsd/render/px_vp20/utils.cpp index d32acfcdbd..552ed76595 100644 --- a/lib/mayaUsd/render/px_vp20/utils.cpp +++ b/lib/mayaUsd/render/px_vp20/utils.cpp @@ -13,11 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // + // glew must be included before any other GL header. #include -#include -#include +#include "utils.h" #include #include @@ -38,9 +38,9 @@ #include #include #include +#include #include #include -#include #include #include @@ -56,6 +56,8 @@ #include #include +#include "mayaUsd/render/px_vp20/glslProgram.h" + PXR_NAMESPACE_OPEN_SCOPE /* static */ diff --git a/lib/mayaUsd/render/px_vp20/utils.h b/lib/mayaUsd/render/px_vp20/utils.h index 49ed6249f6..a38043b9c5 100644 --- a/lib/mayaUsd/render/px_vp20/utils.h +++ b/lib/mayaUsd/render/px_vp20/utils.h @@ -18,7 +18,7 @@ /// \file px_vp20/utils.h -#include +#include "mayaUsd/base/api.h" #include #include diff --git a/lib/mayaUsd/render/px_vp20/utils_legacy.cpp b/lib/mayaUsd/render/px_vp20/utils_legacy.cpp index 81d0810467..8d3370a9fb 100644 --- a/lib/mayaUsd/render/px_vp20/utils_legacy.cpp +++ b/lib/mayaUsd/render/px_vp20/utils_legacy.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "utils_legacy.h" #include #include diff --git a/lib/mayaUsd/render/px_vp20/utils_legacy.h b/lib/mayaUsd/render/px_vp20/utils_legacy.h index 5fdf139957..cca41401d4 100644 --- a/lib/mayaUsd/render/px_vp20/utils_legacy.h +++ b/lib/mayaUsd/render/px_vp20/utils_legacy.h @@ -18,13 +18,13 @@ /// \file px_vp20/utils_legacy.h -#include - #include #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// This class contains helper methods and utilities to help with the diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp index c9e2582e52..844926ce35 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp @@ -17,11 +17,7 @@ // glew needs to be included before any other OpenGL headers. #include -#include -#include -#include -#include -#include +#include "batchRenderer.h" #include #include @@ -60,8 +56,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -73,16 +69,23 @@ #include #include #include +#include + #if USD_VERSION_NUM > 2002 #include #include #endif -#include #if USD_VERSION_NUM < 1911 #include #endif +#include "mayaUsd/render/px_vp20/utils.h" +#include "mayaUsd/render/px_vp20/utils_legacy.h" + +#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" +#include "mayaUsd/render/pxrUsdMayaGL/userData.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS( diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h index 1598b30339..7b36d0fea8 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h @@ -17,19 +17,10 @@ #define PXRUSDMAYAGL_BATCH_RENDERER_H /// \file pxrUsdMayaGL/batchRenderer.h -#include -#include -#include -#include -#include -#include -#include -#include - #include -#include #include #include +#include #include #include @@ -48,17 +39,28 @@ #include #include #include -#if USD_VERSION_NUM > 2002 -#include -#endif #include #include #include #include -#include #include +#include #include +#if USD_VERSION_NUM > 2002 +#include +#endif + +#include "mayaUsd/base/api.h" +#include "mayaUsd/listeners/notice.h" +#include "mayaUsd/utils/diagnosticDelegate.h" +#include "mayaUsd/utils/util.h" + +#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" +#include "mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h" +#include "mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h" +#include "mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h" + PXR_NAMESPACE_OPEN_SCOPE /// UsdMayaGLBatchRenderer is a singleton that shapes can use to get consistent diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.cpp index 52b188f0c8..1f23e8e1ce 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "debugCodes.h" #include #include diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp index cf530257b5..d7c4859724 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp @@ -13,17 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include - -#include -#include -#include -#include +#include "hdImagingShapeDrawOverride.h" #include -#include #include +#include #include #include #include @@ -42,6 +36,12 @@ #include #include +#include "mayaUsd/nodes/hdImagingShape.h" +#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" +#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" +#include "mayaUsd/render/pxrUsdMayaGL/instancerImager.h" +#include "mayaUsd/render/pxrUsdMayaGL/userData.h" + PXR_NAMESPACE_OPEN_SCOPE const MString PxrMayaHdImagingShapeDrawOverride::drawDbClassification( diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h index 8f3cba7d99..196aa30af1 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h @@ -18,8 +18,6 @@ /// \file pxrUsdMayaGL/hdImagingShapeDrawOverride.h -#include - #include #include #include @@ -33,8 +31,9 @@ #include -PXR_NAMESPACE_OPEN_SCOPE +#include "mayaUsd/base/api.h" +PXR_NAMESPACE_OPEN_SCOPE /// Draw override for drawing the pxrHdImagingShape node in Viewport 2.0 /// diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp index 0a7358e519..0b8d8ae377 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp @@ -13,16 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include +#include "hdImagingShapeUI.h" #include -#include #include +#include #include #include #include @@ -38,6 +33,12 @@ #include #include +#include "mayaUsd/nodes/hdImagingShape.h" +#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" +#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" +#include "mayaUsd/render/pxrUsdMayaGL/instancerImager.h" +#include "mayaUsd/render/pxrUsdMayaGL/userData.h" + PXR_NAMESPACE_OPEN_SCOPE /* static */ diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h index 7ba1ba8f69..8c42c0a0d4 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h @@ -17,8 +17,12 @@ #define PXRUSDMAYAGL_HD_IMAGING_SHAPE_UI_H /// \file pxrUsdMayaGL/hdImagingShapeUI.h - -#include +#include +// XXX: On Linux, some Maya headers (notably M3dView.h) end up indirectly +// including X11/Xlib.h, which #define's "Bool" as int. This can cause +// compilation issues if sdf/types.h is included afterwards, so to fix +// this, we ensure that it gets included first. +#include #include #include @@ -26,13 +30,7 @@ #include #include -#include - -// XXX: On Linux, some Maya headers (notably M3dView.h) end up indirectly -// including X11/Xlib.h, which #define's "Bool" as int. This can cause -// compilation issues if sdf/types.h is included afterwards, so to fix -// this, we ensure that it gets included first. -#include +#include "mayaUsd/base/api.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp index 5d25386b6b..6edbba83f8 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp @@ -22,10 +22,6 @@ // gl.h #include -#include -#include -#include - #include #include @@ -41,6 +37,10 @@ #include #include +#include "mayaUsd/render/px_vp20/utils.h" +#include "mayaUsd/render/px_vp20/utils_legacy.h" +#include "mayaUsd/render/pxrUsdMayaGL/hdRenderer.h" + PXR_NAMESPACE_OPEN_SCOPE void diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h index 8147a800bb..5369c3237e 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h @@ -18,8 +18,6 @@ /// \file pxrUsdMayaGL/hdRenderer.h -#include - #include #include @@ -39,6 +37,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// Simple implementation of a Hydra renderer for a Maya shape. diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp index 2d4e2267ad..aef7a2fb07 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp @@ -13,10 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include +#include "instancerImager.h" #include #include @@ -27,6 +24,10 @@ #include +#include "mayaUsd/nodes/hdImagingShape.h" +#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" +#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" + PXR_NAMESPACE_OPEN_SCOPE TF_INSTANTIATE_SINGLETON(UsdMayaGL_InstancerImager); diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h index 064019759d..2d2d24057b 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h @@ -18,11 +18,6 @@ /// \file pxrUsdMayaGL/instancerImager.h -#include -#include -#include -#include - #include #include @@ -32,6 +27,12 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/listeners/notice.h" +#include "mayaUsd/utils/util.h" + +#include "mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h" + PXR_NAMESPACE_OPEN_SCOPE /// Class for syncing native Maya instancers with the pxrHdImagingShape so that diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp index 1de17bb44f..ed45e2988d 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp @@ -13,13 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include -#include +#include "instancerShapeAdapter.h" #include @@ -39,8 +33,8 @@ #include #include -#include #include +#include #include #include #include @@ -59,6 +53,14 @@ #include #include +#include "mayaUsd/fileio/utils/writeUtil.h" +#include "mayaUsd/utils/util.h" + +#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" +#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" +#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" +#include "mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS( diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h index 1df6c56991..06e9b03bf1 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h @@ -17,10 +17,6 @@ #define PXRUSDMAYAGL_INSTANCER_SHAPE_ADAPTER_H /// \file pxrUsdMayaGL/instancerShapeAdapter.h - -#include -#include - #include #include @@ -31,6 +27,10 @@ #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h" + PXR_NAMESPACE_OPEN_SCOPE /// Class to manage translation of native Maya instancers into diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp index e9207e8a43..e8b5e9aeee 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp @@ -13,12 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include +#include "proxyDrawOverride.h" #include #include @@ -43,6 +38,13 @@ #include #include +#include "mayaUsd/nodes/proxyShapeBase.h" +#include "mayaUsd/render/px_vp20/utils.h" + +#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" +#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" +#include "mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h" + PXR_NAMESPACE_OPEN_SCOPE const MString UsdMayaProxyDrawOverride::drawDbClassification( diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h index 519e5abd5b..b81794bc7e 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h @@ -18,8 +18,7 @@ /// \file pxrUsdMayaGL/proxyDrawOverride.h -#include -#include +#include "mayaUsd/base/api.h" #include #include @@ -36,6 +35,8 @@ #include +#include "mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdMayaProxyDrawOverride : public MHWRender::MPxDrawOverride diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp index 4d078fab5a..40e5d2d599 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp @@ -13,24 +13,23 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #include // This header must absolutely come first. -#include -#include - #include -#include #include #include #include #include +#include #include #include #include #include +#include "mayaUsd/nodes/proxyShapeBase.h" +#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" + PXR_NAMESPACE_OPEN_SCOPE static PxrMayaHdPrimFilter _sharedPrimFilter = { diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp index e3f4f7aa75..cea6379237 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp @@ -13,16 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include +#include "proxyShapeUI.h" #include #include -#include #include +#include #include #include #include @@ -45,6 +41,11 @@ #include #include +#include "mayaUsd/nodes/proxyShapeBase.h" +#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" +#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" +#include "mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h" + PXR_NAMESPACE_OPEN_SCOPE /* static */ diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h index 7e7d2e9511..addefb2549 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h @@ -18,9 +18,6 @@ /// \file pxrUsdMayaGL/proxyShapeUI.h -#include -#include - #include #include #include @@ -34,6 +31,10 @@ #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdMayaProxyShapeUI : public MPxSurfaceShapeUI diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h b/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h index 16d71d1a10..2d1ef69533 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h @@ -18,14 +18,14 @@ /// \file pxrUsdMayaGL/renderParams.h -#include - #include #include #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE struct PxrMayaHdRenderParams diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp index 8761940b9a..580457d7c4 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp @@ -13,15 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "sceneDelegate.h" -#include +#include +#include -#include -#include +#include #include - #include #include #include @@ -35,13 +34,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include @@ -53,16 +52,12 @@ #include #include -#include - -#include - -#include - +#include "mayaUsd/base/api.h" +#include "mayaUsd/render/px_vp20/utils.h" +#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" PXR_NAMESPACE_OPEN_SCOPE - TF_DEFINE_PRIVATE_TOKENS( _tokens, diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h index 4c0e0e4cb8..bf470ed37c 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h @@ -17,8 +17,6 @@ #define PXRUSDMAYAGL_SCENE_DELEGATE_H /// \file pxrUsdMayaGL/sceneDelegate.h -#include -#include #include #include @@ -39,6 +37,10 @@ #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" + PXR_NAMESPACE_OPEN_SCOPE struct PxrMayaHdPrimFilter { diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp index 4c0f079e29..59c7d18c5f 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp @@ -13,13 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include -#include +#include "shapeAdapter.h" #include #include @@ -34,8 +28,8 @@ #include #include #include -#include #include +#include #include #include @@ -48,6 +42,14 @@ #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" +#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" +#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" +#include "mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h" +#include "mayaUsd/render/pxrUsdMayaGL/userData.h" + PXR_NAMESPACE_OPEN_SCOPE // Helper function that converts M3dView::DisplayStyle (legacy viewport) into diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h index c03ca39293..bab8bbd8a3 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h @@ -18,9 +18,7 @@ /// \file pxrUsdMayaGL/shapeAdapter.h -#include -#include -#include +#include #include #include @@ -45,8 +43,10 @@ #include #include -#include +#include "mayaUsd/base/api.h" +#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" +#include "mayaUsd/render/pxrUsdMayaGL/userData.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.cpp index ba377eac91..2b6d1f29e5 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.cpp @@ -13,16 +13,16 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include +#include "softSelectHelper.h" #include #include #include #include +#include +#include + PXR_NAMESPACE_OPEN_SCOPE UsdMayaGLSoftSelectHelper::UsdMayaGLSoftSelectHelper() diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h index b7e4fff168..35a0f21b59 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h @@ -18,8 +18,6 @@ /// \file pxrUsdMayaGL/softSelectHelper.h -#include - #include #include @@ -30,6 +28,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// \class UsdMayaGLSoftSelectHelper diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp index 7b37fd7f79..d8bf4916d5 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp @@ -13,13 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include -#include +#include "usdProxyShapeAdapter.h" #include @@ -57,6 +51,13 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/nodes/proxyShapeBase.h" +#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" +#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" +#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" +#include "mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h" + PXR_NAMESPACE_OPEN_SCOPE /* virtual */ diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h index 9adfae05d7..f509b0914b 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h @@ -18,9 +18,6 @@ /// \file pxrUsdMayaGL/usdProxyShapeAdapter.h -#include -#include - #include #include @@ -34,6 +31,10 @@ #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdMayaProxyDrawOverride; diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp index 4f28c8cad0..740410d767 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "userData.h" #include diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/userData.h b/lib/mayaUsd/render/pxrUsdMayaGL/userData.h index 5e65f7e42d..7536ab19da 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/userData.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/userData.h @@ -18,7 +18,7 @@ /// \file pxrUsdMayaGL/userData.h -#include +#include "mayaUsd/base/api.h" #include diff --git a/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt b/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt index 4d491bfbe2..ef90e7db48 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt +++ b/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt @@ -18,22 +18,7 @@ target_sources(${PROJECT_NAME} ) set(headers - basisCurves.h - bboxGeom.h - CMakeLists.txt - debugCodes.h - draw_item.h - instancer.h - material.h - mesh.h proxyRenderDelegate.h - render_delegate.h - render_param.h - render_pass.h - resource_registry.h - sampler.h - task_commit.h - tokens.h ) # ----------------------------------------------------------------------------- diff --git a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp index 71635f2078..dc151e644b 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp @@ -14,16 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include - -#include -#include -#include -#include -#include -#include -#include +#include "basisCurves.h" #include #include @@ -32,11 +23,18 @@ #include #include #include - #include #include #include +#include "bboxGeom.h" +#include "debugCodes.h" +#include "draw_item.h" +#include "instancer.h" +#include "material.h" +#include "render_delegate.h" +#include "tokens.h" + PXR_NAMESPACE_OPEN_SCOPE namespace { diff --git a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h index d147947f6f..7e4cf78a54 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h @@ -13,12 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef HDVP2_BASIS_CURVES_H #define HDVP2_BASIS_CURVES_H -#include - #include #include @@ -29,6 +26,8 @@ #include #include +#include "mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h" + PXR_NAMESPACE_OPEN_SCOPE class HdSceneDelegate; diff --git a/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.cpp b/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.cpp index 68605b8b63..e38dae004a 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include +#include "bboxGeom.h" #include #include diff --git a/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.h b/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.h index 4fd69cd154..74ef0efcf3 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.h @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef HD_VP2_BBOX_GEOM #define HD_VP2_BBOX_GEOM diff --git a/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.cpp b/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.cpp index ff73e65c5a..c5c33d6d1d 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "debugCodes.h" #include diff --git a/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.h b/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.h index 5afea72c4d..029c910adf 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.h @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef HD_VP2_DEBUGCODES_H #define HD_VP2_DEBUGCODES_H diff --git a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp b/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp index 50bf49b09d..918fd7195e 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp @@ -13,12 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include -#include +#include "draw_item.h" #include +#include "render_delegate.h" + PXR_NAMESPACE_OPEN_SCOPE /*! \brief Constructor. diff --git a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.h b/lib/mayaUsd/render/vp2RenderDelegate/draw_item.h index 74598c7a30..f9196bd8fc 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/draw_item.h @@ -13,23 +13,21 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef HD_VP2_DRAW_ITEM #define HD_VP2_DRAW_ITEM -#include +#include +#include +#include +#include +#include #include #include #include #include #include -#include -#include -#include -#include - PXR_NAMESPACE_OPEN_SCOPE class HdVP2RenderDelegate; diff --git a/lib/mayaUsd/render/vp2RenderDelegate/instancer.cpp b/lib/mayaUsd/render/vp2RenderDelegate/instancer.cpp index fb836fd295..c4b4b84e6f 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/instancer.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/instancer.cpp @@ -17,8 +17,7 @@ // #include -#include -#include +#include "instancer.h" #include #include @@ -28,6 +27,8 @@ #include #include +#include "sampler.h" + PXR_NAMESPACE_OPEN_SCOPE // Define local tokens for the names of the primvars the instancer diff --git a/lib/mayaUsd/render/vp2RenderDelegate/material.cpp b/lib/mayaUsd/render/vp2RenderDelegate/material.cpp index 94f30e261b..5724805c64 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/material.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/material.cpp @@ -13,27 +13,29 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include - -#include -#include +#include "material.h" #include #include #include +#include #include +#include #include #include #include +#include #include #include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -41,12 +43,8 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "debugCodes.h" +#include "render_delegate.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/material.h b/lib/mayaUsd/render/vp2RenderDelegate/material.h index af5291be5f..f5bc82ab7c 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/material.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/material.h @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef HD_VP2_MATERIAL #define HD_VP2_MATERIAL diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp b/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp index c1e7aeb143..2f35aee325 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp @@ -13,16 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include "mesh.h" #include @@ -31,11 +22,21 @@ #include #include -#include #include +#include #include #include +#include "bboxGeom.h" +#include "debugCodes.h" +#include "draw_item.h" +#include "instancer.h" +#include "material.h" +#include "render_delegate.h" +#include "tokens.h" + +#include "mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h" + PXR_NAMESPACE_OPEN_SCOPE namespace { diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mesh.h b/lib/mayaUsd/render/vp2RenderDelegate/mesh.h index d1cec7b1e9..01ab12a6ad 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/mesh.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/mesh.h @@ -13,17 +13,16 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef HD_VP2_MESH #define HD_VP2_MESH -#include - #include #include #include +#include "mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h" + PXR_NAMESPACE_OPEN_SCOPE class HdSceneDelegate; diff --git a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp index 40ceb9240c..e87331c6c9 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp @@ -13,12 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include +#include "proxyRenderDelegate.h" #include #include @@ -39,6 +34,13 @@ #include #include +#include "mayaUsd/nodes/proxyShapeBase.h" +#include "mayaUsd/nodes/stageData.h" +#include "mayaUsd/utils/util.h" + +#include "render_delegate.h" +#include "tokens.h" + #if defined(WANT_UFE_BUILD) #include #include diff --git a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h index f063bd00f8..fd6cde300f 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h @@ -13,12 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef PROXY_RENDER_DELEGATE #define PROXY_RENDER_DELEGATE -#include - #include #include @@ -36,6 +33,8 @@ #include #include +#include "mayaUsd/base/api.h" + #if defined(WANT_UFE_BUILD) #include #endif diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp index 70a4ee57ac..adc769522f 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp @@ -13,18 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include -#include -#include -#include -#include -#include +#include "render_delegate.h" #include #include #include + #include #include @@ -36,6 +31,13 @@ #include #include +#include "basisCurves.h" +#include "bboxGeom.h" +#include "instancer.h" +#include "material.h" +#include "mesh.h" +#include "render_pass.h" + PXR_NAMESPACE_OPEN_SCOPE namespace diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h index 64d91b07c6..f0c2c19ee5 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h @@ -13,13 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef HD_VP2_RENDER_DELEGATE #define HD_VP2_RENDER_DELEGATE -#include -#include - #include #include @@ -30,6 +26,9 @@ #include #include +#include "render_param.h" +#include "resource_registry.h" + PXR_NAMESPACE_OPEN_SCOPE class HdVP2BBoxGeom; diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp b/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp index 1c506064e8..d155c0383f 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include +#include "render_param.h" #include diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_param.h b/lib/mayaUsd/render/vp2RenderDelegate/render_param.h index d2e07d88ca..02cbddf817 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/render_param.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/render_param.h @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef HD_VP2_RENDER_PARAM #define HD_VP2_RENDER_PARAM diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_pass.h b/lib/mayaUsd/render/vp2RenderDelegate/render_pass.h index c808b4fd38..58933d4839 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/render_pass.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/render_pass.h @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef HD_VP2_RENDER_PASS #define HD_VP2_RENDER_PASS diff --git a/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h b/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h index de8fb01b87..eea61f8926 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h @@ -13,15 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef HD_VP2_RESOURCE_REGISTRY #define HD_VP2_RESOURCE_REGISTRY -#include - #include #include +#include "task_commit.h" + PXR_NAMESPACE_OPEN_SCOPE /*! \brief Central place to manage GPU resources commits and any resources not managed by VP2 directly diff --git a/lib/mayaUsd/render/vp2RenderDelegate/sampler.cpp b/lib/mayaUsd/render/vp2RenderDelegate/sampler.cpp index 2b14b73fd0..a9e5d60475 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/sampler.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/sampler.cpp @@ -15,7 +15,7 @@ // // Modifications copyright (C) 2019 Autodesk // -#include +#include "sampler.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/task_commit.h b/lib/mayaUsd/render/vp2RenderDelegate/task_commit.h index 88d8a5310e..108da6da24 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/task_commit.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/task_commit.h @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef HD_VP2_TASK_COMMIT #define HD_VP2_TASK_COMMIT diff --git a/lib/mayaUsd/render/vp2RenderDelegate/tokens.cpp b/lib/mayaUsd/render/vp2RenderDelegate/tokens.cpp index 49debc035f..6a86d597d5 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/tokens.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/tokens.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include +#include "tokens.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/tokens.h b/lib/mayaUsd/render/vp2RenderDelegate/tokens.h index 6fd970e4c6..67ff2fc241 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/tokens.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/tokens.h @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef HD_VP2_TOKENS_H #define HD_VP2_TOKENS_H diff --git a/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp b/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp index 20818d014a..f8f43790d3 100644 --- a/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp +++ b/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp @@ -13,20 +13,18 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include "shaderFragments.h" -#include +#include +#include +#include +#include #include #include #include - #include -#include -#include -#include -#include - PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS( diff --git a/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.h b/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.h index f2f842f47c..1fe597e8a0 100644 --- a/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.h +++ b/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.h @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #ifndef HD_VP2_SHADER_FRAGMENTS #define HD_VP2_SHADER_FRAGMENTS diff --git a/lib/mayaUsd/ufe/Global.cpp b/lib/mayaUsd/ufe/Global.cpp index 8e22a73416..a360205276 100644 --- a/lib/mayaUsd/ufe/Global.cpp +++ b/lib/mayaUsd/ufe/Global.cpp @@ -13,34 +13,32 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include "Global.h" -#include - -#include "private/InPathChange.h" - -#include -#include -#include -#include -#include -#include +#include +#include #include #include #ifdef UFE_V2_FEATURES_AVAILABLE // Note: must come after include of ufe files so we have the define. -#include -#include +#include "UsdAttributesHandler.h" +#include "UsdObject3dHandler.h" #if UFE_PREVIEW_VERSION_NUM >= 2009 -#include +#include "UsdContextOpsHandler.h" #endif #else -#include +#include "UfeVersionCompat.h" #endif -#include -#include +#include "private/InPathChange.h" +#include "ProxyShapeHandler.h" +#include "ProxyShapeHierarchyHandler.h" +#include "StagesSubject.h" +#include "UsdHierarchyHandler.h" +#include "UsdSceneItemOpsHandler.h" +#include "UsdTransform3dHandler.h" namespace { int gRegistrationCount = 0; diff --git a/lib/mayaUsd/ufe/Global.h b/lib/mayaUsd/ufe/Global.h index ac35f7a178..a18331c98c 100644 --- a/lib/mayaUsd/ufe/Global.h +++ b/lib/mayaUsd/ufe/Global.h @@ -15,11 +15,11 @@ // #pragma once -#include +#include #include -#include +#include "mayaUsd/base/api.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/ProxyShapeHandler.cpp b/lib/mayaUsd/ufe/ProxyShapeHandler.cpp index 0ade53e621..1780e7d7e2 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHandler.cpp +++ b/lib/mayaUsd/ufe/ProxyShapeHandler.cpp @@ -13,15 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include - -#include +#include "ProxyShapeHandler.h" #include #include #include +#include "mayaUsd/utils/query.h" + MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/ProxyShapeHandler.h b/lib/mayaUsd/ufe/ProxyShapeHandler.h index f58f4d9c84..1930d3ff6c 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHandler.h +++ b/lib/mayaUsd/ufe/ProxyShapeHandler.h @@ -15,14 +15,14 @@ // #pragma once -#include - #include #include #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp b/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp index 8b5ecab96e..2c899eb1c8 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp +++ b/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp @@ -13,19 +13,19 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include "ProxyShapeHierarchy.h" -#include -#include +#include #include #include #include #include -#include - #include +#include "mayaUsd/ufe/Utils.h" + MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchy.h b/lib/mayaUsd/ufe/ProxyShapeHierarchy.h index c35a07dbcc..56e33e77da 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHierarchy.h +++ b/lib/mayaUsd/ufe/ProxyShapeHierarchy.h @@ -15,13 +15,13 @@ // #pragma once -#include - -#include - #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/ufe/UsdSceneItem.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp index 828ae47a7a..a07c790a60 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp +++ b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include "ProxyShapeHierarchyHandler.h" -#include -#include -#include +#include "mayaUsd/ufe/ProxyShapeHierarchy.h" +#include "mayaUsd/ufe/Utils.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h index 4ff1bfa7e3..feaba066c3 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h +++ b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h @@ -15,7 +15,7 @@ // #pragma once -#include +#include "mayaUsd/base/api.h" #include diff --git a/lib/mayaUsd/ufe/StagesSubject.cpp b/lib/mayaUsd/ufe/StagesSubject.cpp index f34c6c8a41..2afe147728 100644 --- a/lib/mayaUsd/ufe/StagesSubject.cpp +++ b/lib/mayaUsd/ufe/StagesSubject.cpp @@ -13,14 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include - -#include "private/InPathChange.h" - -#include -#include -#include +#include "StagesSubject.h" #ifdef UFE_V2_FEATURES_AVAILABLE #include @@ -46,6 +39,11 @@ #include #include +#include "private/InPathChange.h" +#include "mayaUsd/ufe/ProxyShapeHandler.h" +#include "mayaUsd/ufe/UsdStageMap.h" +#include "mayaUsd/ufe/Utils.h" + #ifdef UFE_V2_FEATURES_AVAILABLE namespace { diff --git a/lib/mayaUsd/ufe/StagesSubject.h b/lib/mayaUsd/ufe/StagesSubject.h index dc10642197..36df65051d 100644 --- a/lib/mayaUsd/ufe/StagesSubject.h +++ b/lib/mayaUsd/ufe/StagesSubject.h @@ -15,9 +15,6 @@ // #pragma once -#include -#include - #include #include // For UFE_V2_FEATURES_AVAILABLE @@ -28,6 +25,9 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/listeners/proxyShapeNotice.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdAttribute.cpp b/lib/mayaUsd/ufe/UsdAttribute.cpp index 176064c9bf..20a1f1f8e6 100644 --- a/lib/mayaUsd/ufe/UsdAttribute.cpp +++ b/lib/mayaUsd/ufe/UsdAttribute.cpp @@ -13,24 +13,24 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include "UsdAttribute.h" -#include -#include - +#include #include #include -#include #include #include -#include #include +#include // We unconditionally want the UFE asserts here (even in release builds). // The UFE_ASSERT_MSG has a built-in throw which we want to use for error handling. #define UFE_ENABLE_ASSERTS #include +#include "mayaUsd/ufe/StagesSubject.h" + // Note: normally we would use this using directive, but here we cannot because // our class is called UsdAttribute which is exactly the same as the one // in USD. diff --git a/lib/mayaUsd/ufe/UsdAttribute.h b/lib/mayaUsd/ufe/UsdAttribute.h index 9427cbd5ac..7e3a198c14 100644 --- a/lib/mayaUsd/ufe/UsdAttribute.h +++ b/lib/mayaUsd/ufe/UsdAttribute.h @@ -15,13 +15,13 @@ // #pragma once -#include - #include #include #include +#include "mayaUsd/ufe/UsdSceneItem.h" + // Ufe::Attribute overrides (minus the type method) #define UFE_ATTRIBUTE_OVERRIDES \ bool hasValue() const override { return UsdAttribute::hasValue(); } \ diff --git a/lib/mayaUsd/ufe/UsdAttributes.cpp b/lib/mayaUsd/ufe/UsdAttributes.cpp index 4007d39554..4aa45ea295 100644 --- a/lib/mayaUsd/ufe/UsdAttributes.cpp +++ b/lib/mayaUsd/ufe/UsdAttributes.cpp @@ -13,14 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include +#include "UsdAttributes.h" #include #include -#include #include +#include // Note: normally we would use this using directive, but here we cannot because // one of our classes is called UsdAttribute which is exactly the same as diff --git a/lib/mayaUsd/ufe/UsdAttributes.h b/lib/mayaUsd/ufe/UsdAttributes.h index 13c7c95e39..1a12687402 100644 --- a/lib/mayaUsd/ufe/UsdAttributes.h +++ b/lib/mayaUsd/ufe/UsdAttributes.h @@ -15,16 +15,17 @@ // #pragma once -#include -#include -#include - #include #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/ufe/UsdSceneItem.h" +#include "mayaUsd/ufe/UsdAttribute.h" + MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdAttributesHandler.cpp b/lib/mayaUsd/ufe/UsdAttributesHandler.cpp index c8de991918..7227a395b7 100644 --- a/lib/mayaUsd/ufe/UsdAttributesHandler.cpp +++ b/lib/mayaUsd/ufe/UsdAttributesHandler.cpp @@ -13,10 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include "UsdAttributesHandler.h" -#include - -#include +#include "mayaUsd/ufe/UsdSceneItem.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdAttributesHandler.h b/lib/mayaUsd/ufe/UsdAttributesHandler.h index ae3d6bd9c5..d2ff1cec1d 100644 --- a/lib/mayaUsd/ufe/UsdAttributesHandler.h +++ b/lib/mayaUsd/ufe/UsdAttributesHandler.h @@ -15,11 +15,12 @@ // #pragma once -#include -#include - #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/ufe/UsdAttributes.h" + MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdContextOps.cpp b/lib/mayaUsd/ufe/UsdContextOps.cpp index cae0b44559..bde4babefd 100644 --- a/lib/mayaUsd/ufe/UsdContextOps.cpp +++ b/lib/mayaUsd/ufe/UsdContextOps.cpp @@ -13,9 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include -#include +#include "UsdContextOps.h" #include @@ -28,6 +26,8 @@ #include #include +#include "mayaUsd/ufe/Utils.h" + namespace { //! \brief Undoable command for variant selection change diff --git a/lib/mayaUsd/ufe/UsdContextOps.h b/lib/mayaUsd/ufe/UsdContextOps.h index cf61c21528..0ea1bcf17c 100644 --- a/lib/mayaUsd/ufe/UsdContextOps.h +++ b/lib/mayaUsd/ufe/UsdContextOps.h @@ -15,14 +15,15 @@ // #pragma once -#include -#include - #include #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/ufe/UsdSceneItem.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdContextOpsHandler.cpp b/lib/mayaUsd/ufe/UsdContextOpsHandler.cpp index 38d5ca350d..e3ca048f73 100644 --- a/lib/mayaUsd/ufe/UsdContextOpsHandler.cpp +++ b/lib/mayaUsd/ufe/UsdContextOpsHandler.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include +#include "UsdContextOpsHandler.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdContextOpsHandler.h b/lib/mayaUsd/ufe/UsdContextOpsHandler.h index 2c4d5ebd8d..b50db90aad 100644 --- a/lib/mayaUsd/ufe/UsdContextOpsHandler.h +++ b/lib/mayaUsd/ufe/UsdContextOpsHandler.h @@ -15,11 +15,11 @@ // #pragma once -#include +#include -#include +#include "mayaUsd/base/api.h" -#include +#include "mayaUsd/ufe/UsdContextOps.h" //PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdHierarchy.cpp b/lib/mayaUsd/ufe/UsdHierarchy.cpp index c51520e1bb..36a6cc70d8 100644 --- a/lib/mayaUsd/ufe/UsdHierarchy.cpp +++ b/lib/mayaUsd/ufe/UsdHierarchy.cpp @@ -13,18 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include +#include "UsdHierarchy.h" #include #include -#include "private/InPathChange.h" -#include "private/Utils.h" - -#include -#include - #include #include @@ -35,6 +28,11 @@ #include #include +#include "private/InPathChange.h" +#include "private/Utils.h" +#include "mayaUsd/ufe/UsdUndoCreateGroupCommand.h" +#include "mayaUsd/ufe/Utils.h" + namespace { UsdPrimSiblingRange filteredChildren( const UsdPrim& prim ) { diff --git a/lib/mayaUsd/ufe/UsdHierarchy.h b/lib/mayaUsd/ufe/UsdHierarchy.h index 11a4e18978..21d4733908 100644 --- a/lib/mayaUsd/ufe/UsdHierarchy.h +++ b/lib/mayaUsd/ufe/UsdHierarchy.h @@ -15,13 +15,13 @@ // #pragma once -#include - -#include - #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/ufe/UsdSceneItem.h" + MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp b/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp index 469f0acfa3..8af144583f 100644 --- a/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp +++ b/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "UsdHierarchyHandler.h" -#include -#include +#include "mayaUsd/ufe/UsdSceneItem.h" +#include "mayaUsd/ufe/Utils.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdHierarchyHandler.h b/lib/mayaUsd/ufe/UsdHierarchyHandler.h index f8ea8f5d92..ca9ff99c5c 100644 --- a/lib/mayaUsd/ufe/UsdHierarchyHandler.h +++ b/lib/mayaUsd/ufe/UsdHierarchyHandler.h @@ -15,12 +15,12 @@ // #pragma once -#include +#include -#include -#include +#include "mayaUsd/base/api.h" -#include +#include "mayaUsd/ufe/UsdHierarchy.h" +#include "mayaUsd/ufe/UsdRootChildHierarchy.h" //PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdObject3d.cpp b/lib/mayaUsd/ufe/UsdObject3d.cpp index f16fd3240e..11f67cae42 100644 --- a/lib/mayaUsd/ufe/UsdObject3d.cpp +++ b/lib/mayaUsd/ufe/UsdObject3d.cpp @@ -1,13 +1,19 @@ -// =========================================================================== -// Copyright 2019 Autodesk, Inc. All rights reserved. // -// Use of this software is subject to the terms of the Autodesk license -// agreement provided at the time of installation or download, or which -// otherwise accompanies this software in either electronic or hard copy form. -// =========================================================================== - -#include -#include +// Copyright 2019 Autodesk +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "UsdObject3d.h" #include #include @@ -18,6 +24,8 @@ #include #include +#include "mayaUsd/ufe/Utils.h" + namespace { Ufe::Vector3d toVector3d(const GfVec3d& v) { diff --git a/lib/mayaUsd/ufe/UsdObject3d.h b/lib/mayaUsd/ufe/UsdObject3d.h index 5977f9b56a..059c30a652 100644 --- a/lib/mayaUsd/ufe/UsdObject3d.h +++ b/lib/mayaUsd/ufe/UsdObject3d.h @@ -7,11 +7,12 @@ // =========================================================================== #pragma once -#include -#include - #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/ufe/UsdSceneItem.h" + MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdObject3dHandler.cpp b/lib/mayaUsd/ufe/UsdObject3dHandler.cpp index 5b38906bbd..af9aa6e158 100644 --- a/lib/mayaUsd/ufe/UsdObject3dHandler.cpp +++ b/lib/mayaUsd/ufe/UsdObject3dHandler.cpp @@ -6,12 +6,12 @@ // otherwise accompanies this software in either electronic or hard copy form. // =========================================================================== -#include - -#include +#include "UsdObject3dHandler.h" #include +#include "mayaUsd/ufe/UsdSceneItem.h" + MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdObject3dHandler.h b/lib/mayaUsd/ufe/UsdObject3dHandler.h index d18b555fca..1d67889918 100644 --- a/lib/mayaUsd/ufe/UsdObject3dHandler.h +++ b/lib/mayaUsd/ufe/UsdObject3dHandler.h @@ -7,11 +7,11 @@ // =========================================================================== #pragma once -#include +#include -#include +#include "mayaUsd/base/api.h" -#include +#include "mayaUsd/ufe/UsdObject3d.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp b/lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp index 261ba53705..8d20cd1733 100644 --- a/lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp +++ b/lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "UsdRootChildHierarchy.h" #include diff --git a/lib/mayaUsd/ufe/UsdRootChildHierarchy.h b/lib/mayaUsd/ufe/UsdRootChildHierarchy.h index ddbf85ad10..c8bb69d2f9 100644 --- a/lib/mayaUsd/ufe/UsdRootChildHierarchy.h +++ b/lib/mayaUsd/ufe/UsdRootChildHierarchy.h @@ -15,9 +15,9 @@ // #pragma once -#include +#include "mayaUsd/base/api.h" -#include +#include "mayaUsd/ufe/UsdHierarchy.h" //PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp index ce0176b280..ee1f17c4d1 100644 --- a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "UsdRotatePivotTranslateUndoableCommand.h" #include "private/Utils.h" diff --git a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h index 3945767798..63559697d2 100644 --- a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h @@ -15,12 +15,12 @@ // #pragma once -#include - #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp index 4e1b5106bc..3a5ebcca75 100644 --- a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include +#include "UsdRotateUndoableCommand.h" #include "private/Utils.h" diff --git a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h index 268050a1e3..0a36851f11 100644 --- a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h @@ -15,14 +15,14 @@ // #pragma once -#include +#include #include -#include - #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp index acb11be343..c8b30b51b3 100644 --- a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp @@ -13,12 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include +#include "UsdScaleUndoableCommand.h" #include "private/Utils.h" -#include +#include "mayaUsd/ufe/Utils.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h index 4a8fb925af..f04c53101c 100644 --- a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h @@ -15,12 +15,12 @@ // #pragma once -#include - #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdSceneItem.cpp b/lib/mayaUsd/ufe/UsdSceneItem.cpp index 18b0c4b556..2d50c39896 100644 --- a/lib/mayaUsd/ufe/UsdSceneItem.cpp +++ b/lib/mayaUsd/ufe/UsdSceneItem.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include +#include "UsdSceneItem.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdSceneItem.h b/lib/mayaUsd/ufe/UsdSceneItem.h index 47230c84df..4dd05d3970 100644 --- a/lib/mayaUsd/ufe/UsdSceneItem.h +++ b/lib/mayaUsd/ufe/UsdSceneItem.h @@ -15,12 +15,12 @@ // #pragma once -#include - #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdSceneItemOps.cpp b/lib/mayaUsd/ufe/UsdSceneItemOps.cpp index 96c7179e51..c23823009a 100644 --- a/lib/mayaUsd/ufe/UsdSceneItemOps.cpp +++ b/lib/mayaUsd/ufe/UsdSceneItemOps.cpp @@ -13,13 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include "UsdSceneItemOps.h" -#include - -#include -#include -#include -#include +#include "mayaUsd/ufe/UsdUndoDeleteCommand.h" +#include "mayaUsd/ufe/UsdUndoDuplicateCommand.h" +#include "mayaUsd/ufe/UsdUndoRenameCommand.h" +#include "mayaUsd/ufe/Utils.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdSceneItemOps.h b/lib/mayaUsd/ufe/UsdSceneItemOps.h index a3a9a0ce90..f18ff429fd 100644 --- a/lib/mayaUsd/ufe/UsdSceneItemOps.h +++ b/lib/mayaUsd/ufe/UsdSceneItemOps.h @@ -15,15 +15,15 @@ // #pragma once -#include - -#include - #include #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/ufe/UsdSceneItem.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp index b5bbfcd78c..84517a8bba 100644 --- a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp +++ b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include +#include "UsdSceneItemOpsHandler.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h index 190669004c..ec9d649269 100644 --- a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h +++ b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h @@ -15,11 +15,11 @@ // #pragma once -#include +#include -#include +#include "mayaUsd/base/api.h" -#include +#include "mayaUsd/ufe/UsdSceneItemOps.h" //PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdStageMap.cpp b/lib/mayaUsd/ufe/UsdStageMap.cpp index 8ca1e872f0..cfb83802a8 100644 --- a/lib/mayaUsd/ufe/UsdStageMap.cpp +++ b/lib/mayaUsd/ufe/UsdStageMap.cpp @@ -13,14 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include -#include +#include "UsdStageMap.h" #include #include +#include "mayaUsd/ufe/Utils.h" + namespace { MObjectHandle proxyShapeHandle(const Ufe::Path& path) diff --git a/lib/mayaUsd/ufe/UsdStageMap.h b/lib/mayaUsd/ufe/UsdStageMap.h index 63ae8db709..a4165a17b5 100644 --- a/lib/mayaUsd/ufe/UsdStageMap.h +++ b/lib/mayaUsd/ufe/UsdStageMap.h @@ -15,7 +15,7 @@ // #pragma once -#include +#include "mayaUsd/base/api.h" #include diff --git a/lib/mayaUsd/ufe/UsdTransform3d.cpp b/lib/mayaUsd/ufe/UsdTransform3d.cpp index 26a0aa6a6c..20e41ed0a7 100644 --- a/lib/mayaUsd/ufe/UsdTransform3d.cpp +++ b/lib/mayaUsd/ufe/UsdTransform3d.cpp @@ -13,19 +13,17 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include "UsdTransform3d.h" -#include +#include +#include "mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h" +#include "mayaUsd/ufe/UsdRotateUndoableCommand.h" +#include "mayaUsd/ufe/UsdScaleUndoableCommand.h" +#include "mayaUsd/ufe/UsdTranslateUndoableCommand.h" +#include "mayaUsd/ufe/Utils.h" #include "private/Utils.h" -#include -#include -#include -#include -#include - -#include - MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdTransform3d.h b/lib/mayaUsd/ufe/UsdTransform3d.h index 0a92ec318b..b6f5f34745 100644 --- a/lib/mayaUsd/ufe/UsdTransform3d.h +++ b/lib/mayaUsd/ufe/UsdTransform3d.h @@ -15,15 +15,15 @@ // #pragma once -#include - -#include - #include #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/ufe/UsdSceneItem.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp b/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp index ad97707517..ce2e28ad73 100644 --- a/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp +++ b/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp @@ -13,10 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include "UsdTransform3dHandler.h" -#include - -#include +#include "mayaUsd/ufe/UsdSceneItem.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdTransform3dHandler.h b/lib/mayaUsd/ufe/UsdTransform3dHandler.h index 5706a1e3de..e566f7d548 100644 --- a/lib/mayaUsd/ufe/UsdTransform3dHandler.h +++ b/lib/mayaUsd/ufe/UsdTransform3dHandler.h @@ -15,11 +15,11 @@ // #pragma once -#include +#include -#include +#include "mayaUsd/base/api.h" -#include +#include "mayaUsd/ufe/UsdTransform3d.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp index 903542fddf..3bff354b01 100644 --- a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp @@ -13,12 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include +#include "UsdTranslateUndoableCommand.h" #include "private/Utils.h" -#include +#include "mayaUsd/ufe/Utils.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h index 131620d967..34c4dcd460 100644 --- a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h @@ -15,12 +15,12 @@ // #pragma once -#include - #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp index 2cbf461f12..92d96158d1 100644 --- a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp +++ b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp @@ -13,11 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include "UsdUndoCreateGroupCommand.h" -#include - -#include #include +#include #include #include diff --git a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h index a49003be2a..1efbc0ccc9 100644 --- a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h +++ b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h @@ -15,13 +15,13 @@ // #pragma once -#include - -#include - #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/ufe/UsdSceneItem.h" + //PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp index 2c2024f3d3..be8696fdef 100644 --- a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp +++ b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include +#include "UsdUndoDeleteCommand.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h index 5c27e5c491..cbf2122357 100644 --- a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h +++ b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h @@ -15,14 +15,14 @@ // #pragma once -#include - -#include +#include "mayaUsd/base/api.h" #include #include +#include "mayaUsd/ufe/UsdSceneItem.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp index 2e676efdd1..f324397e6d 100644 --- a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp +++ b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp @@ -13,10 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include - -#include +#include "UsdUndoDuplicateCommand.h" #include #include @@ -26,6 +23,8 @@ #include #include +#include "mayaUsd/ufe/Utils.h" + MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h index c0dcd51081..d92fd19892 100644 --- a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h +++ b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h @@ -15,15 +15,16 @@ // #pragma once -#include -#include - #include #include #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/ufe/UsdSceneItem.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp b/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp index fea51dffd1..d6fdd31f63 100644 --- a/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp +++ b/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp @@ -13,12 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include - -#include "private/InPathChange.h" - -#include +#include "UsdUndoRenameCommand.h" #include #include @@ -35,6 +30,10 @@ #include #include +#include "private/InPathChange.h" + +#include "mayaUsd/ufe/Utils.h" + MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdUndoRenameCommand.h b/lib/mayaUsd/ufe/UsdUndoRenameCommand.h index 09462ca125..44bbcd80e3 100644 --- a/lib/mayaUsd/ufe/UsdUndoRenameCommand.h +++ b/lib/mayaUsd/ufe/UsdUndoRenameCommand.h @@ -15,10 +15,6 @@ // #pragma once -#include - -#include - #include #include #include @@ -26,6 +22,10 @@ #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/ufe/UsdSceneItem.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/Utils.cpp b/lib/mayaUsd/ufe/Utils.cpp index f5cedca78a..5b7ed50f40 100644 --- a/lib/mayaUsd/ufe/Utils.cpp +++ b/lib/mayaUsd/ufe/Utils.cpp @@ -13,21 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include - -#include "private/Utils.h" - -#include -#include -#include +#include "Utils.h" #include -#include -#include -#include #include +#include #include +#include +#include #include #include @@ -37,6 +30,12 @@ #include #include +#include "mayaUsd/nodes/proxyShapeBase.h" +#include "mayaUsd/ufe/ProxyShapeHandler.h" +#include "mayaUsd/ufe/UsdStageMap.h" + +#include "private/Utils.h" + PXR_NAMESPACE_USING_DIRECTIVE #ifndef MAYA_MSTRINGARRAY_ITERATOR_CATEGORY diff --git a/lib/mayaUsd/ufe/Utils.h b/lib/mayaUsd/ufe/Utils.h index c0ebdfd38c..0ee49a2b99 100644 --- a/lib/mayaUsd/ufe/Utils.h +++ b/lib/mayaUsd/ufe/Utils.h @@ -15,9 +15,6 @@ // #pragma once -#include -#include - #include #include @@ -28,6 +25,10 @@ #include #include +#include "mayaUsd/base/api.h" + +#include "mayaUsd/ufe/UsdSceneItem.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/private/InPathChange.h b/lib/mayaUsd/ufe/private/InPathChange.h index 81205d70a2..f55148daa1 100644 --- a/lib/mayaUsd/ufe/private/InPathChange.h +++ b/lib/mayaUsd/ufe/private/InPathChange.h @@ -15,7 +15,7 @@ // #pragma once -#include +#include "mayaUsd/base/api.h" MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/private/Utils.cpp b/lib/mayaUsd/ufe/private/Utils.cpp index 0ca9efcbe8..ed99d702a2 100644 --- a/lib/mayaUsd/ufe/private/Utils.cpp +++ b/lib/mayaUsd/ufe/private/Utils.cpp @@ -13,11 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #include "Utils.h" -#include #include +#include #include diff --git a/lib/mayaUsd/ufe/private/Utils.h b/lib/mayaUsd/ufe/private/Utils.h index b51aede730..0172a9772a 100644 --- a/lib/mayaUsd/ufe/private/Utils.h +++ b/lib/mayaUsd/ufe/private/Utils.h @@ -15,14 +15,14 @@ // #pragma once -#include - #include #include #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/wrapUtils.cpp b/lib/mayaUsd/ufe/wrapUtils.cpp index 765a00d583..02e3ef982c 100644 --- a/lib/mayaUsd/ufe/wrapUtils.cpp +++ b/lib/mayaUsd/ufe/wrapUtils.cpp @@ -13,18 +13,17 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include -#include -#include +#include #include #include -#include - #include +#include "Global.h" +#include "UsdSceneItem.h" +#include "Utils.h" + using namespace MayaUsd; using namespace boost::python; diff --git a/lib/mayaUsd/utils/blockSceneModificationContext.cpp b/lib/mayaUsd/utils/blockSceneModificationContext.cpp index 2bd5db21df..b4c3b6ade9 100644 --- a/lib/mayaUsd/utils/blockSceneModificationContext.cpp +++ b/lib/mayaUsd/utils/blockSceneModificationContext.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "blockSceneModificationContext.h" #include #include diff --git a/lib/mayaUsd/utils/blockSceneModificationContext.h b/lib/mayaUsd/utils/blockSceneModificationContext.h index f47a5727dc..daf1c22258 100644 --- a/lib/mayaUsd/utils/blockSceneModificationContext.h +++ b/lib/mayaUsd/utils/blockSceneModificationContext.h @@ -16,10 +16,10 @@ #ifndef PXRUSDMAYA_BLOCK_SCENE_MODIFICATION_CONTEXT_H #define PXRUSDMAYA_BLOCK_SCENE_MODIFICATION_CONTEXT_H -#include - #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// Utility class for wrapping a scope of Maya operations such that the diff --git a/lib/mayaUsd/utils/colorSpace.cpp b/lib/mayaUsd/utils/colorSpace.cpp index cad23a890a..8ed847f3cc 100644 --- a/lib/mayaUsd/utils/colorSpace.cpp +++ b/lib/mayaUsd/utils/colorSpace.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "colorSpace.h" #include diff --git a/lib/mayaUsd/utils/colorSpace.h b/lib/mayaUsd/utils/colorSpace.h index 0406c6aca7..4bcb04dbf5 100644 --- a/lib/mayaUsd/utils/colorSpace.h +++ b/lib/mayaUsd/utils/colorSpace.h @@ -16,11 +16,11 @@ #ifndef PXRUSDMAYA_COLORSPACE_H #define PXRUSDMAYA_COLORSPACE_H -#include - #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// Helper functions for dealing with colors stored in Maya. diff --git a/lib/mayaUsd/utils/diagnosticDelegate.cpp b/lib/mayaUsd/utils/diagnosticDelegate.cpp index 471c3f68ae..462c42ba32 100644 --- a/lib/mayaUsd/utils/diagnosticDelegate.cpp +++ b/lib/mayaUsd/utils/diagnosticDelegate.cpp @@ -13,17 +13,18 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include +#include "diagnosticDelegate.h" #include #include -#include #include #include #include +#include "mayaUsd/base/debugCodes.h" + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_ENV_SETTING(PIXMAYA_DIAGNOSTICS_BATCH, true, diff --git a/lib/mayaUsd/utils/diagnosticDelegate.h b/lib/mayaUsd/utils/diagnosticDelegate.h index cbc6101d22..91702e8e91 100644 --- a/lib/mayaUsd/utils/diagnosticDelegate.h +++ b/lib/mayaUsd/utils/diagnosticDelegate.h @@ -16,8 +16,6 @@ #ifndef PXRUSDMAYA_DIAGNOSTICDELEGATE_H #define PXRUSDMAYA_DIAGNOSTICDELEGATE_H -#include - #include #include @@ -27,6 +25,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdMayaDiagnosticBatchContext; diff --git a/lib/mayaUsd/utils/query.cpp b/lib/mayaUsd/utils/query.cpp index 6e91c6f1f9..8fcf012216 100644 --- a/lib/mayaUsd/utils/query.cpp +++ b/lib/mayaUsd/utils/query.cpp @@ -13,10 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include -#include +#include "query.h" #include @@ -32,6 +29,9 @@ #include #include +#include "mayaUsd/nodes/usdPrimProvider.h" +#include "mayaUsd/utils/util.h" + PXR_NAMESPACE_OPEN_SCOPE UsdPrim diff --git a/lib/mayaUsd/utils/query.h b/lib/mayaUsd/utils/query.h index 253c8f7dc9..e805e903fe 100644 --- a/lib/mayaUsd/utils/query.h +++ b/lib/mayaUsd/utils/query.h @@ -16,8 +16,6 @@ #ifndef PXRUSDMAYA_QUERY_H #define PXRUSDMAYA_QUERY_H -#include - #include #include @@ -25,6 +23,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE struct UsdMayaQuery diff --git a/lib/mayaUsd/utils/stageCache.cpp b/lib/mayaUsd/utils/stageCache.cpp index a7aa3796ae..3a5865f321 100644 --- a/lib/mayaUsd/utils/stageCache.cpp +++ b/lib/mayaUsd/utils/stageCache.cpp @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include -#include +#include "stageCache.h" #include #include @@ -32,6 +31,8 @@ #include #include +#include "mayaUsd/listeners/notice.h" + PXR_NAMESPACE_OPEN_SCOPE namespace { diff --git a/lib/mayaUsd/utils/stageCache.h b/lib/mayaUsd/utils/stageCache.h index 099ee0f882..9577afe996 100644 --- a/lib/mayaUsd/utils/stageCache.h +++ b/lib/mayaUsd/utils/stageCache.h @@ -16,14 +16,14 @@ #ifndef PXRUSDMAYA_STAGECACHE_H #define PXRUSDMAYA_STAGECACHE_H -#include - #include #include #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE class UsdMayaStageCache diff --git a/lib/mayaUsd/utils/undoHelperCommand.cpp b/lib/mayaUsd/utils/undoHelperCommand.cpp index 7374f52d60..0f7a4bb707 100644 --- a/lib/mayaUsd/utils/undoHelperCommand.cpp +++ b/lib/mayaUsd/utils/undoHelperCommand.cpp @@ -13,12 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include +#include "undoHelperCommand.h" #include +#include + // This is added to prevent multiple definitions of the MApiVersion string. #define MNoVersionString #include diff --git a/lib/mayaUsd/utils/undoHelperCommand.h b/lib/mayaUsd/utils/undoHelperCommand.h index 103944ec95..46ea40eae8 100644 --- a/lib/mayaUsd/utils/undoHelperCommand.h +++ b/lib/mayaUsd/utils/undoHelperCommand.h @@ -16,9 +16,6 @@ #ifndef PXRUSDMAYA_UNDO_HELPER_CMD_H #define PXRUSDMAYA_UNDO_HELPER_CMD_H -#include -#include - #include // For MFnPlugin #include #include @@ -28,6 +25,9 @@ #include #include +#include "mayaUsd/base/api.h" +#include "mayaUsd/fileio/utils/adaptor.h" + PXR_NAMESPACE_OPEN_SCOPE /// This is an internal helper command to provide undo support for operations diff --git a/lib/mayaUsd/utils/util.cpp b/lib/mayaUsd/utils/util.cpp index 02e32cd838..1f969076e6 100644 --- a/lib/mayaUsd/utils/util.cpp +++ b/lib/mayaUsd/utils/util.cpp @@ -13,9 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -#include -#include +#include "util.h" #include #include @@ -73,6 +71,8 @@ #include #include +#include "colorSpace.h" + PXR_NAMESPACE_USING_DIRECTIVE double diff --git a/lib/mayaUsd/utils/util.h b/lib/mayaUsd/utils/util.h index 44c613acc4..60e6ae9067 100644 --- a/lib/mayaUsd/utils/util.h +++ b/lib/mayaUsd/utils/util.h @@ -16,8 +16,6 @@ #ifndef PXRUSDMAYA_UTIL_H #define PXRUSDMAYA_UTIL_H -#include - #include #include #include @@ -55,6 +53,8 @@ #include #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE /// General utilities for working with the Maya API. diff --git a/lib/mayaUsd/utils/utilFileSystem.cpp b/lib/mayaUsd/utils/utilFileSystem.cpp index 12ec7dca01..2bb8d349a6 100644 --- a/lib/mayaUsd/utils/utilFileSystem.cpp +++ b/lib/mayaUsd/utils/utilFileSystem.cpp @@ -13,9 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - -#include +#include "utilFileSystem.h" #include #include @@ -23,6 +21,8 @@ #include +#include "mayaUsd/base/debugCodes.h" + PXR_NAMESPACE_USING_DIRECTIVE std::string diff --git a/lib/mayaUsd/utils/utilFileSystem.h b/lib/mayaUsd/utils/utilFileSystem.h index afd1ab8451..e2198f11ae 100644 --- a/lib/mayaUsd/utils/utilFileSystem.h +++ b/lib/mayaUsd/utils/utilFileSystem.h @@ -13,8 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - #include #include @@ -23,6 +21,8 @@ #include +#include "mayaUsd/base/api.h" + PXR_NAMESPACE_OPEN_SCOPE namespace UsdMayaUtilFileSystem From db250b344f9cea4764a7571cb2f782166362e2a3 Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Thu, 2 Apr 2020 23:51:19 -0400 Subject: [PATCH 6/6] UPDATE lib/mayaUsd: All included public header files from outside and inside the project should be included using angle brackets --- lib/mayaUsd/fileio/chaser/chaser.h | 2 +- lib/mayaUsd/fileio/chaser/chaserRegistry.cpp | 4 ++-- lib/mayaUsd/fileio/chaser/chaserRegistry.h | 8 ++++---- lib/mayaUsd/fileio/fallbackPrimReader.cpp | 2 +- lib/mayaUsd/fileio/fallbackPrimReader.h | 4 ++-- lib/mayaUsd/fileio/functorPrimReader.h | 10 +++++----- lib/mayaUsd/fileio/functorPrimWriter.cpp | 12 +++++------ lib/mayaUsd/fileio/functorPrimWriter.h | 8 ++++---- lib/mayaUsd/fileio/importData.h | 2 +- lib/mayaUsd/fileio/instancedNodeWriter.cpp | 6 +++--- lib/mayaUsd/fileio/instancedNodeWriter.h | 6 +++--- lib/mayaUsd/fileio/jobs/jobArgs.cpp | 4 ++-- lib/mayaUsd/fileio/jobs/jobArgs.h | 4 ++-- lib/mayaUsd/fileio/jobs/modelKindProcessor.h | 4 ++-- lib/mayaUsd/fileio/jobs/readJob.cpp | 12 +++++------ lib/mayaUsd/fileio/jobs/readJob.h | 6 +++--- lib/mayaUsd/fileio/jobs/writeJob.cpp | 20 +++++++++---------- lib/mayaUsd/fileio/jobs/writeJob.h | 8 ++++---- lib/mayaUsd/fileio/primReader.h | 6 +++--- lib/mayaUsd/fileio/primReaderArgs.h | 4 ++-- lib/mayaUsd/fileio/primReaderContext.h | 2 +- lib/mayaUsd/fileio/primReaderRegistry.cpp | 8 ++++---- lib/mayaUsd/fileio/primReaderRegistry.h | 8 ++++---- lib/mayaUsd/fileio/primUpdater.h | 6 +++--- lib/mayaUsd/fileio/primUpdaterContext.h | 2 +- lib/mayaUsd/fileio/primUpdaterRegistry.cpp | 4 ++-- lib/mayaUsd/fileio/primUpdaterRegistry.h | 6 +++--- lib/mayaUsd/fileio/primWriter.cpp | 12 +++++------ lib/mayaUsd/fileio/primWriter.h | 6 +++--- lib/mayaUsd/fileio/primWriterArgs.cpp | 2 +- lib/mayaUsd/fileio/primWriterArgs.h | 2 +- lib/mayaUsd/fileio/primWriterContext.h | 2 +- lib/mayaUsd/fileio/primWriterRegistry.cpp | 6 +++--- lib/mayaUsd/fileio/primWriterRegistry.h | 8 ++++---- lib/mayaUsd/fileio/registryHelper.cpp | 2 +- lib/mayaUsd/fileio/shaderWriter.cpp | 2 +- lib/mayaUsd/fileio/shaderWriter.h | 6 +++--- .../shading/shadingModeDisplayColor.cpp | 10 +++++----- .../fileio/shading/shadingModeExporter.cpp | 8 ++++---- .../fileio/shading/shadingModeExporter.h | 8 ++++---- .../shading/shadingModeExporterContext.cpp | 6 +++--- .../shading/shadingModeExporterContext.h | 8 ++++---- .../fileio/shading/shadingModeImporter.h | 4 ++-- .../fileio/shading/shadingModePxrRis.cpp | 18 ++++++++--------- .../fileio/shading/shadingModeRegistry.cpp | 8 ++++---- .../fileio/shading/shadingModeRegistry.h | 8 ++++---- .../fileio/shading/shadingModeUseRegistry.cpp | 14 ++++++------- lib/mayaUsd/fileio/transformWriter.cpp | 10 +++++----- lib/mayaUsd/fileio/transformWriter.h | 6 +++--- .../translators/skelBindingsProcessor.cpp | 2 +- .../translators/skelBindingsProcessor.h | 4 ++-- .../fileio/translators/translatorCamera.cpp | 10 +++++----- .../fileio/translators/translatorCamera.h | 6 +++--- .../fileio/translators/translatorCurves.cpp | 2 +- .../fileio/translators/translatorCurves.h | 6 +++--- .../fileio/translators/translatorGprim.cpp | 2 +- .../fileio/translators/translatorGprim.h | 6 +++--- .../fileio/translators/translatorMaterial.cpp | 12 +++++------ .../fileio/translators/translatorMaterial.h | 8 ++++---- .../translators/translatorMayaReference.cpp | 4 ++-- .../translators/translatorMayaReference.h | 6 +++--- .../fileio/translators/translatorMesh.cpp | 10 +++++----- .../fileio/translators/translatorMesh.h | 2 +- .../translators/translatorNurbsPatch.cpp | 10 +++++----- .../fileio/translators/translatorNurbsPatch.h | 6 +++--- .../fileio/translators/translatorPrim.cpp | 6 +++--- .../fileio/translators/translatorPrim.h | 6 +++--- .../fileio/translators/translatorRfMLight.cpp | 18 ++++++++--------- .../fileio/translators/translatorRfMLight.h | 10 +++++----- .../fileio/translators/translatorSkel.cpp | 6 +++--- .../fileio/translators/translatorSkel.h | 6 +++--- .../fileio/translators/translatorUtil.cpp | 12 +++++------ .../fileio/translators/translatorUtil.h | 6 +++--- .../translators/translatorXformable.cpp | 6 +++--- .../fileio/translators/translatorXformable.h | 6 +++--- .../translatorXformable_decompose.cpp | 2 +- lib/mayaUsd/fileio/utils/adaptor.cpp | 10 +++++----- lib/mayaUsd/fileio/utils/adaptor.h | 2 +- lib/mayaUsd/fileio/utils/meshUtil.cpp | 10 +++++----- lib/mayaUsd/fileio/utils/meshUtil.h | 2 +- lib/mayaUsd/fileio/utils/readUtil.cpp | 6 +++--- lib/mayaUsd/fileio/utils/readUtil.h | 2 +- lib/mayaUsd/fileio/utils/roundTripUtil.h | 2 +- lib/mayaUsd/fileio/utils/shadingUtil.h | 2 +- .../fileio/utils/userTaggedAttribute.cpp | 2 +- .../fileio/utils/userTaggedAttribute.h | 2 +- lib/mayaUsd/fileio/utils/writeUtil.cpp | 8 ++++---- lib/mayaUsd/fileio/utils/writeUtil.h | 4 ++-- lib/mayaUsd/fileio/utils/xformStack.h | 2 +- lib/mayaUsd/fileio/writeJobContext.cpp | 16 +++++++-------- lib/mayaUsd/fileio/writeJobContext.h | 8 ++++---- lib/mayaUsd/listeners/notice.cpp | 2 +- lib/mayaUsd/listeners/notice.h | 2 +- lib/mayaUsd/listeners/proxyShapeNotice.h | 2 +- lib/mayaUsd/listeners/stageNoticeListener.h | 2 +- lib/mayaUsd/nodes/hdImagingShape.cpp | 6 +++--- lib/mayaUsd/nodes/hdImagingShape.h | 4 ++-- lib/mayaUsd/nodes/pointBasedDeformerNode.cpp | 2 +- lib/mayaUsd/nodes/pointBasedDeformerNode.h | 2 +- lib/mayaUsd/nodes/proxyShapeBase.cpp | 12 +++++------ lib/mayaUsd/nodes/proxyShapeBase.h | 6 +++--- lib/mayaUsd/nodes/proxyShapePlugin.cpp | 6 +++--- lib/mayaUsd/nodes/proxyShapePlugin.h | 2 +- lib/mayaUsd/nodes/stageData.h | 2 +- lib/mayaUsd/nodes/stageNode.cpp | 4 ++-- lib/mayaUsd/nodes/stageNode.h | 2 +- lib/mayaUsd/nodes/usdPrimProvider.h | 2 +- lib/mayaUsd/render/px_vp20/glslProgram.h | 2 +- lib/mayaUsd/render/px_vp20/utils.cpp | 2 +- lib/mayaUsd/render/px_vp20/utils.h | 4 ++-- lib/mayaUsd/render/px_vp20/utils_legacy.h | 2 +- .../render/pxrUsdMayaGL/batchRenderer.cpp | 9 ++++----- .../render/pxrUsdMayaGL/batchRenderer.h | 17 ++++++++-------- .../hdImagingShapeDrawOverride.cpp | 10 +++++----- .../pxrUsdMayaGL/hdImagingShapeDrawOverride.h | 2 +- .../render/pxrUsdMayaGL/hdImagingShapeUI.cpp | 10 +++++----- .../render/pxrUsdMayaGL/hdImagingShapeUI.h | 2 +- .../render/pxrUsdMayaGL/hdRenderer.cpp | 6 +++--- lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h | 2 +- .../render/pxrUsdMayaGL/instancerImager.cpp | 6 +++--- .../render/pxrUsdMayaGL/instancerImager.h | 9 ++++----- .../pxrUsdMayaGL/instancerShapeAdapter.cpp | 13 ++++++------ .../pxrUsdMayaGL/instancerShapeAdapter.h | 5 ++--- .../render/pxrUsdMayaGL/proxyDrawOverride.cpp | 11 +++++----- .../render/pxrUsdMayaGL/proxyDrawOverride.h | 4 ++-- .../pxrUsdMayaGL/proxyShapeDelegate.cpp | 4 ++-- .../render/pxrUsdMayaGL/proxyShapeUI.cpp | 8 ++++---- .../render/pxrUsdMayaGL/proxyShapeUI.h | 5 ++--- .../render/pxrUsdMayaGL/renderParams.h | 2 +- .../render/pxrUsdMayaGL/sceneDelegate.cpp | 6 +++--- .../render/pxrUsdMayaGL/sceneDelegate.h | 4 ++-- .../render/pxrUsdMayaGL/shapeAdapter.cpp | 13 ++++++------ .../render/pxrUsdMayaGL/shapeAdapter.h | 7 +++---- .../render/pxrUsdMayaGL/softSelectHelper.h | 2 +- .../pxrUsdMayaGL/usdProxyShapeAdapter.cpp | 12 +++++------ .../pxrUsdMayaGL/usdProxyShapeAdapter.h | 5 ++--- lib/mayaUsd/render/pxrUsdMayaGL/userData.h | 4 ++-- .../render/vp2RenderDelegate/basisCurves.h | 2 +- lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp | 2 +- lib/mayaUsd/render/vp2RenderDelegate/mesh.h | 2 +- .../vp2RenderDelegate/proxyRenderDelegate.cpp | 6 +++--- .../vp2RenderDelegate/proxyRenderDelegate.h | 2 +- lib/mayaUsd/ufe/Global.h | 2 +- lib/mayaUsd/ufe/ProxyShapeHandler.cpp | 2 +- lib/mayaUsd/ufe/ProxyShapeHandler.h | 2 +- lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp | 2 +- lib/mayaUsd/ufe/ProxyShapeHierarchy.h | 5 ++--- .../ufe/ProxyShapeHierarchyHandler.cpp | 4 ++-- lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h | 4 ++-- lib/mayaUsd/ufe/StagesSubject.cpp | 7 ++++--- lib/mayaUsd/ufe/StagesSubject.h | 4 ++-- lib/mayaUsd/ufe/UsdAttribute.cpp | 2 +- lib/mayaUsd/ufe/UsdAttribute.h | 2 +- lib/mayaUsd/ufe/UsdAttributes.h | 7 +++---- lib/mayaUsd/ufe/UsdAttributesHandler.cpp | 2 +- lib/mayaUsd/ufe/UsdAttributesHandler.h | 5 ++--- lib/mayaUsd/ufe/UsdContextOps.cpp | 2 +- lib/mayaUsd/ufe/UsdContextOps.h | 5 ++--- lib/mayaUsd/ufe/UsdContextOpsHandler.h | 5 ++--- lib/mayaUsd/ufe/UsdHierarchy.cpp | 5 +++-- lib/mayaUsd/ufe/UsdHierarchy.h | 5 ++--- lib/mayaUsd/ufe/UsdHierarchyHandler.cpp | 4 ++-- lib/mayaUsd/ufe/UsdHierarchyHandler.h | 7 +++---- lib/mayaUsd/ufe/UsdObject3d.cpp | 2 +- lib/mayaUsd/ufe/UsdObject3d.h | 5 ++--- lib/mayaUsd/ufe/UsdObject3dHandler.cpp | 2 +- lib/mayaUsd/ufe/UsdObject3dHandler.h | 5 ++--- lib/mayaUsd/ufe/UsdRootChildHierarchy.h | 5 ++--- .../UsdRotatePivotTranslateUndoableCommand.h | 2 +- lib/mayaUsd/ufe/UsdRotateUndoableCommand.h | 2 +- lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp | 2 +- lib/mayaUsd/ufe/UsdScaleUndoableCommand.h | 2 +- lib/mayaUsd/ufe/UsdSceneItem.h | 2 +- lib/mayaUsd/ufe/UsdSceneItemOps.cpp | 8 ++++---- lib/mayaUsd/ufe/UsdSceneItemOps.h | 5 ++--- lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h | 5 ++--- lib/mayaUsd/ufe/UsdStageMap.cpp | 2 +- lib/mayaUsd/ufe/UsdStageMap.h | 4 ++-- lib/mayaUsd/ufe/UsdTransform3d.cpp | 11 +++++----- lib/mayaUsd/ufe/UsdTransform3d.h | 5 ++--- lib/mayaUsd/ufe/UsdTransform3dHandler.cpp | 2 +- lib/mayaUsd/ufe/UsdTransform3dHandler.h | 5 ++--- .../ufe/UsdTranslateUndoableCommand.cpp | 2 +- lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h | 2 +- lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h | 5 ++--- lib/mayaUsd/ufe/UsdUndoDeleteCommand.h | 5 ++--- lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp | 2 +- lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h | 5 ++--- lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp | 2 +- lib/mayaUsd/ufe/UsdUndoRenameCommand.h | 5 ++--- lib/mayaUsd/ufe/Utils.cpp | 6 +++--- lib/mayaUsd/ufe/Utils.h | 4 ++-- lib/mayaUsd/ufe/private/InPathChange.h | 2 +- lib/mayaUsd/ufe/private/Utils.h | 2 +- .../utils/blockSceneModificationContext.h | 2 +- lib/mayaUsd/utils/colorSpace.h | 2 +- lib/mayaUsd/utils/diagnosticDelegate.cpp | 2 +- lib/mayaUsd/utils/diagnosticDelegate.h | 2 +- lib/mayaUsd/utils/query.cpp | 4 ++-- lib/mayaUsd/utils/query.h | 2 +- lib/mayaUsd/utils/stageCache.cpp | 2 +- lib/mayaUsd/utils/stageCache.h | 2 +- lib/mayaUsd/utils/undoHelperCommand.h | 4 ++-- lib/mayaUsd/utils/util.h | 2 +- lib/mayaUsd/utils/utilFileSystem.cpp | 2 +- lib/mayaUsd/utils/utilFileSystem.h | 2 +- 206 files changed, 523 insertions(+), 548 deletions(-) diff --git a/lib/mayaUsd/fileio/chaser/chaser.h b/lib/mayaUsd/fileio/chaser/chaser.h index 4d6036b572..0c8f9ff839 100644 --- a/lib/mayaUsd/fileio/chaser/chaser.h +++ b/lib/mayaUsd/fileio/chaser/chaser.h @@ -21,7 +21,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp b/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp index 360bb33bf0..e79372562e 100644 --- a/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp +++ b/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp @@ -19,8 +19,8 @@ #include -#include "mayaUsd/base/debugCodes.h" -#include "mayaUsd/fileio/registryHelper.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/chaser/chaserRegistry.h b/lib/mayaUsd/fileio/chaser/chaserRegistry.h index 5de8189c34..abc5700689 100644 --- a/lib/mayaUsd/fileio/chaser/chaserRegistry.h +++ b/lib/mayaUsd/fileio/chaser/chaserRegistry.h @@ -24,10 +24,10 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/chaser/chaser.h" -#include "mayaUsd/fileio/jobs/jobArgs.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/fallbackPrimReader.cpp b/lib/mayaUsd/fileio/fallbackPrimReader.cpp index 8144d2c17c..89b234da66 100644 --- a/lib/mayaUsd/fileio/fallbackPrimReader.cpp +++ b/lib/mayaUsd/fileio/fallbackPrimReader.cpp @@ -17,7 +17,7 @@ #include -#include "mayaUsd/fileio/translators/translatorUtil.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/fallbackPrimReader.h b/lib/mayaUsd/fileio/fallbackPrimReader.h index 4f774f97ac..d3dc4ac842 100644 --- a/lib/mayaUsd/fileio/fallbackPrimReader.h +++ b/lib/mayaUsd/fileio/fallbackPrimReader.h @@ -16,8 +16,8 @@ #ifndef PXRUSDMAYA_FALLBACK_PRIM_READER_H #define PXRUSDMAYA_FALLBACK_PRIM_READER_H -#include "mayaUsd/fileio/primReader.h" -#include "mayaUsd/fileio/primReaderRegistry.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/functorPrimReader.h b/lib/mayaUsd/fileio/functorPrimReader.h index 44f5d66114..5a7aca1344 100644 --- a/lib/mayaUsd/fileio/functorPrimReader.h +++ b/lib/mayaUsd/fileio/functorPrimReader.h @@ -20,11 +20,11 @@ #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primReader.h" -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" -#include "mayaUsd/fileio/primReaderRegistry.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/functorPrimWriter.cpp b/lib/mayaUsd/fileio/functorPrimWriter.cpp index ba4c24fab7..0d61706c8c 100644 --- a/lib/mayaUsd/fileio/functorPrimWriter.cpp +++ b/lib/mayaUsd/fileio/functorPrimWriter.cpp @@ -24,12 +24,12 @@ #include #include -#include "mayaUsd/fileio/primWriter.h" -#include "mayaUsd/fileio/primWriterArgs.h" -#include "mayaUsd/fileio/primWriterContext.h" -#include "mayaUsd/fileio/primWriterRegistry.h" -#include "mayaUsd/fileio/transformWriter.h" -#include "mayaUsd/fileio/writeJobContext.h" +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/functorPrimWriter.h b/lib/mayaUsd/fileio/functorPrimWriter.h index 9e103e9bc2..1270ca371c 100644 --- a/lib/mayaUsd/fileio/functorPrimWriter.h +++ b/lib/mayaUsd/fileio/functorPrimWriter.h @@ -24,10 +24,10 @@ #include #include -#include "mayaUsd/fileio/primWriter.h" -#include "mayaUsd/fileio/primWriterRegistry.h" -#include "mayaUsd/fileio/transformWriter.h" -#include "mayaUsd/fileio/writeJobContext.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/importData.h b/lib/mayaUsd/fileio/importData.h index 3c4d3ea17e..4d7e5afd5c 100644 --- a/lib/mayaUsd/fileio/importData.h +++ b/lib/mayaUsd/fileio/importData.h @@ -23,7 +23,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/fileio/instancedNodeWriter.cpp b/lib/mayaUsd/fileio/instancedNodeWriter.cpp index e2ea800574..a446bce032 100644 --- a/lib/mayaUsd/fileio/instancedNodeWriter.cpp +++ b/lib/mayaUsd/fileio/instancedNodeWriter.cpp @@ -27,9 +27,9 @@ #include #include -#include "mayaUsd/fileio/primWriter.h" -#include "mayaUsd/fileio/writeJobContext.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/instancedNodeWriter.h b/lib/mayaUsd/fileio/instancedNodeWriter.h index 4508c62209..2006901e83 100644 --- a/lib/mayaUsd/fileio/instancedNodeWriter.h +++ b/lib/mayaUsd/fileio/instancedNodeWriter.h @@ -24,9 +24,9 @@ #include #include -#include "mayaUsd/fileio/primWriter.h" -#include "mayaUsd/fileio/writeJobContext.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/jobs/jobArgs.cpp b/lib/mayaUsd/fileio/jobs/jobArgs.cpp index fa423add3f..7d4658e5c0 100644 --- a/lib/mayaUsd/fileio/jobs/jobArgs.cpp +++ b/lib/mayaUsd/fileio/jobs/jobArgs.cpp @@ -33,8 +33,8 @@ #include #include -#include "mayaUsd/fileio/registryHelper.h" -#include "mayaUsd/fileio/shading/shadingModeRegistry.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/jobs/jobArgs.h b/lib/mayaUsd/fileio/jobs/jobArgs.h index ab91ff56e9..837074fb76 100644 --- a/lib/mayaUsd/fileio/jobs/jobArgs.h +++ b/lib/mayaUsd/fileio/jobs/jobArgs.h @@ -29,8 +29,8 @@ #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/utils/util.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/jobs/modelKindProcessor.h b/lib/mayaUsd/fileio/jobs/modelKindProcessor.h index a5aa00c9c7..d320653902 100644 --- a/lib/mayaUsd/fileio/jobs/modelKindProcessor.h +++ b/lib/mayaUsd/fileio/jobs/modelKindProcessor.h @@ -24,8 +24,8 @@ #include #include -#include "mayaUsd/fileio/jobs/jobArgs.h" -#include "mayaUsd/fileio/primWriter.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/jobs/readJob.cpp b/lib/mayaUsd/fileio/jobs/readJob.cpp index f07a906385..f28a0c50b7 100644 --- a/lib/mayaUsd/fileio/jobs/readJob.cpp +++ b/lib/mayaUsd/fileio/jobs/readJob.cpp @@ -47,12 +47,12 @@ #include #include -#include "mayaUsd/fileio/primReaderRegistry.h" -#include "mayaUsd/fileio/translators/translatorMaterial.h" -#include "mayaUsd/fileio/translators/translatorXformable.h" -#include "mayaUsd/nodes/stageNode.h" -#include "mayaUsd/utils/stageCache.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/jobs/readJob.h b/lib/mayaUsd/fileio/jobs/readJob.h index ddc81aca91..6552362745 100644 --- a/lib/mayaUsd/fileio/jobs/readJob.h +++ b/lib/mayaUsd/fileio/jobs/readJob.h @@ -27,9 +27,9 @@ #include #include -#include "mayaUsd/fileio/importData.h" -#include "mayaUsd/fileio/jobs/jobArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/jobs/writeJob.cpp b/lib/mayaUsd/fileio/jobs/writeJob.cpp index aeddd9760f..f9921f4b0d 100644 --- a/lib/mayaUsd/fileio/jobs/writeJob.cpp +++ b/lib/mayaUsd/fileio/jobs/writeJob.cpp @@ -57,16 +57,16 @@ #include #include -#include "mayaUsd/fileio/chaser/chaser.h" -#include "mayaUsd/fileio/chaser/chaserRegistry.h" -#include "mayaUsd/fileio/jobs/jobArgs.h" -#include "mayaUsd/fileio/jobs/modelKindProcessor.h" -#include "mayaUsd/fileio/primWriter.h" -#include "mayaUsd/fileio/primWriterRegistry.h" -#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" -#include "mayaUsd/fileio/transformWriter.h" -#include "mayaUsd/fileio/translators/translatorMaterial.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/jobs/writeJob.h b/lib/mayaUsd/fileio/jobs/writeJob.h index 14f5deeb9f..f05076a8c8 100644 --- a/lib/mayaUsd/fileio/jobs/writeJob.h +++ b/lib/mayaUsd/fileio/jobs/writeJob.h @@ -23,10 +23,10 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/chaser/chaser.h" -#include "mayaUsd/fileio/writeJobContext.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primReader.h b/lib/mayaUsd/fileio/primReader.h index 7398ce094d..7f6a43e850 100644 --- a/lib/mayaUsd/fileio/primReader.h +++ b/lib/mayaUsd/fileio/primReader.h @@ -18,9 +18,9 @@ #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primReaderArgs.h b/lib/mayaUsd/fileio/primReaderArgs.h index 16cb27608b..e422d1954b 100644 --- a/lib/mayaUsd/fileio/primReaderArgs.h +++ b/lib/mayaUsd/fileio/primReaderArgs.h @@ -20,8 +20,8 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/jobs/jobArgs.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primReaderContext.h b/lib/mayaUsd/fileio/primReaderContext.h index 81356661db..f6f3876a90 100644 --- a/lib/mayaUsd/fileio/primReaderContext.h +++ b/lib/mayaUsd/fileio/primReaderContext.h @@ -21,7 +21,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primReaderRegistry.cpp b/lib/mayaUsd/fileio/primReaderRegistry.cpp index f0a6a4f2dd..b35127d3a4 100644 --- a/lib/mayaUsd/fileio/primReaderRegistry.cpp +++ b/lib/mayaUsd/fileio/primReaderRegistry.cpp @@ -27,10 +27,10 @@ #include #include -#include "mayaUsd/base/debugCodes.h" -#include "mayaUsd/fileio/fallbackPrimReader.h" -#include "mayaUsd/fileio/functorPrimReader.h" -#include "mayaUsd/fileio/registryHelper.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primReaderRegistry.h b/lib/mayaUsd/fileio/primReaderRegistry.h index caccdfc6cc..c35b2b2a00 100644 --- a/lib/mayaUsd/fileio/primReaderRegistry.h +++ b/lib/mayaUsd/fileio/primReaderRegistry.h @@ -19,10 +19,10 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primReader.h" -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primUpdater.h b/lib/mayaUsd/fileio/primUpdater.h index 54b46ff43d..5438ed5b03 100644 --- a/lib/mayaUsd/fileio/primUpdater.h +++ b/lib/mayaUsd/fileio/primUpdater.h @@ -24,9 +24,9 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primUpdaterContext.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primUpdaterContext.h b/lib/mayaUsd/fileio/primUpdaterContext.h index 8d13d0b0a5..e682a6bb33 100644 --- a/lib/mayaUsd/fileio/primUpdaterContext.h +++ b/lib/mayaUsd/fileio/primUpdaterContext.h @@ -21,7 +21,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primUpdaterRegistry.cpp b/lib/mayaUsd/fileio/primUpdaterRegistry.cpp index 99bcb4252c..d7a544ac71 100644 --- a/lib/mayaUsd/fileio/primUpdaterRegistry.cpp +++ b/lib/mayaUsd/fileio/primUpdaterRegistry.cpp @@ -30,8 +30,8 @@ #include #include -#include "mayaUsd/fileio/registryHelper.h" -#include "mayaUsd/base/debugCodes.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primUpdaterRegistry.h b/lib/mayaUsd/fileio/primUpdaterRegistry.h index 4eeb117fc4..ff1cb49067 100644 --- a/lib/mayaUsd/fileio/primUpdaterRegistry.h +++ b/lib/mayaUsd/fileio/primUpdaterRegistry.h @@ -25,9 +25,9 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primUpdater.h" -#include "mayaUsd/fileio/primUpdaterContext.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primWriter.cpp b/lib/mayaUsd/fileio/primWriter.cpp index a608723d6f..4ac4874c79 100644 --- a/lib/mayaUsd/fileio/primWriter.cpp +++ b/lib/mayaUsd/fileio/primWriter.cpp @@ -40,12 +40,12 @@ #include #include -#include "mayaUsd/fileio/jobs/jobArgs.h" -#include "mayaUsd/fileio/translators/translatorGprim.h" -#include "mayaUsd/fileio/utils/adaptor.h" -#include "mayaUsd/fileio/utils/writeUtil.h" -#include "mayaUsd/fileio/writeJobContext.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primWriter.h b/lib/mayaUsd/fileio/primWriter.h index 7c2c2193ee..0ae4b00cbd 100644 --- a/lib/mayaUsd/fileio/primWriter.h +++ b/lib/mayaUsd/fileio/primWriter.h @@ -31,9 +31,9 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/jobs/jobArgs.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primWriterArgs.cpp b/lib/mayaUsd/fileio/primWriterArgs.cpp index 040b37e444..89665b47f6 100644 --- a/lib/mayaUsd/fileio/primWriterArgs.cpp +++ b/lib/mayaUsd/fileio/primWriterArgs.cpp @@ -17,7 +17,7 @@ #include -#include "mayaUsd/fileio/utils/writeUtil.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primWriterArgs.h b/lib/mayaUsd/fileio/primWriterArgs.h index 793770e95c..603ff9cf62 100644 --- a/lib/mayaUsd/fileio/primWriterArgs.h +++ b/lib/mayaUsd/fileio/primWriterArgs.h @@ -23,7 +23,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primWriterContext.h b/lib/mayaUsd/fileio/primWriterContext.h index b5e6ed1f41..33eec8f439 100644 --- a/lib/mayaUsd/fileio/primWriterContext.h +++ b/lib/mayaUsd/fileio/primWriterContext.h @@ -20,7 +20,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primWriterRegistry.cpp b/lib/mayaUsd/fileio/primWriterRegistry.cpp index 5eae3c0dc4..437fc09712 100644 --- a/lib/mayaUsd/fileio/primWriterRegistry.cpp +++ b/lib/mayaUsd/fileio/primWriterRegistry.cpp @@ -27,9 +27,9 @@ #include #include -#include "mayaUsd/base/debugCodes.h" -#include "mayaUsd/fileio/functorPrimWriter.h" -#include "mayaUsd/fileio/registryHelper.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/primWriterRegistry.h b/lib/mayaUsd/fileio/primWriterRegistry.h index 41c6e9cc79..ab1381bd33 100644 --- a/lib/mayaUsd/fileio/primWriterRegistry.h +++ b/lib/mayaUsd/fileio/primWriterRegistry.h @@ -24,10 +24,10 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primWriter.h" -#include "mayaUsd/fileio/primWriterArgs.h" -#include "mayaUsd/fileio/primWriterContext.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/registryHelper.cpp b/lib/mayaUsd/fileio/registryHelper.cpp index 8f1a203d9f..324cedd41b 100644 --- a/lib/mayaUsd/fileio/registryHelper.cpp +++ b/lib/mayaUsd/fileio/registryHelper.cpp @@ -28,7 +28,7 @@ #include #include -#include "mayaUsd/base/debugCodes.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shaderWriter.cpp b/lib/mayaUsd/fileio/shaderWriter.cpp index 65a6c8fcc2..8b19b98d18 100644 --- a/lib/mayaUsd/fileio/shaderWriter.cpp +++ b/lib/mayaUsd/fileio/shaderWriter.cpp @@ -23,7 +23,7 @@ #include #include -#include "mayaUsd/fileio/writeJobContext.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shaderWriter.h b/lib/mayaUsd/fileio/shaderWriter.h index 3a679ed63b..4f2ec6c69c 100644 --- a/lib/mayaUsd/fileio/shaderWriter.h +++ b/lib/mayaUsd/fileio/shaderWriter.h @@ -24,9 +24,9 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primWriter.h" -#include "mayaUsd/fileio/writeJobContext.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp b/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp index 1fa7e34090..69688c5f78 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp @@ -48,11 +48,11 @@ #include #include -#include "mayaUsd/fileio/shading/shadingModeExporter.h" -#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" -#include "mayaUsd/fileio/shading/shadingModeRegistry.h" -#include "mayaUsd/fileio/translators/translatorMaterial.h" -#include "mayaUsd/utils/colorSpace.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp b/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp index e58002d515..fe8edcca76 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp @@ -33,10 +33,10 @@ #include #include -#include "mayaUsd/fileio/jobs/jobArgs.h" -#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" -#include "mayaUsd/fileio/writeJobContext.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporter.h b/lib/mayaUsd/fileio/shading/shadingModeExporter.h index b5f7c9b814..220ae55b94 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeExporter.h +++ b/lib/mayaUsd/fileio/shading/shadingModeExporter.h @@ -23,10 +23,10 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" -#include "mayaUsd/utils/util.h" -#include "mayaUsd/fileio/writeJobContext.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp index fcc56fe70c..3cad0788da 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp @@ -46,9 +46,9 @@ #include #include -#include "mayaUsd/fileio/jobs/jobArgs.h" -#include "mayaUsd/fileio/writeJobContext.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h index bff374d9fa..9e4c932051 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h +++ b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h @@ -16,7 +16,7 @@ #ifndef PXRUSDMAYA_SHADING_MODE_EXPORTER_CONTEXT_H #define PXRUSDMAYA_SHADING_MODE_EXPORTER_CONTEXT_H -#include "mayaUsd/base/api.h" +#include #include #include @@ -32,9 +32,9 @@ #include #include -#include "mayaUsd/fileio/jobs/jobArgs.h" -#include "mayaUsd/fileio/writeJobContext.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeImporter.h b/lib/mayaUsd/fileio/shading/shadingModeImporter.h index 395993d590..879ee545a1 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeImporter.h +++ b/lib/mayaUsd/fileio/shading/shadingModeImporter.h @@ -28,8 +28,8 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primReaderContext.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp b/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp index 81bb4d81c5..578cebd36f 100644 --- a/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp @@ -43,18 +43,18 @@ #include #include -#include "mayaUsd/fileio/shading/shadingModeExporter.h" -#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" -#include "mayaUsd/fileio/shading/shadingModeImporter.h" +#include +#include +#include // Defines the RenderMan for Maya mapping between Pxr objects and Maya internal nodes -#include "mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h" +#include -#include "mayaUsd/fileio/shading/shadingModeRegistry.h" -#include "mayaUsd/fileio/translators/translatorUtil.h" -#include "mayaUsd/fileio/utils/roundTripUtil.h" -#include "mayaUsd/fileio/utils/writeUtil.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp b/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp index 0e11b6bc44..15c35731de 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp @@ -24,10 +24,10 @@ #include #include -#include "mayaUsd/fileio/registryHelper.h" -#include "mayaUsd/fileio/shading/shadingModeExporter.h" -#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" -#include "mayaUsd/fileio/shading/shadingModeImporter.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeRegistry.h b/lib/mayaUsd/fileio/shading/shadingModeRegistry.h index b6d5d09d17..a1c9ec6684 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeRegistry.h +++ b/lib/mayaUsd/fileio/shading/shadingModeRegistry.h @@ -27,10 +27,10 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/shading/shadingModeExporter.h" -#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" -#include "mayaUsd/fileio/shading/shadingModeImporter.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp b/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp index c75d8fe0da..17873dafba 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp @@ -40,13 +40,13 @@ #include #include -#include "mayaUsd/fileio/primWriter.h" -#include "mayaUsd/fileio/shaderWriter.h" -#include "mayaUsd/fileio/shading/shadingModeExporter.h" -#include "mayaUsd/fileio/shading/shadingModeExporterContext.h" -#include "mayaUsd/fileio/shading/shadingModeRegistry.h" -#include "mayaUsd/fileio/utils/shadingUtil.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/transformWriter.cpp b/lib/mayaUsd/fileio/transformWriter.cpp index 46f97e3f9a..741ae82271 100644 --- a/lib/mayaUsd/fileio/transformWriter.cpp +++ b/lib/mayaUsd/fileio/transformWriter.cpp @@ -36,11 +36,11 @@ #include #include -#include "mayaUsd/fileio/primWriterRegistry.h" -#include "mayaUsd/fileio/utils/adaptor.h" -#include "mayaUsd/fileio/utils/xformStack.h" -#include "mayaUsd/fileio/writeJobContext.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/transformWriter.h b/lib/mayaUsd/fileio/transformWriter.h index f7f6636e98..cff77c79b6 100644 --- a/lib/mayaUsd/fileio/transformWriter.h +++ b/lib/mayaUsd/fileio/transformWriter.h @@ -34,9 +34,9 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primWriter.h" -#include "mayaUsd/fileio/writeJobContext.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp index 2289b260e8..8f855670fa 100644 --- a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp +++ b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp @@ -20,7 +20,7 @@ #include #include -#include "mayaUsd/fileio/translators/translatorUtil.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h index 532e5dba44..135493514c 100644 --- a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h +++ b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h @@ -25,8 +25,8 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/utils/util.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorCamera.cpp b/lib/mayaUsd/fileio/translators/translatorCamera.cpp index 9cd2a6870d..1d9c5c2b6d 100644 --- a/lib/mayaUsd/fileio/translators/translatorCamera.cpp +++ b/lib/mayaUsd/fileio/translators/translatorCamera.cpp @@ -33,11 +33,11 @@ #include #include -#include "mayaUsd/fileio/jobs/jobArgs.h" -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" -#include "mayaUsd/fileio/translators/translatorUtil.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorCamera.h b/lib/mayaUsd/fileio/translators/translatorCamera.h index 0327d7c367..2abe378560 100644 --- a/lib/mayaUsd/fileio/translators/translatorCamera.h +++ b/lib/mayaUsd/fileio/translators/translatorCamera.h @@ -22,9 +22,9 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorCurves.cpp b/lib/mayaUsd/fileio/translators/translatorCurves.cpp index 8dbd743153..1b48fabca6 100644 --- a/lib/mayaUsd/fileio/translators/translatorCurves.cpp +++ b/lib/mayaUsd/fileio/translators/translatorCurves.cpp @@ -29,7 +29,7 @@ #include #include -#include "mayaUsd/fileio/translators/translatorUtil.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorCurves.h b/lib/mayaUsd/fileio/translators/translatorCurves.h index c10c8e5700..ea4dedbda6 100644 --- a/lib/mayaUsd/fileio/translators/translatorCurves.h +++ b/lib/mayaUsd/fileio/translators/translatorCurves.h @@ -21,9 +21,9 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorGprim.cpp b/lib/mayaUsd/fileio/translators/translatorGprim.cpp index 4e3cd66ed2..b5b3bc0472 100644 --- a/lib/mayaUsd/fileio/translators/translatorGprim.cpp +++ b/lib/mayaUsd/fileio/translators/translatorGprim.cpp @@ -17,7 +17,7 @@ #include -#include "mayaUsd/utils/util.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorGprim.h b/lib/mayaUsd/fileio/translators/translatorGprim.h index 4b6e170311..a111e8ecde 100644 --- a/lib/mayaUsd/fileio/translators/translatorGprim.h +++ b/lib/mayaUsd/fileio/translators/translatorGprim.h @@ -21,9 +21,9 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primReaderContext.h" -#include "mayaUsd/fileio/primWriterContext.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorMaterial.cpp b/lib/mayaUsd/fileio/translators/translatorMaterial.cpp index 8207bb2ffa..b2c5be9bd8 100644 --- a/lib/mayaUsd/fileio/translators/translatorMaterial.cpp +++ b/lib/mayaUsd/fileio/translators/translatorMaterial.cpp @@ -42,12 +42,12 @@ #include #include -#include "mayaUsd/fileio/primReaderContext.h" -#include "mayaUsd/fileio/shading/shadingModeExporter.h" -#include "mayaUsd/fileio/shading/shadingModeImporter.h" -#include "mayaUsd/fileio/shading/shadingModeRegistry.h" -#include "mayaUsd/fileio/writeJobContext.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorMaterial.h b/lib/mayaUsd/fileio/translators/translatorMaterial.h index d9f5fce77f..54311e9b63 100644 --- a/lib/mayaUsd/fileio/translators/translatorMaterial.h +++ b/lib/mayaUsd/fileio/translators/translatorMaterial.h @@ -24,10 +24,10 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primReaderContext.h" -#include "mayaUsd/fileio/writeJobContext.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp b/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp index f58b0fd3fb..d655ac1483 100644 --- a/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp +++ b/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp @@ -45,8 +45,8 @@ #include #include -#include "mayaUsd/base/debugCodes.h" -#include "mayaUsd/utils/util.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorMayaReference.h b/lib/mayaUsd/fileio/translators/translatorMayaReference.h index aabcacb58f..5de0e7d0ec 100644 --- a/lib/mayaUsd/fileio/translators/translatorMayaReference.h +++ b/lib/mayaUsd/fileio/translators/translatorMayaReference.h @@ -38,9 +38,9 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primReaderContext.h" -#include "mayaUsd/fileio/primWriterContext.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorMesh.cpp b/lib/mayaUsd/fileio/translators/translatorMesh.cpp index 82d9dcb0e4..39ba44ee45 100644 --- a/lib/mayaUsd/fileio/translators/translatorMesh.cpp +++ b/lib/mayaUsd/fileio/translators/translatorMesh.cpp @@ -38,11 +38,11 @@ #include #include -#include "mayaUsd/fileio/utils/meshUtil.h" -#include "mayaUsd/fileio/utils/readUtil.h" -#include "mayaUsd/nodes/pointBasedDeformerNode.h" -#include "mayaUsd/nodes/stageNode.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/fileio/translators/translatorMesh.h b/lib/mayaUsd/fileio/translators/translatorMesh.h index 2a97c2f2d4..54a5b861ae 100644 --- a/lib/mayaUsd/fileio/translators/translatorMesh.h +++ b/lib/mayaUsd/fileio/translators/translatorMesh.h @@ -18,7 +18,7 @@ #pragma once -#include "mayaUsd/base/api.h" +#include #include #include diff --git a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp index 069ec8291b..6bb538a95e 100644 --- a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp +++ b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp @@ -32,11 +32,11 @@ #include -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" -#include "mayaUsd/fileio/translators/translatorGprim.h" -#include "mayaUsd/fileio/translators/translatorMaterial.h" -#include "mayaUsd/fileio/translators/translatorUtil.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h index b72c45ba85..d1dd5ac5ec 100644 --- a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h +++ b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h @@ -21,9 +21,9 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorPrim.cpp b/lib/mayaUsd/fileio/translators/translatorPrim.cpp index 9c147e0954..8a4f4b8739 100644 --- a/lib/mayaUsd/fileio/translators/translatorPrim.cpp +++ b/lib/mayaUsd/fileio/translators/translatorPrim.cpp @@ -20,9 +20,9 @@ #include -#include "mayaUsd/fileio/translators/translatorUtil.h" -#include "mayaUsd/fileio/utils/readUtil.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorPrim.h b/lib/mayaUsd/fileio/translators/translatorPrim.h index 50c96963c1..cbe24f6e15 100644 --- a/lib/mayaUsd/fileio/translators/translatorPrim.h +++ b/lib/mayaUsd/fileio/translators/translatorPrim.h @@ -21,9 +21,9 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp b/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp index 61dccad89f..f0691e030d 100644 --- a/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp +++ b/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp @@ -46,15 +46,15 @@ #include #include -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" -#include "mayaUsd/fileio/primReaderRegistry.h" -#include "mayaUsd/fileio/primWriterArgs.h" -#include "mayaUsd/fileio/primWriterContext.h" -#include "mayaUsd/fileio/primWriterRegistry.h" -#include "mayaUsd/fileio/translators/translatorUtil.h" -#include "mayaUsd/fileio/translators/translatorXformable.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorRfMLight.h b/lib/mayaUsd/fileio/translators/translatorRfMLight.h index 878a181029..fc0e8f0601 100644 --- a/lib/mayaUsd/fileio/translators/translatorRfMLight.h +++ b/lib/mayaUsd/fileio/translators/translatorRfMLight.h @@ -18,11 +18,11 @@ #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" -#include "mayaUsd/fileio/primWriterArgs.h" -#include "mayaUsd/fileio/primWriterContext.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorSkel.cpp b/lib/mayaUsd/fileio/translators/translatorSkel.cpp index c3279384fc..fb7d27123f 100644 --- a/lib/mayaUsd/fileio/translators/translatorSkel.cpp +++ b/lib/mayaUsd/fileio/translators/translatorSkel.cpp @@ -39,9 +39,9 @@ #include #include -#include "mayaUsd/fileio/translators/translatorUtil.h" -#include "mayaUsd/fileio/translators/translatorXformable.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorSkel.h b/lib/mayaUsd/fileio/translators/translatorSkel.h index d701dd5b10..8b29b6348b 100644 --- a/lib/mayaUsd/fileio/translators/translatorSkel.h +++ b/lib/mayaUsd/fileio/translators/translatorSkel.h @@ -16,10 +16,10 @@ #ifndef PXRUSDMAYA_TRANSLATOR_SKEL_H #define PXRUSDMAYA_TRANSLATOR_SKEL_H -#include "mayaUsd/base/api.h" +#include -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" +#include +#include #include #include diff --git a/lib/mayaUsd/fileio/translators/translatorUtil.cpp b/lib/mayaUsd/fileio/translators/translatorUtil.cpp index 7a737ff30a..79cf566130 100644 --- a/lib/mayaUsd/fileio/translators/translatorUtil.cpp +++ b/lib/mayaUsd/fileio/translators/translatorUtil.cpp @@ -30,12 +30,12 @@ #include #include -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" -#include "mayaUsd/fileio/translators/translatorXformable.h" -#include "mayaUsd/fileio/utils/adaptor.h" -#include "mayaUsd/fileio/utils/xformStack.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorUtil.h b/lib/mayaUsd/fileio/translators/translatorUtil.h index ecb7123539..88bfc2a902 100644 --- a/lib/mayaUsd/fileio/translators/translatorUtil.h +++ b/lib/mayaUsd/fileio/translators/translatorUtil.h @@ -16,10 +16,10 @@ #ifndef PXRUSDMAYA_TRANSLATOR_UTIL_H #define PXRUSDMAYA_TRANSLATOR_UTIL_H -#include "mayaUsd/base/api.h" +#include -#include "mayaUsd/fileio/primReaderContext.h" -#include "mayaUsd/fileio/primReaderArgs.h" +#include +#include #include #include diff --git a/lib/mayaUsd/fileio/translators/translatorXformable.cpp b/lib/mayaUsd/fileio/translators/translatorXformable.cpp index 2c89fd5a07..cd3e736112 100644 --- a/lib/mayaUsd/fileio/translators/translatorXformable.cpp +++ b/lib/mayaUsd/fileio/translators/translatorXformable.cpp @@ -43,9 +43,9 @@ #include #include -#include "mayaUsd/fileio/translators/translatorPrim.h" -#include "mayaUsd/fileio/translators/translatorUtil.h" -#include "mayaUsd/fileio/utils/xformStack.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorXformable.h b/lib/mayaUsd/fileio/translators/translatorXformable.h index 3078ea0434..37d41c4ee6 100644 --- a/lib/mayaUsd/fileio/translators/translatorXformable.h +++ b/lib/mayaUsd/fileio/translators/translatorXformable.h @@ -16,7 +16,7 @@ #ifndef PXRUSDMAYA_TRANSLATOR_XFORMABLE_H #define PXRUSDMAYA_TRANSLATOR_XFORMABLE_H -#include "mayaUsd/base/api.h" +#include #include @@ -25,8 +25,8 @@ #include #include -#include "mayaUsd/fileio/primReaderArgs.h" -#include "mayaUsd/fileio/primReaderContext.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp b/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp index dc16ca37e8..eb35999e5f 100644 --- a/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp +++ b/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp @@ -20,7 +20,7 @@ #include #include -#include "mayaUsd/fileio/translators/translatorXformable.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/adaptor.cpp b/lib/mayaUsd/fileio/utils/adaptor.cpp index d6f3523699..28df5ee35f 100644 --- a/lib/mayaUsd/fileio/utils/adaptor.cpp +++ b/lib/mayaUsd/fileio/utils/adaptor.cpp @@ -24,11 +24,11 @@ #include #include -#include "mayaUsd/fileio/primWriterRegistry.h" -#include "mayaUsd/fileio/registryHelper.h" -#include "mayaUsd/fileio/utils/readUtil.h" -#include "mayaUsd/fileio/utils/writeUtil.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/adaptor.h b/lib/mayaUsd/fileio/utils/adaptor.h index e9bc2388a0..3935ef556c 100644 --- a/lib/mayaUsd/fileio/utils/adaptor.h +++ b/lib/mayaUsd/fileio/utils/adaptor.h @@ -28,7 +28,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/meshUtil.cpp b/lib/mayaUsd/fileio/utils/meshUtil.cpp index 1c228510e1..6862330e95 100644 --- a/lib/mayaUsd/fileio/utils/meshUtil.cpp +++ b/lib/mayaUsd/fileio/utils/meshUtil.cpp @@ -43,11 +43,11 @@ #include #include -#include "mayaUsd/fileio/utils/adaptor.h" -#include "mayaUsd/fileio/utils/readUtil.h" -#include "mayaUsd/fileio/utils/roundTripUtil.h" -#include "mayaUsd/utils/colorSpace.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/meshUtil.h b/lib/mayaUsd/fileio/utils/meshUtil.h index 3298c8741f..62ec772319 100644 --- a/lib/mayaUsd/fileio/utils/meshUtil.h +++ b/lib/mayaUsd/fileio/utils/meshUtil.h @@ -31,7 +31,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/readUtil.cpp b/lib/mayaUsd/fileio/utils/readUtil.cpp index 87c52957bd..2651e56746 100644 --- a/lib/mayaUsd/fileio/utils/readUtil.cpp +++ b/lib/mayaUsd/fileio/utils/readUtil.cpp @@ -43,9 +43,9 @@ #include #include -#include "mayaUsd/fileio/utils/adaptor.h" -#include "mayaUsd/utils/colorSpace.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/readUtil.h b/lib/mayaUsd/fileio/utils/readUtil.h index fe0301339b..1b84d94b7e 100644 --- a/lib/mayaUsd/fileio/utils/readUtil.h +++ b/lib/mayaUsd/fileio/utils/readUtil.h @@ -27,7 +27,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/roundTripUtil.h b/lib/mayaUsd/fileio/utils/roundTripUtil.h index 3d975d2dda..4aff8cf931 100644 --- a/lib/mayaUsd/fileio/utils/roundTripUtil.h +++ b/lib/mayaUsd/fileio/utils/roundTripUtil.h @@ -20,7 +20,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/shadingUtil.h b/lib/mayaUsd/fileio/utils/shadingUtil.h index 670f39643b..acb4a3ba71 100644 --- a/lib/mayaUsd/fileio/utils/shadingUtil.h +++ b/lib/mayaUsd/fileio/utils/shadingUtil.h @@ -24,7 +24,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp b/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp index 4e9d125f6c..07ff6f62a5 100644 --- a/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp +++ b/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp @@ -32,7 +32,7 @@ #include #include -#include "mayaUsd/utils/util.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/userTaggedAttribute.h b/lib/mayaUsd/fileio/utils/userTaggedAttribute.h index 436085e003..e6c8f2fbd7 100644 --- a/lib/mayaUsd/fileio/utils/userTaggedAttribute.h +++ b/lib/mayaUsd/fileio/utils/userTaggedAttribute.h @@ -28,7 +28,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/writeUtil.cpp b/lib/mayaUsd/fileio/utils/writeUtil.cpp index d3428d0caa..f0559ca6a6 100644 --- a/lib/mayaUsd/fileio/utils/writeUtil.cpp +++ b/lib/mayaUsd/fileio/utils/writeUtil.cpp @@ -63,10 +63,10 @@ #include #include -#include "mayaUsd/fileio/translators/translatorUtil.h" -#include "mayaUsd/fileio/utils/adaptor.h" -#include "mayaUsd/fileio/utils/userTaggedAttribute.h" -#include "mayaUsd/utils/colorSpace.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/writeUtil.h b/lib/mayaUsd/fileio/utils/writeUtil.h index b0a547c4eb..e9cbf15b04 100644 --- a/lib/mayaUsd/fileio/utils/writeUtil.h +++ b/lib/mayaUsd/fileio/utils/writeUtil.h @@ -35,8 +35,8 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/utils/userTaggedAttribute.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/utils/xformStack.h b/lib/mayaUsd/fileio/utils/xformStack.h index ed5f509380..d9e6586f1a 100644 --- a/lib/mayaUsd/fileio/utils/xformStack.h +++ b/lib/mayaUsd/fileio/utils/xformStack.h @@ -26,7 +26,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/writeJobContext.cpp b/lib/mayaUsd/fileio/writeJobContext.cpp index 5e6e2bc71a..13c7f417c9 100644 --- a/lib/mayaUsd/fileio/writeJobContext.cpp +++ b/lib/mayaUsd/fileio/writeJobContext.cpp @@ -47,14 +47,14 @@ #include #include -#include "mayaUsd/fileio/instancedNodeWriter.h" -#include "mayaUsd/fileio/jobs/jobArgs.h" -#include "mayaUsd/fileio/primWriter.h" -#include "mayaUsd/fileio/primWriterRegistry.h" -#include "mayaUsd/fileio/transformWriter.h" -#include "mayaUsd/fileio/translators/skelBindingsProcessor.h" -#include "mayaUsd/utils/stageCache.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/fileio/writeJobContext.h b/lib/mayaUsd/fileio/writeJobContext.h index 46278468d1..77dfd9ee46 100644 --- a/lib/mayaUsd/fileio/writeJobContext.h +++ b/lib/mayaUsd/fileio/writeJobContext.h @@ -25,10 +25,10 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/jobs/jobArgs.h" -#include "mayaUsd/fileio/primWriter.h" -#include "mayaUsd/fileio/primWriterRegistry.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/listeners/notice.cpp b/lib/mayaUsd/listeners/notice.cpp index b6687f0e59..bb011074e2 100644 --- a/lib/mayaUsd/listeners/notice.cpp +++ b/lib/mayaUsd/listeners/notice.cpp @@ -18,7 +18,7 @@ #include -#include "mayaUsd/listeners/notice.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/listeners/notice.h b/lib/mayaUsd/listeners/notice.h index 8db253e6d8..1c02980878 100644 --- a/lib/mayaUsd/listeners/notice.h +++ b/lib/mayaUsd/listeners/notice.h @@ -21,7 +21,7 @@ #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/listeners/proxyShapeNotice.h b/lib/mayaUsd/listeners/proxyShapeNotice.h index a40da65c74..6e0e78b972 100644 --- a/lib/mayaUsd/listeners/proxyShapeNotice.h +++ b/lib/mayaUsd/listeners/proxyShapeNotice.h @@ -20,7 +20,7 @@ #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/listeners/stageNoticeListener.h b/lib/mayaUsd/listeners/stageNoticeListener.h index af2eb9d18d..ac8eeacab4 100644 --- a/lib/mayaUsd/listeners/stageNoticeListener.h +++ b/lib/mayaUsd/listeners/stageNoticeListener.h @@ -24,7 +24,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/nodes/hdImagingShape.cpp b/lib/mayaUsd/nodes/hdImagingShape.cpp index 4cf7df4019..ab36e6251c 100644 --- a/lib/mayaUsd/nodes/hdImagingShape.cpp +++ b/lib/mayaUsd/nodes/hdImagingShape.cpp @@ -45,9 +45,9 @@ #include #include -#include "mayaUsd/fileio/translators/translatorUtil.h" -#include "mayaUsd/utils/blockSceneModificationContext.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/nodes/hdImagingShape.h b/lib/mayaUsd/nodes/hdImagingShape.h index a6d4eaf604..9384259cb2 100644 --- a/lib/mayaUsd/nodes/hdImagingShape.h +++ b/lib/mayaUsd/nodes/hdImagingShape.h @@ -31,8 +31,8 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/utils/util.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp b/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp index f731104682..e0909b7c6b 100644 --- a/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp +++ b/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp @@ -50,7 +50,7 @@ #include #include -#include "mayaUsd/nodes/stageData.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/nodes/pointBasedDeformerNode.h b/lib/mayaUsd/nodes/pointBasedDeformerNode.h index eb17fbafb3..fe3f7ee157 100644 --- a/lib/mayaUsd/nodes/pointBasedDeformerNode.h +++ b/lib/mayaUsd/nodes/pointBasedDeformerNode.h @@ -28,7 +28,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/nodes/proxyShapeBase.cpp b/lib/mayaUsd/nodes/proxyShapeBase.cpp index 6ffc0f371c..f1daf6df8e 100644 --- a/lib/mayaUsd/nodes/proxyShapeBase.cpp +++ b/lib/mayaUsd/nodes/proxyShapeBase.cpp @@ -78,12 +78,12 @@ #include #endif -#include "mayaUsd/base/debugCodes.h" -#include "mayaUsd/listeners/proxyShapeNotice.h" -#include "mayaUsd/nodes/stageData.h" -#include "mayaUsd/utils/query.h" -#include "mayaUsd/utils/stageCache.h" -#include "mayaUsd/utils/utilFileSystem.h" +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/nodes/proxyShapeBase.h b/lib/mayaUsd/nodes/proxyShapeBase.h index 424bb66692..9b8ee2b0ba 100644 --- a/lib/mayaUsd/nodes/proxyShapeBase.h +++ b/lib/mayaUsd/nodes/proxyShapeBase.h @@ -54,9 +54,9 @@ constexpr int USD_UFE_RUNTIME_ID = 2; constexpr char USD_UFE_SEPARATOR = '/'; #endif -#include "mayaUsd/base/api.h" -#include "mayaUsd/listeners/stageNoticeListener.h" -#include "mayaUsd/nodes/usdPrimProvider.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/nodes/proxyShapePlugin.cpp b/lib/mayaUsd/nodes/proxyShapePlugin.cpp index 8b803a7fbf..efacd2e271 100644 --- a/lib/mayaUsd/nodes/proxyShapePlugin.cpp +++ b/lib/mayaUsd/nodes/proxyShapePlugin.cpp @@ -29,9 +29,9 @@ #include -#include "mayaUsd/nodes/hdImagingShape.h" -#include "mayaUsd/nodes/proxyShapeBase.h" -#include "mayaUsd/nodes/stageData.h" +#include +#include +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/nodes/proxyShapePlugin.h b/lib/mayaUsd/nodes/proxyShapePlugin.h index 86a390cfb6..60b30e841e 100644 --- a/lib/mayaUsd/nodes/proxyShapePlugin.h +++ b/lib/mayaUsd/nodes/proxyShapePlugin.h @@ -20,7 +20,7 @@ #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/nodes/stageData.h b/lib/mayaUsd/nodes/stageData.h index 672b7fff6f..015d54322e 100644 --- a/lib/mayaUsd/nodes/stageData.h +++ b/lib/mayaUsd/nodes/stageData.h @@ -27,7 +27,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/nodes/stageNode.cpp b/lib/mayaUsd/nodes/stageNode.cpp index 1658027290..58c706b0e0 100644 --- a/lib/mayaUsd/nodes/stageNode.cpp +++ b/lib/mayaUsd/nodes/stageNode.cpp @@ -40,8 +40,8 @@ #include #include -#include "mayaUsd/nodes/stageData.h" -#include "mayaUsd/utils/stageCache.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/nodes/stageNode.h b/lib/mayaUsd/nodes/stageNode.h index c8cc9e23a4..c705feac48 100644 --- a/lib/mayaUsd/nodes/stageNode.h +++ b/lib/mayaUsd/nodes/stageNode.h @@ -27,7 +27,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/nodes/usdPrimProvider.h b/lib/mayaUsd/nodes/usdPrimProvider.h index fa53bb0e01..b9e5bb490b 100644 --- a/lib/mayaUsd/nodes/usdPrimProvider.h +++ b/lib/mayaUsd/nodes/usdPrimProvider.h @@ -19,7 +19,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/px_vp20/glslProgram.h b/lib/mayaUsd/render/px_vp20/glslProgram.h index 9f55a1ad7f..9b8b867799 100644 --- a/lib/mayaUsd/render/px_vp20/glslProgram.h +++ b/lib/mayaUsd/render/px_vp20/glslProgram.h @@ -24,7 +24,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/px_vp20/utils.cpp b/lib/mayaUsd/render/px_vp20/utils.cpp index 552ed76595..8a18f28bab 100644 --- a/lib/mayaUsd/render/px_vp20/utils.cpp +++ b/lib/mayaUsd/render/px_vp20/utils.cpp @@ -56,7 +56,7 @@ #include #include -#include "mayaUsd/render/px_vp20/glslProgram.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/px_vp20/utils.h b/lib/mayaUsd/render/px_vp20/utils.h index a38043b9c5..c7ef3dc45b 100644 --- a/lib/mayaUsd/render/px_vp20/utils.h +++ b/lib/mayaUsd/render/px_vp20/utils.h @@ -18,8 +18,6 @@ /// \file px_vp20/utils.h -#include "mayaUsd/base/api.h" - #include #include @@ -37,6 +35,8 @@ #include #include +#include + PXR_NAMESPACE_OPEN_SCOPE class px_vp20Utils diff --git a/lib/mayaUsd/render/px_vp20/utils_legacy.h b/lib/mayaUsd/render/px_vp20/utils_legacy.h index cca41401d4..cc0148d3e9 100644 --- a/lib/mayaUsd/render/px_vp20/utils_legacy.h +++ b/lib/mayaUsd/render/px_vp20/utils_legacy.h @@ -23,7 +23,7 @@ #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp index 844926ce35..b2d00b067b 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp @@ -80,11 +80,10 @@ #include #endif -#include "mayaUsd/render/px_vp20/utils.h" -#include "mayaUsd/render/px_vp20/utils_legacy.h" - -#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" -#include "mayaUsd/render/pxrUsdMayaGL/userData.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h index 7b36d0fea8..19c54940ba 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h @@ -51,15 +51,14 @@ #include #endif -#include "mayaUsd/base/api.h" -#include "mayaUsd/listeners/notice.h" -#include "mayaUsd/utils/diagnosticDelegate.h" -#include "mayaUsd/utils/util.h" - -#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" -#include "mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h" -#include "mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h" -#include "mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h" +#include +#include +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp index d7c4859724..d338afe268 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp @@ -36,11 +36,11 @@ #include #include -#include "mayaUsd/nodes/hdImagingShape.h" -#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" -#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" -#include "mayaUsd/render/pxrUsdMayaGL/instancerImager.h" -#include "mayaUsd/render/pxrUsdMayaGL/userData.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h index 196aa30af1..71dfb1a6fc 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h @@ -31,7 +31,7 @@ #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp index 0b8d8ae377..3678c08c79 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp @@ -33,11 +33,11 @@ #include #include -#include "mayaUsd/nodes/hdImagingShape.h" -#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" -#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" -#include "mayaUsd/render/pxrUsdMayaGL/instancerImager.h" -#include "mayaUsd/render/pxrUsdMayaGL/userData.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h index 8c42c0a0d4..2c214c272c 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h @@ -30,7 +30,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp index 6edbba83f8..da7bdf4954 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp @@ -37,9 +37,9 @@ #include #include -#include "mayaUsd/render/px_vp20/utils.h" -#include "mayaUsd/render/px_vp20/utils_legacy.h" -#include "mayaUsd/render/pxrUsdMayaGL/hdRenderer.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h index 5369c3237e..9b169b1e1b 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h @@ -37,7 +37,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp index aef7a2fb07..daa335d81d 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp @@ -24,9 +24,9 @@ #include -#include "mayaUsd/nodes/hdImagingShape.h" -#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" -#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h index 2d2d24057b..f551e7e874 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h @@ -27,11 +27,10 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/listeners/notice.h" -#include "mayaUsd/utils/util.h" - -#include "mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp index ed45e2988d..7a8b2a6347 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp @@ -53,13 +53,12 @@ #include #include -#include "mayaUsd/fileio/utils/writeUtil.h" -#include "mayaUsd/utils/util.h" - -#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" -#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" -#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" -#include "mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h" +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h index 06e9b03bf1..f4181a9ae4 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h @@ -27,9 +27,8 @@ #include #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp index e8b5e9aeee..f9283e2ed4 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp @@ -38,12 +38,11 @@ #include #include -#include "mayaUsd/nodes/proxyShapeBase.h" -#include "mayaUsd/render/px_vp20/utils.h" - -#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" -#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" -#include "mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h" +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h index b81794bc7e..200e258880 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h @@ -18,7 +18,7 @@ /// \file pxrUsdMayaGL/proxyDrawOverride.h -#include "mayaUsd/base/api.h" +#include #include #include @@ -35,7 +35,7 @@ #include -#include "mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp index 40e5d2d599..c44d275515 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp @@ -27,8 +27,8 @@ #include #include -#include "mayaUsd/nodes/proxyShapeBase.h" -#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp index cea6379237..e94eb4e82e 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp @@ -41,10 +41,10 @@ #include #include -#include "mayaUsd/nodes/proxyShapeBase.h" -#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" -#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" -#include "mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h" +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h index addefb2549..8e20e1a5da 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h @@ -31,9 +31,8 @@ #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h b/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h index 2d1ef69533..30ca201d99 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h @@ -24,7 +24,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp index 580457d7c4..6d4c9baecf 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp @@ -52,9 +52,9 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/render/px_vp20/utils.h" -#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h index bf470ed37c..c71a5358a7 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h @@ -37,9 +37,9 @@ #include #include -#include "mayaUsd/base/api.h" +#include -#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp index 59c7d18c5f..df520f88a1 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp @@ -42,13 +42,12 @@ #include #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" -#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" -#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" -#include "mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h" -#include "mayaUsd/render/pxrUsdMayaGL/userData.h" +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h index bab8bbd8a3..fbb9dcd2c0 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h @@ -43,10 +43,9 @@ #include #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" -#include "mayaUsd/render/pxrUsdMayaGL/userData.h" +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h index 35a0f21b59..2d90f14987 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h @@ -28,7 +28,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp index d8bf4916d5..1f57bfac71 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp @@ -51,12 +51,12 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/nodes/proxyShapeBase.h" -#include "mayaUsd/render/pxrUsdMayaGL/batchRenderer.h" -#include "mayaUsd/render/pxrUsdMayaGL/debugCodes.h" -#include "mayaUsd/render/pxrUsdMayaGL/renderParams.h" -#include "mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h" +#include +#include +#include +#include +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h index f509b0914b..b9b7763593 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h @@ -31,9 +31,8 @@ #include #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/userData.h b/lib/mayaUsd/render/pxrUsdMayaGL/userData.h index 7536ab19da..d2b05f42cb 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/userData.h +++ b/lib/mayaUsd/render/pxrUsdMayaGL/userData.h @@ -18,8 +18,6 @@ /// \file pxrUsdMayaGL/userData.h -#include "mayaUsd/base/api.h" - #include #include @@ -28,6 +26,8 @@ #include #include +#include + PXR_NAMESPACE_OPEN_SCOPE /// Container for all of the information needed for a draw request in the diff --git a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h index 7e4cf78a54..bfb2c6b319 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h @@ -26,7 +26,7 @@ #include #include -#include "mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp b/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp index 2f35aee325..b2ad96db8e 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp @@ -35,7 +35,7 @@ #include "render_delegate.h" #include "tokens.h" -#include "mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mesh.h b/lib/mayaUsd/render/vp2RenderDelegate/mesh.h index 01ab12a6ad..697234f3c7 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/mesh.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/mesh.h @@ -21,7 +21,7 @@ #include #include -#include "mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp index e87331c6c9..b29580d81c 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp @@ -34,9 +34,9 @@ #include #include -#include "mayaUsd/nodes/proxyShapeBase.h" -#include "mayaUsd/nodes/stageData.h" -#include "mayaUsd/utils/util.h" +#include +#include +#include #include "render_delegate.h" #include "tokens.h" diff --git a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h index fd6cde300f..7a0805092e 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h @@ -33,7 +33,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include #if defined(WANT_UFE_BUILD) #include diff --git a/lib/mayaUsd/ufe/Global.h b/lib/mayaUsd/ufe/Global.h index a18331c98c..85f09c3ab6 100644 --- a/lib/mayaUsd/ufe/Global.h +++ b/lib/mayaUsd/ufe/Global.h @@ -19,7 +19,7 @@ #include -#include "mayaUsd/base/api.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/ProxyShapeHandler.cpp b/lib/mayaUsd/ufe/ProxyShapeHandler.cpp index 1780e7d7e2..4515469a23 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHandler.cpp +++ b/lib/mayaUsd/ufe/ProxyShapeHandler.cpp @@ -19,7 +19,7 @@ #include #include -#include "mayaUsd/utils/query.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/ProxyShapeHandler.h b/lib/mayaUsd/ufe/ProxyShapeHandler.h index 1930d3ff6c..96e77d0e5e 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHandler.h +++ b/lib/mayaUsd/ufe/ProxyShapeHandler.h @@ -21,7 +21,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp b/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp index 2c899eb1c8..b40298c701 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp +++ b/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp @@ -24,7 +24,7 @@ #include -#include "mayaUsd/ufe/Utils.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchy.h b/lib/mayaUsd/ufe/ProxyShapeHierarchy.h index 56e33e77da..e0f099046d 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHierarchy.h +++ b/lib/mayaUsd/ufe/ProxyShapeHierarchy.h @@ -18,9 +18,8 @@ #include #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdSceneItem.h" +#include +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp index a07c790a60..3cde93795a 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp +++ b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp @@ -15,8 +15,8 @@ // #include "ProxyShapeHierarchyHandler.h" -#include "mayaUsd/ufe/ProxyShapeHierarchy.h" -#include "mayaUsd/ufe/Utils.h" +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h index feaba066c3..7c1bc1a3d3 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h +++ b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h @@ -15,10 +15,10 @@ // #pragma once -#include "mayaUsd/base/api.h" - #include +#include + MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/StagesSubject.cpp b/lib/mayaUsd/ufe/StagesSubject.cpp index 2afe147728..cebb46d3d0 100644 --- a/lib/mayaUsd/ufe/StagesSubject.cpp +++ b/lib/mayaUsd/ufe/StagesSubject.cpp @@ -39,10 +39,11 @@ #include #include +#include +#include +#include + #include "private/InPathChange.h" -#include "mayaUsd/ufe/ProxyShapeHandler.h" -#include "mayaUsd/ufe/UsdStageMap.h" -#include "mayaUsd/ufe/Utils.h" #ifdef UFE_V2_FEATURES_AVAILABLE namespace { diff --git a/lib/mayaUsd/ufe/StagesSubject.h b/lib/mayaUsd/ufe/StagesSubject.h index 36df65051d..d8d6917d8f 100644 --- a/lib/mayaUsd/ufe/StagesSubject.h +++ b/lib/mayaUsd/ufe/StagesSubject.h @@ -25,8 +25,8 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/listeners/proxyShapeNotice.h" +#include +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdAttribute.cpp b/lib/mayaUsd/ufe/UsdAttribute.cpp index 20a1f1f8e6..200f34fd63 100644 --- a/lib/mayaUsd/ufe/UsdAttribute.cpp +++ b/lib/mayaUsd/ufe/UsdAttribute.cpp @@ -29,7 +29,7 @@ #define UFE_ENABLE_ASSERTS #include -#include "mayaUsd/ufe/StagesSubject.h" +#include // Note: normally we would use this using directive, but here we cannot because // our class is called UsdAttribute which is exactly the same as the one diff --git a/lib/mayaUsd/ufe/UsdAttribute.h b/lib/mayaUsd/ufe/UsdAttribute.h index 7e3a198c14..ab1e2a6c3d 100644 --- a/lib/mayaUsd/ufe/UsdAttribute.h +++ b/lib/mayaUsd/ufe/UsdAttribute.h @@ -20,7 +20,7 @@ #include #include -#include "mayaUsd/ufe/UsdSceneItem.h" +#include // Ufe::Attribute overrides (minus the type method) #define UFE_ATTRIBUTE_OVERRIDES \ diff --git a/lib/mayaUsd/ufe/UsdAttributes.h b/lib/mayaUsd/ufe/UsdAttributes.h index 1a12687402..165d664fdd 100644 --- a/lib/mayaUsd/ufe/UsdAttributes.h +++ b/lib/mayaUsd/ufe/UsdAttributes.h @@ -21,10 +21,9 @@ #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdSceneItem.h" -#include "mayaUsd/ufe/UsdAttribute.h" +#include +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdAttributesHandler.cpp b/lib/mayaUsd/ufe/UsdAttributesHandler.cpp index 7227a395b7..4ebb58ddbd 100644 --- a/lib/mayaUsd/ufe/UsdAttributesHandler.cpp +++ b/lib/mayaUsd/ufe/UsdAttributesHandler.cpp @@ -15,7 +15,7 @@ // #include "UsdAttributesHandler.h" -#include "mayaUsd/ufe/UsdSceneItem.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdAttributesHandler.h b/lib/mayaUsd/ufe/UsdAttributesHandler.h index d2ff1cec1d..29ba1469ae 100644 --- a/lib/mayaUsd/ufe/UsdAttributesHandler.h +++ b/lib/mayaUsd/ufe/UsdAttributesHandler.h @@ -17,9 +17,8 @@ #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdAttributes.h" +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdContextOps.cpp b/lib/mayaUsd/ufe/UsdContextOps.cpp index bde4babefd..fb01395c33 100644 --- a/lib/mayaUsd/ufe/UsdContextOps.cpp +++ b/lib/mayaUsd/ufe/UsdContextOps.cpp @@ -26,7 +26,7 @@ #include #include -#include "mayaUsd/ufe/Utils.h" +#include namespace { diff --git a/lib/mayaUsd/ufe/UsdContextOps.h b/lib/mayaUsd/ufe/UsdContextOps.h index 0ea1bcf17c..81e4320c95 100644 --- a/lib/mayaUsd/ufe/UsdContextOps.h +++ b/lib/mayaUsd/ufe/UsdContextOps.h @@ -20,9 +20,8 @@ #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdSceneItem.h" +#include +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdContextOpsHandler.h b/lib/mayaUsd/ufe/UsdContextOpsHandler.h index b50db90aad..3a7d1241ab 100644 --- a/lib/mayaUsd/ufe/UsdContextOpsHandler.h +++ b/lib/mayaUsd/ufe/UsdContextOpsHandler.h @@ -17,9 +17,8 @@ #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdContextOps.h" +#include +#include //PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdHierarchy.cpp b/lib/mayaUsd/ufe/UsdHierarchy.cpp index 36a6cc70d8..3bfb644823 100644 --- a/lib/mayaUsd/ufe/UsdHierarchy.cpp +++ b/lib/mayaUsd/ufe/UsdHierarchy.cpp @@ -28,10 +28,11 @@ #include #include +#include +#include + #include "private/InPathChange.h" #include "private/Utils.h" -#include "mayaUsd/ufe/UsdUndoCreateGroupCommand.h" -#include "mayaUsd/ufe/Utils.h" namespace { UsdPrimSiblingRange filteredChildren( const UsdPrim& prim ) diff --git a/lib/mayaUsd/ufe/UsdHierarchy.h b/lib/mayaUsd/ufe/UsdHierarchy.h index 21d4733908..70469cfb27 100644 --- a/lib/mayaUsd/ufe/UsdHierarchy.h +++ b/lib/mayaUsd/ufe/UsdHierarchy.h @@ -18,9 +18,8 @@ #include #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdSceneItem.h" +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp b/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp index 8af144583f..5d313080df 100644 --- a/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp +++ b/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp @@ -15,8 +15,8 @@ // #include "UsdHierarchyHandler.h" -#include "mayaUsd/ufe/UsdSceneItem.h" -#include "mayaUsd/ufe/Utils.h" +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdHierarchyHandler.h b/lib/mayaUsd/ufe/UsdHierarchyHandler.h index ca9ff99c5c..be273b2c29 100644 --- a/lib/mayaUsd/ufe/UsdHierarchyHandler.h +++ b/lib/mayaUsd/ufe/UsdHierarchyHandler.h @@ -17,10 +17,9 @@ #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdHierarchy.h" -#include "mayaUsd/ufe/UsdRootChildHierarchy.h" +#include +#include +#include //PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdObject3d.cpp b/lib/mayaUsd/ufe/UsdObject3d.cpp index 11f67cae42..e147aedaa9 100644 --- a/lib/mayaUsd/ufe/UsdObject3d.cpp +++ b/lib/mayaUsd/ufe/UsdObject3d.cpp @@ -24,7 +24,7 @@ #include #include -#include "mayaUsd/ufe/Utils.h" +#include namespace { Ufe::Vector3d toVector3d(const GfVec3d& v) diff --git a/lib/mayaUsd/ufe/UsdObject3d.h b/lib/mayaUsd/ufe/UsdObject3d.h index 059c30a652..108332afbe 100644 --- a/lib/mayaUsd/ufe/UsdObject3d.h +++ b/lib/mayaUsd/ufe/UsdObject3d.h @@ -9,9 +9,8 @@ #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdSceneItem.h" +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdObject3dHandler.cpp b/lib/mayaUsd/ufe/UsdObject3dHandler.cpp index af9aa6e158..b9b93ef4d8 100644 --- a/lib/mayaUsd/ufe/UsdObject3dHandler.cpp +++ b/lib/mayaUsd/ufe/UsdObject3dHandler.cpp @@ -10,7 +10,7 @@ #include -#include "mayaUsd/ufe/UsdSceneItem.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdObject3dHandler.h b/lib/mayaUsd/ufe/UsdObject3dHandler.h index 1d67889918..3f7630648b 100644 --- a/lib/mayaUsd/ufe/UsdObject3dHandler.h +++ b/lib/mayaUsd/ufe/UsdObject3dHandler.h @@ -9,9 +9,8 @@ #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdObject3d.h" +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdRootChildHierarchy.h b/lib/mayaUsd/ufe/UsdRootChildHierarchy.h index c8bb69d2f9..998f7546d5 100644 --- a/lib/mayaUsd/ufe/UsdRootChildHierarchy.h +++ b/lib/mayaUsd/ufe/UsdRootChildHierarchy.h @@ -15,9 +15,8 @@ // #pragma once -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdHierarchy.h" +#include +#include //PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h index 63559697d2..353c4a70d4 100644 --- a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h @@ -19,7 +19,7 @@ #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h index 0a36851f11..cf6b243a40 100644 --- a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h @@ -21,7 +21,7 @@ #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp index c8b30b51b3..53e15f51d6 100644 --- a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp @@ -17,7 +17,7 @@ #include "private/Utils.h" -#include "mayaUsd/ufe/Utils.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h index f04c53101c..33f90a498e 100644 --- a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h @@ -19,7 +19,7 @@ #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdSceneItem.h b/lib/mayaUsd/ufe/UsdSceneItem.h index 4dd05d3970..0e6fc5044c 100644 --- a/lib/mayaUsd/ufe/UsdSceneItem.h +++ b/lib/mayaUsd/ufe/UsdSceneItem.h @@ -19,7 +19,7 @@ #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdSceneItemOps.cpp b/lib/mayaUsd/ufe/UsdSceneItemOps.cpp index c23823009a..8fe2e439d3 100644 --- a/lib/mayaUsd/ufe/UsdSceneItemOps.cpp +++ b/lib/mayaUsd/ufe/UsdSceneItemOps.cpp @@ -15,10 +15,10 @@ // #include "UsdSceneItemOps.h" -#include "mayaUsd/ufe/UsdUndoDeleteCommand.h" -#include "mayaUsd/ufe/UsdUndoDuplicateCommand.h" -#include "mayaUsd/ufe/UsdUndoRenameCommand.h" -#include "mayaUsd/ufe/Utils.h" +#include +#include +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdSceneItemOps.h b/lib/mayaUsd/ufe/UsdSceneItemOps.h index f18ff429fd..4f581842ec 100644 --- a/lib/mayaUsd/ufe/UsdSceneItemOps.h +++ b/lib/mayaUsd/ufe/UsdSceneItemOps.h @@ -20,9 +20,8 @@ #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdSceneItem.h" +#include +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h index ec9d649269..9fd84cc525 100644 --- a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h +++ b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h @@ -17,9 +17,8 @@ #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdSceneItemOps.h" +#include +#include //PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdStageMap.cpp b/lib/mayaUsd/ufe/UsdStageMap.cpp index cfb83802a8..0b9c1af926 100644 --- a/lib/mayaUsd/ufe/UsdStageMap.cpp +++ b/lib/mayaUsd/ufe/UsdStageMap.cpp @@ -19,7 +19,7 @@ #include -#include "mayaUsd/ufe/Utils.h" +#include namespace { diff --git a/lib/mayaUsd/ufe/UsdStageMap.h b/lib/mayaUsd/ufe/UsdStageMap.h index a4165a17b5..2abecd3573 100644 --- a/lib/mayaUsd/ufe/UsdStageMap.h +++ b/lib/mayaUsd/ufe/UsdStageMap.h @@ -15,8 +15,6 @@ // #pragma once -#include "mayaUsd/base/api.h" - #include #include @@ -26,6 +24,8 @@ #include #include +#include + // Allow for use of MObjectHandle with std::unordered_map. namespace std { template <> struct hash { diff --git a/lib/mayaUsd/ufe/UsdTransform3d.cpp b/lib/mayaUsd/ufe/UsdTransform3d.cpp index 20e41ed0a7..140a565891 100644 --- a/lib/mayaUsd/ufe/UsdTransform3d.cpp +++ b/lib/mayaUsd/ufe/UsdTransform3d.cpp @@ -17,11 +17,12 @@ #include -#include "mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h" -#include "mayaUsd/ufe/UsdRotateUndoableCommand.h" -#include "mayaUsd/ufe/UsdScaleUndoableCommand.h" -#include "mayaUsd/ufe/UsdTranslateUndoableCommand.h" -#include "mayaUsd/ufe/Utils.h" +#include +#include +#include +#include +#include + #include "private/Utils.h" MAYAUSD_NS_DEF { diff --git a/lib/mayaUsd/ufe/UsdTransform3d.h b/lib/mayaUsd/ufe/UsdTransform3d.h index b6f5f34745..2e7978ffa7 100644 --- a/lib/mayaUsd/ufe/UsdTransform3d.h +++ b/lib/mayaUsd/ufe/UsdTransform3d.h @@ -20,9 +20,8 @@ #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdSceneItem.h" +#include +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp b/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp index ce2e28ad73..08099ef252 100644 --- a/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp +++ b/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp @@ -15,7 +15,7 @@ // #include "UsdTransform3dHandler.h" -#include "mayaUsd/ufe/UsdSceneItem.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdTransform3dHandler.h b/lib/mayaUsd/ufe/UsdTransform3dHandler.h index e566f7d548..1f94fe19d3 100644 --- a/lib/mayaUsd/ufe/UsdTransform3dHandler.h +++ b/lib/mayaUsd/ufe/UsdTransform3dHandler.h @@ -17,9 +17,8 @@ #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdTransform3d.h" +#include +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp index 3bff354b01..8d650a3d66 100644 --- a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp +++ b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp @@ -17,7 +17,7 @@ #include "private/Utils.h" -#include "mayaUsd/ufe/Utils.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h index 34c4dcd460..3de48c7602 100644 --- a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h @@ -19,7 +19,7 @@ #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h index 1efbc0ccc9..3c070ff1c7 100644 --- a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h +++ b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h @@ -18,9 +18,8 @@ #include #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdSceneItem.h" +#include +#include //PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h index cbf2122357..80a265e66d 100644 --- a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h +++ b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h @@ -15,13 +15,12 @@ // #pragma once -#include "mayaUsd/base/api.h" - #include #include -#include "mayaUsd/ufe/UsdSceneItem.h" +#include +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp index f324397e6d..5fc2d07f17 100644 --- a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp +++ b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp @@ -23,7 +23,7 @@ #include #include -#include "mayaUsd/ufe/Utils.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h index d92fd19892..8d18905c06 100644 --- a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h +++ b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h @@ -21,9 +21,8 @@ #include #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdSceneItem.h" +#include +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp b/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp index d6fdd31f63..1f3c0c9f24 100644 --- a/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp +++ b/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp @@ -32,7 +32,7 @@ #include "private/InPathChange.h" -#include "mayaUsd/ufe/Utils.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/UsdUndoRenameCommand.h b/lib/mayaUsd/ufe/UsdUndoRenameCommand.h index 44bbcd80e3..cac5ebaa49 100644 --- a/lib/mayaUsd/ufe/UsdUndoRenameCommand.h +++ b/lib/mayaUsd/ufe/UsdUndoRenameCommand.h @@ -22,9 +22,8 @@ #include #include -#include "mayaUsd/base/api.h" - -#include "mayaUsd/ufe/UsdSceneItem.h" +#include +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/Utils.cpp b/lib/mayaUsd/ufe/Utils.cpp index 5b7ed50f40..88fad56afa 100644 --- a/lib/mayaUsd/ufe/Utils.cpp +++ b/lib/mayaUsd/ufe/Utils.cpp @@ -30,9 +30,9 @@ #include #include -#include "mayaUsd/nodes/proxyShapeBase.h" -#include "mayaUsd/ufe/ProxyShapeHandler.h" -#include "mayaUsd/ufe/UsdStageMap.h" +#include +#include +#include #include "private/Utils.h" diff --git a/lib/mayaUsd/ufe/Utils.h b/lib/mayaUsd/ufe/Utils.h index 0ee49a2b99..bf6bca3457 100644 --- a/lib/mayaUsd/ufe/Utils.h +++ b/lib/mayaUsd/ufe/Utils.h @@ -25,9 +25,9 @@ #include #include -#include "mayaUsd/base/api.h" +#include -#include "mayaUsd/ufe/UsdSceneItem.h" +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/ufe/private/InPathChange.h b/lib/mayaUsd/ufe/private/InPathChange.h index f55148daa1..81205d70a2 100644 --- a/lib/mayaUsd/ufe/private/InPathChange.h +++ b/lib/mayaUsd/ufe/private/InPathChange.h @@ -15,7 +15,7 @@ // #pragma once -#include "mayaUsd/base/api.h" +#include MAYAUSD_NS_DEF { namespace ufe { diff --git a/lib/mayaUsd/ufe/private/Utils.h b/lib/mayaUsd/ufe/private/Utils.h index 0172a9772a..7ccd6b219a 100644 --- a/lib/mayaUsd/ufe/private/Utils.h +++ b/lib/mayaUsd/ufe/private/Utils.h @@ -21,7 +21,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/utils/blockSceneModificationContext.h b/lib/mayaUsd/utils/blockSceneModificationContext.h index daf1c22258..08c219c6de 100644 --- a/lib/mayaUsd/utils/blockSceneModificationContext.h +++ b/lib/mayaUsd/utils/blockSceneModificationContext.h @@ -18,7 +18,7 @@ #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/colorSpace.h b/lib/mayaUsd/utils/colorSpace.h index 4bcb04dbf5..aff84a00a0 100644 --- a/lib/mayaUsd/utils/colorSpace.h +++ b/lib/mayaUsd/utils/colorSpace.h @@ -19,7 +19,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/diagnosticDelegate.cpp b/lib/mayaUsd/utils/diagnosticDelegate.cpp index 462c42ba32..271cde5e1e 100644 --- a/lib/mayaUsd/utils/diagnosticDelegate.cpp +++ b/lib/mayaUsd/utils/diagnosticDelegate.cpp @@ -23,7 +23,7 @@ #include #include -#include "mayaUsd/base/debugCodes.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/diagnosticDelegate.h b/lib/mayaUsd/utils/diagnosticDelegate.h index 91702e8e91..b034bc06c1 100644 --- a/lib/mayaUsd/utils/diagnosticDelegate.h +++ b/lib/mayaUsd/utils/diagnosticDelegate.h @@ -25,7 +25,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/query.cpp b/lib/mayaUsd/utils/query.cpp index 8fcf012216..365c695b6e 100644 --- a/lib/mayaUsd/utils/query.cpp +++ b/lib/mayaUsd/utils/query.cpp @@ -29,8 +29,8 @@ #include #include -#include "mayaUsd/nodes/usdPrimProvider.h" -#include "mayaUsd/utils/util.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/query.h b/lib/mayaUsd/utils/query.h index e805e903fe..704929204e 100644 --- a/lib/mayaUsd/utils/query.h +++ b/lib/mayaUsd/utils/query.h @@ -23,7 +23,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/stageCache.cpp b/lib/mayaUsd/utils/stageCache.cpp index 3a5865f321..4a707b338c 100644 --- a/lib/mayaUsd/utils/stageCache.cpp +++ b/lib/mayaUsd/utils/stageCache.cpp @@ -31,7 +31,7 @@ #include #include -#include "mayaUsd/listeners/notice.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/stageCache.h b/lib/mayaUsd/utils/stageCache.h index 9577afe996..897dc88507 100644 --- a/lib/mayaUsd/utils/stageCache.h +++ b/lib/mayaUsd/utils/stageCache.h @@ -22,7 +22,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/undoHelperCommand.h b/lib/mayaUsd/utils/undoHelperCommand.h index 46ea40eae8..954c60d9a0 100644 --- a/lib/mayaUsd/utils/undoHelperCommand.h +++ b/lib/mayaUsd/utils/undoHelperCommand.h @@ -25,8 +25,8 @@ #include #include -#include "mayaUsd/base/api.h" -#include "mayaUsd/fileio/utils/adaptor.h" +#include +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/util.h b/lib/mayaUsd/utils/util.h index 60e6ae9067..28b5c70ec0 100644 --- a/lib/mayaUsd/utils/util.h +++ b/lib/mayaUsd/utils/util.h @@ -53,7 +53,7 @@ #include #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/utils/utilFileSystem.cpp b/lib/mayaUsd/utils/utilFileSystem.cpp index 2bb8d349a6..22642257ae 100644 --- a/lib/mayaUsd/utils/utilFileSystem.cpp +++ b/lib/mayaUsd/utils/utilFileSystem.cpp @@ -21,7 +21,7 @@ #include -#include "mayaUsd/base/debugCodes.h" +#include PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/mayaUsd/utils/utilFileSystem.h b/lib/mayaUsd/utils/utilFileSystem.h index e2198f11ae..874b34302f 100644 --- a/lib/mayaUsd/utils/utilFileSystem.h +++ b/lib/mayaUsd/utils/utilFileSystem.h @@ -21,7 +21,7 @@ #include -#include "mayaUsd/base/api.h" +#include PXR_NAMESPACE_OPEN_SCOPE