Skip to content

Add trimTo and trimFrom to SVGPath #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sekeidesign wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add trimTo and trimFrom to SVGPath #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37a82f8
Add trimTo and trimFrom to SVGPath
sekeidesign Oct 9, 2024
ce96b06
Remove double instantiation
sekeidesign Oct 9, 2024
adbee44
Add path stroke controls
sekeidesign Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Source/Model/Nodes/SVGNode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,22 @@ public class SVGNode: SerializableElement {
@Published public var clip: SVGNode?
@Published public var mask: SVGNode?
@Published public var id: String?
@Published public var trimFrom: Double
@Published public var trimTo: Double
@Published public var pathStroke: SVGStroke?

var gestures = [AnyGesture<()>]()

public init(transform: CGAffineTransform = .identity, opaque: Bool = true, opacity: Double = 1, clip: SVGNode? = nil, mask: SVGNode? = nil, id: String? = nil) {
public init(transform: CGAffineTransform = .identity, opaque: Bool = true, opacity: Double = 1, clip: SVGNode? = nil, mask: SVGNode? = nil, id: String? = nil, trimFrom: Double = 0, trimTo: Double = 1, pathStroke: SVGStroke? = nil) {
self.transform = transform
self.opaque = opaque
self.opacity = opacity
self.clip = clip
self.mask = mask
self.id = id
self.trimFrom = trimFrom
self.trimTo = trimTo
self.pathStroke = pathStroke
}

public func bounds() -> CGRect {
Expand Down Expand Up @@ -56,6 +62,9 @@ public class SVGNode: SerializableElement {
serializer.add("opacity", opacity, 1)
serializer.add("opaque", opaque, true)
serializer.add("clip", clip).add("mask", mask)
serializer.add("trimFrom", trimFrom)
serializer.add("trimTo", trimTo)
serializer.add("pathStroke", pathStroke)
}

var typeName: String {
Expand Down
3 changes: 2 additions & 1 deletion Source/Model/Shapes/SVGPath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ extension MBezierPath {
let isGradient = model.fill is SVGGradient
let bounds = isGradient ? model.bounds() : CGRect.zero
return Path(self.cgPath)
.applySVGStroke(stroke: model.stroke, eoFill: eoFill)
.trim(from: model.trimFrom, to: model.trimTo)
.applySVGStroke(stroke: model.pathStroke ?? model.stroke, eoFill: eoFill)
.applyShapeAttributes(model: model)
.applyIf(isGradient) {
$0.frame(width: bounds.width, height: bounds.height)
Expand Down