Add NormalizedShort2

src/ImageSharp/Colors/PackedPixel/NormalizedByte2.cs

@@ -92,8 +92,8 @@ namespace ImageSharp
         public Vector2 ToVector2()
         {
             return new Vector2(
-                ((sbyte)((this.PackedValue >> 0) & 0xFF)) / 127F,
-                ((sbyte)((this.PackedValue >> 8) & 0xFF)) / 127F);
+                (sbyte)((this.PackedValue >> 0) & 0xFF) / 127F,
+                (sbyte)((this.PackedValue >> 8) & 0xFF) / 127F);
         }
 
         /// <inheritdoc />

src/ImageSharp/Colors/PackedPixel/NormalizedShort2.cs

@@ -0,0 +1,206 @@
+// <copyright file="NormalizedShort2.cs" company="James Jackson-South">
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageSharp
+{
+    using System;
+    using System.Numerics;
+
+    /// <summary>
+    /// Packed pixel type containing two 16-bit signed normalized values, ranging from −1 to 1.
+    /// </summary>
+    public struct NormalizedShort2 : IPackedPixel<uint>, IEquatable<NormalizedShort2>
+    {
+        /// <summary>
+        /// The maximum byte value.
+        /// </summary>
+        private static readonly Vector4 MaxBytes = new Vector4(255);
+
+        /// <summary>
+        /// The half the maximum byte value.
+        /// </summary>
+        private static readonly Vector4 Half = new Vector4(127);
+
+        /// <summary>
+        /// The vector value used for rounding.
+        /// </summary>
+        private static readonly Vector4 Round = new Vector4(.5F);
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NormalizedShort2"/> struct.
+        /// </summary>
+        /// <param name="vector">The vector containing the component values.</param>
+        public NormalizedShort2(Vector2 vector)
+        {
+            this.PackedValue = Pack(vector.X, vector.Y);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NormalizedShort2"/> struct.
+        /// </summary>
+        /// <param name="x">The x-component.</param>
+        /// <param name="y">The y-component.</param>
+        public NormalizedShort2(float x, float y)
+        {
+            this.PackedValue = Pack(x, y);
+        }
+
+        /// <inheritdoc />
+        public uint PackedValue { get; set; }
+
+        /// <summary>
+        /// Compares two <see cref="NormalizedShort2"/> objects for equality.
+        /// </summary>
+        /// <param name="left">
+        /// The <see cref="NormalizedShort2"/> on the left side of the operand.
+        /// </param>
+        /// <param name="right">
+        /// The <see cref="NormalizedShort2"/> on the right side of the operand.
+        /// </param>
+        /// <returns>
+        /// True if the <paramref name="left"/> parameter is equal to the <paramref name="right"/> parameter; otherwise, false.
+        /// </returns>
+        public static bool operator ==(NormalizedShort2 left, NormalizedShort2 right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Compares two <see cref="NormalizedShort2"/> objects for equality.
+        /// </summary>
+        /// <param name="left">
+        /// The <see cref="NormalizedShort2"/> on the left side of the operand.
+        /// </param>
+        /// <param name="right">
+        /// The <see cref="NormalizedShort2"/> on the right side of the operand.
+        /// </param>
+        /// <returns>
+        /// True if the <paramref name="left"/> parameter is not equal to the <paramref name="right"/> parameter; otherwise, false.
+        /// </returns>
+        public static bool operator !=(NormalizedShort2 left, NormalizedShort2 right)
+        {
+            return !left.Equals(right);
+        }
+
+        /// <inheritdoc />
+        public void PackFromVector4(Vector4 vector)
+        {
+            this.PackedValue = Pack(vector.X, vector.Y);
+        }
+
+        /// <inheritdoc />
+        public Vector4 ToVector4()
+        {
+            return new Vector4(this.ToVector2(), 0, 1);
+        }
+
+        /// <inheritdoc />
+        public void PackFromBytes(byte x, byte y, byte z, byte w)
+        {
+            Vector4 vector = new Vector4(x, y, z, w);
+            vector -= Round;
+            vector -= Half;
+            vector -= Round;
+            vector /= Half;
+            this.PackFromVector4(vector);
+        }
+
+        /// <inheritdoc />
+        public void ToBytes(byte[] bytes, int startIndex, ComponentOrder componentOrder)
+        {
+            Vector4 vector = this.ToVector4();
+            vector *= Half;
+            vector += Round;
+            vector += Half;
+            vector += Round;
+            vector = Vector4.Clamp(vector, Vector4.Zero, MaxBytes);
+
+            switch (componentOrder)
+            {
+                case ComponentOrder.ZYX:
+                    bytes[startIndex] = 0;
+                    bytes[startIndex + 1] = (byte)(float)Math.Round(vector.Y);
+                    bytes[startIndex + 2] = (byte)(float)Math.Round(vector.X);
+                    break;
+                case ComponentOrder.ZYXW:
+                    bytes[startIndex] = 0;
+                    bytes[startIndex + 1] = (byte)(float)Math.Round(vector.Y);
+                    bytes[startIndex + 2] = (byte)(float)Math.Round(vector.X);
+                    bytes[startIndex + 3] = 255;
+                    break;
+                case ComponentOrder.XYZ:
+                    bytes[startIndex] = (byte)(float)Math.Round(vector.X);
+                    bytes[startIndex + 1] = (byte)(float)Math.Round(vector.Y);
+                    bytes[startIndex + 2] = 0;
+                    break;
+                case ComponentOrder.XYZW:
+                    bytes[startIndex] = (byte)(float)Math.Round(vector.X);
+                    bytes[startIndex + 1] = (byte)(float)Math.Round(vector.Y);
+                    bytes[startIndex + 2] = 0;
+                    bytes[startIndex + 3] = 255;
+                    break;
+                default:
+                    throw new NotSupportedException();
+            }
+        }
+
+        /// <summary>
+        /// Expands the packed representation into a <see cref="Vector2"/>.
+        /// The vector components are typically expanded in least to greatest significance order.
+        /// </summary>
+        /// <returns>The <see cref="Vector2"/>.</returns>
+        public Vector2 ToVector2()
+        {
+            const float MaxVal = 0x7FFF;
+
+            return new Vector2(
+                (short)(this.PackedValue & 0xFFFF) / MaxVal,
+                (short)(this.PackedValue >> 0x10) / MaxVal);
+        }
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            return (obj is NormalizedShort2) && this.Equals((NormalizedShort2)obj);
+        }
+
+        /// <inheritdoc />
+        public bool Equals(NormalizedShort2 other)
+        {
+            return this.PackedValue.Equals(other.PackedValue);
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            return this.PackedValue.GetHashCode();
+        }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return this.PackedValue.ToString("X");
+        }
+
+        /// <summary>
+        /// Packs the <see cref="float"/> components into a <see cref="uint"/>.
+        /// </summary>
+        /// <param name="x">The x-component</param>
+        /// <param name="y">The y-component</param>
+        /// <returns>The <see cref="uint"/> containing the packed values.</returns>
+        private static uint Pack(float x, float y)
+        {
+            const float MaxPos = 0x7FFF;
+            const float MinNeg = -MaxPos;
+
+            // Clamp the value between min and max values
+            // Round rather than truncate.
+            uint word2 = (uint)((int)(float)Math.Round(x * MaxPos).Clamp(MinNeg, MaxPos) & 0xFFFF);
+            uint word1 = (uint)(((int)(float)Math.Round(y * MaxPos).Clamp(MinNeg, MaxPos) & 0xFFFF) << 0x10);
+
+            return word2 | word1;
+        }
+    }
+}

tests/ImageSharp.Tests/Colors/PackedPixelTests.cs

@@ -468,6 +468,56 @@ namespace ImageSharp.Tests.Colors
             Assert.Equal(rgba, new byte[] { 9, 115, 202, 127 });
         }
 
+        [Fact]
+        public void NormalizedShort2()
+        {
+            Assert.Equal((uint)0x0, new NormalizedShort2(Vector2.Zero).PackedValue);
+            Assert.Equal((uint)0x7FFF7FFF, new NormalizedShort2(Vector2.One).PackedValue);
+            Assert.Equal(0x80018001, new NormalizedShort2(-Vector2.One).PackedValue);
+
+            Assert.True(Equal(Vector2.One, new NormalizedShort2(Vector2.One).ToVector2()));
+            Assert.True(Equal(Vector2.Zero, new NormalizedShort2(Vector2.Zero).ToVector2()));
+            Assert.True(Equal(-Vector2.One, new NormalizedShort2(-Vector2.One).ToVector2()));
+            Assert.True(Equal(Vector2.One, new NormalizedShort2(Vector2.One * 1234.0f).ToVector2()));
+            Assert.True(Equal(-Vector2.One, new NormalizedShort2(Vector2.One * -1234.0f).ToVector2()));
+
+            Assert.True(Equal(new Vector4(1, 1, 0, 1), (new NormalizedShort2(Vector2.One)).ToVector4()));
+            Assert.True(Equal(new Vector4(0, 0, 0, 1), (new NormalizedShort2(Vector2.Zero)).ToVector4()));
+
+            // Test Ordering
+            float x = 0.35f;
+            float y = -0.2f;
+            Assert.Equal(0xE6672CCC, new NormalizedShort2(x, y).PackedValue);
+            x = 0.1f;
+            y = -0.3f;
+            Assert.Equal(3650751693, new NormalizedShort2(x, y).PackedValue);
+
+            byte[] rgb = new byte[3];
+            byte[] rgba = new byte[4];
+            byte[] bgr = new byte[3];
+            byte[] bgra = new byte[4];
+
+            NormalizedShort2 n = new NormalizedShort2();
+            n.PackFromBytes(141, 90, 0, 0);
+            n.ToBytes(rgb, 0, ComponentOrder.XYZ);
+            Assert.Equal(rgb, new byte[] { 141, 90, 0 });
+
+            // TODO: I don't think this can ever pass since the bytes are already truncated.
+            // Assert.Equal(3650751693, n.PackedValue);
+
+            new NormalizedShort2(x, y).ToBytes(rgb, 0, ComponentOrder.XYZ);
+            Assert.Equal(rgb, new byte[] { 141, 90, 0 });
+
+            new NormalizedShort2(x, y).ToBytes(rgba, 0, ComponentOrder.XYZW);
+            Assert.Equal(rgba, new byte[] { 141, 90, 0, 255 });
+
+            new NormalizedShort2(x, y).ToBytes(bgr, 0, ComponentOrder.ZYX);
+            Assert.Equal(bgr, new byte[] { 0, 90, 141 });
+
+            new NormalizedShort2(x, y).ToBytes(bgra, 0, ComponentOrder.ZYXW);
+            Assert.Equal(bgra, new byte[] { 0, 90, 141, 255 });
+        }
+
         // Comparison helpers with small tolerance to allow for floating point rounding during computations.
         public static bool Equal(float a, float b)
         {

tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs

@@ -61,11 +61,11 @@ namespace ImageSharp.Tests
                 // Image<HalfSingle, ushort> image = file.CreateImage().To<HalfSingle, ushort>();
                 // Image<HalfVector2, uint> image = file.CreateImage().To<HalfVector2, uint>();
                 // Image<HalfVector4, ulong> image = file.CreateImage().To<HalfVector4, ulong>();
-                // Image<NormalizedByte2, ushort> image = file.CreateImage().To<NormalizedByte2, ushort>();
 
                 // TODO: Conversion between types who's vector ranges are different are not possible without scaling function, Make static version of known ones.
+                // Image<NormalizedByte2, ushort> image = file.CreateImage().To<NormalizedByte2, ushort>(v => (2F * v) - Vector4.One);
                 // Image<NormalizedByte4, uint> image = file.CreateImage().To<NormalizedByte4, uint>(v => (2F * v) - Vector4.One);
-
+                // Image<NormalizedShort2, uint> image = file.CreateImage().To<NormalizedShort2, uint>(v => (2F * v) - Vector4.One);
                 using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
                 {
                     image.Save(output);