From 0c200d4ae4f0f4a7a7c58c3affc7670eb6b2dcff Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Wed, 9 Sep 2015 13:50:40 +0200 Subject: simplify Loading, removed unnecessary overloads --- src/Interface.cs | 38 ++------------------------------------ src/OpenTKGameWindow.cs | 13 +------------ 2 files changed, 3 insertions(+), 48 deletions(-) (limited to 'src') diff --git a/src/Interface.cs b/src/Interface.cs index 63160cf5..2fea548a 100644 --- 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(string file, out T result, object hostClass = null) - { - GOMLResolutionStack.Push(new List()); - - 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()); diff --git a/src/OpenTKGameWindow.cs b/src/OpenTKGameWindow.cs index fa68cb89..355ae304 100755 --- a/src/OpenTKGameWindow.cs +++ b/src/OpenTKGameWindow.cs @@ -313,18 +313,6 @@ namespace go #endregion #region loading - public void LoadInterface(string path, out T result) - { - Interface.Load (path, out result, this); - AddWidget (result as GraphicObject); - } - public T LoadInterface (string Path) - { - T result; - Interface.Load (Path, out result, this); - AddWidget (result as GraphicObject); - return result; - } public GraphicObject LoadInterface (string path) { GraphicObject tmp = Interface.Load (path, this); @@ -340,6 +328,7 @@ namespace go { GL.Clear (ClearBufferMask.ColorBufferBit); } + #region Game win overrides protected override void OnUpdateFrame(FrameEventArgs e) { -- cgit v1.3.1-4-g156e