Removed OpenTK.Math namespace. Math functions now go directly into the OpenTK namespace.

Documentation/Changelog.txt

@@ -7,6 +7,8 @@
     + Enabled documentation generation in debug builds.
     + Compute
         + Bitfields are now mapped to 'long' instead of 'int'.
+    + Math
+        + Namespace OpenTK.Math no longer exists. Math functions are now placed directly inside the OpenTK namespace.
 
 -------------------------
  OpenTK 0.9.8-1 -> 0.9.9
@@ -229,7 +231,7 @@ OpenTK 0.9.1 -> 0.9.2
         + Improved GLControl implementations.
     + Graphics
         + Added Color4 struct that can hold floating-point ARGB colors.
-        + Added several new overloads to the GL class. Most deal with OpenTK.Math and System.Drawing.Color interoperation.
+        + Added several new overloads to the GL class. Most deal with OpenTK and System.Drawing.Color interoperation.
         + Added support for the Half type.
     + Math
         + Added half and double precision structures.
@@ -369,7 +371,7 @@ OpenTK 0.3.12 -> 0.3.13
 		+ Improved GameWindow.Exit() handling.
 		+ Removed obsolete GameWindow.Create and GameWindow.Destroy events.
 	+ Math
-		+ Andy Gill implemented Vector2/3/4, Matrix4 and Quaternion methods for OpenTK.Math.
+		+ Andy Gill implemented Vector2/3/4, Matrix4 and Quaternion methods for OpenTK.
 		+ Added Box2 struct which defines a rectangular region. Used in OpenTK.Fonts (see below).
 		- Removed (float*) and (IntPtr) cast operators from Vector234. Added this[] operator.
 	+ Fonts

Documentation/Release.txt

@@ -6,6 +6,7 @@ The Open Toolkit 0.9.9-1 Beta
 
 This is the first preview release of what will become OpenTK 1.0. Major changes:
 * OpenCL bugfixes.
+* Math API improvements.
 
 Please note that this is a work-in-progress snapshot release and should only be used for testing purposes.
 
@@ -42,7 +43,12 @@ Please note that binary compatibility is not preserved between beta releases.
 
 [0.9.9-1]
 
-1. OpenCL bitfields are now mapped to 'long' instead of 'int'. Casts from [Flags] enums to 'int' may now fail. Please avoid such casts or use 'long' instead.
+1. The OpenTK.Math namespace no longer exists. Please replace all references by 'OpenTK'. This can be easily achieved with the following Search & Replace operations:
+
+'using OpenTK.Math;' -> 'using OpenTK;'
+'OpenTK.Math.' -> 'OpenTK.'
+
+2. OpenCL bitfields are now mapped to 'long' instead of 'int'. Casts from [Flags] enums to 'int' may now fail. Please avoid such casts or use 'long' instead.
 
 
 [0.9.9]
@@ -60,7 +66,7 @@ Please mark all relevant overrides as 'protected'.
 
 3. Glu is now marked as deprecated.
 
-Please use OpenTK.Math instead.
+Please use OpenTK instead.
 
 4. OpenTK.Input.[Keyboard|Mouse|Joystick]Device are marked as obsolete.
 

Documentation/Todo.txt

@@ -24,8 +24,8 @@
 + Implement GameWindow-independent input drivers.
 + Implement support for multiple mice and keyboards.
 
-[OpenTK.Math]
+[OpenTK]
-+ Move to the OpenTK namespace instead of OpenTK.Math.
++ Move to the OpenTK namespace instead of OpenTK.
 + Improve performance.
 + Improve API.
 

Source/Bind/Specifications/csharp.tm

@@ -26,8 +26,8 @@ PixelInternalFormat,	PixelInternalFormat
 GLsizeiptrARB,      IntPtr
 GLintptrARB,        IntPtr
 GLhandleARB,        UInt32
-GLhalfARB,          OpenTK.Math.Half
+GLhalfARB,          OpenTK.Half
-GLhalfNV,           OpenTK.Math.Half
+GLhalfNV,           OpenTK.Half
 GLcharARB,          Char
 
 # 64 bit types (introduced in 2.1)

Source/Examples/OpenAL/1.1/PlayStatic.cs

@@ -25,7 +25,6 @@
 using System;
 using System.Threading;
 
-using OpenTK.Math;
 using OpenTK.Audio;
 
 

Source/Examples/OpenGL/1.1/ImmediateMode.cs

@@ -72,7 +72,7 @@ namespace Examples.Tutorial
             GL.MatrixMode(MatrixMode.Projection);
             if (Keyboard[OpenTK.Input.Key.Space])
             {
-                OpenTK.Math.Matrix4 perspective = OpenTK.Math.Matrix4.Perspective(45, (float)aspect_ratio, 1, 64);
+               OpenTK.Matrix4 perspective = OpenTK.Matrix4.Perspective(45, (float)aspect_ratio, 1, 64);
                 GL.LoadMatrix(ref perspective);
             }
             else

Source/Examples/OpenGL/1.1/VertexLighting.cs

@@ -12,7 +12,6 @@ using System.Drawing;
 using OpenTK;
 using OpenTK.Graphics;
 using Examples.Shapes;
-using OpenTK.Math;
 
 namespace Examples.Tutorial
 {

Source/Examples/OpenGL/1.5/VertexBufferObject.cs

@@ -15,7 +15,6 @@ using System.Threading;
 using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Platform;
-using OpenTK.Math;
 
 #endregion
 

Source/Examples/OpenGL/EXT/FramebufferObject.cs

@@ -12,7 +12,6 @@ using System.Drawing;
 
 using OpenTK;
 using OpenTK.Input;
-using OpenTK.Math;
 using OpenTK.Graphics;
 using OpenTK.Graphics.OpenGL;
 

Source/Examples/OpenTK/Test/MathSerialization.cs

@@ -16,7 +16,6 @@ using System.Xml;
 
 using System.Xml.Serialization;
 
-using OpenTK.Math;
 
 namespace Examples.Tests
 {

Source/Examples/OpenTK/Test/MathSpeed.cs

@@ -8,7 +8,6 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Diagnostics;
-using OpenTK.Math;
 
 namespace Examples.Tests
 {

Source/Examples/Properties/Resources.Designer.cs

@@ -249,7 +249,7 @@ namespace Examples.Properties {
         ///
         ///using OpenTK;
         ///using OpenTK.Input;
-        ///using OpenTK.Math;
+        //
         ///using OpenTK.Graphics;
         ///using OpenTK.Graphics.OpenGL;
         ///
@@ -791,7 +791,7 @@ namespace Examples.Properties {
         ///using OpenTK;
         ///using OpenTK.Graphics;
         ///using OpenTK.Platform;
-        ///using OpenTK.Math;
+        ///
         ///
         ///#endregion
         ///
@@ -820,7 +820,7 @@ namespace Examples.Properties {
         ///using OpenTK;
         ///using OpenTK.Graphics;
         ///using Examples.Shapes;
-        ///using OpenTK.Math;
+        ///
         ///
         ///namespace Examples.Tutorial
         ///{

Source/Examples/Shapes/Cube.cs

@@ -9,9 +9,10 @@ using System.Collections.Generic;
 using System.Text;
 using System.Drawing;
 
-using OpenTK.Math;
 using System.Runtime.InteropServices;
 
+using OpenTK;
+
 namespace Examples.Shapes
 {
     public class Cube : Shape

Source/Examples/Shapes/IsoSphere.cs

@@ -8,7 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-using OpenTK.Math;
+using OpenTK;
 
 namespace Examples.Shapes
 {

Source/Examples/Shapes/Plane.cs

@@ -7,7 +7,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenTK.Math;
+
+using OpenTK;
 
 namespace Examples.Shapes
 {

Source/Examples/Shapes/Shape.cs

@@ -8,10 +8,11 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-using OpenTK.Math;
 using System.Runtime.InteropServices;
 using System.Drawing;
 
+using OpenTK;
+
 namespace Examples.Shapes
 {
     public abstract class Shape

Source/OpenTK/Audio/OpenAL/AL/AL.cs

@@ -11,7 +11,6 @@ using System;
 using System.Runtime.InteropServices;
 using System.Security;
 
-using OpenTK.Math;
 
 /* Type Mapping
 // 8-bit boolean 

Source/OpenTK/Audio/OpenAL/AL/EffectsExtension.cs

@@ -11,7 +11,6 @@ using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-using OpenTK.Math;
 
 namespace OpenTK.Audio
 {

Source/OpenTK/Audio/OpenAL/AL/EffectsExtensionPresets.cs

@@ -9,7 +9,6 @@
 
 using System;
 
-using OpenTK.Math;
 
 namespace OpenTK.Audio
 {

Source/OpenTK/Audio/SoundData.cs

@@ -37,7 +37,7 @@ namespace OpenTK.Audio
 
             this.SoundFormat = format;
 
-            buffer = new byte[OpenTK.Math.Functions.NextPowerOfTwo(data.Length)];
+            buffer = new byte[OpenTK.Functions.NextPowerOfTwo(data.Length)];
             Array.Copy(data, buffer, data.Length);
             //buffer = (byte[])data.Clone();
         }

Source/OpenTK/Graphics/GL/GLDelegates.cs

@@ -416,10 +416,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void Color3fVertex3fvSUN(Single* c, Single* v);
             internal unsafe static Color3fVertex3fvSUN glColor3fVertex3fvSUN;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void Color3hNV(OpenTK.Math.Half red, OpenTK.Math.Half green, OpenTK.Math.Half blue);
+            internal delegate void Color3hNV(OpenTK.Half red, OpenTK.Half green, OpenTK.Half blue);
             internal static Color3hNV glColor3hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void Color3hvNV(OpenTK.Math.Half* v);
+            internal unsafe delegate void Color3hvNV(OpenTK.Half* v);
             internal unsafe static Color3hvNV glColor3hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Color3i(Int32 red, Int32 green, Int32 blue);
@@ -476,10 +476,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void Color4fv(Single* v);
             internal unsafe static Color4fv glColor4fv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void Color4hNV(OpenTK.Math.Half red, OpenTK.Math.Half green, OpenTK.Math.Half blue, OpenTK.Math.Half alpha);
+            internal delegate void Color4hNV(OpenTK.Half red, OpenTK.Half green, OpenTK.Half blue, OpenTK.Half alpha);
             internal static Color4hNV glColor4hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void Color4hvNV(OpenTK.Math.Half* v);
+            internal unsafe delegate void Color4hvNV(OpenTK.Half* v);
             internal unsafe static Color4hvNV glColor4hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Color4i(Int32 red, Int32 green, Int32 blue, Int32 alpha);
@@ -1235,10 +1235,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void FogCoordfvEXT(Single* coord);
             internal unsafe static FogCoordfvEXT glFogCoordfvEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void FogCoordhNV(OpenTK.Math.Half fog);
+            internal delegate void FogCoordhNV(OpenTK.Half fog);
             internal static FogCoordhNV glFogCoordhNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void FogCoordhvNV(OpenTK.Math.Half* fog);
+            internal unsafe delegate void FogCoordhvNV(OpenTK.Half* fog);
             internal unsafe static FogCoordhvNV glFogCoordhvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void FogCoordPointer(OpenTK.Graphics.FogPointerType type, Int32 stride, IntPtr pointer);
@@ -2705,10 +2705,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void MultiTexCoord1fvARB(OpenTK.Graphics.TextureUnit target, Single* v);
             internal unsafe static MultiTexCoord1fvARB glMultiTexCoord1fvARB;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void MultiTexCoord1hNV(OpenTK.Graphics.TextureUnit target, OpenTK.Math.Half s);
+            internal delegate void MultiTexCoord1hNV(OpenTK.Graphics.TextureUnit target, OpenTK.Half s);
             internal static MultiTexCoord1hNV glMultiTexCoord1hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void MultiTexCoord1hvNV(OpenTK.Graphics.TextureUnit target, OpenTK.Math.Half* v);
+            internal unsafe delegate void MultiTexCoord1hvNV(OpenTK.Graphics.TextureUnit target, OpenTK.Half* v);
             internal unsafe static MultiTexCoord1hvNV glMultiTexCoord1hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void MultiTexCoord1i(OpenTK.Graphics.TextureUnit target, Int32 s);
@@ -2759,10 +2759,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void MultiTexCoord2fvARB(OpenTK.Graphics.TextureUnit target, Single* v);
             internal unsafe static MultiTexCoord2fvARB glMultiTexCoord2fvARB;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void MultiTexCoord2hNV(OpenTK.Graphics.TextureUnit target, OpenTK.Math.Half s, OpenTK.Math.Half t);
+            internal delegate void MultiTexCoord2hNV(OpenTK.Graphics.TextureUnit target, OpenTK.Half s, OpenTK.Half t);
             internal static MultiTexCoord2hNV glMultiTexCoord2hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void MultiTexCoord2hvNV(OpenTK.Graphics.TextureUnit target, OpenTK.Math.Half* v);
+            internal unsafe delegate void MultiTexCoord2hvNV(OpenTK.Graphics.TextureUnit target, OpenTK.Half* v);
             internal unsafe static MultiTexCoord2hvNV glMultiTexCoord2hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void MultiTexCoord2i(OpenTK.Graphics.TextureUnit target, Int32 s, Int32 t);
@@ -2813,10 +2813,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void MultiTexCoord3fvARB(OpenTK.Graphics.TextureUnit target, Single* v);
             internal unsafe static MultiTexCoord3fvARB glMultiTexCoord3fvARB;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void MultiTexCoord3hNV(OpenTK.Graphics.TextureUnit target, OpenTK.Math.Half s, OpenTK.Math.Half t, OpenTK.Math.Half r);
+            internal delegate void MultiTexCoord3hNV(OpenTK.Graphics.TextureUnit target, OpenTK.Half s, OpenTK.Half t, OpenTK.Half r);
             internal static MultiTexCoord3hNV glMultiTexCoord3hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void MultiTexCoord3hvNV(OpenTK.Graphics.TextureUnit target, OpenTK.Math.Half* v);
+            internal unsafe delegate void MultiTexCoord3hvNV(OpenTK.Graphics.TextureUnit target, OpenTK.Half* v);
             internal unsafe static MultiTexCoord3hvNV glMultiTexCoord3hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void MultiTexCoord3i(OpenTK.Graphics.TextureUnit target, Int32 s, Int32 t, Int32 r);
@@ -2867,10 +2867,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void MultiTexCoord4fvARB(OpenTK.Graphics.TextureUnit target, Single* v);
             internal unsafe static MultiTexCoord4fvARB glMultiTexCoord4fvARB;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void MultiTexCoord4hNV(OpenTK.Graphics.TextureUnit target, OpenTK.Math.Half s, OpenTK.Math.Half t, OpenTK.Math.Half r, OpenTK.Math.Half q);
+            internal delegate void MultiTexCoord4hNV(OpenTK.Graphics.TextureUnit target, OpenTK.Half s, OpenTK.Half t, OpenTK.Half r, OpenTK.Half q);
             internal static MultiTexCoord4hNV glMultiTexCoord4hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void MultiTexCoord4hvNV(OpenTK.Graphics.TextureUnit target, OpenTK.Math.Half* v);
+            internal unsafe delegate void MultiTexCoord4hvNV(OpenTK.Graphics.TextureUnit target, OpenTK.Half* v);
             internal unsafe static MultiTexCoord4hvNV glMultiTexCoord4hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void MultiTexCoord4i(OpenTK.Graphics.TextureUnit target, Int32 s, Int32 t, Int32 r, Int32 q);
@@ -3089,10 +3089,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void Normal3fVertex3fvSUN(Single* n, Single* v);
             internal unsafe static Normal3fVertex3fvSUN glNormal3fVertex3fvSUN;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void Normal3hNV(OpenTK.Math.Half nx, OpenTK.Math.Half ny, OpenTK.Math.Half nz);
+            internal delegate void Normal3hNV(OpenTK.Half nx, OpenTK.Half ny, OpenTK.Half nz);
             internal static Normal3hNV glNormal3hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void Normal3hvNV(OpenTK.Math.Half* v);
+            internal unsafe delegate void Normal3hvNV(OpenTK.Half* v);
             internal unsafe static Normal3hvNV glNormal3hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Normal3i(Int32 nx, Int32 ny, Int32 nz);
@@ -3836,10 +3836,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void SecondaryColor3fvEXT(Single* v);
             internal unsafe static SecondaryColor3fvEXT glSecondaryColor3fvEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void SecondaryColor3hNV(OpenTK.Math.Half red, OpenTK.Math.Half green, OpenTK.Math.Half blue);
+            internal delegate void SecondaryColor3hNV(OpenTK.Half red, OpenTK.Half green, OpenTK.Half blue);
             internal static SecondaryColor3hNV glSecondaryColor3hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void SecondaryColor3hvNV(OpenTK.Math.Half* v);
+            internal unsafe delegate void SecondaryColor3hvNV(OpenTK.Half* v);
             internal unsafe static SecondaryColor3hvNV glSecondaryColor3hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void SecondaryColor3i(Int32 red, Int32 green, Int32 blue);
@@ -4091,10 +4091,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void TexCoord1fv(Single* v);
             internal unsafe static TexCoord1fv glTexCoord1fv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void TexCoord1hNV(OpenTK.Math.Half s);
+            internal delegate void TexCoord1hNV(OpenTK.Half s);
             internal static TexCoord1hNV glTexCoord1hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void TexCoord1hvNV(OpenTK.Math.Half* v);
+            internal unsafe delegate void TexCoord1hvNV(OpenTK.Half* v);
             internal unsafe static TexCoord1hvNV glTexCoord1hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void TexCoord1i(Int32 s);
@@ -4151,10 +4151,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void TexCoord2fVertex3fvSUN(Single* tc, Single* v);
             internal unsafe static TexCoord2fVertex3fvSUN glTexCoord2fVertex3fvSUN;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void TexCoord2hNV(OpenTK.Math.Half s, OpenTK.Math.Half t);
+            internal delegate void TexCoord2hNV(OpenTK.Half s, OpenTK.Half t);
             internal static TexCoord2hNV glTexCoord2hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void TexCoord2hvNV(OpenTK.Math.Half* v);
+            internal unsafe delegate void TexCoord2hvNV(OpenTK.Half* v);
             internal unsafe static TexCoord2hvNV glTexCoord2hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void TexCoord2i(Int32 s, Int32 t);
@@ -4181,10 +4181,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void TexCoord3fv(Single* v);
             internal unsafe static TexCoord3fv glTexCoord3fv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void TexCoord3hNV(OpenTK.Math.Half s, OpenTK.Math.Half t, OpenTK.Math.Half r);
+            internal delegate void TexCoord3hNV(OpenTK.Half s, OpenTK.Half t, OpenTK.Half r);
             internal static TexCoord3hNV glTexCoord3hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void TexCoord3hvNV(OpenTK.Math.Half* v);
+            internal unsafe delegate void TexCoord3hvNV(OpenTK.Half* v);
             internal unsafe static TexCoord3hvNV glTexCoord3hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void TexCoord3i(Int32 s, Int32 t, Int32 r);
@@ -4223,10 +4223,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void TexCoord4fVertex4fvSUN(Single* tc, Single* v);
             internal unsafe static TexCoord4fVertex4fvSUN glTexCoord4fVertex4fvSUN;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void TexCoord4hNV(OpenTK.Math.Half s, OpenTK.Math.Half t, OpenTK.Math.Half r, OpenTK.Math.Half q);
+            internal delegate void TexCoord4hNV(OpenTK.Half s, OpenTK.Half t, OpenTK.Half r, OpenTK.Half q);
             internal static TexCoord4hNV glTexCoord4hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void TexCoord4hvNV(OpenTK.Math.Half* v);
+            internal unsafe delegate void TexCoord4hvNV(OpenTK.Half* v);
             internal unsafe static TexCoord4hvNV glTexCoord4hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void TexCoord4i(Int32 s, Int32 t, Int32 r, Int32 q);
@@ -4682,10 +4682,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void Vertex2fv(Single* v);
             internal unsafe static Vertex2fv glVertex2fv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void Vertex2hNV(OpenTK.Math.Half x, OpenTK.Math.Half y);
+            internal delegate void Vertex2hNV(OpenTK.Half x, OpenTK.Half y);
             internal static Vertex2hNV glVertex2hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void Vertex2hvNV(OpenTK.Math.Half* v);
+            internal unsafe delegate void Vertex2hvNV(OpenTK.Half* v);
             internal unsafe static Vertex2hvNV glVertex2hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Vertex2i(Int32 x, Int32 y);
@@ -4712,10 +4712,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void Vertex3fv(Single* v);
             internal unsafe static Vertex3fv glVertex3fv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void Vertex3hNV(OpenTK.Math.Half x, OpenTK.Math.Half y, OpenTK.Math.Half z);
+            internal delegate void Vertex3hNV(OpenTK.Half x, OpenTK.Half y, OpenTK.Half z);
             internal static Vertex3hNV glVertex3hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void Vertex3hvNV(OpenTK.Math.Half* v);
+            internal unsafe delegate void Vertex3hvNV(OpenTK.Half* v);
             internal unsafe static Vertex3hvNV glVertex3hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Vertex3i(Int32 x, Int32 y, Int32 z);
@@ -4742,10 +4742,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void Vertex4fv(Single* v);
             internal unsafe static Vertex4fv glVertex4fv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void Vertex4hNV(OpenTK.Math.Half x, OpenTK.Math.Half y, OpenTK.Math.Half z, OpenTK.Math.Half w);
+            internal delegate void Vertex4hNV(OpenTK.Half x, OpenTK.Half y, OpenTK.Half z, OpenTK.Half w);
             internal static Vertex4hNV glVertex4hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void Vertex4hvNV(OpenTK.Math.Half* v);
+            internal unsafe delegate void Vertex4hvNV(OpenTK.Half* v);
             internal unsafe static Vertex4hvNV glVertex4hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Vertex4i(Int32 x, Int32 y, Int32 z, Int32 w);
@@ -4805,10 +4805,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void VertexAttrib1fvNV(UInt32 index, Single* v);
             internal unsafe static VertexAttrib1fvNV glVertexAttrib1fvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void VertexAttrib1hNV(UInt32 index, OpenTK.Math.Half x);
+            internal delegate void VertexAttrib1hNV(UInt32 index, OpenTK.Half x);
             internal static VertexAttrib1hNV glVertexAttrib1hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void VertexAttrib1hvNV(UInt32 index, OpenTK.Math.Half* v);
+            internal unsafe delegate void VertexAttrib1hvNV(UInt32 index, OpenTK.Half* v);
             internal unsafe static VertexAttrib1hvNV glVertexAttrib1hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void VertexAttrib1s(UInt32 index, Int16 x);
@@ -4865,10 +4865,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void VertexAttrib2fvNV(UInt32 index, Single* v);
             internal unsafe static VertexAttrib2fvNV glVertexAttrib2fvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void VertexAttrib2hNV(UInt32 index, OpenTK.Math.Half x, OpenTK.Math.Half y);
+            internal delegate void VertexAttrib2hNV(UInt32 index, OpenTK.Half x, OpenTK.Half y);
             internal static VertexAttrib2hNV glVertexAttrib2hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void VertexAttrib2hvNV(UInt32 index, OpenTK.Math.Half* v);
+            internal unsafe delegate void VertexAttrib2hvNV(UInt32 index, OpenTK.Half* v);
             internal unsafe static VertexAttrib2hvNV glVertexAttrib2hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void VertexAttrib2s(UInt32 index, Int16 x, Int16 y);
@@ -4925,10 +4925,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void VertexAttrib3fvNV(UInt32 index, Single* v);
             internal unsafe static VertexAttrib3fvNV glVertexAttrib3fvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void VertexAttrib3hNV(UInt32 index, OpenTK.Math.Half x, OpenTK.Math.Half y, OpenTK.Math.Half z);
+            internal delegate void VertexAttrib3hNV(UInt32 index, OpenTK.Half x, OpenTK.Half y, OpenTK.Half z);
             internal static VertexAttrib3hNV glVertexAttrib3hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void VertexAttrib3hvNV(UInt32 index, OpenTK.Math.Half* v);
+            internal unsafe delegate void VertexAttrib3hvNV(UInt32 index, OpenTK.Half* v);
             internal unsafe static VertexAttrib3hvNV glVertexAttrib3hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void VertexAttrib3s(UInt32 index, Int16 x, Int16 y, Int16 z);
@@ -4991,10 +4991,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void VertexAttrib4fvNV(UInt32 index, Single* v);
             internal unsafe static VertexAttrib4fvNV glVertexAttrib4fvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void VertexAttrib4hNV(UInt32 index, OpenTK.Math.Half x, OpenTK.Math.Half y, OpenTK.Math.Half z, OpenTK.Math.Half w);
+            internal delegate void VertexAttrib4hNV(UInt32 index, OpenTK.Half x, OpenTK.Half y, OpenTK.Half z, OpenTK.Half w);
             internal static VertexAttrib4hNV glVertexAttrib4hNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void VertexAttrib4hvNV(UInt32 index, OpenTK.Math.Half* v);
+            internal unsafe delegate void VertexAttrib4hvNV(UInt32 index, OpenTK.Half* v);
             internal unsafe static VertexAttrib4hvNV glVertexAttrib4hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void VertexAttrib4iv(UInt32 index, Int32* v);
@@ -5234,7 +5234,7 @@ namespace OpenTK.Graphics
             internal unsafe delegate void VertexAttribs1fvNV(UInt32 index, Int32 count, Single* v);
             internal unsafe static VertexAttribs1fvNV glVertexAttribs1fvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void VertexAttribs1hvNV(UInt32 index, Int32 n, OpenTK.Math.Half* v);
+            internal unsafe delegate void VertexAttribs1hvNV(UInt32 index, Int32 n, OpenTK.Half* v);
             internal unsafe static VertexAttribs1hvNV glVertexAttribs1hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void VertexAttribs1svNV(UInt32 index, Int32 count, Int16* v);
@@ -5246,7 +5246,7 @@ namespace OpenTK.Graphics
             internal unsafe delegate void VertexAttribs2fvNV(UInt32 index, Int32 count, Single* v);
             internal unsafe static VertexAttribs2fvNV glVertexAttribs2fvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void VertexAttribs2hvNV(UInt32 index, Int32 n, OpenTK.Math.Half* v);
+            internal unsafe delegate void VertexAttribs2hvNV(UInt32 index, Int32 n, OpenTK.Half* v);
             internal unsafe static VertexAttribs2hvNV glVertexAttribs2hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void VertexAttribs2svNV(UInt32 index, Int32 count, Int16* v);
@@ -5258,7 +5258,7 @@ namespace OpenTK.Graphics
             internal unsafe delegate void VertexAttribs3fvNV(UInt32 index, Int32 count, Single* v);
             internal unsafe static VertexAttribs3fvNV glVertexAttribs3fvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void VertexAttribs3hvNV(UInt32 index, Int32 n, OpenTK.Math.Half* v);
+            internal unsafe delegate void VertexAttribs3hvNV(UInt32 index, Int32 n, OpenTK.Half* v);
             internal unsafe static VertexAttribs3hvNV glVertexAttribs3hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void VertexAttribs3svNV(UInt32 index, Int32 count, Int16* v);
@@ -5270,7 +5270,7 @@ namespace OpenTK.Graphics
             internal unsafe delegate void VertexAttribs4fvNV(UInt32 index, Int32 count, Single* v);
             internal unsafe static VertexAttribs4fvNV glVertexAttribs4fvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void VertexAttribs4hvNV(UInt32 index, Int32 n, OpenTK.Math.Half* v);
+            internal unsafe delegate void VertexAttribs4hvNV(UInt32 index, Int32 n, OpenTK.Half* v);
             internal unsafe static VertexAttribs4hvNV glVertexAttribs4hvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void VertexAttribs4svNV(UInt32 index, Int32 count, Int16* v);
@@ -5402,10 +5402,10 @@ namespace OpenTK.Graphics
             internal unsafe delegate void VertexWeightfvEXT(Single* weight);
             internal unsafe static VertexWeightfvEXT glVertexWeightfvEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void VertexWeighthNV(OpenTK.Math.Half weight);
+            internal delegate void VertexWeighthNV(OpenTK.Half weight);
             internal static VertexWeighthNV glVertexWeighthNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void VertexWeighthvNV(OpenTK.Math.Half* weight);
+            internal unsafe delegate void VertexWeighthvNV(OpenTK.Half* weight);
             internal unsafe static VertexWeighthvNV glVertexWeighthvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void VertexWeightPointerEXT(Int32 size, OpenTK.Graphics.ExtVertexWeighting type, Int32 stride, IntPtr pointer);

Source/OpenTK/Graphics/GL/GLHelper.cs

@@ -16,7 +16,7 @@ using System.Reflection;
 using System.Diagnostics;
 using System.Reflection.Emit;
 
-using OpenTK.Math;
+
 
 #endregion
 

Source/OpenTK/Graphics/Glu/GluHelper.cs

@@ -13,7 +13,6 @@ using System.Runtime.InteropServices;
 using System.Reflection.Emit;
 
 using OpenTK.Platform;
-using OpenTK.Math;
 
 namespace OpenTK.Graphics
 {

Source/OpenTK/Math/BezierCurve.cs

@@ -4,7 +4,7 @@
  * This notice may not be removed from any source distribution.
  * See license.txt for licensing detailed licensing details.
  * 
- * Contributions by Georg Wächter.
+ * Contributions by Georg W<EFBFBD>chter.
  */
 #endregion
 
@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
 	/// <summary>
 	/// Represents a bezier curve with as many points as you want.

Source/OpenTK/Math/BezierCurveCubic.cs

@@ -4,7 +4,7 @@
  * This notice may not be removed from any source distribution.
  * See license.txt for licensing detailed licensing details.
  * 
- * Contributions by Georg Wächter.
+ * Contributions by Georg W<EFBFBD>chter.
  */
 #endregion
 
@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
 	/// <summary>
 	/// Represents a cubic bezier curve with two anchor and two control points.

Source/OpenTK/Math/BezierCurveQuadric.cs

@@ -4,7 +4,7 @@
  * This notice may not be removed from any source distribution.
  * See license.txt for licensing detailed licensing details.
  * 
- * Contributions by Georg Wächter.
+ * Contributions by Georg W<EFBFBD>chter.
  */
 #endregion
 
@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
 	/// <summary>
 	/// Represents a quadric bezier curve with two anchor and one control point.

Source/OpenTK/Math/Box2.cs

@@ -8,8 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Runtime.InteropServices;
-
+namespace OpenTK
-namespace OpenTK.Math
 {
     /// <summary>
     /// Defines a 2d box (rectangle).
@@ -40,8 +39,8 @@ namespace OpenTK.Math
         /// <summary>
         /// Constructs a new Box2 with the specified dimensions.
         /// </summary>
-        /// <param name="topLeft">An OpenTK.Math.Vector2 describing the top-left corner of the Box2.</param>
+        /// <param name="topLeft">AnOpenTK.Vector2 describing the top-left corner of the Box2.</param>
-        /// <param name="bottomRight">An OpenTK.Math.Vector2 describing the bottom-right corner of the Box2.</param>
+        /// <param name="bottomRight">An OpenTK.Vector2 describing the bottom-right corner of the Box2.</param>
         public Box2(Vector2 topLeft, Vector2 bottomRight)
         {
             Left = topLeft.X;
@@ -72,7 +71,7 @@ namespace OpenTK.Math
         /// <param name="left">The position of the left boundary.</param>
         /// <param name="right">The position of the right boundary.</param>
         /// <param name="bottom">The position of the bottom boundary.</param>
-        /// <returns>A new OpenTK.Math.Box2 with the specfied dimensions.</returns>
+        /// <returns>A new OpenTK.Box2 with the specfied dimensions.</returns>
         public static Box2 FromTLRB(float top, float left, float right, float bottom)
         {
             return new Box2(left, top, right, bottom);

Source/OpenTK/Math/Functions.cs

@@ -11,8 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-
+namespace OpenTK
-namespace OpenTK.Math
 {
     /// <summary>
     /// Contains mathematical functions for the OpenTK.Math toolkit.

Source/OpenTK/Math/Half.cs

@@ -61,7 +61,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
 
     /// <summary>
@@ -320,7 +320,7 @@ namespace OpenTK.Math
         #region Conversions
 
         /// <summary>
-        /// Converts a System.Single to a OpenTK.Math.Half.
+        /// Converts a System.Single to a OpenTK.Half.
         /// </summary>
         /// <param name="f">The value to convert.
         /// A <see cref="System.Single"/>
@@ -334,7 +334,7 @@ namespace OpenTK.Math
         }
 
         /// <summary>
-        /// Converts a System.Double to a OpenTK.Math.Half.
+        /// Converts a System.Double to a OpenTK.Half.
         /// </summary>
         /// <param name="d">The value to convert.
         /// A <see cref="System.Double"/>
@@ -348,7 +348,7 @@ namespace OpenTK.Math
         }
 
         /// <summary>
-        /// Converts a OpenTK.Math.Half to a System.Single.
+        /// Converts a OpenTK.Half to a System.Single.
         /// </summary>
         /// <param name="h">The value to convert.
         /// A <see cref="Half"/>
@@ -362,7 +362,7 @@ namespace OpenTK.Math
         }
 
         /// <summary>
-        /// Converts a OpenTK.Math.Half to a System.Double.
+        /// Converts a OpenTK.Half to a System.Double.
         /// </summary>
         /// <param name="h">The value to convert.
         /// A <see cref="Half"/>
@@ -440,9 +440,9 @@ namespace OpenTK.Math
         const int maxUlps = 1;
 
         /// <summary>
-        /// Returns a value indicating whether this instance is equal to a specified OpenTK.Math.Half value.
+        /// Returns a value indicating whether this instance is equal to a specified OpenTK.Half value.
         /// </summary>
-        /// <param name="other">OpenTK.Math.Half object to compare to this instance..</param>
+        /// <param name="other">OpenTK.Half object to compare to this instance..</param>
         /// <returns>True, if other is equal to this instance; false otherwise.</returns>
         public bool Equals(Half other)
         {
@@ -480,12 +480,12 @@ namespace OpenTK.Math
         /// <returns>
         /// A signed number indicating the relative values of this instance and value. If the number is:
         /// <para>Less than zero, then this instance is less than other, or this instance is not a number
-        /// (OpenTK.Math.Half.NaN) and other is a number.</para>
+        /// (OpenTK.Half.NaN) and other is a number.</para>
         /// <para>Zero: this instance is equal to value, or both this instance and other
-        /// are not a number (OpenTK.Math.Half.NaN), OpenTK.Math.Half.PositiveInfinity, or
+        /// are not a number (OpenTK.Half.NaN), OpenTK.Half.PositiveInfinity, or
-        /// OpenTK.Math.Half.NegativeInfinity.</para>
+        /// OpenTK.Half.NegativeInfinity.</para>
         /// <para>Greater than zero: this instance is greater than othrs, or this instance is a number
-        /// and other is not a number (OpenTK.Math.Half.NaN).</para>
+        /// and other is not a number (OpenTK.Half.NaN).</para>
         /// </returns>
         public int CompareTo(Half other)
         {

Source/OpenTK/Math/Matrix3d.cs

@@ -25,7 +25,7 @@ SOFTWARE.
 using System;
 using System.Runtime.InteropServices;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
     // Todo: Remove this warning when the code goes public.
     #pragma warning disable 3019
@@ -321,7 +321,7 @@ namespace OpenTK.Math
         #region Equality
 
         /// <summary>Indicates whether the current matrix is equal to another matrix.</summary>
-        /// <param name="matrix">The OpenTK.Math.Matrix3d structure to compare with.</param>
+        /// <param name="matrix">The OpenTK.Matrix3d structure to compare with.</param>
         /// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns>
         [CLSCompliant(false)]
         public bool Equals(Matrix3d matrix)
@@ -339,7 +339,7 @@ namespace OpenTK.Math
         }
 
         /// <summary>Indicates whether the current matrix is equal to another matrix.</summary>
-        /// <param name="matrix">The OpenTK.Math.Matrix3d structure to compare to.</param>
+        /// <param name="matrix">The OpenTK.Matrix3d structure to compare to.</param>
         /// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns>
         public bool Equals(ref Matrix3d matrix)
         {
@@ -374,7 +374,7 @@ namespace OpenTK.Math
         }
 
         /// <summary>Indicates whether the current matrix is approximately equal to another matrix.</summary>
-        /// <param name="matrix">The OpenTK.Math.Matrix3d structure to compare with.</param>
+        /// <param name="matrix">The OpenTK.Matrix3d structure to compare with.</param>
         /// <param name="tolerance">The limit below which the matrices are considered equal.</param>
         /// <returns>true if the current matrix is approximately equal to the matrix parameter; otherwise, false.</returns>
         public bool EqualsApprox(ref Matrix3d matrix, double tolerance)

Source/OpenTK/Math/Matrix4.cs

@@ -25,7 +25,7 @@ SOFTWARE.
 using System;
 using System.Runtime.InteropServices;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
     /// <summary>
     /// Represents a 4x4 Matrix

Source/OpenTK/Math/Matrix4d.cs

@@ -25,7 +25,7 @@ SOFTWARE.
 using System;
 using System.Runtime.InteropServices;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
     /// <summary>
     /// Represents a 4x4 Matrix with double-precision components.

Source/OpenTK/Math/Quaternion.cs

@@ -27,7 +27,7 @@ using System.Runtime.InteropServices;
 using System.ComponentModel;
 using System.Xml.Serialization;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
     /// <summary>
     /// Represents a Quaternion.
@@ -74,7 +74,7 @@ namespace OpenTK.Math
         #region Properties
 
         /// <summary>
-        /// Gets or sets an OpenTK.Math.Vector3 with the X, Y and Z components of this instance.
+        /// Gets or sets an OpenTK.Vector3 with the X, Y and Z components of this instance.
         /// </summary>
         [Obsolete("Use Xyz property instead.")]
         [CLSCompliant(false)]
@@ -83,7 +83,7 @@ namespace OpenTK.Math
         public Vector3 XYZ { get { return Xyz; } set { Xyz = value; } }
 
         /// <summary>
-        /// Gets or sets an OpenTK.Math.Vector3 with the X, Y and Z components of this instance.
+        /// Gets or sets an OpenTK.Vector3 with the X, Y and Z components of this instance.
         /// </summary>
         public Vector3 Xyz { get { return xyz; } set { xyz = value; } }
 

Source/OpenTK/Math/Quaterniond.cs

@@ -27,7 +27,7 @@ using System.Runtime.InteropServices;
 using System.ComponentModel;
 using System.Xml.Serialization;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
     /// <summary>
     /// Represents a double-precision Quaternion.
@@ -74,7 +74,7 @@ namespace OpenTK.Math
         #region Properties
 
         /// <summary>
-        /// Gets or sets an OpenTK.Math.Vector3d with the X, Y and Z components of this instance.
+        /// Gets or sets an OpenTK.Vector3d with the X, Y and Z components of this instance.
         /// </summary>
         [Obsolete("Use Xyz property instead.")]
         [CLSCompliant(false)]
@@ -83,7 +83,7 @@ namespace OpenTK.Math
         public Vector3d XYZ { get { return Xyz; } set { Xyz = value; } }
 
         /// <summary>
-        /// Gets or sets an OpenTK.Math.Vector3d with the X, Y and Z components of this instance.
+        /// Gets or sets an OpenTK.Vector3d with the X, Y and Z components of this instance.
         /// </summary>
         public Vector3d Xyz { get { return xyz; } set { xyz = value; } }
 

Source/OpenTK/Math/Vector2.cs

@@ -24,8 +24,7 @@ SOFTWARE.
 
 using System;
 using System.Runtime.InteropServices;
-
+namespace OpenTK
-namespace OpenTK.Math
 {
     /// <summary>Represents a 2D vector using two single-precision floating-point numbers.</summary>
     /// <remarks>
@@ -200,7 +199,7 @@ namespace OpenTK.Math
         {
 			get
 			{
-				return 1.0f / OpenTK.Math.Functions.InverseSqrtFast(X * X + Y * Y);
+				return 1.0f /OpenTK.Functions.InverseSqrtFast(X * X + Y * Y);
 			}
         }
 

Source/OpenTK/Math/Vector2d.cs

@@ -25,7 +25,7 @@ SOFTWARE.
 using System;
 using System.Runtime.InteropServices;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
     /// <summary>Represents a 2D vector using two double-precision floating-point numbers.</summary>
     [Serializable]
@@ -686,7 +686,7 @@ namespace OpenTK.Math
             return !left.Equals(right);
         }
 
-        /// <summary>Converts OpenTK.Math.Vector2 to OpenTK.Math.Vector2d.</summary>
+        /// <summary>Converts OpenTK.Vector2 to OpenTK.Vector2d.</summary>
         /// <param name="v2">The Vector2 to convert.</param>
         /// <returns>The resulting Vector2d.</returns>
         public static explicit operator Vector2d(Vector2 v2)
@@ -694,7 +694,7 @@ namespace OpenTK.Math
             return new Vector2d(v2.X, v2.Y);
         }
 
-        /// <summary>Converts OpenTK.Math.Vector2d to OpenTK.Math.Vector2.</summary>
+        /// <summary>Converts OpenTK.Vector2d to OpenTK.Vector2.</summary>
         /// <param name="v2d">The Vector2d to convert.</param>
         /// <returns>The resulting Vector2.</returns>
         public static explicit operator Vector2(Vector2d v2d)

Source/OpenTK/Math/Vector2h.cs

@@ -27,7 +27,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
 
     /// <summary>2-component Vector of the Half type. Occupies 4 Byte total.</summary>
@@ -83,7 +83,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half2 instance will convert the Vector2 into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector2</param>
+        /// <param name="v">OpenTK.Vector2</param>
         [CLSCompliant(false)]
         public Vector2h(Vector2 v)
         {
@@ -94,7 +94,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half2 instance will convert the Vector2 into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector2</param>
+        /// <param name="v">OpenTK.Vector2</param>
         /// <param name="throwOnError">Enable checks that will throw if the conversion result is not meaningful.</param>
         [CLSCompliant(false)]
         public Vector2h(Vector2 v, bool throwOnError)
@@ -107,7 +107,7 @@ namespace OpenTK.Math
         /// The new Half2 instance will convert the Vector2 into 16-Bit Half precision floating point.
         /// This is the fastest constructor.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector2</param>
+        /// <param name="v">OpenTK.Vector2</param>
         public Vector2h(ref Vector2 v)
         {
             X = new Half(v.X);
@@ -117,7 +117,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half2 instance will convert the Vector2 into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector2</param>
+        /// <param name="v">OpenTK.Vector2</param>
         /// <param name="throwOnError">Enable checks that will throw if the conversion result is not meaningful.</param>
         public Vector2h(ref Vector2 v, bool throwOnError)
         {
@@ -128,7 +128,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half2 instance will convert the Vector2d into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector2d</param>
+        /// <param name="v">OpenTK.Vector2d</param>
         public Vector2h(Vector2d v)
         {
             X = new Half(v.X);
@@ -138,7 +138,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half2 instance will convert the Vector2d into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector2d</param>
+        /// <param name="v">OpenTK.Vector2d</param>
         /// <param name="throwOnError">Enable checks that will throw if the conversion result is not meaningful.</param>
         public Vector2h(Vector2d v, bool throwOnError)
         {
@@ -150,7 +150,7 @@ namespace OpenTK.Math
         /// The new Half2 instance will convert the Vector2d into 16-Bit Half precision floating point.
         /// This is the faster constructor.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector2d</param>
+        /// <param name="v">OpenTK.Vector2d</param>
         [CLSCompliant(false)]
         public Vector2h(ref Vector2d v)
         {
@@ -161,7 +161,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half2 instance will convert the Vector2d into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector2d</param>
+        /// <param name="v">OpenTK.Vector2d</param>
         /// <param name="throwOnError">Enable checks that will throw if the conversion result is not meaningful.</param>
         [CLSCompliant(false)]
         public Vector2h(ref Vector2d v, bool throwOnError)
@@ -177,7 +177,7 @@ namespace OpenTK.Math
         /// <summary>
         /// Returns this Half2 instance's contents as Vector2.
         /// </summary>
-        /// <returns>OpenTK.Math.Vector2</returns>
+        /// <returns>OpenTK.Vector2</returns>
         public Vector2 ToVector2()
         {
             return new Vector2(X, Y);
@@ -195,7 +195,7 @@ namespace OpenTK.Math
 
         #region Conversions
 
-        /// <summary>Converts OpenTK.Math.Vector2 to OpenTK.Math.Half2.</summary>
+        /// <summary>Converts OpenTK.Vector2 to OpenTK.Half2.</summary>
         /// <param name="v">The Vector2 to convert.</param>
         /// <returns>The resulting Half vector.</returns>
         public static explicit operator Vector2h(Vector2 v)
@@ -203,7 +203,7 @@ namespace OpenTK.Math
             return new Vector2h(v);
         }
 
-        /// <summary>Converts OpenTK.Math.Vector2d to OpenTK.Math.Half2.</summary>
+        /// <summary>Converts OpenTK.Vector2d to OpenTK.Half2.</summary>
         /// <param name="v">The Vector2d to convert.</param>
         /// <returns>The resulting Half vector.</returns>
         public static explicit operator Vector2h(Vector2d v)
@@ -211,7 +211,7 @@ namespace OpenTK.Math
             return new Vector2h(v);
         }
 
-        /// <summary>Converts OpenTK.Math.Half2 to OpenTK.Math.Vector2.</summary>
+        /// <summary>Converts OpenTK.Half2 to OpenTK.Vector2.</summary>
         /// <param name="h">The Half2 to convert.</param>
         /// <returns>The resulting Vector2.</returns>
         public static explicit operator Vector2(Vector2h h)
@@ -219,7 +219,7 @@ namespace OpenTK.Math
             return new Vector2(h.X, h.Y);
         }
 
-        /// <summary>Converts OpenTK.Math.Half2 to OpenTK.Math.Vector2d.</summary>
+        /// <summary>Converts OpenTK.Half2 to OpenTK.Vector2d.</summary>
         /// <param name="h">The Half2 to convert.</param>
         /// <returns>The resulting Vector2d.</returns>
         public static explicit operator Vector2d(Vector2h h)
@@ -280,8 +280,8 @@ namespace OpenTK.Math
 
         #region IEquatable<Half2> Members
 
-        /// <summary>Returns a value indicating whether this instance is equal to a specified OpenTK.Math.Half2 vector.</summary>
+        /// <summary>Returns a value indicating whether this instance is equal to a specified OpenTK.Half2 vector.</summary>
-        /// <param name="other">OpenTK.Math.Half2 to compare to this instance..</param>
+        /// <param name="other">OpenTK.Half2 to compare to this instance..</param>
         /// <returns>True, if other is equal to this instance; false otherwise.</returns>
         public bool Equals(Vector2h other)
         {

Source/OpenTK/Math/Vector3.cs

@@ -25,8 +25,7 @@ SOFTWARE.
 using System;
 using System.Runtime.InteropServices;
 using System.Xml.Serialization;
-
+namespace OpenTK
-namespace OpenTK.Math
 {
     /// <summary>
     /// Represents a 3D vector using three single-precision floating-point numbers.
@@ -216,7 +215,7 @@ namespace OpenTK.Math
         {
             get
             {
-                return 1.0f / OpenTK.Math.Functions.InverseSqrtFast(X * X + Y * Y + Z * Z);
+                return 1.0f /OpenTK.Functions.InverseSqrtFast(X * X + Y * Y + Z * Z);
             }
         }
 
@@ -1014,7 +1013,7 @@ namespace OpenTK.Math
         #region Swizzle
 
         /// <summary>
-        /// Gets or sets an OpenTK.Math.Vector2 with the X and Y components of this instance.
+        /// Gets or sets an OpenTK.Vector2 with the X and Y components of this instance.
         /// </summary>
         [XmlIgnore]
         public Vector2 Xy { get { return new Vector2(X, Y); } set { X = value.X; Y = value.Y; } }

Source/OpenTK/Math/Vector3d.cs

@@ -26,7 +26,7 @@ using System;
 using System.Runtime.InteropServices;
 using System.Xml.Serialization;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
     /// <summary>
     /// Represents a 3D vector using three double-precision floating-point numbers.
@@ -214,7 +214,7 @@ namespace OpenTK.Math
         {
             get
             {
-                return 1.0f / OpenTK.Math.Functions.InverseSqrtFast(X * X + Y * Y + Z * Z);
+                return 1.0f / OpenTK.Functions.InverseSqrtFast(X * X + Y * Y + Z * Z);
             }
         }
 
@@ -1010,7 +1010,7 @@ namespace OpenTK.Math
         #region Swizzle
 
         /// <summary>
-        /// Gets or sets an OpenTK.Math.Vector2d with the X and Y components of this instance.
+        /// Gets or sets an OpenTK.Vector2d with the X and Y components of this instance.
         /// </summary>
         [XmlIgnore]
         public Vector2d Xy { get { return new Vector2d(X, Y); } set { X = value.X; Y = value.Y; } }
@@ -1078,7 +1078,7 @@ namespace OpenTK.Math
             return !left.Equals(right);
         }
 
-        /// <summary>Converts OpenTK.Math.Vector3 to OpenTK.Math.Vector3d.</summary>
+        /// <summary>Converts OpenTK.Vector3 to OpenTK.Vector3d.</summary>
         /// <param name="v3">The Vector3 to convert.</param>
         /// <returns>The resulting Vector3d.</returns>
         public static explicit operator Vector3d(Vector3 v3)
@@ -1086,7 +1086,7 @@ namespace OpenTK.Math
             return new Vector3d(v3.X, v3.Y, v3.Z);
         }
 
-        /// <summary>Converts OpenTK.Math.Vector3d to OpenTK.Math.Vector3.</summary>
+        /// <summary>Converts OpenTK.Vector3d to OpenTK.Vector3.</summary>
         /// <param name="v3d">The Vector3d to convert.</param>
         /// <returns>The resulting Vector3.</returns>
         public static explicit operator Vector3(Vector3d v3d)

Source/OpenTK/Math/Vector3h.cs

@@ -28,7 +28,7 @@ using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Xml.Serialization;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
     /// <summary>
     /// 3-component Vector of the Half type. Occupies 6 Byte total.
@@ -94,7 +94,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half3 instance will convert the Vector3 into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector3</param>
+        /// <param name="v">OpenTK.Vector3</param>
         [CLSCompliant(false)]
         public Vector3h(Vector3 v)
         {
@@ -106,7 +106,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half3 instance will convert the Vector3 into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector3</param>
+        /// <param name="v">OpenTK.Vector3</param>
         /// <param name="throwOnError">Enable checks that will throw if the conversion result is not meaningful.</param>
         [CLSCompliant(false)]
         public Vector3h(Vector3 v, bool throwOnError)
@@ -120,7 +120,7 @@ namespace OpenTK.Math
         /// The new Half3 instance will convert the Vector3 into 16-Bit Half precision floating point.
         /// This is the fastest constructor.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector3</param>
+        /// <param name="v">OpenTK.Vector3</param>
         public Vector3h(ref Vector3 v)
         {
             X = new Half(v.X);
@@ -131,7 +131,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half3 instance will convert the Vector3 into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector3</param>
+        /// <param name="v">OpenTK.Vector3</param>
         /// <param name="throwOnError">Enable checks that will throw if the conversion result is not meaningful.</param>
         public Vector3h(ref Vector3 v, bool throwOnError)
         {
@@ -143,7 +143,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half3 instance will convert the Vector3d into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector3d</param>
+        /// <param name="v">OpenTK.Vector3d</param>
         public Vector3h(Vector3d v)
         {
             X = new Half(v.X);
@@ -154,7 +154,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half3 instance will convert the Vector3d into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector3d</param>
+        /// <param name="v">OpenTK.Vector3d</param>
         /// <param name="throwOnError">Enable checks that will throw if the conversion result is not meaningful.</param>
         public Vector3h(Vector3d v, bool throwOnError)
         {
@@ -167,7 +167,7 @@ namespace OpenTK.Math
         /// The new Half3 instance will convert the Vector3d into 16-Bit Half precision floating point.
         /// This is the faster constructor.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector3d</param>
+        /// <param name="v">OpenTK.Vector3d</param>
         [CLSCompliant(false)]
         public Vector3h(ref Vector3d v)
         {
@@ -179,7 +179,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half3 instance will convert the Vector3d into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector3d</param>
+        /// <param name="v">OpenTK.Vector3d</param>
         /// <param name="throwOnError">Enable checks that will throw if the conversion result is not meaningful.</param>
         [CLSCompliant(false)]
         public Vector3h(ref Vector3d v, bool throwOnError)
@@ -194,7 +194,7 @@ namespace OpenTK.Math
         #region Swizzle
 
         /// <summary>
-        /// Gets or sets an OpenTK.Math.Vector2h with the X and Y components of this instance.
+        /// Gets or sets an OpenTK.Vector2h with the X and Y components of this instance.
         /// </summary>
         [XmlIgnore]
         public Vector2h Xy { get { return new Vector2h(X, Y); } set { X = value.X; Y = value.Y; } }
@@ -206,7 +206,7 @@ namespace OpenTK.Math
         /// <summary>
         /// Returns this Half3 instance's contents as Vector3.
         /// </summary>
-        /// <returns>OpenTK.Math.Vector3</returns>
+        /// <returns>OpenTK.Vector3</returns>
         public Vector3 ToVector3()
         {
             return new Vector3(X, Y, Z);
@@ -224,7 +224,7 @@ namespace OpenTK.Math
 
         #region Conversions
 
-        /// <summary>Converts OpenTK.Math.Vector3 to OpenTK.Math.Half3.</summary>
+        /// <summary>Converts OpenTK.Vector3 to OpenTK.Half3.</summary>
         /// <param name="v3f">The Vector3 to convert.</param>
         /// <returns>The resulting Half vector.</returns>
         public static explicit operator Vector3h(Vector3 v3f)
@@ -232,7 +232,7 @@ namespace OpenTK.Math
             return new Vector3h(v3f);
         }
 
-        /// <summary>Converts OpenTK.Math.Vector3d to OpenTK.Math.Half3.</summary>
+        /// <summary>Converts OpenTK.Vector3d to OpenTK.Half3.</summary>
         /// <param name="v3d">The Vector3d to convert.</param>
         /// <returns>The resulting Half vector.</returns>
         public static explicit operator Vector3h(Vector3d v3d)
@@ -240,7 +240,7 @@ namespace OpenTK.Math
             return new Vector3h(v3d);
         }
 
-        /// <summary>Converts OpenTK.Math.Half3 to OpenTK.Math.Vector3.</summary>
+        /// <summary>Converts OpenTK.Half3 to OpenTK.Vector3.</summary>
         /// <param name="h3">The Half3 to convert.</param>
         /// <returns>The resulting Vector3.</returns>
         public static explicit operator Vector3(Vector3h h3)
@@ -252,7 +252,7 @@ namespace OpenTK.Math
             return result;
         }
 
-        /// <summary>Converts OpenTK.Math.Half3 to OpenTK.Math.Vector3d.</summary>
+        /// <summary>Converts OpenTK.Half3 to OpenTK.Vector3d.</summary>
         /// <param name="h3">The Half3 to convert.</param>
         /// <returns>The resulting Vector3d.</returns>
         public static explicit operator Vector3d(Vector3h h3)
@@ -321,8 +321,8 @@ namespace OpenTK.Math
 
         #region IEquatable<Half3> Members
 
-        /// <summary>Returns a value indicating whether this instance is equal to a specified OpenTK.Math.Half3 vector.</summary>
+        /// <summary>Returns a value indicating whether this instance is equal to a specified OpenTK.Half3 vector.</summary>
-        /// <param name="other">OpenTK.Math.Half3 to compare to this instance..</param>
+        /// <param name="other">OpenTK.Half3 to compare to this instance..</param>
         /// <returns>True, if other is equal to this instance; false otherwise.</returns>
         public bool Equals(Vector3h other)
         {

Source/OpenTK/Math/Vector4.cs

@@ -25,8 +25,7 @@ SOFTWARE.
 using System;
 using System.Runtime.InteropServices;
 using System.Xml.Serialization;
-
+namespace OpenTK
-namespace OpenTK.Math
 {
     /// <summary>Represents a 4D vector using four single-precision floating-point numbers.</summary>
     /// <remarks>
@@ -278,7 +277,7 @@ namespace OpenTK.Math
         {
             get
             {
-                return 1.0f / OpenTK.Math.Functions.InverseSqrtFast(X * X + Y * Y + Z * Z + W * W);
+                return 1.0f /OpenTK.Functions.InverseSqrtFast(X * X + Y * Y + Z * Z + W * W);
             }
         }
 
@@ -833,13 +832,13 @@ namespace OpenTK.Math
         #region Swizzle
 
         /// <summary>
-        /// Gets or sets an OpenTK.Math.Vector2 with the X and Y components of this instance.
+        /// Gets or sets an OpenTK.Vector2 with the X and Y components of this instance.
         /// </summary>
         [XmlIgnore]
         public Vector2 Xy { get { return new Vector2(X, Y); } set { X = value.X; Y = value.Y; } }
 
         /// <summary>
-        /// Gets or sets an OpenTK.Math.Vector3 with the X, Y and Z components of this instance.
+        /// Gets or sets an OpenTK.Vector3 with the X, Y and Z components of this instance.
         /// </summary>
         [XmlIgnore]
         public Vector3 Xyz { get { return new Vector3(X, Y, Z); } set { X = value.X; Y = value.Y; Z = value.Z; } }

Source/OpenTK/Math/Vector4d.cs

@@ -26,7 +26,7 @@ using System;
 using System.Runtime.InteropServices;
 using System.Xml.Serialization;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
     /// <summary>Represents a 4D vector using four double-precision floating-point numbers.</summary>
     [Serializable]
@@ -275,7 +275,7 @@ namespace OpenTK.Math
         {
             get
             {
-                return 1.0f / OpenTK.Math.Functions.InverseSqrtFast(X * X + Y * Y + Z * Z + W * W);
+                return 1.0f / OpenTK.Functions.InverseSqrtFast(X * X + Y * Y + Z * Z + W * W);
             }
         }
 
@@ -829,13 +829,13 @@ namespace OpenTK.Math
         #region Swizzle
 
         /// <summary>
-        /// Gets or sets an OpenTK.Math.Vector2d with the X and Y components of this instance.
+        /// Gets or sets an OpenTK.Vector2d with the X and Y components of this instance.
         /// </summary>
         [XmlIgnore]
         public Vector2d Xy { get { return new Vector2d(X, Y); } set { X = value.X; Y = value.Y; } }
 
         /// <summary>
-        /// Gets or sets an OpenTK.Math.Vector3d with the X, Y and Z components of this instance.
+        /// Gets or sets an OpenTK.Vector3d with the X, Y and Z components of this instance.
         /// </summary>
         [XmlIgnore]
         public Vector3d Xyz { get { return new Vector3d(X, Y, Z); } set { X = value.X; Y = value.Y; Z = value.Z; } }
@@ -923,7 +923,7 @@ namespace OpenTK.Math
             }
         }
 
-        /// <summary>Converts OpenTK.Math.Vector4 to OpenTK.Math.Vector4d.</summary>
+        /// <summary>Converts OpenTK.Vector4 to OpenTK.Vector4d.</summary>
         /// <param name="v4">The Vector4 to convert.</param>
         /// <returns>The resulting Vector4d.</returns>
         public static explicit operator Vector4d(Vector4 v4)
@@ -931,7 +931,7 @@ namespace OpenTK.Math
             return new Vector4d(v4.X, v4.Y, v4.Z, v4.W);
         }
 
-        /// <summary>Converts OpenTK.Math.Vector4d to OpenTK.Math.Vector4.</summary>
+        /// <summary>Converts OpenTK.Vector4d to OpenTK.Vector4.</summary>
         /// <param name="v4d">The Vector4d to convert.</param>
         /// <returns>The resulting Vector4.</returns>
         public static explicit operator Vector4(Vector4d v4d)

Source/OpenTK/Math/Vector4h.cs

@@ -28,7 +28,7 @@ using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Xml.Serialization;
 
-namespace OpenTK.Math
+namespace OpenTK
 {
     /// <summary>
     /// 4-component Vector of the Half type. Occupies 8 Byte total.
@@ -103,7 +103,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half4 instance will convert the Vector4 into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector4</param>
+        /// <param name="v">OpenTK.Vector4</param>
         [CLSCompliant(false)]
         public Vector4h(Vector4 v)
         {
@@ -116,7 +116,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half4 instance will convert the Vector4 into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector4</param>
+        /// <param name="v">OpenTK.Vector4</param>
         /// <param name="throwOnError">Enable checks that will throw if the conversion result is not meaningful.</param>
         [CLSCompliant(false)]
         public Vector4h(Vector4 v, bool throwOnError)
@@ -131,7 +131,7 @@ namespace OpenTK.Math
         /// The new Half4 instance will convert the Vector4 into 16-Bit Half precision floating point.
         /// This is the fastest constructor.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector4</param>
+        /// <param name="v">OpenTK.Vector4</param>
         public Vector4h(ref Vector4 v)
         {
             X = new Half(v.X);
@@ -143,7 +143,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half4 instance will convert the Vector4 into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector4</param>
+        /// <param name="v">OpenTK.Vector4</param>
         /// <param name="throwOnError">Enable checks that will throw if the conversion result is not meaningful.</param>
         public Vector4h(ref Vector4 v, bool throwOnError)
         {
@@ -156,7 +156,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half4 instance will convert the Vector4d into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector4d</param>
+        /// <param name="v">OpenTK.Vector4d</param>
         public Vector4h(Vector4d v)
         {
             X = new Half(v.X);
@@ -168,7 +168,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half4 instance will convert the Vector4d into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector4d</param>
+        /// <param name="v">OpenTK.Vector4d</param>
         /// <param name="throwOnError">Enable checks that will throw if the conversion result is not meaningful.</param>
         public Vector4h(Vector4d v, bool throwOnError)
         {
@@ -182,7 +182,7 @@ namespace OpenTK.Math
         /// The new Half4 instance will convert the Vector4d into 16-Bit Half precision floating point.
         /// This is the faster constructor.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector4d</param>
+        /// <param name="v">OpenTK.Vector4d</param>
         [CLSCompliant(false)]
         public Vector4h(ref Vector4d v)
         {
@@ -195,7 +195,7 @@ namespace OpenTK.Math
         /// <summary>
         /// The new Half4 instance will convert the Vector4d into 16-Bit Half precision floating point.
         /// </summary>
-        /// <param name="v">OpenTK.Math.Vector4d</param>
+        /// <param name="v">OpenTK.Vector4d</param>
         /// <param name="throwOnError">Enable checks that will throw if the conversion result is not meaningful.</param>
         [CLSCompliant(false)]
         public Vector4h(ref Vector4d v, bool throwOnError)
@@ -211,13 +211,13 @@ namespace OpenTK.Math
         #region Swizzle
 
         /// <summary>
-        /// Gets or sets an OpenTK.Math.Vector2h with the X and Y components of this instance.
+        /// Gets or sets an OpenTK.Vector2h with the X and Y components of this instance.
         /// </summary>
         [XmlIgnore]
         public Vector2h Xy { get { return new Vector2h(X, Y); } set { X = value.X; Y = value.Y; } }
 
         /// <summary>
-        /// Gets or sets an OpenTK.Math.Vector3h with the X, Y and Z components of this instance.
+        /// Gets or sets an OpenTK.Vector3h with the X, Y and Z components of this instance.
         /// </summary>
         [XmlIgnore]
         public Vector3h Xyz { get { return new Vector3h(X, Y, Z); } set { X = value.X; Y = value.Y; Z = value.Z; } }
@@ -229,7 +229,7 @@ namespace OpenTK.Math
         /// <summary>
         /// Returns this Half4 instance's contents as Vector4.
         /// </summary>
-        /// <returns>OpenTK.Math.Vector4</returns>
+        /// <returns>OpenTK.Vector4</returns>
         public Vector4 ToVector4()
         {
             return new Vector4(X, Y, Z, W);
@@ -247,7 +247,7 @@ namespace OpenTK.Math
 
         #region Conversions
 
-        /// <summary>Converts OpenTK.Math.Vector4 to OpenTK.Math.Half4.</summary>
+        /// <summary>Converts OpenTK.Vector4 to OpenTK.Half4.</summary>
         /// <param name="v4f">The Vector4 to convert.</param>
         /// <returns>The resulting Half vector.</returns>
         public static explicit operator Vector4h(Vector4 v4f)
@@ -255,7 +255,7 @@ namespace OpenTK.Math
             return new Vector4h(v4f);
         }
 
-        /// <summary>Converts OpenTK.Math.Vector4d to OpenTK.Math.Half4.</summary>
+        /// <summary>Converts OpenTK.Vector4d to OpenTK.Half4.</summary>
         /// <param name="v4d">The Vector4d to convert.</param>
         /// <returns>The resulting Half vector.</returns>
         public static explicit operator Vector4h(Vector4d v4d)
@@ -263,7 +263,7 @@ namespace OpenTK.Math
             return new Vector4h(v4d);
         }
 
-        /// <summary>Converts OpenTK.Math.Half4 to OpenTK.Math.Vector4.</summary>
+        /// <summary>Converts OpenTK.Half4 to OpenTK.Vector4.</summary>
         /// <param name="h4">The Half4 to convert.</param>
         /// <returns>The resulting Vector4.</returns>
         public static explicit operator Vector4(Vector4h h4)
@@ -276,7 +276,7 @@ namespace OpenTK.Math
             return result;
         }
 
-        /// <summary>Converts OpenTK.Math.Half4 to OpenTK.Math.Vector4d.</summary>
+        /// <summary>Converts OpenTK.Half4 to OpenTK.Vector4d.</summary>
         /// <param name="h4">The Half4 to convert.</param>
         /// <returns>The resulting Vector4d.</returns>
         public static explicit operator Vector4d(Vector4h h4)
@@ -350,8 +350,8 @@ namespace OpenTK.Math
 
         #region IEquatable<Half4> Members
 
-        /// <summary>Returns a value indicating whether this instance is equal to a specified OpenTK.Math.Half4 vector.</summary>
+        /// <summary>Returns a value indicating whether this instance is equal to a specified OpenTK.Half4 vector.</summary>
-        /// <param name="other">OpenTK.Math.Half4 to compare to this instance..</param>
+        /// <param name="other">OpenTK.Half4 to compare to this instance..</param>
         /// <returns>True, if other is equal to this instance; false otherwise.</returns>
         public bool Equals(Vector4h other)
         {

Source/Utilities/Fonts/DisplayListTextPrinter.cs

@@ -9,7 +9,6 @@ using System.Collections.Generic;
 using System.Text;
 
 using OpenTK.Graphics.OpenGL;
-using OpenTK.Math;
 
 namespace OpenTK.Graphics
 {

Source/Utilities/Fonts/IFont.cs

@@ -8,7 +8,6 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-using OpenTK.Math;
 
 namespace OpenTK.Graphics
 {

Source/Utilities/Fonts/IPrinterImplementation.cs

@@ -8,7 +8,6 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-using OpenTK.Math;
 
 namespace OpenTK.Graphics
 {

Source/Utilities/Fonts/TextureFont.cs

@@ -13,7 +13,6 @@ using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
 
-using OpenTK.Math;
 using OpenTK.Graphics;
 using OpenTK.Platform;
 

Source/Utilities/Fonts/VboTextPrinter.cs

@@ -10,7 +10,6 @@ using System.Text;
 using System.Runtime.InteropServices;
 
 using OpenTK.Graphics.OpenGL;
-using OpenTK.Math;
 
 namespace OpenTK.Graphics
 {

Source/Utilities/Graphics/Text/GL1TextOutputProvider.cs

@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 using System.Drawing;
-using OpenTK.Math;
+
 using System;
 
 namespace OpenTK.Graphics.Text

Source/Utilities/Graphics/TextPrinter.cs

@@ -14,7 +14,6 @@ using System.Text.RegularExpressions;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
 
-using OpenTK.Math;
 using OpenTK.Graphics;
 using OpenTK.Graphics.Text;
 using OpenTK.Platform;