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

SvgCtx -> SvgProperties

Browse source
This commit is contained in:
Ryan Oldenburg 2022-05-21 17:31:13 -05:00
parent f5d91a1d9a
commit 3a27b0de90
1 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ type
x1, y1, x2, y2: float32 x1, y1, x2, y2: float32
stops: seq[ColorStop] stops: seq[ColorStop]
SvgCtx = object SvgProperties = object
display: bool display: bool
fillRule: WindingRule fillRule: WindingRule
fill: Paint fill: Paint
@ -38,7 +38,7 @@ proc attrOrDefault(node: XmlNode, name, default: string): string =
if result.len == 0: if result.len == 0:
result = default result = default
proc initSvgCtx(): SvgCtx = proc initSvgProperties(): SvgProperties =
result.display = true result.display = true
try: try:
result.fill = parseHtmlColor("black").rgbx result.fill = parseHtmlColor("black").rgbx
@ -52,7 +52,7 @@ proc initSvgCtx(): SvgCtx =
result.strokeOpacity = 1 result.strokeOpacity = 1
result.linearGradients = newTable[string, LinearGradient]() result.linearGradients = newTable[string, LinearGradient]()
proc decodeSvgCtx(inherited: SvgCtx, node: XmlNode): SvgCtx = proc decodeSvgProperties(inherited: SvgProperties, node: XmlNode): SvgProperties =
result = inherited result = inherited
proc splitArgs(s: string): seq[string] = proc splitArgs(s: string): seq[string] =
@ -316,28 +316,28 @@ proc decodeSvgCtx(inherited: SvgCtx, node: XmlNode): SvgCtx =
else: else:
failInvalidTransform(transform) failInvalidTransform(transform)
proc fill(img: Image, ctx: SvgCtx, path: Path) {.inline.} = proc fill(img: Image, props: SvgProperties, path: Path) {.inline.} =
if ctx.display and ctx.opacity > 0: if props.display and props.opacity > 0:
let paint = newPaint(ctx.fill) let paint = newPaint(props.fill)
paint.opacity = paint.opacity * ctx.opacity paint.opacity = paint.opacity * props.opacity
img.fillPath(path, paint, ctx.transform, ctx.fillRule) img.fillPath(path, paint, props.transform, props.fillRule)
proc stroke(img: Image, ctx: SvgCtx, path: Path) {.inline.} = proc stroke(img: Image, props: SvgProperties, path: Path) {.inline.} =
if ctx.display and ctx.opacity > 0: if props.display and props.opacity > 0:
let paint = newPaint(ctx.stroke) let paint = newPaint(props.stroke)
paint.color.a *= (ctx.opacity * ctx.strokeOpacity) paint.color.a *= (props.opacity * props.strokeOpacity)
img.strokePath( img.strokePath(
path, path,
paint, paint,
ctx.transform, props.transform,
ctx.strokeWidth, props.strokeWidth,
ctx.strokeLineCap, props.strokeLineCap,
ctx.strokeLineJoin, props.strokeLineJoin,
miterLimit = ctx.strokeMiterLimit, miterLimit = props.strokeMiterLimit,
dashes = ctx.strokeDashArray dashes = props.strokeDashArray
) )
proc draw(img: Image, node: XmlNode, ctxStack: var seq[SvgCtx]) = proc draw(img: Image, node: XmlNode, propertiesStack: var seq[SvgProperties]) =
if node.kind != xnElement: if node.kind != xnElement:
# Skip <!-- comments --> # Skip <!-- comments -->
return return
@ -351,25 +351,25 @@ proc draw(img: Image, node: XmlNode, ctxStack: var seq[SvgCtx]) =
echo node echo node
of "g": of "g":
let ctx = decodeSvgCtx(ctxStack[^1], node) let props = decodeSvgProperties(propertiesStack[^1], node)
ctxStack.add(ctx) propertiesStack.add(props)
for child in node: for child in node:
img.draw(child, ctxStack) img.draw(child, propertiesStack)
discard ctxStack.pop() discard propertiesStack.pop()
of "path": of "path":
let let
d = node.attr("d") d = node.attr("d")
ctx = decodeSvgCtx(ctxStack[^1], node) props = decodeSvgProperties(propertiesStack[^1], node)
path = parsePath(d) path = parsePath(d)
img.fill(ctx, path) img.fill(props, path)
if ctx.shouldStroke: if props.shouldStroke:
img.stroke(ctx, path) img.stroke(props, path)
of "line": of "line":
let let
ctx = decodeSvgCtx(ctxStack[^1], node) props = decodeSvgProperties(propertiesStack[^1], node)
x1 = parseFloat(node.attrOrDefault("x1", "0")) x1 = parseFloat(node.attrOrDefault("x1", "0"))
y1 = parseFloat(node.attrOrDefault("y1", "0")) y1 = parseFloat(node.attrOrDefault("y1", "0"))
x2 = parseFloat(node.attrOrDefault("x2", "0")) x2 = parseFloat(node.attrOrDefault("x2", "0"))
@ -379,12 +379,12 @@ proc draw(img: Image, node: XmlNode, ctxStack: var seq[SvgCtx]) =
path.moveTo(x1, y1) path.moveTo(x1, y1)
path.lineTo(x2, y2) path.lineTo(x2, y2)
if ctx.shouldStroke: if props.shouldStroke:
img.stroke(ctx, path) img.stroke(props, path)
of "polyline", "polygon": of "polyline", "polygon":
let let
ctx = decodeSvgCtx(ctxStack[^1], node) props = decodeSvgProperties(propertiesStack[^1], node)
points = node.attr("points") points = node.attr("points")
var vecs: seq[Vec2] var vecs: seq[Vec2]
@ -413,14 +413,14 @@ proc draw(img: Image, node: XmlNode, ctxStack: var seq[SvgCtx]) =
# and fill or not # and fill or not
if node.tag == "polygon": if node.tag == "polygon":
path.closePath() path.closePath()
img.fill(ctx, path) img.fill(props, path)
if ctx.shouldStroke: if props.shouldStroke:
img.stroke(ctx, path) img.stroke(props, path)
of "rect": of "rect":
let let
ctx = decodeSvgCtx(ctxStack[^1], node) props = decodeSvgProperties(propertiesStack[^1], node)
x = parseFloat(node.attrOrDefault("x", "0")) x = parseFloat(node.attrOrDefault("x", "0"))
y = parseFloat(node.attrOrDefault("y", "0")) y = parseFloat(node.attrOrDefault("y", "0"))
width = parseFloat(node.attrOrDefault("width", "0")) width = parseFloat(node.attrOrDefault("width", "0"))
@ -454,13 +454,13 @@ proc draw(img: Image, node: XmlNode, ctxStack: var seq[SvgCtx]) =
else: else:
path.rect(x, y, width, height) path.rect(x, y, width, height)
img.fill(ctx, path) img.fill(props, path)
if ctx.shouldStroke: if props.shouldStroke:
img.stroke(ctx, path) img.stroke(props, path)
of "circle", "ellipse": of "circle", "ellipse":
let let
ctx = decodeSvgCtx(ctxStack[^1], node) props = decodeSvgProperties(propertiesStack[^1], node)
cx = parseFloat(node.attrOrDefault("cx", "0")) cx = parseFloat(node.attrOrDefault("cx", "0"))
cy = parseFloat(node.attrOrDefault("cy", "0")) cy = parseFloat(node.attrOrDefault("cy", "0"))
@ -475,16 +475,16 @@ proc draw(img: Image, node: XmlNode, ctxStack: var seq[SvgCtx]) =
let path = newPath() let path = newPath()
path.ellipse(cx, cy, rx, ry) path.ellipse(cx, cy, rx, ry)
img.fill(ctx, path) img.fill(props, path)
if ctx.shouldStroke: if props.shouldStroke:
img.stroke(ctx, path) img.stroke(props, path)
of "radialGradient": of "radialGradient":
discard discard
of "linearGradient": of "linearGradient":
let let
ctx = decodeSvgCtx(ctxStack[^1], node) props = decodeSvgProperties(propertiesStack[^1], node)
id = node.attr("id") id = node.attr("id")
gradientUnits = node.attr("gradientUnits") gradientUnits = node.attr("gradientUnits")
gradientTransform = node.attr("gradientTransform") gradientTransform = node.attr("gradientTransform")
@ -539,7 +539,7 @@ proc draw(img: Image, node: XmlNode, ctxStack: var seq[SvgCtx]) =
else: else:
raise newException(PixieError, "Unexpected SVG tag: " & child.tag) raise newException(PixieError, "Unexpected SVG tag: " & child.tag)
ctx.linearGradients[id] = linearGradient props.linearGradients[id] = linearGradient
else: else:
raise newException(PixieError, "Unsupported SVG tag: " & node.tag) raise newException(PixieError, "Unsupported SVG tag: " & node.tag)
@ -561,12 +561,12 @@ proc decodeSvg*(
viewBoxWidth = parseInt(box[2]) viewBoxWidth = parseInt(box[2])
viewBoxHeight = parseInt(box[3]) viewBoxHeight = parseInt(box[3])
var rootCtx = initSvgCtx() var rootProps = initSvgProperties()
rootCtx = decodeSvgCtx(rootCtx, root) rootProps = decodeSvgProperties(rootProps, root)
if viewBoxMinX != 0 or viewBoxMinY != 0: if viewBoxMinX != 0 or viewBoxMinY != 0:
let viewBoxMin = vec2(-viewBoxMinX.float32, -viewBoxMinY.float32) let viewBoxMin = vec2(-viewBoxMinX.float32, -viewBoxMinY.float32)
rootCtx.transform = rootCtx.transform * translate(viewBoxMin) rootprops.transform = rootprops.transform * translate(viewBoxMin)
if width == 0 and height == 0: # Default to the view box size if width == 0 and height == 0: # Default to the view box size
result = newImage(viewBoxWidth, viewBoxHeight) result = newImage(viewBoxWidth, viewBoxHeight)
@ -576,11 +576,11 @@ proc decodeSvg*(
let let
scaleX = width.float32 / viewBoxWidth.float32 scaleX = width.float32 / viewBoxWidth.float32
scaleY = height.float32 / viewBoxHeight.float32 scaleY = height.float32 / viewBoxHeight.float32
rootCtx.transform = rootCtx.transform * scale(vec2(scaleX, scaleY)) rootprops.transform = rootprops.transform * scale(vec2(scaleX, scaleY))
var ctxStack = @[rootCtx] var propertiesStack = @[rootProps]
for node in root.items: for node in root.items:
result.draw(node, ctxStack) result.draw(node, propertiesStack)
except PixieError as e: except PixieError as e:
raise e raise e
except: except: