Commit Graph

2612 Commits

Author SHA1 Message Date
Thiago Marcos P. Santos
4a1a7937ae [core] Move set/get thread names to platform::
Android needs its own implementation.
2016-07-16 10:38:42 +03:00
Bruno de Oliveira Abinader
9ef30c2352 [core] Update color layer properties code generator 2016-07-14 16:24:11 +03:00
Thiago Marcos P. Santos
389c7615eb [core] Revert workaround for std::atomic on ARMv5
Got fix on r12.

https://github.com/android-ndk/ndk/issues/31
2016-07-13 17:56:51 +03:00
Bruno de Oliveira Abinader
174d367699 [core] Prefer color aliases for default property values 2016-07-13 11:57:09 +03:00
Bruno de Oliveira Abinader
c670b08ecb [core] Use PropertyValue<T> for Annotation line/fill 2016-07-13 11:57:09 +03:00
Minh Nguyễn
08d0a9a0e2 Quadkey tokens in tile URL templates, limited WMS support (#5628)
* [core] Quadkey tokens in tile URL templates

Fixes #5485.

* [core] WMS tokens in tile URL templates

Fixes #822.

* [macos] Added WMS debug style

Added a style to the macosapp resource bundle that can be used to test WMS support. To use it, zoom in to somewhere in New Jersey, then go to View ‣ Custom Style and enter “wms.json”.
2016-07-12 10:57:18 -07:00
Thiago Marcos P. Santos
86cebd4cca [core] Report conversion errors using std::string
char* increases the risk of pointing to a invalid reference. Qt had
to use a static variable as retainer to workaround.
2016-07-12 16:04:20 +03:00
Bruno de Oliveira Abinader
e197540f9a [core] Fix matrix when panning around the world
Partially reverts commit 1d46e83.
2016-07-12 11:36:26 +03:00
John Firebaugh
fe99295970 [core] Remove unused 2016-07-11 18:39:50 -07:00
John Firebaugh
ae838b397b [core] Move translatedMatrix to RenderTile 2016-07-11 18:39:50 -07:00
John Firebaugh
a27b5586e5 [core] Pass RenderTile rather than individual parameters 2016-07-11 18:39:50 -07:00
John Firebaugh
6e77149c13 [core] Introduce PaintParameters
Use it to DRY selection of regular vs. overdraw shaders and VAOs.
2016-07-11 18:39:50 -07:00
John Firebaugh
822ec091da [core] Introduce non-anonymous Shaders class 2016-07-11 18:39:50 -07:00
Bruno de Oliveira Abinader
5d64cde6d9 [core] Fix raster shader opacity in some cases 2016-07-11 15:47:41 +03:00
Jesse Bounds
626cf54be2 Merge branch 'boundsj-merge-3.3.0.rc.1' 2016-07-08 09:30:22 -07:00
Konstantin Käfer
4f26c8122a [core] track texture state to avoid redundand binds 2016-07-08 13:11:25 +02:00
Jesse Bounds
23caa9f7aa Merge branch 'release-ios-v3.3.0' into master 2016-07-07 15:40:07 -07:00
John Firebaugh
c09fb0f519 [core] Add support for circle-pitch-scale 2016-07-07 14:32:27 -07:00
John Firebaugh
c8e87128b1 [core] Make extrudeScale calculations more similar to JS 2016-07-07 14:18:00 -07:00
Konstantin Käfer
2e10c0a866 [core] don't force GL state to be set when calling .reset()
We are using Value::reset() to change a piece of GL state to its default value. However, the current implementation always executes the GL call, even if our state tracking system knows that it's already at that value. The new implementation of Value::reset() now respects that, resulting in a lot fewer GL calls.
2016-07-07 16:29:34 +02:00
Konstantin Käfer
69c529e264 [core] move shaders to anon struct and alias them 2016-07-07 15:06:59 +02:00
Jesse Bounds
c4bd946f9b [core] Re-close polygons after clipping with clipper (#5596)
This pulls in the implementation change in https://github.com/mapbox/
mapbox-gl-native/commit/903d609b40b6d0f4873f7bb46d96f4a06d7b17d6 from
the master branch for the iOS 3.3.0 release.
2016-07-06 15:25:37 -07:00
Young Hahn
71a3b1d0db [core] geometry@0.8.0 / geojsonvt@6.0.0 (#5514)
* [core] geometry.hpp 0.8.0

* geojsonvt @ 6.0.0

* Update platform deps, build scripts

* Perf optimizations/cleanup

* Rebase in geometry@080

* D.R.Y. etc

* Ensure fill annotation geometries have closed rings.

* Optimizations

* Update to geojsonvt @ 6.1.0 for clean handoff between geojson parsing and geojsonvt

* Apply close multi/poly geoms for line annotations as well
2016-07-06 17:29:34 -04:00
John Firebaugh
903d609b40 [core] Re-close polygons after clipping with clipper 2016-07-06 11:24:49 -07:00
Fredrik Karlsson
546469459f [ios] #3979 compress telemetry events (#5490)
* [ios] #3979 wip gzip telemetry events

* [ios] expose compression from core instead of adding a new dependency

* [ios] #3979 Exposed decompress from mbgl and added a test case

* [ios] #3979 cleanup

* [ios] #3979 cleaned up test case

* [ios] #3979 cleanup

* [ios] #3979 gzip -> deflate
2016-07-05 22:46:04 +02:00
John Firebaugh
d58bee6d90 [core] Avoid unnecessary copies in GlyphSet::insert 2016-07-04 17:35:20 -07:00
Konstantin Käfer
1311ed24ad [core] refactor Raster and allow explicit mipmapping levels 2016-07-04 14:24:32 +02:00
Bruno de Oliveira Abinader
9f18d19a20 [core] Fix typo in coveringPlainOverdrawArray 2016-07-04 12:33:05 +03:00
jingsam
e82ecc60ac mapbox: URL containing query string causes infinite loop (#5554)
* correct all EXPECT_EQ(actual, expected) to EXPECT_EQ(expected, actual)

* fix getMapboxURLPathname() of URL with querystring

* add test for normalizeSourceURL of non-mapbox protocal

* Update mapbox.cpp
2016-07-04 00:26:28 -07:00
Bruno de Oliveira Abinader
aa1fa49af5 [core] Update RasterShader
Ref: https://github.com/mapbox/mapbox-gl-shaders/issues/1
2016-07-02 18:04:20 +03:00
Bruno de Oliveira Abinader
3bf85cc55d [core] Added StaticRasterVertexBuffer 2016-07-02 17:21:59 +03:00
Bruno de Oliveira Abinader
d8a10ac509 [core] Added missing overdraw arrays 2016-07-02 17:18:00 +03:00
Bruno de Oliveira Abinader
f94b354b53 [core] Fix typo in shader outline pattern 2016-07-02 17:17:28 +03:00
Bruno de Oliveira Abinader
b3c07b0277 [core] Enforce solid fragColor for debug frame/text 2016-07-02 13:05:21 +03:00
Bruno de Oliveira Abinader
a17b0bcd82 [core] Fix overdraw mode on Linux
- Use glBindAttribLocation for GLSL attributes.
- Create a separate shader for each shader that supports overdraw.
  Needed because each uniform location must be known for every program.
- Create a separate VAO for each shader inside buckets.
  Needed because we can only bind a VAO to a specific shader.

Fixes #5435.
2016-07-01 19:47:35 +03:00
Konstantin Käfer
eb7cfea7ea [android] upgrade to NDK r12b 2016-07-01 18:26:55 +02:00
Konstantin Käfer
77e7846756 [core] code style cleanups
- puts function definitions in a namespace ... {} rather than using namespace ...;
- remove trailing whitespace
- add trailing newline
- protect SQL statements from being formatted by clang-format
2016-07-01 12:38:33 +02:00
Brad Leege
8e0b06e4dc [android] [core] #5521 - Removing extraneous equals sign 2016-06-30 13:39:49 -05:00
Bruno de Oliveira Abinader
1d46e83e30 [core] Use the right types for zoom scale logic
32 bit integers should be enough for zoom scale logic. In shape
annotation logic, 'maxAmountOfTileFeatures' requires 64 bits because we
are multiplying the zoom scale with the extent, which might give a
number higher than std::numeric_limits<uint32_t>::max().
2016-06-28 12:00:53 +03:00
Bruno de Oliveira Abinader
e1be2c45c1 [core] Set annotation max zoom to 18 2016-06-28 11:26:37 +03:00
John Firebaugh
8956179ce0 [core] Merge TexturePool into ObjectStore; pool all textures (#5477) 2016-06-27 13:44:46 -07:00
John Firebaugh
3d16cd088f [core] Protect against invalid geometries 2016-06-24 12:21:44 -07:00
John Firebaugh
021d4199cb [core, node] Implement bindings for addSource 2016-06-24 09:39:51 -07:00
John Firebaugh
16c435b151 [core, node] Implement bindings for addLayer 2016-06-24 09:39:51 -07:00
John Firebaugh
c4e4cc5081 [core] Adjust layer source properties to better reflect reality
* Layer source ID is immutable; must be provided to the constructor
* Layer source layer is mutable
* Layers with GeoJSON sources do not have a source layer

While here, make Layer::copy impl-private.
2016-06-24 09:39:15 -07:00
John Firebaugh
089c4e413f [core] Split up and clean up conversion.hpp 2016-06-24 09:39:15 -07:00
John Firebaugh
cb6a519f7c [core] Include what you use 2016-06-24 09:39:15 -07:00
John Firebaugh
699076c2fa [core] Remove TexturePool from style::UpdateParameters (#5442) 2016-06-22 12:32:06 -07:00
Konstantin Käfer
d58ed6f9f3 [core] remove TexturePool dependency from Raster constructor 2016-06-22 16:28:32 +02:00
John Firebaugh
3459b83736 [core, node] Node bindings for setFilter 2016-06-21 18:24:49 -07:00