diff --git a/ANX.Framework/GraphicsDeviceManager.cs b/ANX.Framework/GraphicsDeviceManager.cs index 36b2a795..71d5975d 100644 --- a/ANX.Framework/GraphicsDeviceManager.cs +++ b/ANX.Framework/GraphicsDeviceManager.cs @@ -221,7 +221,7 @@ namespace ANX.Framework protected GraphicsDeviceInformation FindBestDevice(bool anySuitableDevice) { - //TODO: implement FindBEstDevice + //TODO: implement FindBestDevice GraphicsDeviceInformation deviceInformation = new GraphicsDeviceInformation(); diff --git a/ANX.Framework/NonXNA/AddInSystemFactory.cs b/ANX.Framework/NonXNA/AddInSystemFactory.cs index 7d1258a6..f2a43673 100644 --- a/ANX.Framework/NonXNA/AddInSystemFactory.cs +++ b/ANX.Framework/NonXNA/AddInSystemFactory.cs @@ -270,7 +270,13 @@ namespace ANX.Framework.NonXNA { case "ANX.Framework.NonXNA.IRenderSystemCreator": IRenderSystemCreator renderSystemCreator = creator as IRenderSystemCreator; - IRenderSystemCreator defaultRenderSystemCreator = GetDefaultCreator(); + IRenderSystemCreator defaultRenderSystemCreator = null; + try + { + defaultRenderSystemCreator = GetDefaultCreator(); + } + catch { } + if (renderSystemCreator != null && (defaultRenderSystemCreator == null || defaultRenderSystemCreator.Priority > renderSystemCreator.Priority)) { SetDefaultCreator(renderSystemCreator); @@ -278,7 +284,13 @@ namespace ANX.Framework.NonXNA break; case "ANX.Framework.NonXNA.ISoundSystemCreator": ISoundSystemCreator soundSystemCreator = creator as ISoundSystemCreator; - ISoundSystemCreator defaultSoundSystemCreator = GetDefaultCreator(); + ISoundSystemCreator defaultSoundSystemCreator = null; + try + { + defaultSoundSystemCreator = GetDefaultCreator(); + } + catch { } + if (soundSystemCreator != null && (defaultSoundSystemCreator == null || defaultSoundSystemCreator.Priority > soundSystemCreator.Priority)) { SetDefaultCreator(soundSystemCreator); @@ -286,7 +298,13 @@ namespace ANX.Framework.NonXNA break; case "ANX.Framework.NonXNA.IInputSystemCreator": IInputSystemCreator inputSystemCreator = creator as IInputSystemCreator; - IInputSystemCreator defaultInputSystemCreator = GetDefaultCreator(); + IInputSystemCreator defaultInputSystemCreator = null; + try + { + defaultInputSystemCreator = GetDefaultCreator(); + } + catch { } + if (inputSystemCreator != null && (defaultInputSystemCreator == null || defaultInputSystemCreator.Priority > inputSystemCreator.Priority)) { SetDefaultCreator(inputSystemCreator); diff --git a/Samples/Primitives/Game1.cs b/Samples/Primitives/Game1.cs index 0b356a34..b352c957 100644 --- a/Samples/Primitives/Game1.cs +++ b/Samples/Primitives/Game1.cs @@ -26,14 +26,18 @@ namespace Primitives { graphics = new GraphicsDeviceManager(this); Content.RootDirectory = "SampleContent"; + + graphics.PreparingDeviceSettings += new EventHandler(graphics_PreparingDeviceSettings); + } + + void graphics_PreparingDeviceSettings(object sender, PreparingDeviceSettingsEventArgs e) + { + e.GraphicsDeviceInformation.PresentationParameters.BackBufferWidth = 600; + e.GraphicsDeviceInformation.PresentationParameters.BackBufferHeight = 600; } protected override void Initialize() { - graphics.PreferredBackBufferWidth = 600; - graphics.PreferredBackBufferHeight = 600; - graphics.ApplyChanges(); - base.Initialize(); }