Implementation of multi-sprites in mbgl-core (#1858)

Co-authored-by: Christophe Brasseur <christophe.brasseur@geolives.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Bart Louwers <bart.louwers@gmail.com>
Co-authored-by: Bart Louwers <bart@emeel.net>
This commit is contained in:
Geolives
2024-02-27 18:42:17 +01:00
committed by GitHub
parent 9e8837b0fb
commit f4c6fabbe6
39 changed files with 649 additions and 83 deletions

View File

@@ -152,7 +152,9 @@ std::optional<style::ImageContent> getContent(const JSValue& value, const char*
} // namespace
std::vector<Immutable<style::Image::Impl>> parseSprite(const std::string& encodedImage, const std::string& json) {
std::vector<Immutable<style::Image::Impl>> parseSprite(const std::string& id,
const std::string& encodedImage,
const std::string& json) {
const PremultipliedImage raster = decodeImage(encodedImage);
JSDocument doc;
@@ -170,6 +172,11 @@ std::vector<Immutable<style::Image::Impl>> parseSprite(const std::string& encode
images.reserve(properties.MemberCount());
for (const auto& property : properties) {
const std::string name = {property.name.GetString(), property.name.GetStringLength()};
std::string completeName = name;
if (id != "default") {
completeName = id + ":";
completeName += name;
}
const JSValue& value = property.value;
if (value.IsObject()) {
@@ -183,8 +190,17 @@ std::vector<Immutable<style::Image::Impl>> parseSprite(const std::string& encode
style::ImageStretches stretchY = getStretches(value, "stretchY", name.c_str());
std::optional<style::ImageContent> content = getContent(value, "content", name.c_str());
auto image = createStyleImage(
name, raster, x, y, width, height, pixelRatio, sdf, std::move(stretchX), std::move(stretchY), content);
auto image = createStyleImage(completeName,
raster,
x,
y,
width,
height,
pixelRatio,
sdf,
std::move(stretchX),
std::move(stretchY),
content);
if (image) {
images.push_back(std::move(image->baseImpl));
}