Commit Graph

113 Commits

Author SHA1 Message Date
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
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
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
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
Justin R. Miller
d94b8bbcec make use of new tile-specific fetches to allow cancellation 2014-02-19 23:09:48 -08:00
Konstantin Käfer
9710fbef99 enable texture interpolation during rotating and scaling 2014-02-19 15:39:44 +01:00
Konstantin Käfer
504b60b93e don't used element arrays 2014-02-19 14:46:50 +01:00
Konstantin Käfer
3843bf1ce5 better allocator defaults 2014-02-17 16:35:12 +01:00
Konstantin Käfer
b087c35c98 add tessellation library 2014-02-17 12:45:57 +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
f5846e1ebb change line_strip drawing for outlines to indexed lines 2014-02-13 15:32:25 +01:00
artemp
db0e83fbbd Merge branch 'master' into variant 2014-02-12 20:59:33 +00:00
Justin R. Miller
0005ca4eef fixes #57: flesh out remainder of getters & setters plus animation 2014-02-12 11:20:21 -08:00
artemp
0939acca30 custom variant type (replaces boost::variant and removes boost dependency altogether) 2014-02-12 14:32:54 +00: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
0bccb08028 clean up duplicate calculations on animation branching 2014-02-07 21:45:45 -05: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
0ae3d3926b always rerender when calling update() 2014-02-06 16:13:41 +01: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
2d3abf36b1 c++
* prefer prefix increment operator unless logically necessary
  (it doesn't make any diff foro built-in type but good practice)
2014-02-06 10:50:31 +00:00