* Tests.csproj:

* GOLIBTests.cs:
* GOLIBTest_1.cs:
* GOLIBTest_0.cs:
* GOLIBTest_5.cs:
* GOLIBTest_3.cs:
* GOLIBTest_fps.cs:
* GOLIBTest_4.1.cs:
* GOLIBTest_1.2.cs:
* GOLIBTest_1.1.cs:
* GOLIBTest_meter.cs:
* GOLIBTest_Label.cs:
* GOLIBTest_stack.cs:
* GOLIBTest_HStack.cs:
* GOLIBTest_Spinner.cs:
* GOLIBTest_Scrollbar.cs:
* GOLIBTest_Container.cs:
* GOLIBTest_Expandable.cs: code cleaning, grouped tests

* Interface.cs:

* OpenTKGameWindow.cs: ClearInterface function

diff --git a/Tests/GOLIBTest_0.cs b/Tests/GOLIBTest_0.cs
index 7ec0de998cf092942166abd87372a858c2f38cce..88cd45e9c17047edc2ac46633f31392a8c14da8a 100644 (file)
--- a/Tests/GOLIBTest_0.cs
+++ b/Tests/GOLIBTest_0.cs
@@ -50,12 +50,7 @@ namespace test6
                        tmp -= 1;\r
                        l.Text = tmp.ToString ();\r
                }\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
+\r
                protected override void OnKeyDown (KeyboardKeyEventArgs e)\r
                {\r
                        switch (e.Key) {\r

diff --git a/Tests/GOLIBTest_1.1.cs b/Tests/GOLIBTest_1.1.cs
deleted file mode 100644 (file)
index b9cbdf6..0000000
--- a/Tests/GOLIBTest_1.1.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test\r
-{\r
-       class GOLIBTest_1_1 : OpenTKGameWindow\r
-       {\r
-               public GOLIBTest_1_1 ()\r
-                       : base(1024, 600,"test")\r
-               {}\r
-\r
-               Group g;\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/test1.1.goml", out g);\r
-\r
-               }\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
-\r
-               protected override void OnUpdateFrame (FrameEventArgs e)\r
-               {\r
-                       base.OnUpdateFrame (e);\r
-               }\r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_1_1 win = new GOLIBTest_1_1( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_1.2.cs b/Tests/GOLIBTest_1.2.cs
deleted file mode 100644 (file)
index 3337f06..0000000
--- a/Tests/GOLIBTest_1.2.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test\r
-{\r
-       class GOLIBTest_1_2 : OpenTKGameWindow\r
-       {\r
-               public GOLIBTest_1_2 ()\r
-                       : base(1024, 600,"test")\r
-               {}\r
-\r
-               Container g;\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/test1.2.goml", out g);\r
-\r
-               }\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
-\r
-               protected override void OnUpdateFrame (FrameEventArgs e)\r
-               {\r
-                       base.OnUpdateFrame (e);\r
-               }\r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_1_2 win = new GOLIBTest_1_2( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_1.cs b/Tests/GOLIBTest_1.cs
deleted file mode 100644 (file)
index f92cd16..0000000
--- a/Tests/GOLIBTest_1.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test\r
-{\r
-       class GOLIBTest_1 : OpenTKGameWindow\r
-       {\r
-               public GOLIBTest_1 ()\r
-                       : base(1024, 600,"test")\r
-               {}\r
-\r
-               Container g;\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/test1.goml", out g);\r
-\r
-               }\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
-\r
-               protected override void OnUpdateFrame (FrameEventArgs e)\r
-               {\r
-                       base.OnUpdateFrame (e);\r
-               }\r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_1 win = new GOLIBTest_1( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_2.cs b/Tests/GOLIBTest_2.cs
deleted file mode 100644 (file)
index 4af5436..0000000
--- a/Tests/GOLIBTest_2.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test\r
-{\r
-       class GOLIBTest_2 : OpenTKGameWindow\r
-       {\r
-               public GOLIBTest_2 ()\r
-                       : base(1024, 600,"test")\r
-               {}\r
-\r
-               Group g;\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/test2.goml", out g);\r
-\r
-               }\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
-\r
-               protected override void OnUpdateFrame (FrameEventArgs e)\r
-               {\r
-                       base.OnUpdateFrame (e);\r
-               }\r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_2 win = new GOLIBTest_2( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_3.cs b/Tests/GOLIBTest_3.cs
deleted file mode 100755 (executable)
index ae23336..0000000
--- a/Tests/GOLIBTest_3.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test\r
-{\r
-       class GOLIBTest_3 : OpenTKGameWindow\r
-       {\r
-               public GOLIBTest_3 ()\r
-                       : base(1024, 600,"test")\r
-               {}\r
-\r
-               GraphicObject g;\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       g = LoadInterface<Container>("Interfaces/test3.goml");\r
-\r
-               }\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
-                       \r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_3 win = new GOLIBTest_3( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_4.1.cs b/Tests/GOLIBTest_4.1.cs
deleted file mode 100644 (file)
index 01621df..0000000
--- a/Tests/GOLIBTest_4.1.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test\r
-{\r
-       class GOLIBTest_4_1 : OpenTKGameWindow\r
-       {\r
-               public GOLIBTest_4_1 ()\r
-                       : base(1024, 600,"test")\r
-               {}\r
-\r
-               Group g;\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/test4.1.goml", out g);\r
-\r
-               }\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
-\r
-               protected override void OnUpdateFrame (FrameEventArgs e)\r
-               {\r
-                       base.OnUpdateFrame (e);\r
-               }\r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_4_1 win = new GOLIBTest_4_1( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_5.cs b/Tests/GOLIBTest_5.cs
index 87fb5276ec734650217303d4eb09e68152467cb4..1969bcf11a0b66dc137fabce04b373eae670a3b1 100644 (file)
--- a/Tests/GOLIBTest_5.cs
+++ b/Tests/GOLIBTest_5.cs
@@ -31,12 +31,6 @@ namespace test
                        gl.Add (c.FindByName ("g0"));\r
                        ll.Add (c.FindByName ("lab0")as Label);\r
                }\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
 \r
                int cpt;\r
                protected override void OnUpdateFrame (FrameEventArgs e)\r

diff --git a/Tests/GOLIBTest_Container.cs b/Tests/GOLIBTest_Container.cs
deleted file mode 100644 (file)
index 3e54e87..0000000
--- a/Tests/GOLIBTest_Container.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test2\r
-{\r
-       class GOLIBTest_Container : OpenTKGameWindow , IValueChange\r
-       {\r
-               #region FPS\r
-               int _fps = 0;\r
-\r
-               public int fps {\r
-                       get { return _fps; }\r
-                       set {\r
-                               if (_fps == value)\r
-                                       return;\r
-                               \r
-                               _fps = value;\r
-\r
-                               if (_fps > fpsMax) {\r
-                                       fpsMax = _fps;\r
-                                       ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMax", fpsMax));\r
-                               } else if (_fps < fpsMin) {\r
-                                       fpsMin = _fps;\r
-                                       ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMin", fpsMin));\r
-                               }\r
-\r
-                               if (ValueChanged != null)\r
-                                       ValueChanged.Raise(this, new ValueChangeEventArgs ("fps", _fps));\r
-                       }\r
-               }\r
-               string name = "testName";\r
-\r
-               public string Name {\r
-                       get {\r
-                               return name;\r
-                       }\r
-                       set {\r
-                               name = value;\r
-                       }\r
-               }\r
-\r
-               public int fpsMin = int.MaxValue;\r
-               public int fpsMax = 0;\r
-\r
-               void resetFps ()\r
-               {\r
-                       fpsMin = int.MaxValue;\r
-                       fpsMax = 0;\r
-                       _fps = 0;\r
-               }\r
-               #endregion\r
-\r
-               public GOLIBTest_Container ()\r
-                       : base(600, 400,"test")\r
-               {}\r
-\r
-               Container g;\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/testContainer.goml", out g);\r
-\r
-               }\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
-\r
-               private int frameCpt = 0;\r
-               protected override void OnUpdateFrame (FrameEventArgs e)\r
-               {\r
-                       base.OnUpdateFrame (e);\r
-\r
-                       fps = (int)RenderFrequency;\r
-\r
-                       if (frameCpt > 200) {\r
-                               resetFps ();\r
-                               frameCpt = 0;\r
-\r
-                       }\r
-                       frameCpt++;\r
-               }\r
-\r
-               #region IValueChange implementation\r
-\r
-               public event EventHandler<ValueChangeEventArgs> ValueChanged;\r
-\r
-               #endregion\r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_Container win = new GOLIBTest_Container( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_Expandable.cs b/Tests/GOLIBTest_Expandable.cs
deleted file mode 100644 (file)
index d96290c..0000000
--- a/Tests/GOLIBTest_Expandable.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-#define DEBUG_CLIP_RECTANGLE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test\r
-{\r
-       class GOLIBTest_Expandable : OpenTKGameWindow\r
-       {\r
-               public GOLIBTest_Expandable ()\r
-                       : base(1024, 600,"test")\r
-               {}\r
-\r
-               Container g;\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/testExpandable.goml", out g);\r
-\r
-               }\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
-\r
-               protected override void OnUpdateFrame (FrameEventArgs e)\r
-               {\r
-                       base.OnUpdateFrame (e);\r
-               }\r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_Expandable win = new GOLIBTest_Expandable( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_HStack.cs b/Tests/GOLIBTest_HStack.cs
deleted file mode 100755 (executable)
index ac8e0a3..0000000
--- a/Tests/GOLIBTest_HStack.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test3\r
-{\r
-       class GOLIBTest_HStack : OpenTKGameWindow\r
-       {\r
-               public GOLIBTest_HStack ()\r
-                       : base(1024, 600,"test")\r
-               {}\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/testHStack.goml");\r
-\r
-               }                       \r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_HStack win = new GOLIBTest_HStack( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_Label.cs b/Tests/GOLIBTest_Label.cs
deleted file mode 100644 (file)
index ca9c0af..0000000
--- a/Tests/GOLIBTest_Label.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test\r
-{\r
-       class GOLIBTest_Label : OpenTKGameWindow , IValueChange\r
-       {\r
-               #region FPS\r
-               int _fps = 0;\r
-\r
-               public int fps {\r
-                       get { return _fps; }\r
-                       set {\r
-                               if (_fps == value)\r
-                                       return;\r
-                               \r
-                               _fps = value;\r
-\r
-                               if (_fps > fpsMax) {\r
-                                       fpsMax = _fps;\r
-                                       ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMax", fpsMax));\r
-                               } else if (_fps < fpsMin) {\r
-                                       fpsMin = _fps;\r
-                                       ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMin", fpsMin));\r
-                               }\r
-\r
-                               if (ValueChanged != null)\r
-                                       ValueChanged.Raise(this, new ValueChangeEventArgs ("fps", _fps));\r
-                       }\r
-               }\r
-               string name = "testName";\r
-\r
-               public string Name {\r
-                       get {\r
-                               return name;\r
-                       }\r
-                       set {\r
-                               name = value;\r
-                       }\r
-               }\r
-\r
-               public int fpsMin = int.MaxValue;\r
-               public int fpsMax = 0;\r
-\r
-               void resetFps ()\r
-               {\r
-                       fpsMin = int.MaxValue;\r
-                       fpsMax = 0;\r
-                       _fps = 0;\r
-               }\r
-               #endregion\r
-\r
-               public GOLIBTest_Label ()\r
-                       : base(600, 400,"test")\r
-               {}\r
-\r
-               Label g;\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/testLabel.goml", out g);\r
-\r
-               }\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
-\r
-               private int frameCpt = 0;\r
-               protected override void OnUpdateFrame (FrameEventArgs e)\r
-               {\r
-                       base.OnUpdateFrame (e);\r
-\r
-                       fps = (int)RenderFrequency;\r
-\r
-                       if (frameCpt > 200) {\r
-                               resetFps ();\r
-                               frameCpt = 0;\r
-\r
-                       }\r
-                       frameCpt++;\r
-               }\r
-\r
-               #region IValueChange implementation\r
-\r
-               public event EventHandler<ValueChangeEventArgs> ValueChanged;\r
-\r
-               #endregion\r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_Label win = new GOLIBTest_Label( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_Scrollbar.cs b/Tests/GOLIBTest_Scrollbar.cs
deleted file mode 100644 (file)
index 67572d5..0000000
--- a/Tests/GOLIBTest_Scrollbar.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-#define DEBUG_CLIP_RECTANGLE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test2\r
-{\r
-       class GOLIBTest_Scrollbar : OpenTKGameWindow\r
-       {\r
-               public GOLIBTest_Scrollbar ()\r
-                       : base(1024, 600,"test")\r
-               {}\r
-\r
-               Group g;\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/testScrollbar.goml", out g);\r
-\r
-               }\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
-\r
-               protected override void OnUpdateFrame (FrameEventArgs e)\r
-               {\r
-                       base.OnUpdateFrame (e);\r
-               }\r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_Scrollbar win = new GOLIBTest_Scrollbar( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_Spinner.cs b/Tests/GOLIBTest_Spinner.cs
deleted file mode 100644 (file)
index c3b36f0..0000000
--- a/Tests/GOLIBTest_Spinner.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test\r
-{\r
-       class GOLIBTest_Spinner : OpenTKGameWindow\r
-       {\r
-               public GOLIBTest_Spinner ()\r
-                       : base(1024, 600,"test")\r
-               {}\r
-\r
-               Container g;\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/testSpinner.goml", out g);\r
-\r
-               }\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
-\r
-               protected override void OnUpdateFrame (FrameEventArgs e)\r
-               {\r
-                       base.OnUpdateFrame (e);\r
-               }\r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_Spinner win = new GOLIBTest_Spinner( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_fps.cs b/Tests/GOLIBTest_fps.cs
deleted file mode 100644 (file)
index c46efcb..0000000
--- a/Tests/GOLIBTest_fps.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test\r
-{\r
-       class GOLIBTest_fps : OpenTKGameWindow , IValueChange\r
-       {\r
-               #region FPS\r
-               int _fps = 0;\r
-\r
-               public int fps {\r
-                       get { return _fps; }\r
-                       set {\r
-                               if (_fps == value)\r
-                                       return;\r
-                               \r
-                               _fps = value;\r
-\r
-                               if (_fps > fpsMax) {\r
-                                       fpsMax = _fps;\r
-                                       ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMax", fpsMax));\r
-                               } else if (_fps < fpsMin) {\r
-                                       fpsMin = _fps;\r
-                                       ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMin", fpsMin));\r
-                               }\r
-                                       \r
-                               ValueChanged.Raise(this, new ValueChangeEventArgs ("fps", _fps));\r
-                               ValueChanged.Raise (this, new ValueChangeEventArgs ("update",\r
-                                       this.updateTime.ElapsedMilliseconds.ToString () + " ms"));\r
-                       }\r
-               }\r
-\r
-               public int fpsMin = int.MaxValue;\r
-               public int fpsMax = 0;\r
-\r
-               void resetFps ()\r
-               {\r
-                       fpsMin = int.MaxValue;\r
-                       fpsMax = 0;\r
-                       _fps = 0;\r
-               }\r
-               #endregion\r
-\r
-               public string update = "";\r
-\r
-               string name = "testName";\r
-\r
-               public string Name {\r
-                       get {\r
-                               return name;\r
-                       }\r
-                       set {\r
-                               name = value;\r
-                       }\r
-               }\r
-\r
-               public GOLIBTest_fps ()\r
-                       : base(600, 400,"test")\r
-               {\r
-                       VSync = VSyncMode.Off;\r
-               }\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/fps.goml");\r
-\r
-\r
-                       //ValueChanged += (object sender, ValueChangeEventArgs vce) => labFps.Text = vce.NewValue.ToString ();\r
-       \r
-\r
-               }\r
-\r
-               private int frameCpt = 0;\r
-               protected override void OnUpdateFrame (FrameEventArgs e)\r
-               {\r
-                       base.OnUpdateFrame (e);\r
-\r
-                       fps = (int)RenderFrequency;\r
-\r
-\r
-                       if (frameCpt > 200) {\r
-                               resetFps ();\r
-                               frameCpt = 0;\r
-                       }\r
-                       frameCpt++;\r
-               }\r
-\r
-               #region IValueChange implementation\r
-\r
-               public event EventHandler<ValueChangeEventArgs> ValueChanged;\r
-\r
-               #endregion\r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_fps win = new GOLIBTest_fps( )) {\r
-                               win.Run (60.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_meter.cs b/Tests/GOLIBTest_meter.cs
deleted file mode 100644 (file)
index 33669d7..0000000
--- a/Tests/GOLIBTest_meter.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test\r
-{\r
-       class GOLIBTest_meter : OpenTKGameWindow, IValueChange\r
-       {\r
-               public GOLIBTest_meter ()\r
-                       : base(1024, 600,"test")\r
-               {}\r
-\r
-               #region IValueChange implementation\r
-               public event EventHandler<ValueChangeEventArgs> ValueChanged;\r
-               #endregion\r
-\r
-               #region FPS\r
-               int _fps = 0;\r
-\r
-               public int fps {\r
-                       get { return _fps; }\r
-                       set {\r
-                               if (_fps == value)\r
-                                       return;\r
-\r
-                               _fps = value;\r
-\r
-                               if (_fps > fpsMax) {\r
-                                       fpsMax = _fps;\r
-                                       ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMax", fpsMax));\r
-                               } else if (_fps < fpsMin) {\r
-                                       fpsMin = _fps;\r
-                                       ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMin", fpsMin));\r
-                               }\r
-\r
-                               if (ValueChanged != null)\r
-                                       ValueChanged.Raise(this, new ValueChangeEventArgs ("fps", _fps));\r
-                       }\r
-               }\r
-               string name = "testName";\r
-\r
-               public string Name {\r
-                       get {\r
-                               return name;\r
-                       }\r
-                       set {\r
-                               name = value;\r
-                       }\r
-               }\r
-\r
-               public int fpsMin = int.MaxValue;\r
-               public int fpsMax = 0;\r
-\r
-               void resetFps ()\r
-               {\r
-                       fpsMin = int.MaxValue;\r
-                       fpsMax = 0;\r
-                       _fps = 0;\r
-               }\r
-               #endregion\r
-               AnalogMeter g;\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/testMeter.goml", out g);\r
-               }\r
-\r
-               protected override void OnRenderFrame (FrameEventArgs e)\r
-               {\r
-                       GL.Clear (ClearBufferMask.ColorBufferBit);\r
-                       base.OnRenderFrame (e);\r
-                       SwapBuffers ();\r
-               }\r
-               private int frameCpt = 0;\r
-               protected override void OnUpdateFrame (FrameEventArgs e)\r
-               {\r
-                       base.OnUpdateFrame (e);\r
-\r
-                       fps = (int)RenderFrequency;\r
-\r
-                       if (frameCpt > 200) {\r
-                               resetFps ();\r
-                               frameCpt = 0;\r
-                       }\r
-                       frameCpt++;\r
-               }\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_meter win = new GOLIBTest_meter( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTest_stack.cs b/Tests/GOLIBTest_stack.cs
deleted file mode 100644 (file)
index 18490d6..0000000
--- a/Tests/GOLIBTest_stack.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-#define MONO_CAIRO_DEBUG_DISPOSE\r
-\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using OpenTK;\r
-using OpenTK.Graphics.OpenGL;\r
-using OpenTK.Input;\r
-\r
-using System.Diagnostics;\r
-\r
-//using GGL;\r
-using go;\r
-using System.Threading;\r
-\r
-\r
-namespace test\r
-{\r
-       class GOLIBTest_stack : OpenTKGameWindow\r
-       {\r
-               public GOLIBTest_stack ()\r
-                       : base(1024, 600,"test")\r
-               {}\r
-\r
-               protected override void OnLoad (EventArgs e)\r
-               {\r
-                       base.OnLoad (e);\r
-                       LoadInterface("Interfaces/test_stack.goml");\r
-\r
-               }\r
-\r
-               protected override void OnUpdateFrame (FrameEventArgs e)\r
-               {\r
-                       base.OnUpdateFrame (e);\r
-               }\r
-\r
-               [STAThread]\r
-               static void Main ()\r
-               {\r
-                       Console.WriteLine ("starting example");\r
-\r
-                       using (GOLIBTest_stack win = new GOLIBTest_stack( )) {\r
-                               win.Run (30.0);\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
new file mode 100644 (file)
index 0000000..a7645cb
--- /dev/null
+++ b/Tests/GOLIBTests.cs
@@ -0,0 +1,133 @@
+#define MONO_CAIRO_DEBUG_DISPOSE\r
+\r
+\r
+using System;\r
+using System.Runtime.InteropServices;\r
+using OpenTK;\r
+using OpenTK.Graphics.OpenGL;\r
+using OpenTK.Input;\r
+\r
+using System.Diagnostics;\r
+\r
+//using GGL;\r
+using go;\r
+using System.Threading;\r
+\r
+\r
+namespace test\r
+{\r
+       class GOLIBTests : OpenTKGameWindow, IValueChange\r
+       {\r
+               #region IValueChange implementation\r
+\r
+               public event EventHandler<ValueChangeEventArgs> ValueChanged;\r
+\r
+               #endregion\r
+\r
+               public GOLIBTests ()\r
+                       : base(800, 600,"test")\r
+               {}\r
+\r
+               int frameCpt = 0;\r
+               int idx = 0;\r
+               string[] testFiles = {\r
+                       "test1.goml",\r
+                       "test1.1.goml",\r
+                       "test1.2.goml",\r
+                       "test1.3.goml",\r
+                       "test2.goml",\r
+                       "testLabel.goml",\r
+                       "testContainer.goml",\r
+                       "test_stack.goml",\r
+                       "testHStack.goml",\r
+                       "testScrollbar.goml",\r
+                       "testSpinner.goml",\r
+                       "testExpandable.goml",\r
+                       "testWindow.goml",\r
+                       "fps.goml",\r
+                       "testMeter.goml",\r
+                       "test3.goml",\r
+                       "test4.1.goml",\r
+               };\r
+\r
+               #region FPS\r
+               int _fps = 0;\r
+\r
+               public int fps {\r
+                       get { return _fps; }\r
+                       set {\r
+                               if (_fps == value)\r
+                                       return;\r
+\r
+                               _fps = value;\r
+\r
+                               if (_fps > fpsMax) {\r
+                                       fpsMax = _fps;\r
+                                       ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMax", fpsMax));\r
+                               } else if (_fps < fpsMin) {\r
+                                       fpsMin = _fps;\r
+                                       ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMin", fpsMin));\r
+                               }\r
+\r
+                               ValueChanged.Raise(this, new ValueChangeEventArgs ("fps", _fps));\r
+                               ValueChanged.Raise (this, new ValueChangeEventArgs ("update",\r
+                                       this.updateTime.ElapsedMilliseconds.ToString () + " ms"));\r
+                       }\r
+               }\r
+\r
+               public int fpsMin = int.MaxValue;\r
+               public int fpsMax = 0;\r
+\r
+               void resetFps ()\r
+               {\r
+                       fpsMin = int.MaxValue;\r
+                       fpsMax = 0;\r
+                       _fps = 0;\r
+               }\r
+               public string update = "";\r
+               #endregion\r
+\r
+               protected override void OnLoad (EventArgs e)\r
+               {\r
+                       base.OnLoad (e);\r
+                       LoadInterface("Interfaces/" + testFiles[idx]);\r
+               }\r
+               protected override void OnUpdateFrame (FrameEventArgs e)\r
+               {\r
+                       base.OnUpdateFrame (e);\r
+\r
+                       fps = (int)RenderFrequency;\r
+\r
+\r
+                       if (frameCpt > 200) {\r
+                               resetFps ();\r
+                               frameCpt = 0;\r
+                       }\r
+                       frameCpt++;\r
+               }\r
+               protected override void OnKeyDown (KeyboardKeyEventArgs e)\r
+               {\r
+                       base.OnKeyDown (e);\r
+                       if (e.Key == Key.Escape) {\r
+                               this.Quit ();\r
+                       }\r
+                       ClearInterface ();\r
+                       idx++;\r
+                       if (idx == testFiles.Length)\r
+                               idx = 0;\r
+                       this.Title = testFiles [idx];\r
+                       LoadInterface("Interfaces/" + testFiles[idx]);\r
+\r
+               }\r
+\r
+               [STAThread]\r
+               static void Main ()\r
+               {\r
+                       Console.WriteLine ("starting example");\r
+\r
+                       using (GOLIBTests win = new GOLIBTests( )) {\r
+                               win.Run (30.0);\r
+                       }\r
+               }\r
+       }\r
+}
\ No newline at end of file

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 6c994d0e163eaa2c8a44af12c2664f9c6709b08e..b6f2125384dc971e1eb6072889ea6e2a149d262e 100644 (file)
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Tests</RootNamespace>
     <AssemblyName>Tests</AssemblyName>
-    <StartupObject>test.GOLIBTest_Window</StartupObject>
+    <StartupObject>test.GOLIBTests</StartupObject>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>..\bin\$(configuration)</OutputPath>
     <IntermediateOutputPath>obj\$(configuration)</IntermediateOutputPath>
@@ -46,26 +46,11 @@
   <ItemGroup>
     <Compile Include="GOLIBTest_5.cs" />
     <Compile Include="GOLIBTest_4.cs" />
-    <Compile Include="GOLIBTest_3.cs" />
-    <Compile Include="GOLIBTest_1.cs" />
-    <Compile Include="GOLIBTest_2.cs" />
-    <Compile Include="GOLIBTest_1.1.cs" />
-    <Compile Include="GOLIBTest_1.2.cs" />
-    <Compile Include="GOLIBTest_4.1.cs" />
-    <Compile Include="GOLIBTest_fps.cs" />
     <Compile Include="GOLIBTest_Listbox.cs" />
-    <Compile Include="GOLIBTest_Spinner.cs" />
-    <Compile Include="GOLIBTest_Expandable.cs" />
-    <Compile Include="GOLIBTest_Label.cs" />
-    <Compile Include="GOLIBTest_Window.cs" />
-    <Compile Include="GOLIBTest_Container.cs" />
-    <Compile Include="GOLIBTest_Scrollbar.cs" />
-    <Compile Include="GOLIBTest_meter.cs" />
     <Compile Include="GOLIBTest_0.cs" />
     <Compile Include="GOLIBTest_TypeViewer.cs" />
-    <Compile Include="GOLIBTest_stack.cs" />
-    <Compile Include="GOLIBTest_HStack.cs" />
     <Compile Include="GOLIBTest_DirViewer.cs" />
+    <Compile Include="GOLIBTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="image\u.svg">

diff --git a/src/Interface.cs b/src/Interface.cs
index d7a35f81e1d49198e62e2558f12dcc628758e170..63160cf53bbce38e5e7d4568c647232d4a1108d5 100644 (file)
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -113,9 +113,7 @@ namespace go
                        return tmp;
                }
                public static void Load<T>(string file, out T result, object hostClass = null)
-               {
-                       //result = (T)(Load (file, hostClass) as object);
-
+               {                       
                        GOMLResolutionStack.Push(new List<DynAttribute>());
 
                        XmlSerializerNamespaces xn = new XmlSerializerNamespaces();

diff --git a/src/OpenTKGameWindow.cs b/src/OpenTKGameWindow.cs
index d34d6bfa03152ad103f6b7778325ad12db0b6b79..fa68cb895b46732c430c9de4b33b21f4c414cda5 100755 (executable)
--- a/src/OpenTKGameWindow.cs
+++ b/src/OpenTKGameWindow.cs
@@ -88,7 +88,13 @@ namespace go
                        g.Visible = false;//trick to ensure clip is added to refresh zone\r
                        GraphicObjects.Remove (g);\r
                }\r
-\r
+               /// <summary> Remove all Graphic objects from top container </summary>\r
+               public void ClearInterface()\r
+               {\r
+                       foreach (GraphicObject g in GraphicObjects)\r
+                               g.Visible = false;\r
+                       GraphicObjects.Clear ();\r
+               }\r
                public void Quit ()\r
                {\r
                        this.Exit ();\r