From bfcfb592da1454321d75f8e7b973f6ff60876e3d Mon Sep 17 00:00:00 2001 From: artemp Date: Thu, 6 Feb 2014 11:45:00 +0000 Subject: [PATCH] c++ * make it a bit more readable --- src/renderer/fill_bucket.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/renderer/fill_bucket.cpp b/src/renderer/fill_bucket.cpp index a45852ebf..bfa50b007 100644 --- a/src/renderer/fill_bucket.cpp +++ b/src/renderer/fill_bucket.cpp @@ -44,17 +44,13 @@ void FillBucket::addGeometry(pbf& geom) { } void FillBucket::addGeometry(const std::vector& line) { - // Alias this. - FillBuffer& buffer = *this->buffer; - - uint32_t vertex_start = buffer.vertex_length(); - - buffer.addDegenerate(); + uint32_t vertex_start = buffer->vertex_length(); + buffer->addDegenerate(); for (const Coordinate& coord : line) { - buffer.addCoordinate(coord.x, coord.y); + buffer->addCoordinate(coord.x, coord.y); } - uint32_t vertex_end = buffer.vertex_length(); + uint32_t vertex_end = buffer->vertex_length(); if (vertex_end - vertex_start > 65535) { throw geometry_too_long_exception(); @@ -82,13 +78,13 @@ void FillBucket::addGeometry(const std::vector& line) { assert(firstIndex + vertex_count - 1 < 65536); - uint32_t elements_start = buffer.elements_length(); + uint32_t elements_start = buffer->elements_length(); for (uint32_t i = 2; i < vertex_count; ++i) { - buffer.addElements(firstIndex, firstIndex + i - 1, firstIndex + i); + buffer->addElements(firstIndex, firstIndex + i - 1, firstIndex + i); } - uint32_t elements_end = buffer.elements_length(); + uint32_t elements_end = buffer->elements_length(); uint32_t elements_count = elements_end - elements_start; group.vertex_length += vertex_count; group.elements_length += elements_count;