summaryrefslogtreecommitdiff
path: root/src/mbgl/style/style.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Get rid of Environment et al.Thiago Marcos P. Santos2015-06-251-2/+2
| | | | | mbgl::Environment is not used anymore and can removed.
* Introduce the ThreadContextThiago Marcos P. Santos2015-06-251-3/+3
| | | | | | | | | mbgl::Thread will keep a ThreadContext for each running instance in a thread_local so we don't need to lookup a man in the Environment every time we need some info about the current thread. This patch is moving the ::currentlyOn check used on Debug build from the Environment class to the ThreadContext.
* Change StyleBucket::source to indirect referenceJohn Firebaugh2015-06-181-2/+17
| | | | | | | This eliminates a reference loop: VectorTileData holds StyleLayers which hold StyleBuckets which held Sources which hold VectorTileDatas. This breaks the StyleBucket -> Source link in favor of manually resolving the reference where necessary.
* Fix race condition on error notificationThiago Marcos P. Santos2015-06-041-0/+1
| | | | | | | | | We start loading the resources at the moment we set the style, but we set the callback for error notification at renderStill(), which happen afterwards. If some error occurs in this short window, it was never being notified. Now we save the last error and we check after we set the callback.
* Remove references to ResourceLoaderThiago Marcos P. Santos2015-06-021-1/+1
| | | | ResourceLoader got merged with Style.
* Remove unused; fix naming styleJohn Firebaugh2015-06-011-6/+4
|
* Merge ResourceLoader into Style and move atlas ownershipJohn Firebaugh2015-06-011-37/+146
|
* Replace mbgl::util::make_unique<> with std::make_unique<>Konstantin Käfer2015-05-261-2/+1
|
* add Map::isFullyLoaded()Konstantin Käfer2015-05-051-3/+4
| | | | returns whether the Map is still loading/parsing any assets or whether everything is there and a render will likely be complete
* Move Worker to StyleJohn Firebaugh2015-04-281-1/+2
| | | | | | This ensures that worker tasks are entirely complete by the time the style is destructed, and enables us to pass Style& rather than a shared pointer.
* Implement Style::isLoadedJohn Firebaugh2015-04-281-0/+20
|
* don't throw an exception in the map thread for bad stylesKonstantin Käfer2015-04-171-2/+1
|
* Eliminate StyleSourceJohn Firebaugh2015-04-061-0/+9
| | | | Fixes #695
* Add typedefs for std::chrono::steady_clock typesJohn Firebaugh2015-04-021-3/+3
|
* Rename methods to match gl-jsJohn Firebaugh2015-04-011-8/+9
|
* Remove unusedJohn Firebaugh2015-04-011-6/+0
|
* Eliminate StyleLayerGroupJohn Firebaugh2015-04-011-8/+8
|
* Revert "Move atlas ownership to Style"John Firebaugh2015-03-131-73/+8
| | | | This reverts commit bffee0715458530c6c86f440f757a4de667278a2.
* Move atlas ownership to StyleJohn Firebaugh2015-03-131-8/+73
| | | | | | This follows gl-js and just makes sense -- whenever the style changes the atlases should be blown away. Refs #957
* Merge branch 'master' into pattern-functionsAnsis Brammanis2015-02-041-5/+4
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * Use std::chronoLeith Bade2015-02-041-5/+4
| |
* | implement functions for patternsAnsis Brammanis2015-02-021-1/+3
|/ | | | | It introduces a new function type, FadedStopsFunction, that transitions between the stops values instead of interpolating between them.
* Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-181-26/+2
|\ | | | | | | | | Conflicts: src/mbgl/map/map.cpp
| * Move class state to mapJohn Firebaugh2015-01-141-26/+2
| | | | | | https://github.com/mapbox/mapbox-gl-js/pull/936
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-051-0/+2
|/ | | | | | | | | | | 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
* make most headers privateKonstantin Käfer2014-12-041-0/+107
View Lorry Controller Status