Commit Graph

1168 Commits

Author SHA1 Message Date
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
Konstantin Käfer
afc54b7956 add translate-anchor for fills 2014-05-14 16:51:27 +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
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
c93af5cfb3 Merge branch 'master' into outdoors-style 2014-05-14 13:44:49 +02:00
Konstantin Käfer
ac9a678ce5 fix lock initialization
background: for non-debug builds, assert() gets compiled away, so the locks are not initialized
2014-05-14 13:41:55 +02:00
Konstantin Käfer
3514538719 make text layers respect the translate-anchor
you can now specify "translate-anchor": "viewport" to have the text translated
in screen coordinates rather than relative to the tile. The default value
remains "translate-anchor": "map"

refs #189
2014-05-14 10:31:57 +02:00
Konstantin Käfer
d97e8899ae add translate-anchor property 2014-05-14 10:31:57 +02:00
Konstantin Käfer
05a330f347 make translate property zoom independent
if you want a zoom-dependent translation, you can use a function

refs #189
2014-05-14 10:31:57 +02:00
Konstantin Käfer
c8a3b916b3 make text layers respect the translate-anchor
you can now specify "translate-anchor": "viewport" to have the text translated
in screen coordinates rather than relative to the tile. The default value
remains "translate-anchor": "map"

refs #189
2014-05-13 19:02:22 +02:00
Konstantin Käfer
b3a1e35f44 add translate-anchor property 2014-05-13 18:41:22 +02:00
Konstantin Käfer
632c5f982c make translate property zoom independent
if you want a zoom-dependent translation, you can use a function

refs #189
2014-05-13 16:48:23 +02:00
Konstantin Käfer
5135c59b71 Merge branch 'master' into outdoors-style
Conflicts:
	bin/style.js
	src/map/map.cpp
2014-05-13 16:18:52 +02:00
Konstantin Käfer
b096373b71 abort rendering early if the style is disabled
refs #184
2014-05-13 15:15:54 +02:00
Konstantin Käfer
ab71db336c move tiles to std::map for faster lookups 2014-05-13 12:20:59 +02:00
Konstantin Käfer
d8fa9aa322 move weak_ptr list of tile_data objects to a map for faster lookups 2014-05-13 12:01:29 +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
23382f9267 Revert "refs #166: fix for std::stoll et al. not handling strings"
This reverts commit 54d5f474c8.
2014-05-12 17:09:06 -07:00
Justin R. Miller
54d5f474c8 refs #166: fix for std::stoll et al. not handling strings 2014-05-12 14:07:07 -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
2b14579986 only paint layer if it has data
refs #184
2014-05-12 19:08:59 +02:00
Konstantin Käfer
6136ab6d21 draw by layer, not by tile
This is needed for correctly compositing raster imagery into the map

fixes #122
fixes #157
2014-05-12 17:13:26 +02:00
Konstantin Käfer
604e558d46 add missing include header 2014-05-10 10:32:30 +02:00
Eden Halperin
db013095e9 update style with labels 2014-05-09 16:51:09 -07: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
d59aedc372 don't show warnings in boost 2014-05-08 13:43:34 +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
artemp
40e3372b80 variant : add binary visitation support 2014-05-05 12:54:17 +01:00
Konstantin Käfer
ab22f68970 fix comment 2014-05-02 10:30:52 +02:00
Konstantin Käfer
6574f0d188 add setAngle() call with duration 2014-05-02 10:28:47 +02:00
Konstantin Käfer
485a9a40bc formatting 2014-05-02 10:25:58 +02:00
Konstantin Käfer
449f403e87 rename animation => transition 2014-04-30 14:46:28 +02:00
Konstantin Käfer
52cd9a6561 update framehistory to use nanosecond timestamps 2014-04-30 14:25:57 +02:00
Konstantin Käfer
4afe20776d move animation time api to use nanoseconds 2014-04-30 14:20:15 +02:00
Konstantin Käfer
9bbdba9eab remove concept of settings object from library 2014-04-30 13:47:03 +02:00
Konstantin Käfer
74768abeb8 make sure we call the sprite load callback 2014-04-30 12:58:38 +02:00
Konstantin Käfer
f683cbf02a hide atomic flags as implementation detail 2014-04-30 12:29:50 +02:00
Konstantin Käfer
1216a061d3 move to libuv for the rendering loop 2014-04-30 12:01:26 +02:00
Konstantin Käfer
ddc359f006 add more timers to headless test 2014-04-25 17:04:22 +02:00
Konstantin Käfer
3d69e38a1c require explicit initialization to point devs toward empty timer names 2014-04-25 16:14:15 +02:00
Konstantin Käfer
3e92f36afc fix headless test case 2014-04-25 16:12:03 +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
a0d935eac7 unify request object to use uv_queue_work for both corefoundation + curl 2014-04-24 17:39:19 +02:00