diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-16 16:29:37 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-16 16:30:30 -0800 |
commit | 9f18ed9a3ce7045753b72a86bf141b294f128bc1 (patch) | |
tree | 32036326175df6fda0f8d414be0a5001dfb14c89 | |
parent | bf89ed080b9240af75512704225b56cccf7c6828 (diff) | |
download | qtlocation-mapboxgl-9f18ed9a3ce7045753b72a86bf141b294f128bc1.tar.gz |
[android] Add CustomLayerRenderParameters to example code
-rw-r--r-- | platform/android/mapboxgl-app.gypi | 4 | ||||
-rw-r--r-- | platform/android/src/example_custom_layer.cpp | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/platform/android/mapboxgl-app.gypi b/platform/android/mapboxgl-app.gypi index 1c2f8f3b3e..128a5ebba9 100644 --- a/platform/android/mapboxgl-app.gypi +++ b/platform/android/mapboxgl-app.gypi @@ -72,6 +72,10 @@ './src/example_custom_layer.cpp', ], + 'include_dirs': [ + '../../include', + ], + 'variables': { 'ldflags': [ '-llog', diff --git a/platform/android/src/example_custom_layer.cpp b/platform/android/src/example_custom_layer.cpp index e853545358..a58b05758e 100644 --- a/platform/android/src/example_custom_layer.cpp +++ b/platform/android/src/example_custom_layer.cpp @@ -1,6 +1,8 @@ #include <jni.h> #include <GLES2/gl2.h> +#include <mbgl/style/types.hpp> + static const GLchar * vertexShaderSource = "attribute vec2 a_pos; void main() { gl_Position = vec4(a_pos, 0, 1); }"; static const GLchar * fragmentShaderSource = "void main() { gl_FragColor = vec4(0, 1, 0, 1); }"; @@ -62,7 +64,7 @@ void nativeInitialize(void *context) { reinterpret_cast<ExampleCustomLayer*>(context)->initialize(); } -void nativeRender(void *context) { +void nativeRender(void *context, const mbgl::CustomLayerRenderParameters& /*parameters*/) { reinterpret_cast<ExampleCustomLayer*>(context)->render(); } |