Commit Graph

2256 Commits

Author SHA1 Message Date
Konstantin Käfer
953e5524a9 fix basepath for headless stylesheets 2014-08-27 14:28:56 +02:00
Mike Morris
5833f8af25 Revert "fix uv_cwd call"
This reverts commit 1882884c9e.
2014-08-26 18:45:42 -04:00
Mike Morris
1882884c9e fix uv_cwd call 2014-08-26 17:38:34 -04:00
Mike Morris
050b00cb58 Merge branch 'master' into libuv010
Conflicts:
	setup-libraries.sh
2014-08-26 16:55:08 -04:00
Konstantin Käfer
5b4ad90bac Merge pull request #445 from mapbox/nsstring
Use NSString-specific case change functions on OS X/iOS
2014-08-26 17:43:02 +02:00
Konstantin Käfer
0f73a0192e Merge pull request #439 from mapbox/clipping
Compute unique clip IDSs per tile
2014-08-26 17:42:53 +02:00
Konstantin Käfer
a889cde6de Merge pull request #440 from mapbox/infinite-placement
Never place infinitely deep symbols
2014-08-26 17:42:41 +02:00
Konstantin Käfer
7dcc061ac5 Merge pull request #437 from mapbox/fix-gcc
Make linux fails
2014-08-26 17:42:34 +02:00
Mike Morris
7ae3b8e8ee Merge branch 'master' into libuv010 2014-08-25 16:13:24 -04:00
John Firebaugh
3d9a293258 Support for Mapbox fontstack API 2014-08-22 17:14:51 -07:00
Leo Lou
c6a947de12 Use float for pixelRatio 2014-08-22 09:31:30 -07:00
Konstantin Käfer
6610a6370b use platform-specific NSString for case changes on OS X/iOS
refs #309
2014-08-22 12:37:23 +02:00
Lauren Budorick
0168612ed3 Load TileJSON; support inline TileJSON sources
Fixes #412
Refs https://github.com/mapbox/mapbox-gl-style-spec/pull/143
2014-08-21 16:12:27 -07:00
Konstantin Käfer
de822826c6 never place infinitely deep symbols 2014-08-21 15:52:27 +02:00
Konstantin Käfer
6730beec0e remove unused threadpool class 2014-08-21 15:51:10 +02:00
Konstantin Käfer
1fa3a3e85a add a few fixes for gcc
fixes #437
2014-08-21 15:46:20 +02:00
Konstantin Käfer
671e3910d6 don't duplicate function 2014-08-21 15:14:00 +02:00
Konstantin Käfer
9c5f9218ac add missing file 2014-08-21 15:10:01 +02:00
Konstantin Käfer
863b4577e4 compute unique clip ids per tile, taking covering children into account
fixes #206
fixes #220
refs #229
2014-08-21 15:02:08 +02:00
Mike Morris
3466f36412 bump mapnik-packaging, conform to libuv 0.10 api 2014-08-20 19:43:29 -04:00
John Firebaugh
b9c7e1bdd9 Consolidate duplicate interpolation definitions
While here, do not interpolate style properties that
are not transitionable. The previous behavior was to
switch from old to new value halfway through the transition;
now the new value is used immediately, as in JS.
2014-08-20 13:58:37 -07:00
John Firebaugh
2660b7bd1b Rename existing interpolate -> resample 2014-08-20 13:52:39 -07:00
Konstantin Käfer
d1ce6fdbeb Merge pull request #429 from mapbox/texture-updates
Use texSubImage2D to avoid texture memory reallocation
2014-08-19 11:52:35 +02:00
Konstantin Käfer
d147e18153 update mapbox/variant 2014-08-19 11:38:26 +02:00
Konstantin Käfer
598c755cbd use texsubimage2d to avoid texture memory reallocation 2014-08-18 15:19:52 +02:00
Konstantin Käfer
5a59b5f5fc fix warnings 2014-08-18 14:05:52 +02:00
Ansis Brammanis
32a1711d8c remove support for composite layers 2014-08-15 15:52:53 +02:00
Konstantin Käfer
478a1dae67 Merge pull request #419 from mapbox/crosstile
allow crosstile labels and add `symbol-avoid-edges`
2014-08-15 15:50:36 +02:00
Konstantin Käfer
937f82fcda use pimpl for collision in tile_parser 2014-08-15 15:18:29 +02:00
Ansis Brammanis
6c45972502 allow crosstile labels and add symbol-avoid-edges 2014-08-15 15:18:29 +02:00
Konstantin Käfer
8c2c7f769f coalesce texture uploads at the beginning of a frame 2014-08-15 15:10:49 +02:00
Konstantin Käfer
8c3675755e base static vertexbuffer on buffer object 2014-08-15 13:39:49 +02:00
Konstantin Käfer
ba67fcd830 refactor vao object to use acutal OpenGL IDs rather than object pointers 2014-08-15 13:37:19 +02:00
Konstantin Käfer
a81c2efba2 don't replace shaders on duplicate setup() call
fixes #408
2014-08-15 13:36:14 +02:00
Konstantin Käfer
d6bfb4be65 fix binding to vaos 2014-08-14 18:30:45 +02:00
Konstantin Käfer
1799c1b04c fix image pattern rendering 2014-08-14 12:58:41 +02:00
Konstantin Käfer
bfd1281285 only set changed glDepthRange values 2014-08-14 12:58:41 +02:00
Lauren Budorick
badc1ea28b Merge pull request #418 from mapbox/raster-styling
Raster styling
2014-08-13 11:00:04 -07:00
Lauren Budorick
8a9a43af7f fix std::sqrt 2014-08-13 09:52:54 -07:00
Konstantin Käfer
3492a55f97 remove unnecessary variable
[skip ci]
2014-08-13 10:44:44 +02:00
Lauren Budorick
b2aa60baac std namespacing trig fns 2014-08-12 22:56:16 -07:00
Lauren Budorick
4de2aafd30 rm commented line [skip ci] 2014-08-12 19:01:40 -07:00
Lauren Budorick
adb04662f9 parsing brightness correctly 2014-08-12 18:56:42 -07:00
Lauren Budorick
0d2724dec4 Raster styling all functional except brightness -- need to rework parsing 2014-08-12 18:27:35 -07:00
Konstantin Käfer
22e179aa37 remove trailing whitespace
[skip ci]
2014-08-12 16:30:27 +02:00
Konstantin Käfer
18b1469e9e use unified RenderPass type 2014-08-12 15:24:02 +02:00
Konstantin Käfer
64d5cea94f Merge branch 'master' into rasterize
[skip ci]
2014-08-12 15:15:05 +02:00
Konstantin Käfer
213b6ad4dc Merge branch 'master' into rasterize
[skip ci]
2014-08-12 15:12:31 +02:00
Konstantin Käfer
df47a7be90 explicitly define destructor to avoid destructing with forward declaration 2014-08-12 13:35:04 +02:00
Konstantin Käfer
9b9ad20a90 Merge branch 'master' into style-parser-test
Conflicts:
	mapboxgl.gyp
2014-08-12 13:16:20 +02:00