diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-15 14:09:06 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-16 12:26:35 -0700 |
| commit | cc1ea759a681cadcfd06fd7bdda79ca6deb38c62 (patch) | |
| tree | 97ece422b0516b11979c84b8136f95aeabb1aa91 /platform/glfw | |
| parent | c0f6e5ccefc67dbdaa6ab7c7ea75a2a2d0c3f2ae (diff) | |
| download | qtlocation-mapboxgl-cc1ea759a681cadcfd06fd7bdda79ca6deb38c62.tar.gz | |
[core, node, darwin, android, qt] Make image ID part of Image
More like Source and Layer.
Diffstat (limited to 'platform/glfw')
| -rw-r--r-- | platform/glfw/glfw_view.cpp | 8 | ||||
| -rw-r--r-- | platform/glfw/glfw_view.hpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index d3a6347110..29cd0dd7c3 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -131,7 +131,7 @@ GLFWView::~GLFWView() { void GLFWView::setMap(mbgl::Map *map_) { map = map_; - map->addAnnotationImage("default_marker", makeImage(22, 22, 1)); + map->addAnnotationImage(makeImage("default_marker", 22, 22, 1)); } void GLFWView::updateAssumedState() { @@ -255,7 +255,7 @@ mbgl::Point<double> GLFWView::makeRandomPoint() const { } std::unique_ptr<mbgl::style::Image> -GLFWView::makeImage(int width, int height, float pixelRatio) { +GLFWView::makeImage(const std::string& id, int width, int height, float pixelRatio) { const int r = 255 * (double(std::rand()) / RAND_MAX); const int g = 255 * (double(std::rand()) / RAND_MAX); const int b = 255 * (double(std::rand()) / RAND_MAX); @@ -280,7 +280,7 @@ GLFWView::makeImage(int width, int height, float pixelRatio) { } } - return std::make_unique<mbgl::style::Image>(std::move(image), pixelRatio); + return std::make_unique<mbgl::style::Image>(id, std::move(image), pixelRatio); } void GLFWView::nextOrientation() { @@ -297,7 +297,7 @@ void GLFWView::addRandomCustomPointAnnotations(int count) { for (int i = 0; i < count; i++) { static int spriteID = 1; const auto name = std::string{ "marker-" } + mbgl::util::toString(spriteID++); - map->addAnnotationImage(name, makeImage(22, 22, 1)); + map->addAnnotationImage(makeImage(name, 22, 22, 1)); spriteIDs.push_back(name); annotationIDs.push_back(map->addAnnotation(mbgl::SymbolAnnotation { makeRandomPoint(), name })); } diff --git a/platform/glfw/glfw_view.hpp b/platform/glfw/glfw_view.hpp index 77f4f64b01..b5fd5856f4 100644 --- a/platform/glfw/glfw_view.hpp +++ b/platform/glfw/glfw_view.hpp @@ -61,7 +61,7 @@ private: mbgl::Color makeRandomColor() const; mbgl::Point<double> makeRandomPoint() const; - static std::unique_ptr<mbgl::style::Image> makeImage(int width, int height, float pixelRatio); + static std::unique_ptr<mbgl::style::Image> makeImage(const std::string& id, int width, int height, float pixelRatio); void nextOrientation(); |