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 |
|
Konstantin Käfer
|
5bf52bfcd7
|
fix compile on ios
|
2014-05-22 12:28:19 +02:00 |
|
Konstantin Käfer
|
bb2cda34a7
|
make sure we're not calling functions that aren't threadsafe
|
2014-05-22 12:12:19 +02:00 |
|
Eden Halperin
|
429850866a
|
width functions as constants
|
2014-05-21 10:23:09 -07:00 |
|
Konstantin Käfer
|
53a6992728
|
fix alpha blending + add depth/stencil buffers
|
2014-05-21 18:34:41 +02:00 |
|
Konstantin Käfer
|
16a79b42ca
|
show tile parse warnings
|
2014-05-21 14:18:25 +02:00 |
|
Konstantin Käfer
|
834ef2eee8
|
don't require a style for composited layers
|
2014-05-21 13:40:59 +02:00 |
|
Vladimir Agafonkin
|
d1df6c9ee7
|
underscale by 1 zoom level instead of 3
|
2014-05-21 14:31:24 +03:00 |
|
Konstantin Käfer
|
13939b26d9
|
first shot at composited blending
still missing:
- stencil+depth mask
- alpha compositing
|
2014-05-21 10:55:09 +02:00 |
|
Konstantin Käfer
|
238fe86571
|
partially revert 6136ab6d21
background: we are doing separate opaque/translucent passes per composite layer
and then we're compositing them in the translucent phase
|
2014-05-21 10:53:40 +02:00 |
|
Konstantin Käfer
|
017145f052
|
show style parse warning if the flag is set
|
2014-05-21 10:53:40 +02:00 |
|
Konstantin Käfer
|
575491e65c
|
make sure we also parse classes for nested layers
|
2014-05-21 10:53:40 +02:00 |
|
Konstantin Käfer
|
de149b0543
|
optimized shaders
|
2014-05-21 10:53:12 +02:00 |
|
Konstantin Käfer
|
752661ae6e
|
allow functions to be referenced from constants
fixes #224
|
2014-05-21 10:29:36 +02:00 |
|
Ansis Brammanis
|
f1e1dd112f
|
Merge branch 'master' of github.com:mapbox/llmr-native
|
2014-05-20 20:15:48 -04:00 |
|
Ansis Brammanis
|
2c1d4c4678
|
fix "bumped" zoom for label fading
fixes #138
|
2014-05-20 20:14:47 -04:00 |
|
Ansis Brammanis
|
362c055aa6
|
remove line causing flickering
|
2014-05-20 20:08:32 -04:00 |
|
Eden Halperin
|
9e49dedc28
|
night styles first pass
|
2014-05-20 15:52:57 -07:00 |
|
Justin R. Miller
|
550e381e70
|
name text halo properties like others
|
2014-05-20 11:26:52 -07:00 |
|
Konstantin Käfer
|
fde4f2cd70
|
Merge branch 'master' into outdoors-style
|
2014-05-20 12:21:59 +02:00 |
|
Konstantin Käfer
|
1420848314
|
accomodate function values for tile size difference
|
2014-05-20 12:21:32 +02:00 |
|
Konstantin Käfer
|
a81f41f41f
|
Merge branch 'master' into outdoors-style
Conflicts:
bin/style.js
|
2014-05-20 12:12:40 +02:00 |
|
Konstantin Käfer
|
e0381a782c
|
use smallest/largest value in undefined regions
refs #217
|
2014-05-20 11:52:17 +02:00 |
|
Konstantin Käfer
|
6bffa49309
|
don't account for tile size in the function; the value is tile source dependent
|
2014-05-20 11:51:49 +02:00 |
|
Konstantin Käfer
|
3be068f8da
|
make sure they never throw. asserts are compiled out in production!
|
2014-05-20 11:23:33 +02:00 |
|
Konstantin Käfer
|
a6cb3d8402
|
fix label display
refs #217
|
2014-05-20 11:10:27 +02:00 |
|
Eden Halperin
|
d0b885694d
|
fix labels
|
2014-05-19 15:29:56 -07:00 |
|
Ansis Brammanis
|
2b348ccfd4
|
Merge branch 'master' of github.com:mapbox/llmr-native
|
2014-05-19 17:36:50 -04:00 |
|