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

4.0.2 check valid polygon

Browse source
This commit is contained in:
Ryan Oldenburg 2022-03-13 15:39:50 -05:00
parent e17d9f2a43
commit efba29578e
4 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pixie.nimble
View file

@ -1,4 +1,4 @@
version = "4.0.1" version = "4.0.2"
author = "Andre von Houck and Ryan Oldenburg" author = "Andre von Houck and Ryan Oldenburg"
description = "Full-featured 2d graphics library for Nim." description = "Full-featured 2d graphics library for Nim."
license = "MIT" license = "MIT"

4
src/pixie/contexts.nim
View file

@ -669,13 +669,13 @@ proc circle*(ctx: Context, circle: Circle) {.inline, raises: [].} =
proc polygon*( proc polygon*(
ctx: Context, x, y, size: float32, sides: int ctx: Context, x, y, size: float32, sides: int
) {.inline, raises: [].} = ) {.inline, raises: [PixieError].} =
## Adds an n-sided regular polygon at (x, y) of size to the current path. ## Adds an n-sided regular polygon at (x, y) of size to the current path.
ctx.path.polygon(x, y, size, sides) ctx.path.polygon(x, y, size, sides)
proc polygon*( proc polygon*(
ctx: Context, pos: Vec2, size: float32, sides: int ctx: Context, pos: Vec2, size: float32, sides: int
) {.inline, raises: [].} = ) {.inline, raises: [PixieError].} =
## Adds an n-sided regular polygon at (x, y) of size to the current path. ## Adds an n-sided regular polygon at (x, y) of size to the current path.
ctx.path.polygon(pos, size, sides) ctx.path.polygon(pos, size, sides)

8
src/pixie/paths.nim
View file

@ -628,8 +628,12 @@ proc circle*(path: Path, circle: Circle) {.inline, raises: [].} =
## Adds a circle. ## Adds a circle.
path.ellipse(circle.pos.x, circle.pos.y, circle.radius, circle.radius) path.ellipse(circle.pos.x, circle.pos.y, circle.radius, circle.radius)
proc polygon*(path: Path, x, y, size: float32, sides: int) {.raises: [].} = proc polygon*(
path: Path, x, y, size: float32, sides: int
) {.raises: [PixieError].} =
## Adds an n-sided regular polygon at (x, y) with the parameter size. ## Adds an n-sided regular polygon at (x, y) with the parameter size.
if sides <= 0:
raise newException(PixieError, "Invalid polygon sides value")
path.moveTo(x + size * cos(0.0), y + size * sin(0.0)) path.moveTo(x + size * cos(0.0), y + size * sin(0.0))
for side in 0 .. sides: for side in 0 .. sides:
path.lineTo( path.lineTo(
@ -639,7 +643,7 @@ proc polygon*(path: Path, x, y, size: float32, sides: int) {.raises: [].} =
proc polygon*( proc polygon*(
path: Path, pos: Vec2, size: float32, sides: int path: Path, pos: Vec2, size: float32, sides: int
) {.inline, raises: [].} = ) {.inline, raises: [PixieError].} =
## Adds a n-sided regular polygon at (x, y) with the parameter size. ## Adds a n-sided regular polygon at (x, y) with the parameter size.
path.polygon(pos.x, pos.y, size, sides) path.polygon(pos.x, pos.y, size, sides)

10
tests/test_paths.nim
View file

@ -665,3 +665,13 @@ block:
color = rgba(255, 0, 0, 255) color = rgba(255, 0, 0, 255)
image.fillPath(pathStr, color) image.fillPath(pathStr, color)
image.writeFile("tests/paths/path0pxCover.png") image.writeFile("tests/paths/path0pxCover.png")
block:
let image = newImage(200, 200)
image.fill(rgba(255, 255, 255, 255))
let ctx = newContext(image)
ctx.setLineDash(@[2.0.float32])
doAssertRaises PixieError:
ctx.strokePolygon(vec2(0.0, 0.0), 0.0, 0)