Commit Graph

376 Commits

Author SHA1 Message Date
Konstantin Käfer
d89df4042f Merge branch 'master' into outdoors-style 2014-05-14 13:01:26 +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
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
32b21b050f do not define variables until they're needed 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
Eden Halperin
ee230c1c98 revert pixel ratio multiplier 2014-05-13 16:11:45 -07:00
Eden Halperin
017cf45ee2 new tile endpoint, fix landcover 2014-05-13 16:04:47 -07:00
Will Snook
e2ee8abce1 use std::fabs instead of fabs 2014-05-13 13:53:30 -06:00
Justin R. Miller
3a7914261e fix erroneous abort of raster rendering 2014-05-13 12:28:54 -07:00
Will Snook
8d2627e5ef Fix for #195, native maxAngleDelta 2014-05-13 13:07:39 -06: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
2135f855d1 do not define variables until they're needed 2014-05-13 18:41:37 +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
7bfcde4025 split up painter into multiple files 2014-05-13 15:37:45 +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
Eden Halperin
ec90ccd358 update sprite pointer and fix marine_label 2014-05-12 15:42:18 -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
d9d9b281c4 disable texture deleting for now 2014-05-12 18:25:58 +02:00
Konstantin Käfer
6ebb4c21f7 clean up gl::group() structure 2014-05-12 18:25:48 +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
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
Eden Halperin
11c8be6f94 start of outdoors style 2014-05-08 16:55:00 -07:00
Konstantin Käfer
ee55798842 remove debug code and use unary visitor directly 2014-05-08 13:44:31 +02:00
Konstantin Käfer
7f4f327166 make sure we're not converting too relaxedly 2014-05-08 13:42:54 +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
93e0c49faa add variant test 2014-05-02 13:41:45 +02:00
Justin R. Miller
7010954229 refs #159: fix bug with filtering on numeric layer values 2014-05-02 11:18:59 +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
4ac34b49a0 there's no need to reset the image data 2014-05-02 10:25:58 +02:00
Justin R. Miller
e56a8113e7 fix animation duration casting errors 2014-05-01 12:20:39 -07: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
e95ece8333 fix sprite rendering 2014-04-30 13:05:04 +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
fcfd506a3c fix rendering + build 2014-04-30 12:09: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
ddc359f006 add more timers to headless test 2014-04-25 17:04:22 +02:00