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 |
|
artemp
|
7d271cca02
|
c++
* store commands in uint8_t
|
2014-02-06 12:23:07 +00:00 |
|
artemp
|
8703b69151
|
c++
* use c++ style casts
* remove unused includes
|
2014-02-06 12:09:13 +00:00 |
|
artemp
|
0cf3f28d05
|
c++
* don't rely on implicit size_t to bool conversions (fix MSVC compiler warning)
|
2014-02-06 11:46:56 +00:00 |
|
artemp
|
bfcfb592da
|
c++
* make it a bit more readable
|
2014-02-06 11:45:00 +00: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 |
|
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 |
|
Konstantin Käfer
|
ed4072bdd1
|
skip unknown glyphs
|
2014-02-06 09:47:12 +01:00 |
|
Konstantin Käfer
|
ad50fa56e7
|
Merge branch 'master' of https://github.com/mapbox/llmr-native
|
2014-02-06 09:45:26 +01:00 |
|
Konstantin Käfer
|
64b072a08e
|
make debug font const
|
2014-02-06 09:45:14 +01:00 |
|
Justin R. Miller
|
61c69f5872
|
fixes #42: allow for simultaneous pan, pinch, and rotate
|
2014-02-05 15:59:16 -05:00 |
|
Justin R. Miller
|
dd3687061d
|
speed up pinch gestures per @gundersen
|
2014-02-05 15:51:44 -05: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 |
|
Justin R. Miller
|
74f3e5715a
|
simplify gesture points
|
2014-02-05 14:38:44 -05:00 |
|
Justin R. Miller
|
e7dd28f6e0
|
scale iOS pinches at gesture center
|
2014-02-05 14:35:40 -05:00 |
|
Justin R. Miller
|
74b522ac6e
|
add 4" device launch image
|
2014-02-05 13:49:55 -05:00 |
|
Konstantin Käfer
|
f27e219a70
|
Merge pull request #39 from mapbox/ios-speed
Switch to Vertex Array Objects
|
2014-02-05 19:14:08 +01:00 |
|
Konstantin Käfer
|
cf31a80920
|
textured fills & enforce vao program with templates
|
2014-02-05 19:03:44 +01:00 |
|
Konstantin Käfer
|
eabd99d8f6
|
always pass the parameters and verify that they're correct
|
2014-02-05 18:46:23 +01:00 |
|
Konstantin Käfer
|
e94cb1b00b
|
remove switchShader()
|
2014-02-05 18:35:19 +01:00 |
|
Konstantin Käfer
|
c922980eeb
|
change back to use web-provided version of resources
|
2014-02-05 18:15:18 +01:00 |
|
Konstantin Käfer
|
e30d8eb48f
|
move to vertex array objects
|
2014-02-05 18:06:16 +01:00 |
|
Justin R. Miller
|
80ed0e13f4
|
Merge branch 'master' of github.com:mapbox/llmr-native
|
2014-02-05 11:02:26 -05:00 |
|
Justin R. Miller
|
503f0fc145
|
bump up iOS deployment target for TestFlight compatibility
|
2014-02-05 11:02:12 -05:00 |
|
Konstantin Käfer
|
0a053d944a
|
set framerate to 60fps
|
2014-02-05 13:59:38 +01:00 |
|
Konstantin Käfer
|
b629f56f68
|
add aliases for VAOs
|
2014-02-05 13:59:26 +01:00 |
|
Konstantin Käfer
|
f738a9e19e
|
initialize variables
|
2014-02-05 13:59:02 +01:00 |
|