Commit Graph

24 Commits

Author SHA1 Message Date
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
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
Mike Morris
3442403e67 parse maxWidth, lineHeight and alignment, pass to FontStack::getShaping 2014-05-30 00:07:22 -04: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
d82acee8c7 Stash. 2014-05-29 05:05:48 -04: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
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
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
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
Konstantin Käfer
5c11bcf5c0 don't treat negative values as placement failure 2014-03-24 17:15:54 +01:00
Konstantin Käfer
67a8882457 use the correct glyphs 2014-03-24 11:13:20 +01:00
Konstantin Käfer
4ee0cf1791 port remainder of the the placement algorithm 2014-03-19 18:58:50 +01:00