Konstantin Käfer
238fe86571
partially revert 6136ab6d21
...
background: we are doing separate opaque/translucent passes per composite layer
and then we're compositing them in the translucent phase
2014-05-21 10:53:40 +02:00
Eden Halperin
d0b885694d
fix labels
2014-05-19 15:29:56 -07:00
Ansis Brammanis
2b348ccfd4
Merge branch 'master' of github.com:mapbox/llmr-native
2014-05-19 17:36:50 -04:00
Ansis Brammanis
4d38e4eb15
fix rotation range check in text shader
...
fixes #215
2014-05-19 17:35:55 -04:00
Eden Halperin
84ebbcd851
use mapbox streets v5
2014-05-19 07:27:09 -07: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
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
Ansis Brammanis
4b2b19ccd3
use separate trees for horizontal and curved labels
...
from e4186926ed38fc1dc232c70098154251a9019669
2014-05-16 16:06:24 -04:00
Ansis Brammanis
264bcd34d9
flush command buffers when done
2014-05-16 14:04:12 -04: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
b167a79c22
always use std:: namespace for math functions
...
fixes #201
2014-05-14 16:40:24 +02:00
Konstantin Käfer
d89df4042f
Merge branch 'master' into outdoors-style
2014-05-14 13:01:26 +02:00
Eden Halperin
017cf45ee2
new tile endpoint, fix landcover
2014-05-13 16:04:47 -07:00
Justin R. Miller
3a7914261e
fix erroneous abort of raster rendering
2014-05-13 12:28:54 -07: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
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
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
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
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
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
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
Justin R. Miller
a324929ba3
clarify comment for gestures as well
2014-04-22 15:02:44 -07:00
Konstantin Käfer
b119aa92d8
remove Settings object from Painter
2014-04-16 16:45:09 -04:00
Konstantin Käfer
797f590cfb
cleanup + unused arguments
2014-04-16 10:55:06 -04:00
Konstantin Käfer
74cb7edb5b
remove more unused variables
2014-04-16 10:47:09 -04:00
Konstantin Käfer
1b922e3a34
remove start_x/y variables, they're unused
2014-04-16 10:46:52 -04:00
Konstantin Käfer
05f8039981
Merge branch 'master' of github.com:mapbox/llmr-native
2014-04-15 18:47:59 -04:00
Konstantin Käfer
b414cbea44
automatically derive fb dimensions
2014-04-15 18:45:15 -04:00