backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

fixed a major bug in AddInSystemFactory which prevented loading of AddIns

Browse Source
This commit is contained in:
Glatzemann 2011-12-01 11:20:49 +00:00
parent fa035cb4df
commit 6a43f4c2d0
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ANX.Framework/GraphicsDeviceManager.cs
View File

@ -221,7 +221,7 @@ namespace ANX.Framework
protected GraphicsDeviceInformation FindBestDevice(bool anySuitableDevice) protected GraphicsDeviceInformation FindBestDevice(bool anySuitableDevice)
{ {
//TODO: implement FindBEstDevice //TODO: implement FindBestDevice
GraphicsDeviceInformation deviceInformation = new GraphicsDeviceInformation(); GraphicsDeviceInformation deviceInformation = new GraphicsDeviceInformation();

24
ANX.Framework/NonXNA/AddInSystemFactory.cs
View File

@ -270,7 +270,13 @@ namespace ANX.Framework.NonXNA
{ {
case "ANX.Framework.NonXNA.IRenderSystemCreator": case "ANX.Framework.NonXNA.IRenderSystemCreator":
IRenderSystemCreator renderSystemCreator = creator as IRenderSystemCreator; IRenderSystemCreator renderSystemCreator = creator as IRenderSystemCreator;
IRenderSystemCreator defaultRenderSystemCreator = GetDefaultCreator<IRenderSystemCreator>(); IRenderSystemCreator defaultRenderSystemCreator = null;
try
{
defaultRenderSystemCreator = GetDefaultCreator<IRenderSystemCreator>();
}
catch { }
if (renderSystemCreator != null && (defaultRenderSystemCreator == null || defaultRenderSystemCreator.Priority > renderSystemCreator.Priority)) if (renderSystemCreator != null && (defaultRenderSystemCreator == null || defaultRenderSystemCreator.Priority > renderSystemCreator.Priority))
{ {
SetDefaultCreator<IRenderSystemCreator>(renderSystemCreator); SetDefaultCreator<IRenderSystemCreator>(renderSystemCreator);
@ -278,7 +284,13 @@ namespace ANX.Framework.NonXNA
break; break;
case "ANX.Framework.NonXNA.ISoundSystemCreator": case "ANX.Framework.NonXNA.ISoundSystemCreator":
ISoundSystemCreator soundSystemCreator = creator as ISoundSystemCreator; ISoundSystemCreator soundSystemCreator = creator as ISoundSystemCreator;
ISoundSystemCreator defaultSoundSystemCreator = GetDefaultCreator<ISoundSystemCreator>(); ISoundSystemCreator defaultSoundSystemCreator = null;
try
{
defaultSoundSystemCreator = GetDefaultCreator<ISoundSystemCreator>();
}
catch { }
if (soundSystemCreator != null && (defaultSoundSystemCreator == null || defaultSoundSystemCreator.Priority > soundSystemCreator.Priority)) if (soundSystemCreator != null && (defaultSoundSystemCreator == null || defaultSoundSystemCreator.Priority > soundSystemCreator.Priority))
{ {
SetDefaultCreator<ISoundSystemCreator>(soundSystemCreator); SetDefaultCreator<ISoundSystemCreator>(soundSystemCreator);
@ -286,7 +298,13 @@ namespace ANX.Framework.NonXNA
break; break;
case "ANX.Framework.NonXNA.IInputSystemCreator": case "ANX.Framework.NonXNA.IInputSystemCreator":
IInputSystemCreator inputSystemCreator = creator as IInputSystemCreator; IInputSystemCreator inputSystemCreator = creator as IInputSystemCreator;
IInputSystemCreator defaultInputSystemCreator = GetDefaultCreator<IInputSystemCreator>(); IInputSystemCreator defaultInputSystemCreator = null;
try
{
defaultInputSystemCreator = GetDefaultCreator<IInputSystemCreator>();
}
catch { }
if (inputSystemCreator != null && (defaultInputSystemCreator == null || defaultInputSystemCreator.Priority > inputSystemCreator.Priority)) if (inputSystemCreator != null && (defaultInputSystemCreator == null || defaultInputSystemCreator.Priority > inputSystemCreator.Priority))
{ {
SetDefaultCreator<IInputSystemCreator>(inputSystemCreator); SetDefaultCreator<IInputSystemCreator>(inputSystemCreator);

12
Samples/Primitives/Game1.cs
View File

@ -26,14 +26,18 @@ namespace Primitives
{ {
graphics = new GraphicsDeviceManager(this); graphics = new GraphicsDeviceManager(this);
Content.RootDirectory = "SampleContent"; Content.RootDirectory = "SampleContent";
graphics.PreparingDeviceSettings += new EventHandler<PreparingDeviceSettingsEventArgs>(graphics_PreparingDeviceSettings);
}
void graphics_PreparingDeviceSettings(object sender, PreparingDeviceSettingsEventArgs e)
{
e.GraphicsDeviceInformation.PresentationParameters.BackBufferWidth = 600;
e.GraphicsDeviceInformation.PresentationParameters.BackBufferHeight = 600;
} }
protected override void Initialize() protected override void Initialize()
{ {
graphics.PreferredBackBufferWidth = 600;
graphics.PreferredBackBufferHeight = 600;
graphics.ApplyChanges();
base.Initialize(); base.Initialize();
} }