ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-12 11:15:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated examples to use the new TextPrinter.

Browse source
This commit is contained in:
the_fiddler 2008-11-25 17:25:51 +00:00
parent 5d1eda9289
commit e1beaf3744
5 changed files with 361 additions and 365 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Source/Examples/OpenGL/FrameBufferObject.cs
View file

@ -8,6 +8,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Drawing;
using OpenTK; using OpenTK;
using OpenTK.Input; using OpenTK.Input;
@ -25,7 +26,7 @@ namespace Examples.Tutorial
{ {
} }
TextureFont sans = new TextureFont(new System.Drawing.Font(System.Drawing.FontFamily.GenericSansSerif, 14.0f)); Font sans = new Font(System.Drawing.FontFamily.GenericSansSerif, 16.0f);
ITextPrinter text = new TextPrinter(); ITextPrinter text = new TextPrinter();
uint ColorTexture; uint ColorTexture;
@ -236,7 +237,7 @@ namespace Examples.Tutorial
GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit); GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
text.Begin(); text.Begin();
text.Draw((1.0 / e.Time).ToString("F2"), sans); text.Print((1.0 / e.Time).ToString("F2"), sans);
text.End(); text.End();
GL.PushMatrix(); GL.PushMatrix();

4
Source/Examples/OpenGL/JuliaSetFractal.cs
View file

@ -55,7 +55,7 @@ namespace Examples.Tutorial
// Text drawing (for fps) // Text drawing (for fps)
TextPrinter printer = new TextPrinter(); TextPrinter printer = new TextPrinter();
TextureFont font = new TextureFont(new Font(FontFamily.GenericSansSerif, 14.0f)); Font font = new Font(FontFamily.GenericSansSerif, 16.0f);
#endregion private Fields #endregion private Fields
@ -290,7 +290,7 @@ namespace Examples.Tutorial
GL.UseProgram(0); GL.UseProgram(0);
printer.Begin(); printer.Begin();
GL.Color3(Color.PaleGoldenrod); GL.Color3(Color.PaleGoldenrod);
printer.Draw((1 / e.Time).ToString("F2"), font); printer.Print((1 / e.Time).ToString("F2"), font, TextPrinterOptions.NoCache);
printer.End(); printer.End();
SwapBuffers(); SwapBuffers();

10
Source/Examples/Tests/GameWindowStates.cs
View file

@ -20,7 +20,7 @@ namespace Examples.Tests
[Example("GameWindow states", ExampleCategory.Test)] [Example("GameWindow states", ExampleCategory.Test)]
public class GameWindowStates : GameWindow public class GameWindowStates : GameWindow
{ {
TextureFont font = new TextureFont(new Font(FontFamily.GenericSansSerif, 16.0f)); Font font = new Font(FontFamily.GenericSansSerif, 16.0f);
TextPrinter printer = new TextPrinter(); TextPrinter printer = new TextPrinter();
#region GetNext and GetPrevious methods for enums. #region GetNext and GetPrevious methods for enums.
@ -118,12 +118,12 @@ namespace Examples.Tests
printer.Begin(); printer.Begin();
printer.Draw("Instructions:", font); GL.Translate(0, font.Height, 0); printer.Print("Instructions:", font); GL.Translate(0, font.Height, 0);
printer.Draw(String.Format("1 - cycle through window styles (current: {0}).", this.WindowState), font); printer.Print(String.Format("1 - cycle through window styles (current: {0}).", this.WindowState), font);
GL.Translate(0, font.Height, 0); GL.Translate(0, font.Height, 0);
printer.Draw(String.Format("2 - cycle through window borders (current: {0}).", this.WindowBorder), font); printer.Print(String.Format("2 - cycle through window borders (current: {0}).", this.WindowBorder), font);
GL.Translate(0, font.Height, 0); GL.Translate(0, font.Height, 0);
printer.Draw(String.Format("3 - toggle fullscreen (current: {0}).", printer.Print(String.Format("3 - toggle fullscreen (current: {0}).",
this.WindowState == WindowState.Fullscreen ? "enabled" : "disabled"), font); this.WindowState == WindowState.Fullscreen ? "enabled" : "disabled"), font);

86
Source/Examples/Tutorial/Fonts.cs
View file

@ -33,52 +33,50 @@ namespace Examples.Tutorial
ITextPrinter printer = new TextPrinter(); ITextPrinter printer = new TextPrinter();
const string text = "Hello, world!"; const string text = "Hello, world!";
TextHandle[] handles; // Used to cache the strings we want to print.
// Load some different TextureFont sizes to compare their quality. // Load some different TextureFont sizes to compare their quality.
// You'll never need to load that many fonts in your application, // You'll never need to load that many fonts in your application,
// 3 or 4 should be more than enough. // 3 or 4 should be more than enough.
TextureFont[] fonts = new TextureFont[] Font[] fonts = new Font[]
{ {
new TextureFont(new Font(FontFamily.GenericSerif, 8.0f)), new Font(FontFamily.GenericSerif, 8.0f),
new TextureFont(new Font(FontFamily.GenericSerif, 10.0f)), new Font(FontFamily.GenericSerif, 10.0f),
new TextureFont(new Font(FontFamily.GenericSerif, 12.0f)), new Font(FontFamily.GenericSerif, 12.0f),
new TextureFont(new Font(FontFamily.GenericSerif, 14.0f)), new Font(FontFamily.GenericSerif, 14.0f),
new TextureFont(new Font(FontFamily.GenericSerif, 16.0f)), new Font(FontFamily.GenericSerif, 16.0f),
new TextureFont(new Font(FontFamily.GenericSerif, 18.0f)), new Font(FontFamily.GenericSerif, 18.0f),
new TextureFont(new Font(FontFamily.GenericSerif, 20.0f)), new Font(FontFamily.GenericSerif, 20.0f),
new TextureFont(new Font(FontFamily.GenericSerif, 22.0f)), new Font(FontFamily.GenericSerif, 22.0f),
new TextureFont(new Font(FontFamily.GenericSerif, 24.0f, FontStyle.Bold)), new Font(FontFamily.GenericSerif, 24.0f, FontStyle.Bold),
new TextureFont(new Font(FontFamily.GenericSerif, 26.0f)), new Font(FontFamily.GenericSerif, 26.0f),
new TextureFont(new Font(FontFamily.GenericSerif, 28.0f)), new Font(FontFamily.GenericSerif, 28.0f),
new TextureFont(new Font(FontFamily.GenericSerif, 30.0f)), new Font(FontFamily.GenericSerif, 30.0f),
new TextureFont(new Font(FontFamily.GenericSerif, 32.0f, FontStyle.Italic)), new Font(FontFamily.GenericSerif, 32.0f, FontStyle.Italic),
new TextureFont(new Font(FontFamily.GenericSerif, 34.0f)), new Font(FontFamily.GenericSerif, 34.0f),
new TextureFont(new Font(FontFamily.GenericSerif, 36.0f)), new Font(FontFamily.GenericSerif, 36.0f),
new TextureFont(new Font(FontFamily.GenericSerif, 38.0f)), new Font(FontFamily.GenericSerif, 38.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 8.0f)), new Font(FontFamily.GenericSansSerif, 8.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 10.0f)), new Font(FontFamily.GenericSansSerif, 10.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 12.0f)), new Font(FontFamily.GenericSansSerif, 12.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 14.0f)), new Font(FontFamily.GenericSansSerif, 14.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 16.0f)), new Font(FontFamily.GenericSansSerif, 16.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 18.0f)), new Font(FontFamily.GenericSansSerif, 18.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 20.0f)), new Font(FontFamily.GenericSansSerif, 20.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 22.0f)), new Font(FontFamily.GenericSansSerif, 22.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 24.0f, FontStyle.Bold)), new Font(FontFamily.GenericSansSerif, 24.0f, FontStyle.Bold),
new TextureFont(new Font(FontFamily.GenericSansSerif, 26.0f)), new Font(FontFamily.GenericSansSerif, 26.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 28.0f)), new Font(FontFamily.GenericSansSerif, 28.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 30.0f)), new Font(FontFamily.GenericSansSerif, 30.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 32.0f, FontStyle.Italic)), new Font(FontFamily.GenericSansSerif, 32.0f, FontStyle.Italic),
new TextureFont(new Font(FontFamily.GenericSansSerif, 34.0f)), new Font(FontFamily.GenericSansSerif, 34.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 36.0f)), new Font(FontFamily.GenericSansSerif, 36.0f),
new TextureFont(new Font(FontFamily.GenericSansSerif, 38.0f)), new Font(FontFamily.GenericSansSerif, 38.0f),
}; };
#endregion #endregion
@ -99,10 +97,6 @@ namespace Examples.Tutorial
public override void OnLoad(EventArgs e) public override void OnLoad(EventArgs e)
{ {
GL.ClearColor(Color.SteelBlue); GL.ClearColor(Color.SteelBlue);
handles = new TextHandle[fonts.Length];
for (int i = handles.Length; --i >= 0; )
printer.Prepare(text, fonts[i], out handles[i]);
} }
#endregion #endregion
@ -117,9 +111,7 @@ namespace Examples.Tutorial
/// <param name="e"></param> /// <param name="e"></param>
public override void OnUnload(EventArgs e) public override void OnUnload(EventArgs e)
{ {
foreach (TextHandle h in handles) foreach (Font f in fonts)
h.Dispose();
foreach (TextureFont f in fonts)
f.Dispose(); f.Dispose();
} }
@ -168,21 +160,21 @@ namespace Examples.Tutorial
printer.Begin(); printer.Begin();
// Print using the first font. // Print using the first font.
for (int i = 0; i < handles.Length / 2; i++) for (int i = 0; i < fonts.Length / 2; i++)
{ {
printer.Draw(handles[i]); printer.Print(text, fonts[i]);
GL.Translate(0, fonts[i].Height, 0); GL.Translate(0, fonts[i].Height, 0);
} }
// Move to the right, and print using the second font. // Move to the right, and print using the second font.
//float width, height; //float width, height;
//fonts[handles.Length / 2 - 1].MeasureString(text, out width, out height); //fonts[handles.Length / 2 - 1].MeasureString(text, out width, out height);
RectangleF rect = fonts[handles.Length / 2 - 1].MeasureText(text); RectangleF rect = printer.Measure(text, fonts[fonts.Length / 2 - 1]).BoundingBox;
GL.LoadIdentity(); GL.LoadIdentity();
GL.Translate(rect.Width + 32.0f, 0, 0); GL.Translate(rect.Width + 32.0f, 0, 0);
for (int i = handles.Length / 2; i < handles.Length; i++) for (int i = fonts.Length / 2; i < fonts.Length; i++)
{ {
printer.Draw(handles[i]); printer.Print(text, fonts[i]);
GL.Translate(0, fonts[i].Height, 0); GL.Translate(0, fonts[i].Height, 0);
} }

31
Source/Examples/Tutorial/Text.cs
View file

@ -23,13 +23,12 @@ namespace Examples.Tutorial
[Example("Text", ExampleCategory.Tutorial, 4)] [Example("Text", ExampleCategory.Tutorial, 4)]
public class Text : GameWindow public class Text : GameWindow
{ {
Font serif2 = new Font(FontFamily.GenericSerif, 16.0f); Font serif = new Font(FontFamily.GenericSerif, 16.0f);
TextureFont serif = new TextureFont(new Font(FontFamily.GenericSerif, 12.0f)); Font sans = new Font(FontFamily.GenericSansSerif, 48.0f, FontStyle.Italic);
TextureFont sans = new TextureFont(new Font(FontFamily.GenericSansSerif, 14.0f));
TextHandle poem_handle;
TextPrinter text = new TextPrinter(); TextPrinter text = new TextPrinter();
string poem = new StreamReader("Data/Poem.txt").ReadToEnd(); //string poem = new StreamReader("Data/Poem.txt").ReadToEnd();
string poem = "The quick brown fox jumped over the lazy dogs!\n\nKerning: Wo\nLigatures: ffi, fft";
int lines; // How many lines the poem contains. int lines; // How many lines the poem contains.
float scroll_speed; float scroll_speed;
@ -49,7 +48,6 @@ namespace Examples.Tutorial
current_position = initial_position; current_position = initial_position;
scroll_speed = -1.0f; scroll_speed = -1.0f;
text.Prepare(poem, serif, out poem_handle);
// Count the amount of lines in the text, to find out the correct // Count the amount of lines in the text, to find out the correct
// warparound position. We want the text to scroll until the last // warparound position. We want the text to scroll until the last
@ -69,8 +67,10 @@ namespace Examples.Tutorial
public override void OnUnload(EventArgs e) public override void OnUnload(EventArgs e)
{ {
if (poem_handle != null) poem_handle.Dispose(); if (serif != null)
if (serif != null) serif.Dispose(); serif.Dispose();
if (sans != null)
sans.Dispose();
} }
#endregion #endregion
@ -126,14 +126,17 @@ namespace Examples.Tutorial
// used in 2d graphics, and is necessary for achieving pixel-perfect glyph rendering. // used in 2d graphics, and is necessary for achieving pixel-perfect glyph rendering.
// TextPrinter.End() restores your previous projection/modelview matrices. // TextPrinter.End() restores your previous projection/modelview matrices.
text.Begin(); text.Begin();
//GL.Color3(Color.LightBlue);
//text.Draw((1.0 / e.Time).ToString("F2"), sans); // Print FPS counter. Since the counter changes per frame,
// it shouldn't be cached (TextPrinterOptions.NoCache).
GL.Color3(Color.LightYellow);
text.Print((1.0 / e.Time).ToString("F2"), sans, TextPrinterOptions.NoCache);
// Print the actual text.
GL.Translate(0.0f, current_position, 0.0f); GL.Translate(0.0f, current_position, 0.0f);
GL.Color3(Color.White); GL.Color3(Color.White);
//text.Draw(poem_handle); text.Print(poem, serif);
//text.Draw(poem, serif);
//GL.BindTexture(TextureTarget.Texture2D, 1);
text.Print(poem, serif2);
text.End(); text.End();
SwapBuffers(); SwapBuffers();