tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up members, arguments, and formatting

Browse Source
This commit is contained in:
Justin R. Miller
2015-03-02 17:08:50 -08:00
parent e1ff75a47a
commit 4407033b3b
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/mbgl/map/tile_parser.cpp
View File

@@ -29,13 +29,14 @@ namespace mbgl {
// its header file.
TileParser::~TileParser() = default;
TileParser::TileParser(const std::string &data, VectorTileData &tile_,
const util::ptr<const Style> &style_,
GlyphAtlas & glyphAtlas_,
GlyphStore & glyphStore_,
SpriteAtlas & spriteAtlas_,
const util::ptr<Sprite> &sprite_)
: vector_data(pbf((const uint8_t *)data.data(), data.size())),
TileParser::TileParser(const std::string& raw_data_,
VectorTileData& tile_,
const util::ptr<const Style>& style_,
GlyphAtlas& glyphAtlas_,
GlyphStore& glyphStore_,
SpriteAtlas& spriteAtlas_,
const util::ptr<Sprite>& sprite_)
: vector_tile(pbf((const uint8_t *)raw_data_.data(), raw_data_.size())),
tile(tile_),
style(style_),
glyphAtlas(glyphAtlas_),
@@ -186,8 +187,8 @@ std::unique_ptr<Bucket> TileParser::createBucket(const StyleBucket &bucket_desc)
if (tile.id.z >= std::ceil(bucket_desc.max_zoom)) return nullptr;
if (bucket_desc.visibility == mbgl::VisibilityType::None) return nullptr;
auto layer_it = vector_data.layers.find(bucket_desc.source_layer);
if (layer_it != vector_data.layers.end()) {
auto layer_it = vector_tile.layers.find(bucket_desc.source_layer);
if (layer_it != vector_tile.layers.end()) {
const VectorTileLayer &layer = layer_it->second;
if (bucket_desc.type == StyleLayerType::Fill) {
return createFillBucket(layer, bucket_desc);

25
src/mbgl/map/tile_parser.hpp
View File

@@ -35,12 +35,13 @@ class TexturePool;
class TileParser : private util::noncopyable
{
public:
TileParser(const std::string &data, VectorTileData &tile,
const util::ptr<const Style> &style,
GlyphAtlas & glyphAtlas,
GlyphStore & glyphStore,
SpriteAtlas & spriteAtlas,
const util::ptr<Sprite> &sprite);
TileParser(const std::string& raw_data,
VectorTileData& tile,
const util::ptr<const Style>& style,
GlyphAtlas& glyphAtlas,
GlyphStore& glyphStore,
SpriteAtlas& spriteAtlas,
const util::ptr<Sprite>& sprite);
~TileParser();
public:
@@ -50,15 +51,15 @@ private:
bool obsolete() const;
void parseStyleLayers(util::ptr<const StyleLayerGroup> group);
std::unique_ptr<Bucket> createBucket(const StyleBucket &bucket_desc);
std::unique_ptr<Bucket> createFillBucket(const VectorTileLayer &layer, const StyleBucket &bucket_desc);
std::unique_ptr<Bucket> createLineBucket(const VectorTileLayer& layer, const StyleBucket &bucket_desc);
std::unique_ptr<Bucket> createSymbolBucket(const VectorTileLayer& layer, const StyleBucket &bucket_desc);
std::unique_ptr<Bucket> createBucket(const StyleBucket& bucket_desc);
std::unique_ptr<Bucket> createFillBucket(const VectorTileLayer& layer, const StyleBucket& bucket_desc);
std::unique_ptr<Bucket> createLineBucket(const VectorTileLayer& layer, const StyleBucket& bucket_desc);
std::unique_ptr<Bucket> createSymbolBucket(const VectorTileLayer& layer, const StyleBucket& bucket_desc);
template <class Bucket> void addBucketGeometries(Bucket& bucket, const VectorTileLayer& layer, const FilterExpression &filter);
template <class Bucket> void addBucketGeometries(Bucket& bucket, const VectorTileLayer& layer, const FilterExpression& filter);
private:
const VectorTile vector_data;
const VectorTile vector_tile;
VectorTileData& tile;
// Cross-thread shared data.