Moved OpenTK.Fonts to OpenTK.Graphics namespace.

This commit is contained in:
the_fiddler 2008-03-08 14:38:10 +00:00
parent ca68971695
commit 1e397fcee5
16 changed files with 27 additions and 20 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -8,7 +8,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace OpenTK.Fonts namespace OpenTK.Graphics
{ {
/// <summary> /// <summary>
/// Represents a handle to cached text. /// Represents a handle to cached text.
@ -21,7 +21,7 @@ namespace OpenTK.Fonts
} }
/// <summary> /// <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. /// to draw the text represented by this TextHandle.
/// </summary> /// </summary>
public readonly int Handle; public readonly int Handle;

View file

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

View file

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

View file

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