core: rename mbgl namespace to mln (#4487)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
16
CHANGELOG.md
16
CHANGELOG.md
@@ -87,7 +87,7 @@
|
||||
|
||||
- [ios, macos] Allow specifying multiple fonts or font families for local font rendering ([#16253](https://github.com/mapbox/mapbox-gl-native/pull/16253))
|
||||
|
||||
By default, CJK characters are now set in the font specified by the `text-font` layout property. If the named font is not installed on the device or bundled with the application, the characters are set in one of the fallback fonts passed into the `localFontFamily` parameter of `mbgl::Renderer::Renderer()` and `mbgl::MapSnapshotter::MapSnapshotter()`. This parameter can now contain a list of font family names, font display names, and font PostScript names, each name separated by a newline.
|
||||
By default, CJK characters are now set in the font specified by the `text-font` layout property. If the named font is not installed on the device or bundled with the application, the characters are set in one of the fallback fonts passed into the `localFontFamily` parameter of `mln::Renderer::Renderer()` and `mln::MapSnapshotter::MapSnapshotter()`. This parameter can now contain a list of font family names, font display names, and font PostScript names, each name separated by a newline.
|
||||
|
||||
### 🐞 Bug fixes
|
||||
|
||||
@@ -141,7 +141,7 @@
|
||||
|
||||
- [core][tile mode] Fix variable placement for labels with the `icon-text-fit` property set ([#16382](https://github.com/mapbox/mapbox-gl-native/pull/16382))
|
||||
|
||||
The `symbolIntersectsTileEdges()` util in `mbgl::TilePlacement` now considers icon shift for the variable symbols with enabled icon-text-fit setting, thus providing more accurate results.
|
||||
The `symbolIntersectsTileEdges()` util in `mln::TilePlacement` now considers icon shift for the variable symbols with enabled icon-text-fit setting, thus providing more accurate results.
|
||||
|
||||
- [core] Correctly log a warning instead of crashing when a non-existent image is attempted to be removed. ([#16391](https://github.com/mapbox/mapbox-gl-native/pull/16391))
|
||||
|
||||
@@ -172,7 +172,7 @@
|
||||
- [android] Add jni binding for styleable snapshotter ([#16286](https://github.com/mapbox/mapbox-gl-native/pull/16286))
|
||||
|
||||
- [core] Ability to set generic layer properties using setProperty method ([#16324](https://github.com/mapbox/mapbox-gl-native/pull/16324))
|
||||
This change enables the following new keys for the `mbgl::Layer::setProperty()` API:
|
||||
This change enables the following new keys for the `mln::Layer::setProperty()` API:
|
||||
- "filter" invokes `setFilter()`
|
||||
- "minzoom" invokes `setMinZoom()`
|
||||
- "maxzoom" invokes `setMaxZoom()`
|
||||
@@ -254,7 +254,7 @@
|
||||
|
||||
- Fixed using of the `in` expression as a layer filter ([#16272](https://github.com/mapbox/mapbox-gl-native/pull/16272))
|
||||
|
||||
The bug was caused by `mbgl::style::conversion::isExpression()` always returning `false` for the `in` expression.
|
||||
The bug was caused by `mln::style::conversion::isExpression()` always returning `false` for the `in` expression.
|
||||
|
||||
### 🧩 Architectural changes
|
||||
|
||||
@@ -298,9 +298,9 @@
|
||||
|
||||
##### ⚠️ Breaking changes
|
||||
|
||||
- Changes to `mbgl::FileSourceManager::getFileSource()` ([#16238](https://github.com/mapbox/mapbox-gl-native/pull/16238))
|
||||
- Changes to `mln::FileSourceManager::getFileSource()` ([#16238](https://github.com/mapbox/mapbox-gl-native/pull/16238))
|
||||
|
||||
It returns now `mbgl::PassRefPtr<FileSource>` (previously was `std::shared_ptr<FileSource>`) in order to enforce keeping the strong reference to the returned object.
|
||||
It returns now `mln::PassRefPtr<FileSource>` (previously was `std::shared_ptr<FileSource>`) in order to enforce keeping the strong reference to the returned object.
|
||||
|
||||
Breaking code example:
|
||||
`auto fs = FileSourceManager::getFileSource(); fs->..`
|
||||
@@ -308,9 +308,9 @@
|
||||
Possible fix:
|
||||
`std::shared_ptr<FileSource> fs = `;
|
||||
|
||||
- The `mbgl::OnlineFileSource` class cannot be used directly ([#16238](https://github.com/mapbox/mapbox-gl-native/pull/16238))
|
||||
- The `mln::OnlineFileSource` class cannot be used directly ([#16238](https://github.com/mapbox/mapbox-gl-native/pull/16238))
|
||||
|
||||
Clients must use the parent `mbgl::FileSource` interface instead.
|
||||
Clients must use the parent `mln::FileSource` interface instead.
|
||||
|
||||
Breaking code example:
|
||||
`std::shared_ptr<OnlineFileSource> onlineSource = std::static_pointer_cast<OnlineFileSource>(FileSourceManager::get()->getFileSource(..));`
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <mbgl/util/io.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
namespace {
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <sstream>
|
||||
#include <optional>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -124,7 +124,7 @@ static void API_renderStill_recreate_map_2(::benchmark::State& state) {
|
||||
}
|
||||
|
||||
static void API_renderStill_multiple_sources(::benchmark::State& state) {
|
||||
using namespace mbgl::style;
|
||||
using namespace mln::style;
|
||||
RenderBenchmark bench;
|
||||
HeadlessFrontend frontend{size, pixelRatio};
|
||||
Map map{frontend,
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
#include <mbgl/style/conversion/property_value.hpp>
|
||||
#include <mbgl/style/conversion_impl.hpp>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mbgl::style;
|
||||
using namespace mln;
|
||||
using namespace mln::style;
|
||||
|
||||
static std::string createFunctionJSON(size_t stopCount) {
|
||||
std::string stops = "[";
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
#include <mbgl/style/conversion/property_value.hpp>
|
||||
#include <mbgl/style/conversion_impl.hpp>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mbgl::style;
|
||||
using namespace mln;
|
||||
using namespace mln::style;
|
||||
|
||||
static std::string createFunctionJSON(size_t stopCount) {
|
||||
std::string stops = "[";
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
#include <mbgl/style/conversion/property_value.hpp>
|
||||
#include <mbgl/style/conversion_impl.hpp>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mbgl::style;
|
||||
using namespace mln;
|
||||
using namespace mln::style;
|
||||
|
||||
static std::string createFunctionJSON(size_t stopCount) {
|
||||
std::string stops = "[";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
int runBenchmark(int argc, char* argv[]);
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -22,13 +22,13 @@ bool TestRunner::startTest(const std::string& basePath) {
|
||||
argv.push_back(nullptr);
|
||||
|
||||
if (chdir(basePath.c_str())) {
|
||||
mbgl::Log::Error(mbgl::Event::General, "Failed to change the directory to " + basePath);
|
||||
mln::Log::Error(mln::Event::General, "Failed to change the directory to " + basePath);
|
||||
return false;
|
||||
}
|
||||
|
||||
mbgl::Log::Info(mbgl::Event::General, "Start BenchmarkRunner");
|
||||
int status = mbgl::runBenchmark(static_cast<uint32_t>(argv.size()), argv.data());
|
||||
mbgl::Log::Info(mbgl::Event::General, "BenchmarkRunner finished with status: '%d'", status);
|
||||
mln::Log::Info(mln::Event::General, "Start BenchmarkRunner");
|
||||
int status = mln::runBenchmark(static_cast<uint32_t>(argv.size()), argv.data());
|
||||
mln::Log::Info(mln::Event::General, "BenchmarkRunner finished with status: '%d'", status);
|
||||
|
||||
return status == 0;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <mbgl/tile/geometry_tile_data.hpp>
|
||||
#include <mbgl/benchmark/stub_geometry_tile_feature.hpp>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
style::Filter parse(const char* expression) {
|
||||
style::conversion::Error error;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <mbgl/algorithm/update_tile_masks.hpp>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
class FakeTile {
|
||||
public:
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <mbgl/tile/vector_mvt_tile_data.hpp>
|
||||
#include <mbgl/util/io.hpp>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
static void Parse_VectorTile(benchmark::State& state) {
|
||||
auto data = std::make_shared<std::string>(
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
#include <mbgl/renderer/render_layer.hpp>
|
||||
#include <mbgl/util/thread_pool.hpp>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mbgl::style;
|
||||
using namespace mln;
|
||||
using namespace mln::style;
|
||||
|
||||
// Minimal FileSource stub for benchmark (doesn't actually fetch resources)
|
||||
class StubFileSource : public FileSource {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <benchmark/benchmark.h>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
int runBenchmark(int argc, char* argv[]) {
|
||||
::benchmark::Initialize(&argc, argv);
|
||||
@@ -10,4 +10,4 @@ int runBenchmark(int argc, char* argv[]) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <mbgl/tile/geometry_tile_data.hpp>
|
||||
#include <mbgl/util/feature.hpp>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
class StubGeometryTileFeature : public GeometryTileFeature {
|
||||
public:
|
||||
|
||||
@@ -18,14 +18,14 @@ public:
|
||||
|
||||
response.data = std::make_shared<std::string>(50 * 1024, 0);
|
||||
response.mustRevalidate = false;
|
||||
response.expires = mbgl::util::now() + 1h;
|
||||
response.expires = mln::util::now() + 1h;
|
||||
|
||||
resetAmbientTiles();
|
||||
resetRegion();
|
||||
}
|
||||
|
||||
void resetAmbientTiles() {
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
db.clearAmbientCache();
|
||||
|
||||
@@ -37,7 +37,7 @@ public:
|
||||
}
|
||||
|
||||
void resetRegion() {
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
auto regions = db.listRegions().value();
|
||||
if (!regions.empty()) {
|
||||
@@ -58,8 +58,8 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
mbgl::Response response;
|
||||
mbgl::OfflineDatabase db{":memory:", mbgl::TileServerOptions::DefaultConfiguration()};
|
||||
mln::Response response;
|
||||
mln::OfflineDatabase db{":memory:", mln::TileServerOptions::DefaultConfiguration()};
|
||||
|
||||
const unsigned tileCount = 100;
|
||||
int64_t regionID = 0;
|
||||
@@ -78,7 +78,7 @@ BENCHMARK_F(OfflineDatabase, DeleteRegion)(benchmark::State& state) {
|
||||
}
|
||||
|
||||
BENCHMARK_F(OfflineDatabase, InsertTileRegion)(benchmark::State& state) {
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
while (state.KeepRunning()) {
|
||||
const Resource offline = Resource::tile(
|
||||
@@ -99,7 +99,7 @@ BENCHMARK_F(OfflineDatabase, ClearAmbientCache)(benchmark::State& state) {
|
||||
}
|
||||
|
||||
BENCHMARK_F(OfflineDatabase, InsertTileCache)(benchmark::State& state) {
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
while (state.KeepRunning()) {
|
||||
const Resource ambient = Resource::tile(
|
||||
@@ -109,7 +109,7 @@ BENCHMARK_F(OfflineDatabase, InsertTileCache)(benchmark::State& state) {
|
||||
}
|
||||
|
||||
BENCHMARK_F(OfflineDatabase, InsertBigTileCache)(benchmark::State& state) {
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
Response big;
|
||||
big.data = std::make_shared<std::string>(util::DEFAULT_MAX_CACHE_SIZE / 100, 0);
|
||||
@@ -122,7 +122,7 @@ BENCHMARK_F(OfflineDatabase, InsertBigTileCache)(benchmark::State& state) {
|
||||
}
|
||||
|
||||
BENCHMARK_F(OfflineDatabase, GetTile)(benchmark::State& state) {
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
std::random_device rd;
|
||||
std::mt19937 gen(rd());
|
||||
@@ -136,7 +136,7 @@ BENCHMARK_F(OfflineDatabase, GetTile)(benchmark::State& state) {
|
||||
}
|
||||
|
||||
BENCHMARK_F(OfflineDatabase, AddTilesToFullDatabase)(benchmark::State& state) {
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
Log::setObserver(std::make_unique<Log::NullObserver>());
|
||||
db.setMaximumAmbientCacheSize(50 * 1024 * 5);
|
||||
@@ -152,7 +152,7 @@ BENCHMARK_F(OfflineDatabase, AddTilesToFullDatabase)(benchmark::State& state) {
|
||||
|
||||
BENCHMARK_F(OfflineDatabase, AddTilesToDisabledDatabase)
|
||||
(benchmark::State& state) {
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
auto regions = db.listRegions().value();
|
||||
if (!regions.empty()) {
|
||||
@@ -171,7 +171,7 @@ BENCHMARK_F(OfflineDatabase, AddTilesToDisabledDatabase)
|
||||
|
||||
BENCHMARK_F(OfflineDatabase, GetTileFromDisabledDatabase)
|
||||
(benchmark::State& state) {
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
auto regions = db.listRegions().value();
|
||||
if (!regions.empty()) {
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace {
|
||||
void ColorParse(benchmark::State& state) {
|
||||
for (auto _ : state) {
|
||||
for (const auto& str : testStrings) {
|
||||
auto result = mbgl::Color::parse(str);
|
||||
auto result = mln::Color::parse(str);
|
||||
benchmark::DoNotOptimize(result);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <mbgl/util/tile_cover.hpp>
|
||||
#include <mbgl/map/transform.hpp>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
static const LatLngBounds sanFrancisco = LatLngBounds::hull({37.6609, -122.5744}, {37.8271, -122.3204});
|
||||
|
||||
|
||||
@@ -25,20 +25,20 @@ int main(int argc, char* argv[]) {
|
||||
args::ValueFlag<unsigned long> expiresValue(p, "expires", "Expires date, will use 'now' otherwise", {'e'});
|
||||
args::ValueFlag<unsigned long> modifiedValue(p, "modified", "Modified date, will use 'now' otherwise", {'m'});
|
||||
|
||||
std::unordered_map<std::string, mbgl::Resource::Kind> typeMap{{"glyphs", mbgl::Resource::Glyphs},
|
||||
{"image", mbgl::Resource::Image},
|
||||
{"source", mbgl::Resource::Source},
|
||||
{"sprite-image", mbgl::Resource::SpriteImage},
|
||||
{"sprite-json", mbgl::Resource::SpriteJSON},
|
||||
{"style", mbgl::Resource::Style},
|
||||
{"tile", mbgl::Resource::Tile}};
|
||||
std::unordered_map<std::string, mln::Resource::Kind> typeMap{{"glyphs", mln::Resource::Glyphs},
|
||||
{"image", mln::Resource::Image},
|
||||
{"source", mln::Resource::Source},
|
||||
{"sprite-image", mln::Resource::SpriteImage},
|
||||
{"sprite-json", mln::Resource::SpriteJSON},
|
||||
{"style", mln::Resource::Style},
|
||||
{"tile", mln::Resource::Tile}};
|
||||
|
||||
std::string typeHelp("One of the following (required):");
|
||||
for (const auto& key : typeMap) {
|
||||
typeHelp += " " + key.first;
|
||||
}
|
||||
|
||||
args::MapFlag<std::string, mbgl::Resource::Kind> typeFlag(
|
||||
args::MapFlag<std::string, mln::Resource::Kind> typeFlag(
|
||||
p, "type", typeHelp, {"type"}, typeMap, args::Options::Required);
|
||||
|
||||
args::Group tileIdGroup(p, "Coordinates (required for 'tile')", args::Group::Validators::AllOrNone);
|
||||
@@ -67,15 +67,15 @@ int main(int argc, char* argv[]) {
|
||||
exit(3);
|
||||
}
|
||||
|
||||
mbgl::Response response;
|
||||
mln::Response response;
|
||||
response.data = std::make_shared<std::string>(*file);
|
||||
response.etag = etagValue ? args::get(etagValue) : std::string();
|
||||
response.expires = expiresValue ? mbgl::Timestamp(mbgl::Seconds(args::get(expiresValue))) : mbgl::util::now();
|
||||
response.modified = modifiedValue ? mbgl::Timestamp(mbgl::Seconds(args::get(modifiedValue))) : mbgl::util::now();
|
||||
response.expires = expiresValue ? mln::Timestamp(mln::Seconds(args::get(expiresValue))) : mln::util::now();
|
||||
response.modified = modifiedValue ? mln::Timestamp(mln::Seconds(args::get(modifiedValue))) : mln::util::now();
|
||||
|
||||
mbgl::Resource resource(args::get(typeFlag), args::get(urlValue));
|
||||
mln::Resource resource(args::get(typeFlag), args::get(urlValue));
|
||||
|
||||
if (args::get(typeFlag) == mbgl::Resource::Tile) {
|
||||
if (args::get(typeFlag) == mln::Resource::Tile) {
|
||||
if (!xValueFlag || !yValueFlag || !zValueFlag) {
|
||||
std::cerr << "Error: -x, -y and -z must be provided for tiles" << '\n';
|
||||
exit(1);
|
||||
@@ -88,9 +88,9 @@ int main(int argc, char* argv[]) {
|
||||
.z = static_cast<int8_t>(args::get(zValueFlag))}};
|
||||
}
|
||||
|
||||
mbgl::util::RunLoop loop;
|
||||
std::shared_ptr<mbgl::FileSource> dbfs = mbgl::FileSourceManager::get()->getFileSource(
|
||||
mbgl::FileSourceType::Database, mbgl::ResourceOptions().withCachePath(args::get(cacheValue)));
|
||||
mln::util::RunLoop loop;
|
||||
std::shared_ptr<mln::FileSource> dbfs = mln::FileSourceManager::get()->getFileSource(
|
||||
mln::FileSourceType::Database, mln::ResourceOptions().withCachePath(args::get(cacheValue)));
|
||||
dbfs->forward(resource, response, [&loop] { loop.stop(); });
|
||||
loop.run();
|
||||
return 0;
|
||||
|
||||
@@ -51,19 +51,19 @@ mapbox::geometry::geometry<double> parseGeometry(const std::string& json) {
|
||||
});
|
||||
}
|
||||
|
||||
std::ostream& operator<<(std::ostream& os, mbgl::Response::Error::Reason r) {
|
||||
std::ostream& operator<<(std::ostream& os, mln::Response::Error::Reason r) {
|
||||
switch (r) {
|
||||
case mbgl::Response::Error::Reason::Success:
|
||||
case mln::Response::Error::Reason::Success:
|
||||
return os << "Response::Error::Reason::Success";
|
||||
case mbgl::Response::Error::Reason::NotFound:
|
||||
case mln::Response::Error::Reason::NotFound:
|
||||
return os << "Response::Error::Reason::NotFound";
|
||||
case mbgl::Response::Error::Reason::Server:
|
||||
case mln::Response::Error::Reason::Server:
|
||||
return os << "Response::Error::Reason::Server";
|
||||
case mbgl::Response::Error::Reason::Connection:
|
||||
case mln::Response::Error::Reason::Connection:
|
||||
return os << "Response::Error::Reason::Connection";
|
||||
case mbgl::Response::Error::Reason::RateLimit:
|
||||
case mln::Response::Error::Reason::RateLimit:
|
||||
return os << "Response::Error::Reason::RateLimit";
|
||||
case mbgl::Response::Error::Reason::Other:
|
||||
case mln::Response::Error::Reason::Other:
|
||||
return os << "Response::Error::Reason::Other";
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ int main(int argc, char* argv[]) {
|
||||
exit(2);
|
||||
}
|
||||
|
||||
auto mapTilerConfiguration = mbgl::TileServerOptions::MapTilerConfiguration();
|
||||
auto mapTilerConfiguration = mln::TileServerOptions::MapTilerConfiguration();
|
||||
|
||||
std::string style = styleValue ? args::get(styleValue) : mapTilerConfiguration.defaultStyles().at(0).getUrl();
|
||||
std::cout << " Style: " << style << std::endl;
|
||||
@@ -138,7 +138,7 @@ int main(int argc, char* argv[]) {
|
||||
const bool includeIdeographs = includeIdeographsValue ? args::get(includeIdeographsValue) : false;
|
||||
const std::string output = outputValue ? args::get(outputValue) : "offline.db";
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
OfflineRegionDefinition definition = [&]() {
|
||||
if (geometryValue) {
|
||||
@@ -185,7 +185,7 @@ int main(int argc, char* argv[]) {
|
||||
int retCode = 0;
|
||||
std::cout << "Start Merge" << std::endl;
|
||||
inputSource.mergeOfflineRegions(
|
||||
*mergePath, [&](mbgl::expected<std::vector<OfflineRegion>, std::exception_ptr> result) {
|
||||
*mergePath, [&](mln::expected<std::vector<OfflineRegion>, std::exception_ptr> result) {
|
||||
if (!result) {
|
||||
std::cerr << "Error merging database: " << util::toString(result.error()) << std::endl;
|
||||
retCode = 1;
|
||||
@@ -264,7 +264,7 @@ int main(int argc, char* argv[]) {
|
||||
std::signal(SIGINT, [](int) { stop(); });
|
||||
|
||||
fileSource->createOfflineRegion(
|
||||
definition, metadata, [&](mbgl::expected<OfflineRegion, std::exception_ptr> region_) {
|
||||
definition, metadata, [&](mln::expected<OfflineRegion, std::exception_ptr> region_) {
|
||||
if (!region_) {
|
||||
std::cerr << "Error creating region: " << util::toString(region_.error()) << std::endl;
|
||||
loop.stop();
|
||||
|
||||
@@ -69,7 +69,7 @@ int main(int argc, char* argv[]) {
|
||||
const double lon = lonValue ? args::get(lonValue) : 0;
|
||||
const double alt = altValue ? args::get(altValue) : 0;
|
||||
const double zoom = zoomValue ? args::get(zoomValue) : 0;
|
||||
const double fov = fovValue ? args::get(fovValue) : mbgl::util::rad2deg(mbgl::util::DEFAULT_FOV);
|
||||
const double fov = fovValue ? args::get(fovValue) : mln::util::rad2deg(mln::util::DEFAULT_FOV);
|
||||
const double bearing = bearingValue ? args::get(bearingValue) : 0;
|
||||
const double pitch = pitchValue ? args::get(pitchValue) : 0;
|
||||
const double roll = rollValue ? args::get(rollValue) : 0;
|
||||
@@ -87,9 +87,9 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
const bool debug = debugFlag ? args::get(debugFlag) : false;
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
auto mapTilerConfiguration = mbgl::TileServerOptions::MapTilerConfiguration();
|
||||
auto mapTilerConfiguration = mln::TileServerOptions::MapTilerConfiguration();
|
||||
std::string style = styleValue ? args::get(styleValue) : mapTilerConfiguration.defaultStyles().at(0).getUrl();
|
||||
|
||||
util::RunLoop loop;
|
||||
@@ -136,8 +136,8 @@ int main(int argc, char* argv[]) {
|
||||
}
|
||||
|
||||
if (debug) {
|
||||
map.setDebug(debug ? mbgl::MapDebugOptions::TileBorders | mbgl::MapDebugOptions::ParseStatus
|
||||
: mbgl::MapDebugOptions::NoDebug);
|
||||
map.setDebug(debug ? mln::MapDebugOptions::TileBorders | mln::MapDebugOptions::ParseStatus
|
||||
: mln::MapDebugOptions::NoDebug);
|
||||
}
|
||||
|
||||
try {
|
||||
|
||||
@@ -108,7 +108,7 @@ Main thread: Tile ready → render
|
||||
### Core C++ (public header)
|
||||
|
||||
```cpp
|
||||
namespace mbgl::style {
|
||||
namespace mln::style {
|
||||
|
||||
enum class TileDataFormat : uint8_t { MVT = 0 };
|
||||
|
||||
@@ -131,7 +131,7 @@ public:
|
||||
void invalidateTile(const CanonicalTileID&);
|
||||
};
|
||||
|
||||
} // namespace mbgl::style
|
||||
} // namespace mln::style
|
||||
```
|
||||
|
||||
### Android (Kotlin)
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <sstream>
|
||||
#include <filesystem>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
using namespace std::literals;
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -20,9 +20,9 @@
|
||||
|
||||
#include <regex>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mbgl::style;
|
||||
using namespace mbgl::style::conversion;
|
||||
using namespace mln;
|
||||
using namespace mln::style;
|
||||
using namespace mln::style::conversion;
|
||||
using namespace std::literals;
|
||||
|
||||
namespace {
|
||||
@@ -407,7 +407,7 @@ std::optional<TestData> parseTestData(const std::filesystem::path& path) {
|
||||
TestData data;
|
||||
auto maybeJson = readJson(path.string());
|
||||
if (!maybeJson.is<JSDocument>()) { // NOLINT
|
||||
mbgl::Log::Error(mbgl::Event::General, "Cannot parse test '" + path.string() + "'.");
|
||||
mln::Log::Error(mln::Event::General, "Cannot parse test '" + path.string() + "'.");
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <vector>
|
||||
#include <filesystem>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
struct Input {
|
||||
Input(std::optional<float> zoom_,
|
||||
|
||||
@@ -105,7 +105,7 @@ TestRunOutput runExpressionTest(TestData& data, const std::string& rootPath, con
|
||||
std::vector<Value> outputs;
|
||||
if (!data.inputs.empty()) {
|
||||
for (const auto& input : data.inputs) {
|
||||
mbgl::style::expression::EvaluationResult evaluationResult;
|
||||
mln::style::expression::EvaluationResult evaluationResult;
|
||||
if (input.canonical) {
|
||||
evaluationResult = expression->evaluate(
|
||||
input.zoom, input.feature, input.heatmapDensity, input.availableImages, *input.canonical);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <cmath>
|
||||
#include <regex>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
// Strip precision for numbers, so that we can compare evaluated results with
|
||||
// fixtures. Copied from JS expression harness.
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
using namespace mbgl;
|
||||
using namespace mln;
|
||||
|
||||
Value stripPrecision(const Value& value);
|
||||
std::vector<std::string> tokenize(std::string str);
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <type_traits>
|
||||
#include <cassert>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class TaggedScheduler;
|
||||
|
||||
@@ -83,4 +83,4 @@ private:
|
||||
EstablishedActor<Object> target;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
/**
|
||||
An `ActorRef<O>` is a *non*-owning, weak reference to an actor of type `O`.
|
||||
@@ -57,4 +57,4 @@ private:
|
||||
std::weak_ptr<Mailbox> weakMailbox;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <type_traits>
|
||||
#include <cassert>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
template <class Object>
|
||||
class EstablishedActor;
|
||||
@@ -56,4 +56,4 @@ private:
|
||||
friend class Actor<Object>;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <type_traits>
|
||||
#include <cassert>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
/**
|
||||
An `EstablishedActor<O>` is one half of the pair of types that comprise an
|
||||
@@ -107,4 +107,4 @@ private:
|
||||
AspiringActor<Object>& parent;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <mapbox/std/weak.hpp>
|
||||
#include <mbgl/actor/scheduler.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class Scheduler;
|
||||
class Message;
|
||||
@@ -61,4 +61,4 @@ private:
|
||||
std::queue<std::unique_ptr<Message>> queue;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <future>
|
||||
#include <utility>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
// A movable type-erasing function wrapper. This allows to store arbitrary
|
||||
// invocable things (like std::function<>, or the result of a movable-only
|
||||
@@ -100,4 +100,4 @@ std::unique_ptr<Message> makeMessage(std::promise<ResultType>&& promise,
|
||||
}
|
||||
|
||||
} // namespace actor
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <mbgl/actor/actor.hpp>
|
||||
#include <mbgl/actor/optional_actor_ref.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class TaggedScheduler;
|
||||
|
||||
@@ -79,4 +79,4 @@ private:
|
||||
OptionalActorRef<Object> selfRef;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <mbgl/actor/actor_ref.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class TaggedScheduler;
|
||||
|
||||
@@ -37,4 +37,4 @@ private:
|
||||
std::optional<ActorRef<Object>> actorRef;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <memory>
|
||||
#include <type_traits>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class Mailbox;
|
||||
|
||||
@@ -147,10 +147,10 @@ public:
|
||||
scheduler->scheduleAndReplyValue(tag, task, reply);
|
||||
}
|
||||
|
||||
const mbgl::util::SimpleIdentity tag;
|
||||
const mln::util::SimpleIdentity tag;
|
||||
|
||||
private:
|
||||
std::shared_ptr<Scheduler> scheduler;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
using AnnotationID = uint64_t;
|
||||
using AnnotationIDs = std::vector<AnnotationID>;
|
||||
@@ -63,4 +63,4 @@ public:
|
||||
|
||||
using Annotation = variant<SymbolAnnotation, LineAnnotation, FillAnnotation>;
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <cstdlib>
|
||||
#include <memory>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class Backend {
|
||||
@@ -66,4 +66,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class RendererBackend;
|
||||
@@ -35,4 +35,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <mbgl/util/color.hpp>
|
||||
#include <mbgl/util/hash.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class ColorMode {
|
||||
@@ -69,15 +69,15 @@ public:
|
||||
}
|
||||
|
||||
std::size_t hash() const {
|
||||
return mbgl::util::hash(blendFunction.which(),
|
||||
blendColor.r,
|
||||
blendColor.g,
|
||||
blendColor.b,
|
||||
blendColor.a,
|
||||
mask.r,
|
||||
mask.g,
|
||||
mask.b,
|
||||
mask.a);
|
||||
return mln::util::hash(blendFunction.which(),
|
||||
blendColor.r,
|
||||
blendColor.g,
|
||||
blendColor.b,
|
||||
blendColor.a,
|
||||
mask.r,
|
||||
mask.g,
|
||||
mask.b,
|
||||
mask.a);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -86,4 +86,4 @@ constexpr bool operator!=(const ColorMode::Mask& a, const ColorMode::Mask& b) {
|
||||
}
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <memory>
|
||||
#include <string_view>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class RenderPassDescriptor;
|
||||
@@ -36,4 +36,4 @@ public:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <mutex>
|
||||
#include <shared_mutex>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class PaintParameters;
|
||||
class ProgramParameters;
|
||||
@@ -192,4 +192,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class ContextObserver {
|
||||
@@ -17,4 +17,4 @@ public:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
template <typename T>
|
||||
@@ -27,4 +27,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <mbgl/gfx/types.hpp>
|
||||
#include <mbgl/util/range.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class DepthMode {
|
||||
@@ -24,4 +24,4 @@ public:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <cstddef>
|
||||
#include <type_traits>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class DrawMode {
|
||||
@@ -91,4 +91,4 @@ template <>
|
||||
struct PrimitiveTypeOf<TriangleStrip> : std::integral_constant<PrimitiveType, PrimitiveType::Triangle> {};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <memory>
|
||||
#include <cassert>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class DrawScopeResource {
|
||||
@@ -30,4 +30,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <optional>
|
||||
#include <vector>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class Bucket;
|
||||
class Color;
|
||||
@@ -83,21 +83,21 @@ public:
|
||||
virtual void setShader(gfx::ShaderProgramBasePtr value) { shader = std::move(value); }
|
||||
|
||||
/// The pass on which we'll be rendered
|
||||
mbgl::RenderPass getRenderPass() const { return renderPass; }
|
||||
mln::RenderPass getRenderPass() const { return renderPass; }
|
||||
|
||||
/// Sets the render passes
|
||||
void setRenderPass(mbgl::RenderPass value) { renderPass = value; }
|
||||
void setRenderPass(mln::RenderPass value) { renderPass = value; }
|
||||
|
||||
/// Test whether to draw this drawable in a given render pass.
|
||||
bool hasRenderPass(const mbgl::RenderPass value) const {
|
||||
return (mbgl::underlying_type(renderPass) & mbgl::underlying_type(value)) != 0;
|
||||
bool hasRenderPass(const mln::RenderPass value) const {
|
||||
return (mln::underlying_type(renderPass) & mln::underlying_type(value)) != 0;
|
||||
}
|
||||
|
||||
/// Test whether to draw this drawable in a given render pass.
|
||||
/// If multiple render pass bits are set, all must be present.
|
||||
bool hasAllRenderPasses(const mbgl::RenderPass value) const {
|
||||
const auto underlying_value = mbgl::underlying_type(value);
|
||||
return (mbgl::underlying_type(renderPass) & underlying_value) == underlying_value;
|
||||
bool hasAllRenderPasses(const mln::RenderPass value) const {
|
||||
const auto underlying_value = mln::underlying_type(value);
|
||||
return (mln::underlying_type(renderPass) & underlying_value) == underlying_value;
|
||||
}
|
||||
|
||||
/// Width for lines
|
||||
@@ -259,7 +259,7 @@ public:
|
||||
const LayerTweakerPtr& getLayerTweaker() const { return layerTweaker; }
|
||||
|
||||
/// Get origin point
|
||||
const std::optional<mbgl::Point<double>>& getOrigin() const { return origin; }
|
||||
const std::optional<mln::Point<double>>& getOrigin() const { return origin; }
|
||||
|
||||
/// Set origin point
|
||||
void setOrigin(std::optional<Point<double>> p) { origin = std::move(p); }
|
||||
@@ -288,7 +288,7 @@ protected:
|
||||
std::string name;
|
||||
const util::SimpleIdentity uniqueID;
|
||||
gfx::ShaderProgramBasePtr shader;
|
||||
mbgl::RenderPass renderPass;
|
||||
mln::RenderPass renderPass;
|
||||
std::optional<OverscaledTileID> tileID;
|
||||
DrawPriority drawPriority = 0;
|
||||
int32_t lineWidth = 1;
|
||||
@@ -307,7 +307,7 @@ protected:
|
||||
LayerTweakerPtr layerTweaker;
|
||||
|
||||
std::size_t type = 0;
|
||||
std::optional<mbgl::Point<double>> origin;
|
||||
std::optional<mln::Point<double>> origin;
|
||||
uint32_t uboIndex = 0;
|
||||
};
|
||||
|
||||
@@ -340,4 +340,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class TileAtlasTextures;
|
||||
using TileAtlasTexturesPtr = std::shared_ptr<TileAtlasTextures>;
|
||||
@@ -61,4 +61,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class SegmentBase;
|
||||
|
||||
@@ -63,10 +63,10 @@ public:
|
||||
void setEnabled(bool value) { enabled = value; }
|
||||
|
||||
/// The pass on which we'll be rendered
|
||||
mbgl::RenderPass getRenderPass() const { return renderPass; }
|
||||
mln::RenderPass getRenderPass() const { return renderPass; }
|
||||
|
||||
/// Set the pass on which the drawable will render
|
||||
void setRenderPass(mbgl::RenderPass value) { renderPass = value; }
|
||||
void setRenderPass(mln::RenderPass value) { renderPass = value; }
|
||||
|
||||
/// The draw priority assigned to generated drawables
|
||||
DrawPriority getDrawPriority() const;
|
||||
@@ -229,7 +229,7 @@ protected:
|
||||
std::string name;
|
||||
std::string drawableName;
|
||||
std::size_t vertexAttrId;
|
||||
mbgl::RenderPass renderPass;
|
||||
mln::RenderPass renderPass;
|
||||
bool enabled = true;
|
||||
bool enableColor = true;
|
||||
bool enableStencil = false;
|
||||
@@ -246,7 +246,7 @@ protected:
|
||||
std::vector<DrawableTweakerPtr> tweakers;
|
||||
gfx::VertexAttributeArrayPtr vertexAttrs;
|
||||
gfx::VertexAttributeArrayPtr instanceAttrs;
|
||||
std::optional<mbgl::Point<double>> origin;
|
||||
std::optional<mln::Point<double>> origin;
|
||||
|
||||
class Impl;
|
||||
std::unique_ptr<Impl> impl;
|
||||
@@ -255,4 +255,4 @@ protected:
|
||||
using UniqueDrawableBuilder = std::unique_ptr<DrawableBuilder>;
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class PaintParameters;
|
||||
|
||||
@@ -32,4 +32,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
namespace gfx {
|
||||
|
||||
@@ -14,4 +14,4 @@ public:
|
||||
using UniqueDrawableData = std::unique_ptr<DrawableData>;
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <mbgl/gfx/drawable.hpp>
|
||||
#include <mbgl/shaders/segment.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
struct Drawable::DrawSegment {
|
||||
@@ -25,4 +25,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class PaintParameters;
|
||||
|
||||
@@ -30,4 +30,4 @@ public:
|
||||
using DrawableTweakerPtr = std::shared_ptr<DrawableTweaker>;
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <optional>
|
||||
#include <mutex>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class Context;
|
||||
@@ -75,4 +75,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <mbgl/text/glyph.hpp>
|
||||
#include <mbgl/style/image_impl.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
namespace gfx {
|
||||
|
||||
@@ -47,4 +47,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <mbgl/renderer/buckets/fill_bucket.hpp>
|
||||
#include <mbgl/renderer/buckets/line_bucket.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
/// Generate fill buffers, without outline
|
||||
@@ -45,4 +45,4 @@ void generateFillAndOutineBuffers(const GeometryCollection& geometry,
|
||||
SegmentVector& basicLineSegments);
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
/// Graphic primitive type enumeration
|
||||
@@ -65,4 +65,4 @@ enum class AttributeDataType : uint8_t {
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <optional>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace style {
|
||||
namespace expression {
|
||||
class Expression;
|
||||
@@ -101,4 +101,4 @@ inline auto GPUExpression::evaluate<float>(const float zoom) const {
|
||||
}
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <functional>
|
||||
#include <optional>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class PolylineGeneratorDistances {
|
||||
@@ -52,7 +52,7 @@ public:
|
||||
using LayoutVertexFunc = std::function<PolylineLayoutVertex(
|
||||
Point<int16_t> p, Point<double> e, bool round, bool up, int8_t dir, int32_t linesofar /*= 0*/)>;
|
||||
using CreateSegmentFunc = std::function<PolylineSegment(std::size_t vertexOffset, std::size_t indexOffset)>;
|
||||
using GetSegmentFunc = std::function<mbgl::SegmentBase&(PolylineSegment& segment)>;
|
||||
using GetSegmentFunc = std::function<mln::SegmentBase&(PolylineSegment& segment)>;
|
||||
using Indexes = gfx::IndexVector<gfx::Triangles>;
|
||||
|
||||
public:
|
||||
@@ -100,4 +100,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <memory>
|
||||
#include <cassert>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class RenderableResource {
|
||||
@@ -56,4 +56,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <memory>
|
||||
#include <cassert>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class RenderbufferResource {
|
||||
@@ -43,4 +43,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class ProgramParameters;
|
||||
class Map;
|
||||
@@ -52,7 +52,7 @@ public:
|
||||
|
||||
/// One-time shader initialization
|
||||
virtual void initShaders(gfx::ShaderRegistry&, const ProgramParameters&) = 0;
|
||||
const mbgl::util::SimpleIdentity uniqueID;
|
||||
const mln::util::SimpleIdentity uniqueID;
|
||||
|
||||
protected:
|
||||
virtual std::unique_ptr<Context> createContext() = 0;
|
||||
@@ -85,4 +85,4 @@ constexpr bool operator==(const RendererBackend& a, const RendererBackend& b) {
|
||||
}
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <memory>
|
||||
#include <mbgl/util/color.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
namespace style {
|
||||
class Style;
|
||||
@@ -113,7 +113,7 @@ public:
|
||||
void create(style::Style& style);
|
||||
void destroy(style::Style& style);
|
||||
|
||||
mbgl::style::SymbolLayer* getLayer(style::Style& style);
|
||||
mln::style::SymbolLayer* getLayer(style::Style& style);
|
||||
|
||||
void update(style::Style& style, const gfx::RenderingStats& stats);
|
||||
|
||||
@@ -130,4 +130,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class ScissorRect {
|
||||
@@ -18,4 +18,4 @@ public:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <string_view>
|
||||
#include <type_traits>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class Shader;
|
||||
@@ -45,4 +45,4 @@ public:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
using StringIDSetsPair = std::pair<unordered_set<std::string_view>, unordered_set<size_t>>;
|
||||
|
||||
@@ -176,9 +176,9 @@ protected:
|
||||
}
|
||||
|
||||
private:
|
||||
mbgl::unordered_map<std::string, std::shared_ptr<gfx::Shader>> programs;
|
||||
mln::unordered_map<std::string, std::shared_ptr<gfx::Shader>> programs;
|
||||
mutable std::shared_mutex programLock;
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
using ShaderGroupPtr = std::shared_ptr<gfx::ShaderGroup>;
|
||||
@@ -66,4 +66,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <mbgl/gfx/types.hpp>
|
||||
#include <mbgl/util/variant.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class StencilMode {
|
||||
@@ -50,4 +50,4 @@ public:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <cstddef>
|
||||
#include <vector>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class Size;
|
||||
|
||||
@@ -125,4 +125,4 @@ public:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
/// Color blending equation type
|
||||
@@ -142,4 +142,4 @@ enum class RenderbufferPixelType : uint8_t {
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <vector>
|
||||
#include <array>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class Context;
|
||||
@@ -90,4 +90,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <variant>
|
||||
#include <vector>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
/// A 2 by 2 matrix
|
||||
using mat2 = std::array<double, 2 * 2>;
|
||||
@@ -444,7 +444,7 @@ protected:
|
||||
/// Copy or share the attribute data from a paint property
|
||||
template <typename TAttribute, typename TBinder>
|
||||
static void applyPaintProperty(const std::size_t attrIndex, const UniqueVertexAttribute& attrib, TBinder& binder) {
|
||||
using Type = typename TAttribute::Type; // ::mbgl::gfx::AttributeType<type_, n_>
|
||||
using Type = typename TAttribute::Type; // ::mln::gfx::AttributeType<type_, n_>
|
||||
using InterpType = ZoomInterpolatedAttributeType<Type>;
|
||||
|
||||
if (!attrib) {
|
||||
@@ -486,4 +486,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <memory>
|
||||
#include <cassert>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
|
||||
class VertexBufferResource {
|
||||
@@ -39,4 +39,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gfx
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <vector>
|
||||
#include <memory>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gl {
|
||||
|
||||
class Context;
|
||||
@@ -174,4 +174,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace gl
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class SegmentBase;
|
||||
class PaintParameters;
|
||||
@@ -71,4 +71,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace gl
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <mbgl/gfx/drawable_builder.hpp>
|
||||
#include <mbgl/gl/vertex_attribute_gl.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gl {
|
||||
|
||||
/**
|
||||
@@ -26,4 +26,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gl
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <mbgl/gfx/dynamic_texture.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gl {
|
||||
|
||||
class Context;
|
||||
@@ -24,4 +24,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace gl
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <mbgl/renderer/layer_group.hpp>
|
||||
#include <mbgl/gl/uniform_buffer_gl.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class PaintParameters;
|
||||
|
||||
@@ -48,4 +48,4 @@ protected:
|
||||
};
|
||||
|
||||
} // namespace gl
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <cstdlib>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gl {
|
||||
|
||||
class RenderableResource : public gfx::RenderableResource {
|
||||
@@ -19,4 +19,4 @@ public:
|
||||
};
|
||||
|
||||
} // namespace gl
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <mbgl/util/size.hpp>
|
||||
#include <mbgl/util/util.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class ProgramParameters;
|
||||
|
||||
@@ -59,4 +59,4 @@ public:
|
||||
};
|
||||
|
||||
} // namespace gl
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
namespace gl {
|
||||
|
||||
@@ -83,4 +83,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace gl
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <mbgl/gl/types.hpp>
|
||||
#include <mbgl/gl/buffer_allocator.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gl {
|
||||
|
||||
class UniformBufferGL final : public gfx::UniformBuffer {
|
||||
@@ -73,4 +73,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace gl
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <mbgl/gl/defines.hpp>
|
||||
#include <mbgl/platform/gl_functions.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace gfx {
|
||||
class VertexBufferResource;
|
||||
} // namespace gfx
|
||||
@@ -73,4 +73,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace gl
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <string>
|
||||
#include <optional>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace platform {
|
||||
|
||||
class Collator {
|
||||
@@ -22,4 +22,4 @@ private:
|
||||
};
|
||||
|
||||
} // namespace platform
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace platform {
|
||||
|
||||
std::string formatNumber(double number,
|
||||
@@ -13,4 +13,4 @@ std::string formatNumber(double number,
|
||||
uint8_t maxFractionDigits);
|
||||
|
||||
} // namespace platform
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <mbgl/layermanager/layer_factory.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class BackgroundLayerFactory : public LayerFactory {
|
||||
protected:
|
||||
@@ -12,4 +12,4 @@ protected:
|
||||
std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <mbgl/layermanager/layer_factory.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class CircleLayerFactory : public LayerFactory {
|
||||
protected:
|
||||
@@ -15,4 +15,4 @@ protected:
|
||||
std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <mbgl/layermanager/layer_factory.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class ColorReliefLayerFactory : public LayerFactory {
|
||||
protected:
|
||||
@@ -12,4 +12,4 @@ protected:
|
||||
std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <array>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class CustomDrawableLayerFactory : public LayerFactory {
|
||||
protected:
|
||||
@@ -15,4 +15,4 @@ protected:
|
||||
std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <array>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class CustomLayerFactory : public LayerFactory {
|
||||
protected:
|
||||
@@ -15,4 +15,4 @@ protected:
|
||||
std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <mbgl/layermanager/layer_factory.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class FillExtrusionLayerFactory : public LayerFactory {
|
||||
protected:
|
||||
@@ -15,4 +15,4 @@ protected:
|
||||
std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <mbgl/layermanager/layer_factory.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class FillLayerFactory : public LayerFactory {
|
||||
protected:
|
||||
@@ -15,4 +15,4 @@ protected:
|
||||
std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <mbgl/layermanager/layer_factory.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class HeatmapLayerFactory : public LayerFactory {
|
||||
protected:
|
||||
@@ -14,4 +14,4 @@ protected:
|
||||
std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <mbgl/layermanager/layer_factory.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class HillshadeLayerFactory : public LayerFactory {
|
||||
protected:
|
||||
@@ -12,4 +12,4 @@ protected:
|
||||
std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
namespace style {
|
||||
class LayerProperties;
|
||||
@@ -44,4 +44,4 @@ protected:
|
||||
std::optional<std::string> getSource(const style::conversion::Convertible& value) const noexcept;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
namespace style {
|
||||
class LayerProperties;
|
||||
} // namespace style
|
||||
@@ -74,7 +74,7 @@ public:
|
||||
* in order to save binary size (the corresponding SDK layer wrappers
|
||||
* should be excluded from the project build).
|
||||
*/
|
||||
virtual void addLayerTypeCoreOnly(std::unique_ptr<mbgl::LayerFactory>);
|
||||
virtual void addLayerTypeCoreOnly(std::unique_ptr<mln::LayerFactory>);
|
||||
|
||||
protected:
|
||||
virtual ~LayerManager() = default;
|
||||
@@ -82,4 +82,4 @@ protected:
|
||||
virtual LayerFactory* getFactory(const style::LayerTypeInfo*) noexcept = 0;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <mbgl/layermanager/layer_factory.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class LineLayerFactory : public LayerFactory {
|
||||
protected:
|
||||
@@ -15,4 +15,4 @@ protected:
|
||||
std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <mbgl/layermanager/layer_factory.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class LocationIndicatorLayerFactory : public LayerFactory {
|
||||
protected:
|
||||
@@ -12,4 +12,4 @@ protected:
|
||||
std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <mbgl/layermanager/layer_factory.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace mln {
|
||||
|
||||
class RasterLayerFactory : public LayerFactory {
|
||||
protected:
|
||||
@@ -12,4 +12,4 @@ protected:
|
||||
std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
} // namespace mln
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user