Commit Graph

37 Commits

Author SHA1 Message Date
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
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
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
Konstantin Käfer
98bb797a4a explicit names 2014-03-18 17:57:51 +01:00
Konstantin Käfer
6c61fb7fa5 missing braces 2014-03-17 16:58:26 +01:00
Konstantin Käfer
bed8de2ad6 force explicit types 2014-03-17 16:58:04 +01:00
Konstantin Käfer
bf6a6001f9 format fixes 2014-03-17 16:54:14 +01:00
Konstantin Käfer
1f2c71ec8b port of collision class 2014-03-17 16:53:40 +01:00
Konstantin Käfer
e8db54367f add rotation range tests 2014-03-17 12:32:53 +01:00
Konstantin Käfer
10c72f811d port rotationrange.js (still missing tests) 2014-03-14 18:23:38 +01:00