Commit Graph

737 Commits

Author SHA1 Message Date
Konstantin Käfer
e4c311a864 remove uv.h dependency in util/time.hpp 2014-08-11 17:41:08 +02:00
Konstantin Käfer
7a98ad4cf9 Merge pull request #407 from mapbox/filesource
Use style.json directory as base path for loading sprite images
2014-08-11 16:57:33 +02:00
Konstantin Käfer
225b5e01cb don't automatically move back to main thread 2014-08-11 07:41:52 -07:00
Justin R. Miller
e39ae931b9 Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-08-08 12:29:56 -07:00
Konstantin Käfer
4657e6e023 use a file source object to abstract loading of resources 2014-08-08 18:25:45 +02:00
Konstantin Käfer
a045d9c9d4 use filesource object for loading all http stuff 2014-08-08 15:08:41 +02:00
John Firebaugh
70a31baf5c Eliminate warnings 2014-08-07 13:02:40 -07:00
Justin R. Miller
73db681d1e redo of 2397019347 2014-08-06 15:53:37 -07:00
Konstantin Käfer
9dc48b773f fix crash bug for styles that have no glyph url specified 2014-08-06 18:33:21 +02:00
Konstantin Käfer
915e89bee8 Merge branch 'master' into symbols
Conflicts:
	src/renderer/painter_text.cpp
2014-08-06 15:32:48 +02:00
Konstantin Käfer
1f992b1de8 fix icons on retina screens 2014-08-06 14:54:37 +02:00
Konstantin Käfer
3043b5608f fix black border around icon 2014-08-06 14:35:57 +02:00
Konstantin Käfer
b281313266 use linear interpolation for icons placed along a line 2014-08-06 14:34:14 +02:00
Konstantin Käfer
5781d12ff1 linearly interpolate rotated icons 2014-08-06 12:38:57 +02:00
Konstantin Käfer
625ad1efe2 fix icon rendering 2014-08-06 12:36:19 +02:00
Ansis Brammanis
4220bfcb6c implement line-blur and fix retina antialiasing 2014-08-05 14:17:00 -07:00
Konstantin Käfer
8cd6a99716 convert offset to em 2014-08-05 17:37:13 +02:00
Konstantin Käfer
898c5dc7c3 port text alignment algorithm 2014-08-05 16:18:23 +02:00
Konstantin Käfer
af4ecc6260 we account differently for the ascender already 2014-08-05 15:08:26 +02:00
Konstantin Käfer
5ebb23521f change gamma back to old value 2014-08-05 14:57:40 +02:00
Konstantin Käfer
23ceaf7d66 code style fixes 2014-08-05 14:54:31 +02:00
Konstantin Käfer
86e137664c use trinary operator rather than || since c++ semantics for || is different 2014-08-05 14:53:56 +02:00
Konstantin Käfer
3946437d87 port js algorithm 2014-08-05 13:51:21 +02:00
Konstantin Käfer
1a95ec3a65 explicitly named parameters 2014-08-05 13:51:07 +02:00
Konstantin Käfer
1f8202b678 default to map alignment when placement type is line 2014-08-05 13:49:59 +02:00
Konstantin Käfer
b402d03837 don't require the background layer to be named "background" 2014-08-05 11:58:16 +02:00
Konstantin Käfer
17617a54bd make sure to check the promise 2014-08-05 11:56:28 +02:00
Konstantin Käfer
cdd7991505 correctly calculate placement depth 2014-08-05 11:44:50 +02:00
Konstantin Käfer
1ac5ed84ea port mapbox/mapbox-gl-js#ffd529df107bfec446fa4b4454a583f296c38819 2014-08-04 21:33:48 +02:00
Konstantin Käfer
9f99f0bb60 change max_angle_delta to max_angle 2014-08-04 18:59:17 +02:00
Konstantin Käfer
056b4a988c fix boolean operators 2014-08-04 18:46:43 +02:00
Konstantin Käfer
36181b0922 update symbol placement to be more like js 2014-08-04 18:24:22 +02:00
Konstantin Käfer
9dd50a29e1 update shaders and backport some collision changes 2014-08-04 12:59:22 +02:00
John Firebaugh
9861f40f76 Remove rounding 2014-08-01 10:21:43 -07:00
Konstantin Käfer
19e51e8bd8 port 5a9a1b14b9 2014-08-01 16:43:39 +02:00
Konstantin Käfer
2ff8b409fe port 954dc6591f 2014-08-01 16:33:59 +02:00
John Firebaugh
d8490853b9 Remove unused 2014-07-31 17:54:33 -07:00
Justin R. Miller
2397019347 comment out verbose log line 2014-07-31 14:20:51 -07:00
Konstantin Käfer
d01b996acd better warning messages 2014-07-31 18:55:48 +02:00
Konstantin Käfer
75c079adb1 move sprite to a use future loading 2014-07-31 18:14:26 +02:00
Konstantin Käfer
fa3a41136c merge text and icon buckets/styles
(we're not yet placing together!)
2014-07-29 18:27:59 +02:00
Konstantin Käfer
270c24a9a8 add symbol* properties/keys 2014-07-29 12:09:22 +02:00
Eden Halperin
7a8a9fb339 change text-max-angle to accept degrees and convert to radians 2014-07-26 09:18:42 -07:00
John Firebaugh
600e1d8a9e line-join defaults to miter (fixes #384) 2014-07-25 11:45:56 -07:00
Konstantin Käfer
2be561ed4a reduce maxPlacementScale
implements 871883d569
2014-07-23 17:28:10 +02:00
Konstantin Käfer
346e0510fa fix text placement
[skip ci]
2014-07-23 16:20:20 +02:00
Konstantin Käfer
04bab1af76 more include what you use 2014-07-23 13:18:03 +02:00
Konstantin Käfer
d175d146fb include what you use 2014-07-23 12:53:21 +02:00
Konstantin Käfer
b5c406416a read default values from property structs
fixes background color
2014-07-22 17:19:07 +02:00
Konstantin Käfer
d47f11574e do not explicitly render matte; we already cleared the background with glClear 2014-07-22 17:18:38 +02:00