diff --git a/include/mbgl/geometry/geometry.hpp b/include/mbgl/geometry/geometry.hpp index 47981ce83..961569204 100644 --- a/include/mbgl/geometry/geometry.hpp +++ b/include/mbgl/geometry/geometry.hpp @@ -12,7 +12,7 @@ class Geometry : private util::noncopyable { public: inline explicit Geometry(pbf& data); - + enum command : uint8_t { end = 0, move_to = 1, diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 14f8f4091..fba38879e 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -46,7 +46,7 @@ public: void rerender(); void renderLayer(std::shared_ptr layer_desc, RenderPass pass, const Tile::ID* id = nullptr, const mat4* matrix = nullptr); - + // Forces a map update: always triggers a rerender. void update(); diff --git a/include/mbgl/renderer/painter.hpp b/include/mbgl/renderer/painter.hpp index 385e8bdd0..db85d8703 100644 --- a/include/mbgl/renderer/painter.hpp +++ b/include/mbgl/renderer/painter.hpp @@ -43,7 +43,7 @@ class LineBucket; class SymbolBucket; class RasterBucket; class PrerenderedTexture; - + struct FillProperties; struct RasterProperties; struct CompositeProperties; @@ -92,7 +92,7 @@ public: void preparePrerender(RasterBucket &bucket); void renderPrerenderedTexture(RasterBucket &bucket, const mat4 &matrix, const RasterProperties& properties); - + void createPrerendered(RasterBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id); void resize(); diff --git a/include/mbgl/renderer/raster_bucket.hpp b/include/mbgl/renderer/raster_bucket.hpp index 41f4d4e4c..a68475565 100644 --- a/include/mbgl/renderer/raster_bucket.hpp +++ b/include/mbgl/renderer/raster_bucket.hpp @@ -17,19 +17,19 @@ class VertexArrayObject; class RasterBucket : public Bucket { public: RasterBucket(const std::shared_ptr &texturepool, const StyleBucketRaster& properties); - + virtual void render(Painter& painter, std::shared_ptr layer_desc, const Tile::ID& id, const mat4 &matrix); virtual bool hasData() const; bool setImage(const std::string &data); - + const StyleBucketRaster &properties; PrerenderedTexture texture; void drawRaster(RasterShader& shader, VertexBuffer &vertices, VertexArrayObject &array); void drawRaster(RasterShader& shader, VertexBuffer &vertices, VertexArrayObject &array, GLuint texture); - + Raster raster; private: diff --git a/include/mbgl/util/raster.hpp b/include/mbgl/util/raster.hpp index 9124f59ba..e526ffa5a 100644 --- a/include/mbgl/util/raster.hpp +++ b/include/mbgl/util/raster.hpp @@ -28,7 +28,7 @@ public: // bind prerendered texture void bind(const GLuint texture); - + // loaded status bool isLoaded() const; diff --git a/src/map/source.cpp b/src/map/source.cpp index bbe25969c..523a7f3bc 100644 --- a/src/map/source.cpp +++ b/src/map/source.cpp @@ -87,7 +87,7 @@ void Source::render(Painter &painter, std::shared_ptr layer_desc) { } } } - + void Source::render(Painter &painter, std::shared_ptr layer_desc, const Tile::ID &id, const mat4 &matrix) { auto it = tiles.find(id); if (it != tiles.end() && it->second->data && it->second->data->state == TileData::State::parsed) { diff --git a/src/map/vector_tile.cpp b/src/map/vector_tile.cpp index 8644c3e04..4ec25d6cf 100644 --- a/src/map/vector_tile.cpp +++ b/src/map/vector_tile.cpp @@ -128,7 +128,7 @@ FilteredVectorTileLayer::iterator::iterator(const FilteredVectorTileLayer& paren // return true; // } // -// +// // // // if (filterExpression.is>()) { diff --git a/src/map/vector_tile_data.cpp b/src/map/vector_tile_data.cpp index f1c67d8e1..1f74cab1d 100644 --- a/src/map/vector_tile_data.cpp +++ b/src/map/vector_tile_data.cpp @@ -21,7 +21,7 @@ VectorTileData::~VectorTileData() { } void VectorTileData::beforeParse() { - + parser = std::make_unique(data, *this, map.getStyle(), map.getGlyphAtlas(), map.getGlyphStore(), map.getSpriteAtlas(), map.getSprite()); } diff --git a/src/renderer/painter_prerender.cpp b/src/renderer/painter_prerender.cpp index 429f3cc80..f17014b62 100644 --- a/src/renderer/painter_prerender.cpp +++ b/src/renderer/painter_prerender.cpp @@ -22,7 +22,7 @@ void Painter::preparePrerender(RasterBucket &bucket) { void Painter::renderPrerenderedTexture(RasterBucket &bucket, const mat4 &matrix, const RasterProperties& properties) { const int buffer = bucket.properties.buffer * 4096.0f; - + // draw the texture on a quad useProgram(rasterShader->program); rasterShader->setMatrix(matrix); diff --git a/src/renderer/painter_raster.cpp b/src/renderer/painter_raster.cpp index 3f2de8591..7dcc9b24d 100644 --- a/src/renderer/painter_raster.cpp +++ b/src/renderer/painter_raster.cpp @@ -11,29 +11,29 @@ using namespace mbgl; void Painter::renderRaster(RasterBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id, const mat4 &matrix) { if (pass != RenderPass::Translucent) return; - + const RasterProperties &properties = layer_desc->getProperties(); - + if (layer_desc->layers) { - + if (!bucket.texture.getTexture()) { bucket.texture.bindFramebuffer(); - + preparePrerender(bucket); const int buffer = bucket.properties.buffer * 4096.0f; - + const mat4 preMatrix = [&]{ mat4 vtxMatrix; matrix::ortho(vtxMatrix, -buffer, 4096 + buffer, -4096 - buffer, buffer, 0, 1); matrix::translate(vtxMatrix, vtxMatrix, 0, -4096, 0); return vtxMatrix; }(); - + // call updateTiles to get parsed data for sublayers map.updateTiles(); - + int i = 0; for (auto it = layer_desc->layers->layers.begin(), end = layer_desc->layers->layers.end(); it != end; ++it, --i) { setOpaque(); @@ -41,7 +41,7 @@ void Painter::renderRaster(RasterBucket& bucket, std::shared_ptr lay setTranslucent(); map.renderLayer(*it, RenderPass::Translucent, &id, &preMatrix); } - + if (bucket.properties.blur > 0) { bucket.texture.blur(*this, bucket.properties.blur); } @@ -50,11 +50,11 @@ void Painter::renderRaster(RasterBucket& bucket, std::shared_ptr lay glEnable(GL_DEPTH_TEST); glEnable(GL_STENCIL_TEST); - + glViewport(0, 0, gl_viewport[0], gl_viewport[1]); - + } - + renderPrerenderedTexture(bucket, matrix, properties); } @@ -69,7 +69,7 @@ void Painter::renderRaster(RasterBucket& bucket, std::shared_ptr lay rasterShader->setOpacity(properties.opacity); glDepthRange(strata + strata_epsilon, 1.0f); - + bucket.drawRaster(*rasterShader, tileStencilBuffer, coveringRasterArray); depthMask(true); diff --git a/src/renderer/prerendered_texture.cpp b/src/renderer/prerendered_texture.cpp index 6a21b133a..52f7edc50 100644 --- a/src/renderer/prerendered_texture.cpp +++ b/src/renderer/prerendered_texture.cpp @@ -44,7 +44,7 @@ void PrerenderedTexture::bindFramebuffer() { glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, properties.size, properties.size, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0); glBindTexture(GL_TEXTURE_2D, 0); } - + if (fbo_depth_stencil == 0) { // Create depth/stencil buffer glGenRenderbuffers(1, &fbo_depth_stencil); diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp index 1aa3b54bb..67d3f81a0 100644 --- a/src/style/style_parser.cpp +++ b/src/style/style_parser.cpp @@ -532,7 +532,7 @@ void StyleParser::parseLayer(std::pair> &pair // Skip parsing this again. We already have a valid layer definition. return; } - + // Make sure we have not previously attempted to parse this layer. if (std::find(stack.begin(), stack.end(), layer.get()) != stack.end()) { Log::Warning(Event::ParseStyle, "layer reference of '%s' is circular", layer->id.c_str()); @@ -907,10 +907,10 @@ void StyleParser::parseRender(JSVal value, std::shared_ptr &layer) { parseRenderProperty(value, render.text.ignore_placement, "text-ignore-placement"); parseRenderProperty(value, render.text.optional, "text-optional"); } break; - + case StyleLayerType::Raster: { StyleBucketRaster &render = bucket.render.get(); - + parseRenderProperty(value, render.size, "raster-size"); parseRenderProperty(value, render.blur, "raster-blur"); parseRenderProperty(value, render.buffer, "raster-buffer"); @@ -918,7 +918,7 @@ void StyleParser::parseRender(JSVal value, std::shared_ptr &layer) { render.prerendered = true; } } break; - + default: // There are no render properties for these layer types. break; diff --git a/src/util/raster.cpp b/src/util/raster.cpp index 03266e5b5..9a71573d0 100644 --- a/src/util/raster.cpp +++ b/src/util/raster.cpp @@ -80,14 +80,14 @@ void Raster::bind(const GLuint texture) { } else if (textured) { glBindTexture(GL_TEXTURE_2D, texture); } - + GLuint filter = GL_LINEAR; if (filter != this->filter) { glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter); this->filter = filter; } - + } void Raster::beginFadeInTransition() { diff --git a/src/util/texturepool.cpp b/src/util/texturepool.cpp index 67685eeee..04511348e 100644 --- a/src/util/texturepool.cpp +++ b/src/util/texturepool.cpp @@ -25,7 +25,7 @@ GLuint Texturepool::getTextureID() { return id; } - + void Texturepool::removeTextureID(GLuint texture_id) { bool needs_clear = false;