Commit Graph

89 Commits

Author SHA1 Message Date
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
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
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
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
artemp
a8fef83564 c++
* use nullptr instead of NULL
2014-02-06 10:39:10 +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
Konstantin Käfer
e30d8eb48f move to vertex array objects 2014-02-05 18:06:16 +01:00
Konstantin Käfer
f738a9e19e initialize variables 2014-02-05 13:59:02 +01:00
Justin R. Miller
dbea7937b3 fixes #33: rotate around arbitrary point 2014-02-04 16:01:09 -05:00
Justin R. Miller
ca75b2a351 refs #24: Gyp-built iOS test app 2014-02-04 12:10:20 -05:00
Justin R. Miller
2b2ff9fb3f abstract hardcoded URLs for now 2014-02-04 11:46:06 -05:00
Konstantin Käfer
d77e3b6285 add <algorithm> headers 2014-02-04 14:14:20 +01:00
Konstantin Käfer
2df45d0c4a refactor header includes 2014-02-04 14:07:56 +01:00
Konstantin Käfer
7dfc535d2c remove VectorTile member variable of Tile 2014-02-04 13:44:57 +01:00
Dane Springmeyer
f1e74215fd compile fixes on ubuntu precise/g++-4.8 - refs #27 2014-02-03 21:57:46 +00:00
Konstantin Käfer
9ab9eeec13 textured fills
fixes #15
2014-02-03 22:51:21 +01:00
Konstantin Käfer
a6e464b9a7 add sprite object and parse image
refs #15
2014-02-03 17:38:40 +01:00
Konstantin Käfer
44a3ffbd57 alternative http_request function 2014-02-03 14:53:59 +01:00
Konstantin Käfer
202e0270f7 add rapidjson for parsing sprite json files 2014-02-03 11:36:34 +01:00
Konstantin Käfer
c7b012ba42 create async() function 2014-01-31 13:40:38 +01:00
Konstantin Käfer
bc07cb4b26 don't pass the entire tile object to changeMatrix 2014-01-30 12:37:16 +01:00
Konstantin Käfer
a8b1df403c fix errors from rename of style.hpp to resources.hpp 2014-01-30 11:24:39 +01:00
Konstantin Käfer
1233537713 float[16] => std::array<float, 16> 2014-01-29 15:09:00 +01:00
Konstantin Käfer
9fc749eade add matte 2014-01-29 12:43:37 +01:00
Konstantin Käfer
d5cae14770 parse line width function and call tile destructor from main thread 2014-01-29 12:25:50 +01:00
Konstantin Käfer
04e16cf2ca make line drawing work 2014-01-29 11:12:09 +01:00
Konstantin Käfer
e359d697fb buggy line support 2014-01-28 18:40:17 +01:00
Konstantin Käfer
4c08a9081b change coordinate to use null struct 2014-01-28 17:27:20 +01:00