Commit Graph

51 Commits

Author SHA1 Message Date
John Firebaugh
0c985c024b Revert "Move atlas ownership to Style"
This reverts commit bffee07154.
2015-03-13 13:05:32 -07:00
John Firebaugh
bffee07154 Move atlas ownership to Style
This follows gl-js and just makes sense -- whenever the style changes
the atlases should be blown away.

Refs #957
2015-03-13 10:55:47 -07:00
Thiago Marcos P. Santos
124b49562d Get rid of printf and cout by using Log::*
Use our logging system that will route the message accordingly on
the target platform.

Fixes #613
2015-03-12 14:19:32 +02:00
John Firebaugh
7212accffd More include fixes 2015-03-10 16:07:33 -07:00
John Firebaugh
c13227e35f Move parseValue(pbf) to vector_tile.cpp
This code is specific to the vector tile format.
2015-03-10 12:14:13 -07:00
John Firebaugh
4d3dcea82c Revert FeatureType rename 2015-03-09 18:32:20 -07:00
Justin R. Miller
831264d530 refs #928: 90% of way to genericizing VectorTile 2015-03-09 11:57:31 -07:00
John Firebaugh
9897ae74ec Fix satellite style contour rendering 2015-03-08 12:44:47 -07:00
Konstantin Käfer
e00bae4f1c lock the StyleBucket to avoid crashing
stopgap until we have a solution that doesn't mutate the style objects while parsing a tile
2015-03-06 15:42:34 +01:00
Konstantin Käfer
0151fe6c01 pass StyleLayer objects as const ref instead of a shared pointer 2015-03-06 13:26:11 +01:00
Konstantin Käfer
c07fa06994 rename StyleBucket* => StyleLayout*
and remove a few unused variables

refs #881
2015-02-17 18:27:51 -08:00
Konstantin Käfer
89c0ff5f39 make StyleBucket mutable
refs #881
2015-02-17 18:27:51 -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
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
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
89bbd29278 Use std::chrono 2015-02-04 09:39:25 +11: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
Leith Bade
8c02249324 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2015-01-27 08:28:51 +13:00
John Firebaugh
7694b0c1ec Merge pull request #771 from mapbox/visibility
Add visibility property for v7
2015-01-26 11:09:16 -08:00
Lauren Budorick
66355b7d86 Add visibility property for v7. 2015-01-22 17:11:07 -08:00
Leith Bade
42d1972732 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	src/mbgl/renderer/painter_prerender.cpp
	src/mbgl/renderer/prerendered_texture.cpp
	src/mbgl/renderer/prerendered_texture.hpp
2015-01-23 11:11:04 +11:00
John Firebaugh
0c2ffc251c Revert "scale dashes by line-gap-width if present"
This reverts commit 4791bac675.
2015-01-22 14:05:49 -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
Leith Bade
016c2948c5 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	src/mbgl/map/map.cpp
2015-01-18 16:33:39 +11:00
Ansis Brammanis
4791bac675 scale dashes by line-gap-width if present
https://github.com/mapbox/mapbox-gl-js/pull/860#issuecomment-68788411

js: a5fb9f9fb5c7ea056b6ec228e0b398815cc0d356
2015-01-16 16:29:58 -05:00
Ansis Brammanis
221d256bea remove unused 2015-01-15 20:44:10 -05:00
Ansis Brammanis
c472528f9b support functions of dash arrays 2015-01-15 17:41:55 -05:00
Ansis Brammanis
2c615b613c support dash arrays that are any length 2015-01-14 22:24:44 -05:00
Ansis Brammanis
84e9dbdc09 remove unused code 2015-01-14 22:02:22 -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
John Firebaugh
d24b73b1a6 Move class state to map
https://github.com/mapbox/mapbox-gl-js/pull/936
2015-01-14 17:43:44 -08:00
Leith Bade
de9eb00276 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	.gitignore
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	include/mbgl/map/map.hpp
	src/mbgl/map/map.cpp
	src/mbgl/storage/caching_http_file_source.cpp
2014-12-05 23:16:49 +11:00