Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

introduce elementGroups and re-organize buckets #461

Merged
merged 21 commits into from
Jun 17, 2014
Merged

introduce elementGroups and re-organize buckets #461

merged 21 commits into from
Jun 17, 2014

Conversation

ansis
Copy link
Contributor

@ansis ansis commented Jun 17, 2014

  • introduces the elementgroup concept
  • split bucket.js and geometry.js into separate files for each bucket type
  • started cleaning up workertile.js
  • made bucket parsing less serial ae34e6a

why:

  • to move closer to -native
  • better organize buckets
  • prepare for fixing geojson and making it less of a special case

todo:

  • add tests for linebucket
  • add tests for fillbucket
  • add tests for textbucket covered by text-placement
  • add tests for pointbucket

ansis and others added 20 commits June 13, 2014 14:23
@ansis
switch to using element groups for lines
1acfa85 
This starts bringing rendering closer to how its done in -native.

Lines are added to a single vertex and element buffer. If the number of
vertices exceeds the maximum number, instead of creating a new buffer it
creates a new element group, and stores the offset of that group into
the buffer.
@ansis
switch fills to elementGroups
574a7c8
@ansis
switch points to elementGroups
b79dfaa
@ansis
switch text to elementGroups
f5b4b09
@ansis
remove geometry.js and bucket.js
3854dde
@ansis
remove bucket.start bucket.end
f7eefe2
@ansis
cleanup passing elementGroups back from worker
299fe34
@ansis
fix check to see whether a bucket is empty
d754a9b 
break geojson, but fix build
@ansis
fix drawvertices
8d6318f
@ansis
remove grunt from travis script
a99a2da
@ansis
fix check whether bucket is empty
3210356
@ansis
move bucket-specific parsing into bucket files
07394e0
@ansis
consolidate bucket parse functions in workertile
ca651d9
@ansis
forEach -> regular loops
232038b
@ansis
cleanup sorting a tile into buckets
181e4cf
@ansis
rework async processing to be less serial
ae34e6a 
Some buckets may need to download resources (like glyphs) before begin
parsed. These are now all started first so that a previous bucket
doesn't need to be finished before starting to donwnload the next
bucket's glyphs.

Also, placement only matters for buckets with placement. Buckets that
don't have placement (lines, fills) don't need to wait until the
previous bucket finishes.

Basically:
- start downloads stuff as early as possible
- don't enforce order where it isn't necessary
@ansis
reorder functions in workertile
4cfb707
@ansis
fix tests
1744691
@yhahn
Merge branch 'master' into element-groups
c43f709
@yhahn
Refactor previous geometry.test.js into fill/line/point bucket tests.
e43859a
@yhahn
Copy link
Member

yhahn commented Jun 17, 2014

@ansis moved over the assertions from geometry.test.js from master to handle fill/line/point. I'm seeing textbucket as hard to test in this context -- and getting tested via https://github.com/mapbox/mapbox-gl-js/blob/element-groups/test/text-placement.js

@yhahn
Copy link
Member

yhahn commented Jun 17, 2014

Tested with our demo styles as well.

@mourner
Copy link
Member

mourner commented Jun 17, 2014

This is great, much cleaner now.

@ansis
Copy link
Contributor Author

ansis commented Jun 17, 2014

thanks for adding tests

ansis added a commit that referenced this pull request Jun 17, 2014
@ansis
Merge pull request #461 from mapbox/element-groups
3ebabad 
introduce elementGroups and re-organize buckets
@ansis ansis merged commit 3ebabad into master Jun 17, 2014
@ansis ansis deleted the element-groups branch June 17, 2014 17:03
bensleveritt pushed a commit to bensleveritt/mapbox-gl-js that referenced this pull request Oct 24, 2016
Fix out-of-bounds dragging in direct_select; closes mapbox#461
6d09511
bensleveritt pushed a commit to bensleveritt/mapbox-gl-js that referenced this pull request Oct 24, 2016
@mcwhittemore
Merge pull request mapbox#462 from mapbox/direct-select-constraint
1cb793d 
Fix out-of-bounds dragging in direct_select; closes mapbox#461
lucaswoj pushed a commit that referenced this pull request Jan 11, 2017
@yhahn
Add icon-text-fit, icon-text-fit-padding (#461)
194fc55 
* First pass at icon-text-fit, icon-text-fit-padding properties

* Support specifying padding independently on all 4 sides
@lucaswoj lucaswoj mentioned this pull request Feb 1, 2017
Closed
karimnaaji pushed a commit that referenced this pull request Mar 14, 2023
@endanke
Add applyCutout function to fragment shader prelude, call applyCutout…
6981b61 
… conditionally in fill extrusion, ground shadow, and line fragment shaders (#461)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ansis @yhahn @mourner @kkaefer