Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAYA-106222 Rename pxrUsdPreviewSurface to usdPreviewSurface #744

Merged
merged 6 commits into from
Sep 14, 2020

Conversation

JGamache-autodesk
Copy link
Collaborator

@JGamache-autodesk JGamache-autodesk commented Aug 25, 2020

The mayaUsdPlugin will provide a node named "usdPreviewSurface" that is functionnally identical to the "pxrUsdPreviewSurface" node now back into the pxrUsdPreviewSurface plugin.
Both nodes will import, export, display, and convert to hydra using an identical code base.

The mayaUsdPlugin will provide a node named "UsdPreviewSurface" that is functionnally identical to the "pxrUsdPreviewSurface" node now back into the pxrUsdPreviewSurface plugin.
Both nodes will import, export, display, and convert to hydra using an identical code base.
@JGamache-autodesk JGamache-autodesk added import-export Related to Import and/or Export mtoh Related to legacy Maya to Hydra plugin. pxr Related to Pixar plugin vp2renderdelegate Related to VP2RenderDelegate adsk Related to Autodesk plugin labels Aug 25, 2020
Copy link
Contributor

@mattyjams mattyjams left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

lib/usd/pxrUsdPreviewSurface/overview.dox Outdated Show resolved Hide resolved
lib/usd/pxrUsdPreviewSurface/usdPreviewSurfacePlugin.cpp Outdated Show resolved Hide resolved
lib/usd/pxrUsdPreviewSurface/usdPreviewSurfacePlugin.h Outdated Show resolved Hide resolved
@JGamache-autodesk JGamache-autodesk changed the title MAYA-106222 Rename pxrUsdPreviewSurface to UsdPreviewSurface MAYA-106222 Rename pxrUsdPreviewSurface to usdPreviewSurface Aug 27, 2020
@JGamache-autodesk JGamache-autodesk added the ready-for-merge Development process is finished, PR is ready for merge label Aug 28, 2020
Copy link

@kxl-adsk kxl-adsk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change fails with USD 19.11:

FAILED: plugin/pxr/maya/plugin/pxrUsdPreviewSurface/CMakeFiles/pxrUsdPreviewSurface.dir/plugin.cpp.obj
C:\PROGRA2\MIB0551\2017\ENTERP1\VC\Tools\MSVC\14161.270\bin\Hostx64\x64\cl.exe /nologo /TP -DBOOST_ALL_DYN_LINK -DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE -DHAVE_SNPRINTF -DMFB_ALT_PACKAGE_NAME=pxrUsdPreviewSurface -DMFB_PACKAGE_MODULE=PxrUsdPreviewSurface -DMFB_PACKAGE_NAME=pxrUsdPreviewSurface -DNOMINMAX -DPXRUSDPREVIEWSURFACE_EXPORTS=1 -DPXR_BUILD_LOCATION=usd -DPXR_PLUGIN_BUILD_LOCATION=../plugin/usd -DPXR_PYTHON_ENABLED=1 -DPXR_PYTHON_MODULES_ENABLED=1 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -DpxrUsdPreviewSurface_EXPORTS -Iinclude -Imaya\include -IE:\Dev\maya\builds\2019_\runTime\include -IE:_workspaces_latest\Pixar_USD_19.11\include /DWIN32 /D_WINDOWS /W3 /GR /EHsc /MD /Zi /O2 /Ob1 /DNDEBUG /W3 /WX /Zi /Zc:inline /Zc:rvalueCast /MP /EHsc /wd4244 /wd4267 /wd4273 /wd4305 /wd4506 /wd4996 /wd4180 -std:c++14 /showIncludes /Foplugin\pxr\maya\plugin\pxrUsdPreviewSurface\CMakeFiles\pxrUsdPreviewSurface.dir\plugin.cpp.obj /Fdplugin\pxr\maya\plugin\pxrUsdPreviewSurface\CMakeFiles\pxrUsdPreviewSurface.dir\ /FS -c E:\maya-usd_pr\plugin\pxr\maya\plugin\pxrUsdPreviewSurface\plugin.cpp
E:_workspaces_latest\Pixar_USD_19.11\include\pxr/base/tf/traits.h(32): fatal error C1083: Cannot open include file: 'boost/utility/enable_if.hpp': No such file or directory

@kxl-adsk kxl-adsk removed the ready-for-merge Development process is finished, PR is ready for merge label Aug 28, 2020
…name_pxrUsdPreviewSurface

# Conflicts:
#	lib/usd/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.cpp
target_link_libraries(${TARGET_NAME}
target_link_libraries(${TARGET_NAME}
PUBLIC
tf
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Declare a transitive dependency to tf, which has the transitive dependency to Boost that is required to build pxrUsdPreviewSurface plugin with USD 19.11.

@@ -31,7 +31,7 @@ global proc pxrUsdPreviewSurface_ToggleSpecularWorkflow(string $nodeName)
}
}

global proc AEpxrUsdPreviewSurfaceTemplate(string $nodeName)
global proc AE${PREVIEWSURFACE_MAYA_TYPE_NAME}Template(string $nodeName)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

File is back where it belongs. It now has template parameters allowing clients to generate a copy that works with their own node.

CHECK_MSTATUS(status);

UsdMayaShaderWriterRegistry::Register(
typeNameToken,
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registering a node will automatically register a reader/writer for file import/export.

Copy link

@kxl-adsk kxl-adsk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, Jerry. You addressed review feedback in a very elegant way.

@JGamache-autodesk JGamache-autodesk added the ready-for-merge Development process is finished, PR is ready for merge label Sep 14, 2020
@kxl-adsk kxl-adsk merged commit 71eaabf into dev Sep 14, 2020
@kxl-adsk kxl-adsk deleted the t_gamaj/MAYA-106222/rename_pxrUsdPreviewSurface branch September 14, 2020 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
adsk Related to Autodesk plugin import-export Related to Import and/or Export mtoh Related to legacy Maya to Hydra plugin. pxr Related to Pixar plugin ready-for-merge Development process is finished, PR is ready for merge vp2renderdelegate Related to VP2RenderDelegate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants