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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1462
          http://sourceforge.net/p/agate/code/1462
Author:   kanato
Date:     2014-08-15 19:27:26 +0000 (Fri, 15 Aug 2014)
Log Message:
-----------
Add new resource system.

Modified Paths:
--------------
    trunk/AgateLib/AgateLib.csproj
    trunk/AgateLib/DisplayLib/BitmapFont/BitmapFontOptions.cs
    trunk/AgateLib/DisplayLib/BitmapFont/FontMetrics.cs
    trunk/AgateLib/DisplayLib/BitmapFont/GlyphMetrics.cs
    trunk/AgateLib/DisplayLib/DisplayWindow.cs
    trunk/AgateLib/DisplayLib/Font.cs
    trunk/AgateLib/DisplayLib/FontSurface.cs
    trunk/AgateLib/DisplayLib/ImplementationBase/DisplayImpl.cs
    trunk/AgateLib/DisplayLib/Surface.cs
    trunk/AgateLib/Drivers/IDisplayFactory.cs
    trunk/AgateLib/Serialization/Xle/XleSerializationInfo.cs
    trunk/AgateLib/Serialization/Xle/XleSerializer.cs
    trunk/AgateLib/Sprites/Sprite.cs
    trunk/AgateLib.Platform.WindowsForms/DisplayImplementation/DesktopGLDisplay.cs
    trunk/AgateLib.Platform.WindowsForms/WinForms/BitmapFontUtil.cs
    trunk/Examples/BallBuster.Net/CImage.cs
    trunk/Tests/CoreTests/Resources.cs
    trunk/Tests/DisplayTests/ParticleTests/ParticleTests.cs
    trunk/Tests/DisplayTests/SpriteTester/frmChooseSprite.cs
    trunk/Tests/DisplayTests/SpriteTester/frmSpriteTester.cs
    trunk/Tests/Fonts/BitmapFonts.cs
    trunk/Tests/Fonts/FontAlignment.cs
    trunk/Tests/UserInterfaceTests/GuiStuff.cs
    trunk/Tools/FontCreator/FontCreator.cs
    trunk/Tools/PackedSpriteCreator/SpriteEditor.cs
    trunk/Tools/PackedSpriteCreator/frmNewSprite.cs
    trunk/Tools/PackedSpriteCreator/frmSpriteCreator.cs
    trunk/Tools/ResourceEditor/StringTable/StringTableEditor.cs
    trunk/Tools/ResourceEditor/frmResourceEditor.cs
    trunk/UnitTests/Display/FontTests.cs
    trunk/UnitTests/Fakes/FakeDisplayDriver.cs
    trunk/UnitTests/UnitTests.csproj
    trunk/UnitTests/UserInterface/Css/LayoutTest.cs

Added Paths:
-----------
    trunk/AgateLib/DisplayLib/FontSettings.cs
    trunk/AgateLib/DisplayLib/FontStyles.cs
    trunk/AgateLib/Drivers/NullDrivers/NullInputFactory.cs
    trunk/AgateLib/Drivers/NullDrivers/NullSoundFactory.cs
    trunk/AgateLib/Geometry/Polygon.cs
    trunk/AgateLib/Resources/DC/
    trunk/AgateLib/Resources/DC/AgateResource.cs
    trunk/AgateLib/Resources/DC/AgateResourceCollection.cs
    trunk/AgateLib/Resources/DC/FontResource.cs
    trunk/AgateLib/Resources/DC/FontSurfaceResource.cs
    trunk/AgateLib/Resources/DC/ResourceCollection.cs
    trunk/AgateLib/Resources/DC/SpriteFrameResource.cs
    trunk/AgateLib/Resources/DC/SpriteResource.cs
    trunk/AgateLib/Resources/DC/SurfaceResource.cs
    trunk/AgateLib/Resources/Legacy/
    trunk/AgateLib/Resources/Legacy/AgateResource.cs
    trunk/AgateLib/Resources/Legacy/AgateResourceCollection.cs
    trunk/AgateLib/Resources/Legacy/AgateResourceLoader.cs
    trunk/AgateLib/Resources/Legacy/BitmapFontResource.cs
    trunk/AgateLib/Resources/Legacy/DisplayWindowResource.cs
    trunk/AgateLib/Resources/Legacy/ImageResource.cs
    trunk/AgateLib/Resources/Legacy/SpriteResource.cs
    trunk/AgateLib/Resources/Legacy/StringTable.cs
    trunk/AgateLib/Resources/Legacy/SurfaceResource.cs
    trunk/AgateLib/Resources/Legacy/XmlHelper.cs
    trunk/UnitTests/Fakes/FakeAgateFactory.cs
    trunk/UnitTests/Fakes/FakePlatformFactory.cs
    trunk/UnitTests/Fakes/FakePlatformInfo.cs
    trunk/UnitTests/Resources/
    trunk/UnitTests/Resources/SerializationTest.cs

Removed Paths:
-------------
    trunk/AgateLib/Resources/AgateResource.cs
    trunk/AgateLib/Resources/AgateResourceCollection.cs
    trunk/AgateLib/Resources/AgateResourceLoader.cs
    trunk/AgateLib/Resources/BitmapFontResource.cs
    trunk/AgateLib/Resources/DisplayWindowResource.cs
    trunk/AgateLib/Resources/ImageResource.cs
    trunk/AgateLib/Resources/SpriteResource.cs
    trunk/AgateLib/Resources/StringTable.cs
    trunk/AgateLib/Resources/SurfaceResource.cs
    trunk/AgateLib/Resources/XmlHelper.cs
    trunk/AgateLib/Sprites/Polygon.cs

Modified: trunk/AgateLib/AgateLib.csproj
===================================================================

--- trunk/AgateLib/AgateLib.csproj	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/AgateLib.csproj	2014-08-15 19:27:26 UTC (rev 1462)
@@ -84,6 +84,10 @@
     <Compile Include="Algorithms\PathFinding\AStarNode.cs" />
     <Compile Include="Algorithms\PathFinding\AStarState.cs" />
     <Compile Include="Algorithms\Inverting.cs" />
+    <Compile Include="DisplayLib\FontSettings.cs" />
+    <Compile Include="DisplayLib\FontStyles.cs" />
+    <Compile Include="Drivers\NullDrivers\NullInputFactory.cs" />
+    <Compile Include="Drivers\NullDrivers\NullSoundFactory.cs" />
     <Compile Include="Mathematics\MathHelper.cs" />
     <Compile Include="Algorithms\PathFinding\IAStarMap.cs" />
     <Compile Include="Algorithms\Pair.cs" />
@@ -96,9 +100,17 @@
     <Compile Include="ApplicationModels\CoordinateSystems\FixedAspectRatioCoordinates.cs" />
     <Compile Include="ApplicationModels\ICoordinateSystemCreator.cs" />
     <Compile Include="ApplicationModels\ModelParameters.cs" />
+    <Compile Include="Resources\DC\AgateResource.cs" />
+    <Compile Include="Resources\DC\FontResource.cs" />
+    <Compile Include="Resources\DC\FontSurfaceResource.cs" />
+    <Compile Include="Resources\DC\ResourceCollection.cs" />
+    <Compile Include="Resources\DC\AgateResourceCollection.cs" />
+    <Compile Include="Resources\DC\SpriteFrameResource.cs" />
+    <Compile Include="Resources\DC\SpriteResource.cs" />
+    <Compile Include="Resources\DC\SurfaceResource.cs" />
     <Compile Include="Sprites\CollisionRegion.cs" />
     <Compile Include="Sprites\ISpriteContainer.cs" />
-    <Compile Include="Sprites\Polygon.cs" />
+    <Compile Include="Geometry\Polygon.cs" />
     <Compile Include="Sprites\SpriteContainer.cs" />
     <Compile Include="UnitTesting\AssertThrows.cs" />
     <Compile Include="AudioLib\AudioCapsInfo.cs" />
@@ -172,7 +184,7 @@
     <Compile Include="Platform\IStopWatch.cs" />
     <Compile Include="Platform\PlatformInfo.cs" />
     <Compile Include="Platform\PlatformType.cs" />
-    <Compile Include="Resources\ImageResource.cs" />
+    <Compile Include="Resources\Legacy\ImageResource.cs" />
     <Compile Include="Serialization\Xle\CompressionMode.cs" />
     <Compile Include="Serialization\Xle\CompressionType.cs" />
     <Compile Include="Serialization\Xle\ITypeBinder.cs" />
@@ -456,34 +468,34 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Resources\AgateResource.cs">
+    <Compile Include="Resources\Legacy\AgateResource.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Resources\AgateResourceCollection.cs">
+    <Compile Include="Resources\Legacy\AgateResourceCollection.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Resources\AgateResourceException.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Resources\AgateResourceLoader.cs">
+    <Compile Include="Resources\Legacy\AgateResourceLoader.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Resources\BitmapFontResource.cs">
+    <Compile Include="Resources\Legacy\BitmapFontResource.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Resources\DisplayWindowResource.cs">
+    <Compile Include="Resources\Legacy\DisplayWindowResource.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Resources\SpriteResource.cs">
+    <Compile Include="Resources\Legacy\SpriteResource.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Resources\StringTable.cs">
+    <Compile Include="Resources\Legacy\StringTable.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Resources\SurfaceResource.cs">
+    <Compile Include="Resources\Legacy\SurfaceResource.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Resources\XmlHelper.cs">
+    <Compile Include="Resources\Legacy\XmlHelper.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Sprites\FrameList.cs">

Modified: trunk/AgateLib/DisplayLib/BitmapFont/BitmapFontOptions.cs
===================================================================
--- trunk/AgateLib/DisplayLib/BitmapFont/BitmapFontOptions.cs	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/DisplayLib/BitmapFont/BitmapFontOptions.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -93,7 +93,7 @@
 
 		private string mFamily;
 		private float mSize;
-		private FontStyle mStyle;
+		private FontStyles mStyle;
 		private bool mUseTextRenderer = true;
 		private bool mCreateBorder;
 		private bool mMonospaceNumbers = true;
@@ -132,7 +132,7 @@
 		/// <param name="fontFamily"></param>
 		/// <param name="sizeInPoints"></param>
 		/// <param name="style"></param>
-		public BitmapFontOptions(string fontFamily, float sizeInPoints, FontStyle style)
+		public BitmapFontOptions(string fontFamily, float sizeInPoints, FontStyles style)
 			: this(fontFamily, sizeInPoints)
 		{
 			mStyle = style;
@@ -240,7 +240,7 @@
 		/// <summary>
 		/// Style of the font to be generated.
 		/// </summary>
-		public FontStyle FontStyle
+		public FontStyles FontStyle
 		{
 			get { return mStyle; }
 			set { mStyle = value; }

Modified: trunk/AgateLib/DisplayLib/BitmapFont/FontMetrics.cs
===================================================================
--- trunk/AgateLib/DisplayLib/BitmapFont/FontMetrics.cs	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/DisplayLib/BitmapFont/FontMetrics.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -21,6 +21,7 @@
 using System.Text;
 using System.Xml;
 using AgateLib.Geometry;
+using System.Runtime.Serialization;
 
 namespace AgateLib.DisplayLib.BitmapFont
 {

Modified: trunk/AgateLib/DisplayLib/BitmapFont/GlyphMetrics.cs
===================================================================
--- trunk/AgateLib/DisplayLib/BitmapFont/GlyphMetrics.cs	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/DisplayLib/BitmapFont/GlyphMetrics.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -21,6 +21,7 @@
 using System.Text;
 
 using AgateLib.Geometry;
+using System.Runtime.Serialization;
 
 namespace AgateLib.DisplayLib.BitmapFont
 {

Modified: trunk/AgateLib/DisplayLib/DisplayWindow.cs
===================================================================
--- trunk/AgateLib/DisplayLib/DisplayWindow.cs	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/DisplayLib/DisplayWindow.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -44,10 +44,10 @@
 		/// </summary>
 		/// <param name="resources"></param>
 		/// <param name="name"></param>
-		public DisplayWindow(Resources.AgateResourceCollection resources, string name)
+		public DisplayWindow(Resources.Legacy.AgateResourceCollection resources, string name)
 		{
-			Resources.AgateResource res = resources[name];
-			Resources.DisplayWindowResource disp = res as Resources.DisplayWindowResource;
+			Resources.Legacy.AgateResource res = resources[name];
+			Resources.Legacy.DisplayWindowResource disp = res as Resources.Legacy.DisplayWindowResource;
 
 			if (disp == null)
 				throw new Resources.AgateResourceException("Resource " + name + " was found, but was of type " + name.GetType().ToString() + ", not DisplayWindowResource.");

Modified: trunk/AgateLib/DisplayLib/Font.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Font.cs	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/DisplayLib/Font.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -19,7 +19,7 @@
 			Name = name;
 		}
 
-		public void AddFont(FontSurface fontSurface, int size, FontStyle style)
+		public void AddFont(FontSurface fontSurface, int size, FontStyles style)
 		{
 			AddFont(new FontSettings(size, style), fontSurface);
 		}
@@ -33,11 +33,11 @@
 
 		public string Name { get; set; }
 		public int Size { get { return mSettings.Size; } set { mSettings.Size = value; } }
-		public FontStyle Style { get { return mSettings.Style; } set { mSettings.Style = value; } }
+		public FontStyles Style { get { return mSettings.Style; } set { mSettings.Style = value; } }
 
 		public int FontHeight { get { return FontSurface.FontHeight; } }
 
-		int MaxSize(FontStyle style)
+		int MaxSize(FontStyles style)
 		{
 			var keys = mFontSurfaces.Keys.Where(x => x.Style == style);
 			if (keys.Count() > 0)
@@ -58,7 +58,7 @@
 
 		#region --- Finding correctly sized font ---
 
-		public FontSurface GetClosestFont(int size, FontStyle style)
+		public FontSurface GetClosestFont(int size, FontStyles style)
 		{
 			return GetClosestFont(new FontSettings(size, style));
 		}
@@ -74,7 +74,7 @@
 			return retval;
 		}
 
-		internal FontSettings GetClosestFontSettings(int size, FontStyle style)
+		internal FontSettings GetClosestFontSettings(int size, FontStyles style)
 		{
 			return GetClosestFontSettings(new FontSettings(size, style));
 		}
@@ -88,16 +88,16 @@
 			// this happens if we have no font surfaces of this style.
 			if (maxSize <= 0)
 			{
-				FontStyle newStyle;
+				FontStyles newStyle;
 
 				// OK remove styles until we find an actual font.
-				if (TryRemoveStyle(settings.Style, FontStyle.Strikeout, out newStyle))
+				if (TryRemoveStyle(settings.Style, FontStyles.Strikeout, out newStyle))
 					return GetClosestFontSettings(settings.Size, newStyle);
-				if (TryRemoveStyle(settings.Style, FontStyle.Italic, out newStyle))
+				if (TryRemoveStyle(settings.Style, FontStyles.Italic, out newStyle))
 					return GetClosestFontSettings(settings.Size, newStyle);
-				if (TryRemoveStyle(settings.Style, FontStyle.Underline, out newStyle))
+				if (TryRemoveStyle(settings.Style, FontStyles.Underline, out newStyle))
 					return GetClosestFontSettings(settings.Size, newStyle);
-				if (TryRemoveStyle(settings.Style, FontStyle.Bold, out newStyle))
+				if (TryRemoveStyle(settings.Style, FontStyles.Bold, out newStyle))
 					return GetClosestFontSettings(settings.Size, newStyle);
 				else
 				{
@@ -122,7 +122,7 @@
 
 		#endregion
 
-		private bool TryRemoveStyle(FontStyle value, FontStyle remove, out FontStyle result)
+		private bool TryRemoveStyle(FontStyles value, FontStyles remove, out FontStyles result)
 		{
 			if ((value & remove) == remove)
 			{
@@ -167,28 +167,4 @@
 		}
 	}
 
-	public struct FontSettings : IEquatable<FontSettings>
-	{
-		int mSize;
-		FontStyle mStyle;
-
-		public int Size { get { return mSize; } set { mSize = value; } }
-		public FontStyle Style { get { return mStyle; } set { mStyle = value; } }
-
-		public bool Equals(FontSettings other)
-		{
-			if (Size != other.Size)
-				return false;
-			if (Style != other.Style)
-				return false;
-
-			return true;
-		}
-
-		public FontSettings(int size, FontStyle style)
-		{
-			mSize = size;
-			mStyle = style;
-		}
-	}
 }

Added: trunk/AgateLib/DisplayLib/FontSettings.cs
===================================================================
--- trunk/AgateLib/DisplayLib/FontSettings.cs	                        (rev 0)
+++ trunk/AgateLib/DisplayLib/FontSettings.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AgateLib.DisplayLib
+{
+	/// <summary>
+	/// Structure which encapsulates font size and style.
+	/// </summary>
+	public struct FontSettings : IEquatable<FontSettings>
+	{
+		int mSize;
+		FontStyles mStyle;
+
+		/// <summary>
+		/// Size of the font in points.
+		/// </summary>
+		public int Size { get { return mSize; } set { mSize = value; } }
+		/// <summary>
+		/// Style(s) of the font. Combinations like bold&italic are possible.
+		/// </summary>
+		public FontStyles Style { get { return mStyle; } set { mStyle = value; } }
+
+		/// <summary>
+		/// Returns true if the two FontSettings objects are equal.
+		/// </summary>
+		/// <param name="other"></param>
+		/// <returns></returns>
+		public bool Equals(FontSettings other)
+		{
+			if (Size != other.Size)
+				return false;
+			if (Style != other.Style)
+				return false;
+
+			return true;
+		}
+
+		/// <summary>
+		/// Constructs a FontSettings object.
+		/// </summary>
+		/// <param name="size"></param>
+		/// <param name="style"></param>
+		public FontSettings(int size, FontStyles style)
+		{
+			mSize = size;
+			mStyle = style;
+		}
+
+		/// <summary>
+		/// Returns the full name of a font with these settings.
+		/// </summary>
+		/// <param name="family"></param>
+		/// <returns></returns>
+		public string FontName(string family)
+		{
+			return family + "-" + ToString();
+		}
+
+		/// <summary>
+		/// Converts to a string representation.
+		/// </summary>
+		/// <returns></returns>
+		public override string ToString()
+		{
+			if (Style != FontStyles.None)
+			{
+				return string.Format("{0}-{1}", Size, Style);
+			}
+			else
+				return Size.ToString();
+		}
+	}
+}

Added: trunk/AgateLib/DisplayLib/FontStyles.cs
===================================================================
--- trunk/AgateLib/DisplayLib/FontStyles.cs	                        (rev 0)
+++ trunk/AgateLib/DisplayLib/FontStyles.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AgateLib.DisplayLib
+{
+	/// <summary>
+	/// Enumeration which allows selection of font styles when creating
+	/// a font from the OS.  This enum has the FlagsAttribute, so its members
+	/// can be combined in a bitwise fashion.
+	/// </summary>
+	[Flags]
+	public enum FontStyles
+	{
+		/// <summary>
+		/// No style is applied.
+		/// </summary>
+		None = 0,
+		/// <summary>
+		/// Make the font bold.
+		/// </summary>
+		Bold = 1,
+		/// <summary>
+		/// Use italics.
+		/// </summary>
+		Italic = 2,
+		/// <summary>
+		/// Strikeout through the font glyphs.
+		/// </summary>
+		Strikeout = 4,
+		/// <summary>
+		/// Underline beneath the glyphs.
+		/// </summary>
+		Underline = 8,
+	}
+
+}

Modified: trunk/AgateLib/DisplayLib/FontSurface.cs
===================================================================
--- trunk/AgateLib/DisplayLib/FontSurface.cs	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/DisplayLib/FontSurface.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -25,40 +25,11 @@
 using AgateLib.DisplayLib.ImplementationBase;
 using AgateLib.Geometry;
 using AgateLib.Resources;
+using AgateLib.Resources.Legacy;
 
 namespace AgateLib.DisplayLib
 {
 	/// <summary>
-	/// Enumeration which allows selection of font styles when creating
-	/// a font from the OS.  This enum has the FlagsAttribute, so its members
-	/// can be combined in a bitwise fashion.
-	/// </summary>
-	[Flags]
-	public enum FontStyle
-	{
-		/// <summary>
-		/// No style is applied.
-		/// </summary>
-		None = 0,
-		/// <summary>
-		/// Make the font bold.
-		/// </summary>
-		Bold = 1,
-		/// <summary>
-		/// Use italics.
-		/// </summary>
-		Italic = 2,
-		/// <summary>
-		/// Strikeout through the font glyphs.
-		/// </summary>
-		Strikeout = 4,
-		/// <summary>
-		/// Underline beneath the glyphs.
-		/// </summary>
-		Underline = 8,
-	}
-
-	/// <summary>
 	/// Class which represents a font to draw on the screen.
 	/// <remarks>When creating a FontSurface, if you are going to be
 	/// scaling the font, it usually looks much better to make a large font
@@ -82,7 +53,7 @@
 		/// ones, like FontSurface.AgateSans14.
 		/// </remarks>
 		public FontSurface(string fontFamily, float sizeInPoints)
-			: this(fontFamily, sizeInPoints, FontStyle.None)
+			: this(fontFamily, sizeInPoints, FontStyles.None)
 		{ }
 
 		/// <summary>
@@ -97,7 +68,7 @@
 		/// support, either create a bitmap font, or use one of the built-in
 		/// ones, like FontSurface.AgateSans14.
 		/// </remarks>
-		public FontSurface(string fontFamily, float sizeInPoints, FontStyle style)
+		public FontSurface(string fontFamily, float sizeInPoints, FontStyles style)
 		{
 			if (sizeInPoints < 1)
 				throw new ArgumentOutOfRangeException("Font size must be positive and non-zero, but was " +

Modified: trunk/AgateLib/DisplayLib/ImplementationBase/DisplayImpl.cs
===================================================================
--- trunk/AgateLib/DisplayLib/ImplementationBase/DisplayImpl.cs	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/DisplayLib/ImplementationBase/DisplayImpl.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -176,7 +176,7 @@
 		/// <param name="style"></param>
 		/// <returns></returns>
 		public abstract FontSurfaceImpl CreateFont(string fontFamily,
-			float sizeInPoints, FontStyle style);
+			float sizeInPoints, FontStyles style);
 
 		/// <summary>
 		/// Creates a BitmapFontImpl object from the specified options.

Modified: trunk/AgateLib/DisplayLib/Surface.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Surface.cs	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/DisplayLib/Surface.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -67,12 +67,12 @@
 		/// </summary>
 		/// <param name="resources"></param>
 		/// <param name="name"></param>
-		public Surface(Resources.AgateResourceCollection resources, string name)
+		public Surface(Resources.Legacy.AgateResourceCollection resources, string name)
 		{
 			if (Display.Impl == null)
 				throw new AgateException("AgateLib's display system has not been initialized.");
 
-			Resources.SurfaceResource surf = resources.Surfaces[name];
+			Resources.Legacy.SurfaceResource surf = resources.Surfaces[name];
 					    
 			mImpl = surf.CreateSurfaceImpl();
 

Modified: trunk/AgateLib/Drivers/IDisplayFactory.cs
===================================================================
--- trunk/AgateLib/Drivers/IDisplayFactory.cs	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/Drivers/IDisplayFactory.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -1,4 +1,5 @@
-using System;
+using AgateLib.DisplayLib.ImplementationBase;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,6 +9,6 @@
 {
 	public interface IDisplayFactory
 	{
-		DisplayLib.ImplementationBase.DisplayImpl CreateDisplayImpl();
+		DisplayImpl CreateDisplayImpl();
 	}
 }

Added: trunk/AgateLib/Drivers/NullDrivers/NullInputFactory.cs
===================================================================
--- trunk/AgateLib/Drivers/NullDrivers/NullInputFactory.cs	                        (rev 0)
+++ trunk/AgateLib/Drivers/NullDrivers/NullInputFactory.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AgateLib.Drivers.NullDrivers
+{
+	public class NullInputFactory : IInputFactory
+	{
+		public InputLib.ImplementationBase.InputImpl CreateJoystickInputImpl()
+		{
+			return new NullInputImpl();
+		}
+	}
+}

Added: trunk/AgateLib/Drivers/NullDrivers/NullSoundFactory.cs
===================================================================
--- trunk/AgateLib/Drivers/NullDrivers/NullSoundFactory.cs	                        (rev 0)
+++ trunk/AgateLib/Drivers/NullDrivers/NullSoundFactory.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AgateLib.Drivers.NullDrivers
+{
+	public class NullSoundFactory : IAudioFactory
+	{
+		public AudioLib.ImplementationBase.AudioImpl CreateAudioImpl()
+		{
+			return new NullSoundImpl();
+		}
+	}
+}

Copied: trunk/AgateLib/Geometry/Polygon.cs (from rev 1460, trunk/AgateLib/Sprites/Polygon.cs)
===================================================================
--- trunk/AgateLib/Geometry/Polygon.cs	                        (rev 0)
+++ trunk/AgateLib/Geometry/Polygon.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -0,0 +1,179 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AgateLib.Geometry;
+using System.Runtime.Serialization;
+
+namespace AgateLib.Geometry
+{
+	[DataContract]
+	public class Polygon
+	{
+		[DataMember]
+		List<Vector2> mPoints = new List<Vector2>();
+
+		public List<Vector2> Points
+		{
+			get { return mPoints; }
+		}
+
+		public Polygon Clone()
+		{
+			var retval = new Polygon();
+
+			retval.mPoints.AddRange(mPoints);
+
+			return retval;
+		}
+
+		public static Polygon FromRect(Rectangle rect)
+		{
+			Polygon retval = new Polygon();
+
+			retval.AddPoint(rect.X, rect.Y);
+			retval.AddPoint(rect.Right, rect.Y);
+			retval.AddPoint(rect.Right, rect.Bottom);
+			retval.AddPoint(rect.X, rect.Bottom);
+
+			return retval;
+		}
+
+		private void AddPoint(int x, int y)
+		{
+			mPoints.Add(new Vector2(x, y));
+		}
+
+		public Rectangle BoundingRect
+		{
+			get
+			{
+				if (Points.Count == 0)
+					throw new InvalidOperationException();
+
+				int left = int.MaxValue;
+				int right = int.MinValue;
+				int top = int.MaxValue;
+				int bottom = int.MinValue;
+
+				foreach (var pt in Points)
+				{
+					if (pt.X < left) left = (int)pt.X;
+					if (pt.X > right) right = (int)pt.X;
+					if (pt.Y < top) top = (int)pt.Y;
+					if (pt.Y > bottom) bottom = (int)pt.Y;
+				}
+
+				return Rectangle.FromLTRB(left, top, right, bottom);
+			}
+		}
+
+
+		#region --- Collision Checking ---
+
+		public static bool PolysIntersect(Polygon polyA, Polygon polyB)
+		{
+			return PolysIntersect(polyA, Vector2.Empty, polyB, Vector2.Empty);
+		}
+		public static bool PolysIntersect(
+			Polygon polyA, Vector2 offsetA,
+			Polygon polyB, Vector2 offsetB)
+		{
+			// do the separating axis test for each edge in each square.
+			if (FindSeparatingAxis(
+				polyA.mPoints, offsetA,
+				polyB.mPoints, offsetB))
+				return false;
+
+			if (FindSeparatingAxis(
+				polyB.mPoints, offsetB,
+				polyA.mPoints, offsetA))
+				return false;
+
+			return true;
+		}
+
+		/// <summary>
+		/// Checks to see if any of the lines in the first set of vectors groups
+		/// all the points in the second set of vectors entirely into one side.
+		/// This algorithm can be used to determine if two convex polygons intersect.
+		/// </summary>
+		/// <param name="va"></param>
+		/// <param name="vb"></param>
+		/// <returns></returns>
+		private static bool FindSeparatingAxis(
+			List<Vector2> va, Vector2 offsetA,
+			List<Vector2> vb, Vector2 offsetB)
+		{
+			for (int i = 0; i < va.Count; i++)
+			{
+				int next = i + 1;
+				if (next == va.Count) next = 0;
+
+				int nextnext = next + 1;
+				if (nextnext == va.Count) nextnext = 0;
+
+				Vector2 edge = va[next] - va[i];
+
+				bool separating = true;
+
+				// first check to see which side of the axis the points in 
+				// va are on, stored in the inSide variable.
+				Vector2 indiff = va[nextnext] - va[i];
+
+				var indot = indiff.DotProduct(edge);
+				int inSide = Math.Sign(indot);
+				int lastSide = 0;
+
+				for (int j = 0; j < vb.Count; j++)
+				{
+					Vector2 diff = vb[j] - va[i];
+					diff += offsetB - offsetA;
+
+					var dot = diff.DotProduct(edge);
+					var side = Math.Sign(dot);
+
+					// this means points in vb are on the same side 
+					// of the edge as points in va. Thus, it is not 
+					// a separating axis.
+					if (side == inSide)
+					{
+						separating = false;
+						break;
+					}
+
+					if (lastSide == 0)
+						lastSide = side;
+					else if (lastSide != side)
+					{
+						// if we fail here, it means the axis goes right through
+						// the polygon defined in vb, so this is not a separating
+						// axis.
+						separating = false;
+						break;
+					}
+				}
+
+				if (separating)
+					return true;
+			}
+
+			return false;
+		}
+
+		#endregion
+
+
+		public bool IsAlignedRect
+		{
+			get
+			{
+				if (mPoints.Count != 4)
+					return false;
+
+				// TODO: actually implement this method.
+				return true;
+			}
+		}
+	}
+}

Deleted: trunk/AgateLib/Resources/AgateResource.cs
===================================================================
--- trunk/AgateLib/Resources/AgateResource.cs	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/Resources/AgateResource.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -1,85 +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.Text;
-using System.Xml;
-using System.Xml.Linq;
-using System.Xml.Serialization;
-
-namespace AgateLib.Resources
-{
-	/// <summary>
-	/// Class which represents a resource.
-	/// </summary>
-	public abstract class AgateResource 
-	{
-		private string mName;
-		private string mLanguage = "Default";
-
-		/// <summary>
-		/// Constructs a base resource object.
-		/// </summary>
-		protected AgateResource()
-		{ }
-		/// <summary>
-		/// Constructs a base resource object.
-		/// </summary>
-		/// <param name="name"></param>
-		protected AgateResource(string name)
-		{
-			mName = name;
-		}
-		/// <summary>
-		/// Name of the resource
-		/// </summary>
-		public string Name
-		{
-			get { return mName; }
-			set { mName = value; }
-		}
-		/// <summary>
-		/// Language this resource is to be used for.  If this is a language-independent
-		/// resource, then the Language will be "Default".
-		/// </summary>
-		public string Language
-		{
-			get { return mLanguage; }
-			private set { mLanguage = value; }
-		}
-
-		/// <summary>
-		/// Serializes the AgateResource object to a subelement of parent.
-		/// </summary>
-		/// <param name="parent">The parent element of this resource.</param>
-		/// <param name="doc">The XML document used to create elements.</param>
-		internal abstract void BuildNodes(XElement parent);
-
-		#region --- ICloneable Members ---
-
-		/// <summary>
-		/// Override to construct a copy of the resource.
-		/// </summary>
-		/// <returns></returns>
-		protected abstract AgateResource Clone();
-
-
-		#endregion
-	}
-}

Deleted: trunk/AgateLib/Resources/AgateResourceCollection.cs
===================================================================
--- trunk/AgateLib/Resources/AgateResourceCollection.cs	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/Resources/AgateResourceCollection.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -1,478 +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.Xml;
-using System.IO;
-using AgateLib.DisplayLib;
-using AgateLib.DisplayLib.ImplementationBase;
-using AgateLib.Utility;
-using AgateLib.IO;
-
-namespace AgateLib.Resources
-{
-	/// <summary>
-	/// Class which wraps an XML based resource file.  This class provides methods for adding
-	/// and extracting resources.
-	/// </summary>
-	public class AgateResourceCollection : IDictionary<string, AgateResource>, ICollection<AgateResource>
-	{
-		Dictionary<string, AgateResource> mStore = new Dictionary<string, AgateResource>();
-
-		List<ImageResource> mImages = new List<ImageResource>();
-		//List<GuiThemeResource> mGuiThemes = new List<GuiThemeResource>();
-
-		const string mStringTableKey = "Strings";
-		bool mOwnFileProvider;
-		IReadFileProvider mFileProvider;
-
-		SurfaceResourceList mSurfaceAccessor;
-		//GuiThemeResourceList mGuiThemeAccessor;
-
-		public class SurfaceResourceList
-		{
-			AgateResourceCollection mResources;
-
-			internal SurfaceResourceList(AgateResourceCollection resources)
-			{
-				mResources = resources;
-			}
-
-			public SurfaceResource this[string key]
-			{
-				get
-				{
-					foreach (var img in mResources.mImages)
-					{
-						var retval = img.Surfaces.FirstOrDefault(x => x.Name == key);
-
-						if (retval != null)
-							return retval;
-					}
-
-					throw new AgateResourceException("Could not find the surface resource {0}.", key);
-				}
-			}
-
-			public int Count
-			{
-				get { return mResources.mImages.Count; }
-			}
-		}
-		//		public class GuiThemeResourceList
-		//		{
-		//			AgateResourceCollection mResources;
-		//
-		//			internal GuiThemeResourceList(AgateResourceCollection resources)
-		//			{
-		//				mResources = resources;
-		//			}
-		//
-		//			public GuiThemeResource this[string key]
-		//			{
-		//				get
-		//				{
-		//					var retval = mResources.mGuiThemes.FirstOrDefault(x => x.Name == key);
-		//
-		//					if (retval == null)
-		//						throw new AgateResourceException("Could not find the gui theme resource {0}.", key);
-		//
-		//					return retval;
-		//				}
-		//			}
-		//			public GuiThemeResource this[int index]
-		//			{
-		//				get { return mResources.mGuiThemes[index]; }
-		//			}
-		//			public int Count
-		//			{
-		//				get { return mResources.mGuiThemes.Count; }
-		//			}
-		//		}
-
-		/// <summary>
-		/// Constructs a new AgateResourceCollection object.
-		/// </summary>
-		public AgateResourceCollection()
-		{
-			mSurfaceAccessor = new SurfaceResourceList(this);
-			//mGuiThemeAccessor = new GuiThemeResourceList(this);
-
-			this.mStore.Add(mStringTableKey, new StringTable());
-		}
-		/// <summary>
-		/// Constructs a new AgateResourceCollection object.
-		/// </summary>
-		/// <param name="filename"></param>
-		public AgateResourceCollection(string filename)
-		{
-			mSurfaceAccessor = new SurfaceResourceList(this);
-			//mGuiThemeAccessor = new GuiThemeResourceList(this);
-
-			RootDirectory = FileSystem.Path.GetDirectoryName(filename);
-
-			Load(filename);
-		}
-
-		private void Load(string filename)
-		{
-			using (Stream s = FileProvider.OpenRead(filename))
-			{
-				AgateResourceLoader.LoadResources(this, s);
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the file provider used to laod resources.
-		/// </summary>
-		public IReadFileProvider FileProvider
-		{
-			get
-			{
-				if (mFileProvider == null)
-					return AgateLib.IO.FileProvider.ResourceAssets;
-
-				return mFileProvider;
-			}
-			set { mFileProvider = value; }
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		public string RootDirectory { get; set; }
-
-		private IEnumerable<T> Enumerate<T>() where T : AgateResource
-		{
-			foreach (KeyValuePair<string, AgateResource> kvp in mStore)
-			{
-				if (kvp.Value is T)
-					yield return kvp.Value as T;
-			}
-		}
-		/// <summary>
-		/// Enumerates through the SpriteResources contained in this group of resources.
-		/// </summary>
-		public IEnumerable<SpriteResource> Sprites
-		{
-			get
-			{
-				return Enumerate<SpriteResource>();
-			}
-		}
-		/// <summary>
-		/// Enumerates through the SurfaceResources contained in this group of resources.
-		/// </summary>
-		public SurfaceResourceList Surfaces
-		{
-			get
-			{
-				return mSurfaceAccessor;
-			}
-		}
-		/// <summary>
-		/// Gets the list of GuiThemeResource objects.
-		/// </summary>
-		//		public GuiThemeResourceList GuiThemes
-		//		{
-		//			get { return mGuiThemeAccessor; }
-		//		}
-		/// <summary>
-		/// Enumerates through the DisplayWindowResources contained in this group of resources.
-		/// </summary>
-		public IEnumerable<DisplayWindowResource> DisplayWindows
-		{
-			get { return Enumerate<DisplayWindowResource>(); }
-		}
-		/// <summary>
-		/// Enumerates through the BitmapFontResources contained in this group of resources.
-		/// </summary>
-		public IEnumerable<BitmapFontResource> BitmapFonts
-		{
-			get { return Enumerate<BitmapFontResource>(); }
-		}
-		/// <summary>
-		/// Gets the StringTable for this langauge.
-		/// </summary>
-		public StringTable Strings
-		{
-			get
-			{
-				if (this.mStore.ContainsKey(mStringTableKey))
-					return (StringTable)this.mStore[mStringTableKey];
-				else
-					return null;
-			}
-		}
-
-		/// <summary>
-		/// Adds a resource to this group.  An exception is thrown if an item with the same name 
-		/// already exists in the group.
-		/// </summary>
-		/// <param name="item"></param>
-		public void Add(AgateResource item)
-		{
-			if (item is StringTable)
-				this.AddStringsTable((StringTable)item);
-			else if (item is ImageResource)
-			{
-				ImageResource img = (ImageResource)item;
-				img.FileProvider = FileProvider;
-
-				mImages.Add(img);
-			}
-			//			else if (item is GuiThemeResource)
-			//			{
-			//				mGuiThemes.Add((GuiThemeResource)item);
-			//			}
-			else
-				mStore.Add(item.Name, item);
-		}
-
-
-		/// <summary>
-		/// Adds a strings
-		/// </summary>
-		/// <param name="table"></param>
-		private void AddStringsTable(StringTable table)
-		{
-			if (Strings == null)
-				this.mStore[mStringTableKey] = table;
-			else if (Strings.Count != 0)
-				throw new ArgumentException("The string table for this ResourceGroup is non-empty.  Should you add your strings to the existing string table?");
-			else
-				this.mStore[mStringTableKey] = table;
-		}
-		/// <summary>
-		/// 
-		/// </summary>
-		public void Clear()
-		{
-			mStore.Clear();
-		}
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="resourceName"></param>
-		/// <returns></returns>
-		public bool Contains(string resourceName)
-		{
-			return mStore.ContainsKey(resourceName);
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		public int Count
-		{
-			get { return mStore.Count; }
-		}
-
-		#region --- IDictionary<string,AgateResource> Members ---
-
-		void IDictionary<string, AgateResource>.Add(string key, AgateResource value)
-		{
-			value.Name = key;
-			this.Add(value);
-		}
-
-		/// <summary>
-		/// Returns a collection of all the resource names.
-		/// </summary>
-		public ICollection<string> Keys
-		{
-			get { return mStore.Keys; }
-		}
-
-
-		bool IDictionary<string, AgateResource>.ContainsKey(string key)
-		{
-			return mStore.ContainsKey(key);
-		}
-		/// <summary>
-		/// Removes a resource.
-		/// </summary>
-		/// <param name="resourceName"></param>
-		/// <returns></returns>
-		public bool Remove(string resourceName)
-		{
-			return mStore.Remove(resourceName);
-		}
-		/// <summary>
-		/// Tries to find the resource in the collection.  False is returned if 
-		/// the resource does not exist.
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="value"></param>
-		/// <returns></returns>
-		public bool TryGetValue(string key, out AgateResource value)
-		{
-			return mStore.TryGetValue(key, out value);
-		}
-		/// <summary>
-		/// Gets a collection of all the AgateResource objects in the collection.
-		/// </summary>
-		public ICollection<AgateResource> Values
-		{
-			get { return mStore.Values; }
-		}
-		/// <summary>
-		/// Gets or sets the resource with the specified key.
-		/// </summary>
-		/// <param name="key"></param>
-		/// <returns></returns>
-		public AgateResource this[string key]
-		{
-			get
-			{
-				if (mStore.ContainsKey(key))
-					return mStore[key];
-				else
-					throw new KeyNotFoundException("The given resource was not found within the resource collection.");
-			}
-			set
-			{
-				mStore[key] = value;
-			}
-		}
-
-		#endregion
-		#region --- ICollection<KeyValuePair<string,AgateResource>> Members ---
-
-		void ICollection<KeyValuePair<string, AgateResource>>.Add(KeyValuePair<string, AgateResource> item)
-		{
-			mStore.Add(item.Key, item.Value);
-		}
-		bool ICollection<KeyValuePair<string, AgateResource>>.Contains(KeyValuePair<string, AgateResource> item)
-		{
-			return (mStore as ICollection<KeyValuePair<string, AgateResource>>).Contains(item);
-		}
-		void ICollection<KeyValuePair<string, AgateResource>>.CopyTo(KeyValuePair<string, AgateResource>[] array, int arrayIndex)
-		{
-			(mStore as ICollection<KeyValuePair<string, AgateResource>>).CopyTo(array, arrayIndex);
-		}
-		bool ICollection<KeyValuePair<string, AgateResource>>.Remove(KeyValuePair<string, AgateResource> item)
-		{
-			return mStore.Remove(item.Key);
-		}
-		bool ICollection<KeyValuePair<string, AgateResource>>.IsReadOnly
-		{
-			get { return false; }
-		}
-
-		#endregion
-		#region --- IEnumerable<KeyValuePair<string,AgateResource>> Members ---
-
-		IEnumerator<KeyValuePair<string, AgateResource>> IEnumerable<KeyValuePair<string, AgateResource>>.GetEnumerator()
-		{
-			return mStore.GetEnumerator();
-		}
-
-		#endregion
-
-		#region --- IEnumerable<AgateResource> Members ---
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <returns></returns>
-		public IEnumerator<AgateResource> GetEnumerator()
-		{
-			return mStore.Values.GetEnumerator();
-		}
-
-		#endregion
-		#region --- IEnumerable Members ---
-
-		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-
-		#endregion
-
-		#region --- ICollection<AgateResource> Members ---
-
-		/// <summary>
-		/// Gets whether the item is part of the collection.
-		/// </summary>
-		/// <param name="item"></param>
-		/// <returns></returns>
-		public bool Contains(AgateResource item)
-		{
-			return mStore.ContainsValue(item);
-		}
-
-		void ICollection<AgateResource>.CopyTo(AgateResource[] array, int arrayIndex)
-		{
-			foreach (AgateResource res in mStore.Values)
-			{
-				array[arrayIndex] = res;
-				arrayIndex++;
-			}
-		}
-		bool ICollection<AgateResource>.IsReadOnly
-		{
-			get { return false; }
-		}
-
-		/// <summary>
-		/// Removes a resource from the collection.
-		/// </summary>
-		/// <param name="item"></param>
-		/// <returns></returns>
-		public bool Remove(AgateResource item)
-		{
-			return mStore.Remove(item.Name);
-		}
-
-		#endregion
-
-		Dictionary<string, SurfaceImpl> mOwnedSurfaces = new Dictionary<string, SurfaceImpl>();
-
-		internal SurfaceImpl LoadSurfaceImpl(string filename)
-		{
-			if (mOwnedSurfaces.ContainsKey(filename) == false)
-			{
-				string path = string.IsNullOrEmpty(RootDirectory) ? filename :
-					RootDirectory + "/" + filename;
-				SurfaceImpl impl = Display.Impl.CreateSurface(FileProvider, path);
-
-				mOwnedSurfaces.Add(filename, impl);
-
-				return impl;
-			}
-			else
-			{
-				return mOwnedSurfaces[filename];
-			}
-		}
-
-		internal string FullFileName(string filename)
-		{
-			if (string.IsNullOrEmpty(RootDirectory))
-				return filename;
-
-			return RootDirectory + "/" + filename;
-		}
-	}
-}
\ No newline at end of file

Deleted: trunk/AgateLib/Resources/AgateResourceLoader.cs
===================================================================
--- trunk/AgateLib/Resources/AgateResourceLoader.cs	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/Resources/AgateResourceLoader.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -1,176 +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.Linq;
-using System.Text;
-using System.IO;
-using System.Xml;
-using AgateLib.Utility;
-using System.Diagnostics;
-using System.Xml.Linq;
-
-namespace AgateLib.Resources
-{
-	/// <summary>
-	/// Static class which loads and saves AgateResourceCollection objects to disk.
-	/// </summary>
-	public static class AgateResourceLoader
-	{
-		/// <summary>
-		/// Saves the resources to a file located in the Filename property.
-		/// </summary>
-		public static void SaveResources(AgateResourceCollection resources, string filename)
-		{
-			XDocument doc = new XDocument();
-			XElement root = new XElement("AgateResources",
-				new XAttribute("Version", "1.0.0"));
-
-			doc.Add(root);
-
-			foreach (AgateResource res in resources)
-			{
-				res.BuildNodes(root);
-			}
-
-			//doc.Save(filename);
-			throw new NotImplementedException();
-		}
-
-		/// <summary>
-		/// Static method which creates a resource manager based on the contents of a file.
-		/// </summary>
-		/// <param name="filename"></param>
-		/// <returns></returns>
-		[Obsolete("Use new AgateResourceCollection instead.")]
-		public static AgateResourceCollection LoadResources(string filename)
-		{
-			return new AgateResourceCollection(filename);
-		}
-
-		/// <summary>
-		/// Loads the resource information from a stream containing XML data.
-		/// This erases all information in the current AgateResourceCollection.
-		/// </summary>
-		/// <param name="resources"></param>
-		/// <param name="stream"></param>
-		public static void LoadResources(AgateResourceCollection resources, Stream stream)
-		{
-			XDocument doc = new XDocument();
-			try
-			{
-				doc = XDocument.Load(new StreamReader(stream));
-			}
-			catch (XmlException e)
-			{
-				throw new AgateResourceException("The XML resource file is malformed.", e);
-			}
-
-			XElement root = doc.Elements().First();
-
-			if (root.Attribute("Version") == null)
-				throw new AgateResourceException("XML resource file does not contain the required version attibute.");
-
-			string version = root.Attribute("Version").Value;
-
-			switch (version)
-			{
-				case "1.0.0":
-				case "0.4.0":
-				case "0.3.5":
-				case "0.3.2":
-				case "0.3.1":
-				case "0.3.0":
-					ReadVersion100(resources, root, version);
-					break;
-
-				default:
-					throw new AgateResourceException("XML Resource file version " + version + " not supported.");
-			}
-		}
-
-
-		private static void ReadVersion100(AgateResourceCollection resources, XElement root, string version)
-		{
-			foreach (var node in root.Elements())
-			{
-				try
-				{
-					resources.Add(ReadNode(node, version));
-				}
-				catch (Exception e)
-				{
-					throw new AgateResourceException("An error occurred while reading XML resource file: \r\n"
-						+ e.Message, e);
-				}
-			}
-		}
-
-		private static AgateResource ReadNode(XElement node, string version)
-		{
-			switch (node.Name.LocalName)
-			{
-				case "StringTable":
-					return new StringTable(node, version);
-
-				case "DisplayWindow":
-					return new DisplayWindowResource(node, version);
-
-				case "Image":
-					return new ImageResource(node, version);
-
-				case "Surface":
-					return new SurfaceResource(node, version);
-
-				case "Sprite":
-					return new SpriteResource(node, version);
-
-				case "BitmapFont":
-					return new BitmapFontResource(node, version);
-
-				default:
-					ReadError("Unrecognized node " + node.Name + ".");
-					return null;
-			}
-		}
-		private static void ReadError(string message)
-		{
-			if (ThrowOnReadError)
-			{
-				throw new InvalidOperationException(message);
-			}
-			else
-				Debug.WriteLine(message);
-		}
-
-		static bool mThrowOnReadError = true;
-
-		/// <summary>
-		/// Gets or sets a bool value indicating whether or not an exception
-		/// is thrown if an unknown resource type is encountered when reading
-		/// an XML file.
-		/// </summary>
-		public static bool ThrowOnReadError
-		{
-			get { return mThrowOnReadError; }
-			set { mThrowOnReadError = value; }
-		}
-
-	}
-}

Deleted: trunk/AgateLib/Resources/BitmapFontResource.cs
===================================================================
--- trunk/AgateLib/Resources/BitmapFontResource.cs	2014-08-11 05:55:19 UTC (rev 1461)
+++ trunk/AgateLib/Resources/BitmapFontResource.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -1,226 +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.Text;
-using System.Xml;
-using AgateLib.DisplayLib.BitmapFont;
-using AgateLib.Geometry;
-using System.Xml.Linq;
-
-namespace AgateLib.Resources
-{
-	/// <summary>
-	/// Resource representing a bitmap font.
-	/// </summary>
-	public class BitmapFontResource : AgateResource
-	{
-		string mImage;
-		FontMetrics mMetrics = new FontMetrics();
-
-		/// <summary>
-		/// Constructs a BitmapFontResource.
-		/// </summary>
-		/// <param name="name"></param>
-		public BitmapFontResource(string name)
-			: base(name)
-		{ }
-		internal BitmapFontResource(XElement node, string version)
-			: base(string.Empty)
-		{
-			switch (version)
-			{
-				case "0.3.2":
-					Name = node.Attribute("name").Value;
-					mImage = XmlHelper.ReadAttributeString(node, "image", string.Empty);
-
-					ReadMetrics032(node);
-
-					break;
-
-				case "0.3.1":
-				case "0.3.0":
-					Name = node.Attribute("name").Value;
-					mImage = XmlHelper.ReadAttributeString(node, "image", string.Empty);
-
-					ReadMetrics030(node);
-
-					break;
-
-				default:
-					throw new AgateResourceException("Loading the BitmapFontResource is not supported for " +
-						"version " + version + " yet. ");
-			}
-		}
-
-		private void ReadMetrics032(XElement parent)
-		{
-			XElement root = null;
-
-			// find metrics node
-			foreach (XElement n in parent.Elements())
-			{
-				if (n.Name == "Metrics")
-				{
-					root = n;
-					break;
-				}
-			}
-
-			if (root == null)
-				throw new AgateResourceException(string.Format(
-					"Could not find Metrics node in bitmap font resource {0}.", Name));
-
-			foreach (XElement node in root.Elements())
-			{
-				if (node.Name == "Glyph")
-				{
-					GlyphMetrics glyph = new GlyphMetrics();
-
-					char key = (char)int.Parse(node.Attribute("char").Value);
-					glyph.SourceRect = Rectangle.Parse(node.Attribute("source").Value);
-
-					glyph.LeftOverhang = XmlHelper.ReadAttributeInt(node, "leftOverhang", 0);
-					glyph.RightOverhang = XmlHelper.ReadAttributeInt(node, "rightOverhang", 0);
-
-					mMetrics.Add(key, glyph);
-				}
-				else if (node.Name == "Kerning")
-				{
-					char left = (char)XmlHelper.ReadAttributeInt(node, "first");
-					char right = (char)XmlHelper.ReadAttributeInt(node, "second");
-					int value = XmlHelper.ReadAttributeInt(node, "value");
-
-					mMetrics[left].KerningPairs.Add(right, value);
-				}
-				else
-				{
-					throw new AgateResourceException(string.Format(
-						"Expected to find glyph node, but found {0} instead.", node.Name));
-				}
-			}
-		}
-
-		private void ReadMetrics030(XElement parent)
-		{
-			XElement root = null;
-
-			// find metrics node
-			foreach (XElement n in parent.Elements())
-			{
-				if (n.Name == "Metrics")
-				{
-					root = n;
-					break;
-				}
-			}
-
-			if (root == null)
-				throw new AgateResourceException(string.Format(
-					"Could not find Metrics node in bitmap font resource {0}.", Name));
-
-			foreach (XElement node in root.Elements("Glyph"))
-			{
-				GlyphMetrics glyph = new GlyphMetrics();
-
-				char key = (char)int.Parse(node.Attribute("char").Value);
-				glyph.SourceRect = Rectangle.Parse(node.Attribute("source").Value);
-
-				glyph.LeftOverhang = XmlHelper.ReadAttributeInt(node, "leftOverhang", 0);
-				glyph.RightOverhang = XmlHelper.ReadAttributeInt(node, "rightOverhang", 0);
-
-				mMetrics.Add(key, glyph);
-			}
-		}
-
-		internal override void BuildNodes(XElement parent)
-		{
-			XElement root = new XElement("BitmapFont");
-
-			root.Add(new XAttribute("name", Name));
-			root.Add(new XAttribute("image", mImage));
-
-			XElement metrics = new XElement("Metrics");
-
-			foreach (char glyph in mMetrics.Keys)
-			{
-				XElement current = new XElement("Glyph");
-				GlyphMetrics glyphMetrics = mMetrics[glyph];
-
-				current.Add(new XAttribute("char", glyph));
-				current.Add(new XAttribute("source", glyphMetrics.SourceRect.ToString()));
-
-				if (glyphMetrics.LeftOverhang != 0)
-					current.Add(new XAttribute("leftOverhang", glyphMetrics.LeftOverhang));
-				if (glyphMetrics.RightOverhang != 0)
-					current.Add(new XAttribute("rightOverhang", glyphMetrics.RightOverhang));
-
-				metrics.Add(current);
-			}
-			foreach (char glyph in mMetrics.Keys)
-			{
-				foreach (var kern in mMetrics[glyph].KerningPairs)
-				{
-					XElement current = new XElement("Kerning");
-
-					current.Add(new XAttribute("first", glyph));
-					current.Add(new XAttribute("second", kern.Key));
-					current.Add(new XAttribute("value", kern.Value));
-
-					metrics.Add(current);
-				}
-			}
-
-			root.Add(metrics);
-			parent.Add(root);
-		}
-
-		/// <summary>
-		/// Performs a deep copy.
-		/// </summary>
-		/// <returns></returns>
-		protected override AgateResource Clone()
-		{
-			BitmapFontResource retval = new BitmapFontResource(Name);
-
-			retval.mImage = mImage;
-			retval.mMetrics = mMetrics.Clone();
-
-			return retval;
-		}
-
-		/// <summary>
-		/// Image file name.
-		/// </summary>
-		public string Image
-		{
-			get { return mImage; }
-			set { mImage = value; }
-		}
-		/// <summary>
-		/// Font metrics data.
-		/// </summary>
-		public FontMetrics FontMetrics
-		{
-			get { return mMetrics; }
-			set { mMetrics = value; }
-		}
-
-	}
-}

Added: trunk/AgateLib/Resources/DC/AgateResource.cs
===================================================================
--- trunk/AgateLib/Resources/DC/AgateResource.cs	                        (rev 0)
+++ trunk/AgateLib/Resources/DC/AgateResource.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace AgateLib.Resources.DC
+{
+	public class AgateResource
+	{
+	}
+}

Added: trunk/AgateLib/Resources/DC/AgateResourceCollection.cs
===================================================================
--- trunk/AgateLib/Resources/DC/AgateResourceCollection.cs	                        (rev 0)
+++ trunk/AgateLib/Resources/DC/AgateResourceCollection.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -0,0 +1,104 @@
+using AgateLib.DisplayLib;
+using AgateLib.DisplayLib.BitmapFont;
+using AgateLib.IO;
+using AgateLib.Serialization.Xle;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace AgateLib.Resources.DC
+{
+	public class AgateResourceCollection
+	{
+		ResourceCollection mResources = new ResourceCollection();
+		Dictionary<string, Surface> mSurfaces = new Dictionary<string, Surface>();
+
+		public AgateResourceCollection()
+		{
+			FileProvider = AgateLib.IO.FileProvider.ResourceAssets;
+		}
+
+		public AgateResourceCollection(string filename, IReadFileProvider fileProvider = null)
+			: this()
+		{
+			if (fileProvider == null)
+				fileProvider = AgateLib.IO.FileProvider.ResourceAssets;
+
+			using (var stream = fileProvider.OpenRead(filename))
+			{
+				LoadFrom(stream);
+			}
+		}
+		public AgateResourceCollection(Stream stream)
+		{
+			LoadFrom(stream);
+		}
+
+		public IReadFileProvider FileProvider { get; set; }
+
+		public ResourceCollection Resources { get { return mResources; } }
+
+		public void LoadFrom(Stream stream)
+		{
+			var ser = CreateSerializer();
+
+			//mResources = (ResourceCollection)ser.Deserialize(stream);
+			mResources = (ResourceCollection)ser.ReadObject(stream);		
+		}
+
+		public void SaveTo(Stream stream)
+		{
+			var ser = CreateSerializer();
+
+			//ser.Serialize(stream, mResources);
+			ser.WriteObject(stream, mResources);
+
+		}
+
+		private static DataContractSerializer CreateSerializer()
+		{
+			DataContractSerializer ser = new DataContractSerializer(typeof(ResourceCollection), KnownTypes);
+			return ser;
+
+			//XleSerializer ser = new XleSerializer(typeof(ResourceCollection));
+			//return ser;
+		}
+
+		public Font CreateFont(string name)
+		{
+			FontResource fr = (FontResource)mResources[name];
+
+			Font retval = new Font(fr.FontName);
+
+			foreach(var fs in fr.FontSurfaces)
+			{
+				FontSurface surf = FontSurface.FromImpl(new BitmapFontImpl(
+					GetSurface(fs.ImageFilename), fs.FontMetrics, fs.FontSettings.FontName(fr.FontName)));
+
+				retval.AddFont(fs.FontSettings, surf);
+			}
+
+			return retval;
+		}
+
+		private Surface GetSurface(string filename)
+		{
+			if (mSurfaces.ContainsKey(filename) == false)
+				mSurfaces.Add(filename, new Surface(filename, FileProvider));
+
+			return mSurfaces[filename];
+		}
+
+		public static IEnumerable<Type> KnownTypes
+		{
+			get
+			{
+				yield return typeof(FontResource);
+				yield return typeof(SpriteResource);
+			}
+		}
+	}
+}

Added: trunk/AgateLib/Resources/DC/FontResource.cs
===================================================================
--- trunk/AgateLib/Resources/DC/FontResource.cs	                        (rev 0)
+++ trunk/AgateLib/Resources/DC/FontResource.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace AgateLib.Resources.DC
+{
+	public class FontResource : AgateResource
+	{
+		public FontResource()
+		{
+			FontSurfaces = new List<FontSurfaceResource>();
+		}
+		public FontResource(string name, params FontSurfaceResource[] contents )
+			:this()
+		{
+			FontName = name;
+
+			foreach (var c in contents)
+				FontSurfaces.Add(c);
+		}
+		
+		public string FontName { get; set; }
+		public IList<FontSurfaceResource> FontSurfaces { get; set; }
+	}
+}

Added: trunk/AgateLib/Resources/DC/FontSurfaceResource.cs
===================================================================
--- trunk/AgateLib/Resources/DC/FontSurfaceResource.cs	                        (rev 0)
+++ trunk/AgateLib/Resources/DC/FontSurfaceResource.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -0,0 +1,22 @@
+using AgateLib.DisplayLib;
+using AgateLib.DisplayLib.BitmapFont;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace AgateLib.Resources.DC
+{
+	public class FontSurfaceResource
+	{
+		public FontSurfaceResource()
+		{
+			FontMetrics = new FontMetrics();
+		}
+
+		public string ImageFilename { get; set; }
+		public FontMetrics FontMetrics { get; set; }
+		public FontSettings FontSettings { get; set; }
+	}
+}

Added: trunk/AgateLib/Resources/DC/ResourceCollection.cs
===================================================================
--- trunk/AgateLib/Resources/DC/ResourceCollection.cs	                        (rev 0)
+++ trunk/AgateLib/Resources/DC/ResourceCollection.cs	2014-08-15 19:27:26 UTC (rev 1462)
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace AgateLib.Resources.DC
+{
+	[DataContract(Namespace="")]
+	public class ResourceCollection : IDictionary<string, AgateReso...
 
[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 4)

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