Merge mapbox-gl-shaders repo into this repo #3787
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
Switching back to the old way of doing it. ref #120
- move calculation outside the shaders as much as possible - remove effectless code
…sitions passed through as varying per feature.
…ge and point-size.
Example options used to create a video source:
{
type: 'video',
url: 'http://mapbox.s3.amazonaws.com/llmr-demo/aleppo.mp4',
coordinates: [
[37.17021346092223, 36.20638184589834],
[37.18670368194580, 36.20444264512721],
[37.18577027320862, 36.19716155628325],
[37.16894745826721, 36.19928275195264]
]
}
Create a video bucket with { filter: { type: video } }
Add support for property functions in line-color
Fixes #26
* Remove unnecessary IFDEFS * Rename a_minH to a_base and a_maxH to a_height for naming consistency * Remove unused color attributes from fill_extrusion_pattern shaders
* Add support for line-blur property functions * Add support for line-opacity property functions * Remove "u_antialiasing" * Add support for misc line property functions * remove u_blur and u_opacity from line_sdf * remove u_devicepixelratio in favor of DEVICE_PIXEL_RATIO * move line transformation logic to shaders * DRY-ify line transformation math * remove unused var from line fragment shader
* Add support for circle-stroke-* properties * Fix merge artifacts * Eliminate common subexpressions, adjust formatting per PR review
this should work http://stackoverflow.com/questions/13040958/merge-two-git-repositories-without-breaking-file-history/20974621#20974621 |
|
For this merge I would use the technique from http://stackoverflow.com/a/14470212/52207 rather than git subtree. |
mourner
approved these changes
Dec 13, 2016
jfirebaugh
approved these changes
Dec 13, 2016
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.
As a step towards creating the monorepo, this PR merges the
mapbox-gl-shadersrepo into this repo.Open Questions
Where should the shaders go in the directory structure?They can go in ashadersdirectoryShould we continue publishing the shaders as a separate npm package?NahHow can we best preserve the git history of👍mapbox-gl-shaders?Launch Checklist
mapbox-gl-shaders'sREADME.mdmapbox-gl-shadersissues & PRsmapbox-gl-shadersgithub repo as deprecated