diff --git a/src/ImageSharp/Colors/PackedPixel/HalfSingle.cs b/src/ImageSharp/Colors/PackedPixel/HalfSingle.cs
index 09811228a..b2919b46a 100644
--- a/src/ImageSharp/Colors/PackedPixel/HalfSingle.cs
+++ b/src/ImageSharp/Colors/PackedPixel/HalfSingle.cs
@@ -93,7 +93,7 @@ namespace ImageSharp
///
public void PackFromBytes(byte x, byte y, byte z, byte w)
{
- this.PackFromVector4(new Vector4(x, y, z, w) / 255F);
+ this.PackFromVector4(new Vector4(x, y, z, w) / MaxBytes);
}
///
diff --git a/src/ImageSharp/Colors/PackedPixel/HalfVector2.cs b/src/ImageSharp/Colors/PackedPixel/HalfVector2.cs
new file mode 100644
index 000000000..c41e01b2a
--- /dev/null
+++ b/src/ImageSharp/Colors/PackedPixel/HalfVector2.cs
@@ -0,0 +1,187 @@
+//
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+//
+
+namespace ImageSharp
+{
+ using System;
+ using System.Numerics;
+
+ ///
+ /// Packed pixel type containing two 16-bit floating-point values.
+ ///
+ public struct HalfVector2 : IPackedPixel, IEquatable
+ {
+ ///
+ /// The maximum byte value.
+ ///
+ private static readonly Vector4 MaxBytes = new Vector4(255);
+
+ ///
+ /// The half vector value.
+ ///
+ private static readonly Vector4 Half = new Vector4(0.5F);
+
+ ///
+ /// Initializes a new instance of the struct.
+ ///
+ /// The x-component.
+ /// The y-component.
+ public HalfVector2(float x, float y)
+ {
+ this.PackedValue = Pack(x, y);
+ }
+
+ ///
+ /// Initializes a new instance of the struct.
+ ///
+ /// A vector containing the initial values for the components.
+ public HalfVector2(Vector2 vector)
+ {
+ this.PackedValue = Pack(vector.X, vector.Y);
+ }
+
+ ///
+ public uint PackedValue { get; set; }
+
+ ///
+ /// Compares two objects for equality.
+ ///
+ ///
+ /// The on the left side of the operand.
+ ///
+ ///
+ /// The on the right side of the operand.
+ ///
+ ///
+ /// True if the parameter is equal to the parameter; otherwise, false.
+ ///
+ public static bool operator ==(HalfVector2 left, HalfVector2 right)
+ {
+ return left.Equals(right);
+ }
+
+ ///
+ /// Compares two objects for equality.
+ ///
+ ///
+ /// The on the left side of the operand.
+ ///
+ ///
+ /// The on the right side of the operand.
+ ///
+ ///
+ /// True if the parameter is not equal to the parameter; otherwise, false.
+ ///
+ public static bool operator !=(HalfVector2 left, HalfVector2 right)
+ {
+ return !left.Equals(right);
+ }
+
+ ///
+ /// Expands the packed representation into a .
+ ///
+ /// The .
+ public Vector2 ToVector2()
+ {
+ Vector2 vector;
+ vector.X = HalfTypeHelper.Unpack((ushort)this.PackedValue);
+ vector.Y = HalfTypeHelper.Unpack((ushort)(this.PackedValue >> 0x10));
+ return vector;
+ }
+
+ ///
+ public void PackFromVector4(Vector4 vector)
+ {
+ this.PackedValue = Pack(vector.X, vector.Y);
+ }
+
+ ///
+ public Vector4 ToVector4()
+ {
+ Vector2 vector = this.ToVector2();
+ return new Vector4(vector.X, vector.Y, 0F, 1F);
+ }
+
+ ///
+ public void PackFromBytes(byte x, byte y, byte z, byte w)
+ {
+ this.PackFromVector4(new Vector4(x, y, z, w) / MaxBytes);
+ }
+
+ ///
+ public void ToBytes(byte[] bytes, int startIndex, ComponentOrder componentOrder)
+ {
+ Vector4 vector = this.ToVector4();
+ vector *= MaxBytes;
+ vector += Half;
+ vector = Vector4.Clamp(vector, Vector4.Zero, MaxBytes);
+
+ switch (componentOrder)
+ {
+ case ComponentOrder.ZYX:
+ bytes[startIndex] = (byte)vector.Z;
+ bytes[startIndex + 1] = (byte)vector.Y;
+ bytes[startIndex + 2] = (byte)vector.X;
+ break;
+ case ComponentOrder.ZYXW:
+ bytes[startIndex] = (byte)vector.Z;
+ bytes[startIndex + 1] = (byte)vector.Y;
+ bytes[startIndex + 2] = (byte)vector.X;
+ bytes[startIndex + 3] = (byte)vector.W;
+ break;
+ case ComponentOrder.XYZ:
+ bytes[startIndex] = (byte)vector.X;
+ bytes[startIndex + 1] = (byte)vector.Y;
+ bytes[startIndex + 2] = (byte)vector.Z;
+ break;
+ case ComponentOrder.XYZW:
+ bytes[startIndex] = (byte)vector.X;
+ bytes[startIndex + 1] = (byte)vector.Y;
+ bytes[startIndex + 2] = (byte)vector.Z;
+ bytes[startIndex + 3] = (byte)vector.W;
+ break;
+ default:
+ throw new NotSupportedException();
+ }
+ }
+
+ ///
+ public override string ToString()
+ {
+ return this.ToVector2().ToString();
+ }
+
+ ///
+ public override int GetHashCode()
+ {
+ return this.PackedValue.GetHashCode();
+ }
+
+ ///
+ public override bool Equals(object obj)
+ {
+ return (obj is HalfVector2) && this.Equals((HalfVector2)obj);
+ }
+
+ ///
+ public bool Equals(HalfVector2 other)
+ {
+ return this.PackedValue.Equals(other.PackedValue);
+ }
+
+ ///
+ /// Packs the components into a .
+ ///
+ /// The x-component
+ /// The y-component
+ /// The containing the packed values.
+ private static uint Pack(float x, float y)
+ {
+ uint num2 = HalfTypeHelper.Pack(x);
+ uint num = (uint)(HalfTypeHelper.Pack(y) << 0x10);
+ return num2 | num;
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Colors/PackedPixelTests.cs b/tests/ImageSharp.Tests/Colors/PackedPixelTests.cs
index a30fecc1c..dcb4b164d 100644
--- a/tests/ImageSharp.Tests/Colors/PackedPixelTests.cs
+++ b/tests/ImageSharp.Tests/Colors/PackedPixelTests.cs
@@ -285,6 +285,43 @@ namespace ImageSharp.Tests.Colors
Assert.Equal(bgra, new byte[] { 0, 0, 128, 255 });
}
+ [Fact]
+ public void HalfVector2()
+ {
+ // Test PackedValue
+ Assert.Equal(0u, new HalfVector2(Vector2.Zero).PackedValue);
+ Assert.Equal(1006648320u, new HalfVector2(Vector2.One).PackedValue);
+ Assert.Equal(3033345638u, new HalfVector2(0.1f, -0.3f).PackedValue);
+
+ // Test ToVector2
+ Assert.True(Equal(Vector2.Zero, new HalfVector2(Vector2.Zero).ToVector2()));
+ Assert.True(Equal(Vector2.One, new HalfVector2(Vector2.One).ToVector2()));
+ Assert.True(Equal(Vector2.UnitX, new HalfVector2(Vector2.UnitX).ToVector2()));
+ Assert.True(Equal(Vector2.UnitY, new HalfVector2(Vector2.UnitY).ToVector2()));
+
+ // Test ordering
+ float x = .5F;
+ float y = .25F;
+ Assert.True(Equal(new Vector4(x, y, 0, 1), new HalfVector2(x, y).ToVector4()));
+
+ byte[] rgb = new byte[3];
+ byte[] rgba = new byte[4];
+ byte[] bgr = new byte[3];
+ byte[] bgra = new byte[4];
+
+ new HalfVector2(x, y).ToBytes(rgb, 0, ComponentOrder.XYZ);
+ Assert.Equal(rgb, new byte[] { 128, 64, 0 });
+
+ new HalfVector2(x, y).ToBytes(rgba, 0, ComponentOrder.XYZW);
+ Assert.Equal(rgba, new byte[] { 128, 64, 0, 255 });
+
+ new HalfVector2(x, y).ToBytes(bgr, 0, ComponentOrder.ZYX);
+ Assert.Equal(bgr, new byte[] { 0, 64, 128 });
+
+ new HalfVector2(x, y).ToBytes(bgra, 0, ComponentOrder.ZYXW);
+ Assert.Equal(bgra, new byte[] { 0, 64, 128, 255 });
+ }
+
// Comparison helpers with small tolerance to allow for floating point rounding during computations.
public static bool Equal(float a, float b)
{