Commit Graph

224 Commits

Author SHA1 Message Date
Konstantin Käfer
580527a16c use token replacement for icon property as well
fixes #300
2014-06-04 10:58:11 +02:00
Konstantin Käfer
2eb948115d only draw points when there actually are linejoins 2014-06-03 18:11:07 +02:00
Konstantin Käfer
7a4a833f39 Revert "background grid"
This reverts commit 1dd3fdfba3.
2014-06-03 17:29:27 +02:00
Justin R. Miller
1dd3fdfba3 background grid 2014-06-02 11:42:00 -07:00
Justin R. Miller
30aa378731 use a black matte instead of yellow 2014-06-01 19:37:56 -07:00
Konstantin Käfer
67bbcd5334 allow setting prerender state with a function too 2014-06-01 18:12:44 +02:00
Konstantin Käfer
1be972eb15 Allow property functions for prerender properties, but tie them to the tile's zoom level instead of the map zoom level
fixes #253
2014-06-01 17:43:12 +02:00
Konstantin Käfer
78fda8bb62 make sure we retain shared state when destructing the map object
refs #261
2014-05-30 17:00:47 +02:00
Konstantin Käfer
31d9dbefea pass shaping directly instead of looking it up 2014-05-30 14:01:53 +02:00
Konstantin Käfer
461a19dfa2 fallback to default properties instead of not rendering when we don't have a style
refs #272
2014-05-30 13:36:53 +02:00
Dane Springmeyer
f5394a7638 release mode: silent debug output + ifdef any potentially expensive calls 2014-05-29 18:07:19 -07:00
Young Hahn
72a71c6f70 Lookup shaping value by string key. Refs #272. 2014-05-29 12:13:56 -04:00
Young Hahn
d82acee8c7 Stash. 2014-05-29 05:05:48 -04:00
Konstantin Käfer
cca9d81ee7 add debug warnings 2014-05-28 15:51:09 +02:00
Konstantin Käfer
e304f6629f only change pass parameters if we actually need to 2014-05-28 09:47:55 +02:00
Vladimir Agafonkin
6ab1dcbeeb remove some leftover code 2014-05-27 18:19:24 +03:00
Konstantin Käfer
1b58fb30a3 use unordered map, don't make copies (auto usage!) and swap maps 2014-05-26 18:40:47 +02:00
Konstantin Käfer
3a9f353a1e move a view calls to generic functions 2014-05-26 16:33:38 +02:00
Konstantin Käfer
2029763b71 only blur if we actually need to 2014-05-26 16:11:23 +02:00
Konstantin Käfer
e40ed2729d use lambda initialization for matrix 2014-05-26 15:43:12 +02:00
Konstantin Käfer
2d0037b112 don't respect opacity when prerendering tile; we do opacity at composite-time 2014-05-26 15:38:51 +02:00
Konstantin Käfer
6350dc5235 move blurring to texture object 2014-05-26 13:31:51 +02:00
Konstantin Käfer
e3e982acd8 respect the prerendered-* stylesheet values 2014-05-26 12:44:35 +02:00
Konstantin Käfer
e506d6bcdd generalize stylesheet parse function 2014-05-26 12:30:27 +02:00
Konstantin Käfer
991eeaf24e fix blur fringes 2014-05-26 10:59:00 +02:00
Konstantin Käfer
889ef68b5b first draft at blurring 2014-05-23 18:30:49 +02:00
Konstantin Käfer
ba17d2cffc no need to use nonpremultiplied alpha blending 2014-05-22 15:17:26 +02:00
Konstantin Käfer
e1a59e0ae8 ifdef => if 2014-05-22 14:48:09 +02:00
Konstantin Käfer
6ae0b71bbb fix framebuffer drawing on ios 2014-05-22 14:15:51 +02:00
Konstantin Käfer
67ab9ff6f5 add cleanup call for destroying framebuffers 2014-05-22 12:41:17 +02:00
Konstantin Käfer
5bf52bfcd7 fix compile on ios 2014-05-22 12:28:19 +02:00
Konstantin Käfer
53a6992728 fix alpha blending + add depth/stencil buffers 2014-05-21 18:34:41 +02:00
Konstantin Käfer
16a79b42ca show tile parse warnings 2014-05-21 14:18:25 +02:00
Konstantin Käfer
13939b26d9 first shot at composited blending
still missing:
- stencil+depth mask
- alpha compositing
2014-05-21 10:55:09 +02:00
Ansis Brammanis
2c1d4c4678 fix "bumped" zoom for label fading
fixes #138
2014-05-20 20:14:47 -04:00
Ansis Brammanis
362c055aa6 remove line causing flickering 2014-05-20 20:08:32 -04:00
Justin R. Miller
550e381e70 name text halo properties like others 2014-05-20 11:26:52 -07:00
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
898c6d6714 fix for retina screens 2014-05-19 11:13:22 +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
01183a0a19 fix remaining cases of point => icon 2014-05-15 18:09:00 +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
fda64b67af rename point => icon 2014-05-15 14:51:02 +02:00
Konstantin Käfer
aeae6248ad simplify point shader in preparation for #196 2014-05-15 14:27:49 +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
a9d559fe51 return refs to avoid matrix allocation/deallocation for untranslated layers
refs #189
2014-05-14 17:21:51 +02:00
Konstantin Käfer
a27f8798ff add translate-anchor: viewport to lines + points
refs #189
2014-05-14 17:17:47 +02:00