From 9aaae0cfce1c51adeb7ea3eecae96a3387b0476c Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Mon, 6 Apr 2020 19:52:26 -0400 Subject: [PATCH 1/3] fix conditional orders in lib/usd and plugin/adsk --- lib/usd/hdMaya/adapters/materialAdapter.cpp | 8 ++++---- lib/usd/hdMaya/adapters/proxyAdapter.cpp | 14 +++++++------- lib/usd/hdMaya/delegates/delegate.h | 6 +++--- lib/usd/hdMaya/delegates/proxyDelegate.cpp | 12 ++++++------ lib/usd/hdMaya/delegates/proxyDelegate.h | 4 ++-- plugin/adsk/plugin/plugin.cpp | 18 +++++++++--------- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lib/usd/hdMaya/adapters/materialAdapter.cpp b/lib/usd/hdMaya/adapters/materialAdapter.cpp index 6ec677e780..b491c3ce4b 100644 --- a/lib/usd/hdMaya/adapters/materialAdapter.cpp +++ b/lib/usd/hdMaya/adapters/materialAdapter.cpp @@ -35,16 +35,16 @@ #include #include -#if USD_VERSION_NUM >= 1911 -#include -#endif - #include #include #include #include #include +#if USD_VERSION_NUM >= 1911 +#include +#endif + PXR_NAMESPACE_OPEN_SCOPE namespace { diff --git a/lib/usd/hdMaya/adapters/proxyAdapter.cpp b/lib/usd/hdMaya/adapters/proxyAdapter.cpp index 3822369baf..dd1713a6fc 100644 --- a/lib/usd/hdMaya/adapters/proxyAdapter.cpp +++ b/lib/usd/hdMaya/adapters/proxyAdapter.cpp @@ -18,18 +18,18 @@ #include #include -#if WANT_UFE_BUILD -#include -#include -#endif // WANT_UFE_BUILD - -#include - #include #include #include #include +#include + +#if WANT_UFE_BUILD +#include +#include +#endif // WANT_UFE_BUILD + PXR_NAMESPACE_OPEN_SCOPE HdMayaProxyAdapter::HdMayaProxyAdapter( diff --git a/lib/usd/hdMaya/delegates/delegate.h b/lib/usd/hdMaya/delegates/delegate.h index 829c1a73c8..218cabf505 100644 --- a/lib/usd/hdMaya/delegates/delegate.h +++ b/lib/usd/hdMaya/delegates/delegate.h @@ -30,6 +30,9 @@ #include #include +#include +#include + #if USD_VERSION_NUM >= 1911 #include #else @@ -43,9 +46,6 @@ PXR_NAMESPACE_CLOSE_SCOPE #include #endif // WANT_UFE_BUILD -#include -#include - PXR_NAMESPACE_OPEN_SCOPE class HdMayaDelegate { diff --git a/lib/usd/hdMaya/delegates/proxyDelegate.cpp b/lib/usd/hdMaya/delegates/proxyDelegate.cpp index 0fb2fd6407..eed2ada600 100644 --- a/lib/usd/hdMaya/delegates/proxyDelegate.cpp +++ b/lib/usd/hdMaya/delegates/proxyDelegate.cpp @@ -31,17 +31,17 @@ #include #include +#include +#include +#include + +#include + #if WANT_UFE_BUILD #include #include #endif // WANT_UFE_BUILD -#include - -#include -#include -#include - PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS(_tokens, (HdMayaProxyDelegate)); diff --git a/lib/usd/hdMaya/delegates/proxyDelegate.h b/lib/usd/hdMaya/delegates/proxyDelegate.h index 7e705e4b74..c30ce488d3 100644 --- a/lib/usd/hdMaya/delegates/proxyDelegate.h +++ b/lib/usd/hdMaya/delegates/proxyDelegate.h @@ -26,12 +26,12 @@ #include #include +#include + #if WANT_UFE_BUILD #include #endif // WANT_UFE_BUILD -#include - PXR_NAMESPACE_OPEN_SCOPE class HdMayaProxyAdapter; diff --git a/plugin/adsk/plugin/plugin.cpp b/plugin/adsk/plugin/plugin.cpp index 5ce479fce1..13007dd27b 100644 --- a/plugin/adsk/plugin/plugin.cpp +++ b/plugin/adsk/plugin/plugin.cpp @@ -23,15 +23,6 @@ #include #include -#include -#if defined(WANT_QT_BUILD) -#include -#endif - -#if defined(WANT_UFE_BUILD) -#include -#endif - #include #include #include @@ -44,6 +35,15 @@ #include "importTranslator.h" #include "ProxyShape.h" +#include +#if defined(WANT_QT_BUILD) +#include +#endif + +#if defined(WANT_UFE_BUILD) +#include +#endif + PXR_NAMESPACE_USING_DIRECTIVE MAYAUSD_PLUGIN_PUBLIC From 6b66abaa8d0f704ad9543fc667d7632da9c66eb4 Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Mon, 6 Apr 2020 20:55:26 -0400 Subject: [PATCH 2/3] fix grouping headers. --- lib/usd/hdMaya/adapters/proxyAdapter.cpp | 1 - lib/usd/hdMaya/delegates/proxyDelegate.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/usd/hdMaya/adapters/proxyAdapter.cpp b/lib/usd/hdMaya/adapters/proxyAdapter.cpp index dd1713a6fc..4a81c9a5f1 100644 --- a/lib/usd/hdMaya/adapters/proxyAdapter.cpp +++ b/lib/usd/hdMaya/adapters/proxyAdapter.cpp @@ -22,7 +22,6 @@ #include #include #include - #include #if WANT_UFE_BUILD diff --git a/lib/usd/hdMaya/delegates/proxyDelegate.cpp b/lib/usd/hdMaya/delegates/proxyDelegate.cpp index eed2ada600..5de11ed0ee 100644 --- a/lib/usd/hdMaya/delegates/proxyDelegate.cpp +++ b/lib/usd/hdMaya/delegates/proxyDelegate.cpp @@ -34,7 +34,6 @@ #include #include #include - #include #if WANT_UFE_BUILD From c6eecc56e9bf07aeaaf02f572b0ae1d588932226 Mon Sep 17 00:00:00 2001 From: Hamed Sabri Date: Mon, 6 Apr 2020 23:20:24 -0400 Subject: [PATCH 3/3] Address feedbacks: - Fix private headers in translator promoted as public - Fix grouping order --- lib/usd/schemas/wrapALMayaReference.cpp | 2 +- lib/usd/translators/CMakeLists.txt | 36 --------------------- lib/usd/translators/cameraWriter.h | 2 +- lib/usd/translators/fileTextureWriter.h | 2 +- lib/usd/translators/instancerWriter.h | 2 +- lib/usd/translators/jointWriter.h | 2 +- lib/usd/translators/locatorWriter.h | 2 +- lib/usd/translators/mayaReferenceUpdater.h | 2 -- lib/usd/translators/meshWriter.h | 2 +- lib/usd/translators/meshWriter_Primvars.cpp | 2 +- lib/usd/translators/meshWriter_Skin.cpp | 4 +-- lib/usd/translators/meshWriter_Subdiv.cpp | 2 +- lib/usd/translators/nurbsCurveWriter.h | 2 +- lib/usd/translators/nurbsSurfaceWriter.h | 2 +- lib/usd/translators/particleWriter.h | 3 +- lib/usd/translators/plugin.cpp | 2 +- lib/usd/translators/strokeWriter.h | 2 ++ 17 files changed, 18 insertions(+), 53 deletions(-) diff --git a/lib/usd/schemas/wrapALMayaReference.cpp b/lib/usd/schemas/wrapALMayaReference.cpp index 0c346bb581..dcde28ec00 100644 --- a/lib/usd/schemas/wrapALMayaReference.cpp +++ b/lib/usd/schemas/wrapALMayaReference.cpp @@ -17,13 +17,13 @@ #include -#include #include #include #include #include #include #include +#include #include diff --git a/lib/usd/translators/CMakeLists.txt b/lib/usd/translators/CMakeLists.txt index cf30706c03..b91b593ba8 100644 --- a/lib/usd/translators/CMakeLists.txt +++ b/lib/usd/translators/CMakeLists.txt @@ -46,42 +46,6 @@ target_sources(${TARGET_NAME} xformReader.cpp ) -set(headers - api.h - cameraReader.h - cameraWriter.h - fileTextureWriter.h - instancerWriter.h - jointWriter.h - lightReader.h - lightWriter.h - locatorWriter.h - materialReader.h - mayaReferenceReader.h - mayaReferenceUpdater.h - meshReader.h - meshWriter.h - meshWriter_Primvars.h - meshWriter_Skin.h - meshWriter_Subdiv.h - nurbsCurvesReader.h - nurbsCurveWriter.h - nurbsPatchReader.h - nurbsSurfaceWriter.h - particleWriter.h - scopeReader.h - skelReader.h - strokeWriter.h - xformReader.h -) - -# ----------------------------------------------------------------------------- -# promoted headers -# ----------------------------------------------------------------------------- -mayaUsd_promoteHeaderList(HEADERS ${headers} - BASEDIR ${TARGET_NAME} -) - # ----------------------------------------------------------------------------- # compile definitions # ----------------------------------------------------------------------------- diff --git a/lib/usd/translators/cameraWriter.h b/lib/usd/translators/cameraWriter.h index d6bfe13127..76528454e0 100644 --- a/lib/usd/translators/cameraWriter.h +++ b/lib/usd/translators/cameraWriter.h @@ -16,7 +16,7 @@ #ifndef PXRUSDTRANSLATORS_CAMERA_WRITER_H #define PXRUSDTRANSLATORS_CAMERA_WRITER_H -/// \file pxrUsdTranslators/cameraWriter.h +/// \file #include diff --git a/lib/usd/translators/fileTextureWriter.h b/lib/usd/translators/fileTextureWriter.h index 9c54965b1e..2de4227994 100644 --- a/lib/usd/translators/fileTextureWriter.h +++ b/lib/usd/translators/fileTextureWriter.h @@ -16,7 +16,7 @@ #ifndef PXRUSDTRANSLATORS_FILE_TEXTURE_WRITER_H #define PXRUSDTRANSLATORS_FILE_TEXTURE_WRITER_H -/// \file pxrUsdTranslators/fileTextureWriter.h +/// \file #include diff --git a/lib/usd/translators/instancerWriter.h b/lib/usd/translators/instancerWriter.h index 1ffd4e34f5..6405de11a0 100644 --- a/lib/usd/translators/instancerWriter.h +++ b/lib/usd/translators/instancerWriter.h @@ -16,7 +16,7 @@ #ifndef PXRUSDTRANSLATORS_INSTANCER_WRITER_H #define PXRUSDTRANSLATORS_INSTANCER_WRITER_H -/// \file pxrUsdTranslators/instancerWriter.h +/// \file #include diff --git a/lib/usd/translators/jointWriter.h b/lib/usd/translators/jointWriter.h index 28bbeda563..caf160b084 100644 --- a/lib/usd/translators/jointWriter.h +++ b/lib/usd/translators/jointWriter.h @@ -16,7 +16,7 @@ #ifndef PXRUSDTRANSLATORS_JOINT_WRITER_H #define PXRUSDTRANSLATORS_JOINT_WRITER_H -/// \file pxrUsdTranslators/jointWriter.h +/// \file #include diff --git a/lib/usd/translators/locatorWriter.h b/lib/usd/translators/locatorWriter.h index b8eff3ab73..c01aba3f0c 100644 --- a/lib/usd/translators/locatorWriter.h +++ b/lib/usd/translators/locatorWriter.h @@ -16,7 +16,7 @@ #ifndef PXRUSDTRANSLATORS_LOCATOR_WRITER_H #define PXRUSDTRANSLATORS_LOCATOR_WRITER_H -/// \file pxrUsdTranslators/locatorWriter.h +/// \file #include diff --git a/lib/usd/translators/mayaReferenceUpdater.h b/lib/usd/translators/mayaReferenceUpdater.h index aa5bdf48ea..553eef263d 100644 --- a/lib/usd/translators/mayaReferenceUpdater.h +++ b/lib/usd/translators/mayaReferenceUpdater.h @@ -16,8 +16,6 @@ #ifndef PXRUSDTRANSLATORS_MAYAREFERENCE_UPDATER_H #define PXRUSDTRANSLATORS_MAYAREFERENCE_UPDATER_H -/// \file pxrUsdTranslators/mayaReferenceUpdater.h - #include #include diff --git a/lib/usd/translators/meshWriter.h b/lib/usd/translators/meshWriter.h index dbe802ecdc..3e340c00f3 100644 --- a/lib/usd/translators/meshWriter.h +++ b/lib/usd/translators/meshWriter.h @@ -16,7 +16,7 @@ #ifndef PXRUSDTRANSLATORS_MESH_WRITER_H #define PXRUSDTRANSLATORS_MESH_WRITER_H -/// \file pxrUsdTranslators/meshWriter.h +/// \file #include #include diff --git a/lib/usd/translators/meshWriter_Primvars.cpp b/lib/usd/translators/meshWriter_Primvars.cpp index 8d52727b71..042c429338 100644 --- a/lib/usd/translators/meshWriter_Primvars.cpp +++ b/lib/usd/translators/meshWriter_Primvars.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include "meshWriter.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/usd/translators/meshWriter_Skin.cpp b/lib/usd/translators/meshWriter_Skin.cpp index 4d860f3bf7..535453d15c 100644 --- a/lib/usd/translators/meshWriter_Skin.cpp +++ b/lib/usd/translators/meshWriter_Skin.cpp @@ -35,8 +35,8 @@ #include #include -#include -#include +#include "jointWriter.h" +#include "meshWriter.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/usd/translators/meshWriter_Subdiv.cpp b/lib/usd/translators/meshWriter_Subdiv.cpp index 94c01fd66c..991ceec4c3 100644 --- a/lib/usd/translators/meshWriter_Subdiv.cpp +++ b/lib/usd/translators/meshWriter_Subdiv.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include "meshWriter.h" PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/usd/translators/nurbsCurveWriter.h b/lib/usd/translators/nurbsCurveWriter.h index 1b67909647..4282370cb3 100644 --- a/lib/usd/translators/nurbsCurveWriter.h +++ b/lib/usd/translators/nurbsCurveWriter.h @@ -16,7 +16,7 @@ #ifndef PXRUSDTRANSLATORS_NURBS_CURVE_WRITER_H #define PXRUSDTRANSLATORS_NURBS_CURVE_WRITER_H -/// \file pxrUsdTranslators/nurbsCurveWriter.h +/// \file #include diff --git a/lib/usd/translators/nurbsSurfaceWriter.h b/lib/usd/translators/nurbsSurfaceWriter.h index de43da7e80..51c48f612a 100644 --- a/lib/usd/translators/nurbsSurfaceWriter.h +++ b/lib/usd/translators/nurbsSurfaceWriter.h @@ -16,7 +16,7 @@ #ifndef PXRUSDTRANSLATORS_NURBS_SURFACE_WRITER_H #define PXRUSDTRANSLATORS_NURBS_SURFACE_WRITER_H -/// \file pxrUsdTranslators/nurbsSurfaceWriter.h +/// \file #include diff --git a/lib/usd/translators/particleWriter.h b/lib/usd/translators/particleWriter.h index f517b67629..79dd3c0cd3 100644 --- a/lib/usd/translators/particleWriter.h +++ b/lib/usd/translators/particleWriter.h @@ -16,7 +16,8 @@ #ifndef PXRUSDTRANSLATORS_PARTICLE_WRITER_H #define PXRUSDTRANSLATORS_PARTICLE_WRITER_H -/// \file pxrUsdTranslators/particleWriter.h +/// \file + #include #include diff --git a/lib/usd/translators/plugin.cpp b/lib/usd/translators/plugin.cpp index fae62c98b7..904e000658 100644 --- a/lib/usd/translators/plugin.cpp +++ b/lib/usd/translators/plugin.cpp @@ -18,7 +18,7 @@ #include -#include +#include "api.h" PXR_NAMESPACE_USING_DIRECTIVE diff --git a/lib/usd/translators/strokeWriter.h b/lib/usd/translators/strokeWriter.h index 2528df70ce..490155c4da 100644 --- a/lib/usd/translators/strokeWriter.h +++ b/lib/usd/translators/strokeWriter.h @@ -16,6 +16,8 @@ #ifndef PXRUSDTRANSLATORS_STROKE_WRITER_H #define PXRUSDTRANSLATORS_STROKE_WRITER_H +/// \file + #include #include