diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-07-16 18:53:56 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-07-16 18:53:56 -0700 |
commit | 4ea281c750c5afcc68f2832bb42d98a1cbce6735 (patch) | |
tree | 60bc7d3ccba2c54859e2e023997cc027cc67aea7 /src/map | |
parent | c1a64dc5fa73b54cc5de77629781dfc74302a1e7 (diff) | |
download | qtlocation-mapboxgl-4ea281c750c5afcc68f2832bb42d98a1cbce6735.tar.gz |
rename llmr => mbgl
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/map.cpp | 32 | ||||
-rw-r--r-- | src/map/raster_tile_data.cpp | 8 | ||||
-rw-r--r-- | src/map/source.cpp | 46 | ||||
-rw-r--r-- | src/map/sprite.cpp | 16 | ||||
-rw-r--r-- | src/map/tile.cpp | 4 | ||||
-rw-r--r-- | src/map/tile_data.cpp | 8 | ||||
-rw-r--r-- | src/map/tile_parser.cpp | 42 | ||||
-rw-r--r-- | src/map/transform.cpp | 16 | ||||
-rw-r--r-- | src/map/transform_state.cpp | 6 | ||||
-rw-r--r-- | src/map/vector_tile.cpp | 12 | ||||
-rw-r--r-- | src/map/vector_tile_data.cpp | 12 |
11 files changed, 101 insertions, 101 deletions
diff --git a/src/map/map.cpp b/src/map/map.cpp index 2086ad54b7..c7039cc927 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -1,24 +1,24 @@ -#include <llmr/map/map.hpp> -#include <llmr/map/source.hpp> -#include <llmr/platform/platform.hpp> -#include <llmr/map/sprite.hpp> -#include <llmr/util/transition.hpp> -#include <llmr/util/time.hpp> -#include <llmr/util/math.hpp> -#include <llmr/util/clip_ids.hpp> -#include <llmr/util/string.hpp> -#include <llmr/util/constants.hpp> -#include <llmr/util/uv.hpp> -#include <llmr/util/std.hpp> -#include <llmr/style/style_layer_group.hpp> -#include <llmr/style/style_bucket.hpp> -#include <llmr/geometry/sprite_atlas.hpp> +#include <mbgl/map/map.hpp> +#include <mbgl/map/source.hpp> +#include <mbgl/platform/platform.hpp> +#include <mbgl/map/sprite.hpp> +#include <mbgl/util/transition.hpp> +#include <mbgl/util/time.hpp> +#include <mbgl/util/math.hpp> +#include <mbgl/util/clip_ids.hpp> +#include <mbgl/util/string.hpp> +#include <mbgl/util/constants.hpp> +#include <mbgl/util/uv.hpp> +#include <mbgl/util/std.hpp> +#include <mbgl/style/style_layer_group.hpp> +#include <mbgl/style/style_bucket.hpp> +#include <mbgl/geometry/sprite_atlas.hpp> #include <algorithm> #include <memory> #include <iostream> -using namespace llmr; +using namespace mbgl; Map::Map(View& view) : view(view), diff --git a/src/map/raster_tile_data.cpp b/src/map/raster_tile_data.cpp index 7892458f91..ef6bea7e62 100644 --- a/src/map/raster_tile_data.cpp +++ b/src/map/raster_tile_data.cpp @@ -1,8 +1,8 @@ -#include <llmr/map/map.hpp> -#include <llmr/map/raster_tile_data.hpp> -#include <llmr/style/style.hpp> +#include <mbgl/map/map.hpp> +#include <mbgl/map/raster_tile_data.hpp> +#include <mbgl/style/style.hpp> -using namespace llmr; +using namespace mbgl; RasterTileData::RasterTileData(Tile::ID id, Map &map, const std::string url) diff --git a/src/map/source.cpp b/src/map/source.cpp index 55a2bea4e1..e46bb0abd8 100644 --- a/src/map/source.cpp +++ b/src/map/source.cpp @@ -1,22 +1,22 @@ -#include <llmr/map/source.hpp> -#include <llmr/map/map.hpp> -#include <llmr/map/transform.hpp> -#include <llmr/renderer/painter.hpp> -#include <llmr/util/constants.hpp> -#include <llmr/util/raster.hpp> -#include <llmr/util/string.hpp> -#include <llmr/util/texturepool.hpp> -#include <llmr/util/vec.hpp> -#include <llmr/util/token.hpp> -#include <llmr/util/std.hpp> -#include <llmr/geometry/glyph_atlas.hpp> -#include <llmr/style/style_layer.hpp> - - -#include <llmr/map/vector_tile_data.hpp> -#include <llmr/map/raster_tile_data.hpp> - -namespace llmr { +#include <mbgl/map/source.hpp> +#include <mbgl/map/map.hpp> +#include <mbgl/map/transform.hpp> +#include <mbgl/renderer/painter.hpp> +#include <mbgl/util/constants.hpp> +#include <mbgl/util/raster.hpp> +#include <mbgl/util/string.hpp> +#include <mbgl/util/texturepool.hpp> +#include <mbgl/util/vec.hpp> +#include <mbgl/util/token.hpp> +#include <mbgl/util/std.hpp> +#include <mbgl/geometry/glyph_atlas.hpp> +#include <mbgl/style/style_layer.hpp> + + +#include <mbgl/map/vector_tile_data.hpp> +#include <mbgl/map/raster_tile_data.hpp> + +namespace mbgl { Source::Source(StyleSource style_source, const std::string &access_token) : type(style_source.type), @@ -330,7 +330,7 @@ struct edge { typedef const std::function<void(int32_t, int32_t, int32_t, int32_t)> ScanLine; // scan-line conversion -edge _edge(const llmr::vec2<double> a, const llmr::vec2<double> b) { +edge _edge(const mbgl::vec2<double> a, const mbgl::vec2<double> b) { if (a.y > b.y) { return { b.x, b.y, a.x, a.y, a.x - b.x, a.y - b.y }; } else { @@ -363,7 +363,7 @@ void _scanSpans(edge e0, edge e1, int32_t ymin, int32_t ymax, ScanLine scanLine) } // scan-line conversion -void _scanTriangle(const llmr::vec2<double> a, const llmr::vec2<double> b, const llmr::vec2<double> c, int32_t ymin, int32_t ymax, ScanLine& scanLine) { +void _scanTriangle(const mbgl::vec2<double> a, const mbgl::vec2<double> b, const mbgl::vec2<double> c, int32_t ymin, int32_t ymax, ScanLine& scanLine) { edge ab = _edge(a, b); edge bc = _edge(b, c); edge ca = _edge(c, a); @@ -384,9 +384,9 @@ double Source::getZoom(const TransformState &state) const { return state.getZoom() + offset; } -std::forward_list<llmr::Tile::ID> Source::covering_tiles(const TransformState &state, int32_t clamped_zoom, const box& points) { +std::forward_list<mbgl::Tile::ID> Source::covering_tiles(const TransformState &state, int32_t clamped_zoom, const box& points) { int32_t dim = std::pow(2, clamped_zoom); - std::forward_list<llmr::Tile::ID> tiles; + std::forward_list<mbgl::Tile::ID> tiles; bool is_raster = (type == SourceType::Raster); double search_zoom = getZoom(state); diff --git a/src/map/sprite.cpp b/src/map/sprite.cpp index 823d646653..fd8a4ec7b5 100644 --- a/src/map/sprite.cpp +++ b/src/map/sprite.cpp @@ -1,16 +1,16 @@ -#include <llmr/map/sprite.hpp> -#include <llmr/map/map.hpp> -#include <llmr/util/raster.hpp> -#include <llmr/platform/log.hpp> +#include <mbgl/map/sprite.hpp> +#include <mbgl/map/map.hpp> +#include <mbgl/util/raster.hpp> +#include <mbgl/platform/log.hpp> #include <string> -#include <llmr/platform/platform.hpp> -#include <llmr/util/uv.hpp> -#include <llmr/util/std.hpp> +#include <mbgl/platform/platform.hpp> +#include <mbgl/util/uv.hpp> +#include <mbgl/util/std.hpp> #include <rapidjson/document.h> -using namespace llmr; +using namespace mbgl; SpritePosition::SpritePosition(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t pixelRatio) : x(x), diff --git a/src/map/tile.cpp b/src/map/tile.cpp index 45fe88ee29..e073960116 100644 --- a/src/map/tile.cpp +++ b/src/map/tile.cpp @@ -1,8 +1,8 @@ -#include <llmr/map/tile.hpp> +#include <mbgl/map/tile.hpp> #include <cassert> -using namespace llmr; +using namespace mbgl; #include <iostream> diff --git a/src/map/tile_data.cpp b/src/map/tile_data.cpp index 4b926f435e..82f8fdedfc 100644 --- a/src/map/tile_data.cpp +++ b/src/map/tile_data.cpp @@ -1,9 +1,9 @@ -#include <llmr/map/tile_data.hpp> -#include <llmr/map/map.hpp> +#include <mbgl/map/tile_data.hpp> +#include <mbgl/map/map.hpp> -#include <llmr/util/string.hpp> +#include <mbgl/util/string.hpp> -using namespace llmr; +using namespace mbgl; TileData::TileData(Tile::ID id, Map &map, const std::string url) : id(id), diff --git a/src/map/tile_parser.cpp b/src/map/tile_parser.cpp index 2208094cf8..8af61c6aab 100644 --- a/src/map/tile_parser.cpp +++ b/src/map/tile_parser.cpp @@ -1,23 +1,23 @@ -#include <llmr/map/tile_parser.hpp> - -#include <llmr/map/vector_tile_data.hpp> -#include <llmr/style/style.hpp> -#include <llmr/style/style_layer.hpp> -#include <llmr/style/style_layer_group.hpp> -#include <llmr/renderer/fill_bucket.hpp> -#include <llmr/renderer/line_bucket.hpp> -#include <llmr/renderer/icon_bucket.hpp> -#include <llmr/renderer/text_bucket.hpp> -#include <llmr/renderer/raster_bucket.hpp> -#include <llmr/util/raster.hpp> -#include <llmr/util/constants.hpp> -#include <llmr/util/token.hpp> -#include <llmr/geometry/glyph_atlas.hpp> -#include <llmr/text/glyph_store.hpp> -#include <llmr/text/glyph.hpp> - -#include <llmr/util/std.hpp> -#include <llmr/util/utf.hpp> +#include <mbgl/map/tile_parser.hpp> + +#include <mbgl/map/vector_tile_data.hpp> +#include <mbgl/style/style.hpp> +#include <mbgl/style/style_layer.hpp> +#include <mbgl/style/style_layer_group.hpp> +#include <mbgl/renderer/fill_bucket.hpp> +#include <mbgl/renderer/line_bucket.hpp> +#include <mbgl/renderer/icon_bucket.hpp> +#include <mbgl/renderer/text_bucket.hpp> +#include <mbgl/renderer/raster_bucket.hpp> +#include <mbgl/util/raster.hpp> +#include <mbgl/util/constants.hpp> +#include <mbgl/util/token.hpp> +#include <mbgl/geometry/glyph_atlas.hpp> +#include <mbgl/text/glyph_store.hpp> +#include <mbgl/text/glyph.hpp> + +#include <mbgl/util/std.hpp> +#include <mbgl/util/utf.hpp> #include <locale> @@ -29,7 +29,7 @@ namespace regex_impl = boost; namespace regex_impl = std; #endif -using namespace llmr; +using namespace mbgl; TileParser::TileParser(const std::string &data, VectorTileData &tile, const std::shared_ptr<const Style> &style, diff --git a/src/map/transform.cpp b/src/map/transform.cpp index f6623485f9..ccf92f974b 100644 --- a/src/map/transform.cpp +++ b/src/map/transform.cpp @@ -1,13 +1,13 @@ -#include <llmr/map/transform.hpp> -#include <llmr/util/constants.hpp> -#include <llmr/util/mat4.hpp> -#include <llmr/util/std.hpp> -#include <llmr/util/math.hpp> -#include <llmr/util/time.hpp> -#include <llmr/platform/platform.hpp> +#include <mbgl/map/transform.hpp> +#include <mbgl/util/constants.hpp> +#include <mbgl/util/mat4.hpp> +#include <mbgl/util/std.hpp> +#include <mbgl/util/math.hpp> +#include <mbgl/util/time.hpp> +#include <mbgl/platform/platform.hpp> #include <cstdio> -using namespace llmr; +using namespace mbgl; const double D2R = M_PI / 180.0; const double R2D = 180.0 / M_PI; diff --git a/src/map/transform_state.cpp b/src/map/transform_state.cpp index 2bc8e71a47..d103897375 100644 --- a/src/map/transform_state.cpp +++ b/src/map/transform_state.cpp @@ -1,7 +1,7 @@ -#include <llmr/map/transform_state.hpp> -#include <llmr/util/constants.hpp> +#include <mbgl/map/transform_state.hpp> +#include <mbgl/util/constants.hpp> -using namespace llmr; +using namespace mbgl; #pragma mark - Matrix diff --git a/src/map/vector_tile.cpp b/src/map/vector_tile.cpp index 393a72c14b..8644c3e044 100644 --- a/src/map/vector_tile.cpp +++ b/src/map/vector_tile.cpp @@ -1,14 +1,14 @@ -#include <llmr/map/vector_tile.hpp> -#include <llmr/style/filter_expression_private.hpp> -#include <llmr/style/filter_comparison_private.hpp> +#include <mbgl/map/vector_tile.hpp> +#include <mbgl/style/filter_expression_private.hpp> +#include <mbgl/style/filter_comparison_private.hpp> #include <algorithm> #include <iostream> -using namespace llmr; +using namespace mbgl; -std::ostream& llmr::operator<<(std::ostream& os, const FeatureType& type) { +std::ostream& mbgl::operator<<(std::ostream& os, const FeatureType& type) { switch (type) { case FeatureType::Unknown: return os << "Unknown"; case FeatureType::Point: return os << "Point"; @@ -54,7 +54,7 @@ VectorTileFeature::VectorTileFeature(pbf feature, const VectorTileLayer& layer) } -std::ostream& llmr::operator<<(std::ostream& os, const VectorTileFeature& feature) { +std::ostream& mbgl::operator<<(std::ostream& os, const VectorTileFeature& feature) { os << "Feature(" << feature.id << "): " << feature.type << std::endl; for (const auto& prop : feature.properties) { os << " - " << prop.first << ": " << prop.second << std::endl; diff --git a/src/map/vector_tile_data.cpp b/src/map/vector_tile_data.cpp index 051ebb7eac..7d0e0fb5a8 100644 --- a/src/map/vector_tile_data.cpp +++ b/src/map/vector_tile_data.cpp @@ -1,10 +1,10 @@ -#include <llmr/map/vector_tile_data.hpp> -#include <llmr/util/std.hpp> -#include <llmr/map/map.hpp> -#include <llmr/style/style_layer.hpp> -#include <llmr/style/style_bucket.hpp> +#include <mbgl/map/vector_tile_data.hpp> +#include <mbgl/util/std.hpp> +#include <mbgl/map/map.hpp> +#include <mbgl/style/style_layer.hpp> +#include <mbgl/style/style_bucket.hpp> -using namespace llmr; +using namespace mbgl; VectorTileData::VectorTileData(Tile::ID id, Map &map, const std::string url) : TileData(id, map, url) { |