Commit Graph

1201 Commits

Author SHA1 Message Date
Konstantin Käfer
5d2ed0326e fix double-free in race conditions when notify() was called twice 2015-02-13 13:28:39 -08:00
Leith Bade
acfeda9899 Fix #include <uv.h> mixing between C and C++ modes 2015-02-11 19:01:30 -08:00
Ansis Brammanis
c621441def Fix line label interpolation offset. 2015-02-11 14:12:32 -08:00
Ansis Brammanis
b53b24a6bc Merge remote-tracking branch 'origin/master' into line-label-density 2015-02-10 15:21:36 -08:00
Ansis Brammanis
8e459c2a73 improve line label density
Place the first label as close to the beginning of the line as possible.

js: 316ed0bd9bff8cd430ad81d0b6397f396fbce124
2015-02-10 15:21:18 -08:00
John Firebaugh
ad481f6f12 Merge pull request #821 from mapbox/pattern-functions
functions for everything
2015-02-10 14:41:44 -08:00
Ansis Brammanis
6d47e9b684 use correct interpolation for background images 2015-02-10 10:59:32 -08:00
Ansis Brammanis
fdc9283c5c fix raster-brightness 2015-02-09 12:03:47 -08:00
Ansis Brammanis
97f19e8b84 support constants within dasharrays 2015-02-09 11:48:36 -08:00
Ansis Brammanis
5eb08baf14 tweak style parsing error messages 2015-02-05 18:33:00 -08:00
Ansis Brammanis
fe5b618484 fix compilation errors 2015-02-05 17:42:51 -08:00
Ansis Brammanis
968d6812db make raster-brightness two separate properties 2015-02-05 17:35:13 -08:00
Ansis Brammanis
f99bd1c6ec switch to functions of arrays (from arrays of fns)
for properties like *-translate, *-offset

https://github.com/mapbox/mapbox-gl-style-spec/issues/237
2015-02-05 17:30:34 -08:00
Ansis Brammanis
3a8aaad6a7 make everything a function 2015-02-05 16:46:13 -08:00
Ansis Brammanis
6e95c3b2e1 fix compilation on android 2015-02-04 19:47:31 -08:00
Ansis Brammanis
f07de8dd23 make pattern and dasharray properties use duration
from "*-transition" properties
2015-02-04 18:46:47 -08:00
Justin R. Miller
d093364d29 only ignore warning on Clang 2015-02-04 17:13:09 -08:00
Justin R. Miller
e1a3b9ff8e fixes #782: ignore 64->32 conversion warnings for Boost 2015-02-04 17:05:57 -08:00
Ansis Brammanis
a49737e542 fix durations by making them milliseconds 2015-02-04 13:51:52 -08:00
Ansis Brammanis
4ec0028856 switch from low/high to from/to 2015-02-04 12:08:29 -08:00
Ansis Brammanis
93b07c3675 rename FadedFunction to PiecewiseConstant function 2015-02-04 11:36:31 -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
Ansis Brammanis
002a709b67 fix copy_bitmap for wrapped bitmaps 2015-02-04 09:54:41 -08:00
Konstantin Käfer
3da75dd706 guard boost include with pragma ignores 2015-02-04 11:54:01 +01:00
Konstantin Käfer
29baacf3a5 refactor makefile 2015-02-04 10:49:09 +01:00
Konstantin Käfer
704b3719f5 use standard DEBUG macro rather than NDEBUG 2015-02-04 10:49:07 +01:00
Konstantin Käfer
272fa8935e make storage lib separate so we can build without storage libs 2015-02-04 10:49:07 +01:00
Konstantin Käfer
1c91f09fda move merge_lines implementation to its own source files to avoid duplicate symbols 2015-02-04 10:49:07 +01:00
Konstantin Käfer
9a549094e0 make ios compile 2015-02-04 10:49:06 +01:00
Konstantin Käfer
92a7f73bbe fixes for linux 2015-02-04 10:49:06 +01:00
Konstantin Käfer
8a1fce547e rearrange tests and add storage tests 2015-02-04 10:49:05 +01:00
Konstantin Käfer
5503aef690 make vaos immovable 2015-02-04 10:49:05 +01:00
Konstantin Käfer
31a0d18ca1 remove circular shared_ptr and a few other memory leaks 2015-02-04 10:49:05 +01:00
Konstantin Käfer
b9bf66e67e rewrite storage layer to be independent of the Map's event loop 2015-02-04 10:46:37 +01:00
John Firebaugh
44be486234 Remove unused
Fixes #786
Fixes #797
2015-02-03 17:05:29 -08: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
Ansis Brammanis
3de43f5f58 fix uninitialized variable warning 2015-02-03 14:44:50 -08: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
793985580d fix sprite atlas padding and icon centering
Pad each icon with one pixel on the bottom and right sides.

On top of this, extra padding is added to round the widths and heights
to multiples of four.

This then fixes the positions of the bottom and right vertices to
correctly center the icon's box around the center of the icon, not the
center of the padded icon.

js: 32ca4007699d1d21ab25bb38588b151510194030

fixes https://github.com/mapbox/mapbox-gl-js/issues/947
2015-01-27 19:15:22 -08:00
Leith Bade
aaedd9c83b Remove program binary caching 2015-01-27 12:38:40 +11:00
Leith Bade
8193acdf30 Merge pull request #676 from mapbox/android-mason
Android GL mega-merge
2015-01-27 07:23:43 +11:00
Ansis Brammanis
60035d7728 Merge branch 'no-crossfade'
Conflicts:
	src/mbgl/renderer/painter_line.cpp
2015-01-26 12:19:40 -08:00