Commit Graph

142 Commits

Author SHA1 Message Date
Justin R. Miller
f8e771b79e move to satellite raster 2014-04-02 15:12:52 -07:00
Justin R. Miller
d2491939e9 move to naming like on web 2014-04-02 15:12:42 -07:00
Justin R. Miller
00e910c147 bring back toggleRaster() by way of layer enable toggling 2014-04-02 15:01:05 -07:00
Justin R. Miller
2e5fed2a7a abstract out zoom adjust 2014-04-02 15:00:48 -07:00
Justin R. Miller
f60a46229d refs #101: first cut of basic hacky data sources 2014-04-02 11:07:22 -07:00
Konstantin Käfer
21f7b0f706 use unique_ptr for buckets rather than shared_ptrs 2014-03-25 13:49:55 +01:00
Konstantin Käfer
85f0d9392b do not use shared pointers for buffers 2014-03-25 13:41:20 +01:00
Konstantin Käfer
afe27ed74c only animate when we need to fade the text 2014-03-24 18:00:03 +01:00
Konstantin Käfer
5c613b5455 normalizedZoom() == zoom level of the visual appearance 2014-03-24 14:44:44 +01:00
Konstantin Käfer
67a8882457 use the correct glyphs 2014-03-24 11:13:20 +01:00
Konstantin Käfer
ea6b24d02d add text rendering code 2014-03-21 17:36:29 +01:00
Konstantin Käfer
3413ee536d Merge branch 'master' into sdf
Conflicts:
	include/llmr/map/tile_data.hpp
	include/llmr/shader/shaders.hpp
	src/map/map.cpp
	src/map/tile_data.cpp
	src/platform/platform.cpp
	src/shader/shaders.cpp
2014-03-21 13:36:32 +01:00
Konstantin Käfer
0730ca640b get rid of float division 2014-03-21 13:32:03 +01:00
Konstantin Käfer
a4cda4ce20 fix Tile::parent() for negative x coords 2014-03-21 13:17:42 +01:00
Konstantin Käfer
4ee0cf1791 port remainder of the the placement algorithm 2014-03-19 18:58:50 +01:00
Justin R. Miller
00a3245ce8 fixes #70: raster tile rendering as toggleable mode from vector 2014-03-18 16:57:17 -07:00
Konstantin Käfer
56e06f527c remove unused glyphs from atlas again 2014-03-14 12:50:28 +01:00
Konstantin Käfer
3c5bac0f6b add debug window showing the glyph atlas 2014-03-14 12:43:42 +01:00
Konstantin Käfer
99cef810ac move tile parsing to its own object 2014-03-14 11:36:10 +01:00
Konstantin Käfer
be44b6b31f add glyph atlas to map 2014-03-14 11:36:10 +01:00
Konstantin Käfer
d9589573bc extract label shaping 2014-03-14 11:36:10 +01:00
Konstantin Käfer
ceb75b7b26 use feature_type to distinguish between geometry type and bucket type 2014-03-14 11:36:10 +01:00
Konstantin Käfer
a26ddf8bce parse feature objects so that we can access all tags 2014-03-14 11:36:10 +01:00
Konstantin Käfer
a37dcedc41 parse label shaping 2014-03-14 11:36:10 +01:00
Konstantin Käfer
31d3c6339c parse faces 2014-03-14 11:36:10 +01:00
Konstantin Käfer
8171c7bb43 add empty classes for rendering glyphs 2014-03-14 11:36:10 +01:00
Konstantin Käfer
f8a096a4fa use templated function to reduce code 2014-03-14 11:36:10 +01:00
Konstantin Käfer
86e6e6bed8 use a custom struct for Tile IDs 2014-03-12 16:42:37 +01:00
Konstantin Käfer
91d42911fb parse the json stylesheet 2014-03-12 11:23:01 +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
420cb58a5d fix pedantic warnings 2014-03-11 12:10:07 +01:00
Konstantin Käfer
4de8674f20 Merge branch 'variant' 2014-03-11 11:55:00 +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
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
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
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
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