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 |
|
Ansis Brammanis
|
4d38e4eb15
|
fix rotation range check in text shader
fixes #215
|
2014-05-19 17:35:55 -04:00 |
|
Konstantin Käfer
|
3391b27591
|
Merge branch 'outdoors-style' of https://github.com/mapbox/llmr-native into outdoors-style
|
2014-05-19 17:37:42 +02:00 |
|
Eden Halperin
|
84ebbcd851
|
use mapbox streets v5
|
2014-05-19 07:27:09 -07:00 |
|
Konstantin Käfer
|
a33d334169
|
incorporate the color and draw circle dots if we don't have an icon
Conflicts:
bin/style.js
|
2014-05-19 16:20:51 +02:00 |
|
Konstantin Käfer
|
7d73d158ba
|
incorporate the color and draw circle dots if we don't have an icon
|
2014-05-19 16:19:51 +02:00 |
|
Konstantin Käfer
|
9bb0146875
|
Merge branch 'master' into outdoors-style
Conflicts:
bin/style.js
|
2014-05-19 15:52:42 +02:00 |
|
Konstantin Käfer
|
ee82986717
|
disable debug image
|
2014-05-19 14:21:57 +02:00 |
|
Konstantin Käfer
|
92706445d9
|
init glfw for debug images + actually copy images over
|
2014-05-19 14:21:15 +02:00 |
|
Konstantin Käfer
|
f848868c16
|
fix texture binding
|
2014-05-19 14:18:29 +02:00 |
|
Konstantin Käfer
|
898c6d6714
|
fix for retina screens
|
2014-05-19 11:13:22 +02:00 |
|
Konstantin Käfer
|
13575330f7
|
use sprite atlas
|
2014-05-19 10:48:36 +02:00 |
|
Konstantin Käfer
|
27f8ed29e4
|
encode icon texture coordinate in buffer so we can render all pois with 1 draw call
|
2014-05-19 10:48:36 +02:00 |
|
Ansis Brammanis
|
4b2b19ccd3
|
use separate trees for horizontal and curved labels
from e4186926ed38fc1dc232c70098154251a9019669
|
2014-05-16 16:06:24 -04:00 |
|
Ansis Brammanis
|
264bcd34d9
|
flush command buffers when done
|
2014-05-16 14:04:12 -04:00 |
|
Konstantin Käfer
|
01183a0a19
|
fix remaining cases of point => icon
|
2014-05-15 18:09:00 +02:00 |
|
Konstantin Käfer
|
4c99014a13
|
don't use fractional texture coordiantes in the shader
|
2014-05-15 15:16:34 +02:00 |
|
Konstantin Käfer
|
27b695b068
|
use explicit constructors
|
2014-05-15 14:56:06 +02:00 |
|