From 772c40f22aa3c99afb861719681562ad2cf04231 Mon Sep 17 00:00:00 2001 From: Ryan Oldenburg Date: Fri, 17 Jun 2022 17:39:48 -0500 Subject: [PATCH] benchmark_blends + exports --- src/pixie/blends.nim | 14 +++++++------- tests/benchmark_blends.nim | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/pixie/blends.nim b/src/pixie/blends.nim index 4a5e49b..18edbd7 100644 --- a/src/pixie/blends.nim +++ b/src/pixie/blends.nim @@ -238,7 +238,7 @@ proc blendScreen*(backdrop, source: ColorRGBX): ColorRGBX {.inline.} = # result = alphaFix(backdrop, source, result) # result = result.toPremultipliedAlpha() -proc blendColorDodge(backdrop, source: ColorRGBX): ColorRGBX = +proc blendColorDodge*(backdrop, source: ColorRGBX): ColorRGBX = let backdrop = backdrop.rgba() source = source.rgba() @@ -341,7 +341,7 @@ proc blendHardLight*(backdrop, source: ColorRGBX): ColorRGBX = result.b = hardLight(backdrop.b, backdrop.a, source.b, source.a) result.a = blendAlpha(backdrop.a, source.a) -proc blendDifference(backdrop, source: ColorRGBX): ColorRGBX = +proc blendDifference*(backdrop, source: ColorRGBX): ColorRGBX = proc blend( backdropColor, backdropAlpha, sourceColor, sourceAlpha: uint8 ): uint8 {.inline.} = @@ -357,7 +357,7 @@ proc blendDifference(backdrop, source: ColorRGBX): ColorRGBX = result.b = blend(backdrop.b, backdrop.a, source.b, source.a) result.a = blendAlpha(backdrop.a, source.a) -proc blendExclusion(backdrop, source: ColorRGBX): ColorRGBX = +proc blendExclusion*(backdrop, source: ColorRGBX): ColorRGBX = proc blend(backdrop, source: uint32): uint8 {.inline.} = let v = (backdrop + source).int32 - ((2 * backdrop * source) div 255).int32 max(0, v).uint8 @@ -366,28 +366,28 @@ proc blendExclusion(backdrop, source: ColorRGBX): ColorRGBX = result.b = blend(backdrop.b.uint32, source.b.uint32) result.a = blendAlpha(backdrop.a, source.a) -proc blendColor(backdrop, source: ColorRGBX): ColorRGBX = +proc blendColor*(backdrop, source: ColorRGBX): ColorRGBX = let backdrop = backdrop.rgba().color source = source.rgba().color blended = SetLum(source, Lum(backdrop)) result = alphaFix(backdrop, source, blended).rgba.rgbx() -proc blendLuminosity(backdrop, source: ColorRGBX): ColorRGBX = +proc blendLuminosity*(backdrop, source: ColorRGBX): ColorRGBX = let backdrop = backdrop.rgba().color source = source.rgba().color blended = SetLum(backdrop, Lum(source)) result = alphaFix(backdrop, source, blended).rgba.rgbx() -proc blendHue(backdrop, source: ColorRGBX): ColorRGBX = +proc blendHue*(backdrop, source: ColorRGBX): ColorRGBX = let backdrop = backdrop.rgba().color source = source.rgba().color blended = SetLum(SetSat(source, Sat(backdrop)), Lum(backdrop)) result = alphaFix(backdrop, source, blended).rgba.rgbx() -proc blendSaturation(backdrop, source: ColorRGBX): ColorRGBX = +proc blendSaturation*(backdrop, source: ColorRGBX): ColorRGBX = let backdrop = backdrop.rgba().color source = source.rgba().color diff --git a/tests/benchmark_blends.nim b/tests/benchmark_blends.nim index d5f1f97..59befb7 100644 --- a/tests/benchmark_blends.nim +++ b/tests/benchmark_blends.nim @@ -1,6 +1,4 @@ -import benchy, chroma, pixie/images, vmath - -include pixie/blends +import benchy, chroma, pixie/blends, pixie/images, vmath let backdrop = newImage(256, 256)