exyte/Macaw
1
1
Fork 0
mirror of https://github.com/exyte/Macaw.git synced 2024-09-11 05:05:23 +03:00
Code Issues Projects Releases Wiki Activity

Override toPath() for Rect.

Browse Source
This commit is contained in:
Eduard Sergeev 2019-03-14 11:37:49 +07:00
parent fd64147a3a
commit 6758c3bbe0
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/model/geom2d/Locus+ToPath.swift
View File

@ -2,10 +2,6 @@ import Foundation
extension Locus {
internal func rectToPath(_ rect: Rect) -> Path {
return MoveTo(x: rect.x, y: rect.y).lineTo(x: rect.x, y: rect.y + rect.h).lineTo(x: rect.x + rect.w, y: rect.y + rect.h).lineTo(x: rect.x + rect.w, y: rect.y).close().build()
}
internal func circleToPath(_ circle: Circle) -> Path {
return MoveTo(x: circle.cx, y: circle.cy).m(-circle.r, 0).a(circle.r, circle.r, 0.0, true, false, circle.r * 2.0, 0.0).a(circle.r, circle.r, 0.0, true, false, -(circle.r * 2.0), 0.0).build()
}

4
Source/model/geom2d/Locus.swift
View File

@ -20,9 +20,7 @@ open class Locus {
}
open func toPath() -> Path {
if let rect = self as? Rect {
return rectToPath(rect)
} else if let circle = self as? Circle {
if let circle = self as? Circle {
return circleToPath(circle)
} else if let arc = self as? Arc {
return arcToPath(arc)

3
Source/model/geom2d/Rect.swift
View File

@ -63,6 +63,9 @@ open class Rect: Locus {
return Size(w: w, h: h)
}
override open func toPath() -> Path {
return MoveTo(x: x, y: y).lineTo(x: x, y: y + h).lineTo(x: x + w, y: y + h).lineTo(x: x + w, y: y).close().build()
}
}
extension Rect {