Moved OpenTK.Fonts to OpenTK.Graphics namespace.

Documentation/Changelog.txt

@@ -27,9 +27,14 @@ OpenTK 0.9.0 -> 0.9.1
 	+ Platform.X11
 		+ Simplified input handling.
 	+ Fonts
+		+ Moved to OpenTK.Utilities.
+
+ + OpenTK.Utilities
+	 + Fonts
+		+ Moved to OpenTK.Graphics from OpenTK.Fonts.
 		+ Implemented immediate text printing (without caching).
-		+ Improved space width calculation.
-		+ Fixed TextureFont.MeasureString calculation.
+		+ Improved width calculation for space characters.
+		+ Fixed width calucalated by TextureFont.MeasureString.
 
 + Examples
 	+ Added GluTessellator example.

Source/Examples/Tutorial/Fonts.cs

@@ -10,7 +10,7 @@ using System.Text;
 using System.Drawing;
 
 using OpenTK;
-using OpenTK.Fonts;
+using OpenTK.Graphics;
 using OpenTK.Graphics.OpenGL;
 using OpenTK.Input;
 using System.IO;

Source/Examples/Tutorial/T01_Simple_Window.cs

@@ -12,7 +12,7 @@ using System.Diagnostics;
 
 using OpenTK;
 using OpenTK.Graphics.OpenGL;
-using OpenTK.Fonts;
+using OpenTK.Graphics;
 using OpenTK.Graphics.OpenGL.Enums;
 using OpenTK.Input;
 

Source/Examples/Tutorial/T02_Vertex_Arrays.cs

@@ -14,7 +14,7 @@ using OpenTK;
 using OpenTK.Graphics.OpenGL;
 using System.Diagnostics;
 using OpenTK.Input;
-using OpenTK.Fonts;
+using OpenTK.Graphics;
 using OpenTK.Graphics.OpenGL.Enums;
 
 namespace Examples.Tutorial

Source/Examples/Tutorial/Text.cs

@@ -11,7 +11,7 @@ using System.IO;
 using System.Drawing;
 
 using OpenTK;
-using OpenTK.Fonts;
+using OpenTK.Graphics;
 using OpenTK.Graphics.OpenGL;
 using OpenTK.Input;
 using OpenTK.Graphics.OpenGL.Enums;

Source/Examples/Tutorial/Textures.cs

@@ -15,7 +15,7 @@ using System.Drawing.Imaging;
 
 using OpenTK;
 using OpenTK.Graphics.OpenGL;
-using OpenTK.Fonts;
+using OpenTK.Graphics;
 using OpenTK.Graphics.OpenGL.Enums;
 
 namespace Examples.Tutorial

Source/Utilities/Fonts/DisplayListTextHandle.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Text;
 using OpenTK.Graphics.OpenGL;
 
-namespace OpenTK.Fonts
+namespace OpenTK.Graphics
 {
     class DisplayListTextHandle : TextHandle
     {

Source/Utilities/Fonts/DisplayListTextPrinter.cs

@@ -11,7 +11,7 @@ using System.Text;
 using OpenTK.Graphics.OpenGL;
 using OpenTK.Math;
 
-namespace OpenTK.Fonts
+namespace OpenTK.Graphics
 {
     /// <summary>
     /// Provides text printing through OpenGL 1.1 Display Lists.

Source/Utilities/Fonts/Glyph.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Drawing;
 
-namespace OpenTK.Fonts
+namespace OpenTK.Graphics
 {
     using Graphics = System.Drawing.Graphics;
 

Source/Utilities/Fonts/IFont.cs

@@ -10,7 +10,7 @@ using System.Text;
 
 using OpenTK.Math;
 
-namespace OpenTK.Fonts
+namespace OpenTK.Graphics
 {
     public interface IFont : IDisposable
     {

Source/Utilities/Fonts/IPrinterImplementation.cs

@@ -10,7 +10,7 @@ using System.Text;
 
 using OpenTK.Math;
 
-namespace OpenTK.Fonts
+namespace OpenTK.Graphics
 {
     /// <summary>
     /// Defines the interface for TextPrinter implementations.

Source/Utilities/Fonts/ITextPrinter.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Drawing;
 
-namespace OpenTK.Fonts
+namespace OpenTK.Graphics
 {
     /// <summary>
     /// Defines the interface for a TextPrinter.

Source/Utilities/Fonts/TextHandle.cs

@@ -8,7 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenTK.Fonts
+namespace OpenTK.Graphics
 {
     /// <summary>
     /// Represents a handle to cached text.
@@ -21,7 +21,7 @@ namespace OpenTK.Fonts
         }
 
         /// <summary>
-        /// The handle of the cached text. Call the OpenTK.Fonts.ITextPrinter.Draw() method
+        /// The handle of the cached text. Call the OpenTK.Graphics.ITextPrinter.Draw() method
         /// to draw the text represented by this TextHandle.
         /// </summary>
         public readonly int Handle;

Source/Utilities/Fonts/TextPrinter.cs

@@ -16,7 +16,9 @@ using OpenTK.Graphics.OpenGL;
 using OpenTK.Graphics.OpenGL.Enums;
 using System.Diagnostics;
 
-namespace OpenTK.Fonts
+namespace OpenTK.Fonts { }
+
+namespace OpenTK.Graphics
 {
     /// <summary>
     /// Provides methods to perform layout and print hardware accelerated text.
@@ -271,7 +273,7 @@ namespace OpenTK.Fonts
         /// Draws dynamic text without caching. Not implemented yet!
         /// </summary>
         /// <param name="text">The System.String to draw.</param>
-        /// <param name="font">The OpenTK.Fonts.TextureFont to draw the text in.</param>
+        /// <param name="font">The OpenTK.Graphics.TextureFont to draw the text in.</param>
         public void Draw(string text, TextureFont font)
         {
             int num_indices;

Source/Utilities/Fonts/TextureFont.cs

@@ -18,7 +18,7 @@ using OpenTK.Graphics.OpenGL;
 using OpenTK.Graphics.OpenGL.Enums;
 using OpenTK.Platform;
 
-namespace OpenTK.Fonts
+namespace OpenTK.Graphics
 {
     using Graphics = System.Drawing.Graphics;
     using PixelFormat = OpenTK.Graphics.OpenGL.PixelFormat;
@@ -327,7 +327,7 @@ namespace OpenTK.Fonts
         bool disposed;
 
         /// <summary>
-        /// Releases all resources used by this OpenTK.Fonts.TextureFont.
+        /// Releases all resources used by this OpenTK.Graphics.TextureFont.
         /// </summary>
         public void Dispose()
         {

Source/Utilities/Fonts/VboTextPrinter.cs

@@ -12,7 +12,7 @@ using System.Runtime.InteropServices;
 using OpenTK.Graphics.OpenGL;
 using OpenTK.Math;
 
-namespace OpenTK.Fonts
+namespace OpenTK.Graphics
 {
     /// <summary>
     /// Provides text printing through OpenGL 1.5 vertex buffer objects.