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

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

Revision: 1237
          http://agate.svn.sourceforge.net/agate/?rev=1237&view=rev
Author:   kanato
Date:     2010-02-21 22:46:35 +0000 (Sun, 21 Feb 2010)

Log Message:
-----------
Initial refactoring of resources.

Modified Paths:
--------------
    trunk/AgateLib/AgateLib.csproj
    trunk/AgateLib/DisplayLib/Surface.cs
    trunk/AgateLib/Gui/IGuiThemeEngine.cs
    trunk/AgateLib/Gui/ThemeEngines/Venus/Venus.cs
    trunk/AgateLib/Resources/AgateResource.cs
    trunk/AgateLib/Resources/AgateResourceCollection.cs
    trunk/AgateLib/Resources/AgateResourceException.cs
    trunk/AgateLib/Resources/AgateResourceLoader.cs
    trunk/AgateLib/Resources/SurfaceResource.cs

Added Paths:
-----------
    trunk/AgateLib/Gui/ThemeEngines/Venus/CssRenderer.cs
    trunk/AgateLib/Resources/GuiThemeResource.cs
    trunk/AgateLib/Resources/ImageResource.cs

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

--- trunk/AgateLib/AgateLib.csproj	2010-02-21 07:36:58 UTC (rev 1236)
+++ trunk/AgateLib/AgateLib.csproj	2010-02-21 22:46:35 UTC (rev 1237)
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9490B719-829E-43A7-A5FE-8001F8A81759}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -167,6 +167,7 @@
     <Compile Include="Geometry\VertexTypes\PositionTextureColorNormal.cs" />
     <Compile Include="Gui\AgateGuiException.cs" />
     <Compile Include="Gui\Button.cs" />
+    <Compile Include="Gui\ThemeEngines\Venus\CssRenderer.cs" />
     <Compile Include="Gui\WidgetRenderer.cs" />
     <Compile Include="Gui\CheckBox.cs" />
     <Compile Include="Gui\ComboBox.cs" />
@@ -213,6 +214,8 @@
     <Compile Include="DisplayLib\ImplementationBase\FrameBufferImpl.cs" />
     <Compile Include="Platform.cs" />
     <Compile Include="PlatformType.cs" />
+    <Compile Include="Resources\GuiThemeResource.cs" />
+    <Compile Include="Resources\ImageResource.cs" />
     <Compile Include="Serialization\Xle\CompressionType.cs" />
     <Compile Include="Settings\SettingsGroup.cs" />
     <Compile Include="Timing.cs">

Modified: trunk/AgateLib/DisplayLib/Surface.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Surface.cs	2010-02-21 07:36:58 UTC (rev 1236)
+++ trunk/AgateLib/DisplayLib/Surface.cs	2010-02-21 22:46:35 UTC (rev 1237)
@@ -27,47 +27,6 @@
 namespace AgateLib.DisplayLib
 {
 	/// <summary>
-	/// Enum which is used to indicate what format an image file is in.
-	/// </summary>
-	public enum ImageFileFormat
-	{
-		/// <summary>
-		/// Portable Network Graphics (PNG) format.
-		/// </summary>
-		Png,
-		/// <summary>
-		/// Windows Bitmap (BMP) format.
-		/// </summary>
-		Bmp,
-		/// <summary>
-		/// Jpeg format.
-		/// </summary>
-		Jpg,
-		/// <summary>
-		/// Targa format.
-		/// </summary>
-		Tga,
-	}
-
-	/// <summary>
-	/// Enum for indicating the sampling mode used when stretching or shrinking surfaces.
-	/// </summary>
-	public enum InterpolationMode
-	{
-		/// <summary>
-		/// Use whatever the driver default is.
-		/// </summary>
-		Default,
-		/// <summary>
-		/// Use the fastest method, usually nearest neighbor pixel sampling.
-		/// </summary>
-		Fastest,
-		/// <summary>
-		/// Use the nicest method, usually bilinear sampling.
-		/// </summary>
-		Nicest,
-	}
-	/// <summary>
 	/// Class which represents a pixel surface.
 	/// There are several ways to create a Surface object.  The most common
 	/// is to pass the name of an image file.
@@ -112,11 +71,10 @@
 			if (Display.Impl == null)
 				throw new AgateException("AgateLib's display system has not been initialized.");
 
-			Resources.AgateResource res = resources[name];
-			Resources.SurfaceResource surf = res as Resources.SurfaceResource;
+			Resources.SurfaceResource surf = resources.Surfaces[name];
+					    
+			impl = surf.CreateSurfaceImpl();
 
-			impl = resources.LoadSurfaceImpl(surf.Filename);
-
 			Display.DisposeDisplay += new Display.DisposeDisplayHandler(Dispose);
 			Display.PackAllSurfacesEvent += new EventHandler(Display_PackAllSurfacesEvent);
 		}
@@ -887,4 +845,46 @@
 			get { return impl; }
 		}
 	}
+
+	/// <summary>
+	/// Enum which is used to indicate what format an image file is in.
+	/// </summary>
+	public enum ImageFileFormat
+	{
+		/// <summary>
+		/// Portable Network Graphics (PNG) format.
+		/// </summary>
+		Png,
+		/// <summary>
+		/// Windows Bitmap (BMP) format.
+		/// </summary>
+		Bmp,
+		/// <summary>
+		/// Jpeg format.
+		/// </summary>
+		Jpg,
+		/// <summary>
+		/// Targa format.
+		/// </summary>
+		Tga,
+	}
+
+	/// <summary>
+	/// Enum for indicating the sampling mode used when stretching or shrinking surfaces.
+	/// </summary>
+	public enum InterpolationMode
+	{
+		/// <summary>
+		/// Use whatever the driver default is.
+		/// </summary>
+		Default,
+		/// <summary>
+		/// Use the fastest method, usually nearest neighbor pixel sampling.
+		/// </summary>
+		Fastest,
+		/// <summary>
+		/// Use the nicest method, usually bilinear sampling.
+		/// </summary>
+		Nicest,
+	}
 }

Modified: trunk/AgateLib/Gui/IGuiThemeEngine.cs
===================================================================
--- trunk/AgateLib/Gui/IGuiThemeEngine.cs	2010-02-21 07:36:58 UTC (rev 1236)
+++ trunk/AgateLib/Gui/IGuiThemeEngine.cs	2010-02-21 22:46:35 UTC (rev 1237)
@@ -30,12 +30,6 @@
 	public interface IGuiThemeEngine
 	{
 		/// <summary>
-		/// Draws the specified widget to the screen.
-		/// </summary>
-		/// <param name="widget"></param>
-		void DrawWidget(Widget widget);
-
-		/// <summary>
 		/// Calculates and returns the minimum size for the widget.
 		/// </summary>
 		/// <param name="widget"></param>

Added: trunk/AgateLib/Gui/ThemeEngines/Venus/CssRenderer.cs
===================================================================
--- trunk/AgateLib/Gui/ThemeEngines/Venus/CssRenderer.cs	                        (rev 0)
+++ trunk/AgateLib/Gui/ThemeEngines/Venus/CssRenderer.cs	2010-02-21 22:46:35 UTC (rev 1237)
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AgateLib.Gui.ThemeEngines.Venus
+{
+	public class CssRenderer : WidgetRenderer 
+	{
+		Venus mEngine;
+		Widget mWidget;
+		string mClass;
+
+		public CssRenderer(Venus engine, Widget w)
+		{
+			mEngine = engine;
+			mWidget = w;
+		}
+		public override void DrawWidget(Widget w)
+		{
+			if (mClass != ClassName)
+			{
+				LoadCssInfo();
+			}
+		}
+
+		private void LoadCssInfo()
+		{
+		}
+
+		string ClassName { get; set; }
+
+	}
+}

Modified: trunk/AgateLib/Gui/ThemeEngines/Venus/Venus.cs
===================================================================
--- trunk/AgateLib/Gui/ThemeEngines/Venus/Venus.cs	2010-02-21 07:36:58 UTC (rev 1236)
+++ trunk/AgateLib/Gui/ThemeEngines/Venus/Venus.cs	2010-02-21 22:46:35 UTC (rev 1237)
@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.IO;
 using System.Text;
 using AgateLib.Geometry;
 
@@ -8,6 +9,21 @@
 {
 	public class Venus : IGuiThemeEngine 
 	{
+		public Venus()
+		{
+
+		}
+
+		public void LoadCss(string text)
+		{
+			CssData d = new CssData();
+			d.Parse(text);
+
+			Css = d;
+		}
+		
+		public CssData Css { get; set; }
+
 		#region IGuiThemeEngine Members
 
 		public void DrawWidget(Widget widget)
@@ -77,7 +93,7 @@
 
 		public WidgetRenderer CreateRenderer(Widget widget)
 		{
-			throw new NotImplementedException();
+			return new CssRenderer(this, widget);
 		}
 
 		#endregion

Modified: trunk/AgateLib/Resources/AgateResource.cs
===================================================================
--- trunk/AgateLib/Resources/AgateResource.cs	2010-02-21 07:36:58 UTC (rev 1236)
+++ trunk/AgateLib/Resources/AgateResource.cs	2010-02-21 22:46:35 UTC (rev 1237)
@@ -35,6 +35,11 @@
 		/// <summary>
 		/// Constructs a base resource object.
 		/// </summary>
+		public AgateResource()
+		{ }
+		/// <summary>
+		/// Constructs a base resource object.
+		/// </summary>
 		/// <param name="name"></param>
 		public AgateResource(string name)
 		{

Modified: trunk/AgateLib/Resources/AgateResourceCollection.cs
===================================================================
--- trunk/AgateLib/Resources/AgateResourceCollection.cs	2010-02-21 07:36:58 UTC (rev 1236)
+++ trunk/AgateLib/Resources/AgateResourceCollection.cs	2010-02-21 22:46:35 UTC (rev 1237)
@@ -35,13 +35,47 @@
 	public class AgateResourceCollection : IDictionary<string, AgateResource>, ICollection<AgateResource>
 	{
 		Dictionary<string, AgateResource> mStore = new Dictionary<string, AgateResource>();
+
+		List<ImageResource> mImages = new List<ImageResource>();
+
 		const string mStringTableKey = "Strings";
+		bool mOwnFileProvider;
+		IFileProvider mFileProvider;
 
+		SurfaceResourceList mSurfaceAccessor;
+		
+		public class SurfaceResourceList
+		{
+			AgateResourceCollection mResources;
+
+			internal SurfaceResourceList(AgateResourceCollection resources)
+			{
+				mResources = resources;
+			}
+
+			public SurfaceResource this[string key]
+			{
+				get
+				{
+					foreach (var img in mResources.mImages)
+					{
+						foreach (var surface in img.Surfaces)
+						{
+							if (surface.Name == key)
+								return surface;
+						}
+					}
+
+					throw new AgateResourceException("Could not find the surface resource {0}.", key);
+				}
+			}
+		}
 		/// <summary>
 		/// Constructs a new AgateResourceCollection object.
 		/// </summary>
 		public AgateResourceCollection()
 		{
+			mSurfaceAccessor = new SurfaceResourceList(this);
 			this.mStore.Add(mStringTableKey, new StringTable());
 		}
 		/// <summary>
@@ -65,13 +99,32 @@
 		/// <param name="filename"></param>
 		public AgateResourceCollection(IFileProvider fileProvider, string filename)
 		{
+			mSurfaceAccessor = new SurfaceResourceList(this);
+
 			FileProvider = fileProvider;
 			RootDirectory = Path.GetDirectoryName(filename);
 
 			Load(filename);
 		}
 
+		/// <summary>
+		/// Constructs an AgateResourceCollection by looking for the resources.xml
+		/// file in the specified archive.  All resources are expected to be in the provided
+		/// archive.
+		/// </summary>
+		/// <param name="path">Full or relative path to the archive.</param>
+		/// <returns></returns>
+		public static AgateResourceCollection FromZipArchive(string path)
+		{
+			ZipFileProvider zip = new ZipFileProvider(path);
 
+			var retval= new AgateResourceCollection(zip, "resources.xml");
+
+			retval.mOwnFileProvider = true;
+
+			return retval;
+		}
+
 		private void Load(string filename)
 		{
 			using (Stream s = FileProvider.OpenRead(filename))
@@ -81,9 +134,14 @@
 		}
 
 		/// <summary>
-		/// 
+		/// Gets or sets the file provider used to laod resources.
 		/// </summary>
-		public IFileProvider FileProvider { get; set; }
+		public IFileProvider FileProvider
+		{
+			get { return mFileProvider; }
+			set { mFileProvider = value; }
+		}
+
 		/// <summary>
 		/// 
 		/// </summary>
@@ -110,11 +168,11 @@
 		/// <summary>
 		/// Enumerates through the SurfaceResources contained in this group of resources.
 		/// </summary>
-		public IEnumerable<SurfaceResource> Surfaces
+		public SurfaceResourceList Surfaces
 		{
 			get
 			{
-				return Enumerate<SurfaceResource>();
+				return mSurfaceAccessor;
 			}
 		}
 		/// <summary>
@@ -154,10 +212,18 @@
 		{
 			if (item is StringTable)
 				this.AddStringsTable((StringTable)item);
+			else if (item is ImageResource)
+			{
+				ImageResource img = (ImageResource)item;
+				img.FileProvider = FileProvider;
+
+				mImages.Add(img);
+			}
 			else
 				mStore.Add(item.Name, item);
 		}
 
+
 		/// <summary>
 		/// Adds a strings
 		/// </summary>
@@ -376,4 +442,5 @@
 			}
 		}
 	}
+
 }
\ No newline at end of file

Modified: trunk/AgateLib/Resources/AgateResourceException.cs
===================================================================
--- trunk/AgateLib/Resources/AgateResourceException.cs	2010-02-21 07:36:58 UTC (rev 1236)
+++ trunk/AgateLib/Resources/AgateResourceException.cs	2010-02-21 22:46:35 UTC (rev 1237)
@@ -49,11 +49,25 @@
 		/// 
 		/// </summary>
 		/// <param name="message"></param>
+		public AgateResourceException(string format, params object[] args)
+			: base(string.Format(format, args)) 
+		{ }
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="message"></param>
 		/// <param name="inner"></param>
 		public AgateResourceException(string message, Exception inner) : base(inner, message) { }
 		/// <summary>
 		/// 
 		/// </summary>
+		/// <param name="message"></param>
+		public AgateResourceException(Exception inner, string format, params object[] args)
+			: base(inner, string.Format(format, args))
+		{ }
+		/// <summary>
+		/// 
+		/// </summary>
 		/// <param name="info"></param>
 		/// <param name="context"></param>
 		protected AgateResourceException(

Modified: trunk/AgateLib/Resources/AgateResourceLoader.cs
===================================================================
--- trunk/AgateLib/Resources/AgateResourceLoader.cs	2010-02-21 07:36:58 UTC (rev 1236)
+++ trunk/AgateLib/Resources/AgateResourceLoader.cs	2010-02-21 22:46:35 UTC (rev 1237)
@@ -141,7 +141,13 @@
 				case "DisplayWindow":
 					return new DisplayWindowResource(node, version);
 
-				case "Surface":
+				case "Image":
+					return new ImageResource(node, version);
+
+				case "GuiTheme":
+					return new GuiThemeResource(node, version);
+
+	 			case "Surface":
 					return new SurfaceResource(node, version);
 
 				case "Sprite":

Added: trunk/AgateLib/Resources/GuiThemeResource.cs
===================================================================
--- trunk/AgateLib/Resources/GuiThemeResource.cs	                        (rev 0)
+++ trunk/AgateLib/Resources/GuiThemeResource.cs	2010-02-21 22:46:35 UTC (rev 1237)
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml;
+
+namespace AgateLib.Resources
+{
+	public class GuiThemeResource : AgateResource 
+	{
+		public string CssFile { get; set; }
+
+		public GuiThemeResource()
+		{ }
+		public GuiThemeResource(string name)
+			: base(name)
+		{ }
+
+		internal GuiThemeResource(XmlNode node, string version)
+		{
+			Name = XmlHelper.ReadAttributeString(node, "name");
+			CssFile = XmlHelper.ReadAttributeString(node, "css");
+		}
+
+		internal override void BuildNodes(XmlElement parent, System.Xml.XmlDocument doc)
+		{
+			throw new NotImplementedException();
+		}
+
+		protected override AgateResource Clone()
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

Added: trunk/AgateLib/Resources/ImageResource.cs
===================================================================
--- trunk/AgateLib/Resources/ImageResource.cs	                        (rev 0)
+++ trunk/AgateLib/Resources/ImageResource.cs	2010-02-21 22:46:35 UTC (rev 1237)
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using AgateLib.DisplayLib;
+
+namespace AgateLib.Resources
+{
+	public class ImageResource : AgateResource 
+	{
+		Surface mBackingSurface;
+		List<SurfaceResource> mSurfaces = new List<SurfaceResource>();
+
+		public ImageResource()
+		{ }
+
+		internal ImageResource(XmlNode node, string version)
+		{
+			if (node.Attributes["filename"] == null)
+				throw new AgateResourceException("Image node did not include the required filename attribute.");
+
+			switch (version)
+			{
+				case "0.4.0":
+					Filename = node.Attributes["filename"].Value;
+					ReadSubNodes040(node);
+					break;
+
+				default:
+					throw new AgateResourceException("Image resource not supported in file version.");
+			}
+		}
+
+		private void ReadSubNodes040(XmlNode node)
+		{
+			foreach (XmlNode n in node.ChildNodes)
+			{
+				switch (n.Name)
+				{
+					case "Surface":
+						ReadSurface(n);
+						break;
+
+					case "Sprite":
+						ReadSprite(n);
+						break;
+
+					default:
+						throw new AgateResourceException(
+							"Could not understand node {0} which is a subnode of Image {1}", n.Name, Filename);
+				}
+			}
+		}
+
+		private void ReadSprite(XmlNode n)
+		{
+			throw new NotImplementedException();
+		}
+
+		private void ReadSurface(XmlNode n)
+		{
+			SurfaceResource res = new SurfaceResource(XmlHelper.ReadAttributeString(n, "name"));
+
+			if (n.Attributes["left"] != null ||
+				n.Attributes["top"] != null ||
+				n.Attributes["width"] != null ||
+				n.Attributes["height"] != null)
+			{
+				res.SourceRect = new AgateLib.Geometry.Rectangle(
+					XmlHelper.ReadAttributeInt(n, "left"),
+					XmlHelper.ReadAttributeInt(n, "top"),
+					XmlHelper.ReadAttributeInt(n, "width"),
+					XmlHelper.ReadAttributeInt(n, "height"));
+			}
+
+			res.Image = this;
+			mSurfaces.Add(res);
+		}
+
+		public string Filename { get; set; }
+		public IFileProvider FileProvider { get; set; }
+
+		public List<SurfaceResource> Surfaces { get { return mSurfaces; } }
+
+		public Surface GetOrLoadSurface()
+		{
+			if (mBackingSurface == null)
+			{
+				mBackingSurface = new Surface(FileProvider, Filename);
+			}
+
+			return mBackingSurface;
+		}
+		internal override void BuildNodes(XmlElement parent, XmlDocument doc)
+		{
+			throw new NotImplementedException();
+		}
+
+		protected override AgateResource Clone()
+		{
+			throw new NotImplementedException();
+		}
+
+	}
+}

Modified: trunk/AgateLib/Resources/SurfaceResource.cs
===================================================================
--- trunk/AgateLib/Resources/SurfaceResource.cs	2010-02-21 07:36:58 UTC (rev 1236)
+++ trunk/AgateLib/Resources/SurfaceResource.cs	2010-02-21 22:46:35 UTC (rev 1237)
@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Xml;
+using AgateLib.DisplayLib;
 using AgateLib.Geometry;
 
 namespace AgateLib.Resources
@@ -31,14 +32,25 @@
 	/// </summary>
 	public sealed class SurfaceResource : AgateResource
 	{
-		string mFilename;
+		ImageResource mImage;
+		Rectangle mSrcRect;
 
 		/// <summary>
 		/// Gets or sets the filename for the surface to be created from.
 		/// </summary>
-		public string Filename { get { return mFilename; } set { mFilename = value; } }
+		[Obsolete]
+		public string Filename { get; set; }
 
 		/// <summary>
+		/// Gets or sets the source rectangle in the image file.
+		/// </summary>
+		public Rectangle SourceRect
+		{
+			get { return mSrcRect; }
+			set { mSrcRect = value; }
+		}
+
+		/// <summary>
 		/// Constructs a SurfaceResource object.
 		/// </summary>
 		/// <param name="name"></param>
@@ -61,8 +73,10 @@
 				case "0.3.1":
 				case "0.3.0":
 					Name = node.Attributes["name"].Value;
-					Filename = node.Attributes["filename"].Value;
 
+					mImage = new ImageResource();
+					mImage.Filename = node.Attributes["filename"].Value;
+
 					break;
 
 				default:
@@ -89,5 +103,18 @@
 		{
 			return new SurfaceResource(Name, Filename);
 		}
+
+		internal AgateLib.DisplayLib.ImplementationBase.SurfaceImpl CreateSurfaceImpl()
+		{
+			Surface s = mImage.GetOrLoadSurface();
+			
+			return s.Impl.CarveSubSurface(mSrcRect);
+		}
+
+		internal ImageResource Image
+		{
+			get { return mImage; }
+			set { mImage = value; }
+		}
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




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 13)

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