Fix Observation

li3zhen1 · Feb 21, 2024 · ae3080e · ae3080e
1 parent b08c89c
commit ae3080e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Sources/Grape/Views/ForceDirectedGraph+Gesture.swift b/Sources/Grape/Views/ForceDirectedGraph+Gesture.swift
@@ -183,7 +183,7 @@ extension ForceDirectedGraph {
 extension ForceDirectedGraph {
     @inlinable
     public func onTicked(
-        perform action: @escaping (KeyFrame) -> Void
+        perform action: @escaping (UInt) -> Void
     ) -> Self {
         self.model._onTicked = action
         return self

diff --git a/Sources/Grape/Views/ForceDirectedGraph+View.swift b/Sources/Grape/Views/ForceDirectedGraph+View.swift
@@ -46,7 +46,7 @@ extension ForceDirectedGraph: View {
     @inlinable
     var debugView: some View {
         VStack(alignment: .leading, spacing: 8.0) {
-            Text("Elapsed Time: \(model.currentFrame.rawValue)")
+            Text("Elapsed Time: \(model.currentFrame)")
             Divider()
             Text(self.model.changeMessage)
             Divider()

diff --git a/Sources/Grape/Views/ForceDirectedGraphModel.swift b/Sources/Grape/Views/ForceDirectedGraphModel.swift
@@ -71,7 +71,7 @@ public final class ForceDirectedGraphModel<Content: GraphContent> {
     var _$changeMessage = "N/A"
 
     @usableFromInline
-    var _$currentFrame: KeyFrame = 0
+    var _$currentFrame: UInt = 0
 
     @inlinable
     var changeMessage: String {
@@ -93,7 +93,7 @@ public final class ForceDirectedGraphModel<Content: GraphContent> {
     }
 
     @inlinable
-    var currentFrame: KeyFrame {
+    var currentFrame: UInt {
         @storageRestrictions(initializes: _$currentFrame)
         init(initialValue) {
             _$currentFrame = initialValue
@@ -119,7 +119,7 @@ public final class ForceDirectedGraphModel<Content: GraphContent> {
     var scheduledTimer: Timer? = nil
 
     @usableFromInline
-    var _onTicked: ((KeyFrame) -> Void)? = nil
+    var _onTicked: ((UInt) -> Void)? = nil
 
     @usableFromInline
     var _onNodeDragChanged: ((NodeID, CGPoint) -> Void)? = nil
@@ -245,7 +245,7 @@ extension ForceDirectedGraphModel {
     func tick() {
         withMutation(keyPath: \.currentFrame) {
             simulationContext.storage.tick()
-            currentFrame.advance()
+            currentFrame += 1
         }
         _onTicked?(currentFrame)
     }