LOOKDEVX-470 : Initial support for export. #1177
Merged
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
feldstj
commented
Apr 27, 2021
| @@ -11,5 +11,5 @@ | |||
| <look name="defaultLook"> | |||
| <materialassign name="defaultMaterialAssign" collection="defaultCollection" material="defaultMaterial"/> | |||
| </look> | |||
| <lookgroup name="defaultLookGroup" looks="defaultLook" activeLook="defaultLook" /> | |||
| <lookgroup name="defaultLookGroup" looks="defaultLook" enabled="defaultLook" /> | |||
| @@ -0,0 +1,48 @@ | |||
| <?xml version="1.0"?> | |||
| @@ -2719,3 +2719,54 @@ TEST_CASE("Runtime: duplicate name", "[runtime]") | |||
| REQUIRE(graph1.getOutputSocket(ADD5)); | |||
| REQUIRE(duplicateCount(ADD5) == 1); | |||
| } | |||
|
|
|||
|
|
|||
| TEST_CASE("Export", "[runtime]") | |||
bernardkwok
suggested changes
Apr 27, 2021
bernardkwok
approved these changes
Apr 28, 2021
source/MaterialXCore/Document.cpp
Outdated
| LookPtr mainLook = mainLookGroup->combineLooks(); | ||
| // Delete the mainLookGroup | ||
| removeChild(mainLookGroup->getName()); | ||
| // Append look names that don't belong to the mainLook to lookNames |
There was a problem hiding this comment.
"append the looks which are not the main look."
source/MaterialXFormat/XmlIo.cpp
Outdated
| @@ -362,6 +372,32 @@ string writeToXmlString(DocumentPtr doc, const XmlWriteOptions* writeOptions) | |||
| return stream.str(); | |||
| } | |||
|
|
|||
| static void mergeLooks(DocumentPtr doc, const XmlExportOptions* exportOptions) | |||
There was a problem hiding this comment.
We should move this to the anonymous namespace at the top and make non-static.
bernardkwok
changed the title
ashwinbhat
pushed a commit
that referenced
this pull request
Jan 4, 2023
I've encountered shading artifacts in normal mapped MaterialX materials, and upon closer inspection I believe that these are caused by the missing basis orthogonalizations @Tellusim brought to attention in PR #1049. However, instead of using a second normalize(cross(..)) call, I've applied the Gram-Schmidt algorithm.
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.
No description provided.