Terrain: shader support for sampling DEM elevation from float textures #10652
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
karimnaaji
approved these changes
May 7, 2021
| @@ -31,6 +36,10 @@ float decodeElevation(vec4 v) { | |||
| } | |||
|
|
|||
| float currentElevation(vec2 apos) { | |||
| #ifdef DEM_FLOAT_FORMAT | |||
There was a problem hiding this comment.
Should we be consistent with the other define and name that TERRAIN_DEM_FLOAT_FORMAT? (we already have TERRAIN_DEM_NEAREST_FILTER)
There was a problem hiding this comment.
At first, I didn't follow it because it is used in hillshade too, without terrain. Renamed to TERRAIN_DEM_FLOAT_FORMAT - it is terrain DEM anyway.
astojilj
force-pushed
the
astojilj-dem-float-shader-support
branch
from
c2c70c2 to
d176132
Compare
Feature is implemented in gl-native first. Since shader code is shared, code here is not used by gl-js (`TERRAIN_DEM_FLOAT_FORMAT` is not defined).
astojilj
force-pushed
the
astojilj-dem-float-shader-support
branch
from
d176132 to
2a73031
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.
This feature is implemented in gl-native first. As
TERRAIN_DEM_FLOAT_FORMATis not defined, code here has no effect on gl-js.Submitting here only shared shader code change.