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

svg

Browse source
This commit is contained in:
Ryan Oldenburg 2020-12-04 12:03:33 -06:00
parent fcde792086
commit 2c08ba2760
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,16 +5,14 @@ import chroma, pixie/images, pixie/common, pixie/paths, vmath, xmlparser, xmltre
const svgSignature* = "<?xml" const svgSignature* = "<?xml"
var tmp: Image
proc draw(img: Image, matStack: var seq[Mat3], xml: XmlNode) = proc draw(img: Image, matStack: var seq[Mat3], xml: XmlNode) =
case xml.tag: case xml.tag:
of "g": of "g":
let fill = xml.attr("fill") let
let stroke = xml.attr("stroke") fill = xml.attr("fill")
let strokeWidth = xml.attr("stroke-width") stroke = xml.attr("stroke")
let transform = xml.attr("transform") strokeWidth = xml.attr("stroke-width")
transform = xml.attr("transform")
if transform != "": if transform != "":
if transform.startsWith("matrix("): if transform.startsWith("matrix("):
@ -29,10 +27,8 @@ proc draw(img: Image, matStack: var seq[Mat3], xml: XmlNode) =
m[7] = parseFloat(arr[5]) m[7] = parseFloat(arr[5])
matStack.add(matStack[^1] * m) matStack.add(matStack[^1] * m)
else: else:
var m = mat3()
matStack.add(m)
raise newException( raise newException(
PixieError, "Unsupported transform: " & transform & ".") PixieError, "Unsupported SVG transform: " & transform & ".")
for child in xml: for child in xml:
if child.tag == "path": if child.tag == "path":
@ -40,7 +36,8 @@ proc draw(img: Image, matStack: var seq[Mat3], xml: XmlNode) =
if fill != "none" and fill != "": if fill != "none" and fill != "":
let fillColor = parseHtmlColor(fill).rgba let fillColor = parseHtmlColor(fill).rgba
var (bounds, fillImg) = fillPathBounds(d, fillColor, mat = matStack[^1]) let (bounds, fillImg) =
fillPathBounds(d, fillColor, mat = matStack[^1])
img.draw(fillImg, bounds.xy) img.draw(fillImg, bounds.xy)
if stroke != "none" and stroke != "": if stroke != "none" and stroke != "":
@ -48,7 +45,8 @@ proc draw(img: Image, matStack: var seq[Mat3], xml: XmlNode) =
let strokeWidth = let strokeWidth =
if strokeWidth == "": 1.0 # Default stroke width is 1px if strokeWidth == "": 1.0 # Default stroke width is 1px
else: parseFloat(strokeWidth) else: parseFloat(strokeWidth)
var (bounds, strokeImg) = strokePathBounds(d, strokeColor, strokeWidth, mat = matStack[^1]) let (bounds, strokeImg) =
strokePathBounds(d, strokeColor, strokeWidth, mat = matStack[^1])
img.draw(strokeImg, bounds.xy) img.draw(strokeImg, bounds.xy)
else: else:
@ -58,7 +56,7 @@ proc draw(img: Image, matStack: var seq[Mat3], xml: XmlNode) =
discard matStack.pop() discard matStack.pop()
else: else:
raise newException(PixieError, "Unsupported tag: " & xml.tag & ".") raise newException(PixieError, "Unsupported SVG tag: " & xml.tag & ".")
proc decodeSvg*(data: string): Image = proc decodeSvg*(data: string): Image =
## Render SVG file and return the image. ## Render SVG file and return the image.
@ -72,8 +70,6 @@ proc decodeSvg*(data: string): Image =
let h = parseInt(box[3]) let h = parseInt(box[3])
result = newImage(w, h) result = newImage(w, h)
tmp = result.copy()
var matStack = @[mat3()] var matStack = @[mat3()]
for n in xml: for n in xml:
result.draw(matStack, n) result.draw(matStack, n)