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

Push/Pop AttribMask.ColorBufferBit in TextPrinter.Begin/End

Browse source 
float[] viewport should have 4 members, not 6.
This commit is contained in:
the_fiddler 2008-03-13 09:34:09 +00:00
parent c79f4abbe9
commit 9d1f1ecc4c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Utilities/Fonts/TextPrinter.cs
View file

@ -29,7 +29,7 @@ namespace OpenTK.Graphics
//static char[] split_chars = new char[] { ' ', '\n', '\t', ',', '.', '/', '?', '!', ';', '\\', '-', '+', '*', '=' }; //static char[] split_chars = new char[] { ' ', '\n', '\t', ',', '.', '/', '?', '!', ';', '\\', '-', '+', '*', '=' };
static bool functionality_checked = false; static bool functionality_checked = false;
static ITextPrinterImplementation printer; static ITextPrinterImplementation printer;
float[] viewport = new float[6]; float[] viewport = new float[4];
// 8 chars by default // 8 chars by default
Vector2[] vertices = new Vector2[8 * 8]; // Interleaved, vertex, texcoord, vertex, etc... Vector2[] vertices = new Vector2[8 * 8]; // Interleaved, vertex, texcoord, vertex, etc...
ushort[] indices = new ushort[6 * 8]; ushort[] indices = new ushort[6 * 8];
@ -307,6 +307,7 @@ namespace OpenTK.Graphics
GL.PushAttrib(AttribMask.TextureBit); GL.PushAttrib(AttribMask.TextureBit);
GL.PushAttrib(AttribMask.EnableBit); GL.PushAttrib(AttribMask.EnableBit);
GL.PushAttrib(AttribMask.ColorBufferBit);
GL.Enable(EnableCap.Texture2D); GL.Enable(EnableCap.Texture2D);
GL.Enable(EnableCap.Blend); GL.Enable(EnableCap.Blend);
@ -326,6 +327,7 @@ namespace OpenTK.Graphics
{ {
GL.PopAttrib(); GL.PopAttrib();
GL.PopAttrib(); GL.PopAttrib();
GL.PopAttrib();
GL.MatrixMode(MatrixMode.Modelview); GL.MatrixMode(MatrixMode.Modelview);
GL.PopMatrix(); GL.PopMatrix();