Commit Graph

111 Commits

Author SHA1 Message Date
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
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
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
64b072a08e make debug font const 2014-02-06 09:45:14 +01: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
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
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
Konstantin Käfer
e97fcda9f3 correctly specify the number of attribute elements 2014-02-05 12:38:04 +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
3b7f06ccbf fix build on linux 2014-02-04 16:53:22 +01:00
Konstantin Käfer
aff6c54c00 remove hardcoded #version 120 2014-02-04 16:46:48 +01: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
Konstantin Käfer
e3db9b1ef1 add textured water 2014-02-04 11:40:28 +01:00
Dane Springmeyer
5b783f4eb1 fix sprite.cpp compile on linux - refs #27 2014-02-03 23:02:02 +00:00
Dane Springmeyer
b8d9f7704f switch build system to gyp 2014-02-03 14:32:00 -08:00
Konstantin Käfer
1295ebc705 Merge branch 'master' of https://github.com/mapbox/llmr-native 2014-02-03 23:22:35 +01:00
Konstantin Käfer
82c79b7bda remove c99 features
fixes #26
2014-02-03 23:21:50 +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
e478ae2a2d allow binding the sprite object
refs #15
2014-02-03 17:44:12 +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
9d982c10fd first part of loading JSON stylesheets 2014-02-03 14:54:16 +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
Dane Springmeyer
b70788a6f1 Merge branch 'master' of github.com:mapbox/llmr-native into unique-cpp-names 2014-01-29 14:00:36 -08:00
Dane Springmeyer
948a0d1922 avoid two cpp files named style.cpp 2014-01-29 13:57:29 -08:00
Konstantin Käfer
2b59dfae63 move static global buffers to RAII 2014-01-29 15:31:22 +01:00