refined the snap animation

ThasianX · Aug 1, 2020 · bf744d9 · bf744d9
1 parent 06a307b
commit bf744d9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 119 deletions.
diff --git a/Sources/ElegantColorPalette/Helpers/Modifiers/FocusModifier.swift b/Sources/ElegantColorPalette/Helpers/Modifiers/FocusModifier.swift
@@ -44,18 +44,20 @@ private extension ColorNode {
 
 private extension ColorNode {
 
-    // TODO: fix this for the first node. it can be really snappy
     func snap(to location: CGPoint, multiplier: CGFloat, completion: @escaping () -> Void) {
         guard position != location else { return }
 
-        let offset = CGPoint(x: -position.x,
-                             y: -position.y)
+        let offset = CGPoint(x: location.x - position.x,
+                             y: location.y - position.y)
         let snapVector = CGVector(dx: offset.x*multiplier,
                                   dy: offset.y*multiplier)
         physicsBody?.velocity = snapVector
 
+        let distance = hypot(offset.x, offset.y)
+        let moveDuration = 0.001*distance
+
         let moveAction = SKAction.move(to: location,
-                                       duration: 0.25)
+                                       duration: TimeInterval(moveDuration))
 
         run(moveAction, completion: completion)
     }

diff --git a/SwiftUIExample/SwiftUIExample/Assets.xcassets/color1.colorset/Contents.json b/SwiftUIExample/SwiftUIExample/Assets.xcassets/color1.colorset/Contents.json
diff --git a/SwiftUIExample/SwiftUIExample/Assets.xcassets/color2.colorset/Contents.json b/SwiftUIExample/SwiftUIExample/Assets.xcassets/color2.colorset/Contents.json
diff --git a/SwiftUIExample/SwiftUIExample/SwiftUIExampleView.swift b/SwiftUIExample/SwiftUIExample/SwiftUIExampleView.swift
@@ -72,7 +72,7 @@ struct CustomNodeStyle: NodeStyle {
 
     func apply(configuration: Configuration) -> ColorNode {
         configuration.defaultStyledNode
-            .radius(35)
+            .radius(30)
             .font(name: "Thonburi")
     }
 

diff --git a/UIKitProgrammaticAndXIBExample/UIKitProgrammaticAndXIBExample/ProgrammaticExampleVC.swift b/UIKitProgrammaticAndXIBExample/UIKitProgrammaticAndXIBExample/ProgrammaticExampleVC.swift
@@ -102,7 +102,7 @@ struct CustomNodeStyle: NodeStyle {
 
     func apply(configuration: Configuration) -> ColorNode {
         configuration.defaultStyledNode
-            .radius(35)
+            .radius(30)
             .font(name: "Thonburi")
     }
 

diff --git a/UIKitStoryboardExample/UIKitStoryboardExample/ViewController.swift b/UIKitStoryboardExample/UIKitStoryboardExample/ViewController.swift
@@ -49,7 +49,7 @@ struct CustomNodeStyle: NodeStyle {
 
     func apply(configuration: Configuration) -> ColorNode {
         configuration.defaultStyledNode
-            .radius(35)
+            .radius(30)
             .font(name: "Thonburi")
     }