summaryrefslogtreecommitdiff
path: root/src/mbgl/style/bucket_parameters.hpp
Commit message (Collapse)AuthorAgeFilesLines
* [core] Remove unused BucketParameter membersJohn Firebaugh2016-12-211-23/+7
|
* [core] Convert BucketParameters#layer to a separate parameterJohn Firebaugh2016-12-211-4/+1
| | | | This parameter varies between Buckets, while the others are constant. It makes more sense as an individual parameter.
* [core] Merge GlyphStore and GlyphAtlasJohn Firebaugh2016-09-191-4/+0
|
* [core] Merge SpriteStore and SpriteAtlasJohn Firebaugh2016-09-191-4/+0
|
* [core] Extract SymbolLayout from SymbolBucketJohn Firebaugh2016-09-141-3/+0
| | | | | | | | | | | | | | SymbolLayout lives on the worker thread and contains the persistent data needed for repeated placement. SymbolBucket contains the data generated during placement, and is transferred to the main thread for rendering. This eliminates the risky sharing of GeometryTile::buckets between the main thread and worker thread during TileWorker::redoPlacement. While here, rationalize the names of states a SymbolLayout may be in: * Pending: Waiting for the necessary glyphs or icons to be available. * Prepared: The potential positions of text and icons have been determined. * Placed: The final positions have been determined, taking into account prior layers. In TileWorker, all SymbolLayouts are stored in a single vector. Each SymbolLayout knows what state it is in, and TileWorker can easily determine how much progress it can make toward a final result.
* [core] Revert workaround for std::atomic on ARMv5Thiago Marcos P. Santos2016-07-131-3/+3
| | | | | | Got fix on r12. https://github.com/android-ndk/ndk/issues/31
* Merge branch 'release-android-v4.1.0'Brad Leege2016-06-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java # platform/android/src/jni.cpp # src/mbgl/geometry/buffer.hpp # src/mbgl/geometry/glyph_atlas.cpp # src/mbgl/geometry/glyph_atlas.hpp # src/mbgl/geometry/line_atlas.cpp # src/mbgl/geometry/vao.cpp # src/mbgl/gl/gl_object_store.cpp # src/mbgl/gl/gl_object_store.hpp # src/mbgl/renderer/frame_history.cpp # src/mbgl/shader/shader.cpp # src/mbgl/sprite/sprite_atlas.cpp # src/mbgl/sprite/sprite_atlas.hpp # src/mbgl/text/glyph_pbf.hpp
* [core] Rationalize naming for style-related codeJohn Firebaugh2016-06-021-0/+65