[core] Remove MapData dependency from Style

This commit is contained in:
John Firebaugh
2016-04-14 16:15:43 -07:00
parent 25ff2696a1
commit ed489e7649
5 changed files with 47 additions and 53 deletions

View File

@@ -10,12 +10,12 @@
#include <mbgl/platform/log.hpp>
#include <mbgl/map/transform.hpp>
#include <mbgl/map/map_data.hpp>
#include <mbgl/util/worker.hpp>
#include <mbgl/gl/texture_pool.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/style/style_update_parameters.hpp>
#include <mbgl/layer/line_layer.hpp>
#include <mbgl/annotation/annotation_manager.hpp>
using namespace mbgl;
@@ -29,8 +29,8 @@ public:
TransformState transformState;
Worker worker { 1 };
gl::TexturePool texturePool;
MapData mapData { MapMode::Still, GLContextMode::Unique, 1.0 };
Style style { mapData, fileSource };
AnnotationManager annotationManager { 1.0 };
Style style { fileSource, 1.0 };
StyleUpdateParameters updateParameters {
1.0,
@@ -42,7 +42,7 @@ public:
texturePool,
true,
MapMode::Continuous,
mapData,
annotationManager,
style
};