Merge pull request #1756 from Autodesk/boudrey/MAYA-114246/shadingmode

Boudrey/maya 114246/shadingmode
Autodesk · Oct 14, 2021 · 7475c4e · 7475c4e
2 parents 3d4383a + 18532df
commit 7475c4e
Show file tree

Hide file tree

Showing 30 changed files with 156 additions and 85 deletions.
diff --git a/lib/mayaUsd/fileio/registryHelper.cpp b/lib/mayaUsd/fileio/registryHelper.cpp
@@ -27,7 +27,7 @@
 
 #include <maya/MGlobal.h>
 
-#include <boost/python.hpp>
+#include <boost/python/import.hpp>
 
 #include <map>
 #include <vector>

diff --git a/lib/mayaUsd/python/CMakeLists.txt b/lib/mayaUsd/python/CMakeLists.txt
@@ -47,6 +47,7 @@ target_sources(${PYTHON_TARGET_NAME}
         wrapExportChaser.cpp
         wrapImportChaser.cpp
         wrapShadingUtil.cpp
+        wrapShadingMode.cpp
 )
 
 # -----------------------------------------------------------------------------

diff --git a/lib/mayaUsd/python/module.cpp b/lib/mayaUsd/python/module.cpp
@@ -50,4 +50,5 @@ TF_WRAP_MODULE
     TF_WRAP(ExportChaser);
     TF_WRAP(ImportChaser);
     TF_WRAP(ShadingUtil);
+    TF_WRAP(ShadingMode);
 }
diff --git a/lib/mayaUsd/python/wrapAdaptor.cpp b/lib/mayaUsd/python/wrapAdaptor.cpp
@@ -26,7 +26,11 @@
 
 #include <maya/MObject.h>
 
-#include <boost/python.hpp>
+#include <boost/python/class.hpp>
+#include <boost/python/def.hpp>
+#include <boost/python/make_constructor.hpp>
+#include <boost/python/operators.hpp>
+#include <boost/python/self.hpp>
 
 using namespace boost::python;
 

diff --git a/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp b/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp
@@ -15,7 +15,9 @@
 //
 #include <mayaUsd/utils/blockSceneModificationContext.h>
 
-#include <boost/python.hpp>
+#include <boost/python/class.hpp>
+#include <boost/python/def.hpp>
+#include <boost/python/return_arg.hpp>
 
 #include <memory>
 

diff --git a/lib/mayaUsd/python/wrapColorSpace.cpp b/lib/mayaUsd/python/wrapColorSpace.cpp
@@ -22,7 +22,6 @@
 #include <pxr/base/tf/pyResultConversions.h>
 #include <pxr/pxr.h>
 
-#include <boost/python.hpp>
 #include <boost/python/def.hpp>
 
 using namespace std;

diff --git a/lib/mayaUsd/python/wrapConverter.cpp b/lib/mayaUsd/python/wrapConverter.cpp
@@ -24,7 +24,8 @@
 
 #include <maya/MObject.h>
 
-#include <boost/python.hpp>
+#include <boost/python/class.hpp>
+#include <boost/python/def.hpp>
 
 using namespace boost::python;
 

diff --git a/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp b/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp
@@ -18,7 +18,9 @@
 #include <pxr/pxr.h>
 
 #include <boost/noncopyable.hpp>
-#include <boost/python.hpp>
+#include <boost/python/class.hpp>
+#include <boost/python/def.hpp>
+#include <boost/python/return_arg.hpp>
 
 using namespace boost::python;
 

diff --git a/lib/mayaUsd/python/wrapExportChaser.cpp b/lib/mayaUsd/python/wrapExportChaser.cpp
@@ -18,17 +18,11 @@
 #include <mayaUsd/fileio/chaser/exportChaserRegistry.h>
 #include <mayaUsd/fileio/registryHelper.h>
 
-#include <pxr/base/tf/makePyConstructor.h>
-#include <pxr/base/tf/pyContainerConversions.h>
-#include <pxr/base/tf/pyEnum.h>
 #include <pxr/base/tf/pyPolymorphic.h>
-#include <pxr/base/tf/pyPtrHelpers.h>
-#include <pxr/base/tf/pyResultConversions.h>
-#include <pxr/base/tf/refPtr.h>
 
-#include <boost/python.hpp>
-#include <boost/python/args.hpp>
+#include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
+#include <boost/python/make_constructor.hpp>
 #include <boost/python/wrapper.hpp>
 
 PXR_NAMESPACE_USING_DIRECTIVE

diff --git a/lib/mayaUsd/python/wrapImportChaser.cpp b/lib/mayaUsd/python/wrapImportChaser.cpp
@@ -18,19 +18,11 @@
 #include <mayaUsd/fileio/chaser/importChaserRegistry.h>
 #include <mayaUsd/fileio/registryHelper.h>
 
-#include <pxr/base/tf/makePyConstructor.h>
-#include <pxr/base/tf/pyContainerConversions.h>
-#include <pxr/base/tf/pyEnum.h>
 #include <pxr/base/tf/pyPolymorphic.h>
-#include <pxr/base/tf/pyPtrHelpers.h>
-#include <pxr/base/tf/pyResultConversions.h>
-#include <pxr/base/tf/refPtr.h>
 
-#include <maya/MFnDependencyNode.h>
-
-#include <boost/python.hpp>
-#include <boost/python/args.hpp>
+#include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
+#include <boost/python/make_constructor.hpp>
 #include <boost/python/wrapper.hpp>
 
 PXR_NAMESPACE_USING_DIRECTIVE

diff --git a/lib/mayaUsd/python/wrapMeshWriteUtils.cpp b/lib/mayaUsd/python/wrapMeshWriteUtils.cpp
@@ -26,8 +26,8 @@
 #include <maya/MObject.h>
 #include <maya/MStatus.h>
 
-#include <boost/python.hpp>
 #include <boost/python/class.hpp>
+#include <boost/python/def.hpp>
 
 #include <string>
 

diff --git a/lib/mayaUsd/python/wrapOpenMaya.cpp b/lib/mayaUsd/python/wrapOpenMaya.cpp
@@ -30,10 +30,8 @@
 #include <maya/MDagPathArray.h>
 #include <maya/MPlug.h>
 
-#include <boost/python.hpp>
-#include <boost/python/args.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/wrapper.hpp>
+#include <boost/python/import.hpp>
+#include <boost/python/to_python_converter.hpp>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 

diff --git a/lib/mayaUsd/python/wrapPrimReader.cpp b/lib/mayaUsd/python/wrapPrimReader.cpp
@@ -22,17 +22,13 @@
 #include <mayaUsd/fileio/shading/shadingModeImporter.h>
 #include <mayaUsd/fileio/shading/symmetricShaderReader.h>
 
-#include <pxr/base/tf/makePyConstructor.h>
-#include <pxr/base/tf/pyContainerConversions.h>
 #include <pxr/base/tf/pyEnum.h>
 #include <pxr/base/tf/pyPolymorphic.h>
-#include <pxr/base/tf/pyPtrHelpers.h>
-#include <pxr/base/tf/pyResultConversions.h>
-#include <pxr/base/tf/refPtr.h>
 
-#include <boost/python.hpp>
-#include <boost/python/args.hpp>
+#include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
+#include <boost/python/make_constructor.hpp>
+#include <boost/python/pure_virtual.hpp>
 #include <boost/python/return_internal_reference.hpp>
 #include <boost/python/wrapper.hpp>
 
@@ -323,31 +319,6 @@ void wrapPrimReader()
         .staticmethod("Register");
 }
 
-void wrapShadingModeImportContext()
-{
-    boost::python::class_<UsdMayaShadingModeImportContext>(
-        "ShadingModeImportContext", boost::python::no_init)
-        .def("GetCreatedObject", &UsdMayaShadingModeImportContext::GetCreatedObject)
-        //        .def("AddCreatedObject",&UsdMayaShadingModeImportContext::AddCreatedObject) //
-        //        overloads
-        .def("CreateShadingEngine", &UsdMayaShadingModeImportContext::CreateShadingEngine)
-        .def("GetShadingEngineName", &UsdMayaShadingModeImportContext::GetShadingEngineName)
-        .def("GetSurfaceShaderPlugName", &UsdMayaShadingModeImportContext::GetSurfaceShaderPlugName)
-        .def("GetVolumeShaderPlugName", &UsdMayaShadingModeImportContext::GetVolumeShaderPlugName)
-        .def(
-            "GetDisplacementShaderPlugName",
-            &UsdMayaShadingModeImportContext::GetDisplacementShaderPlugName)
-        .def("SetSurfaceShaderPlugName", &UsdMayaShadingModeImportContext::SetSurfaceShaderPlugName)
-        .def("SetVolumeShaderPlugName", &UsdMayaShadingModeImportContext::SetVolumeShaderPlugName)
-        .def(
-            "SetDisplacementShaderPlugName",
-            &UsdMayaShadingModeImportContext::SetDisplacementShaderPlugName)
-        .def(
-            "GetPrimReaderContext",
-            &UsdMayaShadingModeImportContext::GetPrimReaderContext,
-            boost::python::return_value_policy<boost::python::return_by_value>());
-}
-
 TF_REGISTRY_FUNCTION(TfEnum)
 {
     TF_ADD_ENUM_NAME(UsdMayaShaderReader::ContextSupport::Supported, "Supported");

diff --git a/lib/mayaUsd/python/wrapPrimWriter.cpp b/lib/mayaUsd/python/wrapPrimWriter.cpp
@@ -21,17 +21,13 @@
 #include <mayaUsd/fileio/shaderWriterRegistry.h>
 #include <mayaUsd/fileio/shading/symmetricShaderWriter.h>
 
-#include <pxr/base/tf/makePyConstructor.h>
-#include <pxr/base/tf/pyContainerConversions.h>
 #include <pxr/base/tf/pyEnum.h>
 #include <pxr/base/tf/pyPolymorphic.h>
-#include <pxr/base/tf/pyPtrHelpers.h>
-#include <pxr/base/tf/pyResultConversions.h>
-#include <pxr/base/tf/refPtr.h>
 
-#include <boost/python.hpp>
-#include <boost/python/args.hpp>
+#include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
+#include <boost/python/make_constructor.hpp>
+#include <boost/python/return_internal_reference.hpp>
 #include <boost/python/wrapper.hpp>
 
 PXR_NAMESPACE_USING_DIRECTIVE

diff --git a/lib/mayaUsd/python/wrapQuery.cpp b/lib/mayaUsd/python/wrapQuery.cpp
@@ -18,7 +18,6 @@
 #include <pxr/base/tf/pyResultConversions.h>
 #include <pxr/pxr.h>
 
-#include <boost/python.hpp>
 #include <boost/python/def.hpp>
 
 using namespace std;

diff --git a/lib/mayaUsd/python/wrapReadUtil.cpp b/lib/mayaUsd/python/wrapReadUtil.cpp
@@ -23,7 +23,8 @@
 
 #include <maya/MObject.h>
 
-#include <boost/python.hpp>
+#include <boost/python/class.hpp>
+#include <boost/python/def.hpp>
 
 using namespace boost::python;
 

diff --git a/lib/mayaUsd/python/wrapRoundTripUtil.cpp b/lib/mayaUsd/python/wrapRoundTripUtil.cpp
@@ -20,7 +20,8 @@
 #include <pxr/usd/usd/pyConversions.h>
 #include <pxr/usd/usdGeom/primvar.h>
 
-#include <boost/python.hpp>
+#include <boost/python/class.hpp>
+#include <boost/python/def.hpp>
 
 using namespace std;
 using namespace boost::python;

diff --git a/lib/mayaUsd/python/wrapShadingMode.cpp b/lib/mayaUsd/python/wrapShadingMode.cpp
@@ -0,0 +1,83 @@
+//
+// Copyright 2021 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 <mayaUsd/fileio/shading/shadingModeImporter.h>
+#include <mayaUsd/fileio/shading/shadingModeRegistry.h>
+
+#include <boost/python/class.hpp>
+#include <boost/python/def.hpp>
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+class ShadingModeRegistry
+{
+public:
+    static void RegisterImportConversion(
+        const TfToken& materialConversion,
+        const TfToken& renderContext,
+        const TfToken& niceName,
+        const TfToken& description)
+    {
+        UsdMayaShadingModeRegistry::GetInstance().RegisterImportConversion(
+            materialConversion, renderContext, niceName, description);
+    }
+
+    static void RegisterExportConversion(
+        const TfToken& materialConversion,
+        const TfToken& renderContext,
+        const TfToken& niceName,
+        const TfToken& description)
+    {
+        UsdMayaShadingModeRegistry::GetInstance().RegisterExportConversion(
+            materialConversion, renderContext, niceName, description);
+    }
+};
+
+//----------------------------------------------------------------------------------------------------------------------
+void wrapShadingModeImportContext()
+{
+    boost::python::class_<UsdMayaShadingModeImportContext>(
+        "ShadingModeImportContext", boost::python::no_init)
+        .def("GetCreatedObject", &UsdMayaShadingModeImportContext::GetCreatedObject)
+        //        .def("AddCreatedObject",&UsdMayaShadingModeImportContext::AddCreatedObject) //
+        //        overloads
+        .def("CreateShadingEngine", &UsdMayaShadingModeImportContext::CreateShadingEngine)
+        .def("GetShadingEngineName", &UsdMayaShadingModeImportContext::GetShadingEngineName)
+        .def("GetSurfaceShaderPlugName", &UsdMayaShadingModeImportContext::GetSurfaceShaderPlugName)
+        .def("GetVolumeShaderPlugName", &UsdMayaShadingModeImportContext::GetVolumeShaderPlugName)
+        .def(
+            "GetDisplacementShaderPlugName",
+            &UsdMayaShadingModeImportContext::GetDisplacementShaderPlugName)
+        .def("SetSurfaceShaderPlugName", &UsdMayaShadingModeImportContext::SetSurfaceShaderPlugName)
+        .def("SetVolumeShaderPlugName", &UsdMayaShadingModeImportContext::SetVolumeShaderPlugName)
+        .def(
+            "SetDisplacementShaderPlugName",
+            &UsdMayaShadingModeImportContext::SetDisplacementShaderPlugName)
+        .def(
+            "GetPrimReaderContext",
+            &UsdMayaShadingModeImportContext::GetPrimReaderContext,
+            boost::python::return_value_policy<boost::python::return_by_value>());
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+void wrapShadingMode()
+{
+    boost::python::class_<ShadingModeRegistry>("ShadingModeRegistry", boost::python::no_init)
+        .def("RegisterImportConversion", &ShadingModeRegistry::RegisterImportConversion)
+        .staticmethod("RegisterImportConversion")
+        .def("RegisterExportConversion", &ShadingModeRegistry::RegisterExportConversion)
+        .staticmethod("RegisterExportConversion");
+}
diff --git a/lib/mayaUsd/python/wrapShadingUtil.cpp b/lib/mayaUsd/python/wrapShadingUtil.cpp
@@ -16,7 +16,7 @@
 
 #include <mayaUsd/fileio/utils/shadingUtil.h>
 
-#include <boost/python.hpp>
+#include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
 
 PXR_NAMESPACE_USING_DIRECTIVE

diff --git a/lib/mayaUsd/python/wrapStageCache.cpp b/lib/mayaUsd/python/wrapStageCache.cpp
@@ -18,8 +18,8 @@
 #include <pxr/base/tf/pyResultConversions.h>
 #include <pxr/pxr.h>
 
-#include <boost/python.hpp>
 #include <boost/python/args.hpp>
+#include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
 
 using namespace std;

diff --git a/lib/mayaUsd/python/wrapUsdUndoManager.cpp b/lib/mayaUsd/python/wrapUsdUndoManager.cpp
@@ -22,7 +22,8 @@
 #include <pxr/pxr.h>
 #include <pxr/usd/sdf/layer.h>
 
-#include <boost/python.hpp>
+#include <boost/python/class.hpp>
+#include <boost/python/def.hpp>
 
 #include <memory>
 

diff --git a/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp b/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp
@@ -27,7 +27,7 @@
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
-#include <boost/python.hpp>
+#include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
 
 #include <string>

diff --git a/lib/mayaUsd/python/wrapWriteUtil.cpp b/lib/mayaUsd/python/wrapWriteUtil.cpp
@@ -23,7 +23,8 @@
 
 #include <maya/MObject.h>
 
-#include <boost/python.hpp>
+#include <boost/python/class.hpp>
+#include <boost/python/def.hpp>
 
 using namespace boost::python;
 

diff --git a/lib/mayaUsd/ufe/wrapGlobal.cpp b/lib/mayaUsd/ufe/wrapGlobal.cpp
@@ -15,7 +15,7 @@
 //
 #include <mayaUsd/ufe/Global.h>
 
-#include <boost/python.hpp>
+#include <boost/python/def.hpp>
 
 using namespace MayaUsd;
 using namespace boost::python;

diff --git a/lib/mayaUsd/ufe/wrapNotice.cpp b/lib/mayaUsd/ufe/wrapNotice.cpp
@@ -18,7 +18,7 @@
 
 #include <pxr/base/tf/pyNoticeWrapper.h>
 
-#include <boost/python.hpp>
+#include <boost/python/class.hpp>
 
 using namespace MayaUsd;
 using namespace boost::python;