diff options
author | Juha Alanen <juha.alanen@mapbox.com> | 2019-09-17 15:40:01 +0300 |
---|---|---|
committer | Juha Alanen <19551460+jmalanen@users.noreply.github.com> | 2019-09-18 14:29:15 +0300 |
commit | 6b13c42314f28e3b27111367c4f3296c3c3c1248 (patch) | |
tree | 2f91aae637e2c49bb55cfc336f772ac772ab5a2d /src/mbgl/tile | |
parent | 0042f0b9f5de7151f14300f02a559b6ecb48a507 (diff) | |
download | qtlocation-mapboxgl-6b13c42314f28e3b27111367c4f3296c3c3c1248.tar.gz |
[build] Fix clang format and tidy checks
Diffstat (limited to 'src/mbgl/tile')
-rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 41 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 15 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile_worker.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/tile/tile.cpp | 11 | ||||
-rw-r--r-- | src/mbgl/tile/tile.hpp | 13 |
5 files changed, 33 insertions, 49 deletions
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index 2076c73337..9f9c41d229 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -302,15 +302,11 @@ float GeometryTile::getQueryPadding(const std::unordered_map<std::string, const return queryPadding; } -void GeometryTile::queryRenderedFeatures( - std::unordered_map<std::string, std::vector<Feature>>& result, - const GeometryCoordinates& queryGeometry, - const TransformState& transformState, - const std::unordered_map<std::string, const RenderLayer*>& layers, - const RenderedQueryOptions& options, - const mat4& projMatrix, - const SourceFeatureState& featureState) { - +void GeometryTile::queryRenderedFeatures(std::unordered_map<std::string, std::vector<Feature>>& result, + const GeometryCoordinates& queryGeometry, const TransformState& transformState, + const std::unordered_map<std::string, const RenderLayer*>& layers, + const RenderedQueryOptions& options, const mat4& projMatrix, + const SourceFeatureState& featureState) { if (!getData()) return; const float queryPadding = getQueryPadding(layers); @@ -319,17 +315,10 @@ void GeometryTile::queryRenderedFeatures( transformState.matrixFor(posMatrix, id.toUnwrapped()); matrix::multiply(posMatrix, projMatrix, posMatrix); - layoutResult->featureIndex->query(result, - queryGeometry, - transformState, - posMatrix, - util::tileSize * id.overscaleFactor(), - std::pow(2, transformState.getZoom() - id.overscaledZ), - options, - id.toUnwrapped(), - layers, - queryPadding * transformState.maxPitchScaleFactor(), - featureState); + layoutResult->featureIndex->query(result, queryGeometry, transformState, posMatrix, + util::tileSize * id.overscaleFactor(), + std::pow(2, transformState.getZoom() - id.overscaledZ), options, id.toUnwrapped(), + layers, queryPadding * transformState.maxPitchScaleFactor(), featureState); } void GeometryTile::querySourceFeatures( @@ -391,7 +380,9 @@ void GeometryTile::performedFadePlacement() { void GeometryTile::setFeatureState(const LayerFeatureStates& states) { auto layers = getData(); - if (!layers || states.empty() || !layoutResult) return; + if ((layers == nullptr) || states.empty() || !layoutResult) { + return; + } auto& layerIdToLayerRenderData = layoutResult->layerRenderData; for (auto& layer : layerIdToLayerRenderData) { @@ -400,9 +391,13 @@ void GeometryTile::setFeatureState(const LayerFeatureStates& states) { if (sourceLayer) { const auto& sourceLayerID = sourceLayer->getName(); auto entry = states.find(sourceLayerID); - if (entry == states.end()) continue; + if (entry == states.end()) { + continue; + } const auto& featureStates = entry->second; - if (featureStates.empty()) continue; + if (featureStates.empty()) { + continue; + } auto bucket = layer.second.bucket; if (bucket && bucket->hasData()) { diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index 4415e0a1fa..566b359547 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -48,14 +48,11 @@ public: bool layerPropertiesUpdated(const Immutable<style::LayerProperties>&) override; - void queryRenderedFeatures( - std::unordered_map<std::string, std::vector<Feature>>& result, - const GeometryCoordinates& queryGeometry, - const TransformState&, - const std::unordered_map<std::string, const RenderLayer*>& layers, - const RenderedQueryOptions& options, - const mat4& projMatrix, - const SourceFeatureState& featureState) override; + void queryRenderedFeatures(std::unordered_map<std::string, std::vector<Feature>>& result, + const GeometryCoordinates& queryGeometry, const TransformState&, + const std::unordered_map<std::string, const RenderLayer*>& layers, + const RenderedQueryOptions& options, const mat4& projMatrix, + const SourceFeatureState& featureState) override; void querySourceFeatures( std::vector<Feature>& result, @@ -94,7 +91,7 @@ public: const std::shared_ptr<FeatureIndex> getFeatureIndex() const; const std::string sourceID; - + void setFeatureState(const LayerFeatureStates&) override; protected: diff --git a/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp index ce883ad93f..f6af61eb3c 100644 --- a/src/mbgl/tile/geometry_tile_worker.cpp +++ b/src/mbgl/tile/geometry_tile_worker.cpp @@ -384,7 +384,7 @@ void GeometryTileWorker::parse() { continue; const GeometryCollection& geometries = feature->getGeometries(); - bucket->addFeature(*feature, geometries, {}, PatternLayerMap (), i); + bucket->addFeature(*feature, geometries, {}, PatternLayerMap(), i); featureIndex->insert(geometries, i, sourceLayerID, leaderImpl.id); } diff --git a/src/mbgl/tile/tile.cpp b/src/mbgl/tile/tile.cpp index 87223c7933..2ebbf76c2a 100644 --- a/src/mbgl/tile/tile.cpp +++ b/src/mbgl/tile/tile.cpp @@ -39,14 +39,9 @@ void Tile::dumpDebugLogs() const { Log::Info(Event::General, "Tile::complete: %s", isComplete() ? "yes" : "no"); } -void Tile::queryRenderedFeatures( - std::unordered_map<std::string, std::vector<Feature>>&, - const GeometryCoordinates&, - const TransformState&, - const std::unordered_map<std::string, const RenderLayer*>&, - const RenderedQueryOptions&, - const mat4&, - const SourceFeatureState&) {} +void Tile::queryRenderedFeatures(std::unordered_map<std::string, std::vector<Feature>>&, const GeometryCoordinates&, + const TransformState&, const std::unordered_map<std::string, const RenderLayer*>&, + const RenderedQueryOptions&, const mat4&, const SourceFeatureState&) {} float Tile::getQueryPadding(const std::unordered_map<std::string, const RenderLayer*>&) { return 0; diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp index eda4667027..b73383f989 100644 --- a/src/mbgl/tile/tile.hpp +++ b/src/mbgl/tile/tile.hpp @@ -68,14 +68,11 @@ public: virtual void setLayers(const std::vector<Immutable<style::LayerProperties>>&) {} virtual void setMask(TileMask&&) {} - virtual void queryRenderedFeatures( - std::unordered_map<std::string, std::vector<Feature>>& result, - const GeometryCoordinates& queryGeometry, - const TransformState&, - const std::unordered_map<std::string, const RenderLayer*>&, - const RenderedQueryOptions& options, - const mat4& projMatrix, - const SourceFeatureState& featureState); + virtual void queryRenderedFeatures(std::unordered_map<std::string, std::vector<Feature>>& result, + const GeometryCoordinates& queryGeometry, const TransformState&, + const std::unordered_map<std::string, const RenderLayer*>&, + const RenderedQueryOptions& options, const mat4& projMatrix, + const SourceFeatureState& featureState); virtual void querySourceFeatures( std::vector<Feature>& result, |