performance improvements

alexzhirkevich · Jul 19, 2024 · 85180b8 · 85180b8
1 parent d432ddb
commit 85180b8
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 23 deletions.
diff --git a/compottie/src/commonMain/kotlin/io/github/alexzhirkevich/compottie/LottiePainter.kt b/compottie/src/commonMain/kotlin/io/github/alexzhirkevich/compottie/LottiePainter.kt
@@ -31,6 +31,7 @@ import io.github.alexzhirkevich.compottie.internal.AnimationState
 import io.github.alexzhirkevich.compottie.internal.assets.LottieAsset
 import io.github.alexzhirkevich.compottie.internal.layers.CompositionLayer
 import io.github.alexzhirkevich.compottie.internal.layers.Layer
+import io.github.alexzhirkevich.compottie.internal.utils.fastReset
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
 import kotlin.math.roundToInt
@@ -342,7 +343,7 @@ private class LottiePainter(
     }
 
     override fun DrawScope.onDraw() {
-        matrix.reset()
+        matrix.fastReset()
 
         val scale = ContentScale.FillBounds.computeScaleFactor(intrinsicSize, size)
 

diff --git a/...monMain/kotlin/io/github/alexzhirkevich/compottie/internal/animation/AnimatedTransform.kt b/...monMain/kotlin/io/github/alexzhirkevich/compottie/internal/animation/AnimatedTransform.kt
@@ -7,6 +7,7 @@ import io.github.alexzhirkevich.compottie.internal.helpers.BooleanInt
 import io.github.alexzhirkevich.compottie.internal.platform.ComposeBackend
 import io.github.alexzhirkevich.compottie.internal.platform.currentComposeBackend
 import io.github.alexzhirkevich.compottie.internal.utils.degreeToRadians
+import io.github.alexzhirkevich.compottie.internal.utils.fastReset
 import io.github.alexzhirkevich.compottie.internal.utils.preConcat
 import io.github.alexzhirkevich.compottie.internal.utils.preRotate
 import io.github.alexzhirkevich.compottie.internal.utils.preRotateX
@@ -63,7 +64,7 @@ internal abstract class AnimatedTransform {
     fun matrix(state: AnimationState): Matrix {
         val autoOrient = state.layer.autoOrient == BooleanInt.Yes
 
-        matrix.reset()
+        matrix.fastReset()
 
         if (isHidden(state)){
             return matrix

diff --git a/...monMain/kotlin/io/github/alexzhirkevich/compottie/internal/animation/RepeaterTransform.kt b/...monMain/kotlin/io/github/alexzhirkevich/compottie/internal/animation/RepeaterTransform.kt
@@ -3,6 +3,7 @@ package io.github.alexzhirkevich.compottie.internal.animation
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Matrix
 import io.github.alexzhirkevich.compottie.internal.AnimationState
+import io.github.alexzhirkevich.compottie.internal.utils.fastReset
 import io.github.alexzhirkevich.compottie.internal.utils.preRotate
 import io.github.alexzhirkevich.compottie.internal.utils.preScale
 import io.github.alexzhirkevich.compottie.internal.utils.preTranslate
@@ -40,10 +41,8 @@ internal class RepeaterTransform(
     val endOpacity : AnimatedNumber? = null,
 ) : AnimatedTransform() {
 
-
-
     fun repeaterMatrix(state: AnimationState, amount: Float): Matrix {
-        matrix.reset()
+        matrix.fastReset()
 
         position.interpolated(state).takeIf { it != Vec2.Zero }?.let {
             matrix.preTranslate(

diff --git a/...commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/content/ContentGroupImpl.kt b/...commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/content/ContentGroupImpl.kt
@@ -11,6 +11,7 @@ import io.github.alexzhirkevich.compottie.internal.AnimationState
 import io.github.alexzhirkevich.compottie.internal.animation.AnimatedTransform
 import io.github.alexzhirkevich.compottie.internal.animation.interpolatedNorm
 import io.github.alexzhirkevich.compottie.internal.platform.addPath
+import io.github.alexzhirkevich.compottie.internal.utils.fastReset
 import io.github.alexzhirkevich.compottie.internal.utils.fastSetFrom
 import io.github.alexzhirkevich.compottie.internal.utils.preConcat
 import io.github.alexzhirkevich.compottie.internal.utils.union
@@ -103,7 +104,7 @@ internal class ContentGroupImpl(
         if (hidden(state)) {
             return path
         }
-        matrix.reset()
+        matrix.fastReset()
 
         matrix.fastSetFrom(transform.matrix(state))
         pathContents.fastForEachReversed {

diff --git a/...ottie/src/commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/helpers/Bezier.kt b/...ottie/src/commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/helpers/Bezier.kt
@@ -113,7 +113,7 @@ internal class Bezier(
     }
 
     fun mapPath(outPath : Path) {
-        outPath.reset()
+        outPath.rewind()
         outPath.moveTo(initialPoint.x, initialPoint.y)
 
         var pathFromDataCurrentPoint = initialPoint

diff --git a/...commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/helpers/CompoundTrimPath.kt b/...commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/helpers/CompoundTrimPath.kt
@@ -103,7 +103,7 @@ internal fun Path.applyTrimPath(
     }
 
 
-    tempPath.reset()
+    tempPath.rewind()
     pathMeasure.getSegment(
         startDistance = newStart,
         stopDistance = newEnd,

diff --git a/...tie/src/commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/layers/TextLayer.kt b/...tie/src/commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/layers/TextLayer.kt
@@ -46,6 +46,7 @@ import io.github.alexzhirkevich.compottie.internal.platform.addCodePoint
 import io.github.alexzhirkevich.compottie.internal.platform.charCount
 import io.github.alexzhirkevich.compottie.internal.platform.codePointAt
 import io.github.alexzhirkevich.compottie.internal.platform.isModifier
+import io.github.alexzhirkevich.compottie.internal.utils.fastReset
 import io.github.alexzhirkevich.compottie.internal.utils.preScale
 import io.github.alexzhirkevich.compottie.internal.utils.preTranslate
 import io.github.alexzhirkevich.compottie.internal.utils.toOffset
@@ -659,7 +660,7 @@ internal class TextLayer(
       fontScale : Float,
       document: TextDocument,
     ) {
-        matrix.reset();
+        matrix.fastReset();
         matrix.preTranslate(0f, -(document.baselineShift ?: 0f))
         matrix.preScale(fontScale, fontScale);
         character.data?.draw(drawScope, state, matrix, strokePaint, fillPaint)

diff --git a/...tie/src/commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/shapes/FillShape.kt b/...tie/src/commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/shapes/FillShape.kt
@@ -59,11 +59,10 @@ internal class FillShape(
     ) : Shape, DrawingContent {
 
     @Transient
-    private val path = Path().apply {
-        fillRule?.asPathFillType()?.let {
-            fillType = it
-        }
-    }
+    private val path = Path()
+
+    @Transient
+    private val fillType = fillRule?.asPathFillType() ?: path.fillType
 
     @Transient
     private var paths: List<PathContent> = emptyList()
@@ -122,7 +121,9 @@ internal class FillShape(
         roundShape?.applyTo(paint, state)
 
         state.layer.effectsApplier.applyTo(paint, state, effectsState)
+
         path.rewind()
+        path.fillType = fillType
 
         paths.fastForEach {
             path.addPath(it.getPath(state), parentMatrix)

diff --git a/...commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/shapes/GradientFillShape.kt b/...commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/shapes/GradientFillShape.kt
@@ -75,13 +75,11 @@ internal class GradientFillShape(
     val fillRule : FillRule? = null,
 ) : Shape, DrawingContent {
 
+    @Transient
+    private val path = Path()
 
     @Transient
-    private val path = Path().apply {
-        fillRule?.asPathFillType()?.let {
-            fillType = it
-        }
-    }
+    private val fillType =  fillRule?.asPathFillType() ?: path.fillType
 
     @Transient
     private val boundsRect = MutableRect(0f,0f,0f,0f)
@@ -143,6 +141,7 @@ internal class GradientFillShape(
         state.layer.effectsApplier.applyTo(paint, state, effectsState)
 
         path.rewind()
+        path.fillType = fillType
 
         pathContents.fastForEach {
             path.addPath(it.getPath(state), parentMatrix)

diff --git a/...c/commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/shapes/MergePathsShape.kt b/...c/commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/shapes/MergePathsShape.kt
@@ -64,7 +64,7 @@ internal class MergePathsShape(
 
     override fun getPath(state: AnimationState): Path {
 
-        path.reset()
+        path.rewind()
 
         val hidden = dynamicShape?.hidden.derive(hidden, state)
 

diff --git a/compottie/src/commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/utils/Matrix.kt b/compottie/src/commonMain/kotlin/io/github/alexzhirkevich/compottie/internal/utils/Matrix.kt
@@ -53,6 +53,10 @@ internal fun Matrix.preConcat(other : Matrix) {
 //    timesAssign(other)
 }
 
+internal fun Matrix.fastReset() {
+    fastSetFrom(IdentityMatrix)
+}
+
 internal fun Matrix.fastSetFrom(other : Matrix){
     other.values.copyInto(values)
 }
@@ -80,20 +84,20 @@ internal fun Matrix.preRotate(degree : Float) {
 
 internal fun Matrix.preRotateX(degree : Float) {
     preConcat(tempMatrixTransform.apply {
-        reset()
+        fastReset()
         rotateX(degree)
     })
 }
 
 internal fun Matrix.preRotateY(degree : Float) {
     preConcat(tempMatrixTransform.apply {
-        reset()
+        fastReset()
         rotateY(degree)
     })
 }
 internal fun Matrix.preRotateZ(degree : Float) {
     preConcat(tempMatrixTransform.apply {
-        reset()
+        fastReset()
         rotateZ(degree)
     })
 }