From 174833423c69ac6d09572f5750a68f5365aeb48d Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Thu, 8 Oct 2026 20:34:18 +0200 Subject: [PATCH] Bump f3d and fix animation API --- f3d/libs/f3d.jar | 4 ++-- .../main/java/app/f3d/F3D/android/MainView.kt | 20 +++++++++---------- f3d/src/main/jniLibs/arm64-v8a/libf3d-java.so | 4 ++-- .../main/jniLibs/armeabi-v7a/libf3d-java.so | 4 ++-- f3d/src/main/jniLibs/x86/libf3d-java.so | 4 ++-- f3d/src/main/jniLibs/x86_64/libf3d-java.so | 4 ++-- jniLibs-lock.json | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/f3d/libs/f3d.jar b/f3d/libs/f3d.jar index 4c53c18..887d466 100644 --- a/f3d/libs/f3d.jar +++ b/f3d/libs/f3d.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05192c956578da180feea9802e1562d99f63e47e52fa35d50715ff397c4a354f -size 48424 +oid sha256:9c605960fc3a7d4d177d9647dc80fb3968c5d133d0b7a7712c6aeabcbcc97070 +size 55021 diff --git a/f3d/src/main/java/app/f3d/F3D/android/MainView.kt b/f3d/src/main/java/app/f3d/F3D/android/MainView.kt index 3746ef0..af5b9a0 100644 --- a/f3d/src/main/java/app/f3d/F3D/android/MainView.kt +++ b/f3d/src/main/java/app/f3d/F3D/android/MainView.kt @@ -422,31 +422,31 @@ class MainView(context: Context) : GLSurfaceView(context) { activeAnimation = 0 lastFrameNanos = 0L animAvailable = try { - scene.availableAnimations() + scene.animation.count() } catch (_: Exception) { 0 } if (animAvailable > 0) { val range = try { - scene.animationTimeRange() + scene.animation.timeRange } catch (_: Exception) { doubleArrayOf(0.0, 0.0) } animMin = range.getOrElse(0) { 0.0 } animMax = range.getOrElse(1) { 0.0 } animNames = try { - scene.animationNames + scene.animation.names } catch (_: Exception) { emptyList() } animKeyFrames = try { - scene.animationKeyFrames + scene.animation.keyFrames } catch (_: Exception) { DoubleArray(0) } currentTime = animMin try { - scene.loadAnimationTime(currentTime) + scene.animation.loadTime(currentTime) } catch (_: Exception) { } } else { @@ -479,7 +479,7 @@ class MainView(context: Context) : GLSurfaceView(context) { animMin } try { - mEngine?.scene?.loadAnimationTime(currentTime) + mEngine?.scene?.animation?.loadTime(currentTime) } catch (_: Exception) { } } @@ -510,7 +510,7 @@ class MainView(context: Context) : GLSurfaceView(context) { currentTime = animMin + fraction.coerceIn(0.0, 1.0) * (animMax - animMin) lastFrameNanos = 0L try { - mEngine?.scene?.loadAnimationTime(currentTime) + mEngine?.scene?.animation?.loadTime(currentTime) } catch (_: Exception) { } postProgress() @@ -531,13 +531,13 @@ class MainView(context: Context) : GLSurfaceView(context) { activeAnimation = index try { engine.options.setAsIntVector("scene.animation.indices", intArrayOf(index)) - val range = engine.scene.animationTimeRange() + val range = engine.scene.animation.timeRange animMin = range.getOrElse(0) { 0.0 } animMax = range.getOrElse(1) { 0.0 } - animKeyFrames = engine.scene.animationKeyFrames + animKeyFrames = engine.scene.animation.keyFrames currentTime = animMin lastFrameNanos = 0L - engine.scene.loadAnimationTime(currentTime) + engine.scene.animation.loadTime(currentTime) } catch (_: Exception) { } publishAnimationInfo(resetPlayback = false) diff --git a/f3d/src/main/jniLibs/arm64-v8a/libf3d-java.so b/f3d/src/main/jniLibs/arm64-v8a/libf3d-java.so index afcd48b..6cd6310 100755 --- a/f3d/src/main/jniLibs/arm64-v8a/libf3d-java.so +++ b/f3d/src/main/jniLibs/arm64-v8a/libf3d-java.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06c832f162a25bdf439123a26892eec960e375871afdf3575043cfda532789d0 -size 138425840 +oid sha256:6a08bc418090f2ad5c7e667981626acbf70d7034d1786e6a83ffac6e1933b411 +size 138848992 diff --git a/f3d/src/main/jniLibs/armeabi-v7a/libf3d-java.so b/f3d/src/main/jniLibs/armeabi-v7a/libf3d-java.so index e7e1b46..f11dccb 100755 --- a/f3d/src/main/jniLibs/armeabi-v7a/libf3d-java.so +++ b/f3d/src/main/jniLibs/armeabi-v7a/libf3d-java.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d464afd6b32a7cce9912f6f40470e0343bd50d0c83299bba44e123d112424888 -size 71879632 +oid sha256:fc4e32f04c556e157bb5ad61882d581585ce3b1c9ab57d8bc90a60d057607fe6 +size 72201296 diff --git a/f3d/src/main/jniLibs/x86/libf3d-java.so b/f3d/src/main/jniLibs/x86/libf3d-java.so index fbfe26f..973b7a8 100755 --- a/f3d/src/main/jniLibs/x86/libf3d-java.so +++ b/f3d/src/main/jniLibs/x86/libf3d-java.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d9f07834010108f7ed6d6c6f8abb1f54a3c2d5cb66e5c651a1c79b273cd7dd0 -size 99585580 +oid sha256:2c8f51121fe3dc16514bb98495d54f1912271830075816720d3b225fc77aa73b +size 100031404 diff --git a/f3d/src/main/jniLibs/x86_64/libf3d-java.so b/f3d/src/main/jniLibs/x86_64/libf3d-java.so index 0293509..b301a55 100755 --- a/f3d/src/main/jniLibs/x86_64/libf3d-java.so +++ b/f3d/src/main/jniLibs/x86_64/libf3d-java.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:762db662339a986aed4c8f587a77c739655755e8606519ab8607e3a0d2e6aacb -size 143564904 +oid sha256:92c2fd2f952c0c6f1737e86f0b99a0b5719867cbde43b3d2f0a6d69978fcf8cb +size 144011736 diff --git a/jniLibs-lock.json b/jniLibs-lock.json index a1a0244..ddd9f98 100644 --- a/jniLibs-lock.json +++ b/jniLibs-lock.json @@ -1,5 +1,5 @@ { "repo": "f3d-app/f3d", - "commit": "1ee566572b2d46585d89c63d1f7c62a75a3266f0", - "version": "v3.5.0-280-g1ee56657" + "commit": "dc16808815b21ba4c8de1cd79100c63262c6fac3", + "version": "v3.5.0-331-gdc168088" }