diff --git a/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj b/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj index 3c697b5a..4a1c7297 100644 --- a/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj +++ b/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj @@ -70,6 +70,7 @@ + diff --git a/ANX.Framework.TestCenter/AssertHelper.cs b/ANX.Framework.TestCenter/AssertHelper.cs index 9c75d625..a6e2af63 100644 --- a/ANX.Framework.TestCenter/AssertHelper.cs +++ b/ANX.Framework.TestCenter/AssertHelper.cs @@ -99,6 +99,9 @@ using ANXHalfSingle = ANX.Framework.Graphics.PackedVector.HalfSingle; using XNAHalfVector2 = Microsoft.Xna.Framework.Graphics.PackedVector.HalfVector2; using ANXHalfVector2 = ANX.Framework.Graphics.PackedVector.HalfVector2; +using XNAHalfVector4 = Microsoft.Xna.Framework.Graphics.PackedVector.HalfVector4; +using ANXHalfVector4 = ANX.Framework.Graphics.PackedVector.HalfVector4; + namespace ANX.Framework.TestCenter { class AssertHelper @@ -175,6 +178,18 @@ namespace ANX.Framework.TestCenter } } + public static void ConvertEquals(XNAHalfVector4 lhs, ANXHalfVector4 rhs, String test) + { + if (lhs.PackedValue == rhs.PackedValue) + { + Assert.Pass(test + " passed"); + } + else + { + Assert.Fail(String.Format("{0] failed: HalfVector4 XNA: ({1}) HalfVector4 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/HalfVector4Test.cs b/ANX.Framework.TestCenter/Strukturen/PackedVector/HalfVector4Test.cs new file mode 100644 index 00000000..5a08c828 --- /dev/null +++ b/ANX.Framework.TestCenter/Strukturen/PackedVector/HalfVector4Test.cs @@ -0,0 +1,109 @@ +#region Using Statements + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using NUnit.Framework; + +using XNAHalfVector4 = Microsoft.Xna.Framework.Graphics.PackedVector.HalfVector4; +using ANXHalfVector4 = ANX.Framework.Graphics.PackedVector.HalfVector4; + +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 HalfVector4Test + { + #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) + { + XNAHalfVector4 xnaVal = new XNAHalfVector4(x, y, z, w); + ANXHalfVector4 anxVal = new ANXHalfVector4(x, y, z, w); + + AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor1"); + } + + [Test, TestCaseSource("fourfloats")] + public void contructor2(float x, float y, float z, float w) + { + XNAHalfVector4 xnaVal = new XNAHalfVector4(new XNAVector4(x, y, z, w)); + ANXHalfVector4 anxVal = new ANXHalfVector4(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) + { + XNAHalfVector4 xnaVal = new XNAHalfVector4(x, y, z, w); + ANXHalfVector4 anxVal = new ANXHalfVector4(x, y, z, w); + + AssertHelper.ConvertEquals(xnaVal.ToVector4(), anxVal.ToVector4(), "unpack1"); + } + } +} diff --git a/ANX.Framework/Graphics/PackedVector/HalfVector4.cs b/ANX.Framework/Graphics/PackedVector/HalfVector4.cs index fe08a2aa..f53aa55a 100644 --- a/ANX.Framework/Graphics/PackedVector/HalfVector4.cs +++ b/ANX.Framework/Graphics/PackedVector/HalfVector4.cs @@ -52,33 +52,85 @@ using System; namespace ANX.Framework.Graphics.PackedVector { - public struct HalfVector4 : IPackedVector, IEquatable, IPackedVector + public struct HalfVector4 : IPackedVector, IEquatable, IPackedVector { - public uint PackedValue + private ulong packedValue; + + public HalfVector4(float x, float y, float z, float w) + { + this.packedValue = (ulong)HalfTypeHelper.convert(x) + | (ulong)HalfTypeHelper.convert(y) << 16 + | (ulong)HalfTypeHelper.convert(z) << 32 + | (ulong)HalfTypeHelper.convert(w) << 48; + } + + public HalfVector4(Vector4 vector) + { + this.packedValue = (ulong)HalfTypeHelper.convert(vector.X) + | (ulong)HalfTypeHelper.convert(vector.Y) << 16 + | (ulong)HalfTypeHelper.convert(vector.Z) << 32 + | (ulong)HalfTypeHelper.convert(vector.W) << 48; + } + + public ulong 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(); + return new Vector4(HalfTypeHelper.convert((ushort)this.packedValue), + HalfTypeHelper.convert((ushort)(this.packedValue >> 16)), + HalfTypeHelper.convert((ushort)(this.packedValue >> 32)), + HalfTypeHelper.convert((ushort)(this.packedValue >> 48)) + ); + } + + void IPackedVector.PackFromVector4(Vector4 vector) + { + packedValue = HalfTypeHelper.convert(vector.X) | (uint)HalfTypeHelper.convert(vector.Y) << 16; + } + + public override bool Equals(object obj) + { + if (obj != null && obj.GetType() == this.GetType()) + { + return this == (HalfVector4)obj; + } + + return false; } public bool Equals(HalfVector4 other) { - throw new NotImplementedException(); + return this.packedValue == other.packedValue; + } + + public override string ToString() + { + return this.ToVector4().ToString(); + } + + public override int GetHashCode() + { + return this.packedValue.GetHashCode(); + } + + public static bool operator ==(HalfVector4 lhs, HalfVector4 rhs) + { + return lhs.packedValue == rhs.packedValue; + } + + public static bool operator !=(HalfVector4 lhs, HalfVector4 rhs) + { + return lhs.packedValue != rhs.packedValue; } } }