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

move proc, more tests

Browse source
This commit is contained in:
Ryan Oldenburg 2021-02-24 22:19:09 -06:00
parent 6e7a08538d
commit 3d3dc58bce
2 changed files with 62 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/pixie/paths.nim
View file

@ -1273,41 +1273,41 @@ proc strokeShapes(
@[a, b, c, d, a]
proc makeJoin(prevPos, pos, nextPos: Vec2): seq[Vec2] =
let angle = fixAngle(angle(nextPos - pos) - angle(prevPos - pos))
if abs(abs(angle) - PI) > epsilon:
var
a = (pos - prevPos).normalize() * halfStroke
b = (pos - nextPos).normalize() * halfStroke
if angle >= 0:
a = vec2(-a.y, a.x)
b = vec2(b.y, -b.x)
else:
a = vec2(a.y, -a.x)
b = vec2(-b.y, b.x)
var lineJoin = lineJoin
if lineJoin == ljMiter and abs(angle) < miterAngleLimit:
lineJoin = ljBevel
case lineJoin:
of ljMiter:
let
la = line(prevPos + a, pos + a)
lb = line(nextPos + b, pos + b)
var at: Vec2
if la.intersects(lb, at):
return @[pos + a, at, pos + b, pos, pos + a]
of ljBevel:
return @[a + pos, b + pos, pos, a + pos]
of ljRound:
return makeCircle(prevPos)
for shape in shapes:
var shapeStroke: seq[seq[Vec2]]
proc makeJoin(prevPos, pos, nextPos: Vec2): seq[Vec2] =
let angle = fixAngle(-angle(prevPos - pos) - -angle(nextPos - pos))
if abs(abs(angle) - PI) > epsilon:
var
a = (pos - prevPos).normalize() * halfStroke
b = (pos - nextPos).normalize() * halfStroke
if angle >= 0:
a = vec2(-a.y, a.x)
b = vec2(b.y, -b.x)
else:
a = vec2(a.y, -a.x)
b = vec2(-b.y, b.x)
var lineJoin = lineJoin
if lineJoin == ljMiter and abs(angle) < miterAngleLimit:
lineJoin = ljBevel
case lineJoin:
of ljMiter:
let
la = line(prevPos + a, pos + a)
lb = line(nextPos + b, pos + b)
var at: Vec2
if la.intersects(lb, at):
return @[pos + a, at, pos + b, pos, pos + a]
of ljBevel:
return @[a + pos, b + pos, pos, a + pos]
of ljRound:
return makeCircle(prevPos)
if shape[0] != shape[^1]:
# This shape does not end at the same point it starts so draw the
# first line cap.

30
tests/test_paths.nim
View file

@ -268,3 +268,33 @@ block:
image.strokePath(path, rgba(0, 0, 0, 255), vec2(10, 10), 10, lcSquare, ljBevel)
image.writeFile("tests/images/paths/lcSquare.png")
# Potential error cases, ensure they do not crash
block:
let
image = newImage(60, 60)
path = parsePath("M 3 3 L 3 3 L 3 3")
image.fill(rgba(255, 255, 255, 255))
image.strokePath(path, rgba(0, 0, 0, 255), vec2(10, 10), 10, lcSquare, ljMiter)
block:
let
image = newImage(60, 60)
path = parsePath("L 0 0 L 0 0")
image.fill(rgba(255, 255, 255, 255))
image.strokePath(path, rgba(0, 0, 0, 255), vec2(10, 10), 10, lcSquare, ljMiter)
block:
let
image = newImage(60, 60)
path = parsePath("L 1 1")
image.fill(rgba(255, 255, 255, 255))
image.strokePath(path, rgba(0, 0, 0, 255), vec2(10, 10), 10, lcSquare, ljMiter)
block:
let
image = newImage(60, 60)
path = parsePath("L 0 0")
image.fill(rgba(255, 255, 255, 255))
image.strokePath(path, rgba(0, 0, 0, 255), vec2(10, 10), 10, lcSquare, ljMiter)