diff --git a/f3d/libs/f3d.jar b/f3d/libs/f3d.jar index 4c53c18..fefc4d1 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:77a62010d1693647bb83f852dc92058d15f77a127dc13aefd939e3bc67d2701d +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..e4317f0 100644 --- a/f3d/src/main/java/app/f3d/F3D/android/MainView.kt +++ b/f3d/src/main/java/app/f3d/F3D/android/MainView.kt @@ -417,18 +417,19 @@ class MainView(context: Context) : GLSurfaceView(context) { private fun refreshAnimationState() { val scene = mEngine?.scene ?: return + val anim = scene.animation isPlaying = false speed = 1.0 activeAnimation = 0 lastFrameNanos = 0L animAvailable = try { - scene.availableAnimations() + scene.animation.count() } catch (_: Exception) { 0 } if (animAvailable > 0) { val range = try { - scene.animationTimeRange() + anim.timeRange() } catch (_: Exception) { doubleArrayOf(0.0, 0.0) } @@ -446,7 +447,7 @@ class MainView(context: Context) : GLSurfaceView(context) { } currentTime = animMin try { - scene.loadAnimationTime(currentTime) + anim.loadTime(currentTime) } catch (_: Exception) { } } else { @@ -479,7 +480,7 @@ class MainView(context: Context) : GLSurfaceView(context) { animMin } try { - mEngine?.scene?.loadAnimationTime(currentTime) + mEngine?.scene?.animation.loadTime(currentTime) } catch (_: Exception) { } } @@ -510,7 +511,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 +532,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 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..352dde3 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:c1417b55aeeb906191f66fd71e22e416741a23ae83b474e415182d60ea2ef454 +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..978eb39 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:e3294365ab6adb704513164c00b47cad21b4bdef46ea927f0662c999088625b4 +size 72201296 diff --git a/f3d/src/main/jniLibs/x86/libf3d-java.so b/f3d/src/main/jniLibs/x86/libf3d-java.so index fbfe26f..2e6d301 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:3b32f94bb91809e62668d1dc3bf58fd02c3ca10cc1edfb9430965b46277c32ad +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..6df1d45 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:3c638bf75245d8b6196e9dd301749f7a91a406692b29496c657e8662d5d29702 +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" }