Commit Graph

436 Commits

Author SHA1 Message Date
Konstantin Käfer
ed7b86a134 add glyph store and load glyph pbfs 2014-05-28 20:51:13 +02:00
Konstantin Käfer
1749aa3de2 switch to glyph/shaping-less endpoint 2014-05-28 15:51:29 +02: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
Konstantin Käfer
4ad3a1ee76 Merge branch 'master' into blur
Conflicts:
	src/shader/shaders_gl.cpp
	src/shader/shaders_gles2.cpp
2014-05-26 17:30:31 +02:00
Konstantin Käfer
9b5c75cef0 add isVisible function to Properties 2014-05-26 15:34:50 +02:00
Justin R. Miller
661860d12f foundations of delegate/callback API 2014-05-23 18:32:55 -07:00
Justin R. Miller
3c5a2c7935 disallow/undo rotation at low zooms and near world edge 2014-05-23 18:24:58 -07:00
Konstantin Käfer
889ef68b5b first draft at blurring 2014-05-23 18:30:49 +02:00
Justin R. Miller
3f55302fb5 reset angle on resize to small zooms 2014-05-22 16:54:04 -07:00
Justin R. Miller
dbd877cb80 disallow/undo rotation at low zooms 2014-05-22 16:47:17 -07:00
Justin R. Miller
1ff173a049 fixes #48: constrain min zoom/vertical pan to within world 2014-05-22 16:11:21 -07:00
Justin R. Miller
12594ce8f1 clearer comments 2014-05-22 14:24:54 -07:00
Justin R. Miller
bccba97020 style cascading needs to happen every render for transitions 2014-05-22 14:22:54 -07:00
Justin R. Miller
aa92e92595 support for style transitions 2014-05-22 12:46:53 -07:00
Konstantin Käfer
084e7af377 better sprite warnings 2014-05-22 15:19:51 +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
bb2cda34a7 make sure we're not calling functions that aren't threadsafe 2014-05-22 12:12: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
834ef2eee8 don't require a style for composited layers 2014-05-21 13:40:59 +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
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