Commit Graph

436 Commits

Author SHA1 Message Date
Konstantin Käfer
7637b7f8c7 get applied classes 2014-06-24 16:47:11 +02:00
Konstantin Käfer
b72583371c add memory header 2014-06-24 14:10:00 +02:00
Konstantin Käfer
a1e40c1780 change enum parsing 2014-06-24 13:45:14 +02:00
Konstantin Käfer
ba4294ae0c saving current state 2014-06-23 18:05:25 +02:00
Konstantin Käfer
68c621b2a6 load glDiscardFramebufferEXT with a library function if needed 2014-06-17 05:52:24 -07:00
Konstantin Käfer
4899d72da6 only ignore diagnostics with clang 2014-06-17 04:42:23 -07:00
Konstantin Käfer
3cd1b8f07c template the parser 2014-06-16 17:00:25 +02:00
Konstantin Käfer
e3b9e9abf6 make code more concise 2014-06-16 16:48:21 +02:00
Konstantin Käfer
4a41b02cef move to std::map for classes 2014-06-16 15:47:37 +02:00
Konstantin Käfer
71d2b230a1 separate bucket render properties and change naming 2014-06-16 11:49:11 +02:00
Konstantin Käfer
af69b4fe39 unifiy constants in one place, and allow local override 2014-06-04 11:22:03 +02:00
Konstantin Käfer
ef76be64a2 separate out token replacer as a standalone function in preparation for #300 2014-06-04 10:53:08 +02:00
Konstantin Käfer
7a4a833f39 Revert "background grid"
This reverts commit 1dd3fdfba3.
2014-06-03 17:29:27 +02:00
Konstantin Käfer
ce23e88b01 add a few tests 2014-06-03 00:38:49 +02:00
Konstantin Käfer
331b726db4 fix comparison order error 2014-06-03 00:00:15 +02:00
Konstantin Käfer
bd4da29a30 Merge branch 'master' into expressions 2014-06-02 23:10:50 +02:00
Justin R. Miller
1dd3fdfba3 background grid 2014-06-02 11:42:00 -07:00
Konstantin Käfer
3c26f53e63 generalize variant comparison and add more operators 2014-06-02 13:50:25 +02:00
Konstantin Käfer
dd4c8a67ba add explicit true type == "no filter" 2014-06-02 11:14:09 +02:00
Konstantin Käfer
99b6a700ef move both variant options to recursive_wrapper 2014-06-02 11:14:09 +02:00
Konstantin Käfer
1d3d0bd85c add missing files 2014-06-02 11:14:09 +02:00
Konstantin Käfer
606ad56220 implement nested expression parsing 2014-06-02 11:14:09 +02:00
Konstantin Käfer
3bc5e03253 simple expression support 2014-06-02 11:14:09 +02:00
Justin R. Miller
38dd25a85a fixes #279: remove forced rotation animations for now 2014-06-01 18:00:28 -07:00
Justin R. Miller
e5a78c931a make some more getter functions constant 2014-06-01 15:32:03 -07:00
Justin R. Miller
3c249e7c9e Merge branch 'master' of github.com:mapbox/llmr-native 2014-06-01 11:21:04 -07:00
Justin R. Miller
4d66a51d22 get rid of brittle hardcoded style toggling method
Conflicts:
	ios/mapbox-gl-cocoa
2014-06-01 11:20:55 -07:00
Konstantin Käfer
67bbcd5334 allow setting prerender state with a function too 2014-06-01 18:12:44 +02:00
Konstantin Käfer
1be972eb15 Allow property functions for prerender properties, but tie them to the tile's zoom level instead of the map zoom level
fixes #253
2014-06-01 17:43:12 +02:00
Justin R. Miller
a81a336638 programmatic styling API 2014-05-31 11:32:42 -07:00
Dane Springmeyer
5f03cc1595 [hardening] fix double const& declaration 2014-05-30 13:41:07 -07:00
Dane Springmeyer
7124580294 fix function signature 2014-05-30 12:13:26 -07:00
Mike Morris
59774f7e93 shaped to shaping, pass by reference instead of returning a copy 2014-05-30 14:19:22 -04:00
Ansis Brammanis
0dd78c96e3 Merge remote-tracking branch 'origin/linebreak' 2014-05-30 13:06:25 -04:00
Ansis Brammanis
c0c43ef518 fix compile error 2014-05-30 13:06:08 -04:00
Konstantin Käfer
d5e63cea21 retain the uv loop until all things deconstructed
fixes #261
2014-05-30 17:32:09 +02:00
Konstantin Käfer
78fda8bb62 make sure we retain shared state when destructing the map object
refs #261
2014-05-30 17:00:47 +02:00
Young Hahn
2d0b3482ec Merge branch 'master' into linebreak
Conflicts:
	src/map/tile_parser.cpp
	src/text/glyph_store.cpp
2014-05-30 09:00:29 -04:00
Konstantin Käfer
31d9dbefea pass shaping directly instead of looking it up 2014-05-30 14:01:53 +02:00
Konstantin Käfer
461a19dfa2 fallback to default properties instead of not rendering when we don't have a style
refs #272
2014-05-30 13:36:53 +02:00
Konstantin Käfer
ca41046dff Merge pull request #275 from mapbox/correct-calloc
Correct calloc
2014-05-30 11:26:19 +02:00
Ansis Brammanis
9ac55e0d74 add text letterSpacing 2014-05-30 04:02:23 -04:00
Ansis Brammanis
7c653895c6 translate as a text bucket property
When used, text is translated before being checked for collisions.
2014-05-30 03:50:25 -04:00
Ansis Brammanis
41c310c762 add verticalAlign for text
Default is center. Other options are "top" and "bottom"
2014-05-30 03:11:57 -04:00
Ansis Brammanis
9057c4980d line wrapping 2014-05-30 01:32:15 -04:00
Mike Morris
3442403e67 parse maxWidth, lineHeight and alignment, pass to FontStack::getShaping 2014-05-30 00:07:22 -04:00
Young Hahn
6e53a0328b Remove VectorTileGlyph, VectorTileFace, IndexedFaces, Faces and glyph related parts of vector_tile.proto. Refs #274. 2014-05-29 22:54:46 -04:00
Dane Springmeyer
c9a1d9efd4 remove unused member variable 2014-05-29 14:17:22 -07:00
Dane Springmeyer
30a34d73f8 fix static analyzer warning: Result of 'calloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint32_t' 2014-05-29 13:23:00 -07:00
Dane Springmeyer
f83f4a6d63 include <memory> / fix compile issues with g++-4.9 2014-05-29 12:16:25 -07:00