Multiple raster overlays cleanup #495
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,
corybarr and
mattelser
as code owners
lilleyse
commented
Oct 18, 2023
Comment on lines
+59
to
60
| return fabricMesh.material != nullptr && fabricMesh.material->getMaterialDefinition().hasBaseColorTexture() && | ||
| fabricMesh.materialInfo.baseColorTexture.has_value(); |
There was a problem hiding this comment.
Bug fix. The nullptr check prevents against a crash if you're using a custom tileset material in #406 but omniverse can't locate it (the full explanation for why this happens is a bit longer).
| @@ -410,7 +407,7 @@ void FabricMaterial::setTextureValues( | |||
| const TextureInfo& textureInfo, | |||
| uint64_t texcoordIndex) { | |||
|
|
|||
| if (texcoordIndex >= FabricTokens::MAX_TEXTURE_LAYER_COUNT) { | |||
| if (texcoordIndex >= FabricTokens::MAX_PRIMVAR_ST_COUNT) { | |||
There was a problem hiding this comment.
Bug fix, was using the wrong constant.
corybarr
reviewed
Oct 19, 2023
lilleyse
commented
Oct 19, 2023
Comment on lines
+58
to
+73
| gltf_texture_lookup_value imagery_layer_0 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_1 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_2 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_3 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_4 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_5 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_6 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_7 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_8 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_9 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_10 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_11 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_12 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_13 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_14 = gltf_texture_lookup(), | ||
| gltf_texture_lookup_value imagery_layer_15 = gltf_texture_lookup() |
There was a problem hiding this comment.
These should actually by gltf_texture_lookup_value(). It's harmless for now, but I fixed it on a different branch.
There was a problem hiding this comment.
Oh and I forgot to mention in the PR description, eAsset arrays don't seem to work in Fabric which is why each texture is its own entry instead of gltf_texture_lookup_value[16]
corybarr
approved these changes
Oct 19, 2023
Merged
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.
As I was integrating multiple raster overlays (#492) into tileset material nodes (#406) I realized it would be much simpler to treat glTF base color textures and raster overlays as separate things instead of all being treated as base color textures.
The main change is in
cesium.mdlwherecesium_imagery_layer_resolveris responsible for blending imagery layers together andcesium_materialis responsible for blending the final imagery layer color with the glTF base color texture. As a resultcesium_materialis no longer an exact copy ofgltf_material, but does some simple calculations first.In the case where there's a single imagery layer performance should still be good because it skips
cesium_imagery_layer_resolver.