Commit Graph

573 Commits

Author SHA1 Message Date
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
d6da893e66 add comment for magic value 2014-06-11 20:24:12 +02:00
Konstantin Käfer
318ee37e4d remove accidental bias value 2014-06-05 08:45:34 +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
580527a16c use token replacement for icon property as well
fixes #300
2014-06-04 10:58:11 +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
f59424b00b skip background layer early 2014-06-04 10:09:38 +02:00
Konstantin Käfer
fbd983f104 don't make a copy of the glyph store 2014-06-03 18:11:19 +02:00
Konstantin Käfer
2eb948115d only draw points when there actually are linejoins 2014-06-03 18:11:07 +02:00
Konstantin Käfer
7a4a833f39 Revert "background grid"
This reverts commit 1dd3fdfba3.
2014-06-03 17:29:27 +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
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
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
30aa378731 use a black matte instead of yellow 2014-06-01 19:37:56 -07: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
Konstantin Käfer
c54ff954bf never send async events to nullptrs 2014-06-01 00:10:16 +02:00
Justin R. Miller
62b19f7e8b clean up obsolete stylesheet resources reference 2014-05-31 13:06:39 -07: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
42a2c252b8 use malloc/free from c++: fixes compile with libc++ on linux - refs #287 2014-05-30 13:38:09 -07:00
Dane Springmeyer
74c534b07a avoid unused variable warning 2014-05-30 13:28:06 -07:00
Dane Springmeyer
a944018367 [hardening] must return from non void function 2014-05-30 13:27:48 -07:00
Dane Springmeyer
d19870d9d2 fix another potential invalid memory access 2014-05-30 12:41:41 -07:00
Dane Springmeyer
552b9a0f1b fix potential crash in line wrapping:
- shaping.size() == 0 would result in unsigned overflow because uint32_t(0) - 1 == huge number
2014-05-30 12:35:49 -07:00
Konstantin Käfer
c5fd7a0cdd add token replacement system
fixes #212
2014-05-30 21:13:55 +02:00
Konstantin Käfer
da29a16370 skip second loop 2014-05-30 21:13:55 +02: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
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
3e7f801de1 mark all sprites as uninitialized on pixelRatio changes
fixes #226
2014-05-30 14:28:42 +02:00
Konstantin Käfer
3a8b88dbbd fix nearest neighbor image scaling
refs #226
2014-05-30 14:26:26 +02: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
942da9cecc don't convert twice 2014-05-30 13:23:48 +02:00
Konstantin Käfer
ec973af82e skip characters that don't have metrics 2014-05-30 13:02:40 +02:00
Konstantin Käfer
ca41046dff Merge pull request #275 from mapbox/correct-calloc
Correct calloc
2014-05-30 11:26:19 +02:00
Konstantin Käfer
2aa9174507 Merge pull request #281 from mapbox/cleanup
post-glyphrange cleanup
2014-05-30 11:24:48 +02:00
Ansis Brammanis
9ac55e0d74 add text letterSpacing 2014-05-30 04:02:23 -04:00