Skip to content

Update libf3d and use new animation API #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mwestphal wants to merge 2 commits into from
Closed

Update libf3d and use new animation API #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bf1f89
Update libf3d to master
mwestphal Oct 8, 2026
c8734ae
Update MainView.kt for new animation API
mwestphal Oct 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions f3d/libs/f3d.jar
View file
Open in desktop
Git LFS file not shown
15 changes: 8 additions & 7 deletions f3d/src/main/java/app/f3d/F3D/android/MainView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -446,7 +447,7 @@ class MainView(context: Context) : GLSurfaceView(context) {
}
currentTime = animMin
try {
scene.loadAnimationTime(currentTime)
anim.loadTime(currentTime)
} catch (_: Exception) {
}
} else {
Expand Down Expand Up @@ -479,7 +480,7 @@ class MainView(context: Context) : GLSurfaceView(context) {
animMin
}
try {
mEngine?.scene?.loadAnimationTime(currentTime)
mEngine?.scene?.animation.loadTime(currentTime)
} catch (_: Exception) {
}
}
Expand Down Expand Up @@ -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()
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions f3d/src/main/jniLibs/arm64-v8a/libf3d-java.so
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions f3d/src/main/jniLibs/armeabi-v7a/libf3d-java.so
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions f3d/src/main/jniLibs/x86/libf3d-java.so
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions f3d/src/main/jniLibs/x86_64/libf3d-java.so
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions jniLibs-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"repo": "f3d-app/f3d",
"commit": "1ee566572b2d46585d89c63d1f7c62a75a3266f0",
"version": "v3.5.0-280-g1ee56657"
"commit": "dc16808815b21ba4c8de1cd79100c63262c6fac3",
"version": "v3.5.0-331-gdc168088"
}
Loading