simplify Loading, removed unnecessary overloads

diff --git a/Tests/GOLIBTest_0.cs b/Tests/GOLIBTest_0.cs
index 88cd45e9c17047edc2ac46633f31392a8c14da8a..a41cdb4156a7bc69d08355d0a26c9b7315ad6e3f 100644 (file)
--- a/Tests/GOLIBTest_0.cs
+++ b/Tests/GOLIBTest_0.cs
@@ -22,13 +22,13 @@ namespace test6
                        : base(1024, 600,"test")\r
                {}\r
 \r
-               Border g;\r
+               GraphicObject g;\r
                Label l;\r
 \r
                protected override void OnLoad (EventArgs e)\r
                {\r
                        base.OnLoad (e);\r
-                       LoadInterface("Interfaces/test0.goml", out g);\r
+                       g = LoadInterface("Interfaces/test0.goml");\r
                        l = g.FindByName ("labCpt") as Label;\r
                }\r
 \r

diff --git a/Tests/GOLIBTest_4.cs b/Tests/GOLIBTest_4.cs
index 8adb5064e802e2a41470df6eac66e24d29392961..c1f2e0ad2a7cb6c8e926abe431d75ea44f724cc5 100644 (file)
--- a/Tests/GOLIBTest_4.cs
+++ b/Tests/GOLIBTest_4.cs
@@ -66,7 +66,7 @@ namespace test
                }\r
                #endregion\r
 \r
-               Group c,c2;\r
+               GraphicObject c;\r
                ProgressBar pb, pb2;\r
                Label labMousePos, labPb, labF, labA, labH, labFps, labFpsMin, labFpsMax, labV,\r
                                labUpdate;\r
@@ -83,7 +83,7 @@ namespace test
                {\r
                        base.OnLoad (e);\r
 \r
-                       LoadInterface("Interfaces/test4.goml", out c);\r
+                       c = LoadInterface("Interfaces/test4.goml");\r
                        //LoadInterface("golibtests/test4.xml", out c2);\r
                        //c2.HorizontalAlignment = HorizontalAlignment.Left;\r
                        //c2.VerticalAlignment = VerticalAlignment.Top;\r

diff --git a/Tests/GOLIBTest_5.cs b/Tests/GOLIBTest_5.cs
index 1969bcf11a0b66dc137fabce04b373eae670a3b1..d5a8a343b4bd148d684c3d9c2bdebcf8ade343c1 100644 (file)
--- a/Tests/GOLIBTest_5.cs
+++ b/Tests/GOLIBTest_5.cs
@@ -20,14 +20,14 @@ namespace test
                        : base(1024, 600,"test5")\r
                {}\r
 \r
-               Container c;\r
+               GraphicObject c;\r
                List<GraphicObject> gl = new List<GraphicObject>();\r
                List<Label> ll = new List<Label>();\r
                protected override void OnLoad (EventArgs e)\r
                {\r
                        base.OnLoad (e);\r
 \r
-                       LoadInterface("Interfaces/test5.goml", out c);\r
+                       c = LoadInterface("Interfaces/test5.goml");\r
                        gl.Add (c.FindByName ("g0"));\r
                        ll.Add (c.FindByName ("lab0")as Label);\r
                }\r

diff --git a/Tests/GOLIBTest_Listbox.cs b/Tests/GOLIBTest_Listbox.cs
index 815acfd2755323043342832770487e68963d7aff..f3064dd14f046e480c123a97a97510bbbf6cfd91 100644 (file)
--- a/Tests/GOLIBTest_Listbox.cs
+++ b/Tests/GOLIBTest_Listbox.cs
@@ -80,23 +80,16 @@ namespace test
 //                             "string 2",\r
 //                             "string 3"\r
 //                     };      \r
-               ListBox g;\r
 \r
                protected override void OnLoad (EventArgs e)\r
                {\r
                        base.OnLoad (e);\r
-                       LoadInterface("Interfaces/test_Listbox.goml", out g);\r
+                       LoadInterface("Interfaces/test_Listbox.goml");\r
 \r
 //                     TestList [1].Field = "test string";\r
 //                     ValueChanged.Raise(this, new ValueChangeEventArgs ("TestList", null, TestList));\r
 \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

diff --git a/src/Interface.cs b/src/Interface.cs
index 63160cf53bbce38e5e7d4568c647232d4a1108d5..2fea548a78e2d173d980abbc3cc32def2ea5fb18 100644 (file)
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -87,6 +87,7 @@ namespace go
                        }
                        return stream;
                }
+
                public static GraphicObject Load(string path, object hostClass = null)
                {
                        string root = "Object";
@@ -112,42 +113,7 @@ namespace go
                        stream.Dispose ();
                        return tmp;
                }
-               public static void Load<T>(string file, out T result, object hostClass = null)
-               {                       
-                       GOMLResolutionStack.Push(new List<DynAttribute>());
-
-                       XmlSerializerNamespaces xn = new XmlSerializerNamespaces();
-                       xn.Add("", "");
-                       XmlSerializer xs = new XmlSerializer(typeof(T));            
-
-                       using (Stream s = new FileStream(file, FileMode.Open))
-                       {
-                               result = (T)xs.Deserialize(s);
-                       }
-
-                       if (hostClass == null)
-                               return;
-
-                       resolveGOML (hostClass);
-
-//                     while (Bindings.Count > 0) {
-//                             DynAttribute binding = Bindings [0];
-//                             Bindings.RemoveAt (0);
-//                             CompilerServices.ResolveBinding (binding, hostClass);
-//                     }
-//                     foreach (DynAttribute binding in Bindings) {
-////                           Type tSource = binding.Source.GetType ();
-////                           if (!tSource.GetInterfaces ().Any (i => i.Name == "IValueChange")){
-////                                   Debug.WriteLine ("Binding source does not implement IValueChange.");
-////                                   continue;
-////                           }
-//                             //MemberInfo mi = binding.Source.GetType ().GetMember (binding.MemberName);
-//                             CompilerServices.CreateBinding (binding, hostClass);
-//                     }
-//                     Bindings.Clear ();
-               }
-
-               public static GraphicObject Load(Stream stream, Type type, object hostClass = null)
+               static GraphicObject Load(Stream stream, Type type, object hostClass = null)
                {
                        GraphicObject result;
                        GOMLResolutionStack.Push(new List<DynAttribute>());

diff --git a/src/OpenTKGameWindow.cs b/src/OpenTKGameWindow.cs
index fa68cb895b46732c430c9de4b33b21f4c414cda5..355ae304018bcd555ed8782c74ea40b5cfa1e3d8 100755 (executable)
--- a/src/OpenTKGameWindow.cs
+++ b/src/OpenTKGameWindow.cs
@@ -313,18 +313,6 @@ namespace go
                #endregion\r
                        \r
                #region loading\r
-               public void LoadInterface<T>(string path, out T result)\r
-               {\r
-                       Interface.Load<T> (path, out result, this);\r
-                       AddWidget (result as GraphicObject);\r
-               }\r
-               public T LoadInterface<T> (string Path)\r
-               {\r
-                       T result;\r
-                       Interface.Load<T> (Path, out result, this);\r
-                       AddWidget (result as GraphicObject);\r
-                       return result;\r
-               }\r
                public GraphicObject LoadInterface (string path)\r
                {\r
                        GraphicObject tmp = Interface.Load (path, this);\r
@@ -340,6 +328,7 @@ namespace go
                {\r
                        GL.Clear (ClearBufferMask.ColorBufferBit);\r
                }\r
+\r
                #region Game win overrides\r
                protected override void OnUpdateFrame(FrameEventArgs e)\r
                {       \r