Individual materials for GUI nodes #7606
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
Jhonnyg
commented
Jun 16, 2023
matgis
requested changes
Jun 16, 2023
There was a problem hiding this comment.
Big props for tackling the editor changes! The data dependencies in the Gui system are some of the most difficult to grasp in the entire editor code base. 😅
Before merging, we should add more validation for the selected material, and we could rename the new override-material-shader output if we included the default material in the material-names map under "" like we do for the textures.
editor/src/clj/editor/gui.clj
Outdated
| @@ -2388,6 +2513,7 @@ | |||
| (input layouts-node g/NodeID) ; for tests | |||
| (input fonts-node g/NodeID) ; for tests | |||
| (input textures-node g/NodeID) ; for tests | |||
| (input materials-node g/NodeID) ; for tests | |||
There was a problem hiding this comment.
Well, did you write any tests? 😅
Jhonnyg
added
engine
Jhonnyg
changed the title
matgis
reviewed
Jun 26, 2023
matgis
previously approved these changes
Jun 27, 2023
JCash
previously approved these changes
Jun 28, 2023
engine/gui/src/gui.cpp
Outdated
Comment on lines
755
to
762
| InternalNode* nodes = scene->m_Nodes.Begin(); | ||
| for (uint32_t i = 0; i < scene->m_Nodes.Size(); ++i) | ||
| { | ||
| if (nodes[i].m_Node.m_MaterialNameHash == name_hash) | ||
| { | ||
| nodes[i].m_Node.m_Material = material; | ||
| } | ||
| } |
There was a problem hiding this comment.
I think rather than looping for every node, for each material, we could have a loop outside of the function (at setup) where we lookup the materials from the map instead?
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.
GUIs now has a list of materials that can be assigned to individual nodes, similar to textures, particles and fonts. If no material has been set on a node, the default GUI node material will be used.
Note: Assigning separate materials will break batching in the same manner as the regular GO world!
Fixes #7455
PR checklist