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

p instead

Browse source
This commit is contained in:
Ryan Oldenburg 2020-12-05 22:14:33 -06:00
parent ccb92fb46a
commit dd1bb58538
1 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
src/pixie/images.nim
View file

@ -380,15 +380,15 @@ proc drawCorrect*(a, b: Image, mat: Mat3, blendMode: BlendMode) =
matInv = mat.inverse() matInv = mat.inverse()
# compute movement vectors # compute movement vectors
h = 0.5.float32 h = 0.5.float32
start = matInv * vec2(0 + h, 0 + h) p = matInv * vec2(0 + h, 0 + h)
dx = matInv * vec2(1 + h, 0 + h) - start dx = matInv * vec2(1 + h, 0 + h) - p
dy = matInv * vec2(0 + h, 1 + h) - start dy = matInv * vec2(0 + h, 1 + h) - p
minFilterBy2 = max(dx.length, dy.length) minFilterBy2 = max(dx.length, dy.length)
b = b b = b
while minFilterBy2 > 2.0: while minFilterBy2 > 2.0:
b = b.minifyBy2() b = b.minifyBy2()
start /= 2 p /= 2
dx /= 2 dx /= 2
dy /= 2 dy /= 2
minFilterBy2 /= 2 minFilterBy2 /= 2
@ -406,10 +406,10 @@ const h = 0.5.float32
proc drawUber( proc drawUber(
a, b: Image, a, b: Image,
start, dx, dy: Vec2, p, dx, dy: Vec2,
lines: array[0..3, Segment], lines: array[0..3, Segment],
blendMode: static[BlendMode], blendMode: static[BlendMode],
smooth: static[bool] = false smooth: static[bool]
) = ) =
for y in 0 ..< a.height: for y in 0 ..< a.height:
var var
@ -440,7 +440,7 @@ proc drawUber(
zeroMem(a.getAddr(0, y), 4 * xMin) zeroMem(a.getAddr(0, y), 4 * xMin)
for x in xMin ..< xMax: for x in xMin ..< xMax:
let srcPos = start + dx * float32(x) + dy * float32(y) let srcPos = p + dx * float32(x) + dy * float32(y)
let let
xFloat = srcPos.x - h xFloat = srcPos.x - h
yFloat = srcPos.y - h yFloat = srcPos.y - h
@ -477,15 +477,15 @@ proc draw*(a, b: Image, mat: Mat3, blendMode: BlendMode) =
var var
matInv = mat.inverse() matInv = mat.inverse()
# compute movement vectors # compute movement vectors
start = matInv * vec2(0 + h, 0 + h) p = matInv * vec2(0 + h, 0 + h)
dx = matInv * vec2(1 + h, 0 + h) - start dx = matInv * vec2(1 + h, 0 + h) - p
dy = matInv * vec2(0 + h, 1 + h) - start dy = matInv * vec2(0 + h, 1 + h) - p
minFilterBy2 = max(dx.length, dy.length) minFilterBy2 = max(dx.length, dy.length)
b = b b = b
while minFilterBy2 > 2.0: while minFilterBy2 > 2.0:
b = b.minifyBy2() b = b.minifyBy2()
start /= 2 p /= 2
dx /= 2 dx /= 2
dy /= 2 dy /= 2
minFilterBy2 /= 2 minFilterBy2 /= 2
@ -496,54 +496,54 @@ proc draw*(a, b: Image, mat: Mat3, blendMode: BlendMode) =
if not smooth: if not smooth:
case blendMode case blendMode
of bmNormal: a.drawUber(b, start, dx, dy, lines, bmNormal) of bmNormal: a.drawUber(b, p, dx, dy, lines, bmNormal, false)
of bmDarken: a.drawUber(b, start, dx, dy, lines, bmDarken) of bmDarken: a.drawUber(b, p, dx, dy, lines, bmDarken, false)
of bmMultiply: a.drawUber(b, start, dx, dy, lines, bmMultiply) of bmMultiply: a.drawUber(b, p, dx, dy, lines, bmMultiply, false)
of bmLinearBurn: a.drawUber(b, start, dx, dy, lines, bmLinearBurn) of bmLinearBurn: a.drawUber(b, p, dx, dy, lines, bmLinearBurn, false)
of bmColorBurn: a.drawUber(b, start, dx, dy, lines, bmColorBurn) of bmColorBurn: a.drawUber(b, p, dx, dy, lines, bmColorBurn, false)
of bmLighten: a.drawUber(b, start, dx, dy, lines, bmLighten) of bmLighten: a.drawUber(b, p, dx, dy, lines, bmLighten, false)
of bmScreen: a.drawUber(b, start, dx, dy, lines, bmScreen) of bmScreen: a.drawUber(b, p, dx, dy, lines, bmScreen, false)
of bmLinearDodge: a.drawUber(b, start, dx, dy, lines, bmLinearDodge) of bmLinearDodge: a.drawUber(b, p, dx, dy, lines, bmLinearDodge, false)
of bmColorDodge: a.drawUber(b, start, dx, dy, lines, bmColorDodge) of bmColorDodge: a.drawUber(b, p, dx, dy, lines, bmColorDodge, false)
of bmOverlay: a.drawUber(b, start, dx, dy, lines, bmOverlay) of bmOverlay: a.drawUber(b, p, dx, dy, lines, bmOverlay, false)
of bmSoftLight: a.drawUber(b, start, dx, dy, lines, bmSoftLight) of bmSoftLight: a.drawUber(b, p, dx, dy, lines, bmSoftLight, false)
of bmHardLight: a.drawUber(b, start, dx, dy, lines, bmHardLight) of bmHardLight: a.drawUber(b, p, dx, dy, lines, bmHardLight, false)
of bmDifference: a.drawUber(b, start, dx, dy, lines, bmDifference) of bmDifference: a.drawUber(b, p, dx, dy, lines, bmDifference, false)
of bmExclusion: a.drawUber(b, start, dx, dy, lines, bmExclusion) of bmExclusion: a.drawUber(b, p, dx, dy, lines, bmExclusion, false)
of bmHue: a.drawUber(b, start, dx, dy, lines, bmHue) of bmHue: a.drawUber(b, p, dx, dy, lines, bmHue, false)
of bmSaturation: a.drawUber(b, start, dx, dy, lines, bmSaturation) of bmSaturation: a.drawUber(b, p, dx, dy, lines, bmSaturation, false)
of bmColor: a.drawUber(b, start, dx, dy, lines, bmColor) of bmColor: a.drawUber(b, p, dx, dy, lines, bmColor, false)
of bmLuminosity: a.drawUber(b, start, dx, dy, lines, bmLuminosity) of bmLuminosity: a.drawUber(b, p, dx, dy, lines, bmLuminosity, false)
of bmMask: a.drawUber(b, start, dx, dy, lines, bmMask) of bmMask: a.drawUber(b, p, dx, dy, lines, bmMask, false)
of bmOverwrite: a.drawUber(b, start, dx, dy, lines, bmOverwrite) of bmOverwrite: a.drawUber(b, p, dx, dy, lines, bmOverwrite, false)
of bmSubtractMask: a.drawUber(b, start, dx, dy, lines, bmSubtractMask) of bmSubtractMask: a.drawUber(b, p, dx, dy, lines, bmSubtractMask, false)
of bmIntersectMask: a.drawUber(b, start, dx, dy, lines, bmIntersectMask) of bmIntersectMask: a.drawUber(b, p, dx, dy, lines, bmIntersectMask, false)
of bmExcludeMask: a.drawUber(b, start, dx, dy, lines, bmExcludeMask) of bmExcludeMask: a.drawUber(b, p, dx, dy, lines, bmExcludeMask, false)
else: else:
case blendMode case blendMode
of bmNormal: a.drawUber(b, start, dx, dy, lines, bmNormal, true) of bmNormal: a.drawUber(b, p, dx, dy, lines, bmNormal, true)
of bmDarken: a.drawUber(b, start, dx, dy, lines, bmDarken, true) of bmDarken: a.drawUber(b, p, dx, dy, lines, bmDarken, true)
of bmMultiply: a.drawUber(b, start, dx, dy, lines, bmMultiply, true) of bmMultiply: a.drawUber(b, p, dx, dy, lines, bmMultiply, true)
of bmLinearBurn: a.drawUber(b, start, dx, dy, lines, bmLinearBurn, true) of bmLinearBurn: a.drawUber(b, p, dx, dy, lines, bmLinearBurn, true)
of bmColorBurn: a.drawUber(b, start, dx, dy, lines, bmColorBurn, true) of bmColorBurn: a.drawUber(b, p, dx, dy, lines, bmColorBurn, true)
of bmLighten: a.drawUber(b, start, dx, dy, lines, bmLighten, true) of bmLighten: a.drawUber(b, p, dx, dy, lines, bmLighten, true)
of bmScreen: a.drawUber(b, start, dx, dy, lines, bmScreen, true) of bmScreen: a.drawUber(b, p, dx, dy, lines, bmScreen, true)
of bmLinearDodge: a.drawUber(b, start, dx, dy, lines, bmLinearDodge, true) of bmLinearDodge: a.drawUber(b, p, dx, dy, lines, bmLinearDodge, true)
of bmColorDodge: a.drawUber(b, start, dx, dy, lines, bmColorDodge, true) of bmColorDodge: a.drawUber(b, p, dx, dy, lines, bmColorDodge, true)
of bmOverlay: a.drawUber(b, start, dx, dy, lines, bmOverlay, true) of bmOverlay: a.drawUber(b, p, dx, dy, lines, bmOverlay, true)
of bmSoftLight: a.drawUber(b, start, dx, dy, lines, bmSoftLight, true) of bmSoftLight: a.drawUber(b, p, dx, dy, lines, bmSoftLight, true)
of bmHardLight: a.drawUber(b, start, dx, dy, lines, bmHardLight, true) of bmHardLight: a.drawUber(b, p, dx, dy, lines, bmHardLight, true)
of bmDifference: a.drawUber(b, start, dx, dy, lines, bmDifference, true) of bmDifference: a.drawUber(b, p, dx, dy, lines, bmDifference, true)
of bmExclusion: a.drawUber(b, start, dx, dy, lines, bmExclusion, true) of bmExclusion: a.drawUber(b, p, dx, dy, lines, bmExclusion, true)
of bmHue: a.drawUber(b, start, dx, dy, lines, bmHue, true) of bmHue: a.drawUber(b, p, dx, dy, lines, bmHue, true)
of bmSaturation: a.drawUber(b, start, dx, dy, lines, bmSaturation, true) of bmSaturation: a.drawUber(b, p, dx, dy, lines, bmSaturation, true)
of bmColor: a.drawUber(b, start, dx, dy, lines, bmColor, true) of bmColor: a.drawUber(b, p, dx, dy, lines, bmColor, true)
of bmLuminosity: a.drawUber(b, start, dx, dy, lines, bmLuminosity, true) of bmLuminosity: a.drawUber(b, p, dx, dy, lines, bmLuminosity, true)
of bmMask: a.drawUber(b, start, dx, dy, lines, bmMask, true) of bmMask: a.drawUber(b, p, dx, dy, lines, bmMask, true)
of bmOverwrite: a.drawUber(b, start, dx, dy, lines, bmOverwrite, true) of bmOverwrite: a.drawUber(b, p, dx, dy, lines, bmOverwrite, true)
of bmSubtractMask: a.drawUber(b, start, dx, dy, lines, bmSubtractMask, true) of bmSubtractMask: a.drawUber(b, p, dx, dy, lines, bmSubtractMask, true)
of bmIntersectMask: a.drawUber(b, start, dx, dy, lines, bmIntersectMask, true) of bmIntersectMask: a.drawUber(b, p, dx, dy, lines, bmIntersectMask, true)
of bmExcludeMask: a.drawUber(b, start, dx, dy, lines, bmExcludeMask, true) of bmExcludeMask: a.drawUber(b, p, dx, dy, lines, bmExcludeMask, true)
proc draw*(a, b: Image, pos = vec2(0, 0), blendMode = bmNormal) {.inline.} = proc draw*(a, b: Image, pos = vec2(0, 0), blendMode = bmNormal) {.inline.} =
a.draw(b, translate(pos), blendMode) a.draw(b, translate(pos), blendMode)