-
Notifications
You must be signed in to change notification settings - Fork 27
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
MaterialX : adds MaterialX #190
Conversation
MaterialX/config.py
Outdated
|
||
"cmake/MaterialXConfig.cmake", | ||
"cmake/MaterialXConfig-noconfig.cmake", | ||
"cmake/MaterialXConfigVersion.cmake" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing comma means we're not including this file or the one after it.
MaterialX/config.py
Outdated
"lib/libMaterialXCore.so", | ||
"lib/libMaterialXFormat.so.1.38.0", | ||
"lib/libMaterialXFormat.so.1", | ||
"lib/libMaterialXFormat.so" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Another missing comma. If I fix these then I can import the Python bindings.
MaterialX/config.py
Outdated
"lib/libMaterialXGenGlsl.so.1.38.0", | ||
"lib/libMaterialXGenGlsl.so.1", | ||
"lib/libMaterialXGenGlsl.so", | ||
"lib/libMaterialXGenOsl.so.1.38.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.so
is the extension on Linux, but it'll be .dylib
on Mac. Including the version numbers is going to make maintenance harder than necessary too. Let's do as we do for other projects and use a catch-all lib/libMaterialX*{sharedLibraryExtension}*
.
MaterialX/config.py
Outdated
"cmake/MaterialXConfig.cmake", | ||
"cmake/MaterialXConfig-noconfig.cmake", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't include CMake files for any other projects so let's omit these for now.
MaterialX/config.py
Outdated
"include/MaterialXCore", | ||
"include/MaterialXFormat", | ||
"include/MaterialXGenShader", | ||
"include/MaterialXGenGlsl", | ||
"include/MaterialXGenOsl", | ||
"include/MaterialXRender", | ||
"include/MaterialXRenderOsl", | ||
"include/MaterialXRenderHw", | ||
"include/MaterialXRenderGlsl", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Likewise, let's use a catch-all include/MaterialX*
here, to simplify future maintenance.
MaterialX/config.py
Outdated
"resources/Geometry", | ||
"resources/Images", | ||
"resources/Lights", | ||
"resources/Materials", | ||
"libraries/bxdf", | ||
"libraries/lights", | ||
"libraries/pbrlib", | ||
"libraries/stdlib", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be great if we could install these in a subfolder somehow, to make it clear that they're MaterialX things and not Gaffer things. Do you know if that is possible? Also, are the resources perhaps just for use by the viewer (which it seems we're not building)?
Sorry, one more comment - could you add |
I tried building the latest MaterialX with this, and some settings and flags have changed. Closing in favour of some future PR based on a local branch I've got... |
fixes #185