separate bucket render properties and change naming

1 files changed, 20 insertions, 24 deletions

diff --git a/src/renderer/fill_bucket.cpp b/src/renderer/fill_bucket.cpp
index 7021566592..d7ba048a5c 100644
--- a/src/renderer/fill_bucket.cpp
+++ b/src/renderer/fill_bucket.cpp
@@ -30,30 +30,26 @@ void FillBucket::free(void *, void *ptr) {
     ::free(ptr);
 }
 
-FillBucket::FillBucket(FillVertexBuffer& vertexBuffer,
-                       TriangleElementsBuffer& triangleElementsBuffer,
-                       LineElementsBuffer& lineElementsBuffer,
-                       const BucketDescription& bucket_desc)
-    : geom_desc(bucket_desc.geometry),
-    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),
-triangleElementsBuffer(triangleElementsBuffer),
-lineElementsBuffer(lineElementsBuffer),
-vertex_start(vertexBuffer.index()),
-triangle_elements_start(triangleElementsBuffer.index()),
-line_elements_start(lineElementsBuffer.index()) {
+FillBucket::FillBucket(FillVertexBuffer &vertexBuffer,
+                       TriangleElementsBuffer &triangleElementsBuffer,
+                       LineElementsBuffer &lineElementsBuffer,
+                       const BucketFillDescription &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.
+      }),
+      tesselator(tessNewTess(allocator)),
+      vertexBuffer(vertexBuffer),
+      triangleElementsBuffer(triangleElementsBuffer),
+      lineElementsBuffer(lineElementsBuffer),
+      vertex_start(vertexBuffer.index()),
+      triangle_elements_start(triangleElementsBuffer.index()),
+      line_elements_start(lineElementsBuffer.index()) {
     assert(tesselator);
 }