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
|
8b63d19198
|
prerender/blur terrain
|
2014-05-26 16:14:09 +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
|
a7c3b8b6f5
|
derive properties from a generic class
|
2014-05-26 11:58:37 +02:00 |
|
Konstantin Käfer
|
b6561dd342
|
increase http timeout
|
2014-05-26 10:59:15 +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
|
c73dd91307
|
add Core Graphics to deps for iOS app
|
2014-05-23 19:40:39 -07:00 |
|
Justin R. Miller
|
10be55f5c4
|
bump MVK for compass view
|
2014-05-23 19:31:10 -07:00 |
|
Justin R. Miller
|
661860d12f
|
foundations of delegate/callback API
|
2014-05-23 18:32:55 -07:00 |
|
Justin R. Miller
|
2d7b76e2fe
|
bump MVK for zoom/rotate gesture interactions
|
2014-05-23 18:29:33 -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
|
7f592ac2e7
|
Address #151 at the same time
|
2014-05-23 17:14:19 -07:00 |
|
Dane Springmeyer
|
105aa295f1
|
gyp: better xcode parameter usage
|
2014-05-23 16:51:37 -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 |
|
Dane Springmeyer
|
2bfb4f6ed2
|
more gyp fixups in line with #232
|
2014-05-23 16:32:20 -07:00 |
|
Dane Springmeyer
|
13d390534d
|
fix #232, refs #151
|
2014-05-23 16:13:39 -07:00 |
|
Nicki Dlugash
|
54fa90ce5b
|
Merge pull request #238 from mapbox/road-poi-labels
Road poi labels
|
2014-05-23 19:06:49 -04:00 |
|
Nicki Dlugash
|
da6658d286
|
changed country_label text_field back to name
|
2014-05-23 18:43:28 -04:00 |
|
Nicki Dlugash
|
0cf3495053
|
updated night poi label stroke, strokeWidth, and strokeBlur
|
2014-05-23 18:41:10 -04:00 |
|
Nicki Dlugash
|
f2354ea6f2
|
Merge branch 'master' into road-poi-labels
|
2014-05-23 15:12:46 -04:00 |
|
Justin R. Miller
|
07e15927af
|
remove unneeded headers
|
2014-05-23 11:29:58 -07: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
|
035b11e8a0
|
Merge branch 'master' of github.com:mapbox/llmr-native
|
2014-05-22 16:12:06 -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 |
|
Eden Halperin
|
a2104f074a
|
Merge branch 'master' of https://github.com/mapbox/llmr-native
|
2014-05-22 14:40:02 -07:00 |
|
Eden Halperin
|
cb039d9b9e
|
include noveg in wetland bucket
|
2014-05-22 14:39:56 -07: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
|
05882c0f54
|
Merge pull request #235 from mapbox/transitions
support for style transitions
|
2014-05-22 12:58:28 -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 |
|
Eden Halperin
|
cbe84299ed
|
slight adjustments to landcover colors for contrast discrepencies
|
2014-05-22 12:01:34 -07:00 |
|