diff --git a/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj b/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj
index 7e144712..11f56ac4 100644
--- a/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj
+++ b/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj
@@ -67,6 +67,7 @@
+
diff --git a/ANX.Framework.TestCenter/AssertHelper.cs b/ANX.Framework.TestCenter/AssertHelper.cs
index 80e542d3..f7ecfeab 100644
--- a/ANX.Framework.TestCenter/AssertHelper.cs
+++ b/ANX.Framework.TestCenter/AssertHelper.cs
@@ -90,6 +90,9 @@ using ANXBgra5551 = ANX.Framework.Graphics.PackedVector.Bgra5551;
using XNABgra4444 = Microsoft.Xna.Framework.Graphics.PackedVector.Bgra4444;
using ANXBgra4444 = ANX.Framework.Graphics.PackedVector.Bgra4444;
+using XNAByte4 = Microsoft.Xna.Framework.Graphics.PackedVector.Byte4;
+using ANXByte4 = ANX.Framework.Graphics.PackedVector.Byte4;
+
namespace ANX.Framework.TestCenter
{
class AssertHelper
@@ -130,6 +133,18 @@ namespace ANX.Framework.TestCenter
}
}
+ public static void ConvertEquals(XNAByte4 lhs, ANXByte4 rhs, String test)
+ {
+ if (lhs.PackedValue == rhs.PackedValue)
+ {
+ Assert.Pass(test + " passed");
+ }
+ else
+ {
+ Assert.Fail(String.Format("{0] failed: Byte4 XNA: ({1}) Byte4 ANX: ({2})", test, lhs, rhs));
+ }
+ }
+
public static void ConvertEquals(byte a, byte b, String test)
{
if (a == b)
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/Byte4Test.cs b/ANX.Framework.TestCenter/Strukturen/PackedVector/Byte4Test.cs
new file mode 100644
index 00000000..4e39ff60
--- /dev/null
+++ b/ANX.Framework.TestCenter/Strukturen/PackedVector/Byte4Test.cs
@@ -0,0 +1,111 @@
+#region Using Statements
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+
+using XNAByte4 = Microsoft.Xna.Framework.Graphics.PackedVector.Byte4;
+using ANXByte4 = ANX.Framework.Graphics.PackedVector.Byte4;
+
+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 Byte4Test
+ {
+ #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 r, float g, float b, float a)
+ {
+ XNAByte4 xnaVal = new XNAByte4(r, g, b, a);
+ ANXByte4 anxVal = new ANXByte4(r, g, b, a);
+
+ AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor1");
+ }
+
+ [Test, TestCaseSource("fourfloats")]
+ public void contructor2(float r, float g, float b, float a)
+ {
+
+ XNAByte4 xnaVal = new XNAByte4(new XNAVector4(r, g, b, a));
+ ANXByte4 anxVal = new ANXByte4(new ANXVector4(r, g, b, a));
+
+ AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor2");
+ }
+
+ [Test, TestCaseSource("fourfloats")]
+ public void ToVector4(float r, float g, float b, float a)
+ {
+ XNAByte4 xnaVal = new XNAByte4(r, g, b, a);
+ ANXByte4 anxVal = new ANXByte4(r, g, b, a);
+
+ AssertHelper.ConvertEquals(xnaVal.ToVector4(), anxVal.ToVector4(), "ToVector4");
+ }
+
+ }
+}
diff --git a/ANX.Framework/Graphics/PackedVector/Byte4.cs b/ANX.Framework/Graphics/PackedVector/Byte4.cs
index 6256c758..d5022c93 100644
--- a/ANX.Framework/Graphics/PackedVector/Byte4.cs
+++ b/ANX.Framework/Graphics/PackedVector/Byte4.cs
@@ -54,31 +54,91 @@ namespace ANX.Framework.Graphics.PackedVector
{
public struct Byte4 : IPackedVector, IEquatable, IPackedVector
{
+ private uint packedValue;
+
+ public Byte4(float x, float y, float z, float w)
+ {
+ uint b1 = (uint)MathHelper.Clamp(x, 0f, 255f) << 0;
+ uint b2 = (uint)MathHelper.Clamp(y, 0f, 255f) << 8;
+ uint b3 = (uint)MathHelper.Clamp(z, 0f, 255f) << 16;
+ uint b4 = (uint)MathHelper.Clamp(w, 0f, 255f) << 24;
+
+ this.packedValue = (uint)(b1 | b2 | b3 | b4);
+ }
+
+ public Byte4(Vector4 vector)
+ {
+ uint b1 = (uint)MathHelper.Clamp(vector.X, 0f, 255f) << 0;
+ uint b2 = (uint)MathHelper.Clamp(vector.Y, 0f, 255f) << 8;
+ uint b3 = (uint)MathHelper.Clamp(vector.Z, 0f, 255f) << 16;
+ uint b4 = (uint)MathHelper.Clamp(vector.W, 0f, 255f) << 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)
+ void IPackedVector.PackFromVector4(Vector4 vector)
{
- throw new NotImplementedException();
+ uint b1 = (uint)MathHelper.Clamp(vector.X, 0f, 255f) << 0;
+ uint b2 = (uint)MathHelper.Clamp(vector.Y, 0f, 255f) << 8;
+ uint b3 = (uint)MathHelper.Clamp(vector.Z, 0f, 255f) << 16;
+ uint b4 = (uint)MathHelper.Clamp(vector.W, 0f, 255f) << 24;
+
+ this.packedValue = (uint)(b1 | b2 | b3 | b4);
}
public Vector4 ToVector4()
{
- throw new NotImplementedException();
+ return new Vector4((packedValue >> 0) & 255,
+ (packedValue >> 8) & 255,
+ (packedValue >> 16) & 255,
+ (packedValue >> 24) & 255);
+ }
+
+ public override bool Equals(object obj)
+ {
+ if (obj != null && obj.GetType() == this.GetType())
+ {
+ return this == (Byte4)obj;
+ }
+
+ return false;
}
public bool Equals(Byte4 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 ==(Byte4 lhs, Byte4 rhs)
+ {
+ return lhs.packedValue == rhs.packedValue;
+ }
+
+ public static bool operator !=(Byte4 lhs, Byte4 rhs)
+ {
+ return lhs.packedValue != rhs.packedValue;
}
}
}