diff --git a/ANX.Framework/ANX.Framework.csproj b/ANX.Framework/ANX.Framework.csproj index f56e1307..213dce7c 100644 --- a/ANX.Framework/ANX.Framework.csproj +++ b/ANX.Framework/ANX.Framework.csproj @@ -36,6 +36,10 @@ true + + False + ..\lib\NLog\NLog.dll + @@ -459,6 +463,11 @@ + + + Always + + + + + + + + + + + + diff --git a/ANX.Framework/NonXNA/AddInSystemFactory.cs b/ANX.Framework/NonXNA/AddInSystemFactory.cs index caa59138..1636aced 100644 --- a/ANX.Framework/NonXNA/AddInSystemFactory.cs +++ b/ANX.Framework/NonXNA/AddInSystemFactory.cs @@ -5,6 +5,7 @@ using System.Reflection; using System.Collections.Generic; using System.Linq; using ANX.Framework.Input; +using NLog; #endregion // Using Statements @@ -64,6 +65,8 @@ namespace ANX.Framework.NonXNA private bool initialized; private Dictionary defaultCreators = new Dictionary(); + private static Logger logger = LogManager.GetCurrentClassLogger(); + public static AddInSystemFactory Instance { get @@ -71,6 +74,7 @@ namespace ANX.Framework.NonXNA if (instance == null) { instance = new AddInSystemFactory(); + logger.Debug("Created AddInSystemFactory instance"); } return instance; @@ -86,12 +90,16 @@ namespace ANX.Framework.NonXNA { if (!initialized) { + logger.Info("[ANX] Initializing ANX.Framework AddInSystemFactory..."); + String executingAssembly = Assembly.GetExecutingAssembly().Location; foreach (String file in Directory.EnumerateFiles(Path.GetDirectoryName(executingAssembly), "*.dll", SearchOption.TopDirectoryOnly)) { if (!file.Equals(executingAssembly)) { + logger.Info("[ANX] trying to load '{0}'...", file); + Assembly part = null; try @@ -100,16 +108,20 @@ namespace ANX.Framework.NonXNA } catch (Exception ex) { - + logger.Debug("error calling Assembly.LoadFile({0}) Exception: {1}", file, ex.Message); } if (part != null) { + logger.Info("[ANX] scanning for ANX interfaces..."); + foreach (Type t in part.GetTypes().Where(p => typeof(IInputSystemCreator).IsAssignableFrom(p) || typeof(IRenderSystemCreator).IsAssignableFrom(p) || typeof(ISoundSystemCreator).IsAssignableFrom(p) )) { + logger.Info("[ANX] registering instance of '{0}'...", t.FullName); + var instance = part.CreateInstance(t.FullName); ((ICreator)instance).RegisterCreator(this); } diff --git a/ANX.Framework/Properties/AssemblyInfo.cs b/ANX.Framework/Properties/AssemblyInfo.cs index e0385877..361f4b5b 100644 --- a/ANX.Framework/Properties/AssemblyInfo.cs +++ b/ANX.Framework/Properties/AssemblyInfo.cs @@ -31,8 +31,8 @@ using System.Runtime.InteropServices; // // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: -[assembly: AssemblyVersion("0.4.19.*")] -[assembly: AssemblyFileVersion("0.4.19.0")] +[assembly: AssemblyVersion("0.4.20.*")] +[assembly: AssemblyFileVersion("0.4.20.0")] [assembly:InternalsVisibleTo("ANX.Framework.Windows.DX10")] [assembly:InternalsVisibleTo("ANX.Framework.Windows.DX11.1")] diff --git a/InputSystems/ANX.InputSystem.Windows.XInput/ANX.InputSystem.Windows.XInput.csproj b/InputSystems/ANX.InputSystem.Windows.XInput/ANX.InputSystem.Windows.XInput.csproj index f436fa45..5cce4d3e 100644 --- a/InputSystems/ANX.InputSystem.Windows.XInput/ANX.InputSystem.Windows.XInput.csproj +++ b/InputSystems/ANX.InputSystem.Windows.XInput/ANX.InputSystem.Windows.XInput.csproj @@ -31,6 +31,10 @@ 4 + + False + ..\..\lib\NLog\NLog.dll + ..\..\lib\SharpDX\Bin\SharpDX.dll diff --git a/InputSystems/ANX.InputSystem.Windows.XInput/Creator.cs b/InputSystems/ANX.InputSystem.Windows.XInput/Creator.cs index 1703b65e..9b0449fd 100644 --- a/InputSystems/ANX.InputSystem.Windows.XInput/Creator.cs +++ b/InputSystems/ANX.InputSystem.Windows.XInput/Creator.cs @@ -6,6 +6,7 @@ using System.Text; using System.IO; using System.Runtime.InteropServices; using ANX.Framework.NonXNA; +using NLog; #endregion // Using Statements @@ -60,33 +61,47 @@ namespace ANX.InputSystem.Windows.XInput { public class Creator : IInputSystemCreator { - + private static Logger logger = LogManager.GetCurrentClassLogger(); public string Name { - get { return "XInput"; } - } - - public IGamePad GamePad - { - get { return new GamePad(); } + get + { + return "XInput"; + } } public void RegisterCreator(AddInSystemFactory factory) { + logger.Debug("adding XInput creator to creator collection of AddInSystemFactory"); factory.AddCreator(this); } - + public IGamePad GamePad + { + get + { + logger.Debug("returning a new XInput GamePad device"); + return new GamePad(); + } + } public IMouse Mouse { - get { return new Mouse(); } + get + { + logger.Debug("returning a new XInput Mouse device"); + return new Mouse(); + } } public IKeyboard Keyboard { - get { return new Keyboard(); } + get + { + logger.Debug("returning a new XInput Keyboard device"); + return new Keyboard(); + } } #if XNAEXT diff --git a/InputSystems/ANX.InputSystem.Windows.XInput/Properties/AssemblyInfo.cs b/InputSystems/ANX.InputSystem.Windows.XInput/Properties/AssemblyInfo.cs index d47385bb..ec123a31 100644 --- a/InputSystems/ANX.InputSystem.Windows.XInput/Properties/AssemblyInfo.cs +++ b/InputSystems/ANX.InputSystem.Windows.XInput/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.6.0.0")] -[assembly: AssemblyFileVersion("0.6.0.0")] +[assembly: AssemblyVersion("0.6.1.0")] +[assembly: AssemblyFileVersion("0.6.1.0")]