implemented HalfVector2 struct
This commit is contained in:
Glatzemann
parent
c60d9405dd
commit
a2b73245e9
@ -69,6 +69,7 @@
|
||||
<Compile Include="Strukturen\PackedVector\Bgra4444Test.cs" />
|
||||
<Compile Include="Strukturen\PackedVector\Byte4Test.cs" />
|
||||
<Compile Include="Strukturen\PackedVector\HalfSingleTest.cs" />
|
||||
<Compile Include="Strukturen\PackedVector\HalfVector2Test.cs" />
|
||||
<Compile Include="Strukturen\PlaneTest.cs" />
|
||||
<Compile Include="Strukturen\PointTest.cs" />
|
||||
<Compile Include="Strukturen\RayTest.cs" />
|
||||
|
||||
@ -96,6 +96,9 @@ using ANXByte4 = ANX.Framework.Graphics.PackedVector.Byte4;
|
||||
using XNAHalfSingle = Microsoft.Xna.Framework.Graphics.PackedVector.HalfSingle;
|
||||
using ANXHalfSingle = ANX.Framework.Graphics.PackedVector.HalfSingle;
|
||||
|
||||
using XNAHalfVector2 = Microsoft.Xna.Framework.Graphics.PackedVector.HalfVector2;
|
||||
using ANXHalfVector2 = ANX.Framework.Graphics.PackedVector.HalfVector2;
|
||||
|
||||
namespace ANX.Framework.TestCenter
|
||||
{
|
||||
class AssertHelper
|
||||
@ -160,6 +163,18 @@ namespace ANX.Framework.TestCenter
|
||||
}
|
||||
}
|
||||
|
||||
public static void ConvertEquals(XNAHalfVector2 lhs, ANXHalfVector2 rhs, String test)
|
||||
{
|
||||
if (lhs.PackedValue == rhs.PackedValue)
|
||||
{
|
||||
Assert.Pass(test + " passed");
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.Fail(String.Format("{0] failed: HalfVector2 XNA: ({1}) HalfVector2 ANX: ({2})", test, lhs, rhs));
|
||||
}
|
||||
}
|
||||
|
||||
public static void ConvertEquals(float a, float b, String test)
|
||||
{
|
||||
if (a.Equals(b))
|
||||
|
||||
@ -0,0 +1,109 @@
|
||||
#region Using Statements
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using NUnit.Framework;
|
||||
|
||||
using XNAHalfVector2 = Microsoft.Xna.Framework.Graphics.PackedVector.HalfVector2;
|
||||
using ANXHalfVector2 = ANX.Framework.Graphics.PackedVector.HalfVector2;
|
||||
|
||||
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 HalfVector2Test
|
||||
{
|
||||
#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)
|
||||
{
|
||||
XNAHalfVector2 xnaVal = new XNAHalfVector2(x, y);
|
||||
ANXHalfVector2 anxVal = new ANXHalfVector2(x, y);
|
||||
|
||||
AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor1");
|
||||
}
|
||||
|
||||
[Test, TestCaseSource("twofloats")]
|
||||
public void contructor2(float x, float y)
|
||||
{
|
||||
XNAHalfVector2 xnaVal = new XNAHalfVector2(new XNAVector2(x, y));
|
||||
ANXHalfVector2 anxVal = new ANXHalfVector2(new ANXVector2(x, y));
|
||||
|
||||
AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor2");
|
||||
}
|
||||
|
||||
[Test, TestCaseSource("twofloats")]
|
||||
public void unpack1(float x, float y)
|
||||
{
|
||||
XNAHalfVector2 xnaVal = new XNAHalfVector2(x, y);
|
||||
ANXHalfVector2 anxVal = new ANXHalfVector2(x, y);
|
||||
|
||||
AssertHelper.ConvertEquals(xnaVal.ToVector2(), anxVal.ToVector2(), "unpack1");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -54,31 +54,79 @@ namespace ANX.Framework.Graphics.PackedVector
|
||||
{
|
||||
public struct HalfVector2 : IPackedVector<uint>, IEquatable<HalfVector2>, IPackedVector
|
||||
{
|
||||
private uint packedValue;
|
||||
|
||||
public HalfVector2(float x, float y)
|
||||
{
|
||||
packedValue = HalfTypeHelper.convert(x) | (uint)HalfTypeHelper.convert(y) << 16;
|
||||
}
|
||||
|
||||
public HalfVector2(Vector2 vector)
|
||||
{
|
||||
packedValue = HalfTypeHelper.convert(vector.X) | (uint)HalfTypeHelper.convert(vector.Y) << 16;
|
||||
}
|
||||
|
||||
public uint 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();
|
||||
return new Vector2(HalfTypeHelper.convert((ushort)this.packedValue), HalfTypeHelper.convert((ushort)(this.packedValue >> 16)));
|
||||
}
|
||||
|
||||
public Vector4 ToVector4()
|
||||
void IPackedVector.PackFromVector4(Vector4 vector)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
packedValue = HalfTypeHelper.convert(vector.X) | (uint)HalfTypeHelper.convert(vector.Y) << 16;
|
||||
}
|
||||
|
||||
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 == (HalfVector2)obj;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool Equals(HalfVector2 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 ==(HalfVector2 lhs, HalfVector2 rhs)
|
||||
{
|
||||
return lhs.packedValue == rhs.packedValue;
|
||||
}
|
||||
|
||||
public static bool operator !=(HalfVector2 lhs, HalfVector2 rhs)
|
||||
{
|
||||
return lhs.packedValue != rhs.packedValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user