Commit Graph

483 Commits

Author SHA1 Message Date
Vladimir Agafonkin
7dc706b063 Merge pull request #257 from mapbox/optimize-placement
Ignore flipped glyphs when placing labels for perf
2014-05-28 17:17:34 +03:00
Konstantin Käfer
192b5a30e4 make PropertyTransitions optional 2014-05-28 10:49:56 +02:00
Konstantin Käfer
e304f6629f only change pass parameters if we actually need to 2014-05-28 09:47:55 +02:00
Konstantin Käfer
4074db512f fix stylesheet parse typo
refs #192
2014-05-28 06:34:29 +02:00
Konstantin Käfer
a17c86840f Merge branch 'master' of https://github.com/mapbox/llmr-native 2014-05-27 19:38:42 +02:00
Konstantin Käfer
f32c996348 fixed subtle clip id generation bug
refs #206
2014-05-27 18:51:09 +02:00
Vladimir Agafonkin
00d6cc6bdd simplify glyph boxes handling 2014-05-27 19:33:26 +03:00
Vladimir Agafonkin
88a5de2aa6 ignore flipped glyphs when placing labels for perf 2014-05-27 18:49:18 +03:00
Vladimir Agafonkin
6ab1dcbeeb remove some leftover code 2014-05-27 18:19:24 +03:00
Konstantin Käfer
23da773667 a few preliminary speed improvements 2014-05-27 12:08:36 +02:00
Konstantin Käfer
9477097f0f Revert "refs #253: support blur function property values"
This reverts commit 34b90476b4.
2014-05-27 09:59:35 +02:00
Justin R. Miller
34b90476b4 refs #253: support blur function property values 2014-05-26 23:48:50 -07:00
Konstantin Käfer
1b58fb30a3 use unordered map, don't make copies (auto usage!) and swap maps 2014-05-26 18:40:47 +02:00
Konstantin Käfer
4ad3a1ee76 Merge branch 'master' into blur
Conflicts:
	src/shader/shaders_gl.cpp
	src/shader/shaders_gles2.cpp
2014-05-26 17:30:31 +02:00
Konstantin Käfer
3a9f353a1e move a view calls to generic functions 2014-05-26 16:33:38 +02:00
Konstantin Käfer
2029763b71 only blur if we actually need to 2014-05-26 16:11:23 +02:00
Konstantin Käfer
e40ed2729d use lambda initialization for matrix 2014-05-26 15:43:12 +02:00
Konstantin Käfer
2d0037b112 don't respect opacity when prerendering tile; we do opacity at composite-time 2014-05-26 15:38:51 +02:00
Konstantin Käfer
6ed5c0ddf3 use sigma 1 for blur by default 2014-05-26 15:35:08 +02:00
Konstantin Käfer
9b5c75cef0 add isVisible function to Properties 2014-05-26 15:34:50 +02:00
Konstantin Käfer
6350dc5235 move blurring to texture object 2014-05-26 13:31:51 +02:00
Konstantin Käfer
e3e982acd8 respect the prerendered-* stylesheet values 2014-05-26 12:44:35 +02:00
Konstantin Käfer
4b8e3faa70 consolidate stylesheet cascading 2014-05-26 12:43:49 +02:00
Konstantin Käfer
e506d6bcdd generalize stylesheet parse function 2014-05-26 12:30:27 +02:00
Konstantin Käfer
991eeaf24e fix blur fringes 2014-05-26 10:59:00 +02:00
Konstantin Käfer
0cb2d7ea48 Merge pull request #245 from mapbox/issue_241
Always build shaders during build process
2014-05-24 15:28:56 +02:00
Konstantin Käfer
225fd4c87d Merge pull request #244 from mapbox/issue_240
Correct namespace usage
2014-05-24 14:00:48 +02:00
Justin R. Miller
661860d12f foundations of delegate/callback API 2014-05-23 18:32:55 -07:00
Justin R. Miller
8d678e3e9c Merge branch 'master' of github.com:mapbox/llmr-native 2014-05-23 18:25:19 -07:00
Justin R. Miller
3c5a2c7935 disallow/undo rotation at low zooms and near world edge 2014-05-23 18:24:58 -07:00
Dane Springmeyer
9e7ee02fcd remove generated shaders from git - Closes #241 2014-05-23 16:41:08 -07:00
Dane Springmeyer
7e94462747 correct namespace usage 2014-05-23 16:38:26 -07:00
Nicki Dlugash
f2354ea6f2 Merge branch 'master' into road-poi-labels 2014-05-23 15:12:46 -04:00
Konstantin Käfer
889ef68b5b first draft at blurring 2014-05-23 18:30:49 +02:00
Konstantin Käfer
7d767f518b add keys to stylesheet 2014-05-23 13:38:59 +02:00
Konstantin Käfer
ce2270eafc use boost optional to mark initialized values 2014-05-23 13:14:11 +02:00
Justin R. Miller
3f55302fb5 reset angle on resize to small zooms 2014-05-22 16:54:04 -07:00
Justin R. Miller
dbd877cb80 disallow/undo rotation at low zooms 2014-05-22 16:47:17 -07:00
Justin R. Miller
1ff173a049 fixes #48: constrain min zoom/vertical pan to within world 2014-05-22 16:11:21 -07:00
Nicki Dlugash
2ecf410504 playing around with road and poi label strokes, to match updated icons 2014-05-22 18:50:05 -04:00
Justin R. Miller
12594ce8f1 clearer comments 2014-05-22 14:24:54 -07:00
Justin R. Miller
bccba97020 style cascading needs to happen every render for transitions 2014-05-22 14:22:54 -07:00
Justin R. Miller
80cb89a6b5 be sure to track previous composites 2014-05-22 12:52:06 -07:00
Justin R. Miller
aa92e92595 support for style transitions 2014-05-22 12:46:53 -07:00
Konstantin Käfer
084e7af377 better sprite warnings 2014-05-22 15:19:51 +02:00
Konstantin Käfer
ba17d2cffc no need to use nonpremultiplied alpha blending 2014-05-22 15:17:26 +02:00
Konstantin Käfer
04e70b240e Merge remote-tracking branch 'origin/master' into composite-layers
Conflicts:
	src/shader/shaders_gl.cpp
	src/shader/shaders_gles2.cpp
2014-05-22 14:49:27 +02:00
Konstantin Käfer
e1a59e0ae8 ifdef => if 2014-05-22 14:48:09 +02:00
Konstantin Käfer
6ae0b71bbb fix framebuffer drawing on ios 2014-05-22 14:15:51 +02:00
Konstantin Käfer
67ab9ff6f5 add cleanup call for destroying framebuffers 2014-05-22 12:41:17 +02:00