Commit Graph

180 Commits

Author SHA1 Message Date
Konstantin Käfer
7a4a833f39 Revert "background grid"
This reverts commit 1dd3fdfba3.
2014-06-03 17:29:27 +02:00
Konstantin Käfer
331b726db4 fix comparison order error 2014-06-03 00:00:15 +02:00
Konstantin Käfer
bd4da29a30 Merge branch 'master' into expressions 2014-06-02 23:10:50 +02:00
Justin R. Miller
1dd3fdfba3 background grid 2014-06-02 11:42:00 -07:00
Konstantin Käfer
3c26f53e63 generalize variant comparison and add more operators 2014-06-02 13:50:25 +02:00
Konstantin Käfer
dd4c8a67ba add explicit true type == "no filter" 2014-06-02 11:14:09 +02:00
Konstantin Käfer
99b6a700ef move both variant options to recursive_wrapper 2014-06-02 11:14:09 +02:00
Konstantin Käfer
1d3d0bd85c add missing files 2014-06-02 11:14:09 +02:00
Konstantin Käfer
606ad56220 implement nested expression parsing 2014-06-02 11:14:09 +02:00
Konstantin Käfer
3bc5e03253 simple expression support 2014-06-02 11:14:09 +02:00
Justin R. Miller
38dd25a85a fixes #279: remove forced rotation animations for now 2014-06-01 18:00:28 -07:00
Justin R. Miller
e5a78c931a make some more getter functions constant 2014-06-01 15:32:03 -07:00
Justin R. Miller
4d66a51d22 get rid of brittle hardcoded style toggling method
Conflicts:
	ios/mapbox-gl-cocoa
2014-06-01 11:20:55 -07:00
Justin R. Miller
a81a336638 programmatic styling API 2014-05-31 11:32:42 -07:00
Konstantin Käfer
d5e63cea21 retain the uv loop until all things deconstructed
fixes #261
2014-05-30 17:32:09 +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
Young Hahn
6e53a0328b Remove VectorTileGlyph, VectorTileFace, IndexedFaces, Faces and glyph related parts of vector_tile.proto. Refs #274. 2014-05-29 22:54:46 -04:00
Dane Springmeyer
f83f4a6d63 include <memory> / fix compile issues with g++-4.9 2014-05-29 12:16:25 -07:00
Young Hahn
86ae823306 Merge branch 'glyphrange-boost-locale' into glyphrange-yh-guesses
Conflicts:
	src/map/tile_parser.cpp
	src/text/glyph_store.cpp
2014-05-29 06:06:57 -04:00
Young Hahn
d82acee8c7 Stash. 2014-05-29 05:05:48 -04:00
Konstantin Käfer
ed7b86a134 add glyph store and load glyph pbfs 2014-05-28 20:51:13 +02:00
Konstantin Käfer
5b38927c5f use an unordered map for bucket name => bucket 2014-05-28 14:54:54 +02:00
Justin R. Miller
3c5a2c7935 disallow/undo rotation at low zooms and near world edge 2014-05-23 18:24:58 -07:00
Justin R. Miller
07e15927af remove unneeded headers 2014-05-23 11:29:58 -07:00
Justin R. Miller
1ff173a049 fixes #48: constrain min zoom/vertical pan to within world 2014-05-22 16:11:21 -07: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
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
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
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
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
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
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
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