Justin R. Miller
23382f9267
Revert "refs #166 : fix for std::stoll et al. not handling strings"
...
This reverts commit 54d5f474c8 .
2014-05-12 17:09:06 -07:00
Justin R. Miller
160a02bb51
Merge branch 'outdoors-style' of github.com:mapbox/llmr-native into outdoors-style
2014-05-12 16:57:47 -07:00
Eden Halperin
9dc164f064
update contour lines
2014-05-12 16:35:32 -07:00
Eden Halperin
ec90ccd358
update sprite pointer and fix marine_label
2014-05-12 15:42:18 -07:00
Justin R. Miller
54d5f474c8
refs #166 : fix for std::stoll et al. not handling strings
2014-05-12 14:07:07 -07:00
Justin R. Miller
38e7682302
Merge branch 'master' of github.com:mapbox/llmr-native
2014-05-12 14:00:19 -07:00
Justin R. Miller
bc29ed5a9c
refs #166 : fix for std::stoll et al. not handling strings
2014-05-12 14:00:10 -07:00
Dane Springmeyer
fcd7a230e1
Merge branch 'master' of github.com:mapbox/llmr-native into clear-caches
2014-05-12 13:57:34 -07:00
Dane Springmeyer
6538f580ce
ensure setup-libraries.sh checks for valid pkg-config
2014-05-12 13:40:58 -07:00
Eden Halperin
66dbcce4fd
fix landuse industrial layer
2014-05-12 12:17:43 -07:00
Justin R. Miller
b6d6c7ee30
re-add iOS Xcode instructions
2014-05-12 14:07:20 -04:00
Eden Halperin
8f2c211ff0
remove hillshade antialiasing
2014-05-12 10:56:36 -07:00
Konstantin Käfer
263c887777
don't try to render layers that do not produce anyting during the current render pass
...
refs #184
2014-05-12 19:53:06 +02:00
Dane Springmeyer
755c51fcdd
Merge branch 'master' of github.com:mapbox/llmr-native into clear-caches
...
Conflicts:
Makefile
2014-05-12 10:38:07 -07:00
Eden Halperin
1dfd2fcd59
transparent stroke on hillshade fills
2014-05-12 10:25:11 -07:00
Konstantin Käfer
2b14579986
only paint layer if it has data
...
refs #184
2014-05-12 19:08:59 +02:00
Konstantin Käfer
2a3377cc4d
fix typo
...
fixes #186
2014-05-12 18:28:21 +02:00
Konstantin Käfer
d9d9b281c4
disable texture deleting for now
2014-05-12 18:25:58 +02:00
Konstantin Käfer
6ebb4c21f7
clean up gl::group() structure
2014-05-12 18:25:48 +02:00
Konstantin Käfer
6136ab6d21
draw by layer, not by tile
...
This is needed for correctly compositing raster imagery into the map
fixes #122
fixes #157
2014-05-12 17:13:26 +02:00
Konstantin Käfer
16e8d8137b
Merge branch 'master' of https://github.com/mapbox/llmr-native
2014-05-12 16:06:31 +02:00
Konstantin Käfer
b705382b9f
add cross compile build script
...
[skip ci]
2014-05-12 04:00:47 -07:00
Konstantin Käfer
d964128cc5
make sure node is available
2014-05-12 10:40:10 +02:00
Konstantin Käfer
604e558d46
add missing include header
2014-05-10 10:32:30 +02:00
Nicki Dlugash
4a2e75a33d
fixed road label and place_label_other style to make them appear
2014-05-09 19:19:43 -07:00
Eden Halperin
db013095e9
update style with labels
2014-05-09 16:51:09 -07:00
Dane Springmeyer
13988467ca
Merge branch 'master' of github.com:mapbox/llmr-native into clear-caches
2014-05-09 14:09:10 -07:00
Dane Springmeyer
53decedf85
more selective cache clear
2014-05-09 14:08:58 -07:00
Konstantin Käfer
0bfd7b0f43
Calculate clip IDs with a huffman prefix tree
...
This changes the clip IDs from sequential to a huffman prefix tree, meaning that
parent tiles share the same prefix with child tiles (but are shorter). This allows
us to use the same checkerboard pattern to draw all tiles.
TODO:
- make sure we're not overflowing the 8 bit limit of the stencil buffer
- draw all checkerboard fields at the same time, with one draw call
- fix raster drawing (fading, clipping)
refs #132
2014-05-09 18:10:28 +02:00
Eden Halperin
11c8be6f94
start of outdoors style
2014-05-08 16:55:00 -07:00
Dane Springmeyer
70a7ba81f3
ensure resources.cpp is included in xcode project - closes #175
2014-05-08 15:11:34 -07:00
Dane Springmeyer
895977a538
setup-libraries: improve dependency checking
2014-05-08 14:42:09 -07:00
Dane Springmeyer
f02c572618
clear xcode caches if they appear older than a day - refs #174
2014-05-08 14:25:36 -07:00
Nicki Dlugash
c4067e28ba
Update README.md
...
`./setup_libraries.sh` --> `./setup-libraries.sh`
2014-05-08 11:41:21 -07:00
Konstantin Käfer
ee55798842
remove debug code and use unary visitor directly
2014-05-08 13:44:31 +02:00
Konstantin Käfer
d59aedc372
don't show warnings in boost
2014-05-08 13:43:34 +02:00
Konstantin Käfer
7f4f327166
make sure we're not converting too relaxedly
2014-05-08 13:42:54 +02:00
Konstantin Käfer
115afe3b10
add relaxed comparsion function + tests
2014-05-08 13:03:59 +02:00
Justin R. Miller
e76bd031fc
refs #147 : basic "locate me" button in debug UI
2014-05-07 17:35:20 -07:00
Justin R. Miller
2b9fbb0731
squashed stylequest merge
...
* uses OSM Bright style
* adds dot shader
* adds layer translation
* adds dashed line support
* adds style array parsing
* improves background layer parsing
* improves style constant parsing
* fixes sprite JSON pixel ratio parsing
2014-05-07 10:37:25 -07:00
artemp
40e3372b80
variant : add binary visitation support
2014-05-05 12:54:17 +01:00
Konstantin Käfer
93e0c49faa
add variant test
2014-05-02 13:41:45 +02:00
Justin R. Miller
7010954229
refs #159 : fix bug with filtering on numeric layer values
2014-05-02 11:18:59 +02:00
Konstantin Käfer
ab22f68970
fix comment
2014-05-02 10:30:52 +02:00
Konstantin Käfer
6574f0d188
add setAngle() call with duration
2014-05-02 10:28:47 +02:00
Konstantin Käfer
485a9a40bc
formatting
2014-05-02 10:25:58 +02:00
Konstantin Käfer
4ac34b49a0
there's no need to reset the image data
2014-05-02 10:25:58 +02:00
Justin R. Miller
e56a8113e7
fix animation duration casting errors
2014-05-01 12:20:39 -07:00
Justin R. Miller
4833689c74
we no longer use this notification
2014-05-01 11:26:59 -07:00
Justin R. Miller
ad4e075e43
fix iOS view controller for animations->transitions
2014-04-30 17:30:49 -07:00