Commit Graph

86 Commits

Author SHA1 Message Date
Konstantin Käfer
5a59b5f5fc fix warnings 2014-08-18 14:05:52 +02:00
Konstantin Käfer
937f82fcda use pimpl for collision in tile_parser 2014-08-15 15:18:29 +02:00
Ansis Brammanis
6c45972502 allow crosstile labels and add symbol-avoid-edges 2014-08-15 15:18:29 +02:00
Konstantin Käfer
6f80264291 remove uv.h dependency from header files 2014-08-12 11:45:30 +02:00
Konstantin Käfer
a045d9c9d4 use filesource object for loading all http stuff 2014-08-08 15:08:41 +02: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
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
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
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
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
Konstantin Käfer
fa3a41136c merge text and icon buckets/styles
(we're not yet placing together!)
2014-07-29 18:27:59 +02:00
Eden Halperin
7a8a9fb339 change text-max-angle to accept degrees and convert to radians 2014-07-26 09:18:42 -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
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00
Konstantin Käfer
22c8afced5 replace {{token}} with {token}, and %d/%d/%d with {z}/{x}/{y}
refs https://github.com/mapbox/mapbox-gl-style-spec/pull/87
2014-07-09 16:27:23 -07:00
Konstantin Käfer
af87fb6c26 load glyphset url from stylesheet 2014-07-02 12:10:09 +02:00
Konstantin Käfer
ce44d8255d ignore boost warnings with gcc as well 2014-07-01 05:15:26 -07:00
Konstantin Käfer
6de9d9769e cleanup 2014-06-26 21:54:57 +02:00
Konstantin Käfer
ba4294ae0c saving current state 2014-06-23 18:05:25 +02:00
Konstantin Käfer
71d2b230a1 separate bucket render properties and change naming 2014-06-16 11:49:11 +02:00
Konstantin Käfer
af69b4fe39 unifiy constants in one place, and allow local override 2014-06-04 11:22:03 +02:00
Dane Springmeyer
d19870d9d2 fix another potential invalid memory access 2014-05-30 12:41:41 -07:00
Dane Springmeyer
552b9a0f1b fix potential crash in line wrapping:
- shaping.size() == 0 would result in unsigned overflow because uint32_t(0) - 1 == huge number
2014-05-30 12:35:49 -07:00
Dane Springmeyer
7124580294 fix function signature 2014-05-30 12:13:26 -07:00
Mike Morris
59774f7e93 shaped to shaping, pass by reference instead of returning a copy 2014-05-30 14:19:22 -04:00
Young Hahn
2d0b3482ec Merge branch 'master' into linebreak
Conflicts:
	src/map/tile_parser.cpp
	src/text/glyph_store.cpp
2014-05-30 09:00:29 -04:00
Konstantin Käfer
ec973af82e skip characters that don't have metrics 2014-05-30 13:02:40 +02:00
Ansis Brammanis
9ac55e0d74 add text letterSpacing 2014-05-30 04:02:23 -04:00
Ansis Brammanis
7c653895c6 translate as a text bucket property
When used, text is translated before being checked for collisions.
2014-05-30 03:50:25 -04:00
Ansis Brammanis
41c310c762 add verticalAlign for text
Default is center. Other options are "top" and "bottom"
2014-05-30 03:11:57 -04:00
Ansis Brammanis
9057c4980d line wrapping 2014-05-30 01:32:15 -04:00
Mike Morris
3442403e67 parse maxWidth, lineHeight and alignment, pass to FontStack::getShaping 2014-05-30 00:07:22 -04:00
Dane Springmeyer
f5394a7638 release mode: silent debug output + ifdef any potentially expensive calls 2014-05-29 18:07:19 -07:00
Dane Springmeyer
42c233b8b4 fix -Wformat-security warning with dodgy fprintf 2014-05-29 12:33:00 -07:00
Young Hahn
bdb16b9ae7 Merge branch 'master' into glyphrange-master
Conflicts:
	bin/style.js
	src/text/placement.cpp
2014-05-29 11:59:12 -04:00
Young Hahn
99396478ff Use 256 sized rangeglyphs. Switch to mapbox API VTs. 2014-05-29 11:41:35 -04:00
Young Hahn
86ae823306 Merge branch 'glyphrange-boost-locale' into glyphrange-yh-guesses
Conflicts:
	src/map/tile_parser.cpp
	src/text/glyph_store.cpp
2014-05-29 06:06:57 -04:00
Young Hahn
f48999dc13 Treat out of range glyphs as belonging to 0-127 for now. 2014-05-29 05:37:30 -04:00
Young Hahn
d5349f9cd3 Don't call varint() more than once. 2014-05-29 05:19:15 -04:00