Commit Graph

60 Commits

Author SHA1 Message Date
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
Young Hahn
d82acee8c7 Stash. 2014-05-29 05:05:48 -04:00
Dane Springmeyer
97683460c1 fix compile of glyph_store.cpp 2014-05-28 19:57:26 -07:00
Dane Springmeyer
56c55d0b02 add include <algorithm> needed for std::replace on linux 2014-05-29 02:36:47 +00:00
Young Hahn
944167296a replace comes from regex 2014-05-28 18:53:54 -04:00
Young Hahn
a66db39a06 Monkey patching to get linux compile working. 2014-05-28 18:45:47 -04:00
Konstantin Käfer
6f68cd3676 return font stack 2014-05-28 22:12:31 +02:00
Konstantin Käfer
906b4839c6 parse glyph pbf 2014-05-28 21:55:14 +02:00
Konstantin Käfer
ed7b86a134 add glyph store and load glyph pbfs 2014-05-28 20:51:13 +02:00
Vladimir Agafonkin
00d6cc6bdd simplify glyph boxes handling 2014-05-27 19:33:26 +03:00
Vladimir Agafonkin
88a5de2aa6 ignore flipped glyphs when placing labels for perf 2014-05-27 18:49:18 +03:00
Vladimir Agafonkin
6ab1dcbeeb remove some leftover code 2014-05-27 18:19:24 +03:00
Vladimir Agafonkin
d1df6c9ee7 underscale by 1 zoom level instead of 3 2014-05-21 14:31:24 +03:00
Konstantin Käfer
9bb0146875 Merge branch 'master' into outdoors-style
Conflicts:
	bin/style.js
2014-05-19 15:52:42 +02:00
Konstantin Käfer
27f8ed29e4 encode icon texture coordinate in buffer so we can render all pois with 1 draw call 2014-05-19 10:48:36 +02:00
Ansis Brammanis
4b2b19ccd3 use separate trees for horizontal and curved labels
from e4186926ed38fc1dc232c70098154251a9019669
2014-05-16 16:06:24 -04:00
Konstantin Käfer
51f523ec14 Merge branch 'master' into outdoors-style
Conflicts:
	bin/style.js
	include/llmr/map/transform.hpp
	src/renderer/painter.cpp
	src/text/placement.cpp
2014-05-14 17:42:10 +02:00
Konstantin Käfer
b167a79c22 always use std:: namespace for math functions
fixes #201
2014-05-14 16:40:24 +02:00
Konstantin Käfer
16ccb08f13 switch back to std::pair, tuples are breaking on travis 2014-05-14 12:38:57 +02:00
Konstantin Käfer
007b27088f add tuple include 2014-05-14 12:24:37 +02:00
Konstantin Käfer
6e0533a355 switch to r*tree and use tuples and bulk inserts 2014-05-14 12:18:51 +02:00
Will Snook
e2ee8abce1 use std::fabs instead of fabs 2014-05-13 13:53:30 -06:00
Will Snook
8d2627e5ef Fix for #195, native maxAngleDelta 2014-05-13 13:07:39 -06:00
Konstantin Käfer
797f590cfb cleanup + unused arguments 2014-04-16 10:55:06 -04:00
Konstantin Käfer
cc8be772f8 don't report warnings in boost 2014-04-16 10:26:55 -04:00
Konstantin Käfer
bb5152d851 add libboost back to build system 2014-04-09 16:18:23 -04:00
Konstantin Käfer
9621038d8a implement alwaysVisible 2014-03-24 17:38:10 +01:00