Commit Graph

202 Commits

Author SHA1 Message Date
Konstantin Käfer
60229ed7db add color parser 2014-03-11 18:42:01 +01:00
Konstantin Käfer
c5dca2c8a8 change tile size 2014-03-11 12:22:20 +01:00
Konstantin Käfer
f04f42df8f load new tile if it's marked as obsolete 2014-03-11 12:18:47 +01:00
Konstantin Käfer
978b714de8 two render passes
Conflicts:
	resources/style.pbf
	src/renderer/painter.cpp
	src/style/resources.cpp
2014-03-11 12:15:06 +01:00
Konstantin Käfer
a1ebf3f264 move tile size to a cpp file 2014-03-11 12:12:05 +01:00
Konstantin Käfer
420cb58a5d fix pedantic warnings 2014-03-11 12:10:07 +01:00
Konstantin Käfer
b7b2812d30 remove debug uniform 2014-03-11 12:09:39 +01:00
Konstantin Käfer
50d4c97b64 whitespace + comments 2014-03-11 12:09:23 +01:00
Konstantin Käfer
4de8674f20 Merge branch 'variant' 2014-03-11 11:55:00 +01:00
Konstantin Käfer
16b0f82a38 remove debug msg 2014-03-05 17:01:36 +01:00
Konstantin Käfer
b50d69b190 add missing file 2014-03-05 17:01:18 +01:00
Konstantin Käfer
02bd08388a disable debug statement 2014-03-05 17:00:13 +01:00
Konstantin Käfer
69a5c0e15f better support for gles2 2014-03-05 16:58:46 +01:00
Konstantin Käfer
b97a9778ea move tile urls to static consts rather than macros 2014-03-05 16:51:38 +01:00
Konstantin Käfer
1fbaa95b02 fix tile loading 2014-03-05 16:40:07 +01:00
Konstantin Käfer
a3a1b812c8 don't pass around pointers if all we need is the state 2014-03-05 09:56:36 +01:00
Konstantin Käfer
027c6f33b3 implement tile wrapping
fixes #14
2014-03-05 09:40:32 +01:00
Konstantin Käfer
b0ddabd6ac rename Tile to TileData 2014-03-04 17:53:16 +01:00
Konstantin Käfer
ba5070bf52 Port scanline algorithm from _getCoveringTiles()
fixes #22
2014-03-04 14:50:17 +01:00
Konstantin Käfer
ed5e335da1 do not write linejoin fragments to depth buffer 2014-03-04 11:35:37 +01:00
Konstantin Käfer
2c9b766371 resolve integer precision errors 2014-03-04 11:32:23 +01:00
Konstantin Käfer
e85304d510 use depth buffer to avoid writing to opaque fragments 2014-03-04 11:21:42 +01:00
Konstantin Käfer
6ee7506ed9 fix line drawing bug with new vertices from tessellation 2014-03-03 17:33:07 +01:00
Konstantin Käfer
0a6dbc8064 Merge branch 'nostencil'
Conflicts:
	macosx/main.mm
	src/map/map.cpp
2014-03-03 16:02:13 +01:00
Konstantin Käfer
2e0681e2d6 Merge pull request #49 from mapbox/tessellation
Try out tessellating polygons
2014-03-03 15:08:48 +01:00
Konstantin Käfer
f1f146b01e remove thread naming 2014-03-03 13:01:09 +01:00
Konstantin Käfer
f850856cec move requests to global threadpool 2014-03-03 12:55:32 +01:00
Konstantin Käfer
c076da0ae2 make threadpool implementation callback agnostic 2014-03-03 12:26:04 +01:00
Konstantin Käfer
b26f3d319b add threadpool implementation 2014-03-03 12:17:32 +01:00
Konstantin Käfer
6c58101b12 multithreaded curl for linux 2014-03-01 13:05:13 +01:00
Konstantin Käfer
4e73a4d47c Merge branch 'master' into tessellation
Conflicts:
	include/llmr/renderer/fill_bucket.hpp
	src/renderer/fill_bucket.cpp
	src/renderer/painter.cpp
2014-02-28 12:25:45 +01:00
Konstantin Käfer
ae3bd04171 fix include 2014-02-27 16:07:17 +01:00
Konstantin Käfer
eadafede08 use clipper and add missing vertices to avoid missing triangles 2014-02-27 16:00:49 +01:00
Konstantin Käfer
57dafc6d4c do not clear the stencil buffer 2014-02-27 12:23:04 +01:00
Konstantin Käfer
8d68bd73e7 draw a checkerboard stencil clipping mask initially 2014-02-26 12:24:17 +01:00
Konstantin Käfer
f87e21b6e8 Merge branch 'tessellation' into nostencil
Conflicts:
	include/llmr/renderer/fill_bucket.hpp
	src/renderer/painter.cpp
2014-02-26 10:44:09 +01:00
Justin R. Miller
0782cfc5be only log tile errors if not obsolete 2014-02-25 17:15:51 -08:00
Justin R. Miller
55b28aaf65 allow for cancellable request, track in tiles, and cancel when obsolete 2014-02-25 16:33:06 -08:00
Justin R. Miller
0406a82299 add tile state 'loaded' 2014-02-25 15:34:32 -08:00
Justin R. Miller
78ab66b06c rename tile state ready -> parsed 2014-02-25 15:26:12 -08:00
Justin R. Miller
3232ecc94d Merge branch 'master' into tile-cancels 2014-02-21 16:36:15 -08:00
Justin R. Miller
675b8eb1fe refs #60: size POIs properly based on pixel ratio 2014-02-21 16:25:42 -08:00
Justin R. Miller
7a48e8ddce move to linear properties for POI opacity 2014-02-21 16:22:45 -08:00
Justin R. Miller
b6d7169b83 refs #60: add support for point colorization & opacity 2014-02-21 16:00:55 -08:00
Justin R. Miller
e59a5f1c1a Merge branch 'master' into tile-cancels 2014-02-21 14:18:48 -08:00
Konstantin Käfer
e382cab17d make implicit type conversions explicit 2014-02-21 13:08:13 +01:00
Konstantin Käfer
4418f2d1c8 remove remnants of emscripten 2014-02-21 12:34:39 +01:00
Konstantin Käfer
5f64ecc3cc Merge branch 'master' into linux-wrapper
Conflicts:
	include/llmr/style/sprite.hpp
2014-02-21 12:26:16 +01:00
Konstantin Käfer
0306e77ff0 remove void* parameter from platform::restart() 2014-02-21 12:18:11 +01:00
Konstantin Käfer
1fb4451192 Merge pull request #68 from mapbox/poi-render
refs #60: first cut of POI rendering
2014-02-21 12:07:46 +01:00