diff --git a/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj b/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj
index c9cfafee..604af823 100644
--- a/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj
+++ b/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj
@@ -71,6 +71,8 @@
+
+
diff --git a/ANX.Framework.TestCenter/AssertHelper.cs b/ANX.Framework.TestCenter/AssertHelper.cs
index 3a6d0d87..84ccf108 100644
--- a/ANX.Framework.TestCenter/AssertHelper.cs
+++ b/ANX.Framework.TestCenter/AssertHelper.cs
@@ -112,6 +112,12 @@ using ANXRgba1010102 = ANX.Framework.Graphics.PackedVector.Rgba1010102;
using XNARgba64 = Microsoft.Xna.Framework.Graphics.PackedVector.Rgba64;
using ANXRgba64 = ANX.Framework.Graphics.PackedVector.Rgba64;
+using XNANormalizedByte2 = Microsoft.Xna.Framework.Graphics.PackedVector.NormalizedByte2;
+using ANXNormalizedByte2 = ANX.Framework.Graphics.PackedVector.NormalizedByte2;
+
+using XNANormalizedByte4 = Microsoft.Xna.Framework.Graphics.PackedVector.NormalizedByte4;
+using ANXNormalizedByte4 = ANX.Framework.Graphics.PackedVector.NormalizedByte4;
+
#endregion // Datatype usings
namespace ANX.Framework.TestCenter
@@ -238,6 +244,30 @@ namespace ANX.Framework.TestCenter
}
}
+ public static void ConvertEquals(XNANormalizedByte2 lhs, ANXNormalizedByte2 rhs, String test)
+ {
+ if (lhs.PackedValue == rhs.PackedValue)
+ {
+ Assert.Pass(test + " passed");
+ }
+ else
+ {
+ Assert.Fail(String.Format("{0] failed: NormalizedByte2 XNA: ({1}) NormalizedByte2 ANX: ({2})", test, lhs, rhs));
+ }
+ }
+
+ public static void ConvertEquals(XNANormalizedByte4 lhs, ANXNormalizedByte4 rhs, String test)
+ {
+ if (lhs.PackedValue == rhs.PackedValue)
+ {
+ Assert.Pass(test + " passed");
+ }
+ else
+ {
+ Assert.Fail(String.Format("{0] failed: NormalizedByte4 XNA: ({1}) NormalizedByte4 ANX: ({2})", test, lhs, rhs));
+ }
+ }
+
public static void ConvertEquals(float a, float b, String test)
{
if (a.Equals(b))
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedByte2Test.cs b/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedByte2Test.cs
new file mode 100644
index 00000000..25a661bf
--- /dev/null
+++ b/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedByte2Test.cs
@@ -0,0 +1,109 @@
+#region Using Statements
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+
+using XNANormalizedByte2 = Microsoft.Xna.Framework.Graphics.PackedVector.NormalizedByte2;
+using ANXNormalizedByte2 = ANX.Framework.Graphics.PackedVector.NormalizedByte2;
+
+using XNAVector2 = Microsoft.Xna.Framework.Vector2;
+using ANXVector2 = ANX.Framework.Vector2;
+
+#endregion // Using Statements
+
+#region License
+
+//
+// This file is part of the ANX.Framework created by the "ANX.Framework developer group".
+//
+// This file is released under the Ms-PL license.
+//
+//
+//
+// Microsoft Public License (Ms-PL)
+//
+// This license governs use of the accompanying software. If you use the software, you accept this license.
+// If you do not accept the license, do not use the software.
+//
+// 1.Definitions
+// The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning
+// here as under U.S. copyright law.
+// A "contribution" is the original software, or any additions or changes to the software.
+// A "contributor" is any person that distributes its contribution under this license.
+// "Licensed patents" are a contributor's patent claims that read directly on its contribution.
+//
+// 2.Grant of Rights
+// (A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations
+// in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to
+// reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution
+// or any derivative works that you create.
+// (B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in
+// section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed
+// patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution
+// in the software or derivative works of the contribution in the software.
+//
+// 3.Conditions and Limitations
+// (A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
+// (B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your
+// patent license from such contributor to the software ends automatically.
+// (C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution
+// notices that are present in the software.
+// (D) If you distribute any portion of the software in source code form, you may do so only under this license by including
+// a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or
+// object code form, you may only do so under a license that complies with this license.
+// (E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees,
+// or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the
+// extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a
+// particular purpose and non-infringement.
+
+#endregion // License
+
+namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+{
+ [TestFixture]
+ class NormalizedByte2Test
+ {
+ #region Testdata
+
+ static object[] twofloats =
+ {
+ new object[] { DataFactory.RandomValue, DataFactory.RandomValue },
+ new object[] { DataFactory.RandomValue, DataFactory.RandomValue },
+ new object[] { DataFactory.RandomValue, DataFactory.RandomValue },
+ new object[] { DataFactory.RandomValue, DataFactory.RandomValue },
+ new object[] { DataFactory.RandomValue, DataFactory.RandomValue }
+ };
+
+ #endregion
+
+ [Test, TestCaseSource("twofloats")]
+ public void contructor1(float x, float y)
+ {
+ XNANormalizedByte2 xnaVal = new XNANormalizedByte2(x, y);
+ ANXNormalizedByte2 anxVal = new ANXNormalizedByte2(x, y);
+
+ AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor1");
+ }
+
+ [Test, TestCaseSource("twofloats")]
+ public void contructor2(float x, float y)
+ {
+ XNANormalizedByte2 xnaVal = new XNANormalizedByte2(new XNAVector2(x, y));
+ ANXNormalizedByte2 anxVal = new ANXNormalizedByte2(new ANXVector2(x, y));
+
+ AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor2");
+ }
+
+ [Test, TestCaseSource("twofloats")]
+ public void unpack1(float x, float y)
+ {
+ XNANormalizedByte2 xnaVal = new XNANormalizedByte2(x, y);
+ ANXNormalizedByte2 anxVal = new ANXNormalizedByte2(x, y);
+
+ AssertHelper.ConvertEquals(xnaVal.ToVector2(), anxVal.ToVector2(), "unpack1");
+ }
+ }
+}
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedByte4Test.cs b/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedByte4Test.cs
new file mode 100644
index 00000000..bbc79e51
--- /dev/null
+++ b/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedByte4Test.cs
@@ -0,0 +1,109 @@
+#region Using Statements
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+
+using XNANormalizedByte4 = Microsoft.Xna.Framework.Graphics.PackedVector.NormalizedByte4;
+using ANXNormalizedByte4 = ANX.Framework.Graphics.PackedVector.NormalizedByte4;
+
+using XNAVector4 = Microsoft.Xna.Framework.Vector4;
+using ANXVector4 = ANX.Framework.Vector4;
+
+#endregion // Using Statements
+
+#region License
+
+//
+// This file is part of the ANX.Framework created by the "ANX.Framework developer group".
+//
+// This file is released under the Ms-PL license.
+//
+//
+//
+// Microsoft Public License (Ms-PL)
+//
+// This license governs use of the accompanying software. If you use the software, you accept this license.
+// If you do not accept the license, do not use the software.
+//
+// 1.Definitions
+// The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning
+// here as under U.S. copyright law.
+// A "contribution" is the original software, or any additions or changes to the software.
+// A "contributor" is any person that distributes its contribution under this license.
+// "Licensed patents" are a contributor's patent claims that read directly on its contribution.
+//
+// 2.Grant of Rights
+// (A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations
+// in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to
+// reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution
+// or any derivative works that you create.
+// (B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in
+// section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed
+// patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution
+// in the software or derivative works of the contribution in the software.
+//
+// 3.Conditions and Limitations
+// (A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
+// (B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your
+// patent license from such contributor to the software ends automatically.
+// (C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution
+// notices that are present in the software.
+// (D) If you distribute any portion of the software in source code form, you may do so only under this license by including
+// a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or
+// object code form, you may only do so under a license that complies with this license.
+// (E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees,
+// or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the
+// extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a
+// particular purpose and non-infringement.
+
+#endregion // License
+
+namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+{
+ [TestFixture]
+ class NormalizedByte4Test
+ {
+ #region Testdata
+
+ static object[] fourfloats =
+ {
+ new object[] { DataFactory.RandomValue, DataFactory.RandomValue, DataFactory.RandomValue, DataFactory.RandomValue },
+ new object[] { DataFactory.RandomValue, DataFactory.RandomValue, DataFactory.RandomValue, DataFactory.RandomValue },
+ new object[] { DataFactory.RandomValue, DataFactory.RandomValue, DataFactory.RandomValue, DataFactory.RandomValue },
+ new object[] { DataFactory.RandomValue, DataFactory.RandomValue, DataFactory.RandomValue, DataFactory.RandomValue },
+ new object[] { DataFactory.RandomValue, DataFactory.RandomValue, DataFactory.RandomValue, DataFactory.RandomValue },
+ };
+
+ #endregion
+
+ [Test, TestCaseSource("fourfloats")]
+ public void contructor1(float x, float y, float z, float w)
+ {
+ XNANormalizedByte4 xnaVal = new XNANormalizedByte4(x, y, z, w);
+ ANXNormalizedByte4 anxVal = new ANXNormalizedByte4(x, y, z, w);
+
+ AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor1");
+ }
+
+ [Test, TestCaseSource("fourfloats")]
+ public void contructor2(float x, float y, float z, float w)
+ {
+ XNANormalizedByte4 xnaVal = new XNANormalizedByte4(new XNAVector4(x, y, z, w));
+ ANXNormalizedByte4 anxVal = new ANXNormalizedByte4(new ANXVector4(x, y, z, w));
+
+ AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor2");
+ }
+
+ [Test, TestCaseSource("fourfloats")]
+ public void unpack1(float x, float y, float z, float w)
+ {
+ XNANormalizedByte4 xnaVal = new XNANormalizedByte4(x, y, z, w);
+ ANXNormalizedByte4 anxVal = new ANXNormalizedByte4(x, y, z, w);
+
+ AssertHelper.ConvertEquals(xnaVal.ToVector4(), anxVal.ToVector4(), "unpack1");
+ }
+ }
+}
diff --git a/ANX.Framework/Graphics/PackedVector/NormalizedByte2.cs b/ANX.Framework/Graphics/PackedVector/NormalizedByte2.cs
index c9583ab7..76e0ba38 100644
--- a/ANX.Framework/Graphics/PackedVector/NormalizedByte2.cs
+++ b/ANX.Framework/Graphics/PackedVector/NormalizedByte2.cs
@@ -52,33 +52,115 @@ using System;
namespace ANX.Framework.Graphics.PackedVector
{
- public struct NormalizedByte2 : IPackedVector, IEquatable, IPackedVector
+ public struct NormalizedByte2 : IPackedVector, IEquatable, IPackedVector
{
- public UInt16 PackedValue
+ private ushort packedValue;
+
+ private const float max = (float)(255 >> 1);
+ private const float oneOverMax = 1f / max;
+ private const uint mask = (uint)(256 >> 1);
+
+ public NormalizedByte2(float x, float y)
+ {
+ ushort b1 = (ushort)(((int)MathHelper.Clamp(x * max, -max, max) & 255) << 0);
+ ushort b2 = (ushort)(((int)MathHelper.Clamp(y * max, -max, max) & 255) << 8);
+
+ this.packedValue = (UInt16)(b1 | b2);
+ }
+
+ public NormalizedByte2(Vector2 vector)
+ {
+ ushort b1 = (ushort)(((int)MathHelper.Clamp(vector.X * max, -max, max) & 255) << 0);
+ ushort b2 = (ushort)(((int)MathHelper.Clamp(vector.Y * max, -max, max) & 255) << 8);
+
+ this.packedValue = (UInt16)(b1 | b2);
+ }
+
+ public ushort PackedValue
{
get
{
- throw new NotImplementedException();
+ return this.packedValue;
}
set
{
- throw new NotImplementedException();
+ this.packedValue = value;
}
}
- public void PackFromVector4(Vector4 vector)
+ public Vector2 ToVector2()
{
- throw new NotImplementedException();
+ Vector2 vector;
+ vector.X = convert(0xff, (uint)this.packedValue);
+ vector.Y = convert(0xff, (uint)(this.packedValue >> 8));
+ return vector;
}
- public Vector4 ToVector4()
+ private static float convert(uint bitmask, uint value)
{
- throw new NotImplementedException();
+ if ((value & mask) != 0)
+ {
+ if ((value & 255) >= mask)
+ {
+ return -1f;
+ }
+ value |= ~bitmask;
+ }
+ else
+ {
+ value &= 255;
+ }
+
+ return (((float)value) * oneOverMax);
+ }
+
+ void IPackedVector.PackFromVector4(Vector4 vector)
+ {
+ ushort b1 = (ushort)(((int)MathHelper.Clamp(vector.X * max, -max, max) & 255) << 0);
+ ushort b2 = (ushort)(((int)MathHelper.Clamp(vector.Y * max, -max, max) & 255) << 8);
+
+ this.packedValue = (UInt16)(b1 | b2);
+ }
+
+ Vector4 IPackedVector.ToVector4()
+ {
+ Vector2 val = this.ToVector2();
+ return new Vector4(val.X, val.Y, 0f, 1f);
+ }
+
+ public override bool Equals(object obj)
+ {
+ if (obj != null && obj.GetType() == this.GetType())
+ {
+ return this == (NormalizedByte2)obj;
+ }
+
+ return false;
}
public bool Equals(NormalizedByte2 other)
{
- throw new NotImplementedException();
+ return this.packedValue == other.packedValue;
+ }
+
+ public override string ToString()
+ {
+ return this.ToVector2().ToString();
+ }
+
+ public override int GetHashCode()
+ {
+ return this.packedValue.GetHashCode();
+ }
+
+ public static bool operator ==(NormalizedByte2 lhs, NormalizedByte2 rhs)
+ {
+ return lhs.packedValue == rhs.packedValue;
+ }
+
+ public static bool operator !=(NormalizedByte2 lhs, NormalizedByte2 rhs)
+ {
+ return lhs.packedValue != rhs.packedValue;
}
}
}
diff --git a/ANX.Framework/Graphics/PackedVector/NormalizedByte4.cs b/ANX.Framework/Graphics/PackedVector/NormalizedByte4.cs
index 2b90ff49..906aa323 100644
--- a/ANX.Framework/Graphics/PackedVector/NormalizedByte4.cs
+++ b/ANX.Framework/Graphics/PackedVector/NormalizedByte4.cs
@@ -54,31 +54,118 @@ namespace ANX.Framework.Graphics.PackedVector
{
public struct NormalizedByte4 : IPackedVector, IEquatable, IPackedVector
{
+ private uint packedValue;
+
+ private const float max = (float)(255 >> 1);
+ private const float oneOverMax = 1f / max;
+ private const uint mask = (uint)(256 >> 1);
+
+ public NormalizedByte4(float x, float y, float z, float w)
+ {
+ uint b1 = (uint)(((int)MathHelper.Clamp(x * max, -max, max) & 255) << 0);
+ uint b2 = (uint)(((int)MathHelper.Clamp(y * max, -max, max) & 255) << 8);
+ uint b3 = (uint)(((int)MathHelper.Clamp(z * max, -max, max) & 255) << 16);
+ uint b4 = (uint)(((int)MathHelper.Clamp(w * max, -max, max) & 255) << 24);
+
+ this.packedValue = (uint)(b1 | b2 | b3 | b4);
+ }
+
+ public NormalizedByte4(Vector4 vector)
+ {
+ uint b1 = (uint)(((int)MathHelper.Clamp(vector.X * max, -max, max) & 255) << 0);
+ uint b2 = (uint)(((int)MathHelper.Clamp(vector.Y * max, -max, max) & 255) << 8);
+ uint b3 = (uint)(((int)MathHelper.Clamp(vector.Z * max, -max, max) & 255) << 16);
+ uint b4 = (uint)(((int)MathHelper.Clamp(vector.W * max, -max, max) & 255) << 24);
+
+ this.packedValue = (uint)(b1 | b2 | b3 | b4);
+ }
+
public uint PackedValue
{
get
{
- throw new NotImplementedException();
+ return this.packedValue;
}
set
{
- throw new NotImplementedException();
+ this.packedValue = value;
}
}
- public void PackFromVector4(Vector4 vector)
- {
- throw new NotImplementedException();
- }
-
public Vector4 ToVector4()
{
- throw new NotImplementedException();
+ Vector4 vector;
+ vector.X = convert(0xff, (uint)this.packedValue);
+ vector.Y = convert(0xff, (uint)(this.packedValue >> 8));
+ vector.Z = convert(0xff, (uint)(this.packedValue >> 16));
+ vector.W = convert(0xff, (uint)(this.packedValue >> 24));
+ return vector;
+ }
+
+ private static float convert(uint bitmask, uint value)
+ {
+ if ((value & mask) != 0)
+ {
+ if ((value & 255) >= mask)
+ {
+ return -1f;
+ }
+ value |= ~bitmask;
+ }
+ else
+ {
+ value &= 255;
+ }
+
+ return (((float)value) * oneOverMax);
+ }
+
+ void IPackedVector.PackFromVector4(Vector4 vector)
+ {
+ ushort b1 = (ushort)(((int)MathHelper.Clamp(vector.X * max, -max, max) & 255) << 0);
+ ushort b2 = (ushort)(((int)MathHelper.Clamp(vector.Y * max, -max, max) & 255) << 8);
+
+ this.packedValue = (UInt16)(b1 | b2);
+ }
+
+ Vector4 IPackedVector.ToVector4()
+ {
+ return this.ToVector4();
+ }
+
+ public override bool Equals(object obj)
+ {
+ if (obj != null && obj.GetType() == this.GetType())
+ {
+ return this == (NormalizedByte4)obj;
+ }
+
+ return false;
}
public bool Equals(NormalizedByte4 other)
{
- throw new NotImplementedException();
+ return this.packedValue == other.packedValue;
+ }
+
+ public override string ToString()
+ {
+ return this.packedValue.ToString("X8");
+ }
+
+ public override int GetHashCode()
+ {
+ return this.packedValue.GetHashCode();
+ }
+
+ public static bool operator ==(NormalizedByte4 lhs, NormalizedByte4 rhs)
+ {
+ return lhs.packedValue == rhs.packedValue;
+ }
+
+ public static bool operator !=(NormalizedByte4 lhs, NormalizedByte4 rhs)
+ {
+ return lhs.packedValue != rhs.packedValue;
}
}
}