Issue1076 #1213
Merged
Issue1076 #1213
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
…to billboard and incorporated into Label. SandCastle examples added for both label and billboard fading based on camera distance. Signed-off-by: Alex Wood <[email protected]>
Signed-off-by: Alex Wood <[email protected]>
… use scale/translucencyByDistance, their default values would cause issues. For translucency and scale, we should default to 1.0 which results in an identity transformation (e.g., scale by 1). Signed-off-by: Alex Wood <[email protected]>
Label.translucencyByDistance. Cleanup and fixes related to unit tests. Signed-off-by: Alex Wood <[email protected]>
translucencyByDistance. Picking fixes for translucencyByDistance. Updated Changes.MD. Signed-off-by: Alex Wood <[email protected]>
Signed-off-by: Alex Wood <[email protected]>
|
@pjcozzi This is good for review. |
| @@ -11,6 +12,11 @@ varying vec4 v_color; | |||
| void main() | |||
| { | |||
| #ifdef RENDER_FOR_PICK | |||
| if (v_pickTranslucency == 0.0) | |||
There was a problem hiding this comment.
Instead of doing this per-fragment, let's just cull in the vertex shader if needed like we do for show:
positionEC.xyz *= show;
It will be faster and less code.
|
This is solid. Just those comments and we're good. |
shader. Minor cleanup in unit tests and Sandcastle example. Signed-off-by: Alex Wood <[email protected]>
Conflicts: Source/Scene/Billboard.js Source/Scene/Label.js Specs/Scene/LabelCollectionSpec.js
|
@pjcozzi I've incorporated all of your feedback and merged in the most recent master. |
vertex with scale or translucency equal to 0. Signed-off-by: Alex Wood <[email protected]>
Signed-off-by: Alex Wood <[email protected]>
|
Thanks! |
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.
Updates for issue #1076. Early pull request for the sake of transparency (get it?). CC @mramato.