Merge pull request #807 from Autodesk/kxl-adsk/fixes_for_clang_format

Necessary fixes required before we can apply clang format
Autodesk · Oct 2, 2020 · 2135906 · 2135906
2 parents f94bcfa + 4b05960
commit 2135906
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 2 deletions.
diff --git a/.clang-format b/.clang-format
@@ -25,6 +25,7 @@ IncludeBlocks: Regroup
 IncludeCategories:
 
   # Desired final ordering:
+  # 0. Glew must be included before any other GL header
   # 1. Related header
   # 2. All private headers
   # 3. All public headers from this repository (maya-usd)
@@ -35,6 +36,11 @@ IncludeCategories:
   # 8. C system headers
   # 9. Conditional includes
 
+  # 0. Glew must be included before any other GL header
+  # Negative priority puts it above the default IncludeIsMainRegex
+  - Regex:           '<pxr/imaging/glf/glew.h>'
+    Priority:        -1
+
   # 1. Related header
   #    Handled  by the default IncludeIsMainRegex regex, and auto-assigned
   #    Priority 0

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h
@@ -18,6 +18,7 @@
 #include <AL/maya/utils/FileTranslatorBase.h>
 #include <AL/maya/utils/PluginTranslatorOptions.h>
 #include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/fileio/ExportParams.h>
 
 namespace AL {
 namespace usdmaya {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.h
@@ -28,6 +28,8 @@ namespace AL {
 namespace usdmaya {
 namespace nodes {
 
+class ProxyShape;
+
 //----------------------------------------------------------------------------------------------------------------------
 /// \brief  This class provides the draw override for the USD proxy shape node.
 /// \ingroup nodes

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Scope.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Scope.h
@@ -15,7 +15,9 @@
 //
 #pragma once
 
+#include "AL/maya/utils/MayaHelperMacros.h"
 #include "AL/maya/utils/NodeHelper.h"
+#include "AL/usdmaya/TypeIDs.h"
 
 #include <maya/MObjectHandle.h>
 #include <maya/MPxTransform.h>

diff --git a/plugin/al/translators/Mesh.h b/plugin/al/translators/Mesh.h
@@ -17,6 +17,12 @@
 #pragma once
 #include "AL/usdmaya/fileio/translators/TranslatorBase.h"
 
+PXR_NAMESPACE_OPEN_SCOPE
+
+// forward declare usd types
+class UsdGeomMesh;
+
+PXR_NAMESPACE_CLOSE_SCOPE
 
 namespace AL{
 namespace usdmaya{
@@ -55,7 +61,7 @@ class Mesh : public TranslatorBase
     kPerformDiff = 1 << 0,
     kDynamicAttributes = 1 << 1
   };
-  void writeEdits(MDagPath& dagPath, UsdGeomMesh& geomPrim, uint32_t options = kDynamicAttributes);
+  void writeEdits(MDagPath& dagPath, PXR_NS::UsdGeomMesh& geomPrim, uint32_t options = kDynamicAttributes);
   static MObject m_visible;
 
 };

diff --git a/plugin/al/translators/NurbsCurve.h b/plugin/al/translators/NurbsCurve.h
@@ -17,6 +17,13 @@
 #pragma once
 #include "AL/usdmaya/fileio/translators/TranslatorBase.h"
 
+PXR_NAMESPACE_OPEN_SCOPE
+
+// forward declare usd types
+class UsdGeomNurbsCurves;
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
 namespace AL {
 namespace usdmaya {
 namespace fileio {
@@ -49,7 +56,7 @@ class NurbsCurve : public TranslatorBase
     { return true; }
 
 private:
-  void writeEdits(UsdGeomNurbsCurves& nurbsCurvesPrim, MFnNurbsCurve& fnCurve, bool writeAll);
+  void writeEdits(PXR_NS::UsdGeomNurbsCurves& nurbsCurvesPrim, MFnNurbsCurve& fnCurve, bool writeAll);
 
   static MObject m_visible;
 };