From 9a6187812d00f38fb24aeec387fe4bed18412b52 Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Wed, 11 Jan 2017 09:58:28 +0100 Subject: [PATCH] code clean --- Tests/OpenTKGameWindow.cs | 14 +- src/GraphicObjects/GraphicObject.cs | 4 +- src/GraphicObjects/Label.cs | 4 +- src/GraphicObjects/TextRun.cs | 3 +- src/Interface.cs | 249 ++++++++++++++++++---------- 5 files changed, 172 insertions(+), 102 deletions(-) diff --git a/Tests/OpenTKGameWindow.cs b/Tests/OpenTKGameWindow.cs index 1f103079..c587d768 100644 --- a/Tests/OpenTKGameWindow.cs +++ b/Tests/OpenTKGameWindow.cs @@ -168,9 +168,9 @@ namespace Crow public vaoMesh quad; public Matrix4 projection; + /// Create the texture for the interface redering void createContext() { - #region Create texture if (GL.IsTexture(texID)) GL.DeleteTexture (texID); GL.GenTextures(1, out texID); @@ -185,8 +185,8 @@ namespace Crow GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear); GL.BindTexture(TextureTarget.Texture2D, 0); - #endregion } + /// Rendering of the interface void OpenGLDraw() { #if MEASURE_TIME @@ -225,15 +225,11 @@ namespace Crow } #endregion - /// - /// Override this method for your OpenGL rendering calls - /// + /// Override this method for your OpenGL rendering calls public virtual void OnRender(FrameEventArgs e) { } - /// - /// Override this method to customize clear method between frames - /// + /// Override this method to customize clear method between frames public virtual void GLClear() { GL.Clear (ClearBufferMask.ColorBufferBit|ClearBufferMask.DepthBufferBit); @@ -254,11 +250,13 @@ namespace Crow GL.ClearColor(0.0f, 0.0f, 0.0f, 0.0f); + #if DEBUG Console.WriteLine("\n\n*************************************"); Console.WriteLine("GL version: " + GL.GetString (StringName.Version)); Console.WriteLine("GL vendor: " + GL.GetString (StringName.Vendor)); Console.WriteLine("GLSL version: " + GL.GetString (StringName.ShadingLanguageVersion)); Console.WriteLine("*************************************\n"); + #endif projection = OpenTK.Matrix4.CreateOrthographicOffCenter (-0.5f, 0.5f, -0.5f, 0.5f, 1, -1); diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index 25332832..e0f1ebfd 100644 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -634,7 +634,7 @@ namespace Crow List