MyouProject/pixie
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simpler

Browse source
This commit is contained in:
Ryan Oldenburg 2022-05-21 19:15:30 -05:00
parent a82343b2ee
commit cc93d33ab9
1 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/pixie/fileformats/svg.nim
View file

@ -26,9 +26,6 @@ type
opacity, fillOpacity, strokeOpacity: float32 opacity, fillOpacity, strokeOpacity: float32
linearGradients: TableRef[string, LinearGradient] linearGradients: TableRef[string, LinearGradient]
RenderMode = enum
Fill, Stroke
LinearGradient = object LinearGradient = object
x1, y1, x2, y2: float32 x1, y1, x2, y2: float32
stops: seq[ColorStop] stops: seq[ColorStop]
@ -345,7 +342,7 @@ proc stroke(img: Image, path: Path, props: SvgProperties) =
proc parseSvgElement( proc parseSvgElement(
node: XmlNode, propertiesStack: var seq[SvgProperties] node: XmlNode, propertiesStack: var seq[SvgProperties]
): seq[(Path, RenderMode, SvgProperties)] = ): seq[(Path, SvgProperties)] =
if node.kind != xnElement: if node.kind != xnElement:
# Skip <!-- comments --> # Skip <!-- comments -->
return return
@ -371,9 +368,7 @@ proc parseSvgElement(
props = node.parseSvgProperties(propertiesStack[^1]) props = node.parseSvgProperties(propertiesStack[^1])
path = parsePath(d) path = parsePath(d)
result.add (path, Fill, props) result.add (path, props)
if props.shouldStroke:
result.add (path, Stroke, props)
of "line": of "line":
let let
@ -387,8 +382,7 @@ proc parseSvgElement(
path.moveTo(x1, y1) path.moveTo(x1, y1)
path.lineTo(x2, y2) path.lineTo(x2, y2)
if props.shouldStroke: result.add (path, props)
result.add (path, Stroke, props)
of "polyline", "polygon": of "polyline", "polygon":
let let
@ -421,10 +415,8 @@ proc parseSvgElement(
# and fill or not # and fill or not
if node.tag == "polygon": if node.tag == "polygon":
path.closePath() path.closePath()
result.add (path, Fill, props)
if props.shouldStroke: result.add (path, props)
result.add (path, Stroke, props)
of "rect": of "rect":
let let
@ -462,9 +454,7 @@ proc parseSvgElement(
else: else:
path.rect(x, y, width, height) path.rect(x, y, width, height)
result.add (path, Fill, props) result.add (path, props)
if props.shouldStroke:
result.add (path, Stroke, props)
of "circle", "ellipse": of "circle", "ellipse":
let let
@ -483,9 +473,7 @@ proc parseSvgElement(
let path = newPath() let path = newPath()
path.ellipse(cx, cy, rx, ry) path.ellipse(cx, cy, rx, ry)
result.add (path, Fill, props) result.add (path, props)
if props.shouldStroke:
result.add (path, Stroke, props)
of "radialGradient": of "radialGradient":
discard discard
@ -588,14 +576,12 @@ proc decodeSvg*(
var var
propertiesStack = @[rootProps] propertiesStack = @[rootProps]
renderInfos: seq[(Path, RenderMode, SvgProperties)] renderInfos: seq[(Path, SvgProperties)]
for node in root.items: for node in root.items:
renderInfos.add node.parseSvgElement(propertiesStack) renderInfos.add node.parseSvgElement(propertiesStack)
for (path, mode, props) in renderInfos: for (path, props) in renderInfos:
case mode:
of Fill:
result.fill(path, props) result.fill(path, props)
of Stroke: if props.shouldStroke:
result.stroke(path, props) result.stroke(path, props)
except PixieError as e: except PixieError as e:
raise e raise e