Chore/update native (#125)

* chore: 🤖 updated dotlottie-rs to 0.1.57-372c366

Author: afsalz

dotlottie/build.gradle.kts

@@ -37,7 +37,7 @@ dotlottieRust {
 }
 
 group = "com.github.LottieFiles"
-version = "0.13.8"
+version = "0.14.0"
 
 android {
     namespace = "com.lottiefiles.dotlottie.core"

dotlottie/src/main/cpp/dotlottie_player.h

@@ -1,2 +1,2 @@
-dlplayer-version=0.1.56-cfddbc8
+dlplayer-version=0.1.57-372c366
 api-type=c-api

dotlottie/src/main/cpp/jni_bridge.cpp

@@ -445,8 +445,7 @@ class DotLottieController {
     fun loadAnimation(
         animationId: String,
     ) {
-        val result =
-            dlplayer?.loadAnimation(animationId, this._width.value, this._height.value) ?: false
+        val result = dlplayer?.loadAnimation(animationId) ?: false
 
         if (result) {
             _bufferNeedsUpdate.value = true

dotlottie/src/main/cpp/version.txt

@@ -71,6 +71,8 @@ fun DotLottieAnimation(
 ) {
     val context = LocalContext.current
 
+    remember(context) { DotLottieJNI.ensureAndroidInitialized(context); Unit }
+
     val rController = remember { controller ?: DotLottieController() }
 
     val dlConfig = remember {
@@ -117,9 +119,9 @@ fun DotLottieAnimation(
                 }
 
                 val ticked = if (rController.stateMachineIsActive) {
-                    dlPlayer.stateMachineTick()
+                    dlPlayer.stateMachineTick(frameTimeNanos)
                 } else {
-                    dlPlayer.tick()
+                    dlPlayer.tick(frameTimeNanos)
                 }
 
                 // Poll and dispatch events
@@ -190,11 +192,11 @@ fun DotLottieAnimation(
 
                 when (animationData) {
                     is DotLottieContent.Json -> {
-                        dlPlayer.loadAnimationData(animationData.jsonString, width, height)
+                        dlPlayer.loadAnimationData(animationData.jsonString)
                     }
 
                     is DotLottieContent.Binary -> {
-                        dlPlayer.loadDotlottieData(animationData.data, width, height)
+                        dlPlayer.loadDotlottieData(animationData.data)
                     }
                 }
 
@@ -297,7 +299,6 @@ fun DotLottieAnimation(
                 val newBitmap = createBitmap(_width.toInt(), _height.toInt())
                 val pixelPtr = DotLottieJNI.nativeLockBitmapPixels(newBitmap)
                 if (pixelPtr == 0L) return@withLock
-                dlPlayer.resize(_width, _height)
                 dlPlayer.setSwTarget(pixelPtr, _width, _height)
                 bitmap = newBitmap
                 drawVersion++

dotlottie/src/main/java/com/lottiefiles/dotlottie/core/compose/runtime/DotLottieController.kt

@@ -62,6 +62,9 @@ internal fun DotLottieGLAnimationHardwareBuffer(
     loopCount: UInt = 0u,
 ) {
     val context = LocalContext.current
+    remember(context) {
+        com.lottiefiles.dotlottie.core.jni.DotLottiePlayer.ensureAndroidInitialized(context); Unit
+    }
     val rController = remember { controller ?: DotLottieController() }
     val initialStateMachineId = remember { stateMachineId }
 

dotlottie/src/main/java/com/lottiefiles/dotlottie/core/compose/ui/DotLottieAnimation.kt

@@ -45,7 +45,6 @@ internal fun DotLottieGLSurfaceAnimation(
     val lifecycleOwner = LocalLifecycleOwner.current
 
     val rController = remember { controller ?: DotLottieController() }
-    val initialStateMachineId = remember { stateMachineId }
 
     // Hold a reference to the widget so we can interact with it
     val glWidgetRef = remember { arrayOfNulls<GLWidget>(1) }
@@ -61,6 +60,7 @@ internal fun DotLottieGLSurfaceAnimation(
             .useFrameInterpolation(useFrameInterpolation)
             .marker(marker ?: "")
             .loopCount(loopCount)
+            .stateMachineId(stateMachineId ?: "")
             .build()
     }
 
@@ -119,11 +119,6 @@ internal fun DotLottieGLSurfaceAnimation(
                 widget.setOnPlayerCreated { player, config ->
                     rController.setPlayerInstance(player, config)
                     rController.init()
-
-                    if (!initialStateMachineId.isNullOrEmpty()) {
-                        rController.stateMachineLoad(initialStateMachineId)
-                        rController.stateMachineStart()
-                    }
                 }
 
                 // Load content

dotlottie/src/main/java/com/lottiefiles/dotlottie/core/compose/ui/DotLottieGLAnimationHardwareBuffer.kt

@@ -111,9 +111,9 @@ class DotLottieDrawable(
 
             // stateMachineTick() calls player tick() internally (player is borrowed by state machine)
             val ticked = if (stateMachineIsActive) {
-                player.stateMachineTick()
+                player.stateMachineTick(frameTimeNanos)
             } else {
-                player.tick()
+                player.tick(frameTimeNanos)
             }
 
             // Poll and dispatch events on main thread
@@ -289,15 +289,11 @@ class DotLottieDrawable(
         // 2. Load animation
         when (animationData) {
             is DotLottieContent.Json -> {
-                player.loadAnimationData(
-                    animationData.jsonString,
-                    width.toUInt(),
-                    height.toUInt()
-                )
+                player.loadAnimationData(animationData.jsonString)
             }
 
             is DotLottieContent.Binary -> {
-                player.loadDotlottieData(animationData.data, width.toUInt(), height.toUInt())
+                player.loadDotlottieData(animationData.data)
             }
         }
 
@@ -341,7 +337,6 @@ class DotLottieDrawable(
                 val pixelPtr = DotLottieJNI.nativeLockBitmapPixels(newBitmap)
                 if (pixelPtr == 0L) return@withLock
                 player.setSwTarget(pixelPtr, width.toUInt(), height.toUInt())
-                player.resize(width.toUInt(), height.toUInt())
                 bitmapBuffer = newBitmap
 
                 // Unlock and recycle old bitmap
@@ -405,7 +400,7 @@ class DotLottieDrawable(
     fun loadAnimation(
         animationId: String,
     ) {
-        val result = dlPlayer?.loadAnimation(animationId, width.toUInt(), height.toUInt())
+        val result = dlPlayer?.loadAnimation(animationId)
         if (result == true) {
             scheduleFrame(forceUpdate = true)
         }

dotlottie/src/main/java/com/lottiefiles/dotlottie/core/compose/ui/DotLottieGLSurfaceAnimation.kt

@@ -164,18 +164,10 @@ internal class GlHardwareRenderer : SharedGlThread.RenderClient {
 
             val loaded = when (content) {
                 is DotLottieContent.Json -> {
-                    player.loadAnimationData(
-                        content.jsonString,
-                        bufferWidth.toUInt(),
-                        bufferHeight.toUInt()
-                    )
+                    player.loadAnimationData(content.jsonString)
                 }
                 is DotLottieContent.Binary -> {
-                    player.loadDotlottieData(
-                        content.data,
-                        bufferWidth.toUInt(),
-                        bufferHeight.toUInt()
-                    )
+                    player.loadDotlottieData(content.data)
                 }
             }
             GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0)
@@ -213,7 +205,6 @@ internal class GlHardwareRenderer : SharedGlThread.RenderClient {
             createRenderFbo()
 
             val player = dlPlayer ?: return@post
-            player.resize(width.toUInt(), height.toUInt())
             if (buffersValid && renderFboId != 0) {
                 GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, renderFboId)
                 GLES20.glViewport(0, 0, width, height)
@@ -341,7 +332,7 @@ internal class GlHardwareRenderer : SharedGlThread.RenderClient {
         return player.isPlaying() || player.stateMachineIsActive || !player.isLoaded()
     }
 
-    override fun onRenderFrame() {
+    override fun onRenderFrame(frameTimeNanos: Long) {
         val player = dlPlayer ?: return
         if (bufferWidth <= 0 || bufferHeight <= 0) return
         if (!buffersValid) return
@@ -370,9 +361,9 @@ internal class GlHardwareRenderer : SharedGlThread.RenderClient {
 
         // Tick the player — ThorVG renders into renderFbo
         val ticked = if (player.stateMachineIsActive) {
-            player.stateMachineTick()
+            player.stateMachineTick(frameTimeNanos)
         } else {
-            player.tick()
+            player.tick(frameTimeNanos)
         }
 
         // Poll and dispatch events