Merge pull request #28 from temoki/multiple_tortoises

Draw with multiple tortoises

Author: temoki

OutputExamples/example1.gif

@@ -0,0 +1,35 @@
+//: # With 2 tortoises 🐢🐢
+//: [👈 With a tortoise 🐢](@previous)
+import PlaygroundSupport
+import TortoiseGraphics
+import CoreGraphics
+
+let canvas = PlaygroundCanvas(frame: CGRect(x: 0, y: 0, width: 300, height: 300))
+canvas.frameRate = 30
+PlaygroundPage.current.liveView = canvas
+
+canvas.drawingWithTortoises(count: 2) { tortoises in
+    let 🐢 = tortoises[0]
+    let 🐇 = tortoises[1]
+    
+    🐢.penColor(.red)
+    🐢.fillColor(.orange)
+    🐢.left(90)
+    
+    🐇.penColor(.purple)
+    🐇.fillColor(.lightBlue)
+    🐇.right(90)
+    
+    // Turtle Star!
+    🐢.beginFill()
+    🐇.beginFill()
+    🐢.repeat(36) {
+        🐢.forward(120)
+        🐇.forward(120)
+        🐢.left(170)
+        🐇.right(170)
+    }
+    🐢.endFill()
+    🐇.endFill()
+}
+

OutputExamples/example1.png

@@ -1,3 +1,5 @@
+//: # With a tortoise 🐢
+//: [👉 With 2 tortoises 🐢🐢](@next)
 import PlaygroundSupport
 import TortoiseGraphics
 import CoreGraphics
@@ -8,7 +10,7 @@ PlaygroundPage.current.liveView = canvas
 
 canvas.drawing { 🐢 in
     🐢.penColor(.red)
-    🐢.fillColor(.yellow)
+    🐢.fillColor(.orange)
 
     🐢.penUp()
     🐢.back(100)

OutputExamples/example2.gif

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='5.0' target-platform='macos'>
-    <timeline fileName='timeline.xctimeline'/>
+<playground version='6.0' target-platform='macos' display-mode='raw'>
+    <pages>
+        <page name='With a tortoise'/>
+        <page name='With 2 tortoises'/>
+    </pages>
 </playground>

OutputExamples/example2.png

@@ -30,25 +30,41 @@ public class PlaygroundCanvas: View {
 
     // MARK: - Canvas Protocol
 
-    public func drawing(_ block: @escaping (Tortoise) -> Void) {
-        tortoise.initialize()
+    public func drawing(drawingBlock: @escaping (Tortoise) -> Void) {
+        tortoiseCharmer.initialize(tortoiseCount: 1)
 
-        tortoise.commandedHandler = { [weak self] (tortoise) in
+        tortoiseCharmer.commandedHandler = { [weak self] (_) in
             guard !Thread.isMainThread else { return }
             guard let interval = self?.animationInterval else { return }
             Thread.sleep(forTimeInterval: interval)
         }
 
         DispatchQueue.global().async { [weak self] in
-            guard let tortoise = self?.tortoise else { return }
-            block(tortoise)
-            tortoise.commandedHandler = nil
+            guard let tortoiseCharmer = self?.tortoiseCharmer else { return }
+            drawingBlock(tortoiseCharmer.tortoises[0])
+            tortoiseCharmer.commandedHandler = nil
+        }
+    }
+    
+    public func drawingWithTortoises(count: Int, drawingBlock: @escaping ([Tortoise]) -> Void) {
+        tortoiseCharmer.initialize(tortoiseCount: count)
+        
+        tortoiseCharmer.commandedHandler = { [weak self] (_) in
+            guard !Thread.isMainThread else { return }
+            guard let interval = self?.animationInterval else { return }
+            Thread.sleep(forTimeInterval: interval)
+        }
+        
+        DispatchQueue.global().async { [weak self] in
+            guard let tortoiseCharmer = self?.tortoiseCharmer else { return }
+            drawingBlock(tortoiseCharmer.tortoises)
+            tortoiseCharmer.commandedHandler = nil
         }
     }
 
     // MARK: - Private
 
-    private let tortoise: Tortoise = Tortoise()
+    private var tortoiseCharmer = TortoiseCharmer(tortoiseCount: 1)
 
     private var drawingFrameIndex: Int = 0
 
@@ -59,7 +75,7 @@ public class PlaygroundCanvas: View {
     }
 
     private func draw(with context: GraphicsContext) {
-        drawingFrameIndex = tortoise.draw(with: context, toFrame: drawingFrameIndex)
+        drawingFrameIndex = tortoiseCharmer.charm(with: context, toFrame: drawingFrameIndex)
         drawingTimer = Timer.scheduledTimer(timeInterval: animationInterval,
                                             target: self,
                                             selector: #selector(self.onAnimaitionTimer(timer:)),

Playground/Playground.playground/Pages/With 2 tortoises.xcplaygroundpage/Contents.swift

@@ -1,15 +1,13 @@
-//#-hidden-code
+#if os(iOS)
 import UIKit
-import PlaygroundSupport
 
-class PlaygroundLiveViewController: UIViewController {
+public class PlaygroundLiveViewController: UIViewController {
 
-    var backView: UIView!
-    var canvas: PlaygroundCanvas!
+    private var backView: UIView!
+    public var canvas: PlaygroundCanvas!
 
-    override func viewDidLoad() {
+    public override func viewDidLoad() {
         super.viewDidLoad()
-        
         view.translatesAutoresizingMaskIntoConstraints = false
 
         backView = UIView(frame: view.bounds)
@@ -36,27 +34,4 @@ class PlaygroundLiveViewController: UIViewController {
     }
 
 }
-let liveView = PlaygroundLiveViewController()
-PlaygroundPage.current.liveView = liveView
-
-liveView.canvas.drawing { 🐢 in
-//#-code-completion(identifier, hide, Canvas, ImageCanvas, PlaygroundCanvas, View, Tortoise, PlaygroundLiveViewController, liveView, canvas)
-//#-code-completion(module, hide, UIKit, PlaygroundSupport)
-//#-end-hidden-code
-//: # Let's play with 🐢
-    🐢.penColor(.red)
-    🐢.fillColor(.yellow)
-    
-    🐢.penUp()
-    🐢.back(100)
-    🐢.penDown()
-    
-    // Turtle Star!
-    🐢.beginFill()
-    🐢.repeat(36) {
-        🐢.forward(200)
-        🐢.left(170)
-    }
-    🐢.endFill()
-//#-hidden-code
-}
+#endif