Merge pull request #66 from li3zhen1/ForceDescriptor<NodeID>

Add `NodeID` type parameter to `_ForceDescriptor`

Author: li3zhen1

Examples/ForceDirectedGraphExample/ForceDirectedGraphExample/Lattice.swift

@@ -50,11 +50,11 @@ struct Lattice: View {
             }
 
         } force: {
-            LinkForce(
+            .link(
                 originalLength: .constant(0.8),
                 stiffness: .weightedByDegree { _, _ in 1.0 }
             )
-            ManyBodyForce(strength: -0.8)
+            .manyBody(strength: -0.8)
         }
         .toolbar {
             GraphStateToggle(graphStates: graphStates)

Examples/ForceDirectedGraphExample/ForceDirectedGraphExample/MermaidVisualization.swift

@@ -99,9 +99,9 @@ struct MermaidVisualization: View {
             .stroke(.black, StrokeStyle(lineWidth: 2.0, lineCap: .round, lineJoin: .round))
 
         } force: {
-            ManyBodyForce()
-            LinkForce(originalLength: .constant(70))
-            CenterForce()
+            .manyBody()
+            .link(originalLength: .constant(70))
+            .center()
         } emittingNewNodesWithStates: { id in
             KineticState(position: getInitialPosition(id: id, r: 100))
         }

Examples/ForceDirectedGraphExample/ForceDirectedGraphExample/Miserables.swift

@@ -66,11 +66,11 @@ struct MiserableGraph: View {
             }
 
         } force: {
-            ManyBodyForce(strength: -20)
-            CenterForce()
-            LinkForce(
+            .manyBody(strength: -20)
+            .center()
+            .link(
                 originalLength: .constant(35.0),
-                stiffness: .weightedByDegree(k: { _, _ in 1.0})
+                stiffness: .weightedByDegree { _, _ in 1.0}
             )
         }
         .ignoresSafeArea()

Examples/ForceDirectedGraphExample/ForceDirectedGraphExample/MyRing.swift

@@ -15,7 +15,7 @@ struct MyRing: View {
     @State var graphStates = ForceDirectedGraphState()
 
     var body: some View {
-
+        
         ForceDirectedGraph(states: graphStates) {
             Series(0..<20) { i in
                 NodeMark(id: 3 * i + 0)
@@ -32,26 +32,29 @@ struct MyRing: View {
                     .symbolSize(radius:6.0)
                     .foregroundStyle(.yellow)
                     .stroke(.clear)
-
+                
                 LinkMark(from: 3 * i + 0, to: 3 * i + 1)
                 LinkMark(from: 3 * i + 1, to: 3 * i + 2)
 
                 LinkMark(from: 3 * i + 0, to: 3 * ((i + 1) % 20) + 0)
                 LinkMark(from: 3 * i + 1, to: 3 * ((i + 1) % 20) + 1)
                 LinkMark(from: 3 * i + 2, to: 3 * ((i + 1) % 20) + 2)
-                    
+                
 
             }
-            .stroke(.black, StrokeStyle(lineWidth: 1.5, lineCap: .round, lineJoin: .round))
+            .stroke(
+                .black,
+                StrokeStyle(lineWidth: 1.5, lineCap: .round, lineJoin: .round)
+            )
 
         } force: {
-            ManyBodyForce(strength: -15)
-            LinkForce(
+            .manyBody(strength: -15)
+            .link(
                 originalLength: .constant(20.0),
-                stiffness: .weightedByDegree(k: { _, _ in 3.0})
+                stiffness: .weightedByDegree { _, _ in 3.0}
             )
-            CenterForce()
-            CollideForce()
+            .center()
+            .collide()
         }
         .graphOverlay { proxy in
             Rectangle().fill(.clear).contentShape(Rectangle())

README.md

@@ -167,9 +167,9 @@ struct MyGraph: View {
             }
 
         } force: {
-            LinkForce()
-            CenterForce()
-            ManyBodyForce()
+            .link()
+            .center()
+            .manyBody()
         }
     }
 }