diff --git a/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj b/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj
index e7b26d25..95ab4fbc 100644
--- a/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj
+++ b/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj
@@ -53,7 +53,6 @@
-
@@ -61,13 +60,13 @@
-
-
-
+
+
+
-
-
+
+
@@ -75,22 +74,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -101,7 +100,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ANX.Framework.TestCenter/Strukturen/CurveTest.cs b/ANX.Framework.TestCenter/Strukturen/CurveTest.cs
index bfc9af90..ba4f3e23 100644
--- a/ANX.Framework.TestCenter/Strukturen/CurveTest.cs
+++ b/ANX.Framework.TestCenter/Strukturen/CurveTest.cs
@@ -1,42 +1,173 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+#region Using Statements
+using System;
+using System.IO;
+using ANX.Framework.NonXNA;
using NUnit.Framework;
-
+#endregion // Using Statements
using XNACurve = Microsoft.Xna.Framework.Curve;
using ANXCurve = ANX.Framework.Curve;
-namespace ANX.Framework.TestCenter.Strukturen
+using XNACurveKey = Microsoft.Xna.Framework.CurveKey;
+using ANXCurveKey = ANX.Framework.CurveKey;
+
+using XNACurveLoopType = Microsoft.Xna.Framework.CurveLoopType;
+using ANXCurveLoopType = ANX.Framework.CurveLoopType;
+
+using XNACurveKeyCollection = Microsoft.Xna.Framework.CurveKeyCollection;
+using ANXCurveKeyCollection = ANX.Framework.CurveKeyCollection;
+
+using XNACurveTangent = Microsoft.Xna.Framework.CurveTangent;
+using ANXCurveTangent = ANX.Framework.CurveTangent;
+
+
+
+#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.Struckturen.classTest
{
- [TestFixture]
- class CurveTest
- {
+ [TestFixture]
+ class CurveTest
+ {
+ static object[] inoutsame =
+ {
+ new object[] {XNACurveTangent.Flat,ANXCurveTangent.Flat , DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000) },
+ new object[] {XNACurveTangent.Linear,ANXCurveTangent.Linear, DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000)},
+ new object[] {XNACurveTangent.Smooth,ANXCurveTangent.Smooth, DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000)}
- [Test]
- public void Evaluate()
- {
- XNACurve xna = new XNACurve();
- ANXCurve anx = new ANXCurve();
+ };
- Random r = new Random();
- for (int i = 0; i < 5; ++i)
- {
- float value = r.Next(-10, 10);
- xna.Keys.Add(new Microsoft.Xna.Framework.CurveKey(i, value));
- anx.Keys.Add(new CurveKey(i, value));
- }
- xna.PreLoop = Microsoft.Xna.Framework.CurveLoopType.Constant;
- anx.PreLoop = ANX.Framework.CurveLoopType.Constant;
+ [TestCaseSource("inoutsame")]
+ public void Curve(XNACurveTangent xnainout, ANXCurveTangent anxinout, float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, float f12, float f13, float f14, float f15, float f16)
+ {
+ XNACurve xna = new XNACurve();
+ ANXCurve anx = new ANXCurve();
- xna.PostLoop = Microsoft.Xna.Framework.CurveLoopType.Constant;
- anx.PostLoop = ANX.Framework.CurveLoopType.Constant;
+ xna.Keys.Add(new XNACurveKey(f1, f2));
+ //xna.Keys.Add(new XNACurveKey(f3, f4));
+ //xna.Keys.Add(new XNACurveKey(f5, f6));
+ //xna.Keys.Add(new XNACurveKey(f7, f8));
+ //xna.Keys.Add(new XNACurveKey(f9, f10));
+ //xna.Keys.Add(new XNACurveKey(f11, f12));
+ //xna.Keys.Add(new XNACurveKey(f13, f14));
+ //xna.Keys.Add(new XNACurveKey(f15, f16));
- xna.ComputeTangents(Microsoft.Xna.Framework.CurveTangent.Flat);
- anx.ComputeTangents(CurveTangent.Flat);
+ anx.Keys.Add(new ANXCurveKey(f1, f2));
+ //anx.Keys.Add(new ANXCurveKey(f3, f4));
+ //anx.Keys.Add(new ANXCurveKey(f5, f6));
+ //anx.Keys.Add(new ANXCurveKey(f7, f8));
+ //anx.Keys.Add(new ANXCurveKey(f9, f10));
+ //anx.Keys.Add(new ANXCurveKey(f11, f12));
+ //anx.Keys.Add(new ANXCurveKey(f13, f14));
+ //anx.Keys.Add(new ANXCurveKey(f15, f16));
- AssertHelper.CompareFloats(xna.Evaluate(3.5f), anx.Evaluate(3.5f), float.Epsilon);
- }
- }
+ AssertHelper.ConvertEquals(xna, anx, "Curve");
+ }
+
+ [TestCaseSource("inoutsame")]
+ public void Clone(XNACurveTangent xnainout, ANXCurveTangent anxinout, float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, float f12, float f13, float f14, float f15, float f16)
+ {
+ XNACurve xna = new XNACurve();
+ ANXCurve anx = new ANXCurve();
+
+ xna.Keys.Add(new XNACurveKey(f1, f2));
+ xna.Keys.Add(new XNACurveKey(f3, f4));
+ xna.Keys.Add(new XNACurveKey(f5, f6));
+ xna.Keys.Add(new XNACurveKey(f7, f8));
+ xna.Keys.Add(new XNACurveKey(f9, f10));
+ xna.Keys.Add(new XNACurveKey(f11, f12));
+ xna.Keys.Add(new XNACurveKey(f13, f14));
+ xna.Keys.Add(new XNACurveKey(f15, f16));
+
+ anx.Keys.Add(new ANXCurveKey(f1, f2));
+ anx.Keys.Add(new ANXCurveKey(f3, f4));
+ anx.Keys.Add(new ANXCurveKey(f5, f6));
+ anx.Keys.Add(new ANXCurveKey(f7, f8));
+ anx.Keys.Add(new ANXCurveKey(f9, f10));
+ anx.Keys.Add(new ANXCurveKey(f11, f12));
+ anx.Keys.Add(new ANXCurveKey(f13, f14));
+ anx.Keys.Add(new ANXCurveKey(f15, f16));
+
+ XNACurve xna2 = xna.Clone();
+ ANXCurve anx2 = anx.Clone();
+
+ AssertHelper.ConvertEquals(xna, xna2, anx, anx2, "Clone");
+
+ }
+
+ [TestCaseSource("inoutsame")]
+ public void ComputeTangents(XNACurveTangent xnainout, ANXCurveTangent anxinout, float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, float f12, float f13, float f14, float f15, float f16)
+ {
+ XNACurve xna = new XNACurve();
+ ANXCurve anx = new ANXCurve();
+
+ xna.Keys.Add(new XNACurveKey(f1, f2));
+ xna.Keys.Add(new XNACurveKey(f3, f4));
+ xna.Keys.Add(new XNACurveKey(f5, f6));
+ xna.Keys.Add(new XNACurveKey(f7, f8));
+ xna.Keys.Add(new XNACurveKey(f9, f10));
+ xna.Keys.Add(new XNACurveKey(f11, f12));
+ xna.Keys.Add(new XNACurveKey(f13, f14));
+ xna.Keys.Add(new XNACurveKey(f15, f16));
+
+ anx.Keys.Add(new ANXCurveKey(f1, f2));
+ anx.Keys.Add(new ANXCurveKey(f3, f4));
+ anx.Keys.Add(new ANXCurveKey(f5, f6));
+ anx.Keys.Add(new ANXCurveKey(f7, f8));
+ anx.Keys.Add(new ANXCurveKey(f9, f10));
+ anx.Keys.Add(new ANXCurveKey(f11, f12));
+ anx.Keys.Add(new ANXCurveKey(f13, f14));
+ anx.Keys.Add(new ANXCurveKey(f15, f16));
+
+ xna.ComputeTangents(xnainout);
+ anx.ComputeTangents(anxinout);
+
+ AssertHelper.ConvertEquals(xna, anx, "ComputeTangents");
+ }
+
+ }
}
diff --git a/ANX.Framework.TestCenter/Design/TypeConverterTest.cs b/ANX.Framework.TestCenter/Strukturen/Design/TypeConverterTest.cs
similarity index 97%
rename from ANX.Framework.TestCenter/Design/TypeConverterTest.cs
rename to ANX.Framework.TestCenter/Strukturen/Design/TypeConverterTest.cs
index aa8d00d2..2d0b392b 100644
--- a/ANX.Framework.TestCenter/Design/TypeConverterTest.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Design/TypeConverterTest.cs
@@ -58,7 +58,7 @@ using NUnit.Framework;
using XnaVector3 = Microsoft.Xna.Framework.Vector3;
using AnxVector3 = ANX.Framework.Vector3;
-namespace ANX.Framework.TestCenter.Design
+namespace ANX.Framework.TestCenter.Strukturen.Design
{
[TestFixture]
public class TypeConverterTest
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/Bgr565Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Bgr565Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/Bgr565Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Bgr565Test.cs
index 02118f10..ca44a3cd 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/Bgr565Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Bgr565Test.cs
@@ -61,7 +61,7 @@ using ANXVector3 = ANX.Framework.Vector3;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class Bgr565Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/Bgra4444Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Bgra4444Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/Bgra4444Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Bgra4444Test.cs
index 3c5ebb5f..6427a3fd 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/Bgra4444Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Bgra4444Test.cs
@@ -61,7 +61,7 @@ using ANXVector4 = ANX.Framework.Vector4;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class Bgra4444Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/Bgra5551Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Bgra5551Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/Bgra5551Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Bgra5551Test.cs
index 8b70a937..d48bcd72 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/Bgra5551Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Bgra5551Test.cs
@@ -61,7 +61,7 @@ using ANXVector4 = ANX.Framework.Vector4;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class Bgra5551Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/Byte4Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Byte4Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/Byte4Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Byte4Test.cs
index 4e39ff60..5b5d8c51 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/Byte4Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Byte4Test.cs
@@ -61,7 +61,7 @@ using ANXVector4 = ANX.Framework.Vector4;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class Byte4Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/HalfSingleTest.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/HalfSingleTest.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/HalfSingleTest.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/HalfSingleTest.cs
index 3545a666..f5992718 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/HalfSingleTest.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/HalfSingleTest.cs
@@ -61,7 +61,7 @@ using ANXVector4 = ANX.Framework.Vector4;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class HalfSingleTest
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/HalfVector2Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/HalfVector2Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/HalfVector2Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/HalfVector2Test.cs
index 7dcad77c..62938a3a 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/HalfVector2Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/HalfVector2Test.cs
@@ -61,7 +61,7 @@ using ANXVector2 = ANX.Framework.Vector2;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class HalfVector2Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/HalfVector4Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/HalfVector4Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/HalfVector4Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/HalfVector4Test.cs
index 5a08c828..6f812bbb 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/HalfVector4Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/HalfVector4Test.cs
@@ -61,7 +61,7 @@ using ANXVector4 = ANX.Framework.Vector4;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class HalfVector4Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedByte2Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/NormalizedByte2Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedByte2Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/NormalizedByte2Test.cs
index 25a661bf..c4e5201a 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedByte2Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/NormalizedByte2Test.cs
@@ -61,7 +61,7 @@ using ANXVector2 = ANX.Framework.Vector2;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class NormalizedByte2Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedByte4Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/NormalizedByte4Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedByte4Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/NormalizedByte4Test.cs
index bbc79e51..8536fed9 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedByte4Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/NormalizedByte4Test.cs
@@ -61,7 +61,7 @@ using ANXVector4 = ANX.Framework.Vector4;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class NormalizedByte4Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedShort2Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/NormalizedShort2Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedShort2Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/NormalizedShort2Test.cs
index 9408d93b..acf5679a 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedShort2Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/NormalizedShort2Test.cs
@@ -61,7 +61,7 @@ using ANXVector2 = ANX.Framework.Vector2;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class NormalizedShort2Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedShort4Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/NormalizedShort4Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedShort4Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/NormalizedShort4Test.cs
index 2a9df356..08330a1b 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/NormalizedShort4Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/NormalizedShort4Test.cs
@@ -61,7 +61,7 @@ using ANXVector4 = ANX.Framework.Vector4;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class NormalizedShort4Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/Rg32Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Rg32Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/Rg32Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Rg32Test.cs
index 1a38e9f6..494626b6 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/Rg32Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Rg32Test.cs
@@ -61,7 +61,7 @@ using ANXVector2 = ANX.Framework.Vector2;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class Rg32Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/Rgba1010102Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Rgba1010102Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/Rgba1010102Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Rgba1010102Test.cs
index 3716a7f3..ccee0aaf 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/Rgba1010102Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Rgba1010102Test.cs
@@ -61,7 +61,7 @@ using ANXVector4 = ANX.Framework.Vector4;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class Rgba1010102Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/Rgba64Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Rgba64Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/Rgba64Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Rgba64Test.cs
index 4a896ba9..1390fe60 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/Rgba64Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Rgba64Test.cs
@@ -61,7 +61,7 @@ using ANXVector4 = ANX.Framework.Vector4;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class Rgba64Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/Short2Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Short2Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/Short2Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Short2Test.cs
index 40a58511..1983ca6f 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/Short2Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Short2Test.cs
@@ -61,7 +61,7 @@ using ANXVector2 = ANX.Framework.Vector2;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class Short2Test
diff --git a/ANX.Framework.TestCenter/Strukturen/PackedVector/Short4Test.cs b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Short4Test.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Strukturen/PackedVector/Short4Test.cs
rename to ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Short4Test.cs
index f07cb114..8fcb970d 100644
--- a/ANX.Framework.TestCenter/Strukturen/PackedVector/Short4Test.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Graphics/PackedVector/Short4Test.cs
@@ -61,7 +61,7 @@ using ANXVector4 = ANX.Framework.Vector4;
#endregion // License
-namespace ANX.Framework.TestCenter.Strukturen.PackedVector
+namespace ANX.Framework.TestCenter.Strukturen.Graphics.PackedVector
{
[TestFixture]
class Short4Test
diff --git a/ANX.Framework.TestCenter/Input/GamePadDPadTest.cs b/ANX.Framework.TestCenter/Strukturen/Input/GamePadDPadTest.cs
similarity index 98%
rename from ANX.Framework.TestCenter/Input/GamePadDPadTest.cs
rename to ANX.Framework.TestCenter/Strukturen/Input/GamePadDPadTest.cs
index f28e62ea..8967aaa3 100644
--- a/ANX.Framework.TestCenter/Input/GamePadDPadTest.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Input/GamePadDPadTest.cs
@@ -60,7 +60,7 @@ using XNAButtonState = Microsoft.Xna.Framework.Input.ButtonState;
#endregion // License
-namespace ANX.Framework.TestCenter.Input
+namespace ANX.Framework.TestCenter.Strukturen.Input
{
[TestFixture]
class GamePadDPadTest
diff --git a/ANX.Framework.TestCenter/Input/GamePadTriggersTest.cs b/ANX.Framework.TestCenter/Strukturen/Input/GamePadTriggersTest.cs
similarity index 97%
rename from ANX.Framework.TestCenter/Input/GamePadTriggersTest.cs
rename to ANX.Framework.TestCenter/Strukturen/Input/GamePadTriggersTest.cs
index bc2a8271..6bf43251 100644
--- a/ANX.Framework.TestCenter/Input/GamePadTriggersTest.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Input/GamePadTriggersTest.cs
@@ -56,7 +56,7 @@ using XNAGamePadTriggers = Microsoft.Xna.Framework.Input.GamePadTriggers;
// particular purpose and non-infringement.
#endregion // License
-namespace ANX.Framework.TestCenter.Input
+namespace ANX.Framework.TestCenter.Strukturen.Input
{
[TestFixture]
class GamePadTriggersTest
diff --git a/ANX.Framework.TestCenter/Storage/StorageContainerTest.cs b/ANX.Framework.TestCenter/Strukturen/Storage/StorageContainerTest.cs
similarity index 96%
rename from ANX.Framework.TestCenter/Storage/StorageContainerTest.cs
rename to ANX.Framework.TestCenter/Strukturen/Storage/StorageContainerTest.cs
index 06e48a13..2798a5f2 100644
--- a/ANX.Framework.TestCenter/Storage/StorageContainerTest.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Storage/StorageContainerTest.cs
@@ -62,7 +62,7 @@ using XNAPlayerIndex = Microsoft.Xna.Framework.PlayerIndex;
// particular purpose and non-infringement.
#endregion // License
-namespace ANX.Framework.TestCenter.Storage
+namespace ANX.Framework.TestCenter.Strukturen.Storage
{
[TestFixture]
class StorageContainerTest
diff --git a/ANX.Framework.TestCenter/Storage/StorageDeviceTest.cs b/ANX.Framework.TestCenter/Strukturen/Storage/StorageDeviceTest.cs
similarity index 97%
rename from ANX.Framework.TestCenter/Storage/StorageDeviceTest.cs
rename to ANX.Framework.TestCenter/Strukturen/Storage/StorageDeviceTest.cs
index 00d0a801..0db3da69 100644
--- a/ANX.Framework.TestCenter/Storage/StorageDeviceTest.cs
+++ b/ANX.Framework.TestCenter/Strukturen/Storage/StorageDeviceTest.cs
@@ -64,7 +64,7 @@ using System.Reflection;
// particular purpose and non-infringement.
#endregion // License
-namespace ANX.Framework.TestCenter.Storage
+namespace ANX.Framework.TestCenter.Strukturen.Storage
{
[TestFixture]
class StorageDeviceTest
diff --git a/ANX.Framework.TestCenter/classTests/CurveTest.cs b/ANX.Framework.TestCenter/classTests/CurveTest.cs
deleted file mode 100644
index afa70e2a..00000000
--- a/ANX.Framework.TestCenter/classTests/CurveTest.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-#region Using Statements
-using System;
-using System.IO;
-using ANX.Framework.NonXNA;
-using NUnit.Framework;
-#endregion // Using Statements
-
-using XNACurve = Microsoft.Xna.Framework.Curve;
-using ANXCurve = ANX.Framework.Curve;
-
-using XNACurveKey = Microsoft.Xna.Framework.CurveKey;
-using ANXCurveKey = ANX.Framework.CurveKey;
-
-using XNACurveLoopType = Microsoft.Xna.Framework.CurveLoopType;
-using ANXCurveLoopType = ANX.Framework.CurveLoopType;
-
-using XNACurveKeyCollection = Microsoft.Xna.Framework.CurveKeyCollection;
-using ANXCurveKeyCollection = ANX.Framework.CurveKeyCollection;
-
-using XNACurveTangent = Microsoft.Xna.Framework.CurveTangent;
-using ANXCurveTangent = ANX.Framework.CurveTangent;
-
-
-
-#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.classTest
-{
- [TestFixture]
- class CurveTest
- {
- static object[] inoutsame =
- {
- new object[] {XNACurveTangent.Flat,ANXCurveTangent.Flat , DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000) },
- new object[] {XNACurveTangent.Linear,ANXCurveTangent.Linear, DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000)},
- new object[] {XNACurveTangent.Smooth,ANXCurveTangent.Smooth, DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000), DataFactory.RandomValueMinMax(float.Epsilon, 1000)}
-
- };
-
- [TestCaseSource("inoutsame")]
- public void Curve(XNACurveTangent xnainout, ANXCurveTangent anxinout, float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, float f12, float f13, float f14, float f15, float f16)
- {
- XNACurve xna = new XNACurve();
- ANXCurve anx = new ANXCurve();
-
- xna.Keys.Add(new XNACurveKey(f1, f2));
- //xna.Keys.Add(new XNACurveKey(f3, f4));
- //xna.Keys.Add(new XNACurveKey(f5, f6));
- //xna.Keys.Add(new XNACurveKey(f7, f8));
- //xna.Keys.Add(new XNACurveKey(f9, f10));
- //xna.Keys.Add(new XNACurveKey(f11, f12));
- //xna.Keys.Add(new XNACurveKey(f13, f14));
- //xna.Keys.Add(new XNACurveKey(f15, f16));
-
- anx.Keys.Add(new ANXCurveKey(f1, f2));
- //anx.Keys.Add(new ANXCurveKey(f3, f4));
- //anx.Keys.Add(new ANXCurveKey(f5, f6));
- //anx.Keys.Add(new ANXCurveKey(f7, f8));
- //anx.Keys.Add(new ANXCurveKey(f9, f10));
- //anx.Keys.Add(new ANXCurveKey(f11, f12));
- //anx.Keys.Add(new ANXCurveKey(f13, f14));
- //anx.Keys.Add(new ANXCurveKey(f15, f16));
-
- AssertHelper.ConvertEquals(xna, anx, "Curve");
- }
-
- [TestCaseSource("inoutsame")]
- public void Clone(XNACurveTangent xnainout, ANXCurveTangent anxinout, float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, float f12, float f13, float f14, float f15, float f16)
- {
- XNACurve xna = new XNACurve();
- ANXCurve anx = new ANXCurve();
-
- xna.Keys.Add(new XNACurveKey(f1, f2));
- xna.Keys.Add(new XNACurveKey(f3, f4));
- xna.Keys.Add(new XNACurveKey(f5, f6));
- xna.Keys.Add(new XNACurveKey(f7, f8));
- xna.Keys.Add(new XNACurveKey(f9, f10));
- xna.Keys.Add(new XNACurveKey(f11, f12));
- xna.Keys.Add(new XNACurveKey(f13, f14));
- xna.Keys.Add(new XNACurveKey(f15, f16));
-
- anx.Keys.Add(new ANXCurveKey(f1, f2));
- anx.Keys.Add(new ANXCurveKey(f3, f4));
- anx.Keys.Add(new ANXCurveKey(f5, f6));
- anx.Keys.Add(new ANXCurveKey(f7, f8));
- anx.Keys.Add(new ANXCurveKey(f9, f10));
- anx.Keys.Add(new ANXCurveKey(f11, f12));
- anx.Keys.Add(new ANXCurveKey(f13, f14));
- anx.Keys.Add(new ANXCurveKey(f15, f16));
-
- XNACurve xna2 = xna.Clone();
- ANXCurve anx2 = anx.Clone();
-
- AssertHelper.ConvertEquals(xna,xna2,anx, anx2,"Clone");
-
- }
-
- [TestCaseSource("inoutsame")]
- public void ComputeTangents(XNACurveTangent xnainout, ANXCurveTangent anxinout, float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, float f12, float f13, float f14, float f15, float f16)
- {
- XNACurve xna = new XNACurve();
- ANXCurve anx = new ANXCurve();
-
- xna.Keys.Add(new XNACurveKey(f1, f2));
- xna.Keys.Add(new XNACurveKey(f3, f4));
- xna.Keys.Add(new XNACurveKey(f5, f6));
- xna.Keys.Add(new XNACurveKey(f7, f8));
- xna.Keys.Add(new XNACurveKey(f9, f10));
- xna.Keys.Add(new XNACurveKey(f11, f12));
- xna.Keys.Add(new XNACurveKey(f13, f14));
- xna.Keys.Add(new XNACurveKey(f15, f16));
-
- anx.Keys.Add(new ANXCurveKey(f1, f2));
- anx.Keys.Add(new ANXCurveKey(f3, f4));
- anx.Keys.Add(new ANXCurveKey(f5, f6));
- anx.Keys.Add(new ANXCurveKey(f7, f8));
- anx.Keys.Add(new ANXCurveKey(f9, f10));
- anx.Keys.Add(new ANXCurveKey(f11, f12));
- anx.Keys.Add(new ANXCurveKey(f13, f14));
- anx.Keys.Add(new ANXCurveKey(f15, f16));
-
- xna.ComputeTangents(xnainout);
- anx.ComputeTangents(anxinout);
-
- AssertHelper.ConvertEquals(xna, anx, "ComputeTangents");
- }
-
- }
-}
diff --git a/ANX.Framework/ANX.Framework.csproj b/ANX.Framework/ANX.Framework.csproj
index e28b73fa..c7f5c4ae 100644
--- a/ANX.Framework/ANX.Framework.csproj
+++ b/ANX.Framework/ANX.Framework.csproj
@@ -160,57 +160,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-