Commit Graph

7032 Commits

Author SHA1 Message Date
Konstantin Käfer
ea6b24d02d add text rendering code 2014-03-21 17:36:29 +01:00
Konstantin Käfer
a7b9b96d4d add textshader 2014-03-21 14:26:25 +01:00
Konstantin Käfer
3413ee536d Merge branch 'master' into sdf
Conflicts:
	include/llmr/map/tile_data.hpp
	include/llmr/shader/shaders.hpp
	src/map/map.cpp
	src/map/tile_data.cpp
	src/platform/platform.cpp
	src/shader/shaders.cpp
2014-03-21 13:36:32 +01:00
Konstantin Käfer
0730ca640b get rid of float division 2014-03-21 13:32:03 +01:00
Konstantin Käfer
a4cda4ce20 fix Tile::parent() for negative x coords 2014-03-21 13:17:42 +01:00
Justin R. Miller
acd95168eb re-bind texture in right circumstances 2014-03-19 14:26:15 -07:00
Justin R. Miller
4dc6aa9aec don't attempt texture binding before the texture pool is setup 2014-03-19 14:22:00 -07:00
Konstantin Käfer
4ee0cf1791 port remainder of the the placement algorithm 2014-03-19 18:58:50 +01:00
Justin R. Miller
00a3245ce8 fixes #70: raster tile rendering as toggleable mode from vector 2014-03-18 16:57:17 -07:00
Konstantin Käfer
98bb797a4a explicit names 2014-03-18 17:57:51 +01:00
Konstantin Käfer
25ff0b253f merge vec2 and Coordinate 2014-03-18 17:57:09 +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
88af0b8b6c add interpolate function 2014-03-17 13:00:44 +01:00
Konstantin Käfer
e8db54367f add rotation range tests 2014-03-17 12:32:53 +01:00
Konstantin Käfer
85449e097c add gtest 2014-03-17 12:32:27 +01:00
Konstantin Käfer
168ee4659e rename text shader file 2014-03-17 12:31:13 +01:00
Konstantin Käfer
10c72f811d port rotationrange.js (still missing tests) 2014-03-14 18:23:38 +01:00
Konstantin Käfer
56e06f527c remove unused glyphs from atlas again 2014-03-14 12:50:28 +01:00
Konstantin Käfer
3c5bac0f6b add debug window showing the glyph atlas 2014-03-14 12:43:42 +01:00
Konstantin Käfer
99cef810ac move tile parsing to its own object 2014-03-14 11:36:10 +01:00
Konstantin Käfer
be44b6b31f add glyph atlas to map 2014-03-14 11:36:10 +01:00
Konstantin Käfer
d9589573bc extract label shaping 2014-03-14 11:36:10 +01:00
Konstantin Käfer
df56f9fbce they return bool values 2014-03-14 11:36:10 +01:00
Konstantin Käfer
ceb75b7b26 use feature_type to distinguish between geometry type and bucket type 2014-03-14 11:36:10 +01:00
Konstantin Käfer
29e4ecb977 add text styling 2014-03-14 11:36:10 +01:00
Konstantin Käfer
45c341b414 use external library 2014-03-14 11:36:10 +01:00
Konstantin Käfer
a26ddf8bce parse feature objects so that we can access all tags 2014-03-14 11:36:10 +01:00
Konstantin Käfer
117078270d add text buffer code 2014-03-14 11:36:10 +01:00
Konstantin Käfer
a37dcedc41 parse label shaping 2014-03-14 11:36:10 +01:00
Konstantin Käfer
31d3c6339c parse faces 2014-03-14 11:36:10 +01:00
Konstantin Käfer
9f1a53743a fix binpack compile 2014-03-14 11:36:10 +01:00
Konstantin Käfer
8171c7bb43 add empty classes for rendering glyphs 2014-03-14 11:36:10 +01:00
Konstantin Käfer
f8a096a4fa use templated function to reduce code 2014-03-14 11:36:10 +01:00
Konstantin Käfer
f0b821dff9 add glyph atlas class 2014-03-14 11:36:09 +01:00
Konstantin Käfer
bdfa761c39 remove code duplication between osx/glfw and linux/glfw programs 2014-03-14 11:33:45 +01:00
Konstantin Käfer
4f03b43ab2 remove reference to boost 2014-03-14 10:53:34 +01:00
Konstantin Käfer
7a34534aca remove reference to style pbf 2014-03-14 10:52:42 +01:00
Konstantin Käfer
86e6e6bed8 use a custom struct for Tile IDs 2014-03-12 16:42:37 +01:00
Konstantin Käfer
8fd4d855d5 move shader classes to separate folder 2014-03-12 15:25:39 +01:00
Konstantin Käfer
277bc1586d add constants and move style parser to its own class 2014-03-12 13:26:24 +01:00
Konstantin Käfer
207358b598 change datasource => source for compliance with js 2014-03-12 12:46:28 +01:00
Konstantin Käfer
72ac0c9c31 use external library 2014-03-12 12:43:18 +01:00
Konstantin Käfer
b3e9a1b42c make sure color values are lowercased 2014-03-12 11:48:49 +01:00
Konstantin Käfer
c44d056c24 respect style background color 2014-03-12 11:42:17 +01:00
Konstantin Käfer
e1868194d9 Merge pull request #96 from mapbox/json-style
Parse JSON stylesheet
2014-03-12 11:29:55 +01:00
Konstantin Käfer
26a91d29f5 remove unneeded file 2014-03-12 11:24:58 +01:00
Konstantin Käfer
91d42911fb parse the json stylesheet 2014-03-12 11:23:01 +01:00