removed unneccisary subtraction, combined high and low parameters #3104
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
| @@ -38,13 +38,12 @@ float get2DMercatorYPositionFraction() | |||
| float northLatitude = u_southAndNorthLatitude.y; | |||
| if (northLatitude - southLatitude > maxTileWidth) | |||
| { | |||
| float southMercatorYLow = u_southMercatorYLowAndHighAndOneOverHeight.x; | |||
| float southMercatorYHigh = u_southMercatorYLowAndHighAndOneOverHeight.y; | |||
| float southMercatorY = u_southMercatorYLowAndHighAndOneOverHeight.y; | |||
There was a problem hiding this comment.
u_southMercatorYLowAndHighAndOneOverHeight doesn't need to store low and high now. It can just store the double value casted to a float.
So it can be renamed to u_southMercatorYAndOneOverHeight and made a vec2. Also, update the JavaScript code that sets this uniform.
|
Made the changes. |
| var northMercatorY = WebMercatorProjection.geodeticLatitudeToMercatorAngle(northLatitude); | ||
|
|
||
| float32ArrayScratch[0] = southMercatorY; |
There was a problem hiding this comment.
Remove the declaration for this.
|
removed the declaration |
|
It looks like there is a differnce when you remove the code. Top is my branch, bottom is master. |
|
@pjcozzi I rebuilt my branch and and refreshed the page, and now I am seeing the same thing as master |
|
Looks good on my machine too! |
pjcozzi
added a commit
that referenced
this pull request
Oct 16, 2015
removed unneccisary subtraction, combined high and low parameters
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.
Closes #965.
Removed simulated double precision subtraction from
latitudeToWebMercatorFraction.glsland combinedhighandlowparameters into onesouthMercatorY. Changed occurrence of the function call to match the new parameters.