diff --git a/ANX.Framework/NonXNA/AddInSystemFactory.cs b/ANX.Framework/NonXNA/AddInSystemFactory.cs index 796a0522..fd865c4b 100644 --- a/ANX.Framework/NonXNA/AddInSystemFactory.cs +++ b/ANX.Framework/NonXNA/AddInSystemFactory.cs @@ -8,6 +8,7 @@ using ANX.Framework.Input; using NLog; using System.Collections; using System.Resources; +using System.Xml.Linq; #endregion // Using Statements @@ -152,9 +153,7 @@ namespace ANX.Framework.NonXNA } } - this.inputSystems.Sort(); - this.renderSystems.Sort(); - this.soundSystems.Sort(); + SortAddIns(); } } @@ -291,6 +290,15 @@ namespace ANX.Framework.NonXNA throw new AddInLoadingException(String.Format("couldn't find a DefaultCreator of type '{0}'", type.FullName)); } + public void SortAddIns() + { + this.inputSystems.Sort(); + this.renderSystems.Sort(); + this.soundSystems.Sort(); + + this.creators = this.creators.OrderBy(x => x.Value.Priority).ToDictionary(x => x.Key, x => x.Value); + } + public OperatingSystem OperatingSystem { get diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX11/Creator.cs b/RenderSystems/ANX.RenderSystem.Windows.DX11/Creator.cs index 6b6aef25..e7bc9d0a 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX11/Creator.cs +++ b/RenderSystems/ANX.RenderSystem.Windows.DX11/Creator.cs @@ -71,7 +71,7 @@ namespace ANX.RenderSystem.Windows.DX11 public int Priority { - get { return 5; } + get { return 15; } } public bool IsSupported diff --git a/Samples/WindowsGame/AddInSelector.cs b/Samples/WindowsGame/AddInSelector.cs index f97ef926..c4880dd4 100644 --- a/Samples/WindowsGame/AddInSelector.cs +++ b/Samples/WindowsGame/AddInSelector.cs @@ -22,6 +22,8 @@ namespace WindowsGame1 private void AddInSelector_Load(object sender, EventArgs e) { + AddInSystemFactory.Instance.SortAddIns(); + foreach (IRenderSystemCreator renderSystemCreator in AddInSystemFactory.Instance.GetCreators()) { cbRenderSystem.Items.Add(renderSystemCreator.Name); diff --git a/SoundSystems/ANX.SoundSystem.OpenAL/Creator.cs b/SoundSystems/ANX.SoundSystem.OpenAL/Creator.cs index 4d6a9ba8..32f049bd 100644 --- a/SoundSystems/ANX.SoundSystem.OpenAL/Creator.cs +++ b/SoundSystems/ANX.SoundSystem.OpenAL/Creator.cs @@ -73,7 +73,7 @@ namespace ANX.SoundSystem.OpenAL public int Priority { - get { return 10; } + get { return 100; } } public bool IsSupported