MaterialX 1.39.x support #4134
Open
MaterialX 1.39.x support #4134
+140
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JGamache-autodesk
requested changes
Feb 24, 2025
| @@ -161,7 +161,11 @@ const string& HwSpecularEnvironmentSamples::name() | |||
|
|
|||
| string GlslFragmentSyntax::getVariableName( | |||
| const string& name, | |||
| #if MATERIALX_MAJOR_VERSION == 1 && MATERIALX_MINOR_VERSION <= 38 | |||
There was a problem hiding this comment.
Please use the combined syntax:
#if MX_COMBINED_VERSION < 13900| void GlslFragmentGenerator::toVec3(const TypeDesc* type, string& variable) | ||
| { | ||
| if (type->isFloat2()) { | ||
| variable = "vec3(" + variable + ", 0.0)"; | ||
| } else if (type->isFloat4()) { | ||
| variable = variable + ".xyz"; | ||
| #else | ||
| void GlslFragmentGenerator::toVec3(const TypeDesc type, string& variable) |
There was a problem hiding this comment.
Please use const TypeDesc& ?
| std::string channelInfo = ngInput.getChannels(); | ||
| #else |
There was a problem hiding this comment.
Remove the #else part. Channels are gone, so we should not see any here. And if we see some, it will be because we forgot to upgrade the document from 1.38 to 1.39, which might be needed in a few places.
There was a problem hiding this comment.
For this one, do you think gatherChannels could just be bypassed entirely, or return an empty string?
There was a problem hiding this comment.
Yes, please bypass it entirely on 1.39.
boberfly
force-pushed
the
materialx_1.39
branch
from
ec6ae9a to
ebafe82
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi,
This is a simple modification to work with MaterialX 1.39.x so that it can compile against the changes that were made from the 1.38.x version, all pre-processor modifications eg.
I've not made extensive testing with this to see if everything is working, it merely lets you compile. The channels API was removed so this probably needs to most attention to see if the behaviour has changed or broke things.
Addresses #4129