tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

progress on pixel conposer/blender combinations

pull/641/head
Vicente Penades 8 years ago
parent
4836450c22
commit
4bb5f9f45e
4 changed files with 2414 additions and 2645 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4451
      src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.cs
  2. 426
      src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.tt
  3. 159
      src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.cs
  4. 23
      tests/ImageSharp.Tests/Drawing/SolidFillBlendedShapesTests.cs

4451
src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.cs
View File

File diff suppressed because it is too large

426
src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.tt
View File

@ -1,237 +1,191 @@
<# <#
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
#> #>
<#@ template debug="false" hostspecific="false" language="C#" #> <#@ template debug="false" hostspecific="false" language="C#" #>
<#@ assembly name="System.Core" #> <#@ assembly name="System.Core" #>
<#@ import namespace="System.Linq" #> <#@ import namespace="System.Linq" #>
<#@ import namespace="System.Text" #> <#@ import namespace="System.Text" #>
<#@ import namespace="System.Collections.Generic" #> <#@ import namespace="System.Collections.Generic" #>
<#@ output extension=".cs" #> <#@ output extension=".cs" #>
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
// <auto-generated /> // <auto-generated />
using System; using System;
using System.Numerics; using System.Numerics;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
{ {
internal static partial class PorterDuffFunctions internal static partial class PorterDuffFunctions
{ {
<# void GeneratePixelBlenders(string blender) { #>
<# void GenerateVectorCompositor(string name, string sourceVar, string destVar, string blendVar)
{ [MethodImpl(MethodImplOptions.AggressiveInlining)]
int a_s = sourceVar == "Vector4.Zero" ? 0 : 1; public static Vector4 <#=blender#>_Src(Vector4 backdrop, Vector4 source, float opacity)
int a_b = destVar == "Vector4.Zero" ? 0 : 1; {
int a_x = blendVar == "Vector4.Zero" ? 0 : 1; opacity = opacity.Clamp(0, 1);
#> source.W *= opacity;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Vector4 <#=name#>(Vector4 backdrop, Vector4 source, Vector4 xform) return source;
{ }
// calculate weights
float xw = backdrop.W * source.W; [MethodImpl(MethodImplOptions.AggressiveInlining)]
float bw = backdrop.W - xw; public static Vector4 <#=blender#>_SrcAtop(Vector4 backdrop, Vector4 source, float opacity)
float sw = source.W - xw; {
opacity = opacity.Clamp(0, 1);
// calculate final alpha source.W *= opacity;
float fw = (sw * <#=a_s#>) + (bw * <#=a_b#>) + (xw * <#=a_x#>);
return Atop(backdrop, source, <#=blender#>(backdrop, source));
// calculate final value }
xform = ((<#=blendVar#> * xw) + (<#=destVar#> * bw) + (<#=sourceVar#> * sw)) / MathF.Max(fw, Constants.Epsilon);
xform.W = fw; [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Vector4 <#=blender#>_SrcOver(Vector4 backdrop, Vector4 source, float opacity)
return xform; {
} opacity = opacity.Clamp(0, 1);
<# } #> source.W *= opacity;
return Over(backdrop, source, <#=blender#>(backdrop, source));
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
<# void GeneratePixelBlenders(string blender) { #> public static Vector4 <#=blender#>_SrcIn(Vector4 backdrop, Vector4 source, float opacity)
{
[MethodImpl(MethodImplOptions.AggressiveInlining)] opacity = opacity.Clamp(0, 1);
public static Vector4 <#=blender#>_Src(Vector4 backdrop, Vector4 source, float opacity) source.W *= opacity;
{
opacity = opacity.Clamp(0, 1); return In(backdrop, source, <#=blender#>(backdrop, source));
source.W *= opacity; }
return Src(backdrop, source, <#=blender#>(backdrop, source)); [MethodImpl(MethodImplOptions.AggressiveInlining)]
} public static Vector4 <#=blender#>_SrcOut(Vector4 backdrop, Vector4 source, float opacity)
{
[MethodImpl(MethodImplOptions.AggressiveInlining)] opacity = opacity.Clamp(0, 1);
public static Vector4 <#=blender#>_SrcAtop(Vector4 backdrop, Vector4 source, float opacity) source.W *= opacity;
{
opacity = opacity.Clamp(0, 1); return Out(backdrop, source);
source.W *= opacity; }
return SrcAtop(backdrop, source, <#=blender#>(backdrop, source)); [MethodImpl(MethodImplOptions.AggressiveInlining)]
} public static Vector4 <#=blender#>_Dest(Vector4 backdrop, Vector4 source, float opacity)
{
[MethodImpl(MethodImplOptions.AggressiveInlining)] return backdrop;
public static Vector4 <#=blender#>_SrcOver(Vector4 backdrop, Vector4 source, float opacity) }
{
opacity = opacity.Clamp(0, 1); [MethodImpl(MethodImplOptions.AggressiveInlining)]
source.W *= opacity; public static Vector4 <#=blender#>_DestAtop(Vector4 backdrop, Vector4 source, float opacity)
{
return SrcOver(backdrop, source, <#=blender#>(backdrop, source)); opacity = opacity.Clamp(0, 1);
} source.W *= opacity;
[MethodImpl(MethodImplOptions.AggressiveInlining)] return Atop(source, backdrop, <#=blender#>(source, backdrop));
public static Vector4 <#=blender#>_SrcIn(Vector4 backdrop, Vector4 source, float opacity) }
{
opacity = opacity.Clamp(0, 1); [MethodImpl(MethodImplOptions.AggressiveInlining)]
source.W *= opacity; public static Vector4 <#=blender#>_DestOver(Vector4 backdrop, Vector4 source, float opacity)
{
return SrcIn(backdrop, source, <#=blender#>(backdrop, source)); opacity = opacity.Clamp(0, 1);
} source.W *= opacity;
[MethodImpl(MethodImplOptions.AggressiveInlining)] return Over(source, backdrop, <#=blender#>(source, backdrop));
public static Vector4 <#=blender#>_SrcOut(Vector4 backdrop, Vector4 source, float opacity) }
{
opacity = opacity.Clamp(0, 1); [MethodImpl(MethodImplOptions.AggressiveInlining)]
source.W *= opacity; public static Vector4 <#=blender#>_DestIn(Vector4 backdrop, Vector4 source, float opacity)
{
return SrcOut(backdrop, source, <#=blender#>(backdrop, source)); opacity = opacity.Clamp(0, 1);
} source.W *= opacity;
[MethodImpl(MethodImplOptions.AggressiveInlining)] return In(source, backdrop, <#=blender#>(source, backdrop));
public static Vector4 <#=blender#>_Dest(Vector4 backdrop, Vector4 source, float opacity) }
{
opacity = opacity.Clamp(0, 1); [MethodImpl(MethodImplOptions.AggressiveInlining)]
source.W *= opacity; public static Vector4 <#=blender#>_DestOut(Vector4 backdrop, Vector4 source, float opacity)
{
return Dest(backdrop, source, <#=blender#>(backdrop, source)); opacity = opacity.Clamp(0, 1);
} source.W *= opacity;
[MethodImpl(MethodImplOptions.AggressiveInlining)] return Out(source, backdrop);
public static Vector4 <#=blender#>_DestAtop(Vector4 backdrop, Vector4 source, float opacity) }
{
opacity = opacity.Clamp(0, 1); [MethodImpl(MethodImplOptions.AggressiveInlining)]
source.W *= opacity; public static Vector4 <#=blender#>_Xor(Vector4 backdrop, Vector4 source, float opacity)
{
return DestAtop(backdrop, source, <#=blender#>(backdrop, source)); opacity = opacity.Clamp(0, 1);
} source.W *= opacity;
[MethodImpl(MethodImplOptions.AggressiveInlining)] return Xor(backdrop, source);
public static Vector4 <#=blender#>_DestOver(Vector4 backdrop, Vector4 source, float opacity) }
{
opacity = opacity.Clamp(0, 1); [MethodImpl(MethodImplOptions.AggressiveInlining)]
source.W *= opacity; public static Vector4 <#=blender#>_Clear(Vector4 backdrop, Vector4 source, float opacity)
{
return DestOver(backdrop, source, <#=blender#>(backdrop, source)); opacity = opacity.Clamp(0, 1);
} source.W *= opacity;
[MethodImpl(MethodImplOptions.AggressiveInlining)] return Clear(backdrop, source);
public static Vector4 <#=blender#>_DestIn(Vector4 backdrop, Vector4 source, float opacity) }
{ <# } #>
opacity = opacity.Clamp(0, 1);
source.W *= opacity;
<# void GenerateGenericPixelBlender(string blender, string composer) { #>
return DestIn(backdrop, source, <#=blender#>(backdrop, source));
} [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static TPixel <#=blender#>_<#=composer#><TPixel>(TPixel backdrop, TPixel source, float opacity)
[MethodImpl(MethodImplOptions.AggressiveInlining)] where TPixel : struct, IPixel<TPixel>
public static Vector4 <#=blender#>_DestOut(Vector4 backdrop, Vector4 source, float opacity) {
{ TPixel dest = default;
opacity = opacity.Clamp(0, 1); dest.PackFromVector4(<#=blender#>_<#=composer#>(backdrop.ToVector4(),source.ToVector4(),opacity));
source.W *= opacity; return dest;
}
return DestOut(backdrop, source, <#=blender#>(backdrop, source));
} <# } #>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Vector4 <#=blender#>_Clear(Vector4 backdrop, Vector4 source, float opacity) #region Blenders
{ <#
opacity = opacity.Clamp(0, 1);
source.W *= opacity; string[] composers = new []{
"Src" ,
return Clear(backdrop, source, source); "SrcAtop" ,
} "SrcOver" ,
"SrcIn" ,
[MethodImpl(MethodImplOptions.AggressiveInlining)] "SrcOut" ,
public static Vector4 <#=blender#>_Xor(Vector4 backdrop, Vector4 source, float opacity) "Dest" ,
{ "DestAtop" ,
opacity = opacity.Clamp(0, 1); "DestOver" ,
source.W *= opacity; "DestIn" ,
"DestOut" ,
return Xor(backdrop, source, source); "Clear" ,
} "Xor" ,
};
<# } #>
string[] blenders = new []{
"Normal" ,
<# void GenerateGenericPixelBlender(string blender, string composer) { #> "Multiply" ,
"Add" ,
[MethodImpl(MethodImplOptions.AggressiveInlining)] "Subtract" ,
public static TPixel <#=blender#>_<#=composer#><TPixel>(TPixel backdrop, TPixel source, float opacity) "Screen" ,
where TPixel : struct, IPixel<TPixel> "Darken" ,
{ "Lighten" ,
TPixel dest = default; "Overlay" ,
dest.PackFromVector4(<#=blender#>_<#=composer#>(backdrop.ToVector4(),source.ToVector4(),opacity)); "HardLight"
return dest; };
}
foreach(var blender in blenders)
<# } #> {
GeneratePixelBlenders(blender);
#region Blenders
<# foreach(var composer in composers)
{
// GenerateVectorCompositor("Src", "source", "Vector4.Zero", "xform"); GenerateGenericPixelBlender(blender,composer);
GenerateVectorCompositor("SrcAtop", "Vector4.Zero", "backdrop", "xform"); }
GenerateVectorCompositor("SrcOver", "source", "backdrop", "xform"); }
// GenerateVectorCompositor("SrcIn", "Vector4.Zero", "Vector4.Zero", "xform");
// GenerateVectorCompositor("SrcOut", "source", "Vector4.Zero", "Vector4.Zero"); #>
GenerateVectorCompositor("Dest", "Vector4.Zero", "backdrop", "backdrop");
// GenerateVectorCompositor("DestAtop", "source", "Vector4.Zero", "backdrop"); #endregion
// GenerateVectorCompositor("DestOver", "source", "backdrop", "backdrop"); }
// GenerateVectorCompositor("DestIn", "Vector4.Zero", "Vector4.Zero", "backdrop");
GenerateVectorCompositor("DestOut", "Vector4.Zero", "backdrop", "Vector4.Zero");
// GenerateVectorCompositor("Clear", "Vector4.Zero", "Vector4.Zero", "Vector4.Zero");
GenerateVectorCompositor("Xor", "source", "backdrop", "Vector4.Zero");
string[] composers = new []{
"Src" ,
"SrcAtop" ,
"SrcOver" ,
"SrcIn" ,
"SrcOut" ,
"Dest" ,
"DestAtop" ,
"DestOver" ,
"DestIn" ,
"DestOut" ,
"Clear" ,
"Xor" ,
};
string[] blenders = new []{
"Normal" ,
"Multiply" ,
"Add" ,
"Subtract" ,
"Screen" ,
"Darken" ,
"Lighten" ,
"Overlay" ,
"HardLight"
};
foreach(var blender in blenders)
{
GeneratePixelBlenders(blender);
foreach(var composer in composers)
{
GenerateGenericPixelBlender(blender,composer);
}
}
#>
#endregion
}
} }

159
src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.cs
View File

@ -179,125 +179,78 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
return xform; return xform;
} }
public static Vector4 Over(Vector4 dst, Vector4 src, Vector4 blend)
{
// calculate weights
float blendW = dst.W * src.W;
float dstW = dst.W - blendW;
float srcW = src.W - blendW;
// calculate final alpha
float alpha = dstW + srcW + blendW;
// calculate final color
Vector4 color = dst * dstW + src * srcW + blend * blendW;
// unpremultiply
color /= MathF.Max(alpha, Constants.Epsilon);
color.W = alpha;
return color;
}
public static Vector4 Atop(Vector4 dst, Vector4 src, Vector4 blend)
{
// calculate weights
float blendW = dst.W * src.W;
float dstW = dst.W - blendW;
[MethodImpl(MethodImplOptions.AggressiveInlining)] // calculate final alpha
public static Vector4 Src(Vector4 backdrop, Vector4 source, Vector4 xform) float alpha = dstW + blendW;
{
// calculate weights // calculate final color
float xw = backdrop.W * source.W; Vector4 color = dst * dstW + blend * blendW;
float bw = backdrop.W - xw;
float sw = source.W - xw; // unpremultiply
color /= MathF.Max(alpha, Constants.Epsilon);
// calculate final alpha color.W = alpha;
float fw = (sw * 1) + (bw * 0) + (xw * 1);
// calculate final value
xform = ((xform * xw) + (Vector4.Zero * bw) + (source * sw)) / MathF.Max(fw, Constants.Epsilon);
xform.W = fw;
return Vector4.Lerp(backdrop, xform, source.W);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Vector4 SrcIn(Vector4 backdrop, Vector4 source, Vector4 xform)
{
// calculate weights
float xw = backdrop.W * source.W;
// calculate final value
xform.W = xw;
return Vector4.Lerp(backdrop, xform, source.W);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)] return color;
public static Vector4 SrcOut(Vector4 backdrop, Vector4 source, Vector4 xform)
{
// calculate weights
float xw = backdrop.W * source.W;
float bw = backdrop.W - xw;
float sw = source.W - xw;
// calculate final alpha
float fw = sw;
// calculate final value
xform = source;
xform.W = fw;
return Vector4.Lerp(backdrop, xform, source.W);
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 In(Vector4 dst, Vector4 src, Vector4 blend)
public static Vector4 DestAtop(Vector4 backdrop, Vector4 source, Vector4 xform) {
{ blend.W = dst.W * src.W;
// calculate weights
float xw = backdrop.W * source.W; return blend;
float bw = backdrop.W - xw;
float sw = source.W - xw;
// calculate final alpha
float fw = (sw * 1) + (bw * 0) + (xw * 1);
// calculate final value
xform = ((backdrop * xw) + (Vector4.Zero * bw) + (source * sw)) / MathF.Max(fw, Constants.Epsilon);
xform.W = fw;
return Vector4.Lerp(backdrop, xform, source.W);
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 Out(Vector4 dst, Vector4 src)
public static Vector4 DestOver(Vector4 backdrop, Vector4 source, Vector4 xform) {
{ // calculate final alpha
// calculate weights src.W = (1 - dst.W) * src.W;
float xw = backdrop.W * source.W;
float bw = backdrop.W - xw; return src;
float sw = source.W - xw;
// calculate final alpha
float fw = (sw * 1) + (bw * 1) + (xw * 1);
// calculate final value
xform = ((backdrop * xw) + (backdrop * bw) + (source * sw)) / MathF.Max(fw, Constants.Epsilon);
xform.W = fw;
return Vector4.Lerp(backdrop, xform, source.W);
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] public static Vector4 Xor(Vector4 dst, Vector4 src)
public static Vector4 DestIn(Vector4 backdrop, Vector4 source, Vector4 xform) {
{ float srcW = 1 - dst.W;
// calculate weights float dstW = 1 - src.W;
float xw = backdrop.W * source.W;
float bw = backdrop.W - xw; float alpha = src.W * srcW + dst.W * dstW;
float sw = source.W - xw; Vector4 color = src.W * src * srcW + dst.W * dst * dstW;
// calculate final alpha // unpremultiply
float fw = (sw * 0) + (bw * 0) + (xw * 1); color /= MathF.Max(alpha, Constants.Epsilon);
color.W = alpha;
// calculate final value
xform = ((backdrop * xw) + (Vector4.Zero * bw) + (Vector4.Zero * sw)) / MathF.Max(fw, Constants.Epsilon); return color;
xform.W = fw;
return Vector4.Lerp(backdrop, xform, source.W);
} }
/// <summary> private static Vector4 Clear(Vector4 backdrop, Vector4 source)
/// General composition function for all modes, with a general solution for alpha channel
/// </summary>
/// <param name="backdrop">Original Backdrop color</param>
/// <param name="source">Original source color</param>
/// <param name="xform">Desired transformed color, without taking Alpha channel in account</param>
/// <returns>The final color</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static Vector4 Clear(Vector4 backdrop, Vector4 source, Vector4 xform)
{ {
return Vector4.Lerp(backdrop, Vector4.Zero, xform.W); return Vector4.Lerp(backdrop, Vector4.Zero, source.W);
} }
#endregion #endregion

23
tests/ImageSharp.Tests/Drawing/SolidFillBlendedShapesTests.cs
View File

@ -116,21 +116,26 @@ namespace SixLabors.ImageSharp.Tests.Drawing
public void _1DarkBlueRect_2BlendBlackEllipse<TPixel>(TestImageProvider<TPixel> provider, PixelBlenderMode mode) public void _1DarkBlueRect_2BlendBlackEllipse<TPixel>(TestImageProvider<TPixel> provider, PixelBlenderMode mode)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
using (Image<TPixel> img = provider.GetImage()) using(Image<TPixel> dstImg = provider.GetImage(), srcImg = provider.GetImage())
{ {
int scaleX = (img.Width / 100); int scaleX = (dstImg.Width / 100);
int scaleY = (img.Height / 100); int scaleY = (dstImg.Height / 100);
img.Mutate(
dstImg.Mutate(
x => x.Fill( x => x.Fill(
NamedColors<TPixel>.DarkBlue, NamedColors<TPixel>.DarkBlue,
new Rectangle(0 * scaleX, 40 * scaleY, 100 * scaleX, 20 * scaleY))); new Rectangle(0 * scaleX, 40 * scaleY, 100 * scaleX, 20 * scaleY)));
img.Mutate(
srcImg.Mutate(
x => x.Fill( x => x.Fill(
new GraphicsOptions(true) { BlenderMode = mode },
NamedColors<TPixel>.Black, NamedColors<TPixel>.Black,
new Shapes.EllipsePolygon(40 * scaleX, 50 * scaleY, 50 * scaleX, 50 * scaleY))); new Shapes.EllipsePolygon(40 * scaleX, 50 * scaleY, 50 * scaleX, 50 * scaleY)));
dstImg.Mutate(
x => x.DrawImage(new GraphicsOptions(true) { BlenderMode = mode }, srcImg)
);
VerifyImage(provider, mode, img); VerifyImage(provider, mode, dstImg);
} }
} }

Write Preview
Loading…
Cancel
Save