From a8518c8218c57ef33d15bc8dfc176560a0a1f7f8 Mon Sep 17 00:00:00 2001
From: Ryan Oldenburg <ryan@guzba.com>
Date: Tue, 23 Nov 2021 03:15:58 -0600
Subject: [PATCH 1/4] save work if no shadow offset
---
src/pixie/images.nim | 12 +++++++++---
tests/benchmark_images_draw.nim | 19 ++++++++++++++++++-
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/pixie/images.nim b/src/pixie/images.nim
index 1b2919f..60977a2 100644
--- a/src/pixie/images.nim
+++ b/src/pixie/images.nim
@@ -976,12 +976,18 @@ proc shadow*(
image: Image, offset: Vec2, spread, blur: float32, color: SomeColor
): Image {.raises: [PixieError].} =
## Create a shadow of the image with the offset, spread and blur.
- let
- mask = image.newMask()
+ let mask = image.newMask()
+
+ var shifted: Mask
+ if offset == vec2(0, 0):
+ shifted = mask
+ else:
shifted = newMask(mask.width, mask.height)
- shifted.draw(mask, translate(offset), bmOverwrite)
+ shifted.draw(mask, translate(offset), bmOverwrite)
+
shifted.spread(spread)
shifted.blur(blur)
+
result = newImage(shifted.width, shifted.height)
result.fill(color)
result.draw(shifted, blendMode = bmMask)
diff --git a/tests/benchmark_images_draw.nim b/tests/benchmark_images_draw.nim
index 34930be..3083c05 100644
--- a/tests/benchmark_images_draw.nim
+++ b/tests/benchmark_images_draw.nim
@@ -115,7 +115,7 @@ block:
a = newImage(100, 100)
b = newImage(50, 50)
- timeIt "shadow":
+ timeIt "shadow (no offset)":
b.fill(rgba(0, 0, 0, 255))
a.draw(b, translate(vec2(25, 25)))
@@ -126,3 +126,20 @@ block:
color = rgba(0, 0, 0, 255)
)
keep(shadow)
+
+block:
+ let
+ a = newImage(100, 100)
+ b = newImage(50, 50)
+
+ timeIt "shadow (with offset)":
+ b.fill(rgba(0, 0, 0, 255))
+ a.draw(b, translate(vec2(25, 25)))
+
+ let shadow = a.shadow(
+ offset = vec2(10, 10),
+ spread = 10,
+ blur = 10,
+ color = rgba(0, 0, 0, 255)
+ )
+ keep(shadow)
From ebac3e1f24b8e4deb4521e42b0237806f4a54e39 Mon Sep 17 00:00:00 2001
From: Ryan Oldenburg <ryan@guzba.com>
Date: Tue, 23 Nov 2021 03:32:11 -0600
Subject: [PATCH 2/4] small things
---
src/pixie/paints.nim | 40 ++++++++++++++++++----------------------
1 file changed, 18 insertions(+), 22 deletions(-)
diff --git a/src/pixie/paints.nim b/src/pixie/paints.nim
index 9b6ee64..48407e4 100644
--- a/src/pixie/paints.nim
+++ b/src/pixie/paints.nim
@@ -45,9 +45,7 @@ proc newPaint*(paint: Paint): Paint {.raises: [].} =
result.gradientHandlePositions = paint.gradientHandlePositions
result.gradientStops = paint.gradientStops
-converter parseSomePaint*(
- paint: SomePaint
-): Paint {.inline.} =
+converter parseSomePaint*(paint: SomePaint): Paint {.inline.} =
## Given SomePaint, parse it in different ways.
when type(paint) is string:
result = newPaint(pkSolid)
@@ -67,19 +65,10 @@ converter parseSomePaint*(
proc colorStop*(color: Color, position: float32): ColorStop =
ColorStop(color: color, position: position)
-proc toLineSpace(at, to, point: Vec2): float32 {.inline.} =
- ## Convert position on to where it would fall on a line between at and to.
- let
- d = to - at
- det = d.x * d.x + d.y * d.y
- (d.y * (point.y - at.y) + d.x * (point.x - at.x)) / det
-
-proc gradientPut(
- image: Image, paint: Paint, x, y: int, t: float32, stops: seq[ColorStop]
-) =
+proc gradientPut(image: Image, paint: Paint, x, y: int, t: float32) =
## Put an gradient color based on `t` - where are we related to a line.
var index = -1
- for i, stop in stops:
+ for i, stop in paint.gradientStops:
if stop.position < t:
index = i
if stop.position > t:
@@ -87,14 +76,14 @@ proc gradientPut(
var color: Color
if index == -1:
# first stop solid
- color = stops[0].color
- elif index + 1 >= stops.len:
+ color = paint.gradientStops[0].color
+ elif index + 1 >= paint.gradientStops.len:
# last stop solid
- color = stops[index].color
+ color = paint.gradientStops[index].color
else:
let
- gs1 = stops[index]
- gs2 = stops[index + 1]
+ gs1 = paint.gradientStops[index]
+ gs2 = paint.gradientStops[index + 1]
color = mix(
gs1.color,
gs2.color,
@@ -115,6 +104,13 @@ proc fillGradientLinear(image: Image, paint: Paint) =
if paint.opacity == 0:
return
+ proc toLineSpace(at, to, point: Vec2): float32 {.inline.} =
+ ## Convert position on to where it would fall on a line between at and to.
+ let
+ d = to - at
+ det = d.x * d.x + d.y * d.y
+ (d.y * (point.y - at.y) + d.x * (point.x - at.x)) / det
+
let
at = paint.gradientHandlePositions[0]
to = paint.gradientHandlePositions[1]
@@ -123,7 +119,7 @@ proc fillGradientLinear(image: Image, paint: Paint) =
let
xy = vec2(x.float32, y.float32)
t = toLineSpace(at, to, xy)
- image.gradientPut(paint, x, y, t, paint.gradientStops)
+ image.gradientPut(paint, x, y, t)
proc fillGradientRadial(image: Image, paint: Paint) =
## Fills a radial gradient.
@@ -154,7 +150,7 @@ proc fillGradientRadial(image: Image, paint: Paint) =
let
xy = vec2(x.float32, y.float32)
t = (mat * xy).length()
- image.gradientPut(paint, x, y, t, paint.gradientStops)
+ image.gradientPut(paint, x, y, t)
proc fillGradientAngular(image: Image, paint: Paint) =
## Fills an angular gradient.
@@ -179,7 +175,7 @@ proc fillGradientAngular(image: Image, paint: Paint) =
xy = vec2(x.float32, y.float32)
angle = normalize(xy - center).angle()
t = (angle + gradientAngle + PI / 2).fixAngle() / 2 / PI + 0.5
- image.gradientPut(paint, x, y, t, paint.gradientStops)
+ image.gradientPut(paint, x, y, t)
proc fillGradient*(image: Image, paint: Paint) {.raises: [PixieError].} =
## Fills with the Paint gradient.
From edaaeff2e3e5ac50e00abe9a4c7da79b796535b2 Mon Sep 17 00:00:00 2001
From: Ryan Oldenburg <ryan@guzba.com>
Date: Tue, 23 Nov 2021 04:14:03 -0600
Subject: [PATCH 3/4] faster horiz and vert gradients
---
src/pixie/paints.nim | 65 +++++++++++++++++++++++++++-----
tests/benchmark_paints.nim | 27 +++++++++++++
tests/paths/gradientLinear2.png | Bin 0 -> 1990 bytes
tests/test_paints.nim | 15 ++++++++
4 files changed, 98 insertions(+), 9 deletions(-)
create mode 100644 tests/benchmark_paints.nim
create mode 100644 tests/paths/gradientLinear2.png
diff --git a/src/pixie/paints.nim b/src/pixie/paints.nim
index 48407e4..c619299 100644
--- a/src/pixie/paints.nim
+++ b/src/pixie/paints.nim
@@ -1,5 +1,8 @@
import blends, chroma, common, images, vmath
+when defined(amd64) and not defined(pixieNoSimd):
+ import nimsimd/sse2
+
type
PaintKind* = enum
pkSolid
@@ -65,8 +68,8 @@ converter parseSomePaint*(paint: SomePaint): Paint {.inline.} =
proc colorStop*(color: Color, position: float32): ColorStop =
ColorStop(color: color, position: position)
-proc gradientPut(image: Image, paint: Paint, x, y: int, t: float32) =
- ## Put an gradient color based on `t` - where are we related to a line.
+proc gradientColor(paint: Paint, t: float32): ColorRGBX =
+ ## Get the gradient color based on `t` - where are we related to a line.
var index = -1
for i, stop in paint.gradientStops:
if stop.position < t:
@@ -90,7 +93,7 @@ proc gradientPut(image: Image, paint: Paint, x, y: int, t: float32) =
(t - gs1.position) / (gs2.position - gs1.position)
)
color.a *= paint.opacity
- image.setRgbaUnsafe(x, y, color.rgbx())
+ color.rgbx()
proc fillGradientLinear(image: Image, paint: Paint) =
## Fills a linear gradient.
@@ -114,12 +117,56 @@ proc fillGradientLinear(image: Image, paint: Paint) =
let
at = paint.gradientHandlePositions[0]
to = paint.gradientHandlePositions[1]
- for y in 0 ..< image.height:
- for x in 0 ..< image.width:
+
+ if at.y == to.y: # Horizontal gradient
+ var x: int
+ while x < image.width:
+ when defined(amd64) and not defined(pixieNoSimd):
+ if x + 4 <= image.width:
+ var colors: array[4, ColorRGBX]
+ for i in 0 ..< 4:
+ let
+ xy = vec2((x + i).float32, 0.float32)
+ t = toLineSpace(at, to, xy)
+ rgbx = paint.gradientColor(t)
+ colors[i] = rgbx
+
+ let colorVec = cast[M128i](colors)
+ for y in 0 ..< image.height:
+ mm_storeu_si128(image.data[image.dataIndex(x, y)].addr, colorVec)
+ x += 4
+ continue
+
let
- xy = vec2(x.float32, y.float32)
+ xy = vec2(x.float32, 0.float32)
t = toLineSpace(at, to, xy)
- image.gradientPut(paint, x, y, t)
+ rgbx = paint.gradientColor(t)
+ for y in 0 ..< image.height:
+ image.setRgbaUnsafe(x, y, rgbx)
+ inc x
+
+ elif at.x == to.x: # Vertical gradient
+ for y in 0 ..< image.height:
+ let
+ xy = vec2(0.float32, y.float32)
+ t = toLineSpace(at, to, xy)
+ rgbx = paint.gradientColor(t)
+ var x: int
+ when defined(amd64) and not defined(pixieNoSimd):
+ let colorVec = mm_set1_epi32(cast[int32](rgbx))
+ for _ in 0 ..< image.width div 4:
+ mm_storeu_si128(image.data[image.dataIndex(x, y)].addr, colorVec)
+ x += 4
+ for x in x ..< image.width:
+ image.setRgbaUnsafe(x, y, rgbx)
+
+ else:
+ for y in 0 ..< image.height:
+ for x in 0 ..< image.width:
+ let
+ xy = vec2(x.float32, y.float32)
+ t = toLineSpace(at, to, xy)
+ image.setRgbaUnsafe(x, y, paint.gradientColor(t))
proc fillGradientRadial(image: Image, paint: Paint) =
## Fills a radial gradient.
@@ -150,7 +197,7 @@ proc fillGradientRadial(image: Image, paint: Paint) =
let
xy = vec2(x.float32, y.float32)
t = (mat * xy).length()
- image.gradientPut(paint, x, y, t)
+ image.setRgbaUnsafe(x, y, paint.gradientColor(t))
proc fillGradientAngular(image: Image, paint: Paint) =
## Fills an angular gradient.
@@ -175,7 +222,7 @@ proc fillGradientAngular(image: Image, paint: Paint) =
xy = vec2(x.float32, y.float32)
angle = normalize(xy - center).angle()
t = (angle + gradientAngle + PI / 2).fixAngle() / 2 / PI + 0.5
- image.gradientPut(paint, x, y, t)
+ image.setRgbaUnsafe(x, y, paint.gradientColor(t))
proc fillGradient*(image: Image, paint: Paint) {.raises: [PixieError].} =
## Fills with the Paint gradient.
diff --git a/tests/benchmark_paints.nim b/tests/benchmark_paints.nim
new file mode 100644
index 0000000..f07da26
--- /dev/null
+++ b/tests/benchmark_paints.nim
@@ -0,0 +1,27 @@
+import benchy, pixie
+
+let image = newImage(1000, 1000)
+
+timeIt "GradientLinear vertical":
+ let paint = newPaint(pkGradientLinear)
+ paint.gradientHandlePositions = @[
+ vec2(50, 0),
+ vec2(50, 1000),
+ ]
+ paint.gradientStops = @[
+ ColorStop(color: color(1, 0, 0, 1), position: 0),
+ ColorStop(color: color(1, 0, 0, 0.15625), position: 1.0),
+ ]
+ image.fillGradient(paint)
+
+timeIt "GradientLinear horizontal":
+ let paint = newPaint(pkGradientLinear)
+ paint.gradientHandlePositions = @[
+ vec2(0, 50),
+ vec2(1000, 50),
+ ]
+ paint.gradientStops = @[
+ ColorStop(color: color(1, 0, 0, 1), position: 0),
+ ColorStop(color: color(1, 0, 0, 0.15625), position: 1.0),
+ ]
+ image.fillGradient(paint)
diff --git a/tests/paths/gradientLinear2.png b/tests/paths/gradientLinear2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7acc3f84020f53b694c8fc2d95bf9ebb8e168711
GIT binary patch
literal 1990
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
Y7h2oMc9`8a-2eap07*qoM6N<$g3H*cmjD0&
literal 0
HcmV?d00001
diff --git a/tests/test_paints.nim b/tests/test_paints.nim
index 8761dbf..f206a08 100644
--- a/tests/test_paints.nim
+++ b/tests/test_paints.nim
@@ -69,6 +69,21 @@ block:
image.fillPath(heartShape, paint)
image.writeFile("tests/paths/gradientLinear.png")
+block:
+ let paint = newPaint(pkGradientLinear)
+ paint.gradientHandlePositions = @[
+ vec2(50, 0),
+ vec2(50, 100),
+ ]
+ paint.gradientStops = @[
+ ColorStop(color: color(1, 0, 0, 1), position: 0),
+ ColorStop(color: color(1, 0, 0, 0.15625), position: 1.0),
+ ]
+
+ let image = newImage(100, 100)
+ image.fillPath(heartShape, paint)
+ image.writeFile("tests/paths/gradientLinear2.png")
+
block:
let paint = newPaint(pkGradientRadial)
paint.gradientHandlePositions = @[
From c9d792823df34f35141931af08348497e8acf596 Mon Sep 17 00:00:00 2001
From: Ryan Oldenburg <ryan@guzba.com>
Date: Tue, 23 Nov 2021 04:38:37 -0600
Subject: [PATCH 4/4] ensure float32
---
src/pixie/paints.nim | 3 ++-
tests/benchmark_paints.nim | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/pixie/paints.nim b/src/pixie/paints.nim
index c619299..9b9bbaa 100644
--- a/src/pixie/paints.nim
+++ b/src/pixie/paints.nim
@@ -214,6 +214,7 @@ proc fillGradientAngular(image: Image, paint: Paint) =
let
center = paint.gradientHandlePositions[0]
edge = paint.gradientHandlePositions[1]
+ f32PI = PI.float32
# TODO: make edge between start and end anti-aliased.
let gradientAngle = normalize(edge - center).angle().fixAngle()
for y in 0 ..< image.height:
@@ -221,7 +222,7 @@ proc fillGradientAngular(image: Image, paint: Paint) =
let
xy = vec2(x.float32, y.float32)
angle = normalize(xy - center).angle()
- t = (angle + gradientAngle + PI / 2).fixAngle() / 2 / PI + 0.5
+ t = (angle + gradientAngle + f32PI / 2).fixAngle() / 2 / f32PI + 0.5.float32
image.setRgbaUnsafe(x, y, paint.gradientColor(t))
proc fillGradient*(image: Image, paint: Paint) {.raises: [PixieError].} =
diff --git a/tests/benchmark_paints.nim b/tests/benchmark_paints.nim
index f07da26..24e7d93 100644
--- a/tests/benchmark_paints.nim
+++ b/tests/benchmark_paints.nim
@@ -25,3 +25,19 @@ timeIt "GradientLinear horizontal":
ColorStop(color: color(1, 0, 0, 0.15625), position: 1.0),
]
image.fillGradient(paint)
+
+# timeIt "GradientLinear radial":
+# discard
+
+timeIt "GradientLinear angular":
+ let paint = newPaint(pkGradientAngular)
+ paint.gradientHandlePositions = @[
+ vec2(500, 500),
+ vec2(1000, 500),
+ vec2(500, 1000)
+ ]
+ paint.gradientStops = @[
+ ColorStop(color: color(1, 0, 0, 1), position: 0),
+ ColorStop(color: color(1, 0, 0, 0.15625), position: 1.0),
+ ]
+ image.fillGradient(paint)