Commit Graph

79 Commits

Author SHA1 Message Date
Ansis Brammanis
8aa2e2fef7 Don't wrap line labels.
fixes #1332

98af024921/js/data/symbol_bucket.js (L74)
2015-04-24 15:41:13 -07:00
Ansis Brammanis
17010bfd73 make text-max-size not affect rendering size
This way it matches -js. The real fix will eventually be
https://github.com/mapbox/mapbox-gl-style-spec/issues/255
2015-04-24 15:33:58 -07:00
Konstantin Käfer
ec94e03a8e set the correct v7 default font
- also skip layers with empty font names
2015-04-09 22:29:05 +02:00
John Firebaugh
691756d7dd Move ClipID to clip_id.hpp/cpp 2015-04-09 10:58:11 -07:00
John Firebaugh
d8411f26d2 Tile::ID ⇢ TileID
This allows making both Tile and TileID private.
2015-04-06 13:58:56 -07:00
John Firebaugh
7e0e55e542 Eliminate StyleSource
Fixes #695
2015-04-06 10:30:01 -07:00
John Firebaugh
41c4d50f8a Remove unused 2015-04-03 13:51:33 -07:00
Konstantin Käfer
5ab6274f8b some cleanup 2015-04-02 15:45:39 +02:00
John Firebaugh
9331acf8e6 Add typedefs for std::chrono::steady_clock types 2015-04-02 12:28:12 +02:00
John Firebaugh
5264982ba7 Eliminate StyleLayerGroup 2015-04-01 11:14:20 -07:00
Konstantin Käfer
220ebf61dd replace iterator variable types with auto 2015-04-01 16:42:42 +02:00
John Firebaugh
3d9b441c8b Eliminate some unnecessary pointer indirection
Buckets had a pointer to the associated layout type, when they can just
have a direct member.
2015-03-31 15:23:40 -07:00
John Firebaugh
f2e658d962 Remove unused 2015-03-31 12:08:57 -07:00
Ansis Brammanis
31a3d3603c clip fill antialiasing with depth buffer to avoid overlapping
https://github.com/mapbox/mapbox-gl-native/pull/381
2015-03-24 16:08:26 -07:00
John Firebaugh
96f6b79251 Compare correct fill/stroke variables
The comparisons here need to take into account the check above for the
special value {{ 0, 0, 0, -1 }} for stroke_color, which indicates that
the fill color should be used.
2015-03-24 16:08:26 -07:00
Justin R. Miller
93abf881fb feature() -> getFeature() to clear up ambiguity / Linux compiler error 2015-03-17 19:25:32 -07:00
John Firebaugh
0c985c024b Revert "Move atlas ownership to Style"
This reverts commit bffee07154.
2015-03-13 13:05:32 -07:00
John Firebaugh
6325f1e25a Index glyph use by tile pointer value, not tile ID
There can be multiple tiles with the same ID, but from different
sources.

Fixes #957
2015-03-13 10:55:49 -07:00
John Firebaugh
96682a02af Remove unused declaration 2015-03-13 10:55:49 -07:00
John Firebaugh
998092e5b2 Remove needless indirection 2015-03-13 10:55:49 -07:00
John Firebaugh
bffee07154 Move atlas ownership to Style
This follows gl-js and just makes sense -- whenever the style changes
the atlases should be blown away.

Refs #957
2015-03-13 10:55:47 -07:00
Thiago Marcos P. Santos
124b49562d Get rid of printf and cout by using Log::*
Use our logging system that will route the message accordingly on
the target platform.

Fixes #613
2015-03-12 14:19:32 +02:00
John Firebaugh
b7f04ee7c2 Use single geometry format 2015-03-09 18:32:09 -07:00
John Firebaugh
50b5c15653 Rework GeometryTile* interface 2015-03-09 18:32:08 -07:00
Justin R. Miller
2d8bf823fc unique -> shared ptr 2015-03-09 11:57:34 -07:00
Justin R. Miller
7361f8566b move to shared pointers for queried layers passed to buckets 2015-03-09 11:57:34 -07:00
Justin R. Miller
a45ae199cf move from range-based for loop to iterator for to be clearer 2015-03-09 11:57:34 -07:00
Justin R. Miller
a6b6a8d67e move to abstract interfaces to more be in line with original API 2015-03-09 11:57:34 -07:00
Justin R. Miller
405137700b parse geometry collections from the pbfs; iterate geometries in buckets 2015-03-09 11:57:33 -07:00
Justin R. Miller
0a8a0aee90 move to abstract base classes & shared pointers 2015-03-09 11:57:32 -07:00
Justin R. Miller
41c3b82d3e refs #928: bookmarking working build of refactor 2015-03-09 11:57:31 -07:00
John Firebaugh
7d06e62363 Fix satellite style label rendering 2015-03-09 10:42:25 -07:00
Konstantin Käfer
c30bb1a9f8 add more locking around GlyphStore and FontStack
this is a stopgap until we have a solution that gives every worker thread their own copy
2015-03-06 15:42:34 +01:00
Konstantin Käfer
0151fe6c01 pass StyleLayer objects as const ref instead of a shared pointer 2015-03-06 13:26:11 +01:00
Konstantin Käfer
c07fa06994 rename StyleBucket* => StyleLayout*
and remove a few unused variables

refs #881
2015-02-17 18:27:51 -08:00
Konstantin Käfer
89c0ff5f39 make StyleBucket mutable
refs #881
2015-02-17 18:27:51 -08:00
Justin R. Miller
6e41664cb0 fixes #476 & #853: pixel/meter/latlng conversion routines in core & iOS 2015-02-16 09:52:36 -08:00
Ansis Brammanis
c621441def Fix line label interpolation offset. 2015-02-11 14:12:32 -08:00
Ansis Brammanis
b53b24a6bc Merge remote-tracking branch 'origin/master' into line-label-density 2015-02-10 15:21:36 -08:00
Ansis Brammanis
8e459c2a73 improve line label density
Place the first label as close to the beginning of the line as possible.

js: 316ed0bd9bff8cd430ad81d0b6397f396fbce124
2015-02-10 15:21:18 -08:00
Ansis Brammanis
6d47e9b684 use correct interpolation for background images 2015-02-10 10:59:32 -08:00
Ansis Brammanis
4ec0028856 switch from low/high to from/to 2015-02-04 12:08:29 -08:00
Ansis Brammanis
465b1ac3eb Merge branch 'master' into pattern-functions
Conflicts:
	src/mbgl/renderer/painter.cpp
	src/mbgl/renderer/painter.hpp
	src/mbgl/renderer/painter_fill.cpp
	src/mbgl/renderer/painter_line.cpp
	src/mbgl/style/style_layer.cpp
	src/mbgl/style/style_layer.hpp
	src/mbgl/style/style_layer_group.cpp
	src/mbgl/style/style_layer_group.hpp
2015-02-04 11:05:36 -08:00
Konstantin Käfer
5503aef690 make vaos immovable 2015-02-04 10:49:05 +01:00
Lauren Budorick
895d90409b Add functions for layout properties. 2015-02-03 16:09:58 -08:00
Leith Bade
63e4c75275 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into chrono
Conflicts:
	ios/mapbox-gl-cocoa
2015-02-04 10:44:57 +11:00
Leith Bade
89bbd29278 Use std::chrono 2015-02-04 09:39:25 +11:00
Ansis Brammanis
23dd403a25 add wrapped padding to sprite for repeating images
fixes #798
js: e732e784e41bef35bd40de27fdbfa3e8f9588038
2015-02-03 13:17:26 -08:00
Ansis Brammanis
c9f8de863d remove old version of zoomHistory 2015-02-02 18:27:55 -08:00
Ansis Brammanis
6f5c6b58b4 use faded pattern functions for dasharrays 2015-02-02 17:57:12 -08:00