diff --git a/NEW_RELEASE_NOTES.md b/NEW_RELEASE_NOTES.md index c3161a7700..d835bea931 100644 --- a/NEW_RELEASE_NOTES.md +++ b/NEW_RELEASE_NOTES.md @@ -8,3 +8,4 @@ appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md). ## Release notes for next branch cut +- Java/Kotlin: user callbacks were not invoked on successful texture upload diff --git a/android/filament-android/src/main/cpp/Texture.cpp b/android/filament-android/src/main/cpp/Texture.cpp index bb5be8fd43..ef778056c0 100644 --- a/android/filament-android/src/main/cpp/Texture.cpp +++ b/android/filament-android/src/main/cpp/Texture.cpp @@ -511,9 +511,7 @@ public: private: void* mData = nullptr; - jobject mBitmap = nullptr; - jobject mHandler = nullptr; - jobject mCallback = nullptr; + jobject mBitmap{}; AndroidBitmapInfo mInfo{}; }; diff --git a/android/samples/sample-textured-object/src/main/java/com/google/android/filament/textured/MainActivity.kt b/android/samples/sample-textured-object/src/main/java/com/google/android/filament/textured/MainActivity.kt index 9e6e79dad0..4016d35f38 100644 --- a/android/samples/sample-textured-object/src/main/java/com/google/android/filament/textured/MainActivity.kt +++ b/android/samples/sample-textured-object/src/main/java/com/google/android/filament/textured/MainActivity.kt @@ -231,7 +231,7 @@ class MainActivity : Activity() { animator.repeatCount = ValueAnimator.INFINITE animator.addUpdateListener { a -> val v = (a.animatedValue as Float) - camera.lookAt(cos(v) * 4.5, 1.5, sin(v) * 4.5, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0) + camera.lookAt(cos(v) * 5.5, 1.5, sin(v) * 5.5, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0) } animator.start() } @@ -253,7 +253,7 @@ class MainActivity : Activity() { // Stop the animation and any pending frame choreographer.removeFrameCallback(frameScheduler) - animator.cancel(); + animator.cancel() // Always detach the surface before destroying the engine uiHelper.detach()