Clean up FabricMaterial #540
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
lilleyse
requested review from
weegeekps,
r-veenstra and
corybarr
as code owners
lilleyse
commented
Nov 9, 2023
Comment on lines
-58
to
60
| bool hasBaseColorTextureGltf(const FabricMesh& fabricMesh) { | ||
| return fabricMesh.material != nullptr && fabricMesh.material->getMaterialDefinition().hasBaseColorTexture() && | ||
| fabricMesh.materialInfo.baseColorTexture.has_value(); | ||
| bool hasBaseColorTexture(const FabricMesh& fabricMesh) { | ||
| return fabricMesh.material != nullptr && fabricMesh.material->getMaterialDefinition().hasBaseColorTexture(); | ||
| } |
There was a problem hiding this comment.
The deleted part used to be important, but is no longer needed after #495.
corybarr
reviewed
Nov 9, 2023
corybarr
approved these changes
Nov 9, 2023
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.
I did some cleanup in
FabricMaterialwhile adding support for feature ids.setMaterialrather than a separate function. This keeps the material setting code more cohesive. Imagery layers are still set separately because their loading happens in a different phase of the pipeline.cesium_base_color_texture_float4nodes, we no longer create multiple base color texture prims to feed into each one. Instead we create a single prim and add multiple connections. This is cleaner and should be more performant. This applies to imagery layers too.I tested this PR with a variety of scenes from previous PRs: test-data-sets.zip