Commit Graph

229 Commits

Author SHA1 Message Date
Dane Springmeyer
359a35e60f Merge branch 'master' of github.com:mapbox/llmr-native into variant 2014-02-12 12:51:58 -08: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
b78df1903a Merge branch 'indexed-lines' 2014-02-12 11:15:11 +01:00
Konstantin Käfer
4638add04b Merge pull request #55 from mapbox/common-buffer
Create a common buffer implementation
2014-02-12 11:14:34 +01:00
Konstantin Käfer
369beb08c5 add rule for just making project 2014-02-12 11:13:48 +01:00
Konstantin Käfer
02f2dea807 get point shader to work on ios 2014-02-11 17:58:33 +01:00
Konstantin Käfer
f0a945a45c add rule for just making project 2014-02-11 17:58:16 +01:00
Konstantin Käfer
4cf48e08a5 Merge branch 'master' into indexed-lines 2014-02-11 17:35:36 +01:00
Konstantin Käfer
662a61a396 split line vertices into multiple buffer groups if elements overflow 2014-02-11 17:34:46 +01:00
Konstantin Käfer
eb8e5fcf15 move group struct to shared file 2014-02-11 16:00:40 +01:00
Konstantin Käfer
bec0ad10c4 drawing lines with triangles 2014-02-11 15:51:54 +01:00
Justin R. Miller
a84f861d1f fixes #56: iOS network activity indicator 2014-02-10 14:27:00 -08:00
Justin R. Miller
d9f4b07c93 properly handle notifications 2014-02-10 14:13:12 -08:00
Konstantin Käfer
eb9a6b7068 add more docs 2014-02-10 15:20:46 +01:00
Konstantin Käfer
4c6dc54352 add missing buffer.hpp 2014-02-10 15:18:24 +01:00
Konstantin Käfer
f4996046a2 common buffer implementation 2014-02-10 15:14:52 +01:00
artemp
0157e4f140 c++ - change types order in boost::variant to move std::string to the end
("By default, a variant default-constructs its first bounded type..")
2014-02-10 12:24:48 +00:00
artemp
5e87cfed5a c++ - prefer switch over long-ish if/else (be nice to compiler) 2014-02-10 12:18:52 +00:00
Justin R. Miller
e8bd180f00 fixes #50: get rid of GLKViewController 2014-02-07 23:13:48 -08:00
Justin R. Miller
0bccb08028 clean up duplicate calculations on animation branching 2014-02-07 21:45:45 -05:00
Justin R. Miller
150d3ffdbe added iOS quick zoom gesture 2014-02-07 21:18:16 -05:00
Justin R. Miller
7f30ca8763 code sign on iOS depending on configuration 2014-02-07 13:42:35 -05:00
Justin R. Miller
8ada3a6551 fix iPad/iPhone animation times 2014-02-07 12:42:13 -05:00
Justin R. Miller
f4edf7a33e fixes #35: decelerated pinch zooming 2014-02-07 12:37:48 -05:00
Justin R. Miller
c412b8d45a all iOS gestures cancel previous animations 2014-02-07 12:28:37 -05:00
Justin R. Miller
f6642766c1 expose transform animations cancel through map 2014-02-07 12:26:39 -05:00
Konstantin Käfer
df2bc0bb7f Merge branch 'master' of https://github.com/mapbox/llmr-native 2014-02-07 17:54:41 +01:00
Konstantin Käfer
cbe70c7648 use a publicly accessible sprite image 2014-02-07 17:54:27 +01:00
Justin R. Miller
daac03f526 fixes #43: fix tile renders on OS X 2014-02-07 11:40:15 -05:00
Justin R. Miller
b176985791 fix some indentation 2014-02-07 11:33:07 -05:00
Justin R. Miller
b2b38c4985 Merge branch 'master' of github.com:mapbox/llmr-native 2014-02-07 11:26:59 -05:00
Justin R. Miller
ad104ee03e refs #43: only render on iOS when we need to 2014-02-07 11:26:39 -05:00
Justin R. Miller
309096419b removing useless line with our use of GLKViewController 2014-02-07 11:15:51 -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
6d75c0209d only output FPS on iOS when in debug mode 2014-02-06 17:06:02 -05:00
Justin R. Miller
29744cfa5a refs #34: don't decelerate pan for low velocity 2014-02-06 16:27:54 -05:00
Justin R. Miller
a95f0a8621 fixes #34: decelerated panning 2014-02-06 16:09:12 -05:00
Justin R. Miller
e48207a4ef allow for animated moves 2014-02-06 16:08:44 -05:00
Justin R. Miller
26433e3288 fixes #46: properly dampen pinch gestures near initial zoom w/o flapping 2014-02-06 15:32:25 -05:00
Justin R. Miller
c4cdf8f714 refs #45: fix bug w/o breaking intended result 2014-02-06 13:24:32 -05:00
Justin R. Miller
558fef5257 fixes #45: only simultaneously allow pan, pinch, and rotate 2014-02-06 13:17:31 -05:00
Justin R. Miller
7e92a82d17 re-org gestures for conceptual grouping 2014-02-06 12:34:25 -05:00
Konstantin Käfer
0ae3d3926b always rerender when calling update() 2014-02-06 16:13:41 +01:00
Konstantin Käfer
828240565b add cstring header 2014-02-06 15:46:12 +01:00
Konstantin Käfer
dd6d040cda render updates if tiles changed after movements 2014-02-06 15:44:50 +01:00
Konstantin Käfer
9553bfa159 revert back to 32767 2014-02-06 15:29:23 +01:00
Konstantin Käfer
f756768c18 Merge remote-tracking branch 'origin/animated-scale' 2014-02-06 15:18:17 +01:00
Konstantin Käfer
33beb081f5 Merge branch 'master' of https://github.com/mapbox/llmr-native
Conflicts:
	src/geometry/debug_font.cpp
2014-02-06 15:14:51 +01:00