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-109893 Integrate 21.05 UsdPreviewSurface shader into mayaUsd plugin #1416

Merged
merged 6 commits into from
May 20, 2021

Conversation

JGamache-autodesk
Copy link
Collaborator

  • Leverages recent code in Maya that simplifies Light integration.
  • Original shading fragment still present for older versions of Maya.

- Leverages recent code in Maya that simplifies Light integration.
- Original shading fragment still present for older versions of Maya.
@JGamache-autodesk
Copy link
Collaborator Author

Brings the Helmet discussed in PixarAnimationStudios/OpenUSD#1174 closer to Pixar's usdView version.
Helmet using original UsdPreviewSurface.xml shader fragment:
HelmetBefore
Using latest Pixar shader code from UsdPreviewSurfaceNG.xml fragment:
helmetNG Dx11

@JGamache-autodesk
Copy link
Collaborator Author

Still missing: Normal maps, as is plainly visible on the air intake tubes.

@JGamache-autodesk
Copy link
Collaborator Author

Here is the gramophone, for comparison:
image

Copy link
Contributor

@williamkrick williamkrick left a comment

Choose a reason for hiding this comment

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

To what extent should I be reviewing usdPreviewSurfaceNGLighting.xml? There is a lot of code there which looks reasonable at first glance, but I didn't try to delve too deeply into it.

The rest of the files are all fine.

@williamkrick
Copy link
Contributor

To what extent should I be reviewing usdPreviewSurfaceNGLighting.xml? There is a lot of code there which looks reasonable at first glance, but I didn't try to delve too deeply into it.

The rest of the files are all fine.

I did some comparisons between the Pixar glslfx file USD/pxr/usdImaging/plugin/usdShaders/shaders/previewSurface.glslfx and the Maya version usdPriviewSurfaceNGLighting.xml and they seem aligned with one another.

@kxl-adsk kxl-adsk added the vp2renderdelegate Related to VP2RenderDelegate label May 17, 2021
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.

@JGamache-autodesk I see you updated testMetallicResponse.png baseline. I would assume this baseline will be different depending on the Maya version?

@JGamache-autodesk
Copy link
Collaborator Author

@kxl-adsk The result will be different based on the Maya version. I will add a check otherwise the preflight will not work.

@@ -301,13 +301,16 @@ find_program(MAYA_PY_EXECUTABLE
set(MAYA_LIGHTAPI_VERSION 1)
if(IS_MACOSX)
set(MAYA_DSO_SUFFIX ".dylib")
sef(MAYA_DSO_PREFIX "lib")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Typo? sef -> set

@JGamache-autodesk JGamache-autodesk added the ready-for-merge Development process is finished, PR is ready for merge label May 20, 2021
@kxl-adsk kxl-adsk merged commit a5a9d87 into dev May 20, 2021
@kxl-adsk kxl-adsk deleted the t_gamaj/MAYA-109893/use_external_light_functions branch May 20, 2021 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants