Commit Graph

77 Commits

Author SHA1 Message Date
Konstantin Käfer
7d73d158ba incorporate the color and draw circle dots if we don't have an icon 2014-05-19 16:19:51 +02: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
f848868c16 fix texture binding 2014-05-19 14:18:29 +02:00
Konstantin Käfer
13575330f7 use sprite atlas 2014-05-19 10:48:36 +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
4c99014a13 don't use fractional texture coordiantes in the shader 2014-05-15 15:16:34 +02:00
Konstantin Käfer
27b695b068 use explicit constructors 2014-05-15 14:56:06 +02:00
Konstantin Käfer
fda64b67af rename point => icon 2014-05-15 14:51:02 +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
a27f8798ff add translate-anchor: viewport to lines + points
refs #189
2014-05-14 17:17:47 +02:00
Konstantin Käfer
afc54b7956 add translate-anchor for fills 2014-05-14 16:51:27 +02:00
Konstantin Käfer
790b6cbdb3 add strokeBlur property (default 1.0, larger values blur more) to achieve a gradient effect
fixes #194
2014-05-14 15:27:49 +02:00
Konstantin Käfer
a812f37c60 make sure to premultiply the colors during stylesheet parsing
fixes #193
2014-05-14 15:05:59 +02:00
Konstantin Käfer
2d938f2ec2 make sure to premultiply the colors during stylesheet parsing
fixes #193
2014-05-14 15:04:33 +02:00
Konstantin Käfer
d97e8899ae add translate-anchor property 2014-05-14 10:31:57 +02:00
Konstantin Käfer
b3a1e35f44 add translate-anchor property 2014-05-13 18:41:22 +02:00
Konstantin Käfer
b096373b71 abort rendering early if the style is disabled
refs #184
2014-05-13 15:15:54 +02:00
Justin R. Miller
654520ea34 Revert "refs #166: fix for std::stoll et al. not handling strings"
This reverts commit bc29ed5a9c.
2014-05-12 17:14:28 -07:00
Justin R. Miller
bc29ed5a9c refs #166: fix for std::stoll et al. not handling strings 2014-05-12 14:00:10 -07:00
Konstantin Käfer
263c887777 don't try to render layers that do not produce anyting during the current render pass
refs #184
2014-05-12 19:53:06 +02:00
Konstantin Käfer
604e558d46 add missing include header 2014-05-10 10:32:30 +02:00
Konstantin Käfer
0bfd7b0f43 Calculate clip IDs with a huffman prefix tree
This changes the clip IDs from sequential to a huffman prefix tree, meaning that
parent tiles share the same prefix with child tiles (but are shorter). This allows
us to use the same checkerboard pattern to draw all tiles.

TODO:
- make sure we're not overflowing the 8 bit limit of the stencil buffer
- draw all checkerboard fields at the same time, with one draw call
- fix raster drawing (fading, clipping)

refs #132
2014-05-09 18:10:28 +02:00
Konstantin Käfer
7f4f327166 make sure we're not converting too relaxedly 2014-05-08 13:42:54 +02:00
Konstantin Käfer
115afe3b10 add relaxed comparsion function + tests 2014-05-08 13:03:59 +02:00
Justin R. Miller
2b9fbb0731 squashed stylequest merge
* uses OSM Bright style
 * adds dot shader
 * adds layer translation
 * adds dashed line support
 * adds style array parsing
 * improves background layer parsing
 * improves style constant parsing
 * fixes sprite JSON pixel ratio parsing
2014-05-07 10:37:25 -07:00
Konstantin Käfer
74768abeb8 make sure we call the sprite load callback 2014-04-30 12:58:38 +02:00
Konstantin Käfer
1216a061d3 move to libuv for the rendering loop 2014-04-30 12:01:26 +02:00
Konstantin Käfer
666f593803 use an event loop per map that is not the render thread 2014-04-25 14:26:59 +02:00
Konstantin Käfer
78c10c0701 Merge remote-tracking branch 'remotes/origin/pr/127'
Conflicts:
	include/llmr/map/map.hpp
	src/map/map.cpp
	src/platform/platform.cpp
2014-04-15 12:46:19 -04:00
Konstantin Käfer
eb499e77c1 fix linejoin drawing on retina 2014-04-10 11:49:43 -04:00
Justin R. Miller
e5713f31a6 move to raster buckets & tile parser handling raster decoding 2014-04-09 11:38:42 -07:00
Justin R. Miller
1215f6f1fe refs #101: data sources with styling
* add second, satellite class to stylesheet
 * get rid of tile clipping masks for now
 * flesh out raster styling properties
2014-04-04 13:24:11 -07:00
Justin R. Miller
2eca1c419b add support for background opacity in style 2014-04-02 16:09:31 -07:00
Konstantin Käfer
0c6f993695 add min/max functions and refactor FunctionProperty
fixes #83
2014-03-26 12:21:33 +01:00
Konstantin Käfer
e427f51dd4 remove generated files 2014-03-25 13:25:35 +01:00
Konstantin Käfer
166305fb14 change hidden to enabled
refs #83
2014-03-25 13:23:51 +01:00
Konstantin Käfer
9621038d8a implement alwaysVisible 2014-03-24 17:38:10 +01:00
Konstantin Käfer
75cd64de58 add toString method for Value variant 2014-03-24 14:47:21 +01:00
Konstantin Käfer
c00ec64205 exponential functions 2014-03-24 14:45:33 +01:00
Konstantin Käfer
ea6b24d02d add text rendering code 2014-03-21 17:36:29 +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
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
d9589573bc extract label shaping 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
277bc1586d add constants and move style parser to its own class 2014-03-12 13:26:24 +01:00
Konstantin Käfer
c44d056c24 respect style background color 2014-03-12 11:42:17 +01:00
Konstantin Käfer
91d42911fb parse the json stylesheet 2014-03-12 11:23:01 +01:00
Konstantin Käfer
4de8674f20 Merge branch 'variant' 2014-03-11 11:55:00 +01:00
Konstantin Käfer
e382cab17d make implicit type conversions explicit 2014-02-21 13:08:13 +01:00