Allow changing text color#389
Open
Carifio24 wants to merge 2 commits intoWorldWideTelescope:masterfrom
Open
Conversation
This file contains hidden or 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
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 PR updates the text shader to allow changing the text color. The computation in the shader is the same a what we do to set point colors for table layers. However, for points we need to make color an attribute as it can be different for each point (due to colormapping layers). This PR only allows making the text a solid color, so we can just pass in the color as a uniform (so we only need 4 numbers as opposed to 4 * N).
While hooking this up to
Text3dBatch, I noticed that the text batches already have a color parameter. It looks like this parameter was used in the canvas-based implementation but hasn't previously been respected in WebGL. Interestingly enough, some of the existing overlay text batches (in particular, constellation names and grid text) already have colors other than white passed in.@pkgw @patudom @astrodavid10 Did WWT ever look like the screenshot below? This is technically what the WWT control is asking for. I think changing the grid text color seems pretty reasonable, but the constellation name color seems like a much bigger change. So I added a settings item for constellation name color which is now what is asked for in the draw call, and set that to white by default.