Commit Graph

149 Commits

Author SHA1 Message Date
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
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
25ff0b253f merge vec2 and Coordinate 2014-03-18 17:57:09 +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
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
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
4d5715c973 atomic state 2014-03-03 16:38:26 +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
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
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
Konstantin Käfer
bd2d865fc4 trigger a bogus mouse move event to interrupt glfwWaitEvents()
see https://github.com/glfw/glfw/issues/218
2014-02-21 12:05:27 +01:00
Konstantin Käfer
d5c611d707 add timeouts for panning,scaling,rotating 2014-02-21 11:31:24 +01:00
Konstantin Käfer
9710fbef99 enable texture interpolation during rotating and scaling 2014-02-19 15:39:44 +01:00
Konstantin Käfer
ea80daa129 allow switching the vao if we switch the style from plain color to pattern fill 2014-02-18 15:56:23 +01:00
Justin R. Miller
828d8ba26f refs #60: first cut of POI rendering
* add basic marker style to stylesheet
 * pass through marker style to PBF conversion
 * marker/point tile parsing, bucket, buffer, shaders, etc.
 * new sprite hosting for 1x/2x variants
 * sprite load accepts screen scale argument
2014-02-14 18:13:12 -08:00
Justin R. Miller
257ccd16bb clean up settings mechanism (fixes #9 & #62)
* init, load, persist, sync, clear
 * clean up frequent disk syncs which impacted iOS performance
 * insert disk sync into various iOS/OS X lifecycle events
 * implement clear
 * implement save on iOS
 * cleaner dictionary syntax
2014-02-13 12:21:35 -08:00
Konstantin Käfer
b0357e8ea7 move tile size to constants.hpp 2014-02-13 17:34:08 +01:00
Konstantin Käfer
da06a52056 cut down on redundant gl uniform changes 2014-02-13 16:21:51 +01:00
Konstantin Käfer
f5846e1ebb change line_strip drawing for outlines to indexed lines 2014-02-13 15:32:25 +01:00
Justin R. Miller
0005ca4eef fixes #57: flesh out remainder of getters & setters plus animation 2014-02-12 11:20:21 -08:00
Konstantin Käfer
bec0ad10c4 drawing lines with triangles 2014-02-11 15:51:54 +01:00
Konstantin Käfer
f4996046a2 common buffer implementation 2014-02-10 15:14:52 +01:00
Justin R. Miller
f6642766c1 expose transform animations cancel through map 2014-02-07 12:26:39 -05:00
Konstantin Käfer
9cef72fadb Merge branch 'master' of https://github.com/mapbox/llmr-native
Conflicts:
	src/map/transform.cpp
2014-02-07 16:10:00 +01:00
Konstantin Käfer
28ee5968f8 add cancelAnimations() function
refs #34
2014-02-07 16:08:17 +01:00
Justin R. Miller
e48207a4ef allow for animated moves 2014-02-06 16:08:44 -05:00
Konstantin Käfer
dd6d040cda render updates if tiles changed after movements 2014-02-06 15:44:50 +01:00
Konstantin Käfer
f756768c18 Merge remote-tracking branch 'origin/animated-scale' 2014-02-06 15:18:17 +01:00
artemp
d6654ccaed c++
* fix typedef's
* fix virtual dtor's
* make ctor's with one argument explicit
* util::noncopyable utility class  ( class my_object : private noncopyable {} )
* update kTileURL
2014-02-06 10:33:46 +00:00
Justin R. Miller
3ae58c53a2 refs #30: animated scaleBy
* add duration argument to scaleBy & setScale
 * add scale center arguments to setScale
 * add animation to Transform::setScale
2014-02-05 15:16:05 -05:00