Fixed the billboard alignedaxis issue. #5367
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
emackey
reviewed
May 25, 2017
| @@ -256,6 +256,7 @@ void main() | |||
|
|
|||
| vec4 positionWC = computePositionWindowCoordinates(positionEC, imageSize, scale, direction, origin, translate, pixelOffset, alignedAxis, validAlignedAxis, rotation, sizeInMeters); | |||
| gl_Position = czm_viewportOrthographic * vec4(positionWC.xy, -positionWC.z, 1.0); | |||
| //gl_Position = czm_modelViewProjection * vec4(positionWC.xy, -positionWC.z, 1.0); | |||
There was a problem hiding this comment.
Oops... extra comment slipped by.
bagnell
suggested changes
May 25, 2017
| @@ -53,9 +53,9 @@ vec4 computePositionWindowCoordinates(vec4 positionEC, vec2 imageSize, float sca | |||
| { | |||
| vec3 pos = positionEC.xyz + czm_encodedCameraPositionMCHigh + czm_encodedCameraPositionMCLow; | |||
There was a problem hiding this comment.
You can remove this and normal as well.
bagnell
approved these changes
May 25, 2017
|
@klingerj When you finish updates after a review, bump the PR so the reviewer knows to look again. Please update any forum threads linked in the issue that this was fixed and will be in the next release. |
|
Got it, thanks for letting me know @bagnell. |
|
Fantastic, thanks again @klingerj! |
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.
Fixes #2487