summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-08-12 16:30:27 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-08-12 16:30:27 +0200
commit22e179aa37c3aece1350274e69ac86a5cd345a5a (patch)
treef68c04e7825e2534afc9626b0031d99230146e22
parent18b1469e9ebd02465101fbea719c9c967d334072 (diff)
downloadqtlocation-mapboxgl-22e179aa37c3aece1350274e69ac86a5cd345a5a.tar.gz
remove trailing whitespace
[skip ci]
-rw-r--r--include/mbgl/geometry/geometry.hpp2
-rw-r--r--include/mbgl/map/map.hpp2
-rw-r--r--include/mbgl/renderer/painter.hpp4
-rw-r--r--include/mbgl/renderer/raster_bucket.hpp6
-rw-r--r--include/mbgl/util/raster.hpp2
-rw-r--r--src/map/source.cpp2
-rw-r--r--src/map/vector_tile.cpp2
-rw-r--r--src/map/vector_tile_data.cpp2
-rw-r--r--src/renderer/painter_prerender.cpp2
-rw-r--r--src/renderer/painter_raster.cpp24
-rw-r--r--src/renderer/prerendered_texture.cpp2
-rw-r--r--src/style/style_parser.cpp8
-rw-r--r--src/util/raster.cpp4
-rw-r--r--src/util/texturepool.cpp2
14 files changed, 32 insertions, 32 deletions
diff --git a/include/mbgl/geometry/geometry.hpp b/include/mbgl/geometry/geometry.hpp
index 47981ce83b..961569204d 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 14f8f40916..fba38879ed 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<StyleLayer> 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 385e8bdd0e..db85d8703d 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<StyleLayer> 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 41f4d4e4c0..a68475565b 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> &texturepool, const StyleBucketRaster& properties);
-
+
virtual void render(Painter& painter, std::shared_ptr<StyleLayer> 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 9124f59ba7..e526ffa5ac 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 bbe25969c1..523a7f3bc7 100644
--- a/src/map/source.cpp
+++ b/src/map/source.cpp
@@ -87,7 +87,7 @@ void Source::render(Painter &painter, std::shared_ptr<StyleLayer> layer_desc) {
}
}
}
-
+
void Source::render(Painter &painter, std::shared_ptr<StyleLayer> 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 8644c3e044..4ec25d6cf6 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<util::recursive_wrapper<PropertyFilter>>()) {
diff --git a/src/map/vector_tile_data.cpp b/src/map/vector_tile_data.cpp
index f1c67d8e16..1f74cab1d7 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<TileParser>(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 429f3cc80d..f17014b622 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 3f2de8591d..7dcc9b24d6 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<StyleLayer> layer_desc, const Tile::ID& id, const mat4 &matrix) {
if (pass != RenderPass::Translucent) return;
-
+
const RasterProperties &properties = layer_desc->getProperties<RasterProperties>();
-
+
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<StyleLayer> 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<StyleLayer> 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<StyleLayer> 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 6a21b133af..52f7edc50b 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 1aa3b54bba..67d3f81a02 100644
--- a/src/style/style_parser.cpp
+++ b/src/style/style_parser.cpp
@@ -532,7 +532,7 @@ void StyleParser::parseLayer(std::pair<JSVal, std::shared_ptr<StyleLayer>> &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<StyleLayer> &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<StyleBucketRaster>();
-
+
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<StyleLayer> &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 03266e5b56..9a71573d01 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 67685eeee1..04511348e9 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;