diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-02-17 17:49:02 -0800 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-17 18:27:51 -0800 |
| commit | 89c0ff5f3955ecd4316a7b4280e995b7b431817d (patch) | |
| tree | 7ca855869e5d851ff2e8669c5526a5acab44bc97 /src/mbgl/renderer/fill_bucket.cpp | |
| parent | df23a6b7d7fc88ac90d0fe034a7e40c8aff928f8 (diff) | |
| download | qtlocation-mapboxgl-89c0ff5f3955ecd4316a7b4280e995b7b431817d.tar.gz | |
make StyleBucket mutable
refs #881
Diffstat (limited to 'src/mbgl/renderer/fill_bucket.cpp')
| -rw-r--r-- | src/mbgl/renderer/fill_bucket.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/mbgl/renderer/fill_bucket.cpp b/src/mbgl/renderer/fill_bucket.cpp index b58e860b46..6544e43f09 100644 --- a/src/mbgl/renderer/fill_bucket.cpp +++ b/src/mbgl/renderer/fill_bucket.cpp @@ -31,18 +31,22 @@ void FillBucket::free(void *, void *ptr) { ::free(ptr); } -FillBucket::FillBucket(FillVertexBuffer &vertexBuffer_, +FillBucket::FillBucket(std::unique_ptr<const StyleBucketFill> layout_, + FillVertexBuffer &vertexBuffer_, TriangleElementsBuffer &triangleElementsBuffer_, - LineElementsBuffer &lineElementsBuffer_, - const StyleBucketFill &properties_) - : properties(properties_), - allocator(new TESSalloc{&alloc, &realloc, &free, nullptr, // userData - 64, // meshEdgeBucketSize - 64, // meshVertexBucketSize - 32, // meshFaceBucketSize - 64, // dictNodeBucketSize - 8, // regionBucketSize - 128, // extraVertices allocated for the priority queue. + LineElementsBuffer &lineElementsBuffer_) + : layout(std::move(layout_)), + allocator(new TESSalloc{ + &alloc, + &realloc, + &free, + nullptr, // userData + 64, // meshEdgeBucketSize + 64, // meshVertexBucketSize + 32, // meshFaceBucketSize + 64, // dictNodeBucketSize + 8, // regionBucketSize + 128, // extraVertices allocated for the priority queue. }), tesselator(tessNewTess(allocator)), vertexBuffer(vertexBuffer_), @@ -52,6 +56,7 @@ FillBucket::FillBucket(FillVertexBuffer &vertexBuffer_, triangle_elements_start(triangleElementsBuffer_.index()), line_elements_start(lineElementsBuffer.index()) { assert(tesselator); + assert(layout); } FillBucket::~FillBucket() { |