agate-svn-commit Mailing List for AgateLib (Page 6)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1412
          http://sourceforge.net/p/agate/code/1412
Author:   kanato
Date:     2014-07-24 02:07:05 +0000 (Thu, 24 Jul 2014)
Log Message:
-----------
Refactor AgateConsole to be more portable.
Rename Desktop.Forms to Platform.WindowsForms.

Modified Paths:
--------------
    trunk/AgateLib/AgateLib-Portable.csproj
    trunk/AgateLib/AgateLib.csproj
    trunk/AgateLib/Core.cs
    trunk/AgateLib/DisplayLib/Display.cs
    trunk/AgateLib/InputLib/Keyboard.cs
    trunk/AgateLib-Everything.sln
    trunk/AgateLib-Windows.sln
    trunk/AgateLib.GL/AL_Audio.cs
    trunk/AgateLib.GL/AgateLib.GL.csproj
    trunk/AgateLib.GL/ContextFB.cs
    trunk/AgateLib.GL/GL3/DrawBuffer.cs
    trunk/AgateLib.GL/GL3/FrameBuffer.cs
    trunk/AgateLib.GL/GL3/GLPrimitiveRenderer.cs
    trunk/AgateLib.GL/GL3/GLVertexBuffer.cs
    trunk/AgateLib.GL/GL3/Shaders/GL3_Basic2DShader.cs
    trunk/AgateLib.GL/GL3/Shaders/GlslFragmentProgram.cs
    trunk/AgateLib.GL/GL3/Shaders/GlslShader.cs
    trunk/AgateLib.GL/GL3/Shaders/GlslShaderCompiler.cs
    trunk/AgateLib.GL/GL3/Shaders/GlslVertexProgram.cs
    trunk/AgateLib.GL/GL3/Shaders/IGL3Shader.cs
    trunk/AgateLib.GL/GL3/Shaders/ShaderFactory3.cs
    trunk/AgateLib.GL/GL3/Shaders/ShaderSources.Designer.cs
    trunk/AgateLib.GL/GLDrawBuffer.cs
    trunk/AgateLib.GL/GL_FrameBuffer.cs
    trunk/AgateLib.GL/GL_IndexBuffer.cs
    trunk/AgateLib.GL/GeoHelper.cs
    trunk/AgateLib.GL/IGL_Display.cs
    trunk/AgateLib.GL/IGL_Surface.cs
    trunk/AgateLib.GL/Legacy/FixedFunction/FixedFunctionShaderFactory.cs
    trunk/AgateLib.GL/Legacy/FixedFunction/OTK_FF_Basic2DShader.cs
    trunk/AgateLib.GL/Legacy/FixedFunction/OTK_FF_Lighting2D.cs
    trunk/AgateLib.GL/Legacy/FixedFunction/OTK_FF_Lighting3D.cs
    trunk/AgateLib.GL/Legacy/FrameBufferExt.cs
    trunk/AgateLib.GL/Legacy/FrameBufferReadPixels.cs
    trunk/AgateLib.GL/Legacy/LegacyDrawBuffer.cs
    trunk/AgateLib.GL/Legacy/LegacyPrimitiveRenderer.cs
    trunk/AgateLib.GL/Legacy/LegacyVertexBuffer.cs
    trunk/AgateLib.GL/PrimitiveRenderer.cs
    trunk/AgateLib.GL/Properties/AssemblyInfo.cs
    trunk/AgateLib.GL/ShaderFactory.cs
    trunk/AgateLib.GL/TextureCoordinates.cs
    trunk/AgateLib.Platform.WindowsForms/Setup.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/AgateRenderTarget.Designer.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/AgateRenderTarget.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/BitmapFontUtil.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/BitmapFontUtilRenderers.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/DisplayWindowForm.Designer.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/DisplayWindowForm.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/FormUtil.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/FormsInterop.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/Icons.Designer.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/SetSystemsForm.Designer.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/SetSystemsForm.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/TypeConverters.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/WinFormsDriver.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/WinFormsReporter.cs
    trunk/Drivers/AgateSDL/AgateSDL.csproj
    trunk/Examples/Pong/Pong.csproj
    trunk/Examples/ShootTheTraps/ShootTheTraps.csproj
    trunk/Tests/AudioTests/AudioPlayer/frmAudioPlayer.cs
    trunk/Tests/DisplayTests/RenderStates/frmRenderStateTest.Designer.cs
    trunk/Tests/DisplayTests/TestPacker/frmTestPacker.cs
    trunk/Tests/DisplayTests/TileTester/frmTileTester.Designer.cs
    trunk/Tests/InputTests/Input/frmInputTester.Designer.cs
    trunk/Tests/Launcher.cs
    trunk/Tests/Shaders/LightingTest/LightingTestForm.Designer.cs
    trunk/Tests/Shaders/LightingTest/LightingTestForm.cs
    trunk/Tests/Tests.csproj
    trunk/Tests/WinFormsTests/Converters.cs
    trunk/Tests/frmLauncher.cs
    trunk/Tools/DatabaseEditor/DatabaseEditor.csproj
    trunk/Tools/FontCreator/FontCreator.csproj
    trunk/Tools/PackedSpriteCreator/PackedSpriteCreator.csproj
    trunk/Tools/ResourceEditor/ResourceEditor.csproj
    trunk/UnitTests/Core/ConsoleTests.cs
    trunk/UnitTests/PlatformTests.cs
    trunk/UnitTests/UnitTests.csproj

Added Paths:
-----------
    trunk/AgateLib/Diagnostics/
    trunk/AgateLib/Diagnostics/AgateConsole.cs
    trunk/AgateLib/Diagnostics/ConsoleSupport/
    trunk/AgateLib/Diagnostics/ConsoleSupport/AgateConsoleCommandProcessor.cs
    trunk/AgateLib/Diagnostics/ConsoleSupport/ConsoleDictionary.cs
    trunk/AgateLib/Diagnostics/ConsoleSupport/ConsoleMessage.cs
    trunk/AgateLib/Diagnostics/ConsoleSupport/ConsoleMessageType.cs
    trunk/AgateLib/Diagnostics/ConsoleSupport/ICommandProcessor.cs
    trunk/AgateLib/Platform/
    trunk/AgateLib/Platform/Platform.cs
    trunk/AgateLib/Platform/PlatformType.cs
    trunk/AgateLib.Platform.WindowsForms/
    trunk/AgateLib.Platform.WindowsForms/AgateLib.Platform.WindowsForms.csproj
    trunk/AgateLib.Platform.WindowsForms/Diagnostics/
    trunk/AgateLib.Platform.WindowsForms/Diagnostics/AgateConsoleImpl.cs
    trunk/AgateLib.Platform.WindowsForms/Diagnostics/AgateConsoleTraceListener.cs
    trunk/AgateLib.Platform.WindowsForms/DisplayImplementation/
    trunk/AgateLib.Platform.WindowsForms/DisplayImplementation/DesktopGLDisplay.cs
    trunk/AgateLib.Platform.WindowsForms/DisplayImplementation/GL_DisplayControl.cs
    trunk/AgateLib.Platform.WindowsForms/DisplayImplementation/GL_GameWindow.cs
    trunk/AgateLib.Platform.WindowsForms/DisplayImplementation/GL_Surface.cs
    trunk/AgateLib.Platform.WindowsForms/DisplayImplementation/frmFullScreen.Designer.cs
    trunk/AgateLib.Platform.WindowsForms/DisplayImplementation/frmFullScreen.cs
    trunk/AgateLib.Platform.WindowsForms/DisplayImplementation/frmFullScreen.resx
    trunk/AgateLib.Platform.WindowsForms/packages.config

Removed Paths:
-------------
    trunk/AgateLib/AgateConsole.cs
    trunk/AgateLib/ICommandProcessor.cs
    trunk/AgateLib/Platform.cs
    trunk/AgateLib/PlatformType.cs
    trunk/AgateLib.Desktop.Forms/
    trunk/AgateLib.Platform.WindowsForms/AgateLib.Desktop.Forms.csproj
    trunk/AgateLib.Platform.WindowsForms/DisplayImpl/

Deleted: trunk/AgateLib/AgateConsole.cs
===================================================================

--- trunk/AgateLib/AgateConsole.cs	2014-07-21 01:50:48 UTC (rev 1411)
+++ trunk/AgateLib/AgateConsole.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -1,645 +0,0 @@
-//     The contents of this file are subject to the Mozilla Public License
-//     Version 1.1 (the "License"); you may not use this file except in
-//     compliance with the License. You may obtain a copy of the License at
-//     http://www.mozilla.org/MPL/
-//
-//     Software distributed under the License is distributed on an "AS IS"
-//     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-//     License for the specific language governing rights and limitations
-//     under the License.
-//
-//     The Original Code is AgateLib.
-//
-//     The Initial Developer of the Original Code is Erik Ylvisaker.
-//     Portions created by Erik Ylvisaker are Copyright (C) 2006-2014.
-//     All Rights Reserved.
-//
-//     Contributor(s): Erik Ylvisaker
-//
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using AgateLib.DisplayLib;
-using AgateLib.Geometry;
-using AgateLib.InputLib;
-using System.ComponentModel;
-using AgateLib.DisplayLib.Shaders;
-
-namespace AgateLib
-{
-	public class AgateConsole : IDisposable
-	{
-		#region --- Static Members ---
-
-		static AgateConsole sInstance;
-
-		public static bool IsInitialized { get { return sInstance != null; } }
-
-		public static FontSurface Font { get; set; }
-		public static KeyCode VisibleToggleKey { get; set; }
-		public static bool IsVisible
-		{
-			get
-			{
-				if (sInstance == null)
-					return false; 
-				
-				return sInstance.mVisible;
-			}
-			set
-			{
-				if (sInstance == null)
-					throw new AgateException("You must initalize the console before making it visible.");
-
-				sInstance.mVisible = value;
-			}
-		}
-
-		public static Color TextColor { get; set; }
-		public static Color EntryColor { get; set; }
-		public static Color BackgroundColor { get; set; }
-		public static AgateConsole Instance { get { return sInstance; } }
-
-		public static ConsoleDictionary Commands { get { return Instance.CommandProcessor.Commands; } }
-
-		public static void Initialize()
-		{
-			if (sInstance != null)
-				return;
-
-			PrivateInitialize();
-		}
-
-		private static void PrivateInitialize()
-		{
-			if (sInstance == null)
-				sInstance = new AgateConsole();
-
-			VisibleToggleKey = KeyCode.Tilde;
-
-			TextColor = Color.White;
-			EntryColor = Color.Yellow;
-			BackgroundColor = Color.FromArgb(192, Color.Black);
-		}
-		/// <summary>
-		/// Draws the console window. Call this right before your Display.EndFrame call.
-		/// </summary>
-		public static void Draw()
-		{
-			if (sInstance == null) return;
-
-			if (Font == null)
-				Font = FontSurface.AgateSans10;
-
-			sInstance.DrawImpl();
-		}
-
-		internal static void Keyboard_KeyDown(InputEventArgs e)
-		{
-			if (e.KeyCode == VisibleToggleKey)
-			{
-				sInstance.mVisible = !sInstance.mVisible;
-				sInstance.mHeight = Display.RenderTarget.Height * 5 / 12;
-			}
-			else if (sInstance.mVisible)
-			{
-				sInstance.ProcessKeyDown(e);
-			}
-		}
-		internal static void Keyboard_KeyUp(InputEventArgs eventArgs)
-		{
-		}
-
-
-		/// <summary>
-		/// Writes a line to the output part of the console window.
-		/// </summary>
-		/// <param name="text"></param>
-		public static void WriteLine(string text, params object[] args)
-		{
-			Instance.WriteLineImpl(string.Format(text, args));
-		}
-		/// <summary>
-		/// Writes some text to the output part of the console window.
-		/// </summary>
-		/// <param name="text"></param>
-		public static void Write(string text)
-		{
-			Instance.WriteImpl(text);
-		}
-
-		#endregion
-
-		class AgateConsoleTraceListener : TraceListener
-		{
-			AgateConsole mOwner;
-			ConsoleMessage current;
-			Stopwatch watch = new Stopwatch();
-
-			public AgateConsoleTraceListener(AgateConsole owner)
-			{
-				mOwner = owner;
-				Trace.Listeners.Add(this);
-
-				watch.Start();
-			}
-
-			public override void Write(string message)
-			{
-				if (current == null)
-				{
-					current = new ConsoleMessage();
-					mOwner.mMessages.Add(current);
-				}
-
-				current.Time = watch.ElapsedMilliseconds;
-				current.Text += message;
-			}
-			public override void WriteLine(string message)
-			{
-				if (current == null)
-				{
-					current = new ConsoleMessage();
-					mOwner.mMessages.Add(current);
-				}
-
-				current.Text += message;
-				current.Time = watch.ElapsedMilliseconds;
-				current = null;
-			}
-
-			public Stopwatch Watch { get { return watch; } }
-		}
-
-		List<ConsoleMessage> mInputHistory = new List<ConsoleMessage>();
-		List<ConsoleMessage> mMessages = new List<ConsoleMessage>();
-		AgateConsoleTraceListener mTraceListener;
-		ICommandProcessor mCommandProcessor = new AgateConsoleCommandProcessor();
-
-		bool mVisible = false;
-		string mCurrentLine;
-		int mHeight;
-		int mHistoryIndex;
-
-		public AgateConsole()
-		{
-			if (sInstance != null)
-				throw new InvalidOperationException("Cannot create two AgateConsole objects!");
-
-			sInstance = this;
-			Initialize();
-
-			mTraceListener = new AgateConsoleTraceListener(this);
-		}
-
-		public ICommandProcessor CommandProcessor
-		{
-			get { return mCommandProcessor; }
-			set { mCommandProcessor = value; }
-		}
-
-		public void Dispose()
-		{
-			Dispose(true);
-			sInstance = null;
-		}
-		protected virtual void Dispose(bool disposing) { }
-
-
-		protected void WriteLineImpl(string text)
-		{
-			mTraceListener.WriteLine(text);
-		}
-		protected void WriteImpl(string text)
-		{
-			mTraceListener.Write(text);
-		}
-
-		void DrawImpl()
-		{
-			if (mVisible == false)
-			{
-				long time = mTraceListener.Watch.ElapsedMilliseconds;
-				int y = 0;
-				Font.DisplayAlignment = OriginAlignment.TopLeft;
-				Font.Color = TextColor;
-
-				for (int i = 0; i < mMessages.Count; i++)
-				{
-					if (time - mMessages[i].Time > 5000)
-						continue;
-					if (mMessages[i].MessageType != ConsoleMessageType.Text)
-						continue;
-
-					Font.DrawText(new Point(0, y), mMessages[i].Text);
-					y += Font.FontHeight;
-				}
-
-				while (mMessages.Count > 100)
-					mMessages.RemoveAt(0);
-			}
-			else
-			{
-				Display.Shader = AgateBuiltInShaders.Basic2DShader;
-				AgateBuiltInShaders.Basic2DShader.CoordinateSystem = new Rectangle(0, 0, Display.CurrentWindow.Width, Display.CurrentWindow.Height);
-
-				Display.FillRect(new Rectangle(0, 0, Display.RenderTarget.Width, mHeight), BackgroundColor);
-
-				int y = mHeight;
-				Font.DisplayAlignment = OriginAlignment.BottomLeft;
-
-				string currentLineText = "> ";
-
-				if (mHistoryIndex != 0)
-					currentLineText += EscapeText(mInputHistory[mInputHistory.Count - mHistoryIndex].Text);
-				else
-					currentLineText += EscapeText(mCurrentLine);
-
-				Font.Color = EntryColor;
-				Font.DrawText(0, y, currentLineText);
-
-				// draw insertion point
-				if (mTraceListener.Watch.ElapsedMilliseconds % 1000 < 500)
-				{
-					int x = Font.MeasureString(currentLineText).Width;
-
-					Display.DrawLine(
-						new Point(x, y - Font.FontHeight),
-						new Point(x, y),
-						EntryColor);
-				}
-
-				for (int i = mMessages.Count - 1; i >= 0; i--)
-				{
-					y -= Font.FontHeight;
-					var message = mMessages[i];
-
-					if (message.MessageType == ConsoleMessageType.UserInput)
-					{
-						Font.Color = EntryColor;
-						Font.DrawText(0, y, "> " + EscapeText(message.Text));
-					}
-					else
-					{
-						Font.Color = TextColor;
-						Font.DrawText(0, y, EscapeText(message.Text));
-					}
-
-					if (y < 0)
-						break;
-				}
-			}
-		}
-
-		private string EscapeText(string p)
-		{
-			if (p == null)
-				return p;
-
-			return p.Replace("{", "{{}");
-		}
-
-
-		/// <summary>
-		/// Sends the key string to the console as if the user typed it.
-		/// </summary>
-		/// <param name="keys"></param>
-		/// <remarks>
-		/// Control characters are treated specially. A line feed (\n) is
-		/// treated as the end of line. \r is ignored. 
-		/// \t is converted to a space.
-		/// </remarks>
-		public void ProcessKeys(string keys)
-		{
-			keys = keys.Replace('\t', ' ');
-			keys = keys.Replace("\r", "");
-
-			ModifyHistoryLine();
-
-			int index = keys.IndexOf('\n');
-			while (index > -1)
-			{
-				mCurrentLine += keys.Substring(0, index);
-				ProcessKeyDown(new InputEventArgs(KeyCode.Enter, new KeyModifiers()));
-
-				keys = keys.Substring(index + 1);
-				index = keys.IndexOf('\n');
-			}
-
-			mCurrentLine += keys;
-		}
-		/// <summary>
-		/// Processes an input key.
-		/// </summary>
-		/// <param name="e"></param>
-		public void ProcessKeyDown(InputEventArgs e)
-		{
-			if (e.KeyCode == KeyCode.Up)
-			{
-				mHistoryIndex++;
-
-				if (mHistoryIndex > mInputHistory.Count)
-					mHistoryIndex = mInputHistory.Count;
-			}
-			else if (e.KeyCode == KeyCode.Down)
-			{
-				mHistoryIndex--;
-
-				if (mHistoryIndex < 0)
-					mHistoryIndex = 0;
-			}
-			else if (e.KeyCode == KeyCode.Enter || e.KeyCode == KeyCode.Return)
-			{
-				ModifyHistoryLine();
-
-				ConsoleMessage input = new ConsoleMessage
-				{
-					Text = mCurrentLine,
-					MessageType = ConsoleMessageType.UserInput,
-					Time = mTraceListener.Watch.ElapsedMilliseconds
-				};
-
-				mMessages.Add(input);
-				mInputHistory.Add(input);
-
-				ExecuteCommand();
-			}
-			else if (string.IsNullOrEmpty(e.KeyString) == false)
-			{
-				ModifyHistoryLine();
-
-				if (e.KeyCode == KeyCode.Tab)
-					mCurrentLine += " ";
-				else
-					mCurrentLine += e.KeyString;
-			}
-			else if (e.KeyCode == KeyCode.BackSpace)
-			{
-				ModifyHistoryLine();
-
-				if (mCurrentLine.Length > 0)
-				{
-					mCurrentLine = mCurrentLine.Substring(0, mCurrentLine.Length - 1);
-				}
-			}
-		}
-
-		private void ModifyHistoryLine()
-		{
-			if (mHistoryIndex > 0)
-			{
-				mCurrentLine = mInputHistory[mInputHistory.Count - mHistoryIndex].Text;
-				mHistoryIndex = 0;
-			}
-		}
-
-		static char[] splitters = new char[] { ' ' };
-
-		private void ExecuteCommand()
-		{
-			if (string.IsNullOrEmpty(mCurrentLine))
-				return;
-			if (mCurrentLine.Trim() == string.Empty)
-				return;
-
-			// regular expression obtained from 
-			// http://stackoverflow.com/questions/554013/regular-expression-to-split-on-spaces-unless-in-quotes
-			//
-			var regexMatches = Regex.Matches(mCurrentLine, @"((""((?<token>.*?)(?<!\\)"")|(?<token>[\w]+))(\s)*)");
-
-			string[] tokens = (from Match m in regexMatches
-							   where m.Groups["token"].Success
-							   select m.Groups["token"].Value).ToArray();
-
-			tokens[0] = tokens[0].ToLowerInvariant();
-
-			mCurrentLine = string.Empty;
-
-			try
-			{
-				mCommandProcessor.ExecuteCommand(tokens);
-			}
-			catch (System.Reflection.TargetInvocationException ex)
-			{
-				var e = ex.InnerException;
-
-				WriteLine("Caught exception: {0}", e.GetType());
-				WriteLine(e.Message);
-			}
-		}
-
-		public string CurrentLine { get { return mCurrentLine; } }
-	}
-
-	public class ConsoleDictionary : Dictionary<string, Delegate>
-	{
-		public void Add<T>(string key, Action<T> value)
-		{
-			base.Add(key, value);
-		}
-		public void Add<T1, T2>(string key, Action<T1, T2> value)
-		{
-			base.Add(key, value);
-		}
-		public void Add<T1, T2, T3>(string key, Action<T1, T2, T3> value)
-		{
-			base.Add(key, value);
-		}
-		public void Add<T1, T2, T3, T4>(string key, Action<T1, T2, T3, T4> value)
-		{
-			base.Add(key, value);
-		}
-
-		public void Add<TResult>(string key, Func<TResult> value)
-		{
-			base.Add(key, value);
-		}
-		public void Add<T1, TResult>(string key, Func<T1, TResult> value)
-		{
-			base.Add(key, value);
-		}
-		public void Add<T1, T2, TResult>(string key, Func<T1, T2, TResult> value)
-		{
-			base.Add(key, value);
-		}
-		public void Add<T1, T2, T3, TResult>(string key, Func<T1, T2, T3, TResult> value)
-		{
-			base.Add(key, value);
-		}
-		public void Add<T1, T2, T3, T4, TResult>(string key, Func<T1, T2, T3, T4, TResult> value)
-		{
-			base.Add(key, value);
-		}
-	}
-	public delegate string DescribeCommandHandler(string command);
-
-	class ConsoleMessage
-	{
-		public string Text;
-		public long Time;
-		public ConsoleMessageType MessageType;
-	}
-
-	enum ConsoleMessageType
-	{
-		Text,
-		UserInput,
-	}
-
-	public class AgateConsoleCommandProcessor : ICommandProcessor
-	{
-		ConsoleDictionary mCommands = new ConsoleDictionary();
-
-		public AgateConsoleCommandProcessor()
-		{
-			mCommands.Add("help", new Action<string>(HelpCommand));
-		}
-
-		public ConsoleDictionary Commands { get { return mCommands; } }
-
-		public void ExecuteCommand(string[] tokens)
-		{
-			if (mCommands.ContainsKey(tokens[0]) == false)
-			{
-				WriteLine("Invalid command: " + tokens[0]);
-			}
-			else
-			{
-				ExecuteDelegate(mCommands[tokens[0]], tokens);
-			}
-		}
-
-		private void ExecuteDelegate(Delegate p, string[] tokens)
-		{
-			var parameters = p.Method.GetParameters();
-			object[] args = new object[parameters.Length];
-			bool notEnoughArgs = false;
-			bool badArgs = false;
-
-			for (int i = 0; i < parameters.Length || i < tokens.Length - 1; i++)
-			{
-				if (i < args.Length && i < tokens.Length - 1)
-				{
-					try
-					{
-						args[i] = Convert.ChangeType(tokens[i + 1], parameters[i].ParameterType);
-					}
-					catch
-					{
-						WriteLine("Argument #" + (i + 1).ToString() + " invalid: \"" +
-							tokens[i + 1] + "\" not convertable to " + parameters[i].ParameterType.Name);
-						badArgs = true;
-					}
-				}
-				else if (i < args.Length)
-				{
-					if (parameters[i].IsOptional)
-					{
-						args[i] = Type.Missing;
-					}
-					else
-					{
-						if (notEnoughArgs == false)
-						{
-							WriteLine("Insufficient arguments for command: " + tokens[0]);
-						}
-						notEnoughArgs = true;
-
-						WriteLine("    missing " + parameters[i].ParameterType.Name + " argument: " + parameters[i].Name);
-					}
-				}
-				else
-				{
-					WriteLine("[Ignoring extra argument: " + tokens[i + 1] + "]");
-				}
-			}
-
-			if (badArgs || notEnoughArgs)
-				return;
-
-			object retval = p.Method.Invoke(p.Target, args);
-
-			if (p.Method.ReturnType != typeof(void) && retval != null)
-			{
-				WriteLine(retval.ToString());
-			}
-		}
-
-
-		private void HelpCommand(string command = "")
-		{
-			command = command.ToLowerInvariant().Trim();
-
-			if (string.IsNullOrEmpty(command) || mCommands.ContainsKey(command) == false)
-			{
-				WriteLine("Available Commands:");
-
-				foreach (var cmd in mCommands.Keys)
-				{
-					if (cmd == "help")
-						continue;
-
-					WriteLine("    " + cmd);
-				}
-
-				WriteLine("Type \"help <command>\" for help on a specific command.");
-			}
-			else
-			{
-				Delegate d = mCommands[command];
-
-				Write("Usage: ");
-				Write(command + " ");
-
-				var parameters = d.Method.GetParameters();
-				for (int i = 0; i < parameters.Length; i++)
-				{
-					if (parameters[i].IsOptional)
-						Write("[");
-
-					Write(parameters[i].Name);
-
-					if (parameters[i].IsOptional)
-						Write("]");
-				}
-
-				WriteLine("");
-
-				string description = "";
-
-				if (DescribeCommand != null)
-				{
-					description = DescribeCommand(command);
-				}
-				if (string.IsNullOrEmpty(description))
-				{
-					var descripAttrib = (DescriptionAttribute)d.Method.GetCustomAttributes(typeof(DescriptionAttribute), false).FirstOrDefault();
-
-					if (descripAttrib != null)
-						description = descripAttrib.Description;
-				}
-
-				if (string.IsNullOrEmpty(description) == false)
-				{
-					WriteLine(description);
-				}
-
-			}
-		}
-
-		void WriteLine(string text)
-		{
-			AgateConsole.WriteLine(text);
-		}
-		void Write(string text)
-		{
-			AgateConsole.Write(text);
-		}
-
-		public event DescribeCommandHandler DescribeCommand;
-	}
-
-}

Modified: trunk/AgateLib/AgateLib-Portable.csproj
===================================================================
--- trunk/AgateLib/AgateLib-Portable.csproj	2014-07-21 01:50:48 UTC (rev 1411)
+++ trunk/AgateLib/AgateLib-Portable.csproj	2014-07-24 02:07:05 UTC (rev 1412)
@@ -57,7 +57,6 @@
     <Folder Include="Serialization\Xle\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AgateConsole.cs" />
     <Compile Include="AgateException.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -83,6 +82,12 @@
     <Compile Include="Core.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Diagnostics\AgateConsole.cs" />
+    <Compile Include="Diagnostics\ConsoleSupport\AgateConsoleCommandProcessor.cs" />
+    <Compile Include="Diagnostics\ConsoleSupport\ConsoleDictionary.cs" />
+    <Compile Include="Diagnostics\ConsoleSupport\ConsoleMessage.cs" />
+    <Compile Include="Diagnostics\ConsoleSupport\ConsoleMessageType.cs" />
+    <Compile Include="Diagnostics\ConsoleSupport\ICommandProcessor.cs" />
     <Compile Include="DisplayLib\FrameBuffer.cs" />
     <Compile Include="DisplayLib\IFrameBuffer.cs" />
     <Compile Include="DisplayLib\Shaders\AgateBuiltInShaders.cs" />
@@ -100,7 +105,6 @@
     <Compile Include="Extensions\Collections\Generic\ListSorting.cs" />
     <Compile Include="Extensions\Collections\NonGeneric\NonGenericListSorting.cs" />
     <Compile Include="Geometry\VertexTypes\PositionTextureColorNormal.cs" />
-    <Compile Include="ICommandProcessor.cs" />
     <Compile Include="IFileProvider.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -108,8 +112,8 @@
     <Compile Include="InputLib\Delegates.cs" />
     <Compile Include="InputLib\HatState.cs" />
     <Compile Include="InputLib\JoystickEventArgs.cs" />
-    <Compile Include="Platform.cs" />
-    <Compile Include="PlatformType.cs" />
+    <Compile Include="Platform\Platform.cs" />
+    <Compile Include="Platform\PlatformType.cs" />
     <Compile Include="Resources\ImageResource.cs" />
     <Compile Include="Settings\SettingsGroup.cs" />
     <Compile Include="Timing.cs">

Modified: trunk/AgateLib/AgateLib.csproj
===================================================================
--- trunk/AgateLib/AgateLib.csproj	2014-07-21 01:50:48 UTC (rev 1411)
+++ trunk/AgateLib/AgateLib.csproj	2014-07-24 02:07:05 UTC (rev 1412)
@@ -125,7 +125,6 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
-    <Compile Include="AgateConsole.cs" />
     <Compile Include="AgateException.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -161,6 +160,11 @@
     <Compile Include="Data\FieldType.cs" />
     <Compile Include="Data\AgateRowList.cs" />
     <Compile Include="Data\AgateTableDictionary.cs" />
+    <Compile Include="Diagnostics\AgateConsole.cs" />
+    <Compile Include="Diagnostics\ConsoleSupport\AgateConsoleCommandProcessor.cs" />
+    <Compile Include="Diagnostics\ConsoleSupport\ConsoleDictionary.cs" />
+    <Compile Include="Diagnostics\ConsoleSupport\ConsoleMessage.cs" />
+    <Compile Include="Diagnostics\ConsoleSupport\ConsoleMessageType.cs" />
     <Compile Include="DisplayLib\FrameBuffer.cs" />
     <Compile Include="DisplayLib\IFrameBuffer.cs" />
     <Compile Include="DisplayLib\Shaders\AgateBuiltInShaders.cs" />
@@ -179,7 +183,7 @@
     <Compile Include="Extensions\Collections\Generic\ListSorting.cs" />
     <Compile Include="Extensions\Collections\NonGeneric\NonGenericListSorting.cs" />
     <Compile Include="Geometry\VertexTypes\PositionTextureColorNormal.cs" />
-    <Compile Include="ICommandProcessor.cs" />
+    <Compile Include="Diagnostics\ConsoleSupport\ICommandProcessor.cs" />
     <Compile Include="IFileProvider.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -187,8 +191,8 @@
     <Compile Include="InputLib\Delegates.cs" />
     <Compile Include="InputLib\HatState.cs" />
     <Compile Include="InputLib\JoystickEventArgs.cs" />
-    <Compile Include="Platform.cs" />
-    <Compile Include="PlatformType.cs" />
+    <Compile Include="Platform\Platform.cs" />
+    <Compile Include="Platform\PlatformType.cs" />
     <Compile Include="Resources\ImageResource.cs" />
     <Compile Include="Serialization\Xle\CompressionType.cs" />
     <Compile Include="Serialization\Xle\IXleTypeSerializer.cs" />

Modified: trunk/AgateLib/Core.cs
===================================================================
--- trunk/AgateLib/Core.cs	2014-07-21 01:50:48 UTC (rev 1411)
+++ trunk/AgateLib/Core.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -25,6 +25,7 @@
 using AgateLib.AudioLib;
 using AgateLib.DisplayLib;
 using AgateLib.Settings;
+using AgateLib.Platform;
 
 namespace AgateLib
 {
@@ -90,7 +91,7 @@
 		private static bool sAutoPause = false;
 		private static bool sIsActive = true;
 		private static bool sInititalized = false;
-		private static readonly Platform mPlatform = new Platform();
+		private static readonly PlatformInfo mPlatform = new PlatformInfo();
 		private static PersistantSettings sSettings;
 
 
@@ -329,7 +330,7 @@
 		/// <summary>
 		/// Gets an object which describes details about the current platform.
 		/// </summary>
-		public static Platform Platform
+		public static PlatformInfo Platform
 		{
 			get { return mPlatform; }
 		}

Added: trunk/AgateLib/Diagnostics/AgateConsole.cs
===================================================================
--- trunk/AgateLib/Diagnostics/AgateConsole.cs	                        (rev 0)
+++ trunk/AgateLib/Diagnostics/AgateConsole.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -0,0 +1,371 @@
+using AgateLib.Diagnostics.ConsoleSupport;
+using AgateLib.DisplayLib;
+using AgateLib.DisplayLib.Shaders;
+using AgateLib.Geometry;
+using AgateLib.InputLib;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace AgateLib.Diagnostics
+{
+	public abstract class AgateConsole : IDisposable
+	{
+		#region --- Static Members ---
+
+		protected static AgateConsole sInstance;
+
+		public static bool IsInitialized { get { return sInstance != null; } }
+
+		public static FontSurface Font { get; set; }
+		public static KeyCode VisibleToggleKey { get; set; }
+		public static bool IsVisible
+		{
+			get
+			{
+				if (sInstance == null)
+					return false;
+
+				return sInstance.mVisible;
+			}
+			set
+			{
+				if (sInstance == null)
+					throw new AgateException("You must initalize the console before making it visible.");
+
+				sInstance.mVisible = value;
+			}
+		}
+
+		public static Color TextColor { get; set; }
+		public static Color EntryColor { get; set; }
+		public static Color BackgroundColor { get; set; }
+		public static AgateConsole Instance { get { return sInstance; } }
+
+		public static ConsoleDictionary Commands { get { return Instance.CommandProcessor.Commands; } }
+
+		public static void Initialize()
+		{
+			if (sInstance != null)
+				return;
+
+			PrivateInitialize();
+		}
+
+		private static void PrivateInitialize()
+		{
+			if (sInstance == null)
+				throw new InvalidOperationException();
+
+			VisibleToggleKey = KeyCode.Tilde;
+
+			TextColor = Color.White;
+			EntryColor = Color.Yellow;
+			BackgroundColor = Color.FromArgb(192, Color.Black);
+		}
+		/// <summary>
+		/// Draws the console window. Call this right before your Display.EndFrame call.
+		/// </summary>
+		public static void Draw()
+		{
+			if (sInstance == null) return;
+
+			if (Font == null)
+				Font = FontSurface.AgateSans10;
+
+			sInstance.DrawImpl();
+		}
+
+		internal static void Keyboard_KeyDown(InputEventArgs e)
+		{
+			if (e.KeyCode == VisibleToggleKey)
+			{
+				sInstance.mVisible = !sInstance.mVisible;
+				sInstance.mHeight = Display.RenderTarget.Height * 5 / 12;
+			}
+			else if (sInstance.mVisible)
+			{
+				sInstance.ProcessKeyDown(e);
+			}
+		}
+		internal static void Keyboard_KeyUp(InputEventArgs eventArgs)
+		{
+		}
+
+
+		/// <summary>
+		/// Writes a line to the output part of the console window.
+		/// </summary>
+		/// <param name="text"></param>
+		public static void WriteLine(string text, params object[] args)
+		{
+			Instance.WriteLineImpl(string.Format(text, args));
+		}
+		/// <summary>
+		/// Writes some text to the output part of the console window.
+		/// </summary>
+		/// <param name="text"></param>
+		public static void Write(string text)
+		{
+			Instance.WriteImpl(text);
+		}
+
+		#endregion
+
+		protected bool mVisible = false;
+		protected List<ConsoleMessage> mInputHistory = new List<ConsoleMessage>();
+		List<ConsoleMessage> mMessages = new List<ConsoleMessage>();
+
+		string mCurrentLine;
+		int mHeight;
+		int mHistoryIndex;
+
+		ICommandProcessor mCommandProcessor = new AgateConsoleCommandProcessor();
+
+		public AgateConsole()
+		{
+			if (sInstance != null)
+				throw new InvalidOperationException("Cannot create two AgateConsole objects!");
+
+			sInstance = this;
+		}
+
+		public void Dispose()
+		{
+			Dispose(true);
+			sInstance = null;
+		}
+		protected virtual void Dispose(bool disposing) { }
+
+		public ICommandProcessor CommandProcessor
+		{
+			get { return mCommandProcessor; }
+			set { mCommandProcessor = value; }
+		}
+
+		public List<ConsoleMessage> Messages { get { return mMessages; } }
+
+
+		void DrawImpl()
+		{
+			if (mVisible == false)
+			{
+				long time = CurrentTime;
+				int y = 0;
+				Font.DisplayAlignment = OriginAlignment.TopLeft;
+				Font.Color = TextColor;
+
+				for (int i = 0; i < mMessages.Count; i++)
+				{
+					if (time - mMessages[i].Time > 5000)
+						continue;
+					if (mMessages[i].MessageType != ConsoleMessageType.Text)
+						continue;
+
+					Font.DrawText(new Point(0, y), mMessages[i].Text);
+					y += Font.FontHeight;
+				}
+
+				while (mMessages.Count > 100)
+					mMessages.RemoveAt(0);
+			}
+			else
+			{
+				Display.Shader = AgateBuiltInShaders.Basic2DShader;
+				AgateBuiltInShaders.Basic2DShader.CoordinateSystem = new Rectangle(0, 0, Display.CurrentWindow.Width, Display.CurrentWindow.Height);
+
+				Display.FillRect(new Rectangle(0, 0, Display.RenderTarget.Width, mHeight), BackgroundColor);
+
+				int y = mHeight;
+				Font.DisplayAlignment = OriginAlignment.BottomLeft;
+
+				string currentLineText = "> ";
+
+				if (mHistoryIndex != 0)
+					currentLineText += EscapeText(mInputHistory[mInputHistory.Count - mHistoryIndex].Text);
+				else
+					currentLineText += EscapeText(mCurrentLine);
+
+				Font.Color = EntryColor;
+				Font.DrawText(0, y, currentLineText);
+
+				// draw insertion point
+				if (CurrentTime % 1000 < 500)
+				{
+					int x = Font.MeasureString(currentLineText).Width;
+
+					Display.DrawLine(
+						new Point(x, y - Font.FontHeight),
+						new Point(x, y),
+						EntryColor);
+				}
+
+				for (int i = mMessages.Count - 1; i >= 0; i--)
+				{
+					y -= Font.FontHeight;
+					var message = mMessages[i];
+
+					if (message.MessageType == ConsoleMessageType.UserInput)
+					{
+						Font.Color = EntryColor;
+						Font.DrawText(0, y, "> " + EscapeText(message.Text));
+					}
+					else
+					{
+						Font.Color = TextColor;
+						Font.DrawText(0, y, EscapeText(message.Text));
+					}
+
+					if (y < 0)
+						break;
+				}
+			}
+		}
+
+		private string EscapeText(string p)
+		{
+			if (p == null)
+				return p;
+
+			return p.Replace("{", "{{}");
+		}
+
+		protected abstract void WriteLineImpl(string text);
+		protected abstract void WriteImpl(string text);
+
+		/// <summary>
+		/// Sends the key string to the console as if the user typed it.
+		/// </summary>
+		/// <param name="keys"></param>
+		/// <remarks>
+		/// Control characters are treated specially. A line feed (\n) is
+		/// treated as the end of line. \r is ignored. 
+		/// \t is converted to a space.
+		/// </remarks>
+		public void ProcessKeys(string keys)
+		{
+			keys = keys.Replace('\t', ' ');
+			keys = keys.Replace("\r", "");
+
+			ModifyHistoryLine();
+
+			int index = keys.IndexOf('\n');
+			while (index > -1)
+			{
+				mCurrentLine += keys.Substring(0, index);
+				ProcessKeyDown(new InputEventArgs(KeyCode.Enter, new KeyModifiers()));
+
+				keys = keys.Substring(index + 1);
+				index = keys.IndexOf('\n');
+			}
+
+			mCurrentLine += keys;
+		}
+		/// <summary>
+		/// Processes an input key.
+		/// </summary>
+		/// <param name="e"></param>
+		public void ProcessKeyDown(InputEventArgs e)
+		{
+			if (e.KeyCode == KeyCode.Up)
+			{
+				mHistoryIndex++;
+
+				if (mHistoryIndex > mInputHistory.Count)
+					mHistoryIndex = mInputHistory.Count;
+			}
+			else if (e.KeyCode == KeyCode.Down)
+			{
+				mHistoryIndex--;
+
+				if (mHistoryIndex < 0)
+					mHistoryIndex = 0;
+			}
+			else if (e.KeyCode == KeyCode.Enter || e.KeyCode == KeyCode.Return)
+			{
+				ModifyHistoryLine();
+
+				ConsoleMessage input = new ConsoleMessage
+				{
+					Text = mCurrentLine,
+					MessageType = ConsoleMessageType.UserInput,
+					Time = CurrentTime
+				};
+
+				mMessages.Add(input);
+				mInputHistory.Add(input);
+
+				ExecuteCommand();
+			}
+			else if (string.IsNullOrEmpty(e.KeyString) == false)
+			{
+				ModifyHistoryLine();
+
+				if (e.KeyCode == KeyCode.Tab)
+					mCurrentLine += " ";
+				else
+					mCurrentLine += e.KeyString;
+			}
+			else if (e.KeyCode == KeyCode.BackSpace)
+			{
+				ModifyHistoryLine();
+
+				if (mCurrentLine.Length > 0)
+				{
+					mCurrentLine = mCurrentLine.Substring(0, mCurrentLine.Length - 1);
+				}
+			}
+		}
+
+		private void ExecuteCommand()
+		{
+			if (string.IsNullOrEmpty(mCurrentLine))
+				return;
+			if (mCurrentLine.Trim() == string.Empty)
+				return;
+
+			// regular expression obtained from 
+			// http://stackoverflow.com/questions/554013/regular-expression-to-split-on-spaces-unless-in-quotes
+			//
+			var regexMatches = Regex.Matches(mCurrentLine, @"((""((?<token>.*?)(?<!\\)"")|(?<token>[\w]+))(\s)*)");
+
+			string[] tokens = (from Match m in regexMatches
+							   where m.Groups["token"].Success
+							   select m.Groups["token"].Value).ToArray();
+
+			tokens[0] = tokens[0].ToLowerInvariant();
+
+			mCurrentLine = string.Empty;
+
+			try
+			{
+				CommandProcessor.ExecuteCommand(tokens);
+			}
+			catch (System.Reflection.TargetInvocationException ex)
+			{
+				var e = ex.InnerException;
+
+				WriteLine("Caught exception: {0}", e.GetType());
+				WriteLine(e.Message);
+			}
+		}
+
+		public string CurrentLine { get { return mCurrentLine; } }
+
+
+		private void ModifyHistoryLine()
+		{
+			if (mHistoryIndex > 0)
+			{
+				mCurrentLine = mInputHistory[mInputHistory.Count - mHistoryIndex].Text;
+				mHistoryIndex = 0;
+			}
+		}
+
+
+		protected abstract long CurrentTime { get; }
+	}
+}

Added: trunk/AgateLib/Diagnostics/ConsoleSupport/AgateConsoleCommandProcessor.cs
===================================================================
--- trunk/AgateLib/Diagnostics/ConsoleSupport/AgateConsoleCommandProcessor.cs	                        (rev 0)
+++ trunk/AgateLib/Diagnostics/ConsoleSupport/AgateConsoleCommandProcessor.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AgateLib.Diagnostics.ConsoleSupport
+{
+	public class AgateConsoleCommandProcessor : ICommandProcessor
+	{
+		ConsoleDictionary mCommands = new ConsoleDictionary();
+
+		public AgateConsoleCommandProcessor()
+		{
+			mCommands.Add("help", new Action<string>(HelpCommand));
+		}
+
+		public ConsoleDictionary Commands { get { return mCommands; } }
+
+		public void ExecuteCommand(string[] tokens)
+		{
+			if (mCommands.ContainsKey(tokens[0]) == false)
+			{
+				WriteLine("Invalid command: " + tokens[0]);
+			}
+			else
+			{
+				ExecuteDelegate(mCommands[tokens[0]], tokens);
+			}
+		}
+
+		private void ExecuteDelegate(Delegate p, string[] tokens)
+		{
+			var parameters = p.Method.GetParameters();
+			object[] args = new object[parameters.Length];
+			bool notEnoughArgs = false;
+			bool badArgs = false;
+
+			for (int i = 0; i < parameters.Length || i < tokens.Length - 1; i++)
+			{
+				if (i < args.Length && i < tokens.Length - 1)
+				{
+					try
+					{
+						args[i] = Convert.ChangeType(tokens[i + 1], parameters[i].ParameterType);
+					}
+					catch
+					{
+						WriteLine("Argument #" + (i + 1).ToString() + " invalid: \"" +
+							tokens[i + 1] + "\" not convertable to " + parameters[i].ParameterType.Name);
+						badArgs = true;
+					}
+				}
+				else if (i < args.Length)
+				{
+					if (parameters[i].IsOptional)
+					{
+						args[i] = Type.Missing;
+					}
+					else
+					{
+						if (notEnoughArgs == false)
+						{
+							WriteLine("Insufficient arguments for command: " + tokens[0]);
+						}
+						notEnoughArgs = true;
+
+						WriteLine("    missing " + parameters[i].ParameterType.Name + " argument: " + parameters[i].Name);
+					}
+				}
+				else
+				{
+					WriteLine("[Ignoring extra argument: " + tokens[i + 1] + "]");
+				}
+			}
+
+			if (badArgs || notEnoughArgs)
+				return;
+
+			object retval = p.Method.Invoke(p.Target, args);
+
+			if (p.Method.ReturnType != typeof(void) && retval != null)
+			{
+				WriteLine(retval.ToString());
+			}
+		}
+
+
+		private void HelpCommand(string command = "")
+		{
+			command = command.ToLowerInvariant().Trim();
+
+			if (string.IsNullOrEmpty(command) || mCommands.ContainsKey(command) == false)
+			{
+				WriteLine("Available Commands:");
+
+				foreach (var cmd in mCommands.Keys)
+				{
+					if (cmd == "help")
+						continue;
+
+					WriteLine("    " + cmd);
+				}
+
+				WriteLine("Type \"help <command>\" for help on a specific command.");
+			}
+			else
+			{
+				Delegate d = mCommands[command];
+
+				Write("Usage: ");
+				Write(command + " ");
+
+				var parameters = d.Method.GetParameters();
+				for (int i = 0; i < parameters.Length; i++)
+				{
+					if (parameters[i].IsOptional)
+						Write("[");
+
+					Write(parameters[i].Name);
+
+					if (parameters[i].IsOptional)
+						Write("]");
+				}
+
+				WriteLine("");
+
+				string description = "";
+
+				if (DescribeCommand != null)
+				{
+					description = DescribeCommand(command);
+				}
+				if (string.IsNullOrEmpty(description))
+				{
+					var descripAttrib = (DescriptionAttribute)d.Method.GetCustomAttributes(typeof(DescriptionAttribute), false).FirstOrDefault();
+
+					if (descripAttrib != null)
+						description = descripAttrib.Description;
+				}
+
+				if (string.IsNullOrEmpty(description) == false)
+				{
+					WriteLine(description);
+				}
+
+			}
+		}
+
+		void WriteLine(string text)
+		{
+			AgateConsole.WriteLine(text);
+		}
+		void Write(string text)
+		{
+			AgateConsole.Write(text);
+		}
+
+		public event DescribeCommandHandler DescribeCommand;
+	}
+
+}

Added: trunk/AgateLib/Diagnostics/ConsoleSupport/ConsoleDictionary.cs
===================================================================
--- trunk/AgateLib/Diagnostics/ConsoleSupport/ConsoleDictionary.cs	                        (rev 0)
+++ trunk/AgateLib/Diagnostics/ConsoleSupport/ConsoleDictionary.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AgateLib.Diagnostics.ConsoleSupport
+{
+
+	public class ConsoleDictionary : Dictionary<string, Delegate>
+	{
+		public void Add<T>(string key, Action<T> value)
+		{
+			base.Add(key, value);
+		}
+		public void Add<T1, T2>(string key, Action<T1, T2> value)
+		{
+			base.Add(key, value);
+		}
+		public void Add<T1, T2, T3>(string key, Action<T1, T2, T3> value)
+		{
+			base.Add(key, value);
+		}
+		public void Add<T1, T2, T3, T4>(string key, Action<T1, T2, T3, T4> value)
+		{
+			base.Add(key, value);
+		}
+
+		public void Add<TResult>(string key, Func<TResult> value)
+		{
+			base.Add(key, value);
+		}
+		public void Add<T1, TResult>(string key, Func<T1, TResult> value)
+		{
+			base.Add(key, value);
+		}
+		public void Add<T1, T2, TResult>(string key, Func<T1, T2, TResult> value)
+		{
+			base.Add(key, value);
+		}
+		public void Add<T1, T2, T3, TResult>(string key, Func<T1, T2, T3, TResult> value)
+		{
+			base.Add(key, value);
+		}
+		public void Add<T1, T2, T3, T4, TResult>(string key, Func<T1, T2, T3, T4, TResult> value)
+		{
+			base.Add(key, value);
+		}
+	}
+}

Added: trunk/AgateLib/Diagnostics/ConsoleSupport/ConsoleMessage.cs
===================================================================
--- trunk/AgateLib/Diagnostics/ConsoleSupport/ConsoleMessage.cs	                        (rev 0)
+++ trunk/AgateLib/Diagnostics/ConsoleSupport/ConsoleMessage.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AgateLib.Diagnostics.ConsoleSupport
+{
+	public class ConsoleMessage
+	{
+		public string Text;
+		public long Time;
+		public ConsoleMessageType MessageType;
+	}
+
+}

Added: trunk/AgateLib/Diagnostics/ConsoleSupport/ConsoleMessageType.cs
===================================================================
--- trunk/AgateLib/Diagnostics/ConsoleSupport/ConsoleMessageType.cs	                        (rev 0)
+++ trunk/AgateLib/Diagnostics/ConsoleSupport/ConsoleMessageType.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AgateLib.Diagnostics.ConsoleSupport
+{
+
+	public delegate string DescribeCommandHandler(string command);
+
+	public enum ConsoleMessageType
+	{
+		Text,
+		UserInput,
+	}
+}

Added: trunk/AgateLib/Diagnostics/ConsoleSupport/ICommandProcessor.cs
===================================================================
--- trunk/AgateLib/Diagnostics/ConsoleSupport/ICommandProcessor.cs	                        (rev 0)
+++ trunk/AgateLib/Diagnostics/ConsoleSupport/ICommandProcessor.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -0,0 +1,11 @@
+using System;
+
+namespace AgateLib.Diagnostics.ConsoleSupport
+{
+	public interface ICommandProcessor
+	{
+		ConsoleDictionary Commands { get; }
+		event DescribeCommandHandler DescribeCommand;
+		void ExecuteCommand(string[] tokens);
+	}
+}

Modified: trunk/AgateLib/DisplayLib/Display.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Display.cs	2014-07-21 01:50:48 UTC (rev 1411)
+++ trunk/AgateLib/DisplayLib/Display.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -25,6 +25,7 @@
 using AgateLib.Drivers;
 using AgateLib.Geometry;
 using AgateLib.Utility;
+using AgateLib.Diagnostics;
 
 namespace AgateLib.DisplayLib
 {

Deleted: trunk/AgateLib/ICommandProcessor.cs
===================================================================
--- trunk/AgateLib/ICommandProcessor.cs	2014-07-21 01:50:48 UTC (rev 1411)
+++ trunk/AgateLib/ICommandProcessor.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -1,11 +0,0 @@
-using System;
-
-namespace AgateLib
-{
-	public interface ICommandProcessor
-	{
-		ConsoleDictionary Commands { get; }
-		event DescribeCommandHandler DescribeCommand;
-		void ExecuteCommand(string[] tokens);
-	}
-}

Modified: trunk/AgateLib/InputLib/Keyboard.cs
===================================================================
--- trunk/AgateLib/InputLib/Keyboard.cs	2014-07-21 01:50:48 UTC (rev 1411)
+++ trunk/AgateLib/InputLib/Keyboard.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -21,6 +21,7 @@
 using System.Text;
 
 using AgateLib.Geometry;
+using AgateLib.Diagnostics;
 
 namespace AgateLib.InputLib
 {

Added: trunk/AgateLib/Platform/Platform.cs
===================================================================
--- trunk/AgateLib/Platform/Platform.cs	                        (rev 0)
+++ trunk/AgateLib/Platform/Platform.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -0,0 +1,374 @@
+//     The contents of this file are subject to the Mozilla Public License
+//     Version 1.1 (the "License"); you may not use this file except in
+//     compliance with the License. You may obtain a copy of the License at
+//     http://www.mozilla.org/MPL/
+//
+//     Software distributed under the License is distributed on an "AS IS"
+//     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+//     License for the specific language governing rights and limitations
+//     under the License.
+//
+//     The Original Code is AgateLib.
+//
+//     The Initial Developer of the Original Code is Erik Ylvisaker.
+//     Portions created by Erik Ylvisaker are Copyright (C) 2006-2014.
+//     All Rights Reserved.
+//
+//     Contributor(s): Erik Ylvisaker
+//
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+namespace AgateLib.Platform
+{
+	/// <summary>
+	/// Class which contains known information about the platform.
+	/// This class also contains the folders where the application should store its data,
+	/// which are automatically created from the AssemblyCompanhy and AssemblyProduct
+	/// attributes for the assembly where the entry point for the application is.
+	/// </summary>
+	public class PlatformInfo
+	{
+		PlatformType mType;
+		DotNetRuntime mRuntime;
+		WindowsVersion mWindowsVersion;
+		string mDocuments;
+		string mAppData;
+		string mAppDir;
+		bool m64Bit;
+
+		internal PlatformInfo()
+		{
+			
+			mType = DetectPlatformType();
+			mRuntime = DetectRuntime();
+			m64Bit = Detect64Bit();
+
+			// According to http://msdn.microsoft.com/query/dev10.query?appId=Dev10IDEF1&l=EN-US&k=k%28SYSTEM.DIAGNOSTICS.DEBUG.LISTENERS%29;k%28TargetFrameworkMoniker-%22.NETFRAMEWORK%2cVERSION%3dV3.5%22%29;k%28DevLang-CSHARP%29&rd=true
+			//		The Listeners collection is shared by both the Debug and the Trace classes; 
+			//		adding a trace listener to either class adds the listener to both.
+			// So we will just use the Trace.Listeners class.
+			if (PlatformType != PlatformType.Windows)
+			{
+				Trace.Listeners.Add(new TextWriterTraceListener(Console.Out));
+			}
+
+			//CheckOSVersion();
+
+			//if (mType == PlatformType.Windows)
+			//	mWindowsVersion = DetectWindowsVersion();
+
+			SetFolders();
+
+			string debugLog = "agate-debuglog.txt";
+
+			if (HasWriteAccessToAppDirectory())
+			{
+				debugLog = Path.Combine(mAppDir, debugLog);
+			}
+			else
+			{
+				debugLog = Path.Combine(mAppData, debugLog);
+			}
+
+			try
+			{
+				Trace.Listeners.Add(new TextWriterTraceListener(new StreamWriter(debugLog)));
+			}
+			catch (Exception)
+			{
+				Trace.WriteLine("Could not open debug or trace log for writing.");
+			}
+
+			Trace.WriteLine("64-bit platform: " + m64Bit.ToString());
+
+		}
+
+		private bool Detect64Bit()
+		{
+			unsafe
+			{
+				int size = sizeof(IntPtr);
+
+				switch (size)
+				{
+					case 4: return false;
+					case 8: return true;
+					default:
+						throw new AgateException(string.Format("Size of IntPtr is {0}.", size));
+				}
+			}
+		}
+
+		private bool HasWriteAccessToAppDirectory()
+		{
+			return false;
+			/*
+			 * TODO: Fix this!!
+			// TODO: Maybe there is a better way to inspect permissions?
+			// here we just try to write and see if we fail.
+			string filename = Path.GetTempFileName();
+
+			try
+			{
+				string targetFile = Path.Combine(mAppDir, Path.GetFileName(filename));
+
+				using (var w = new StreamWriter( targetFile))
+				{
+					w.WriteLine("x");
+				}
+
+				File.Delete(targetFile);
+				return true;
+			}
+			catch
+			{
+				return false;
+			}*/
+		}
+
+		internal void EnsureAppDataDirectoryExists()
+		{
+			Directory.CreateDirectory(AppDataDirectory);
+		}
+
+		/// <summary>
+		/// Gets the directory where the application should store its configuration data.
+		/// </summary>
+		public string AppDataDirectory
+		{
+			get { return mAppData; }
+		}
+
+		static T GetCustomAttribute<T>(Assembly ass) where T : Attribute 	
+		{
+			try
+			{
+				return ass.GetCustomAttributes(typeof(T), false)[0] as T;
+			}
+			catch
+			{
+				return null;
+			}
+		}
+
+		private void SetFolders()
+		{
+			Assembly entryPt = Assembly.GetEntryAssembly() ?? Assembly.GetCallingAssembly();
+			string fqn = entryPt.GetLoadedModules()[0].FullyQualifiedName;
+
+			var companyAttribute = GetCustomAttribute<AssemblyCompanyAttribute>(entryPt);
+			var nameAttribute = GetCustomAttribute<AssemblyProductAttribute>(entryPt);
+
+			mAppDir = Path.GetDirectoryName(fqn);
+			Console.WriteLine("App Dir: {0}", mAppDir);
+
+			string companyName = companyAttribute != null ? companyAttribute.Company : string.Empty;
+			string product = nameAttribute != null ? nameAttribute.Product : string.Empty;
+
+			SetFolderPaths(companyName, product);
+		}
+
+		/// <summary>
+		/// Sets the folder paths for data based on the company name and application name.
+		/// This only needs to be called if the values used in the AssemblyCompany and
+		/// AssemblyProduct are not what you want to use to define these locations.
+		/// </summary>
+		/// <param name="companyName"></param>
+		/// <param name="appName"></param>
+		public void SetFolderPaths(string companyName, string appName)
+		{
+			string combDir = Path.Combine(companyName, appName);
+
+			if (string.IsNullOrEmpty(combDir))
+			{
+				mAppData = mAppDir;
+				Trace.WriteLine("Warning: No assembly level company / product name attributes were found.");
+			}
+			else
+				mAppData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+
+			mDocuments = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+
+			mAppData = Path.Combine(mAppData, combDir);
+			mDocuments = Path.Combine(mDocuments, combDir);
+
+			Console.WriteLine("App Data: {0}", mAppData);
+			Console.WriteLine("Documents: {0}", mDocuments);
+
+		}
+
+		private DotNetRuntime DetectRuntime()
+		{
+			DotNetRuntime runtime = DotNetRuntime.MicrosoftDotNet;
+
+			if (Type.GetType("Mono.Runtime") != null)
+				runtime = DotNetRuntime.Mono;
+
+			return runtime;
+		}
+
+		/// <summary>
+		/// Returns the version of windows being used, if the current platform is Windows.
+		/// An exception is thrown if this property is checked when the platform is not Windows.
+		/// </summary>
+		public WindowsVersion WindowsVersion
+		{
+			get
+			{
+				if (PlatformType != PlatformType.Windows)
+					throw new AgateCrossPlatformException(
+						"Current platform is not Windows, but the WindowsVersion property was checked.");
+
+				return mWindowsVersion;
+			}
+		}
+
+		/// <summary>
+		/// Gets the platform type.
+		/// </summary>
+		public PlatformType PlatformType
+		{
+			get { return mType; }
+		}
+		/// <summary>
+		/// Gets the runtime being used.
+		/// </summary>
+		public DotNetRuntime Runtime
+		{
+			get { return mRuntime; }
+		}
+
+		PlatformType DetectPlatformType()
+		{
+			switch (Environment.OSVersion.Platform)
+			{
+				case PlatformID.WinCE:
+				case PlatformID.Win32NT:
+				case PlatformID.Win32S:
+				case PlatformID.Win32Windows:
+					return PlatformType.Windows;
+
+				case PlatformID.Unix:
+					string kernel = DetectUnixKernel();
+
+					if (kernel == "Darwin")
+						return PlatformType.MacOS;
+					else
+						return PlatformType.Linux;
+
+				case PlatformID.MacOSX:
+					return PlatformType.MacOS;
+
+				case PlatformID.Xbox:
+					return PlatformType.XBox360;
+			}
+
+			return PlatformType.Unknown;
+		}
+
+		#region private static string DetectUnixKernel()
+
+		[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+		struct utsname
+		{
+			[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+			public string sysname;
+
+			[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+			public string nodename;
+
+			[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+			public string release;
+
+			[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+			public string version;
+
+			[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+			public string machine;
+
+			[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)] 
+			private string extraJustInCase;
+
+		}
+
+		 /// <summary>
+		 /// Detects the unix kernel by p/invoking the uname call in libc.
+		 /// </summary>
+		 /// <returns></returns>
+		private static string DetectUnixKernel()
+		{
+			Debug.WriteLine("Size: {0}", Marshal.SizeOf(typeof(utsname)).ToString());
+			Debug.Flush();
+			
+			utsname uts = new utsname();
+			uname(out uts);
+
+			Debug.WriteLine("System:");
+			Debug.WriteLine(uts.sysname);
+			Debug.WriteLine(uts.nodename);
+			Debug.WriteLine(uts.release);
+			Debug.WriteLine(uts.version);
+			Debug.WriteLine(uts.machine);
+
+			return uts.sysname.ToString();
+		}
+
+		[DllImport("libc")]
+		private static extern void uname(out utsname uname_struct);
+
+		#endregion
+
+
+		private void CheckOSVersion()
+		{
+			var version = System.Environment.OSVersion.Version;
+
+
+			Debug.WriteLine("OS Version: {0}", System.Environment.OSVersion.VersionString);
+			Debug.IndentLevel++;
+			Debug.WriteLine("Major: {0}", version.Major);
+			Debug.WriteLine("Major revision: {0}", version.MajorRevision);
+			Debug.WriteLine("Minor: {0}", version.Minor);
+			Debug.WriteLine("Minor revision: {0}", version.MinorRevision);
+			Debug.WriteLine("Revision: {0}", version.Revision);
+			Debug.WriteLine("Build: {0}", version.Build);
+			Debug.WriteLine("Service Pack: {0}", System.Environment.OSVersion.ServicePack);
+			Debug.IndentLevel--;
+		}
+
+		private WindowsVersion DetectWindowsVersion()
+		{
+			WindowsVersion retval = WindowsVersion.WindowsVista;
+			
+			switch (System.Environment.OSVersion.Version.Major)
+			{
+				case 4:
+					retval = WindowsVersion.Windows98;
+					break;
+				case 5:
+					retval = WindowsVersion.WindowsXP;
+					break;
+				case 6:
+					retval = WindowsVersion.WindowsVista;
+					break;
+				case 7:
+					retval = WindowsVersion.Windows7;
+					break;
+				case 8:
+					retval = WindowsVersion.Windows8;
+					break;
+			}
+
+			return retval;
+		}
+
+
+	}
+}

Added: trunk/AgateLib/Platform/PlatformType.cs
===================================================================
--- trunk/AgateLib/Platform/PlatformType.cs	                        (rev 0)
+++ trunk/AgateLib/Platform/PlatformType.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -0,0 +1,116 @@
+//     The contents of this file are subject to the Mozilla Public License
+//     Version 1.1 (the "License"); you may not use this file except in
+//     compliance with the License. You may obtain a copy of the License at
+//     http://www.mozilla.org/MPL/
+//
+//     Software distributed under the License is distributed on an "AS IS"
+//     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+//     License for the specific language governing rights and limitations
+//     under the License.
+//
+//     The Original Code is AgateLib.
+//
+//     The Initial Developer of the Original Code is Erik Ylvisaker.
+//     Portions created by Erik Ylvisaker are Copyright (C) 2006-2014.
+//     All Rights Reserved.
+//
+//     Contributor(s): Erik Ylvisaker
+//
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AgateLib.Platform
+{
+	/// <summary>
+	/// Enumeration listing the known platform types.
+	/// </summary>
+	public enum PlatformType
+	{
+		/// <summary>
+		/// Default value.
+		/// </summary>
+		Unknown = 0,
+
+		/// <summary>
+		/// The Microsoft Windows platform, including Windows 98, Windows NT, Windows XP, Windows Vista, etc.
+		/// </summary>
+		Windows,
+		/// <summary>
+		/// Some Linux / Unix platform, typically running with an X windowing system.
+		/// </summary>
+		Linux,
+		/// <summary>
+		/// Mac OS 10.3 or later.
+		/// </summary>
+		MacOS,
+
+		/// <summary>
+		/// Microsoft's XBox 360 console.
+		/// </summary>
+		XBox360,
+		/// <summary>
+		/// The portable GP2x handheld, or compatible.
+		/// </summary>
+		Gp2x,
+	}
+
+	/// <summary>
+	/// Enum indicating which version of Microsoft Windows is currently being run.
+	/// </summary>
+	public enum WindowsVersion
+	{
+		/// <summary>
+		/// An unknown version of Windows.
+		/// </summary>
+		Unknown = 0,
+
+		/// <summary>
+		/// Windows 98.
+		/// </summary>
+		Windows98,
+		/// <summary>
+		/// Windows XP or Server 2003.
+		/// </summary>
+		WindowsXP,
+		/// <summary>
+		/// Windows Vista or Server 2008.
+		/// </summary>
+		WindowsVista,
+		/// <summary>
+		/// Windows 7.
+		/// </summary>
+		Windows7,
+		/// <summary>
+		/// Windows 8.
+		/// </summary>
+		Windows8
+	}
+
+	/// <summary>
+	/// Enum indicating which .NET runtime is currently in use.
+	/// </summary>
+	public enum DotNetRuntime
+	{
+		/// <summary>
+		/// An unknown runtime.
+		/// </summary>
+		Unknown = 0,
+
+		/// <summary>
+		/// Microsoft's runtime.
+		/// </summary>
+		MicrosoftDotNet = 1,
+		/// <summary>
+		/// The runtime of the Mono project.
+		/// </summary>
+		Mono = 2,
+		/// <summary>
+		/// The DotGnu / Portable.NET runtime.
+		/// Note that presence of this enumeration value does not indicate
+		/// that using AgateLib on DotGnu is supported.
+		/// </summary>
+		DotGnu = 9999,
+	}
+}

Deleted: trunk/AgateLib/Platform.cs
===================================================================
--- trunk/AgateLib/Platform.cs	2014-07-21 01:50:48 UTC (rev 1411)
+++ trunk/AgateLib/Platform.cs	2014-07-24 02:07:05 UTC (rev 1412)
@@ -1,374 +0,0 @@
-//     The contents of this file are subject to the Mozilla Public License
-//     Version 1.1 (the "License"); you may not use this file except in
-//     compliance with the License. You may obtain a copy of the License at
-//     http://www.mozilla.org/MPL/
-//
-//     Software distributed under the License is distributed on an "AS IS"
-//     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-//     License for the specific language governing rights and limitations
-//     under the License.
-//
-//     The Original Code is AgateLib.
-//
-//     The Initial Developer of the Original Code is Erik Ylvisaker.
-//     Portions created by Erik Ylvisaker are Copyright (C) 2006-2014.
-//     All Rights Reserved.
-//
-//     Contributor(s): Erik Ylvisaker
-//
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-namespace AgateLib
-{
-	/// <summa...
 
[truncated message content]

2009	Jan	Feb	Mar	Apr (86)	May (77)	Jun	Jul (1)	Aug (31)	Sep (12)	Oct (31)	Nov (53)	Dec (39)
2010	Jan (53)	Feb (14)	Mar	Apr	May	Jun	Jul	Aug (2)	Sep	Oct	Nov (7)	Dec (13)
2011	Jan (17)	Feb (5)	Mar (1)	Apr	May	Jun (1)	Jul	Aug	Sep	Oct (10)	Nov (21)	Dec
2012	Jan (6)	Feb (14)	Mar (5)	Apr (4)	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2013	Jan (1)	Feb (8)	Mar (1)	Apr	May	Jun	Jul	Aug (2)	Sep (1)	Oct (5)	Nov (9)	Dec (5)
2014	Jan (3)	Feb (2)	Mar (4)	Apr (3)	May	Jun (5)	Jul (33)	Aug (69)	Sep (35)	Oct (4)	Nov (1)	Dec

agate-svn-commit Mailing List for AgateLib (Page 6)

agate-svn-commit — List with automated subversion commit messages.