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 |
|
Eden Halperin
|
5bb1d151d4
|
transition bigger airport poi
|
2014-05-22 11:50:38 -07:00 |
|
Eden Halperin
|
7012d686fc
|
landuse_snow structure
|
2014-05-22 11:09:59 -07:00 |
|
Eden Halperin
|
3efbe29199
|
add landuse_snow bucket
|
2014-05-22 11:05:49 -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
|
dffbb673ea
|
read style filename from gyp file
|
2014-05-22 15:10:10 +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
|
d1df97d46b
|
add cleanup call to mvkmapkit
|
2014-05-22 12:46:26 +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
|
1cfa10753a
|
remove transition properties, fix poi label size descrepancy
|
2014-05-21 16:01:23 -07:00 |
|
Eden Halperin
|
4f44337ae4
|
lighter waterway labels
|
2014-05-21 14:57:52 -07:00 |
|
Eden Halperin
|
9626f3057b
|
night style updates
|
2014-05-21 14:36:50 -07:00 |
|
Eden Halperin
|
3d7906e590
|
lighten night admin color
|
2014-05-21 12:04:26 -07:00 |
|
Eden Halperin
|
61dc88bfec
|
add barrier_line styles
|
2014-05-21 11:25:01 -07:00 |
|
Eden Halperin
|
05f309ac22
|
more constants
|
2014-05-21 10:38:26 -07:00 |
|
Konstantin Käfer
|
ab4bc4ae30
|
add vec2 * mat4 multiplication
|
2014-05-21 19:23:20 +02:00 |
|
Eden Halperin
|
e855c7734d
|
Merge branch 'master' of https://github.com/mapbox/llmr-native
|
2014-05-21 10:23:18 -07:00 |
|
Eden Halperin
|
429850866a
|
width functions as constants
|
2014-05-21 10:23:09 -07:00 |
|
Nicki Dlugash
|
cc4af71d44
|
updated night hillshade colors and opacity
|
2014-05-21 13:22:05 -04: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
|
a810dbc414
|
use $BUILDTYPE variable
|
2014-05-21 10:42:38 +02:00 |
|
Konstantin Käfer
|
6101a572c5
|
add makefile targets for osx
|
2014-05-21 10:41:00 +02:00 |
|
Konstantin Käfer
|
752661ae6e
|
allow functions to be referenced from constants
fixes #224
|
2014-05-21 10:29:36 +02:00 |
|
Eden Halperin
|
7f00a63fd0
|
fix waterways
|
2014-05-20 20:40:50 -07:00 |
|
Eden Halperin
|
d1e9fc9503
|
night style adjustments
|
2014-05-20 18:00:02 -07:00 |
|
Eden Halperin
|
6709ed25bc
|
no constants for transitions
|
2014-05-20 17:29:55 -07:00 |
|
Eden Halperin
|
b0baeb246e
|
Merge branch 'master' of https://github.com/mapbox/llmr-native
|
2014-05-20 17:18:32 -07:00 |
|
Eden Halperin
|
11da04667e
|
add transition properties
|
2014-05-20 17:17:02 -07: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 |
|