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
|
708fb01276
|
used unordered_maps
|
2014-05-27 11:55:40 +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
|
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
|
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 |
|
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 |
|
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
|
1ff173a049
|
fixes #48: constrain min zoom/vertical pan to within world
|
2014-05-22 16:11:21 -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
|
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 |
|
Konstantin Käfer
|
ab4bc4ae30
|
add vec2 * mat4 multiplication
|
2014-05-21 19:23:20 +02: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 |
|
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 |
|
Justin R. Miller
|
550e381e70
|
name text halo properties like others
|
2014-05-20 11:26:52 -07:00 |
|
Eden Halperin
|
d0b885694d
|
fix labels
|
2014-05-19 15:29:56 -07:00 |
|
Ansis Brammanis
|
7547beadd3
|
add includes
|
2014-05-19 17:39:51 -04: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
|
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
|
24bd0bb667
|
include header
|
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 |
|
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 |
|
Konstantin Käfer
|
fda64b67af
|
rename point => icon
|
2014-05-15 14:51:02 +02:00 |
|