Commit Graph

38 Commits

Author SHA1 Message Date
Ansis Brammanis
4ec0028856 switch from low/high to from/to 2015-02-04 12:08:29 -08:00
Ansis Brammanis
465b1ac3eb Merge branch 'master' into pattern-functions
Conflicts:
	src/mbgl/renderer/painter.cpp
	src/mbgl/renderer/painter.hpp
	src/mbgl/renderer/painter_fill.cpp
	src/mbgl/renderer/painter_line.cpp
	src/mbgl/style/style_layer.cpp
	src/mbgl/style/style_layer.hpp
	src/mbgl/style/style_layer_group.cpp
	src/mbgl/style/style_layer_group.hpp
2015-02-04 11:05:36 -08:00
Konstantin Käfer
5503aef690 make vaos immovable 2015-02-04 10:49:05 +01:00
Lauren Budorick
895d90409b Add functions for layout properties. 2015-02-03 16:09:58 -08:00
Leith Bade
63e4c75275 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into chrono
Conflicts:
	ios/mapbox-gl-cocoa
2015-02-04 10:44:57 +11:00
Leith Bade
89bbd29278 Use std::chrono 2015-02-04 09:39:25 +11:00
Ansis Brammanis
23dd403a25 add wrapped padding to sprite for repeating images
fixes #798
js: e732e784e41bef35bd40de27fdbfa3e8f9588038
2015-02-03 13:17:26 -08:00
Ansis Brammanis
c9f8de863d remove old version of zoomHistory 2015-02-02 18:27:55 -08:00
Ansis Brammanis
6f5c6b58b4 use faded pattern functions for dasharrays 2015-02-02 17:57:12 -08:00
Ansis Brammanis
322f46a5db implement functions for line-image 2015-02-02 17:57:12 -08:00
Ansis Brammanis
b3ca6fcca6 implement functions for background-image 2015-02-02 16:23:10 -08:00
Ansis Brammanis
d532824aec implement functions for patterns
It introduces a new function type, FadedStopsFunction, that transitions
between the stops values instead of interpolating between them.
2015-02-02 14:46:48 -08:00
Ansis Brammanis
47966a1431 make line-opacity work with line-image
js: 0e9a86e3553913abb8ebb3d8926e2b99db8d4008
2015-01-30 11:02:26 -08:00
Ansis Brammanis
60035d7728 Merge branch 'no-crossfade'
Conflicts:
	src/mbgl/renderer/painter_line.cpp
2015-01-26 12:19:40 -08:00
John Firebaugh
7694b0c1ec Merge pull request #771 from mapbox/visibility
Add visibility property for v7
2015-01-26 11:09:16 -08:00
Ansis Brammanis
8f620bed8a reduce gamma for dashes to make them sharper
because the shader uses the range [0.5 - gamma, 0.5 + gamma] gamma
should be half the distance you want to blur, not the full distance.

js: 35b42808922506a6039b8bfd3dc10098692c1268
2015-01-23 19:56:26 -05:00
Ansis Brammanis
5955ac3493 transition dashes when resetting their stretch
Dash patterns stretch from one integer zoom until the
next integer zoom where they reset. This transitions
those resets.

js: be5c7184bfd8cc9d47299041eb7fadbd41f6f6f0
2015-01-23 17:25:31 -05:00
Ansis Brammanis
d0d33a3ee7 don't permanently crossfade line patterns
js: a2e8527b4023d19fa0c58130a105aaf283f4b152
2015-01-23 17:12:41 -05:00
Ansis Brammanis
c5d5a799be Don't permanently crossfade fill patterns.
js: 00e11591106dae7eb02eff0328364d8ec03fdaa5
2015-01-23 17:05:30 -05:00
Lauren Budorick
66355b7d86 Add visibility property for v7. 2015-01-22 17:11:07 -08:00
John Firebaugh
a8b6e3dc71 Merge remote-tracking branch 'origin/dash-3' into v7 2015-01-22 13:06:30 -08:00
John Firebaugh
8e23e3a3e8 Remove support for prerendered layers
https://github.com/mapbox/mapbox-gl-style-spec/issues/232
2015-01-21 18:41:17 -08:00
Ansis Brammanis
4f827c21c6 implement round dash caps 2015-01-14 22:56:44 -05:00
Ansis Brammanis
2c615b613c support dash arrays that are any length 2015-01-14 22:24:44 -05:00
Ansis Brammanis
8bfaf12793 remove old dash support from line shader 2015-01-14 21:11:19 -05:00
Ansis Brammanis
2643a0efc7 start porting dash lines from js
- switches to dash units that are scaled by line width
- adds a lineatlas to store patterns line dashed lines
- adds linesdf shader which renders line fill from the lineatlas

js: 8e83d76af3bd877eb9639c02e296363e2c0186f8
2015-01-14 20:56:18 -05:00
Ansis Brammanis
5670fb397f get rid of separate vector for symbol geometries 2015-01-12 12:33:24 -05:00
Ansis Brammanis
e4858b6a02 merge adjacent roads with same text for labelling
js: https://github.com/mapbox/mapbox-gl-js/pull/683
2015-01-08 23:44:11 -05:00
Ansis Brammanis
166a3e21fa rephrase line uniform calculations to match js
js: 359a576471e20373333cae80a5eccda95ee4cdc2
2015-01-08 14:40:19 -05:00
Konstantin Käfer
bec97a3d40 warp in MBGL_CHECK_ERROR() call 2014-12-12 12:37:55 +01:00
Konstantin Käfer
febfb7ac09 fix rendering errors 2014-12-12 12:37:55 +01:00
Konstantin Käfer
f8ba23377d [performance] remove glFlush() 2014-12-12 12:37:55 +01:00
Konstantin Käfer
5b14c85b78 use 4-byte aligned vertex attributes for performance reason
reverts 9d5f02ccaa and 4c0b4a7901
2014-12-12 12:37:54 +01:00
Konstantin Käfer
93d56294cf update error reporting function 2014-12-10 13:21:08 +01:00
Leith Bade
08b07c30a7 Reduce GL log spew 2014-12-10 22:15:41 +11:00
Leith Bade
0808485453 Use CHECK_ERROR on every GL call 2014-12-10 21:57:34 +11:00
John Firebaugh
de098591c5 Remove Map::cleanup and Painter::cleanup
Both were noops.
2014-12-06 14:08:40 -08:00
Konstantin Käfer
abafb52f37 make most headers private 2014-12-04 20:02:50 +01:00