9a3eadfd5b
[android] #5610 - Adjusted public api after discussion [android] #5610 - added jni binding for NativeMapView#getLayer [android] #5610 - Added initial test Activity [android] #5610 - Started on NativePeer implementation for Layer [android] #5610 - replaced low-level jni code with high-level for native getLayer [android] 5610 - completed basic layer peer class - constructible from java and c++ [android] #5610 - removed reference that was redundant and causing the finalizer exception [android] #5610 - Added a property peer [android] #5610 - added value type to do type conversions - wip [android] #5610 - simplified property conversion approach - wrapped value with jenv [android] #5610 - added some more value conversions [android] #5610 - Finished conversion for basic types [android] #5610 - allow color's to be set as either an android color int or a String to support all formats in the spec [android] #5610 - encode color ints as rgba to retain alpha channel [android] #5610 - recalculate classes after paint property [android] #5610 - more examples [android] #5610 - fixed the example [android] #5610 - cleaned up example code before continueing [android] #5610 - added layout property example [android] #5610 - set visibility on layer [android] #5610 - added removeLayer and example [android] #5610 - added more type conversions [android] #5610 - Started on peer classes for layer implementations - WIP [android] #5610 - First complete layer subclass peer implementation [android] #5610 - added a little bit of structure before adding the other layer types [android] #5610 - generate the c++ headers from the style spec [android] #5610 - make sure the visibility is set as a string [android] #5610 - Generate c++ layer peer class implementations from the style spec [android] #5610 - generate java layer peer classes [android] #5610 - cleanup comments [android] #5610 - register all c++ peer classes with jni [android] #5610 - addLayer [android] #5610 - comment out broken case [android] #5610 - Sources api - very much WIP [android] 5610 - GeoJson source implementation and geojson conversion [android] #5610 - cleanup add source/layer example a bit [android] #5610 - initial filter api [android] #5610 - Added filter api on the relevant Layer classes [android] #5610 - raster layer is not filterable [android] #5610 - actually make it compile [android] #5610 - completed filter implementation [android] #5610 - Vector and Raster Source + examples [android] #5610 - removed superfluous interface, moved filters to the correct package [android] #5610 - fixed comments [android] #5610 - moved tests to the right package [android] #5610 - hide difference between paint and layout properties in public api, make more performant set method for proeprties [android] #5610 - fix rebase issue
65 lines
2.6 KiB
Plaintext
65 lines
2.6 KiB
Plaintext
<%
|
|
const type = locals.type;
|
|
-%>
|
|
// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`.
|
|
|
|
#include "<%- type %>_layer.hpp"
|
|
|
|
#include <string>
|
|
|
|
//XXX
|
|
#include <mbgl/platform/log.hpp>
|
|
|
|
namespace mbgl {
|
|
namespace android {
|
|
|
|
<% if (type === 'background') { -%>
|
|
<%- camelize(type) %>Layer::<%- camelize(type) %>Layer(jni::JNIEnv& env, jni::String layerId)
|
|
: Layer(env, std::make_unique<mbgl::style::<%- camelize(type) %>Layer>(jni::Make<std::string>(env, layerId))) {
|
|
<% } else { -%>
|
|
<%- camelize(type) %>Layer::<%- camelize(type) %>Layer(jni::JNIEnv& env, jni::String layerId, jni::String sourceId)
|
|
: Layer(env, std::make_unique<mbgl::style::<%- camelize(type) %>Layer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
|
|
<% } -%>
|
|
mbgl::Log::Debug(mbgl::Event::JNI, "<%- camelize(type) %>Layer constructed, owning reference");
|
|
}
|
|
|
|
<%- camelize(type) %>Layer::<%- camelize(type) %>Layer(mbgl::Map& map, mbgl::style::<%- camelize(type) %>Layer& coreLayer)
|
|
: Layer(map, coreLayer) {
|
|
|
|
mbgl::Log::Debug(mbgl::Event::JNI, "<%- camelize(type) %>Layer Non-owning reference constructor");
|
|
}
|
|
|
|
<%- camelize(type) %>Layer::~<%- camelize(type) %>Layer() = default;
|
|
|
|
jni::Class<<%- camelize(type) %>Layer> <%- camelize(type) %>Layer::javaClass;
|
|
|
|
jni::jobject* <%- camelize(type) %>Layer::createJavaPeer(jni::JNIEnv& env) {
|
|
static auto constructor = <%- camelize(type) %>Layer::javaClass.template GetConstructor<jni::jlong>(env);
|
|
return <%- camelize(type) %>Layer::javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this));
|
|
}
|
|
|
|
void <%- camelize(type) %>Layer::registerNative(jni::JNIEnv& env) {
|
|
mbgl::Log::Debug(mbgl::Event::JNI, "Registering native background layer");
|
|
|
|
//Lookup the class
|
|
<%- camelize(type) %>Layer::javaClass = *jni::Class<<%- camelize(type) %>Layer>::Find(env).NewGlobalRef(env).release();
|
|
|
|
#define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
|
|
|
|
//Register the peer
|
|
jni::RegisterNativePeer<<%- camelize(type) %>Layer>(
|
|
env, <%- camelize(type) %>Layer::javaClass, "nativePtr",
|
|
<% if (type === 'background') { -%>
|
|
std::make_unique<<%- camelize(type) %>Layer, JNIEnv&, jni::String>,
|
|
<% } else { -%>
|
|
std::make_unique<<%- camelize(type) %>Layer, JNIEnv&, jni::String, jni::String>,
|
|
<% } -%>
|
|
"initialize",
|
|
"finalize"
|
|
);
|
|
|
|
}
|
|
|
|
} // namespace android
|
|
} // namespace mbgl
|