summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2015-12-03 14:07:01 -0600
committerBrad Leege <bleege@gmail.com>2015-12-03 16:57:44 -0600
commit02feddb816900d025581076bb969c594f527aef8 (patch)
tree42d3c8f3e7942dd41bfb563ede24db16ff508a22 /platform
parent805aae24391a1c1239da5fb11a3f9ce890a4ba5e (diff)
downloadqtlocation-mapboxgl-02feddb816900d025581076bb969c594f527aef8.tar.gz
[android] #2805 - Updating Tilt API to support animation duration time
Diffstat (limited to 'platform')
-rw-r--r--platform/android/jni.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/jni.cpp b/platform/android/jni.cpp
index e6cbe81193..acefc87f31 100644
--- a/platform/android/jni.cpp
+++ b/platform/android/jni.cpp
@@ -671,11 +671,11 @@ jdouble JNICALL nativeGetPitch(JNIEnv *env, jobject obj, jlong nativeMapViewPtr)
return nativeMapView->getMap().getPitch();
}
-void JNICALL nativeSetPitch(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jdouble pitch) {
+void JNICALL nativeSetPitch(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jdouble pitch, jlong duration) {
mbgl::Log::Debug(mbgl::Event::JNI, "nativeGetPitch");
assert(nativeMapViewPtr != 0);
NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr);
- nativeMapView->getMap().setPitch(pitch, std::chrono::milliseconds(0));
+ nativeMapView->getMap().setPitch(pitch, std::chrono::milliseconds(duration));
}
void JNICALL nativeScaleBy(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jdouble ds, jdouble cx,
@@ -1903,7 +1903,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
reinterpret_cast<void *>(&nativeGetLatLng)},
{"nativeResetPosition", "(J)V", reinterpret_cast<void *>(&nativeResetPosition)},
{"nativeGetPitch", "(J)D", reinterpret_cast<void *>(&nativeGetPitch)},
- {"nativeSetPitch", "(JD)V", reinterpret_cast<void *>(&nativeSetPitch)},
+ {"nativeSetPitch", "(JDJ)V", reinterpret_cast<void *>(&nativeSetPitch)},
{"nativeScaleBy", "(JDDDJ)V", reinterpret_cast<void *>(&nativeScaleBy)},
{"nativeSetScale", "(JDDDJ)V", reinterpret_cast<void *>(&nativeSetScale)},
{"nativeGetScale", "(J)D", reinterpret_cast<void *>(&nativeGetScale)},