MAYA-102319 Basic useRegistry import support #621

JGamache-autodesk · 2020-07-03T16:06:29Z

Add the useRegistry import mode which uses an info:id-based registry to process individual UsdShade nodes.
Implemented basic import of UsdPreviewSurface and UsdUVTexture nodes to plugin pxrUsdPreviewSurface materials.
Split monolithic materialWriter file into proper C++ hierarchy.

Note 1: does not convert to Maya native materials (yet).
Note 2: does not solve the issue of having multiple importers for a single info:id (for commonly used names like "standard_surface")

Add the useRegistry import mode which uses an info:id-based registry to process individual UsdShade nodes. Implemented basic import of UsdPreviewSurface and UsdUVTexture nodes to plugin pxrUsdPreviewSurface materials. Split monolithic materialWriter file into proper C++ hierarchy. Note: does not convert to Maya native materials (yet).

JGamache-autodesk · 2020-07-03T16:12:53Z

lib/mayaUsd/nodes/proxyShapePlugin.cpp

@@ -129,7 +129,7 @@ MStatus
 MayaUsdProxyShapePlugin::finalize(MFnPlugin& plugin)
 {
    // If more than one plugin still has us registered, do nothing.
-    if (_registrationCount-- > 1) {
+    if (!_registrationCount || _registrationCount-- > 1) {


Request from previous review: fix negative registration counts.

if (_registrationCount == 0 || ...) might be more clear here.

JGamache-autodesk · 2020-07-03T16:14:11Z

lib/usd/translators/CMakeLists.txt

        instancerWriter.cpp
        jointWriter.cpp
        lightReader.cpp
        lightWriter.cpp
        locatorWriter.cpp
        materialReader.cpp
-        materialWriter.cpp


As requested in a previous review: split the monolithic materialWriter.cpp file per dependency node.

JGamache-autodesk · 2020-07-03T16:15:34Z

lib/usd/translators/shading/usdMaterialWriter.h

+class UsdTimeCode;
+
+/// Shader writer for exporting Maya's material shading nodes to USD.
+class PxrUsdTranslators_MaterialWriter : public UsdMayaShaderWriter


Utility base class for often-used functions.

Very good idea, just please add documentation to these often-used functions.

JGamache-autodesk · 2020-07-03T16:16:35Z

lib/usd/translators/shading/usdUVTextureReader.cpp

+        return false;
+    }
+
+    // File


Does the exact reverse of usdFileTextureWriter.

JGamache-autodesk · 2020-07-03T16:18:17Z

lib/usd/pxrUsdPreviewSurface/usdPreviewSurfaceReader.cpp

+    MFnDependencyNode depFn;
+    if (!(UsdMayaTranslatorUtil::CreateShaderNode(
+              MString(prim.GetName().GetText()),
+              PxrMayaUsdPreviewSurfaceTokens->MayaTypeName.GetText(),


Importing back to pxrUsdPreviewSurface plugin material at this point int time.
Importing to Maya native materials to happen in the next PR.

JGamache-autodesk · 2020-07-03T22:12:28Z

lib/usd/pxrUsdPreviewSurface/usdPreviewSurfaceReader.cpp

+            if (mayaAttrName == PxrMayaUsdPreviewSurfaceTokens->DiffuseColorAttrName
+                || mayaAttrName == PxrMayaUsdPreviewSurfaceTokens->EmissiveColorAttrName
+                || mayaAttrName == PxrMayaUsdPreviewSurfaceTokens->SpecularColorAttrName) {
+                // These values are exported unscaled, so they also reimport unscaled:


Will have to check to see if we want them scaled on export.

JGamache-autodesk · 2020-07-03T22:14:14Z

lib/usd/translators/shading/usdUVTextureReader.cpp

+        return false;
+    }
+
+    // Connect manually (fileTexturePlacementConnect is not available in batch):


Code from MEL script fileTexturePlacementConnect copied here since the script is not sourced in batch.

lib/usd/translators/shading/usdMaterialWriter.cpp

kxl-adsk · 2020-07-12T10:26:33Z

lib/usd/translators/shading/usdMaterialWriter.h

+class UsdTimeCode;
+
+/// Shader writer for exporting Maya's material shading nodes to USD.
+class PxrUsdTranslators_MaterialWriter : public UsdMayaShaderWriter


Very good idea, just please add documentation to these often-used functions.

lib/usd/translators/shading/usdReflectWriter.h

lib/usd/translators/shading/usdStandardSurfaceWriter.cpp

lib/mayaUsd/fileio/shaderReader.h

lib/mayaUsd/fileio/shaderReaderRegistry.cpp

lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp

lib/usd/pxrUsdPreviewSurface/usdPreviewSurfaceReader.cpp

test/lib/usd/pxrUsdPreviewSurface/testPxrUsdPreviewSurfaceExportImportRoundtrip.py

mattyjams

This is looking pretty good to me! Thanks for all the great work here @JGamache-autodesk!

I left a bunch of comments and suggestions, but not really much that I think would gate merging this. It's a great start to continue building on, and I think we'll just have to work our way through some of the issues we've been discussing as they come to light.

It might have been nice to have the export changes separated out into their own commits/PR, but it's all been reviewed at this point, so maybe moot now.

lib/mayaUsd/fileio/shaderReader.cpp

lib/mayaUsd/fileio/shaderReaderRegistry.cpp

lib/mayaUsd/fileio/shaderReader.cpp

lib/mayaUsd/fileio/shaderReaderRegistry.cpp

lib/usd/translators/shading/usdUVTextureReader.cpp

plugin/adsk/scripts/mayaUsdTranslatorExport.mel

test/lib/usd/pxrUsdPreviewSurface/testPxrUsdPreviewSurfaceExportImportRoundtrip.py

mattyjams

Looks good to me! Excited to dig into this and continue to flesh this all out. Thanks @JGamache-autodesk!

mattyjams · 2020-07-20T18:29:39Z

test/lib/usd/translators/testUsdExportImportRoundtripPreviewSurface.py

@@ -82,7 +82,8 @@ def testPxrUsdPreviewSurfaceRoundtrip(self):
        cmds.connectAttr(file_node + ".outColor",
                         material_node + ".diffuseColor", f=True)

-        txfile = "PxrUsdPreviewSurfaceExportTest/Brazilian_rosewood_pxr128.png"
+        txfile = "/".join(["UsdExportImportRoundtripPreviewSurface",


os.path.sep here instead of "/", or just use os.path.join() instead?

mattyjams · 2020-07-20T18:36:28Z

lib/usd/pxrUsdPreviewSurface/usdPreviewSurfaceReader.cpp

+    MStatus           status;
+    MFnDependencyNode depFn;
+    if (!(UsdMayaTranslatorUtil::CreateShaderNode(
+              MString(prim.GetName().GetText()),


I think it's less about trying to ensure that the node names are unique, and more important that the translation is as consistent as possible across multiple roundtrips. When there are potentially existing overs on the prims being exported, it would be easy for those to fall off if a name collision on import caused the node name to change, which then affects the prim path when re-exported.

And yeah, I think material deduplication would be an interesting feature to pursue if we can detect that the "source" materials in USD are all the same material (e.g. bindings from multiple gprims across references that all resolve to what is ultimately a single material).

mattyjams · 2020-07-20T18:38:52Z

lib/usd/translators/shading/CMakeLists.txt

+        usdBlinnWriter.cpp
+        usdFileTextureWriter.cpp
+        usdLambertWriter.cpp
+        usdMaterialWriter.cpp
+        usdPhongWriter.cpp
+        usdPhongEWriter.cpp
+        usdReflectWriter.cpp
+        usdStandardSurfaceWriter.cpp
+        usdUVTextureReader.cpp


Hmm. I'm not quite sure I'm following yet how the selection of an export "dialect" impacts what ultimately gets authored in USD, and how/if there's an overlap there with UsdShade's concept of renderContext. There ongoing discussion here, so I guess I wouldn't worry too much about the naming for now.

JGamache-autodesk requested review from mattyjams and kxl-adsk July 3, 2020 16:06

JGamache-autodesk assigned ecp-maya-devops-adsk Jul 3, 2020

JGamache-autodesk commented Jul 3, 2020

View reviewed changes

MAYA-102319 Fix Linux OS/X bulds

5ee6d7a

JGamache-autodesk assigned ecp-maya-devops-adsk and unassigned ecp-maya-devops-adsk Jul 3, 2020

MAYA-102319 More Linux/OSX fixes

f02dda0

JGamache-autodesk assigned ecp-maya-devops-adsk and unassigned ecp-maya-devops-adsk Jul 3, 2020

MAYA-102319 Fix OS/X build

2725ca7

JGamache-autodesk unassigned ecp-maya-devops-adsk Jul 3, 2020

MAYA-102319 Fix OS/X build

7982418

JGamache-autodesk assigned ecp-maya-devops-adsk Jul 3, 2020

MAYA-102319 Add unit test and test fixes

0f01cad

JGamache-autodesk commented Jul 3, 2020

View reviewed changes

JGamache-autodesk assigned ecp-maya-devops-adsk and unassigned ecp-maya-devops-adsk Jul 3, 2020

MAYA-102319 Investigating hunch

15ecda4

JGamache-autodesk assigned ecp-maya-devops-adsk and unassigned ecp-maya-devops-adsk Jul 4, 2020

kxl-adsk added the import-export Related to Import and/or Export label Jul 6, 2020

Disable failing test

5d648ad

kxl-adsk reviewed Jul 13, 2020

View reviewed changes

mattyjams approved these changes Jul 13, 2020

View reviewed changes

MAYA-105728 - Fix crash on OS/X

c98e387

JGamache-autodesk assigned ecp-maya-devops-adsk and unassigned ecp-maya-devops-adsk Jul 14, 2020

MAYA-102319 - Rework from review comments.

93a302c

JGamache-autodesk assigned ecp-maya-devops-adsk and unassigned ecp-maya-devops-adsk Jul 16, 2020

MAYA-102319 Removing obsolete tokens

7fb5143

JGamache-autodesk assigned ecp-maya-devops-adsk and unassigned ecp-maya-devops-adsk Jul 17, 2020

kxl-adsk approved these changes Jul 17, 2020

View reviewed changes

JGamache-autodesk requested a review from mattyjams July 17, 2020 20:11

mattyjams approved these changes Jul 20, 2020

View reviewed changes

kxl-adsk merged commit f937f9c into dev Jul 20, 2020

kxl-adsk deleted the t_gamaj/MAYA-102319/basic_import branch July 20, 2020 20:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MAYA-102319 Basic useRegistry import support #621

MAYA-102319 Basic useRegistry import support #621

JGamache-autodesk commented Jul 3, 2020 •

edited

Loading

JGamache-autodesk Jul 3, 2020

mattyjams Jul 10, 2020

JGamache-autodesk Jul 3, 2020

JGamache-autodesk Jul 3, 2020

kxl-adsk Jul 12, 2020

JGamache-autodesk Jul 3, 2020

JGamache-autodesk Jul 3, 2020

JGamache-autodesk Jul 3, 2020

JGamache-autodesk Jul 3, 2020

kxl-adsk Jul 12, 2020

mattyjams left a comment

mattyjams left a comment

mattyjams Jul 20, 2020

mattyjams Jul 20, 2020

mattyjams Jul 20, 2020

MAYA-102319 Basic useRegistry import support #621

MAYA-102319 Basic useRegistry import support #621

Conversation

JGamache-autodesk commented Jul 3, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mattyjams left a comment

Choose a reason for hiding this comment

mattyjams left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JGamache-autodesk commented Jul 3, 2020 •

edited

Loading