backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

changed version and copyright of ANX.InputSystem.Windows.Kinect and changed project type to assembly

Browse Source 
implemented NormalizedShort2 and NormalizedShort4 struct
fixed a bug in NormalizedByte4
implemented Short2 and Short4 datatypes. The PackedVector namespace is now feature complete.
This commit is contained in:
Glatzemann 2011-11-09 05:54:10 +00:00
parent 99530730bd
commit 9e5d0858c5
14 changed files with 855 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj
View File

@ -71,6 +71,10 @@
<Compile Include="Strukturen\PackedVector\HalfSingleTest.cs" />
<Compile Include="Strukturen\PackedVector\HalfVector2Test.cs" />
<Compile Include="Strukturen\PackedVector\HalfVector4Test.cs" />
<Compile Include="Strukturen\PackedVector\Short2Test.cs" />
<Compile Include="Strukturen\PackedVector\Short4Test.cs" />
<Compile Include="Strukturen\PackedVector\NormalizedShort4Test.cs" />
<Compile Include="Strukturen\PackedVector\NormalizedShort2Test.cs" />
<Compile Include="Strukturen\PackedVector\NormalizedByte4Test.cs" />
<Compile Include="Strukturen\PackedVector\NormalizedByte2Test.cs" />
<Compile Include="Strukturen\PackedVector\Rgba64Test.cs" />

60
ANX.Framework.TestCenter/AssertHelper.cs
View File

@ -118,6 +118,18 @@ using ANXNormalizedByte2 = ANX.Framework.Graphics.PackedVector.NormalizedByte2;
using XNANormalizedByte4 = Microsoft.Xna.Framework.Graphics.PackedVector.NormalizedByte4;
using ANXNormalizedByte4 = ANX.Framework.Graphics.PackedVector.NormalizedByte4;
using XNANormalizedShort2 = Microsoft.Xna.Framework.Graphics.PackedVector.NormalizedShort2;
using ANXNormalizedShort2 = ANX.Framework.Graphics.PackedVector.NormalizedShort2;
using XNANormalizedShort4 = Microsoft.Xna.Framework.Graphics.PackedVector.NormalizedShort4;
using ANXNormalizedShort4 = ANX.Framework.Graphics.PackedVector.NormalizedShort4;
using XNAShort2 = Microsoft.Xna.Framework.Graphics.PackedVector.Short2;
using ANXShort2 = ANX.Framework.Graphics.PackedVector.Short2;
using XNAShort4 = Microsoft.Xna.Framework.Graphics.PackedVector.Short4;
using ANXShort4 = ANX.Framework.Graphics.PackedVector.Short4;
#endregion // Datatype usings
namespace ANX.Framework.TestCenter
@ -268,6 +280,54 @@ namespace ANX.Framework.TestCenter
}
}
public static void ConvertEquals(XNANormalizedShort2 lhs, ANXNormalizedShort2 rhs, String test)
{
if (lhs.PackedValue == rhs.PackedValue)
{
Assert.Pass(test + " passed");
}
else
{
Assert.Fail(String.Format("{0] failed: NormalizedShort2 XNA: ({1}) NormalizedShort2 ANX: ({2})", test, lhs, rhs));
}
}
public static void ConvertEquals(XNANormalizedShort4 lhs, ANXNormalizedShort4 rhs, String test)
{
if (lhs.PackedValue == rhs.PackedValue)
{
Assert.Pass(test + " passed");
}
else
{
Assert.Fail(String.Format("{0] failed: NormalizedShort4 XNA: ({1}) NormalizedShort4 ANX: ({2})", test, lhs, rhs));
}
}
public static void ConvertEquals(XNAShort2 lhs, ANXShort2 rhs, String test)
{
if (lhs.PackedValue == rhs.PackedValue)
{
Assert.Pass(test + " passed");
}
else
{
Assert.Fail(String.Format("{0] failed: Short2 XNA: ({1}) Short2 ANX: ({2})", test, lhs, rhs));
}
}
public static void ConvertEquals(XNAShort4 lhs, ANXShort4 rhs, String test)
{
if (lhs.PackedValue == rhs.PackedValue)
{
Assert.Pass(test + " passed");
}
else
{
Assert.Fail(String.Format("{0] failed: Short4 XNA: ({1}) Short4 ANX: ({2})", test, lhs, rhs));
}
}
public static void ConvertEquals(float a, float b, String test)
{
if (a.Equals(b))

109
ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedShort2Test.cs Normal file
View File

@ -0,0 +1,109 @@
#region Using Statements
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using NUnit.Framework;
using XNANormalizedShort2 = Microsoft.Xna.Framework.Graphics.PackedVector.NormalizedShort2;
using ANXNormalizedShort2 = ANX.Framework.Graphics.PackedVector.NormalizedShort2;
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 NormalizedShort2Test
{
#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)
{
XNANormalizedShort2 xnaVal = new XNANormalizedShort2(x, y);
ANXNormalizedShort2 anxVal = new ANXNormalizedShort2(x, y);
AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor1");
}
[Test, TestCaseSource("twofloats")]
public void contructor2(float x, float y)
{
XNANormalizedShort2 xnaVal = new XNANormalizedShort2(new XNAVector2(x, y));
ANXNormalizedShort2 anxVal = new ANXNormalizedShort2(new ANXVector2(x, y));
AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor2");
}
[Test, TestCaseSource("twofloats")]
public void unpack1(float x, float y)
{
XNANormalizedShort2 xnaVal = new XNANormalizedShort2(x, y);
ANXNormalizedShort2 anxVal = new ANXNormalizedShort2(x, y);
AssertHelper.ConvertEquals(xnaVal.ToVector2(), anxVal.ToVector2(), "unpack1");
}
}
}

109
ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedShort4Test.cs Normal file
View File

@ -0,0 +1,109 @@
#region Using Statements
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using NUnit.Framework;
using XNANormalizedShort4 = Microsoft.Xna.Framework.Graphics.PackedVector.NormalizedShort4;
using ANXNormalizedShort4 = ANX.Framework.Graphics.PackedVector.NormalizedShort4;
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 NormalizedShort4Test
{
#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)
{
XNANormalizedShort4 xnaVal = new XNANormalizedShort4(x, y, z, w);
ANXNormalizedShort4 anxVal = new ANXNormalizedShort4(x, y, z, w);
AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor1");
}
[Test, TestCaseSource("fourfloats")]
public void contructor2(float x, float y, float z, float w)
{
XNANormalizedShort4 xnaVal = new XNANormalizedShort4(new XNAVector4(x, y, z, w));
ANXNormalizedShort4 anxVal = new ANXNormalizedShort4(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)
{
XNANormalizedShort4 xnaVal = new XNANormalizedShort4(x, y, z, w);
ANXNormalizedShort4 anxVal = new ANXNormalizedShort4(x, y, z, w);
AssertHelper.ConvertEquals(xnaVal.ToVector4(), anxVal.ToVector4(), "unpack1");
}
}
}

109
ANX.Framework.TestCenter/Strukturen/PackedVector/Short2Test.cs Normal file
View File

@ -0,0 +1,109 @@
#region Using Statements
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using NUnit.Framework;
using XNAShort2 = Microsoft.Xna.Framework.Graphics.PackedVector.Short2;
using ANXShort2 = ANX.Framework.Graphics.PackedVector.Short2;
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 Short2Test
{
#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)
{
XNAShort2 xnaVal = new XNAShort2(x, y);
ANXShort2 anxVal = new ANXShort2(x, y);
AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor1");
}
[Test, TestCaseSource("twofloats")]
public void contructor2(float x, float y)
{
XNAShort2 xnaVal = new XNAShort2(new XNAVector2(x, y));
ANXShort2 anxVal = new ANXShort2(new ANXVector2(x, y));
AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor2");
}
[Test, TestCaseSource("twofloats")]
public void unpack1(float x, float y)
{
XNAShort2 xnaVal = new XNAShort2(x, y);
ANXShort2 anxVal = new ANXShort2(x, y);
AssertHelper.ConvertEquals(xnaVal.ToVector2(), anxVal.ToVector2(), "unpack1");
}
}
}

109
ANX.Framework.TestCenter/Strukturen/PackedVector/Short4Test.cs Normal file
View File

@ -0,0 +1,109 @@
#region Using Statements
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using NUnit.Framework;
using XNAShort4 = Microsoft.Xna.Framework.Graphics.PackedVector.Short4;
using ANXShort4 = ANX.Framework.Graphics.PackedVector.Short4;
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 Short4Test
{
#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)
{
XNAShort4 xnaVal = new XNAShort4(x, y, z, w);
ANXShort4 anxVal = new ANXShort4(x, y, z, w);
AssertHelper.ConvertEquals(xnaVal, anxVal, "Constructor1");
}
[Test, TestCaseSource("fourfloats")]
public void contructor2(float x, float y, float z, float w)
{
XNAShort4 xnaVal = new XNAShort4(new XNAVector4(x, y, z, w));
ANXShort4 anxVal = new ANXShort4(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)
{
XNAShort4 xnaVal = new XNAShort4(x, y, z, w);
ANXShort4 anxVal = new ANXShort4(x, y, z, w);
AssertHelper.ConvertEquals(xnaVal.ToVector4(), anxVal.ToVector4(), "unpack1");
}
}
}

8
ANX.Framework/Graphics/PackedVector/NormalizedByte4.cs
View File

@ -122,10 +122,12 @@ namespace ANX.Framework.Graphics.PackedVector
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);
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 = (UInt16)(b1 | b2);
this.packedValue = (uint)(b1 | b2 | b3 | b4);
}
Vector4 IPackedVector.ToVector4()

96
ANX.Framework/Graphics/PackedVector/NormalizedShort2.cs
View File

@ -54,31 +54,113 @@ namespace ANX.Framework.Graphics.PackedVector
{
public struct NormalizedShort2 : IPackedVector<uint>, IEquatable<NormalizedShort2>, IPackedVector
{
private uint packedValue;
private const float max = (float)(65535 >> 1);
private const float oneOverMax = 1f / max;
private const uint mask = (uint)(65536 >> 1);
public NormalizedShort2(float x, float y)
{
uint b1 = (uint)(((int)MathHelper.Clamp(x * max, -max, max) & 65535) << 0);
uint b2 = (uint)(((int)MathHelper.Clamp(y * max, -max, max) & 65535) << 16);
this.packedValue = (uint)(b1 | b2);
}
public NormalizedShort2(Vector2 vector)
{
uint b1 = (uint)(((int)MathHelper.Clamp(vector.X * max, -max, max) & 65535) << 0);
uint b2 = (uint)(((int)MathHelper.Clamp(vector.Y * max, -max, max) & 65535) << 16);
this.packedValue = (uint)(b1 | b2);
}
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();
Vector2 vector;
vector.X = convert(0xffff, (uint)this.packedValue);
vector.Y = convert(0xffff, (uint)(this.packedValue >> 16));
return vector;
}
public Vector4 ToVector4()
private static float convert(uint bitmask, uint value)
{
throw new NotImplementedException();
if ((value & mask) != 0)
{
if ((value & 65535) >= mask)
{
return -1f;
}
value |= ~bitmask;
}
else
{
value &= 65535;
}
return (((float)value) * oneOverMax);
}
void IPackedVector.PackFromVector4(Vector4 vector)
{
uint b1 = (uint)(((int)MathHelper.Clamp(vector.X * max, -max, max) & 65535) << 0);
uint b2 = (uint)(((int)MathHelper.Clamp(vector.Y * max, -max, max) & 65535) << 16);
this.packedValue = (uint)(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 == (NormalizedShort2)obj;
}
return false;
}
public bool Equals(NormalizedShort2 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 ==(NormalizedShort2 lhs, NormalizedShort2 rhs)
{
return lhs.packedValue == rhs.packedValue;
}
public static bool operator !=(NormalizedShort2 lhs, NormalizedShort2 rhs)
{
return lhs.packedValue != rhs.packedValue;
}
}
}

107
ANX.Framework/Graphics/PackedVector/NormalizedShort4.cs
View File

@ -54,31 +54,120 @@ namespace ANX.Framework.Graphics.PackedVector
{
public struct NormalizedShort4 : IPackedVector<ulong>, IEquatable<NormalizedShort4>, IPackedVector
{
private ulong packedValue;
private const float max = (float)(65535 >> 1);
private const float oneOverMax = 1f / max;
private const uint mask = (uint)(65536 >> 1);
public NormalizedShort4(float x, float y, float z, float w)
{
ulong b1 = (ulong)(((long)MathHelper.Clamp(x * max, -max, max) & 65535) << 0);
ulong b2 = (ulong)(((long)MathHelper.Clamp(y * max, -max, max) & 65535) << 16);
ulong b3 = (ulong)(((long)MathHelper.Clamp(z * max, -max, max) & 65535) << 32);
ulong b4 = (ulong)(((long)MathHelper.Clamp(w * max, -max, max) & 65535) << 48);
this.packedValue = (ulong)(b1 | b2 | b3 | b4);
}
public NormalizedShort4(Vector4 vector)
{
ulong b1 = (ulong)(((long)MathHelper.Clamp(vector.X * max, -max, max) & 65535) << 0);
ulong b2 = (ulong)(((long)MathHelper.Clamp(vector.Y * max, -max, max) & 65535) << 16);
ulong b3 = (ulong)(((long)MathHelper.Clamp(vector.Z * max, -max, max) & 65535) << 32);
ulong b4 = (ulong)(((long)MathHelper.Clamp(vector.W * max, -max, max) & 65535) << 48);
this.packedValue = (ulong)(b1 | b2 | b3 | b4);
}
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();
Vector4 vector;
vector.X = convert(0xffff, (ulong)this.packedValue);
vector.Y = convert(0xffff, (ulong)(this.packedValue >> 16));
vector.Z = convert(0xffff, (ulong)(this.packedValue >> 32));
vector.W = convert(0xffff, (ulong)(this.packedValue >> 48));
return vector;
}
private static float convert(uint bitmask, ulong value)
{
if ((value & mask) != 0)
{
if ((value & 65535) >= mask)
{
return -1f;
}
value |= ~bitmask;
}
else
{
value &= 65535;
}
return (((float)value) * oneOverMax);
}
void IPackedVector.PackFromVector4(Vector4 vector)
{
ulong b1 = (ulong)(((long)MathHelper.Clamp(vector.X * max, -max, max) & 65535) << 0);
ulong b2 = (ulong)(((long)MathHelper.Clamp(vector.Y * max, -max, max) & 65535) << 16);
ulong b3 = (ulong)(((long)MathHelper.Clamp(vector.Z * max, -max, max) & 65535) << 32);
ulong b4 = (ulong)(((long)MathHelper.Clamp(vector.W * max, -max, max) & 65535) << 48);
this.packedValue = (ulong)(b1 | b2 | b3 | b4);
}
Vector4 IPackedVector.ToVector4()
{
return this.ToVector4();
}
public override bool Equals(object obj)
{
if (obj != null && obj.GetType() == this.GetType())
{
return this == (NormalizedShort4)obj;
}
return false;
}
public bool Equals(NormalizedShort4 other)
{
throw new NotImplementedException();
return this.packedValue == other.packedValue;
}
public override string ToString()
{
return this.packedValue.ToString("X16");
}
public override int GetHashCode()
{
return this.packedValue.GetHashCode();
}
public static bool operator ==(NormalizedShort4 lhs, NormalizedShort4 rhs)
{
return lhs.packedValue == rhs.packedValue;
}
public static bool operator !=(NormalizedShort4 lhs, NormalizedShort4 rhs)
{
return lhs.packedValue != rhs.packedValue;
}
}
}

79
ANX.Framework/Graphics/PackedVector/Short2.cs
View File

@ -54,31 +54,96 @@ namespace ANX.Framework.Graphics.PackedVector
{
public struct Short2 : IPackedVector<uint>, IEquatable<Short2>, IPackedVector
{
private uint packedValue;
private const float max = (float)(65535 >> 1);
private const float min = -max - 1f;
private const float oneOverMax = 1f / max;
private const uint mask = (uint)(65536 >> 1);
public Short2(float x, float y)
{
uint b1 = (uint)(((int)MathHelper.Clamp(x, min, max) & 65535) << 0);
uint b2 = (uint)(((int)MathHelper.Clamp(y, min, max) & 65535) << 16);
this.packedValue = (uint)(b1 | b2);
}
public Short2(Vector2 vector)
{
uint b1 = (uint)(((int)MathHelper.Clamp(vector.X, min, max) & 65535) << 0);
uint b2 = (uint)(((int)MathHelper.Clamp(vector.Y, min, max) & 65535) << 16);
this.packedValue = (uint)(b1 | b2);
}
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();
Vector2 vector;
vector.X = (short)this.packedValue;
vector.Y = (short)(this.packedValue >> 16);
return vector;
}
public Vector4 ToVector4()
void IPackedVector.PackFromVector4(Vector4 vector)
{
throw new NotImplementedException();
uint b1 = (uint)(((int)MathHelper.Clamp(vector.X, min, max) & 65535) << 0);
uint b2 = (uint)(((int)MathHelper.Clamp(vector.Y, min, max) & 65535) << 16);
this.packedValue = (uint)(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 == (Short2)obj;
}
return false;
}
public bool Equals(Short2 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 ==(Short2 lhs, Short2 rhs)
{
return lhs.packedValue == rhs.packedValue;
}
public static bool operator !=(Short2 lhs, Short2 rhs)
{
return lhs.packedValue != rhs.packedValue;
}
}
}

90
ANX.Framework/Graphics/PackedVector/Short4.cs
View File

@ -54,31 +54,103 @@ namespace ANX.Framework.Graphics.PackedVector
{
public struct Short4 : IPackedVector<ulong>, IEquatable<Short4>, IPackedVector
{
private ulong packedValue;
private const float max = (float)(65535 >> 1);
private const float min = -max - 1f;
private const float oneOverMax = 1f / max;
private const uint mask = (uint)(65536 >> 1);
public Short4(float x, float y, float z, float w)
{
ulong b1 = (ulong)(((long)MathHelper.Clamp(x, min, max) & 65535) << 0);
ulong b2 = (ulong)(((long)MathHelper.Clamp(y, min, max) & 65535) << 16);
ulong b3 = (ulong)(((long)MathHelper.Clamp(z, min, max) & 65535) << 32);
ulong b4 = (ulong)(((long)MathHelper.Clamp(w, min, max) & 65535) << 48);
this.packedValue = (ulong)(b1 | b2 | b3 | b4);
}
public Short4(Vector4 vector)
{
ulong b1 = (ulong)(((long)MathHelper.Clamp(vector.X, min, max) & 65535) << 0);
ulong b2 = (ulong)(((long)MathHelper.Clamp(vector.Y, min, max) & 65535) << 16);
ulong b3 = (ulong)(((long)MathHelper.Clamp(vector.Z, min, max) & 65535) << 32);
ulong b4 = (ulong)(((long)MathHelper.Clamp(vector.W, min, max) & 65535) << 48);
this.packedValue = (ulong)(b1 | b2 | b3 | b4);
}
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();
Vector4 vector;
vector.X = (short)this.packedValue;
vector.Y = (short)(this.packedValue >> 16);
vector.Z = (short)(this.packedValue >> 32);
vector.W = (short)(this.packedValue >> 48);
return vector;
}
void IPackedVector.PackFromVector4(Vector4 vector)
{
ulong b1 = (ulong)(((long)MathHelper.Clamp(vector.X, -max, max) & 65535) << 0);
ulong b2 = (ulong)(((long)MathHelper.Clamp(vector.Y, -max, max) & 65535) << 16);
ulong b3 = (ulong)(((long)MathHelper.Clamp(vector.Z, -max, max) & 65535) << 32);
ulong b4 = (ulong)(((long)MathHelper.Clamp(vector.W, -max, max) & 65535) << 48);
this.packedValue = (ulong)(b1 | b2 | b3 | b4);
}
Vector4 IPackedVector.ToVector4()
{
return this.ToVector4();
}
public override bool Equals(object obj)
{
if (obj != null && obj.GetType() == this.GetType())
{
return this == (Short4)obj;
}
return false;
}
public bool Equals(Short4 other)
{
throw new NotImplementedException();
return this.packedValue == other.packedValue;
}
public override string ToString()
{
return this.packedValue.ToString("X16");
}
public override int GetHashCode()
{
return this.packedValue.GetHashCode();
}
public static bool operator ==(Short4 lhs, Short4 rhs)
{
return lhs.packedValue == rhs.packedValue;
}
public static bool operator !=(Short4 lhs, Short4 rhs)
{
return lhs.packedValue != rhs.packedValue;
}
}
}

4
ANX.Framework/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.3.7.*")]
[assembly: AssemblyFileVersion("0.3.7.0")]
[assembly: AssemblyVersion("0.4.1.*")]
[assembly: AssemblyFileVersion("0.4.1.0")]

5
ANX.InputSystem.Windows.Kinect/ANX.InputSystem.Windows.Kinect.csproj
View File

@ -6,7 +6,7 @@
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{E5D69E75-D77C-493F-BBDA-6F9E73B82549}</ProjectGuid>
<OutputType>WinExe</OutputType>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ANX.InputSystem.Windows.Kinect</RootNamespace>
<AssemblyName>ANX.InputSystem.Windows.Kinect</AssemblyName>
@ -33,6 +33,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Research.Kinect, Version=1.0.0.45, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

8
ANX.InputSystem.Windows.Kinect/Properties/AssemblyInfo.cs
View File

@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("ANX.InputSystem.Windows.Kinect")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("ANX.Framework Team")]
[assembly: AssemblyProduct("ANX.InputSystem.Windows.Kinect")]
[assembly: AssemblyCopyright("Copyright © 2011")]
[assembly: AssemblyCopyright("Copyright © ANX.Framework Team 2011")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("0.5.0.0")]
[assembly: AssemblyFileVersion("0.5.0.0")]