implemented Rg32 struct

ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj

@@ -71,6 +71,7 @@
     <Compile Include="Strukturen\PackedVector\HalfSingleTest.cs" />
     <Compile Include="Strukturen\PackedVector\HalfVector2Test.cs" />
     <Compile Include="Strukturen\PackedVector\HalfVector4Test.cs" />
+    <Compile Include="Strukturen\PackedVector\Rg32Test.cs" />
     <Compile Include="Strukturen\PlaneTest.cs" />
     <Compile Include="Strukturen\PointTest.cs" />
     <Compile Include="Strukturen\RayTest.cs" />

ANX.Framework.TestCenter/AssertHelper.cs

@@ -54,6 +54,7 @@ using NUnit.Framework;
 
 #endregion // License
 
+#region Datatype Usings
 using XNAColor = Microsoft.Xna.Framework.Color;
 using ANXColor = ANX.Framework.Color;
 
@@ -102,6 +103,11 @@ using ANXHalfVector2 = ANX.Framework.Graphics.PackedVector.HalfVector2;
 using XNAHalfVector4 = Microsoft.Xna.Framework.Graphics.PackedVector.HalfVector4;
 using ANXHalfVector4 = ANX.Framework.Graphics.PackedVector.HalfVector4;
 
+using XNARg32 = Microsoft.Xna.Framework.Graphics.PackedVector.Rg32;
+using ANXRg32 = ANX.Framework.Graphics.PackedVector.Rg32;
+
+#endregion // Datatype usings
+
 namespace ANX.Framework.TestCenter
 {
     class AssertHelper
@@ -190,6 +196,18 @@ namespace ANX.Framework.TestCenter
             }
         }
 
+        public static void ConvertEquals(XNARg32 lhs, ANXRg32 rhs, String test)
+        {
+            if (lhs.PackedValue == rhs.PackedValue)
+            {
+                Assert.Pass(test + " passed");
+            }
+            else
+            {
+                Assert.Fail(String.Format("{0] failed: Rg32 XNA: ({1}) Rg32 ANX: ({2})", test, lhs, rhs));
+            }
+        }
+
         public static void ConvertEquals(float a, float b, String test)
         {
             if (a.Equals(b))

ANX.Framework.TestCenter/Strukturen/PackedVector/Rg32Test.cs

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

ANX.Framework/Graphics/PackedVector/Rg32.cs

@@ -54,31 +54,86 @@ namespace ANX.Framework.Graphics.PackedVector
 {
     public struct Rg32 : IPackedVector<uint>, IEquatable<Rg32>, IPackedVector
     {
+        private uint packedValue;
+
+        public Rg32(float x, float y)
+        {
+            uint r = (uint)(MathHelper.Clamp(x, 0f, 1f) * 65535.0f) <<  0;
+            uint g = (uint)(MathHelper.Clamp(y, 0f, 1f) * 65535.0f) << 16;
+
+            this.packedValue = (uint)r | g;
+        }
+
+        public Rg32(Vector2 vector)
+        {
+            uint r = (uint)(MathHelper.Clamp(vector.X, 0f, 1f) * 65535.0f) << 0;
+            uint g = (uint)(MathHelper.Clamp(vector.Y, 0f, 1f) * 65535.0f) << 16;
+
+            this.packedValue = (uint)r | g;
+        }
+
         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(((packedValue >>  0) & 65535) / 65535.0f,
+                               ((packedValue >> 16) & 65535) / 65535.0f);
         }
 
-        public Vector4 ToVector4()
+        Vector4 IPackedVector.ToVector4()
         {
-            throw new NotImplementedException();
+            Vector2 val = this.ToVector2();
+            return new Vector4(val.X, val.Y, 0f, 1f);
+        }
+
+        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 == (Rg32)obj;
+            }
+
+            return false;
         }
 
         public bool Equals(Rg32 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 ==(Rg32 lhs, Rg32 rhs)
+        {
+            return lhs.packedValue == rhs.packedValue;
+        }
+
+        public static bool operator !=(Rg32 lhs, Rg32 rhs)
+        {
+            return lhs.packedValue != rhs.packedValue;
         }
     }
 }