Revert Location Update Logic

Lakr233 · Aug 17, 2024 · 1f667fe · 1f667fe
1 parent 8dbe5e3
commit 1f667fe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Sources/ColorfulX/AnimatedMulticolorGradientView+Speckle.swift b/Sources/ColorfulX/AnimatedMulticolorGradientView+Speckle.swift
@@ -92,11 +92,3 @@ public extension AnimatedMulticolorGradientView {
         }
     }
 }
-
-extension SpringInterpolation2D {
-    var distanceToTarget: CGFloat {
-        let dx = x.context.currentPos - x.context.targetPos
-        let dy = y.context.currentPos - y.context.targetPos
-        return sqrt(dx * dx + dy * dy)
-    }
-}
diff --git a/Sources/ColorfulX/AnimatedMulticolorGradientView+Update.swift b/Sources/ColorfulX/AnimatedMulticolorGradientView+Update.swift
@@ -38,7 +38,15 @@ extension AnimatedMulticolorGradientView {
                 speckle.position.update(withDeltaTime: moveDelta)
             }
 
-            if speckle.position.distanceToTarget < 50 {
+            let pos_x = speckle.position.x.context.currentPos
+            let tar_x = speckle.position.x.context.targetPos
+            let pos_y = speckle.position.y.context.currentPos
+            let tar_y = speckle.position.y.context.targetPos
+            let shouldUpdateLocation = false
+                || abs(pos_x - tar_x) < 0.125
+                || abs(pos_y - tar_y) < 0.125
+
+            if shouldUpdateLocation {
                 let rand = randomLocationPair()
                 speckle.position.setTarget(.init(x: rand.x, y: rand.y))
             }

diff --git a/Sources/ColorfulX/AnimatedMulticolorGradientView.swift b/Sources/ColorfulX/AnimatedMulticolorGradientView.swift
@@ -13,8 +13,8 @@ import SpringInterpolation
 private let SPRING_CONFIG = SpringInterpolation.Configuration(
     angularFrequency: 1.5,
     dampingRatio: 0.2,
-    threshold: 0.001,
-    stopWhenHitTarget: false
+    threshold: 0.0001,
+    stopWhenHitTarget: true
 )
 private let SPRING_ENGINE = SpringInterpolation2D(SPRING_CONFIG)
 private let defaultFrameRate: Int = 60