Merge pull request #32 from temoki/develop

Fix bug: penSize state are shared in tortoises.

Author: temoki

PlaygroundBook/template/Contents/Manifest.plist

@@ -11,7 +11,7 @@
 	<key>ContentIdentifier</key>
 	<string>com.temoki.playgroundbook.TortoiseGraphics</string>
 	<key>ContentVersion</key>
-	<string>0.13.0</string>
+	<string>0.13.1</string>
 	<key>ImageReference</key>
 	<string>icon.png</string>
 	<key>DeploymentTarget</key>

Sources/CommandColor.swift

@@ -32,14 +32,7 @@ class CommandColor: Command {
     }
 
     func exexute(in state: State, with context: CGContext) -> State {
-        let newState = test(in: state)
-        switch type {
-        case .pen:
-            context.setStrokeColor(newState.penColor)
-        case .fill:
-            context.setFillColor(newState.fillColor)
-        }
-        return newState
+        return test(in: state)
     }
 
 }

Sources/CommandForward.swift

@@ -23,6 +23,7 @@ class CommandForward: Command {
         if newState.isPenDown {
             context.saveGState()
             context.setStrokeColor(newState.penColor)
+            context.setLineWidth(newState.penSize)
             context.move(to: state.position)
             context.addLine(to: newState.position)
             context.strokePath()

Sources/CommandPenSize.swift

@@ -15,9 +15,7 @@ class CommandPenSize: Command {
     }
 
     func exexute(in state: State, with context: CGContext) -> State {
-        let newState = test(in: state)
-        context.setLineWidth(newState.penSize)
-        return newState
+        return test(in: state)
     }
 
 }

Sources/CommandSetPosition.swift

@@ -19,6 +19,7 @@ class CommandSetPosition: Command {
         if newState.isPenDown {
             context.saveGState()
             context.setStrokeColor(newState.penColor)
+            context.setLineWidth(newState.penSize)
             context.move(to: state.position)
             context.addLine(to: newState.position)
             context.strokePath()

Sources/Tortoise.swift

@@ -49,6 +49,7 @@ public class Tortoise {
 
     func drawTortoise(_ cgContext: CGContext, state: State) {
         cgContext.saveGState()
+        cgContext.setLineWidth(state.penSize)
         cgContext.setStrokeColor(state.penColor)
         cgContext.setFillColor(state.fillColor)
         let transform = CGAffineTransform(translationX: state.position.x, y: state.position.y)

TortoiseGraphics.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'TortoiseGraphics'
-  s.version          = '0.13.0'
+  s.version          = '0.13.1'
   s.summary          = 'A turtle graphics (a key feature of the Logo) engine written in Swift.'
   s.description      = 'A turtle graphics (a key feature of the Logo) engine written in Swift. The commands were implemented with reference to the turtle in Python 3 standard libraries.'
   s.homepage         = 'https://github.com/temoki/TortoiseGraphics'

TortoiseGraphics.xcodeproj/TortoiseGraphics_Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.13.0</string>
+	<string>0.13.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>