Commit Graph

52 Commits

Author SHA1 Message Date
Leith Bade
6c5331ee73 Add more detail to TileJSON error 2014-11-08 02:29:07 +11:00
Konstantin Käfer
40a933ddce add missing header 2014-10-22 18:22:43 +02:00
Konstantin Käfer
214f99673f fix variable shadowing 2014-10-22 18:19:01 +02:00
Konstantin Käfer
19129cbd02 make SourceInfo object noncopyable and use a shared_pointer for it 2014-09-24 16:16:29 +02:00
Konstantin Käfer
f26bb724dc use util::ptr as a wrapper around std::shared_ptr that asserts nonemptiness 2014-09-24 16:14:09 +02:00
Konstantin Käfer
d9fc7708a2 do 304 requests and cache them in sqlite 2014-09-24 16:14:09 +02:00
John Firebaugh
896379daa5 Refactor tile cover to match JS 2014-09-22 13:39:43 -07:00
Konstantin Käfer
0f73a0192e Merge pull request #439 from mapbox/clipping
Compute unique clip IDSs per tile
2014-08-26 17:42:53 +02:00
John Firebaugh
3d9a293258 Support for Mapbox fontstack API 2014-08-22 17:14:51 -07:00
Lauren Budorick
0168612ed3 Load TileJSON; support inline TileJSON sources
Fixes #412
Refs https://github.com/mapbox/mapbox-gl-style-spec/pull/143
2014-08-21 16:12:27 -07:00
Konstantin Käfer
863b4577e4 compute unique clip ids per tile, taking covering children into account
fixes #206
fixes #220
refs #229
2014-08-21 15:02:08 +02:00
Konstantin Käfer
22e179aa37 remove trailing whitespace
[skip ci]
2014-08-12 16:30:27 +02:00
Lauren Budorick
1ad2f26b9d VICTORY 2014-08-11 12:13:23 -07:00
Lauren Budorick
510aaef07f render single tile in source.cpp 2014-08-11 12:13:23 -07:00
Konstantin Käfer
9ed0ca5983 pass SourceInfo object to TileData so that we can not skip buckets that appear later than the source maxzoom 2014-07-17 15:52:39 -07:00
Konstantin Käfer
3141b8b1f7 refactor source information into SourceInfo object 2014-07-17 15:37:18 -07:00
Konstantin Käfer
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00
Konstantin Käfer
8b775573c1 move std::erase_if => util::erase_if 2014-07-14 15:01:45 -07:00
Mike Morris
4590adc115 break out StyleSource from Source, move getActiveSources and
updateSources into Map::Map, move getAccessToken from Style to Map

Conflicts:
	include/llmr/style/style.hpp
	src/map/source.cpp
	src/style/style_layer.cpp
	src/style/style_parser.cpp
2014-07-10 17:12:02 -07:00
Konstantin Käfer
795496053b Merge branch 'master' into access_token
Conflicts:
	src/map/source.cpp
2014-07-10 10:46:35 -07:00
Justin R. Miller
98a415416a move to per-map access token 2014-07-09 17:18:36 -07:00
Konstantin Käfer
22c8afced5 replace {{token}} with {token}, and %d/%d/%d with {z}/{x}/{y}
refs https://github.com/mapbox/mapbox-gl-style-spec/pull/87
2014-07-09 16:27:23 -07:00
John Firebaugh
815f8be96e Use API v4 and access tokens 2014-07-08 13:16:38 -07:00
Konstantin Käfer
af87fb6c26 load glyphset url from stylesheet 2014-07-02 12:10:09 +02:00
Konstantin Käfer
d75f0075f3 even more refactoring 2014-06-27 16:42:44 +02:00
Konstantin Käfer
ba4294ae0c saving current state 2014-06-23 18:05:25 +02:00
Konstantin Käfer
7a4a833f39 Revert "background grid"
This reverts commit 1dd3fdfba3.
2014-06-03 17:29:27 +02:00
Justin R. Miller
1dd3fdfba3 background grid 2014-06-02 11:42:00 -07:00
Konstantin Käfer
53a6992728 fix alpha blending + add depth/stencil buffers 2014-05-21 18:34:41 +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
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
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
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
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
1216a061d3 move to libuv for the rendering loop 2014-04-30 12:01:26 +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
797f590cfb cleanup + unused arguments 2014-04-16 10:55:06 -04:00
Konstantin Käfer
0367dbe8c7 use unique_ptrs and fix compile on mapnik 2014-04-15 12:24:15 -07:00
Konstantin Käfer
5792b04496 remove unused variable 2014-04-15 14:31:21 -04:00
Konstantin Käfer
7c6bf7d854 fix initialization order 2014-04-15 14:31:15 -04:00
Konstantin Käfer
3c656d2bf2 add debug markers for easier gl debugging 2014-04-15 14:30:05 -04:00
Konstantin Käfer
746224a2ae load the normalized_id rather than the logical id 2014-04-15 12:46:28 -04:00
Konstantin Käfer
78c10c0701 Merge remote-tracking branch 'remotes/origin/pr/127'
Conflicts:
	include/llmr/map/map.hpp
	src/map/map.cpp
	src/platform/platform.cpp
2014-04-15 12:46:19 -04:00
Justin R. Miller
228ce33278 cleanup APIs a bit 2014-04-09 11:59:27 -07:00
Justin R. Miller
e5713f31a6 move to raster buckets & tile parser handling raster decoding 2014-04-09 11:38:42 -07:00
Justin R. Miller
1215f6f1fe refs #101: data sources with styling
* add second, satellite class to stylesheet
 * get rid of tile clipping masks for now
 * flesh out raster styling properties
2014-04-04 13:24:11 -07:00