Skip to content

simpler source position when not rotated or scaled #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
treeform merged 1 commit into from
Dec 17, 2021
Merged

simpler source position when not rotated or scaled #350

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 14 additions & 28 deletions src/pixie/images.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ proc drawUber(
filterBy2 *= 2

let
hasRotation = not(dx == vec2(1, 0) and dy == vec2(0, 1))
hasRotationOrScaling = not(dx == vec2(1, 0) and dy == vec2(0, 1))
smooth = not(
dx.length == 1.0 and
dy.length == 1.0 and
Expand Down Expand Up @@ -740,7 +740,7 @@ proc drawUber(
xMax = max(xMax, at.x)

var xStart, xStop: int
if hasRotation or smooth:
if hasRotationOrScaling or smooth:
xStart = xMin.floor.int
xStop = xMax.ceil.int
else:
Expand Down Expand Up @@ -786,14 +786,15 @@ proc drawUber(

else:
var x = xStart
if not hasRotation:
if not hasRotationOrScaling:
let
srcPos = p + dx * x.float32 + dy * y.float32
sy = srcPos.y.int
var sx = srcPos.x.int

when type(a) is Image and type(b) is Image:
if blendMode in {bmNormal, bmOverwrite} and
isOpaque(b.data, b.dataIndex(xStart, y), xStop - xStart):
let
srcPos = p + dx * x.float32 + dy * y.float32
sx = srcPos.x.int
sy = srcPos.y.int
copyMem(
a.data[a.dataIndex(x, y)].addr,
b.data[b.dataIndex(sx, sy)].addr,
Expand All @@ -805,10 +806,6 @@ proc drawUber(
case blendMode:
of bmOverwrite:
for _ in 0 ..< (xStop - xStart) div 16:
let
srcPos = p + dx * x.float32 + dy * y.float32
sx = srcPos.x.int
sy = srcPos.y.int
when type(a) is Image:
when type(b) is Image:
for q in [0, 4, 8, 12]:
Expand All @@ -833,13 +830,10 @@ proc drawUber(
let sourceVec = mm_loadu_si128(b.data[b.dataIndex(sx, sy)].addr)
mm_storeu_si128(a.data[a.dataIndex(x, y)].addr, sourceVec)
x += 16
sx += 16
of bmNormal:
let vec255 = mm_set1_epi32(cast[int32](uint32.high))
for _ in 0 ..< (xStop - xStart) div 16:
let
srcPos = p + dx * x.float32 + dy * y.float32
sx = srcPos.x.int
sy = srcPos.y.int
when type(a) is Image:
when type(b) is Image:
for q in [0, 4, 8, 12]:
Expand Down Expand Up @@ -884,13 +878,10 @@ proc drawUber(
maskNormalInlineSimd(backdropVec, sourceVec)
)
x += 16
sx += 16
of bmMask:
let vec255 = mm_set1_epi32(cast[int32](uint32.high))
for _ in 0 ..< (xStop - xStart) div 16:
let
srcPos = p + dx * x.float32 + dy * y.float32
sx = srcPos.x.int
sy = srcPos.y.int
when type(a) is Image:
when type(b) is Image:
for q in [0, 4, 8, 12]:
Expand Down Expand Up @@ -933,15 +924,12 @@ proc drawUber(
maskMaskInlineSimd(backdropVec, sourceVec)
)
x += 16
sx += 16
else:
when type(a) is Image:
if blendMode.hasSimdBlender():
let blenderSimd = blendMode.blenderSimd()
for _ in 0 ..< (xStop - xStart) div 16:
let
srcPos = p + dx * x.float32 + dy * y.float32
sx = srcPos.x.int
sy = srcPos.y.int
when type(b) is Image:
for q in [0, 4, 8, 12]:
let
Expand All @@ -964,15 +952,12 @@ proc drawUber(
# Shuffle 32 bits off for the next iteration
values = mm_srli_si128(values, 4)
x += 16
sx += 16
else: # is a Mask
if blendMode.hasSimdMasker():
let maskerSimd = blendMode.maskerSimd()
for _ in 0 ..< (xStop - xStart) div 16:
let
srcPos = p + dx * x.float32 + dy * y.float32
sx = srcPos.x.int
sy = srcPos.y.int
backdrop = mm_loadu_si128(a.data[a.dataIndex(x, y)].addr)
let backdrop = mm_loadu_si128(a.data[a.dataIndex(x, y)].addr)
when type(b) is Image:
# Need to read 16 colors and pack their alpha values
let
Expand All @@ -989,6 +974,7 @@ proc drawUber(
maskerSimd(backdrop, source)
)
x += 16
sx += 16

var srcPos = p + dx * x.float32 + dy * y.float32
srcPos = vec2(
Expand Down