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

Add interface for stretchable image (#314)

Browse Source 
* Add interface for stretch image

* Add demo for stretch image api

* Add stretchable image demp

* Update stretchable image test activity.

* Revert change for SymbolLayerActivity

This reverts commit 22bbb798
This commit is contained in:
Kevin Li
2020-04-16 14:31:38 +08:00
committed by GitHub
parent 77d0d5e5cf
commit 1cb8fb7a01
13 changed files with 760 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
MapboxGLAndroidSDK/src/cpp/map/image.cpp
View File

@@ -13,6 +13,9 @@ mbgl::style::Image Image::getImage(jni::JNIEnv& env, const jni::Object<Image>& i
static auto bufferField = javaClass.GetField<jni::Array<jbyte>>(env, "buffer");
static auto nameField = javaClass.GetField<jni::String>(env, "name");
static auto sdfField = javaClass.GetField<jni::jboolean>(env, "sdf");
static auto contentField = javaClass.GetField<jni::Array<jfloat >>(env, "content");
static auto stretchXField = javaClass.GetField<jni::Array<jfloat>>(env, "stretchX");
static auto stretchYField = javaClass.GetField<jni::Array<jfloat>>(env, "stretchY");
auto height = image.Get(env, heightField);
auto width = image.Get(env, widthField);
@@ -20,7 +23,9 @@ mbgl::style::Image Image::getImage(jni::JNIEnv& env, const jni::Object<Image>& i
auto pixels = image.Get(env, bufferField);
auto name = jni::Make<std::string>(env, image.Get(env, nameField));
auto sdf = (bool) image.Get(env, sdfField);
auto content = image.Get(env, contentField);
auto stretchX = image.Get(env, stretchXField);
auto stretchY = image.Get(env, stretchYField);
jni::NullCheck(env, pixels.get());
std::size_t size = pixels.Length(env);
@@ -29,8 +34,38 @@ mbgl::style::Image Image::getImage(jni::JNIEnv& env, const jni::Object<Image>& i
throw mbgl::util::StyleImageException("Image pixel count mismatch");
}
jni::GetArrayRegion(env, *pixels, 0, size, reinterpret_cast<jbyte*>(premultipliedImage.data.get()));
return mbgl::style::Image {name, std::move(premultipliedImage), pixelRatio, sdf};
jni::GetArrayRegion(env, *pixels, 0, size,
reinterpret_cast<jbyte *>(premultipliedImage.data.get()));
style::ImageStretches imageStretchesX = {};
style::ImageStretches imageStretchesY = {};
if (stretchX.get()) {
std::size_t sizeX = stretchX.Length(env);
for (jni::jsize i = 0; i < sizeX - 1; i += 2) {
imageStretchesX.push_back({stretchX.Get(env, i), stretchX.Get(env, i + 1)});
}
}
if (stretchY.get()) {
std::size_t sizeY = stretchY.Length(env);
for (jni::jsize i = 0; i < sizeY - 1; i += 2) {
imageStretchesY.push_back({stretchY.Get(env, i), stretchY.Get(env, i + 1)});
}
}
if (content) {
const style::ImageContent imageContent = style::ImageContent{content.Get(env, 0),
content.Get(env, 1),
content.Get(env, 2),
content.Get(env, 3)};
return mbgl::style::Image{name, std::move(premultipliedImage), pixelRatio, sdf,
imageStretchesX,
imageStretchesY,
std::move(imageContent)};
}
return mbgl::style::Image{name, std::move(premultipliedImage), pixelRatio, sdf,
imageStretchesX,
imageStretchesY};
}
void Image::registerNative(jni::JNIEnv &env) {