Commit Graph

537 Commits

Author SHA1 Message Date
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
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
2be6fefdf8 make shapingWarning and glyphWarning off for release builds 2014-05-29 18:13:41 -07:00
Dane Springmeyer
f5394a7638 release mode: silent debug output + ifdef any potentially expensive calls 2014-05-29 18:07:19 -07:00
Justin R. Miller
7b2355c696 Merge branch 'master' into bezier 2014-05-29 16:12:10 -07:00
Vladimir Agafonkin
841cee7750 change default cubic bezier for easings 2014-05-29 23:41:49 +03:00
Dane Springmeyer
07767951ee use std::abs 2014-05-29 13:24:26 -07:00
Dane Springmeyer
b4d5b1ca65 use std::pow 2014-05-29 13:24:26 -07:00
Dane Springmeyer
88f89d0150 initialize variables 2014-05-29 13:24:26 -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
5c7461f19e use std::abs 2014-05-29 13:10:51 -07:00
Dane Springmeyer
23655f0bb1 use std::pow 2014-05-29 13:09:24 -07:00
Dane Springmeyer
da33bef634 initialize variables 2014-05-29 13:09:10 -07:00
Dane Springmeyer
829f9d1197 [build] another missing <memory> include 2014-05-29 12:36:22 -07:00
Dane Springmeyer
42c233b8b4 fix -Wformat-security warning with dodgy fprintf 2014-05-29 12:33:00 -07:00
Young Hahn
72a71c6f70 Lookup shaping value by string key. Refs #272. 2014-05-29 12:13:56 -04:00
Young Hahn
bdb16b9ae7 Merge branch 'master' into glyphrange-master
Conflicts:
	bin/style.js
	src/text/placement.cpp
2014-05-29 11:59:12 -04:00
Young Hahn
99396478ff Use 256 sized rangeglyphs. Switch to mapbox API VTs. 2014-05-29 11:41:35 -04:00
Young Hahn
86ae823306 Merge branch 'glyphrange-boost-locale' into glyphrange-yh-guesses
Conflicts:
	src/map/tile_parser.cpp
	src/text/glyph_store.cpp
2014-05-29 06:06:57 -04:00
Young Hahn
f48999dc13 Treat out of range glyphs as belonging to 0-127 for now. 2014-05-29 05:37:30 -04:00
Young Hahn
d5349f9cd3 Don't call varint() more than once. 2014-05-29 05:19:15 -04:00
Young Hahn
d82acee8c7 Stash. 2014-05-29 05:05:48 -04:00
Young Hahn
36796490de More educated guess. 2014-05-28 23:12:26 -04:00
Young Hahn
25803b4b98 Guesses. 2014-05-28 22:57:32 -04:00
Dane Springmeyer
97683460c1 fix compile of glyph_store.cpp 2014-05-28 19:57:26 -07:00
Dane Springmeyer
5c46bef717 fallback to boost::locale on linux 2014-05-28 19:57:01 -07:00
Dane Springmeyer
c85a0c3da2 comment unfinished FontStack code 2014-05-28 19:44:11 -07:00
Dane Springmeyer
56c55d0b02 add include <algorithm> needed for std::replace on linux 2014-05-29 02:36:47 +00:00
Young Hahn
944167296a replace comes from regex 2014-05-28 18:53:54 -04:00
Young Hahn
a66db39a06 Monkey patching to get linux compile working. 2014-05-28 18:45:47 -04:00
Konstantin Käfer
83b3b0bb6a create a copy 2014-05-28 22:18:18 +02:00
Konstantin Käfer
6f68cd3676 return font stack 2014-05-28 22:12:31 +02:00
Konstantin Käfer
193b2aacb7 add second labelling pass 2014-05-28 22:00:00 +02:00