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

make icons work again

Browse Source
This commit is contained in:
Konstantin Käfer
2014-07-15 17:17:37 -07:00
parent c2efeaf876
commit 066fa64dad
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/geometry/sprite_atlas.cpp
View File

@@ -128,9 +128,7 @@ Rect<SpriteAtlas::dimension> SpriteAtlas::allocateImage(size_t width, size_t hei
Rect<SpriteAtlas::dimension> SpriteAtlas::getIcon(const int size, const std::string &name) {
std::lock_guard<std::mutex> lock(mtx);
const std::string id = name + "-" + std::to_string(size);
auto rect_it = images.find(id);
auto rect_it = images.find(name);
if (rect_it != images.end()) {
return rect_it->second;
}
@@ -143,7 +141,7 @@ Rect<SpriteAtlas::dimension> SpriteAtlas::getIcon(const int size, const std::str
return rect;
}
images.emplace(id, rect);
images.emplace(name, rect);
allocate();
@@ -158,7 +156,7 @@ Rect<SpriteAtlas::dimension> SpriteAtlas::getIcon(const int size, const std::str
1.0f / size / pixelRatio
);
uninitialized.emplace(id);
uninitialized.emplace(name);
dirty = true;

2
src/renderer/painter_icon.cpp
View File

@@ -23,7 +23,7 @@ void Painter::renderIcon(IconBucket& bucket, std::shared_ptr<StyleLayer> layer_d
useProgram(iconShader->program);
iconShader->setMatrix(matrix);
// TODO: update
// iconShader->setColor(color);
iconShader->setColor({{ 1, 1, 1, 1 }});
iconShader->setImage(0);
iconShader->setRatio(map.getState().getPixelRatio());
iconShader->setDimension({{