agate-svn-commit Mailing List for AgateLib (Page 11)
Status: Alpha
Brought to you by:
kanato
Menu
▾
▴
agate-svn-commit — List with automated subversion commit messages.
You can subscribe to this list here.
| 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
|
|
From: <ka...@us...> - 2011-10-04 06:18:35
|
Revision: 1287
http://agate.svn.sourceforge.net/agate/?rev=1287&view=rev
Author: kanato
Date: 2011-10-04 06:18:28 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
Fixed RectangleF.Contains to take floats.
Modified Paths:
--------------
trunk/AgateLib/Geometry/RectangleF.cs
Modified: trunk/AgateLib/Geometry/RectangleF.cs
===================================================================
--- trunk/AgateLib/Geometry/RectangleF.cs 2011-10-03 16:47:12 UTC (rev 1286)
+++ trunk/AgateLib/Geometry/RectangleF.cs 2011-10-04 06:18:28 UTC (rev 1287)
@@ -175,7 +175,7 @@
/// <param name="x"></param>
/// <param name="y"></param>
/// <returns></returns>
- public bool Contains(int x, int y)
+ public bool Contains(float x, float y)
{
return Contains(new PointF(x, y));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-10-03 16:47:18
|
Revision: 1286
http://agate.svn.sourceforge.net/agate/?rev=1286&view=rev
Author: kanato
Date: 2011-10-03 16:47:12 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
Add conversions from YUV and HSV for colors.
Fix some comments.
Added function to convert PixelBuffer to System.Drawing.Bitmap.
Removed some obsolete code.
Modified Paths:
--------------
trunk/AgateLib/DisplayLib/Display.cs
trunk/AgateLib/Geometry/Color.cs
trunk/AgateLib/Geometry/Rectangle.cs
trunk/AgateLib/Geometry/Size.cs
trunk/Drivers/AgateLib.WinForms/FormUtil.cs
trunk/Drivers/AgateLib.WinForms/FormsInterop.cs
trunk/Drivers/AgateSDL/Reporter.cs
trunk/Tests/Tests.csproj
Added Paths:
-----------
trunk/Tests/DisplayTests/ColorTest.cs
Modified: trunk/AgateLib/DisplayLib/Display.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Display.cs 2011-06-18 01:08:48 UTC (rev 1285)
+++ trunk/AgateLib/DisplayLib/Display.cs 2011-10-03 16:47:12 UTC (rev 1286)
@@ -108,11 +108,6 @@
get { return mRenderState; }
}
- [Obsolete]
- private static ShaderCompilerImpl CreateShaderCompiler()
- {
- return impl.CreateShaderCompiler();
- }
/// <summary>
/// Disposes of the Display.
/// </summary>
Modified: trunk/AgateLib/Geometry/Color.cs
===================================================================
--- trunk/AgateLib/Geometry/Color.cs 2011-06-18 01:08:48 UTC (rev 1285)
+++ trunk/AgateLib/Geometry/Color.cs 2011-10-03 16:47:12 UTC (rev 1286)
@@ -884,5 +884,62 @@
* */
}
+ // See algorithm at http://en.wikipedia.org/wiki/YUV#Conversion_to.2Ffrom_RGB
+ const double W_R = 0.299;
+ const double W_B = 0.114;
+ const double W_G = 0.587;
+ const double Umax = 0.436;
+ const double Vmax = 0.615;
+
+ public void ToYuv(out double y, out double u, out double v)
+ {
+ y = (W_R * r + W_G * g + W_B * b) / 255.0;
+ u = Umax * (b/255.0 - y) / (1 - W_B);
+ v = Vmax * (r / 255.0 - y) / (1 - W_R);
+ }
+
+ public static Color FromYuv(double y, double u, double v)
+ {
+ return Color.FromArgb(
+ (int)(255 * (y + v * (1 - W_R) / Vmax)),
+ (int)(255 * (y - u * W_B * (1 - W_B) / (Umax * W_G) - v * W_R * (1 - W_R) / (Vmax * W_G))),
+ (int)(255 * (y + u * (1 - W_B) / Umax)));
+ }
+
+ /// <summary>
+ /// Returns a Color object calculated from hue, saturation and value.
+ /// See algorithm at http://en.wikipedia.org/wiki/HSL_and_HSV#From_HSV
+ /// </summary>
+ /// <param name="h">The hue angle in degrees.</param>
+ /// <param name="s">A value from 0 to 1 representing saturation.</param>
+ /// <param name="v">A value from 0 to 1 representing the value.</param>
+ /// <returns></returns>
+ public static Color FromHsv(double h, double s, double v)
+ {
+ while (h < 0)
+ h += 360;
+ if (h > 360)
+ h = h % 360;
+
+ double hp = h / 60;
+ double chroma = v * s;
+ double X = chroma * (1 - Math.Abs(hp % 2 - 1));
+
+ double r1 = 0, b1 = 0, g1 = 0;
+
+ switch ((int)hp)
+ {
+ case 0: r1 = chroma; g1 = X; break;
+ case 1: r1 = X; g1 = chroma; break;
+ case 2: g1 = chroma; b1 = X; break;
+ case 3: g1 = X; b1 = chroma; break;
+ case 4: r1 = X; b1 = chroma; break;
+ case 5: r1 = chroma; b1 = X; break;
+ }
+
+ double m = v - chroma;
+
+ return Color.FromArgb((int)(255 * (r1 + m)), (int)(255 * (g1 + m)), (int)(255 * b1 + m));
+ }
}
}
\ No newline at end of file
Modified: trunk/AgateLib/Geometry/Rectangle.cs
===================================================================
--- trunk/AgateLib/Geometry/Rectangle.cs 2011-06-18 01:08:48 UTC (rev 1285)
+++ trunk/AgateLib/Geometry/Rectangle.cs 2011-10-03 16:47:12 UTC (rev 1286)
@@ -25,7 +25,7 @@
namespace AgateLib.Geometry
{
/// <summary>
- /// Replacement for System.Drawing.Rectangle structure.
+ /// Implements a Rectangle structure, containing position and size.
/// </summary>
[Serializable]
[TypeConverter(typeof(ExpandableObjectConverter))]
Modified: trunk/AgateLib/Geometry/Size.cs
===================================================================
--- trunk/AgateLib/Geometry/Size.cs 2011-06-18 01:08:48 UTC (rev 1285)
+++ trunk/AgateLib/Geometry/Size.cs 2011-10-03 16:47:12 UTC (rev 1286)
@@ -25,7 +25,7 @@
namespace AgateLib.Geometry
{
/// <summary>
- /// Replacement for System.Drawing.Size object.
+ /// A structure with two properties, a width and height.
/// </summary>
[Serializable]
[TypeConverter(typeof(ExpandableObjectConverter))]
Modified: trunk/Drivers/AgateLib.WinForms/FormUtil.cs
===================================================================
--- trunk/Drivers/AgateLib.WinForms/FormUtil.cs 2011-06-18 01:08:48 UTC (rev 1285)
+++ trunk/Drivers/AgateLib.WinForms/FormUtil.cs 2011-10-03 16:47:12 UTC (rev 1286)
@@ -179,24 +179,8 @@
/// <param name="format"></param>
public static void SavePixelBuffer(PixelBuffer buffer, string filename, ImageFileFormat format)
{
+ Bitmap bmp = Interop.BitmapFromPixelBuffer(buffer);
- Bitmap bmp = new Bitmap(buffer.Width, buffer.Height);
-
- System.Drawing.Imaging.BitmapData data = bmp.LockBits(
- new Rectangle(Point.Empty, Interop.Convert(buffer.Size)),
- System.Drawing.Imaging.ImageLockMode.WriteOnly,
- System.Drawing.Imaging.PixelFormat.Format32bppArgb);
-
- if (buffer.PixelFormat != PixelFormat.BGRA8888)
- {
- buffer = buffer.ConvertTo(PixelFormat.BGRA8888);
- }
-
- System.Runtime.InteropServices.Marshal.Copy(
- buffer.Data, 0, data.Scan0, buffer.Data.Length);
-
- bmp.UnlockBits(data);
-
switch (format)
{
case ImageFileFormat.Bmp:
Modified: trunk/Drivers/AgateLib.WinForms/FormsInterop.cs
===================================================================
--- trunk/Drivers/AgateLib.WinForms/FormsInterop.cs 2011-06-18 01:08:48 UTC (rev 1285)
+++ trunk/Drivers/AgateLib.WinForms/FormsInterop.cs 2011-10-03 16:47:12 UTC (rev 1286)
@@ -191,5 +191,31 @@
return new Draw.SizeF(sz.Width, sz.Height);
}
+ /// <summary>
+ /// Converts an AgateLib.DisplayLib.PixelBuffer object into a System.Drawing.Bitmap object.
+ /// </summary>
+ /// <param name="buffer">The PixelBuffer object containing the pixel data.</param>
+ /// <returns></returns>
+ public static System.Drawing.Bitmap BitmapFromPixelBuffer(PixelBuffer buffer)
+ {
+ System.Drawing.Bitmap bmp = new System.Drawing.Bitmap(buffer.Width, buffer.Height);
+
+ System.Drawing.Imaging.BitmapData data = bmp.LockBits(
+ new Draw.Rectangle(Draw.Point.Empty, Interop.Convert(buffer.Size)),
+ System.Drawing.Imaging.ImageLockMode.WriteOnly,
+ System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+
+ if (buffer.PixelFormat != PixelFormat.BGRA8888)
+ {
+ buffer = buffer.ConvertTo(PixelFormat.BGRA8888);
+ }
+
+ System.Runtime.InteropServices.Marshal.Copy(
+ buffer.Data, 0, data.Scan0, buffer.Data.Length);
+
+ bmp.UnlockBits(data);
+
+ return bmp;
+ }
}
}
Modified: trunk/Drivers/AgateSDL/Reporter.cs
===================================================================
--- trunk/Drivers/AgateSDL/Reporter.cs 2011-06-18 01:08:48 UTC (rev 1285)
+++ trunk/Drivers/AgateSDL/Reporter.cs 2011-10-03 16:47:12 UTC (rev 1286)
@@ -38,8 +38,12 @@
return true;
}
- catch (DllNotFoundException)
+ catch (DllNotFoundException e)
{
+ AgateLib.Core.ErrorReporting.Report(AgateLib.ErrorLevel.Warning,
+ "A DllNotFoundException was thrown when attempting to load SDL binaries." + Environment.NewLine +
+ "This indicates that SDL.dll or SDL_mixer.dll was not found.", e);
+
return false;
}
catch (BadImageFormatException e)
Added: trunk/Tests/DisplayTests/ColorTest.cs
===================================================================
--- trunk/Tests/DisplayTests/ColorTest.cs (rev 0)
+++ trunk/Tests/DisplayTests/ColorTest.cs 2011-10-03 16:47:12 UTC (rev 1286)
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AgateLib;
+using AgateLib.Geometry;
+using AgateLib.DisplayLib;
+
+namespace Tests.DisplayTests
+{
+ class ColorTest : IAgateTest
+ {
+ #region IAgateTest Members
+
+ public string Name
+ {
+ get { return "Color Test"; }
+ }
+
+ public string Category
+ {
+ get { return "Display"; }
+ }
+
+ public void Main(string[] args)
+ {
+ using (AgateSetup setup = new AgateSetup())
+ {
+ setup.AskUser = true;
+ setup.Initialize(true, false, false);
+ if (setup.WasCanceled)
+ return;
+
+ DisplayWindow wind = DisplayWindow.CreateWindowed(
+ "Color Test", 640, 480);
+
+ while (wind.IsClosed == false)
+ {
+ Display.BeginFrame();
+ Display.Clear();
+
+ for (int i = 0; i < 360; i++)
+ {
+ Display.FillRect(new Rectangle(i, 0, 1, 75), Color.FromHsv(i, 1, 1));
+ }
+
+ Display.EndFrame();
+ Core.KeepAlive();
+ }
+ }
+ }
+
+ #endregion
+ }
+}
Modified: trunk/Tests/Tests.csproj
===================================================================
--- trunk/Tests/Tests.csproj 2011-06-18 01:08:48 UTC (rev 1285)
+++ trunk/Tests/Tests.csproj 2011-10-03 16:47:12 UTC (rev 1286)
@@ -138,6 +138,7 @@
<Compile Include="DisplayTests\Capabilities\frmCapabilities.Designer.cs">
<DependentUpon>frmCapabilities.cs</DependentUpon>
</Compile>
+ <Compile Include="DisplayTests\ColorTest.cs" />
<Compile Include="DisplayTests\PixelBufferMask.cs" />
<Compile Include="DisplayTests\ClipRect.cs" />
<Compile Include="DisplayTests\Prerendered.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-06-18 01:08:54
|
Revision: 1285
http://agate.svn.sourceforge.net/agate/?rev=1285&view=rev
Author: kanato
Date: 2011-06-18 01:08:48 +0000 (Sat, 18 Jun 2011)
Log Message:
-----------
Add some error checking to surface constructor and FileProviderList.
Modified Paths:
--------------
trunk/AgateLib/DisplayLib/Display.cs
trunk/AgateLib/DisplayLib/Surface.cs
trunk/AgateLib/InternalResources/Fonts.zip
trunk/AgateLib/Utility/FileProviderList.cs
Modified: trunk/AgateLib/DisplayLib/Display.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Display.cs 2011-03-18 23:26:59 UTC (rev 1284)
+++ trunk/AgateLib/DisplayLib/Display.cs 2011-06-18 01:08:48 UTC (rev 1285)
@@ -203,7 +203,7 @@
// TODO: replace this with an ActiveWindow property.
//if (value is DisplayWindow)
- // mCurrentWindow = (DisplayWindow)value;
+ // mCurrentWindow = (DisplayWindow)value;
}
}
Modified: trunk/AgateLib/DisplayLib/Surface.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Surface.cs 2011-03-18 23:26:59 UTC (rev 1284)
+++ trunk/AgateLib/DisplayLib/Surface.cs 2011-06-18 01:08:48 UTC (rev 1285)
@@ -95,6 +95,8 @@
{
if (Display.Impl == null)
throw new AgateException("AgateLib's display system has not been initialized.");
+ if (string.IsNullOrEmpty(filename))
+ throw new ArgumentNullException("You must supply a file name.");
using (System.IO.Stream s = fileProvider.OpenRead(filename))
{
Modified: trunk/AgateLib/InternalResources/Fonts.zip
===================================================================
(Binary files differ)
Modified: trunk/AgateLib/Utility/FileProviderList.cs
===================================================================
--- trunk/AgateLib/Utility/FileProviderList.cs 2011-03-18 23:26:59 UTC (rev 1284)
+++ trunk/AgateLib/Utility/FileProviderList.cs 2011-06-18 01:08:48 UTC (rev 1285)
@@ -57,6 +57,9 @@
/// <returns></returns>
public Stream OpenRead(string filename)
{
+ if (string.IsNullOrEmpty(filename))
+ throw new ArgumentNullException("You must supply a file name.");
+
for (int i = mProviders.Count - 1; i >= 0; i--)
{
if (mProviders[i].FileExists(filename))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-03-18 23:27:05
|
Revision: 1284
http://agate.svn.sourceforge.net/agate/?rev=1284&view=rev
Author: kanato
Date: 2011-03-18 23:26:59 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
Add some exception handling to AgateSandBoxLoader.cs.
Modified Paths:
--------------
trunk/AgateLib/Drivers/AgateSandBoxLoader.cs
Modified: trunk/AgateLib/Drivers/AgateSandBoxLoader.cs
===================================================================
--- trunk/AgateLib/Drivers/AgateSandBoxLoader.cs 2011-02-03 07:36:59 UTC (rev 1283)
+++ trunk/AgateLib/Drivers/AgateSandBoxLoader.cs 2011-03-18 23:26:59 UTC (rev 1284)
@@ -19,6 +19,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
+using System.IO;
using System.Text;
using System.Reflection;
@@ -37,11 +38,33 @@
}
catch (BadImageFormatException)
{
- System.Diagnostics.Trace.WriteLine(string.Format(
- "Could not load the file {0}. Is it a CLR assembly?", file));
+ Trace.WriteLine(string.Format("Could not load the file {0}.", file));
+ Trace.WriteLine("BadImageFormatException caught. This file probably is not a CLR assembly.");
+
return retval.ToArray();
}
+ catch (FileLoadException e)
+ {
+ Trace.WriteLine(string.Format("Could not load the file {0}.", file));
+ Trace.WriteLine("FileLoadException caught:");
+ Trace.Indent();
+ Trace.WriteLine(e.Message);
+ Trace.Unindent();
+ return retval.ToArray();
+ }
+ catch (Exception e)
+ {
+ Trace.WriteLine(string.Format("Could not load the file {0}.", file));
+ Trace.WriteLine(string.Format("{0} caught:"), e.GetType().Name);
+ Trace.Indent();
+ Trace.WriteLine(e.Message);
+ Trace.Unindent();
+
+ return retval.ToArray();
+ }
+
+
Type[] types;
try
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-02-03 07:37:05
|
Revision: 1283
http://agate.svn.sourceforge.net/agate/?rev=1283&view=rev
Author: kanato
Date: 2011-02-03 07:36:59 +0000 (Thu, 03 Feb 2011)
Log Message:
-----------
Fix clip rects with AgateSDX.
Modified Paths:
--------------
trunk/Drivers/AgateSDX/SDX_Display.cs
trunk/Drivers/AgateSDX/Shaders/FixedFunction/SDX_FF_Basic2DShader.cs
Modified: trunk/Drivers/AgateSDX/SDX_Display.cs
===================================================================
--- trunk/Drivers/AgateSDX/SDX_Display.cs 2011-02-02 01:26:38 UTC (rev 1282)
+++ trunk/Drivers/AgateSDX/SDX_Display.cs 2011-02-03 07:36:59 UTC (rev 1283)
@@ -363,6 +363,13 @@
mDevice.Device.Viewport = view;
mCurrentClipRect = newClipRect;
+
+ if (Display.Shader is AgateLib.DisplayLib.Shaders.IShader2D)
+ {
+ var s2d = (AgateLib.DisplayLib.Shaders.IShader2D)Display.Shader;
+
+ s2d.CoordinateSystem = newClipRect;
+ }
}
private Stack<Rectangle> mClipRects = new Stack<Rectangle>();
Modified: trunk/Drivers/AgateSDX/Shaders/FixedFunction/SDX_FF_Basic2DShader.cs
===================================================================
--- trunk/Drivers/AgateSDX/Shaders/FixedFunction/SDX_FF_Basic2DShader.cs 2011-02-02 01:26:38 UTC (rev 1282)
+++ trunk/Drivers/AgateSDX/Shaders/FixedFunction/SDX_FF_Basic2DShader.cs 2011-02-03 07:36:59 UTC (rev 1283)
@@ -22,7 +22,11 @@
public override AgateLib.Geometry.Rectangle CoordinateSystem
{
get { return mCoords; }
- set { mCoords = value; }
+ set
+ {
+ mCoords = value;
+ SetOrthoProjection();
+ }
}
public void Set2DDrawState()
@@ -44,10 +48,17 @@
mDevice.SetTransform(TransformState.World, SlimDX.Matrix.Identity);
mDevice.SetTransform(TransformState.View, SlimDX.Matrix.Identity);
+ SetOrthoProjection();
+ }
+
+ private void SetOrthoProjection()
+ {
SlimDX.Matrix orthoProj = SlimDX.Matrix.OrthoOffCenterRH(
- mCoords.Left, mCoords.Right, mCoords.Bottom, mCoords.Top, -1, 1);
+ mCoords.Left, mCoords.Right, mCoords.Bottom, mCoords.Top, -1, 1);
- mDevice.SetTransform(TransformState.Projection, orthoProj);
+ // TODO: figure out why this method sometimes gets called when mDevice is null?
+ if (mDevice != null)
+ mDevice.SetTransform(TransformState.Projection, orthoProj);
}
public override void Begin()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-02-02 01:26:44
|
Revision: 1282
http://agate.svn.sourceforge.net/agate/?rev=1282&view=rev
Author: kanato
Date: 2011-02-02 01:26:38 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
Disable main controls before database is created/opened.
Modified Paths:
--------------
trunk/Tools/DatabaseEditor/frmEditor.Designer.cs
trunk/Tools/DatabaseEditor/frmEditor.cs
Modified: trunk/Tools/DatabaseEditor/frmEditor.Designer.cs
===================================================================
--- trunk/Tools/DatabaseEditor/frmEditor.Designer.cs 2011-02-02 01:17:25 UTC (rev 1281)
+++ trunk/Tools/DatabaseEditor/frmEditor.Designer.cs 2011-02-02 01:26:38 UTC (rev 1282)
@@ -53,13 +53,13 @@
this.btnCodeGen = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripContainer2 = new System.Windows.Forms.ToolStripContainer();
- this.databaseEditor1 = new AgateDatabaseEditor.DatabaseEditor();
this.tableToolStrip = new System.Windows.Forms.ToolStrip();
this.btnDesignTable = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.btnSortAscending = new System.Windows.Forms.ToolStripButton();
this.btnSortDescending = new System.Windows.Forms.ToolStripButton();
+ this.databaseEditor1 = new AgateDatabaseEditor.DatabaseEditor();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.mainToolStrip.SuspendLayout();
@@ -204,7 +204,7 @@
this.btnCodeGen});
this.mainToolStrip.Location = new System.Drawing.Point(3, 24);
this.mainToolStrip.Name = "mainToolStrip";
- this.mainToolStrip.Size = new System.Drawing.Size(141, 25);
+ this.mainToolStrip.Size = new System.Drawing.Size(110, 25);
this.mainToolStrip.TabIndex = 4;
this.mainToolStrip.Text = "toolStrip1";
//
@@ -282,20 +282,6 @@
this.toolStripContainer2.TopToolStripPanel.Controls.Add(this.mainToolStrip);
this.toolStripContainer2.TopToolStripPanel.Controls.Add(this.tableToolStrip);
//
- // databaseEditor1
- //
- this.databaseEditor1.Database = null;
- this.databaseEditor1.DirtyState = false;
- this.databaseEditor1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.databaseEditor1.Location = new System.Drawing.Point(0, 0);
- this.databaseEditor1.Name = "databaseEditor1";
- this.databaseEditor1.Size = new System.Drawing.Size(862, 583);
- this.databaseEditor1.TabIndex = 3;
- this.databaseEditor1.Visible = false;
- this.databaseEditor1.DirtyStateChanged += new System.EventHandler(this.databaseEditor1_DirtyStateChanged);
- this.databaseEditor1.StatusText += new System.EventHandler<AgateDatabaseEditor.StatusTextEventArgs>(this.databaseEditor1_StatusText);
- this.databaseEditor1.TableActiveStatusChanged += new System.EventHandler(this.databaseEditor1_TableActiveStatusChanged);
- //
// tableToolStrip
//
this.tableToolStrip.Dock = System.Windows.Forms.DockStyle.None;
@@ -306,7 +292,7 @@
this.toolStripLabel1,
this.btnSortAscending,
this.btnSortDescending});
- this.tableToolStrip.Location = new System.Drawing.Point(144, 24);
+ this.tableToolStrip.Location = new System.Drawing.Point(113, 24);
this.tableToolStrip.Name = "tableToolStrip";
this.tableToolStrip.Size = new System.Drawing.Size(177, 25);
this.tableToolStrip.TabIndex = 10;
@@ -353,6 +339,20 @@
this.btnSortDescending.Text = "toolStripButton1";
this.btnSortDescending.Click += new System.EventHandler(this.btnSortDescending_Click);
//
+ // databaseEditor1
+ //
+ this.databaseEditor1.Database = null;
+ this.databaseEditor1.DirtyState = false;
+ this.databaseEditor1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.databaseEditor1.Location = new System.Drawing.Point(0, 0);
+ this.databaseEditor1.Name = "databaseEditor1";
+ this.databaseEditor1.Size = new System.Drawing.Size(862, 583);
+ this.databaseEditor1.TabIndex = 3;
+ this.databaseEditor1.Visible = false;
+ this.databaseEditor1.TableActiveStatusChanged += new System.EventHandler(this.databaseEditor1_TableActiveStatusChanged);
+ this.databaseEditor1.DirtyStateChanged += new System.EventHandler(this.databaseEditor1_DirtyStateChanged);
+ this.databaseEditor1.StatusText += new System.EventHandler<AgateDatabaseEditor.StatusTextEventArgs>(this.databaseEditor1_StatusText);
+ //
// frmEditor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -363,6 +363,7 @@
this.Name = "frmEditor";
this.Text = "Agate Database Editor";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmEditor_FormClosing);
+ this.Load += new System.EventHandler(this.frmEditor_Load);
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.menuStrip1.ResumeLayout(false);
Modified: trunk/Tools/DatabaseEditor/frmEditor.cs
===================================================================
--- trunk/Tools/DatabaseEditor/frmEditor.cs 2011-02-02 01:17:25 UTC (rev 1281)
+++ trunk/Tools/DatabaseEditor/frmEditor.cs 2011-02-02 01:26:38 UTC (rev 1282)
@@ -35,6 +35,28 @@
#endregion
+
+ private void DisableControls()
+ {
+ bool enabled = true;
+
+ if (databaseEditor1.Database == null)
+ {
+ enabled = false;
+ }
+
+ btnCodeGen.Enabled = enabled;
+ btnDesignTable.Enabled = enabled;
+ btnSave.Enabled = enabled;
+ btnSortAscending.Enabled = enabled;
+ btnSortDescending.Enabled = enabled;
+ saveDatabaseAsToolStripMenuItem.Enabled = enabled;
+ saveDatabaseToolStripMenuItem.Enabled = enabled;
+ importDataToolStripMenuItem.Enabled = enabled;
+ generateCodeToolStripMenuItem.Enabled = enabled;
+
+ }
+
#region --- Basic database operations ---
private void NewDatabase()
@@ -46,6 +68,8 @@
databaseEditor1.Database = new AgateLib.Data.AgateDatabase();
Text = "New Database - " + title;
+
+ DisableControls();
}
private void OpenDatabase()
@@ -61,6 +85,8 @@
filename = openDatabase.FileName;
Text = System.IO.Path.GetFileName(filename) + " - " + title;
+
+ DisableControls();
}
@@ -304,7 +330,13 @@
#endregion
+ private void frmEditor_Load(object sender, EventArgs e)
+ {
+ DisableControls();
+ }
+
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-02-02 01:17:31
|
Revision: 1281
http://agate.svn.sourceforge.net/agate/?rev=1281&view=rev
Author: kanato
Date: 2011-02-02 01:17:25 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
Fix import of table data when column type is changed.
Allow overwriting of table in database.
Modified Paths:
--------------
trunk/Tools/DatabaseEditor/Import/frmImportTable.Designer.cs
trunk/Tools/DatabaseEditor/Import/frmImportTable.cs
Modified: trunk/Tools/DatabaseEditor/Import/frmImportTable.Designer.cs
===================================================================
--- trunk/Tools/DatabaseEditor/Import/frmImportTable.Designer.cs 2011-02-01 06:11:50 UTC (rev 1280)
+++ trunk/Tools/DatabaseEditor/Import/frmImportTable.Designer.cs 2011-02-02 01:17:25 UTC (rev 1281)
@@ -53,6 +53,7 @@
this.label4 = new System.Windows.Forms.Label();
this.propColumns = new System.Windows.Forms.PropertyGrid();
this.panel1 = new System.Windows.Forms.Panel();
+ this.chkOverwrite = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout();
this.pnlTableWarning.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -225,6 +226,7 @@
//
// backgroundWorker1
//
+ this.backgroundWorker1.WorkerSupportsCancellation = true;
this.backgroundWorker1.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker1_DoWork);
this.backgroundWorker1.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker1_RunWorkerCompleted);
//
@@ -260,18 +262,19 @@
//
// pnlTableWarning
//
+ this.pnlTableWarning.Controls.Add(this.chkOverwrite);
this.pnlTableWarning.Controls.Add(this.label3);
this.pnlTableWarning.Controls.Add(this.pictureBox1);
this.pnlTableWarning.Location = new System.Drawing.Point(250, 243);
this.pnlTableWarning.Name = "pnlTableWarning";
- this.pnlTableWarning.Size = new System.Drawing.Size(295, 37);
+ this.pnlTableWarning.Size = new System.Drawing.Size(295, 58);
this.pnlTableWarning.TabIndex = 10;
this.pnlTableWarning.Visible = false;
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(27, 12);
+ this.label3.Location = new System.Drawing.Point(27, 6);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(226, 13);
this.label3.TabIndex = 1;
@@ -280,7 +283,7 @@
// pictureBox1
//
this.pictureBox1.Image = global::AgateDatabaseEditor.Properties.Resources.warning;
- this.pictureBox1.Location = new System.Drawing.Point(5, 9);
+ this.pictureBox1.Location = new System.Drawing.Point(5, 3);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(16, 16);
this.pictureBox1.TabIndex = 0;
@@ -294,7 +297,7 @@
this.lstColumns.FormattingEnabled = true;
this.lstColumns.Location = new System.Drawing.Point(3, 16);
this.lstColumns.Name = "lstColumns";
- this.lstColumns.Size = new System.Drawing.Size(120, 199);
+ this.lstColumns.Size = new System.Drawing.Size(120, 186);
this.lstColumns.TabIndex = 11;
this.lstColumns.SelectedIndexChanged += new System.EventHandler(this.lstColumns_SelectedIndexChanged);
//
@@ -317,7 +320,7 @@
this.propColumns.HelpVisible = false;
this.propColumns.Location = new System.Drawing.Point(129, 16);
this.propColumns.Name = "propColumns";
- this.propColumns.Size = new System.Drawing.Size(401, 201);
+ this.propColumns.Size = new System.Drawing.Size(401, 196);
this.propColumns.TabIndex = 13;
this.propColumns.Click += new System.EventHandler(this.propColumns_Click);
//
@@ -329,11 +332,22 @@
this.panel1.Controls.Add(this.label4);
this.panel1.Controls.Add(this.propColumns);
this.panel1.Controls.Add(this.lstColumns);
- this.panel1.Location = new System.Drawing.Point(12, 286);
+ this.panel1.Location = new System.Drawing.Point(12, 291);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(533, 220);
+ this.panel1.Size = new System.Drawing.Size(533, 215);
this.panel1.TabIndex = 14;
//
+ // chkOverwrite
+ //
+ this.chkOverwrite.AutoSize = true;
+ this.chkOverwrite.Location = new System.Drawing.Point(32, 25);
+ this.chkOverwrite.Name = "chkOverwrite";
+ this.chkOverwrite.Size = new System.Drawing.Size(183, 17);
+ this.chkOverwrite.TabIndex = 2;
+ this.chkOverwrite.Text = "I know, and I want to overwrite it.";
+ this.chkOverwrite.UseVisualStyleBackColor = true;
+ this.chkOverwrite.CheckedChanged += new System.EventHandler(this.chkOverwrite_CheckedChanged);
+ //
// frmImportTable
//
this.AcceptButton = this.btnOK;
@@ -395,5 +409,6 @@
private System.Windows.Forms.PropertyGrid propColumns;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.CheckBox chkMergeDelimiters;
+ private System.Windows.Forms.CheckBox chkOverwrite;
}
}
\ No newline at end of file
Modified: trunk/Tools/DatabaseEditor/Import/frmImportTable.cs
===================================================================
--- trunk/Tools/DatabaseEditor/Import/frmImportTable.cs 2011-02-01 06:11:50 UTC (rev 1280)
+++ trunk/Tools/DatabaseEditor/Import/frmImportTable.cs 2011-02-02 01:17:25 UTC (rev 1281)
@@ -102,14 +102,7 @@
{
importedTable = null;
- string[] lines = fileContents.Split('\n');
- for (int i = 0; i < lines.Length; i++)
- {
- if (lines[i].EndsWith("\r"))
- {
- lines[i] = lines[i].Substring(0, lines[i].Length - 1);
- }
- }
+ string[] lines = SplitFileContents();
List<AgateColumn> cols = new List<AgateColumn>();
DetectColumnTypes(lines, cols);
@@ -126,6 +119,19 @@
importedTable = tbl;
}
+ private string[] SplitFileContents()
+ {
+ string[] lines = fileContents.Split('\n');
+ for (int i = 0; i < lines.Length; i++)
+ {
+ if (lines[i].EndsWith("\r"))
+ {
+ lines[i] = lines[i].Substring(0, lines[i].Length - 1);
+ }
+ }
+ return lines;
+ }
+
private void backgroundWorker1_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
{
if (importedTable == null)
@@ -144,16 +150,36 @@
if (Database.Tables.ContainsTable(txtName.Text))
return;
- btnOK.Enabled = true;
+ SetOKEnabled();
}
+ private void SetOKEnabled()
+ {
+ bool value = true;
+
+ if (backgroundWorker1.IsBusy)
+ value = false;
+
+ if (Database.Tables.ContainsTable(txtName.Text))
+ {
+ if (chkOverwrite.Checked == false)
+ value = false;
+ }
+
+ btnOK.Enabled = value;
+ }
+
private void txtName_TextChanged(object sender, EventArgs e)
{
if (Database.Tables.ContainsTable(txtName.Text))
+ {
pnlTableWarning.Visible = true;
+ chkOverwrite.Checked = false;
+ }
else
pnlTableWarning.Visible = false;
+ SetOKEnabled();
}
private void SetDefaultColumnNames(List<AgateColumn> cols)
@@ -455,6 +481,8 @@
private void btnOK_Click(object sender, EventArgs e)
{
+ importedTable = ImportTable(SplitFileContents(), importedTable.Columns.ToList());
+
try
{
importedTable.Name = txtName.Text;
@@ -467,6 +495,12 @@
return;
}
+ if (Database.Tables.ContainsTable(importedTable.Name) &&
+ chkOverwrite.Checked == true)
+ {
+ Database.Tables.Remove(Database.Tables[importedTable.Name]);
+ }
+
Database.Tables.Add(importedTable);
}
@@ -475,5 +509,10 @@
}
+ private void chkOverwrite_CheckedChanged(object sender, EventArgs e)
+ {
+ SetOKEnabled();
+ }
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-02-01 06:12:01
|
Revision: 1280
http://agate.svn.sourceforge.net/agate/?rev=1280&view=rev
Author: kanato
Date: 2011-02-01 06:11:50 +0000 (Tue, 01 Feb 2011)
Log Message:
-----------
Make some changes to table imports.
Modified Paths:
--------------
trunk/Tools/DatabaseEditor/DatabaseEditor.csproj
trunk/Tools/DatabaseEditor/frmEditor.cs
Added Paths:
-----------
trunk/Tools/DatabaseEditor/Import/
trunk/Tools/DatabaseEditor/Import/DatabaseImporter.cs
trunk/Tools/DatabaseEditor/Import/frmImportTable.Designer.cs
trunk/Tools/DatabaseEditor/Import/frmImportTable.cs
trunk/Tools/DatabaseEditor/Import/frmImportTable.resx
Removed Paths:
-------------
trunk/Tools/DatabaseEditor/frmImportTable.Designer.cs
trunk/Tools/DatabaseEditor/frmImportTable.cs
trunk/Tools/DatabaseEditor/frmImportTable.resx
Modified: trunk/Tools/DatabaseEditor/DatabaseEditor.csproj
===================================================================
--- trunk/Tools/DatabaseEditor/DatabaseEditor.csproj 2011-02-01 00:01:08 UTC (rev 1279)
+++ trunk/Tools/DatabaseEditor/DatabaseEditor.csproj 2011-02-01 06:11:50 UTC (rev 1280)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -115,10 +115,11 @@
<Compile Include="frmEditor.Designer.cs">
<DependentUpon>frmEditor.cs</DependentUpon>
</Compile>
- <Compile Include="frmImportTable.cs">
+ <Compile Include="Import\DatabaseImporter.cs" />
+ <Compile Include="Import\frmImportTable.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="frmImportTable.Designer.cs">
+ <Compile Include="Import\frmImportTable.Designer.cs">
<DependentUpon>frmImportTable.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
@@ -139,7 +140,7 @@
<DependentUpon>frmEditor.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="frmImportTable.resx">
+ <EmbeddedResource Include="Import\frmImportTable.resx">
<DependentUpon>frmImportTable.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
Added: trunk/Tools/DatabaseEditor/Import/DatabaseImporter.cs
===================================================================
--- trunk/Tools/DatabaseEditor/Import/DatabaseImporter.cs (rev 0)
+++ trunk/Tools/DatabaseEditor/Import/DatabaseImporter.cs 2011-02-01 06:11:50 UTC (rev 1280)
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using AgateDataLib;
+
+namespace AgateDatabaseEditor.Import
+{
+ class DatabaseImporter
+ {
+ public AgateLib.Data.AgateDatabase Database { get; set; }
+
+ public void Run()
+ {
+ if (Database == null)
+ throw new InvalidOperationException("Database cannot be null.");
+
+ string filename = OpenFile();
+ if (filename == null)
+ return;
+
+ if (IsTextFile(filename))
+ {
+ frmImportTable import = new frmImportTable();
+
+ import.Database = Database;
+ import.Filename = filename;
+ import.ShowDialog();
+ }
+ else
+ {
+ MessageBox.Show("No import filter for the specified filetype.", "Cannot import",
+ MessageBoxButtons.OK, MessageBoxIcon.Stop);
+ }
+ }
+
+ private bool IsAccessDatabase(string filename)
+ {
+ if (Path.GetExtension(filename).ToLowerInvariant() == ".mdb")
+ return true;
+ else
+ return false;
+ }
+
+ private bool IsTextFile(string filename)
+ {
+ string ext = Path.GetExtension(filename).ToLowerInvariant();
+
+ if (ext == ".txt" || ext == ".csv")
+ return true;
+ else
+ return false;
+ }
+
+ private string OpenFile()
+ {
+ using (OpenFileDialog o = new OpenFileDialog())
+ {
+ o.Filter = "Text Files (*.txt,*.csv)|*.txt;*.csv|All Files|*.*";
+
+ DialogResult result = o.ShowDialog();
+
+ if (result == DialogResult.Cancel)
+ return null;
+
+
+ return o.FileName;
+ }
+ }
+ }
+}
Copied: trunk/Tools/DatabaseEditor/Import/frmImportTable.Designer.cs (from rev 1274, trunk/Tools/DatabaseEditor/frmImportTable.Designer.cs)
===================================================================
--- trunk/Tools/DatabaseEditor/Import/frmImportTable.Designer.cs (rev 0)
+++ trunk/Tools/DatabaseEditor/Import/frmImportTable.Designer.cs 2011-02-01 06:11:50 UTC (rev 1280)
@@ -0,0 +1,399 @@
+namespace AgateDatabaseEditor
+{
+ partial class frmImportTable
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.txtFileContents = new System.Windows.Forms.TextBox();
+ this.btnOK = new System.Windows.Forms.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.hSeparator1 = new ERY.NotebookLib.HSeparator();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.chkMergeDelimiters = new System.Windows.Forms.CheckBox();
+ this.txtOther = new System.Windows.Forms.TextBox();
+ this.chkOther = new System.Windows.Forms.CheckBox();
+ this.chkSpace = new System.Windows.Forms.CheckBox();
+ this.chkTab = new System.Windows.Forms.CheckBox();
+ this.chkSemicolon = new System.Windows.Forms.CheckBox();
+ this.chkComma = new System.Windows.Forms.CheckBox();
+ this.cboTextQualifier = new System.Windows.Forms.ComboBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
+ this.chkFirstRow = new System.Windows.Forms.CheckBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.txtName = new System.Windows.Forms.TextBox();
+ this.pnlTableWarning = new System.Windows.Forms.Panel();
+ this.label3 = new System.Windows.Forms.Label();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.lstColumns = new System.Windows.Forms.ListBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.propColumns = new System.Windows.Forms.PropertyGrid();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.groupBox1.SuspendLayout();
+ this.pnlTableWarning.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.panel1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // txtFileContents
+ //
+ this.txtFileContents.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtFileContents.Location = new System.Drawing.Point(12, 93);
+ this.txtFileContents.Multiline = true;
+ this.txtFileContents.Name = "txtFileContents";
+ this.txtFileContents.ReadOnly = true;
+ this.txtFileContents.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+ this.txtFileContents.Size = new System.Drawing.Size(533, 138);
+ this.txtFileContents.TabIndex = 0;
+ //
+ // btnOK
+ //
+ this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+ this.btnOK.Location = new System.Drawing.Point(389, 512);
+ this.btnOK.Name = "btnOK";
+ this.btnOK.Size = new System.Drawing.Size(75, 23);
+ this.btnOK.TabIndex = 1;
+ this.btnOK.Text = "OK";
+ this.btnOK.UseVisualStyleBackColor = true;
+ this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+ //
+ // btnCancel
+ //
+ this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.btnCancel.Location = new System.Drawing.Point(470, 512);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(75, 23);
+ this.btnCancel.TabIndex = 2;
+ this.btnCancel.Text = "Cancel";
+ this.btnCancel.UseVisualStyleBackColor = true;
+ //
+ // hSeparator1
+ //
+ this.hSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.hSeparator1.Location = new System.Drawing.Point(12, 235);
+ this.hSeparator1.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
+ this.hSeparator1.MaximumSize = new System.Drawing.Size(10000, 4);
+ this.hSeparator1.MinimumSize = new System.Drawing.Size(0, 4);
+ this.hSeparator1.Name = "hSeparator1";
+ this.hSeparator1.Size = new System.Drawing.Size(533, 4);
+ this.hSeparator1.TabIndex = 3;
+ this.hSeparator1.TabStop = true;
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.chkMergeDelimiters);
+ this.groupBox1.Controls.Add(this.txtOther);
+ this.groupBox1.Controls.Add(this.chkOther);
+ this.groupBox1.Controls.Add(this.chkSpace);
+ this.groupBox1.Controls.Add(this.chkTab);
+ this.groupBox1.Controls.Add(this.chkSemicolon);
+ this.groupBox1.Controls.Add(this.chkComma);
+ this.groupBox1.Location = new System.Drawing.Point(12, 12);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(354, 75);
+ this.groupBox1.TabIndex = 4;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Delimiters";
+ //
+ // chkMergeDelimiters
+ //
+ this.chkMergeDelimiters.AutoSize = true;
+ this.chkMergeDelimiters.Location = new System.Drawing.Point(226, 48);
+ this.chkMergeDelimiters.Name = "chkMergeDelimiters";
+ this.chkMergeDelimiters.Size = new System.Drawing.Size(104, 17);
+ this.chkMergeDelimiters.TabIndex = 15;
+ this.chkMergeDelimiters.Text = "Merge Delimiters";
+ this.chkMergeDelimiters.UseVisualStyleBackColor = true;
+ this.chkMergeDelimiters.CheckedChanged += new System.EventHandler(this.chkMergeDelimiters_CheckedChanged);
+ //
+ // txtOther
+ //
+ this.txtOther.Location = new System.Drawing.Point(287, 23);
+ this.txtOther.MaxLength = 1;
+ this.txtOther.Name = "txtOther";
+ this.txtOther.Size = new System.Drawing.Size(23, 20);
+ this.txtOther.TabIndex = 5;
+ this.txtOther.TextChanged += new System.EventHandler(this.DelimiterCheck_CheckedChanged);
+ //
+ // chkOther
+ //
+ this.chkOther.AutoSize = true;
+ this.chkOther.Location = new System.Drawing.Point(226, 25);
+ this.chkOther.Name = "chkOther";
+ this.chkOther.Size = new System.Drawing.Size(55, 17);
+ this.chkOther.TabIndex = 4;
+ this.chkOther.Text = "Other:";
+ this.chkOther.UseVisualStyleBackColor = true;
+ this.chkOther.CheckedChanged += new System.EventHandler(this.DelimiterCheck_CheckedChanged);
+ //
+ // chkSpace
+ //
+ this.chkSpace.AutoSize = true;
+ this.chkSpace.Location = new System.Drawing.Point(113, 48);
+ this.chkSpace.Name = "chkSpace";
+ this.chkSpace.Size = new System.Drawing.Size(57, 17);
+ this.chkSpace.TabIndex = 3;
+ this.chkSpace.Text = "Space";
+ this.chkSpace.UseVisualStyleBackColor = true;
+ this.chkSpace.CheckedChanged += new System.EventHandler(this.DelimiterCheck_CheckedChanged);
+ //
+ // chkTab
+ //
+ this.chkTab.AutoSize = true;
+ this.chkTab.Location = new System.Drawing.Point(17, 48);
+ this.chkTab.Name = "chkTab";
+ this.chkTab.Size = new System.Drawing.Size(45, 17);
+ this.chkTab.TabIndex = 2;
+ this.chkTab.Text = "Tab";
+ this.chkTab.UseVisualStyleBackColor = true;
+ this.chkTab.CheckedChanged += new System.EventHandler(this.DelimiterCheck_CheckedChanged);
+ //
+ // chkSemicolon
+ //
+ this.chkSemicolon.AutoSize = true;
+ this.chkSemicolon.Location = new System.Drawing.Point(113, 25);
+ this.chkSemicolon.Name = "chkSemicolon";
+ this.chkSemicolon.Size = new System.Drawing.Size(75, 17);
+ this.chkSemicolon.TabIndex = 1;
+ this.chkSemicolon.Text = "Semicolon";
+ this.chkSemicolon.UseVisualStyleBackColor = true;
+ this.chkSemicolon.CheckedChanged += new System.EventHandler(this.DelimiterCheck_CheckedChanged);
+ //
+ // chkComma
+ //
+ this.chkComma.AutoSize = true;
+ this.chkComma.Checked = true;
+ this.chkComma.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.chkComma.Location = new System.Drawing.Point(17, 25);
+ this.chkComma.Name = "chkComma";
+ this.chkComma.Size = new System.Drawing.Size(61, 17);
+ this.chkComma.TabIndex = 0;
+ this.chkComma.Text = "Comma";
+ this.chkComma.UseVisualStyleBackColor = true;
+ this.chkComma.CheckedChanged += new System.EventHandler(this.DelimiterCheck_CheckedChanged);
+ //
+ // cboTextQualifier
+ //
+ this.cboTextQualifier.FormattingEnabled = true;
+ this.cboTextQualifier.Items.AddRange(new object[] {
+ "{none}",
+ "\'",
+ "\""});
+ this.cboTextQualifier.Location = new System.Drawing.Point(456, 22);
+ this.cboTextQualifier.Name = "cboTextQualifier";
+ this.cboTextQualifier.Size = new System.Drawing.Size(61, 21);
+ this.cboTextQualifier.TabIndex = 5;
+ this.cboTextQualifier.Text = "\"";
+ this.cboTextQualifier.TextChanged += new System.EventHandler(this.comboBox1_TextChanged);
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(378, 25);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(72, 13);
+ this.label1.TabIndex = 6;
+ this.label1.Text = "Text Qualifier:";
+ //
+ // backgroundWorker1
+ //
+ this.backgroundWorker1.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker1_DoWork);
+ this.backgroundWorker1.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker1_RunWorkerCompleted);
+ //
+ // chkFirstRow
+ //
+ this.chkFirstRow.AutoSize = true;
+ this.chkFirstRow.Checked = true;
+ this.chkFirstRow.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.chkFirstRow.Location = new System.Drawing.Point(381, 60);
+ this.chkFirstRow.Name = "chkFirstRow";
+ this.chkFirstRow.Size = new System.Drawing.Size(164, 17);
+ this.chkFirstRow.TabIndex = 7;
+ this.chkFirstRow.Text = "First row contains field names";
+ this.chkFirstRow.UseVisualStyleBackColor = true;
+ this.chkFirstRow.CheckedChanged += new System.EventHandler(this.chkFirstRow_CheckedChanged);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(12, 255);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(68, 13);
+ this.label2.TabIndex = 8;
+ this.label2.Text = "Table Name:";
+ //
+ // txtName
+ //
+ this.txtName.Location = new System.Drawing.Point(86, 252);
+ this.txtName.Name = "txtName";
+ this.txtName.Size = new System.Drawing.Size(157, 20);
+ this.txtName.TabIndex = 9;
+ this.txtName.TextChanged += new System.EventHandler(this.txtName_TextChanged);
+ //
+ // pnlTableWarning
+ //
+ this.pnlTableWarning.Controls.Add(this.label3);
+ this.pnlTableWarning.Controls.Add(this.pictureBox1);
+ this.pnlTableWarning.Location = new System.Drawing.Point(250, 243);
+ this.pnlTableWarning.Name = "pnlTableWarning";
+ this.pnlTableWarning.Size = new System.Drawing.Size(295, 37);
+ this.pnlTableWarning.TabIndex = 10;
+ this.pnlTableWarning.Visible = false;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(27, 12);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(226, 13);
+ this.label3.TabIndex = 1;
+ this.label3.Text = "There is already a table by the specified name.";
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Image = global::AgateDatabaseEditor.Properties.Resources.warning;
+ this.pictureBox1.Location = new System.Drawing.Point(5, 9);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(16, 16);
+ this.pictureBox1.TabIndex = 0;
+ this.pictureBox1.TabStop = false;
+ //
+ // lstColumns
+ //
+ this.lstColumns.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)));
+ this.lstColumns.Enabled = false;
+ this.lstColumns.FormattingEnabled = true;
+ this.lstColumns.Location = new System.Drawing.Point(3, 16);
+ this.lstColumns.Name = "lstColumns";
+ this.lstColumns.Size = new System.Drawing.Size(120, 199);
+ this.lstColumns.TabIndex = 11;
+ this.lstColumns.SelectedIndexChanged += new System.EventHandler(this.lstColumns_SelectedIndexChanged);
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(3, 0);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(47, 13);
+ this.label4.TabIndex = 12;
+ this.label4.Text = "Columns";
+ //
+ // propColumns
+ //
+ this.propColumns.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.propColumns.CommandsVisibleIfAvailable = false;
+ this.propColumns.Enabled = false;
+ this.propColumns.HelpVisible = false;
+ this.propColumns.Location = new System.Drawing.Point(129, 16);
+ this.propColumns.Name = "propColumns";
+ this.propColumns.Size = new System.Drawing.Size(401, 201);
+ this.propColumns.TabIndex = 13;
+ this.propColumns.Click += new System.EventHandler(this.propColumns_Click);
+ //
+ // panel1
+ //
+ this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.panel1.Controls.Add(this.label4);
+ this.panel1.Controls.Add(this.propColumns);
+ this.panel1.Controls.Add(this.lstColumns);
+ this.panel1.Location = new System.Drawing.Point(12, 286);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(533, 220);
+ this.panel1.TabIndex = 14;
+ //
+ // frmImportTable
+ //
+ this.AcceptButton = this.btnOK;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.btnCancel;
+ this.ClientSize = new System.Drawing.Size(557, 547);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.pnlTableWarning);
+ this.Controls.Add(this.txtName);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.chkFirstRow);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.cboTextQualifier);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.hSeparator1);
+ this.Controls.Add(this.btnCancel);
+ this.Controls.Add(this.btnOK);
+ this.Controls.Add(this.txtFileContents);
+ this.Name = "frmImportTable";
+ this.Text = "Import Data";
+ this.Load += new System.EventHandler(this.frmImportData_Load);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.pnlTableWarning.ResumeLayout(false);
+ this.pnlTableWarning.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TextBox txtFileContents;
+ private System.Windows.Forms.Button btnOK;
+ private System.Windows.Forms.Button btnCancel;
+ private ERY.NotebookLib.HSeparator hSeparator1;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.TextBox txtOther;
+ private System.Windows.Forms.CheckBox chkOther;
+ private System.Windows.Forms.CheckBox chkSpace;
+ private System.Windows.Forms.CheckBox chkTab;
+ private System.Windows.Forms.CheckBox chkSemicolon;
+ private System.Windows.Forms.CheckBox chkComma;
+ private System.Windows.Forms.ComboBox cboTextQualifier;
+ private System.Windows.Forms.Label label1;
+ private System.ComponentModel.BackgroundWorker backgroundWorker1;
+ private System.Windows.Forms.CheckBox chkFirstRow;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox txtName;
+ private System.Windows.Forms.Panel pnlTableWarning;
+ private System.Windows.Forms.PictureBox pictureBox1;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.ListBox lstColumns;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.PropertyGrid propColumns;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.CheckBox chkMergeDelimiters;
+ }
+}
\ No newline at end of file
Copied: trunk/Tools/DatabaseEditor/Import/frmImportTable.cs (from rev 1274, trunk/Tools/DatabaseEditor/frmImportTable.cs)
===================================================================
--- trunk/Tools/DatabaseEditor/Import/frmImportTable.cs (rev 0)
+++ trunk/Tools/DatabaseEditor/Import/frmImportTable.cs 2011-02-01 06:11:50 UTC (rev 1280)
@@ -0,0 +1,479 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using AgateLib.Data;
+
+namespace AgateDatabaseEditor
+{
+ public partial class frmImportTable : Form
+ {
+ string fileContents;
+
+ public frmImportTable()
+ {
+ InitializeComponent();
+
+ UpdateDelimiters();
+ textQualifier = cboTextQualifier.Text;
+ }
+
+ public AgateDatabase Database { get; set; }
+ char[] Delimiters;
+ string textQualifier;
+ bool firstRowFieldNames = true;
+ bool mergeDelimiters = false;
+ AgateTable importedTable;
+
+ public string Filename { get; set; }
+
+ private void frmImportData_Load(object sender, EventArgs e)
+ {
+ fileContents = System.IO.File.ReadAllText(Filename);
+
+ txtName.Text = System.IO.Path.GetFileNameWithoutExtension(Filename);
+ txtFileContents.Text = fileContents;
+
+ RedoImport();
+ }
+
+ private void DelimiterCheck_CheckedChanged(object sender, EventArgs e)
+ {
+ UpdateDelimiters();
+ RedoImport();
+ }
+
+ private void UpdateDelimiters()
+ {
+ List<char> delim = new List<char>();
+
+ if (chkComma.Checked) delim.Add(',');
+ if (chkSemicolon.Checked) delim.Add(';');
+ if (chkSpace.Checked) delim.Add(' ');
+ if (chkTab.Checked) delim.Add('\t');
+ if (chkOther.Checked && txtOther.Text.Length > 0)
+ delim.Add(txtOther.Text[0]);
+
+ Delimiters = delim.ToArray();
+ }
+
+
+ private void chkMergeDelimiters_CheckedChanged(object sender, EventArgs e)
+ {
+ mergeDelimiters = chkMergeDelimiters.Checked;
+ RedoImport();
+ }
+
+ private void comboBox1_TextChanged(object sender, EventArgs e)
+ {
+ if (cboTextQualifier.Text != "{none}")
+ {
+ textQualifier = cboTextQualifier.Text;
+ }
+ else
+ textQualifier = null;
+
+ RedoImport();
+ }
+
+ private void chkFirstRow_CheckedChanged(object sender, EventArgs e)
+ {
+ firstRowFieldNames = chkFirstRow.Checked;
+
+ RedoImport();
+ }
+ private void RedoImport()
+ {
+ btnOK.Enabled = false;
+ lstColumns.Enabled = false;
+ propColumns.Enabled = false;
+ lstColumns.Items.Clear();
+
+ if (backgroundWorker1.IsBusy)
+ backgroundWorker1.CancelAsync();
+
+ backgroundWorker1.RunWorkerAsync();
+ }
+
+ private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e)
+ {
+ importedTable = null;
+
+ string[] lines = fileContents.Split('\n');
+ for (int i = 0; i < lines.Length; i++)
+ {
+ if (lines[i].EndsWith("\r"))
+ {
+ lines[i] = lines[i].Substring(0, lines[i].Length - 1);
+ }
+ }
+
+ List<AgateColumn> cols = new List<AgateColumn>();
+ DetectColumnTypes(lines, cols);
+
+ if (firstRowFieldNames)
+ SetColumnNames(lines[0], cols);
+ else
+ SetDefaultColumnNames(cols);
+
+
+
+ AgateTable tbl = ImportTable(lines, cols);
+
+ importedTable = tbl;
+ }
+
+ private void backgroundWorker1_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+ {
+ if (importedTable == null)
+ return;
+
+ lstColumns.Items.AddRange(importedTable.Columns.ToArray());
+ lstColumns.Enabled = true;
+ propColumns.Enabled = true;
+
+ if (importedTable == null)
+ return;
+
+ if (string.IsNullOrEmpty(txtName.Text))
+ return;
+
+ if (Database.Tables.ContainsTable(txtName.Text))
+ return;
+
+ btnOK.Enabled = true;
+ }
+
+ private void txtName_TextChanged(object sender, EventArgs e)
+ {
+ if (Database.Tables.ContainsTable(txtName.Text))
+ pnlTableWarning.Visible = true;
+ else
+ pnlTableWarning.Visible = false;
+
+ }
+
+ private void SetDefaultColumnNames(List<AgateColumn> cols)
+ {
+ for (int i = 0; i < cols.Count; i++)
+ {
+ cols[i].Name = "Column" + (i + 1).ToString();
+ }
+ }
+
+ private AgateTable ImportTable(string[] lines, List<AgateColumn> cols)
+ {
+ AgateTable retval = new AgateTable();
+
+ foreach (var col in cols)
+ {
+ retval.AddColumn(col);
+ }
+
+ int start = 0;
+
+ if (firstRowFieldNames)
+ start = 1;
+
+ for (int i = start; i < lines.Length; i++)
+ {
+ if (lines[i].Trim().Length == 0)
+ continue;
+
+ string[] text = SplitLine(lines[i], mergeDelimiters);
+
+ AgateRow r = new AgateRow(retval);
+
+ for (int k = 0; k < text.Length; k++)
+ {
+ if (cols[k].FieldType == FieldType.Boolean)
+ {
+ if (text[k] == "0" || text[k] == "1")
+ {
+ r[cols[k]] = text[k] == "1" ? "true" : "false";
+ continue;
+ }
+ }
+
+ string value = StripTextQualifier(text[k]);
+
+ if (string.IsNullOrEmpty(value))
+ value = cols[k].DefaultValue;
+
+ r[cols[k]] = value;
+ }
+
+ retval.Rows.Add(r);
+ }
+
+ return retval;
+ }
+
+ private void SetColumnNames(string line, List<AgateColumn> cols)
+ {
+ string[] text = SplitLine(line, mergeDelimiters);
+
+ for (int i = 0; i < text.Length; i++)
+ {
+ if (i < cols.Count)
+ {
+ try
+ {
+ cols[i].Name = StripTextQualifier(text[i]);
+ }
+ catch
+ {
+ cols[i].Name = "Column" + (i + 1).ToString();
+ }
+ }
+ else
+ {
+ cols.Add(new AgateColumn { Name = StripTextQualifier(text[i]) });
+ }
+ }
+ }
+
+ private string StripTextQualifier(string p)
+ {
+ if (textQualifier == null)
+ return p;
+
+ if (p.StartsWith(textQualifier) && p.EndsWith(textQualifier))
+ {
+ return p.Substring(textQualifier.Length, p.Length - textQualifier.Length * 2);
+ }
+ else if (p.StartsWith(textQualifier))
+ {
+ return p.Substring(textQualifier.Length);
+ }
+
+ return p;
+ }
+
+ private void DetectColumnTypes(string[] lines, List<AgateColumn> cols)
+ {
+ int start = 0;
+
+ if (firstRowFieldNames)
+ {
+ start = 1;
+
+ string[] text = SplitLine(lines[0], mergeDelimiters);
+
+ for (int i = 0; i < text.Length; i++)
+ {
+ if (cols.Count == i)
+ cols.Add(new AgateColumn());
+
+ if (text[i].StartsWith("\"") && text[i].EndsWith("\""))
+ {
+ text[i] = text[i].Substring(1, text[i].Length - 2);
+ }
+
+ cols[i].Name = text[i];
+
+ // set the most conservative field type.
+ cols[i].FieldType = FieldType.Boolean;
+ }
+ }
+
+ for (int i = start; i < lines.Length; i++)
+ {
+ int intTrial;
+ double doubleTrial;
+ decimal decimalTrial;
+ DateTime dateTrial;
+
+ if (lines[i].Trim().Length == 0)
+ continue;
+
+ string[] text = SplitLine(lines[i], mergeDelimiters);
+
+ for (int j = 0; j < text.Length; j++)
+ {
+ if (text[j] == "")
+ continue;
+
+ if (j < cols.Count && cols[j].FieldType == FieldType.String)
+ continue;
+
+ if (IsBoolCompatible(text[j]))
+ {
+ ColumnType(FieldType.Boolean, cols, j);
+ }
+ else if (int.TryParse(text[j], out intTrial))
+ {
+ ColumnType(FieldType.Int32, cols, j);
+ }
+ else if (double.TryParse(text[j], out doubleTrial))
+ {
+ ColumnType(FieldType.Double, cols, j);
+ }
+ else if (decimal.TryParse(text[j], out decimalTrial))
+ {
+ ColumnType(FieldType.Decimal, cols, j);
+ }
+ else if (DateTime.TryParse(text[j], out dateTrial))
+ {
+ ColumnType(FieldType.DateTime, cols, j);
+ }
+ else
+ {
+ ColumnType(FieldType.String, cols, j);
+ }
+ }
+ }
+
+ for (int i = 0; i < cols.Count; i++)
+ {
+ cols[i].DisplayIndex = i;
+ }
+ }
+
+ private static bool IsBoolCompatible(string text)
+ {
+ if (text == "0" || text == "1")
+ return true;
+
+ bool trial;
+ return bool.TryParse(text, out trial);
+
+ }
+
+ private void ColumnType(FieldType fieldType, List<AgateColumn> cols, int j)
+ {
+ if (j < cols.Count)
+ {
+ if (cols[j].FieldType == fieldType)
+ return;
+
+ // check to see if the data type can be promoted to what type is already in the field
+ if (CanPromoteFieldType(fieldType, cols[j].FieldType))
+ return;
+
+ // check to see if the field type can be promoted to the data type of the current data being imported.
+ if (CanPromoteFieldType(cols[j].FieldType, fieldType))
+ {
+ cols[j].FieldType = fieldType;
+ }
+ else
+ {
+ cols[j].FieldType = FieldType.String;
+ }
+ }
+ else
+ {
+ AgateColumn newCol = new AgateColumn();
+
+ newCol.FieldType = fieldType;
+
+ cols.Add(newCol);
+ }
+ }
+
+ private bool CanPromoteFieldType(FieldType currentType, FieldType toType)
+ {
+ if (toType == FieldType.DateTime)
+ return false;
+
+ switch (currentType)
+ {
+ case FieldType.Boolean:
+ return true;
+
+ case FieldType.Int32:
+ switch (toType)
+ {
+ case FieldType.Double:
+ case FieldType.Decimal:
+ return true;
+ }
+
+ return false;
+
+ case FieldType.Double:
+ switch (toType)
+ {
+ case FieldType.Decimal:
+ return true;
+ }
+
+ return false;
+ }
+
+ return false;
+ }
+
+ private string[] SplitLine(string line, bool removeEmpties)
+ {
+ List<string> retval = new List<string>();
+
+ bool inString = false;
+
+ int pos = 0;
+ int start = pos;
+ while (pos < line.Length)
+ {
+ if (Delimiters.Contains(line[pos]) && inString == false)
+ {
+ retval.Add(line.Substring(start, pos - start));
+
+ start = pos + 1;
+ }
+ else if (textQualifier != null && line.Substring(pos, textQualifier.Length) == textQualifier)
+ {
+ inString = !inString;
+ }
+
+ pos++;
+ }
+
+ retval.Add(line.Substring(start));
+
+ if (removeEmpties)
+ {
+ for (int i = 0; i < retval.Count; i++)
+ {
+ if (string.IsNullOrEmpty(retval[i]))
+ {
+ retval.RemoveAt(i);
+ i--;
+ }
+ }
+ }
+
+ return retval.ToArray();
+ }
+
+ private void lstColumns_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ propColumns.SelectedObject = lstColumns.SelectedItem;
+ }
+
+ private void btnOK_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ importedTable.Name = txtName.Text;
+ }
+ catch(Exception ex)
+ {
+ MessageBox.Show(this, ex.Message, "Error creating table", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+ DialogResult = DialogResult.None;
+
+ return;
+ }
+
+ Database.Tables.Add(importedTable);
+ }
+
+ private void propColumns_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ }
+}
Copied: trunk/Tools/DatabaseEditor/Import/frmImportTable.resx (from rev 1274, trunk/Tools/DatabaseEditor/frmImportTable.resx)
===================================================================
--- trunk/Tools/DatabaseEditor/Import/frmImportTable.resx (rev 0)
+++ trunk/Tools/DatabaseEditor/Import/frmImportTable.resx 2011-02-01 06:11:50 UTC (rev 1280)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="backgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>115, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
Modified: trunk/Tools/DatabaseEditor/frmEditor.cs
===================================================================
--- trunk/Tools/DatabaseEditor/frmEditor.cs 2011-02-01 00:01:08 UTC (rev 1279)
+++ trunk/Tools/DatabaseEditor/frmEditor.cs 2011-02-01 06:11:50 UTC (rev 1280)
@@ -168,14 +168,14 @@
}
private void importDataToolStripMenuItem_Click(object sender, EventArgs e)
{
- frmImportTable import = new frmImportTable();
+ Import.DatabaseImporter importer = new Import.DatabaseImporter();
- import.Database = databaseEditor1.Database;
+ importer.Database = databaseEditor1.Database;
- if (import.ShowDialog() == DialogResult.OK)
- {
- databaseEditor1.DatabaseRefresh();
- }
+ importer.Run();
+
+ databaseEditor1.DatabaseRefresh();
+
}
private void quitToolStripMenuItem_Click(object sender, EventArgs e)
{
Deleted: trunk/Tools/DatabaseEditor/frmImportTable.Designer.cs
===================================================================
--- trunk/Tools/DatabaseEditor/frmImportTable.Designer.cs 2011-02-01 00:01:08 UTC (rev 1279)
+++ trunk/Tools/DatabaseEditor/frmImportTable.Designer.cs 2011-02-01 06:11:50 UTC (rev 1280)
@@ -1,405 +0,0 @@
-namespace AgateDatabaseEditor
-{
- partial class frmImportTable
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- this.txtFileContents = new System.Windows.Forms.TextBox();
- this.btnOK = new System.Windows.Forms.Button();
- this.btnCancel = new System.Windows.Forms.Button();
- this.hSeparator1 = new ERY.NotebookLib.HSeparator();
- this.openFile = new System.Windows.Forms.OpenFileDialog();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.txtOther = new System.Windows.Forms.TextBox();
- this.chkOther = new System.Windows.Forms.CheckBox();
- this.chkSpace = new System.Windows.Forms.CheckBox();
- this.chkTab = new System.Windows.Forms.CheckBox();
- this.chkSemicolon = new System.Windows.Forms.CheckBox();
- this.chkComma = new System.Windows.Forms.CheckBox();
- this.cboTextQualifier = new System.Windows.Forms.ComboBox();
- this.label1 = new System.Windows.Forms.Label();
- this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
- this.chkFirstRow = new System.Windows.Forms.CheckBox();
- this.label2 = new System.Windows.Forms.Label();
- this.txtName = new System.Windows.Forms.TextBox();
- this.pnlTableWarning = new System.Windows.Forms.Panel();
- this.label3 = new System.Windows.Forms.Label();
- this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.lstColumns = new System.Windows.Forms.ListBox();
- this.label4 = new System.Windows.Forms.Label();
- this.propColumns = new System.Windows.Forms.PropertyGrid();
- this.panel1 = new System.Windows.Forms.Panel();
- this.chkMergeDelimiters = new System.Windows.Forms.CheckBox();
- this.groupBox1.SuspendLayout();
- this.pnlTableWarning.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
- this.panel1.SuspendLayout();
- this.SuspendLayout();
- //
- // txtFileContents
- //
- this.txtFileContents.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.txtFileContents.Location = new System.Drawing.Point(12, 93);
- this.txtFileContents.Multiline = true;
- this.txtFileContents.Name = "txtFileContents";
- this.txtFileContents.ReadOnly = true;
- this.txtFileContents.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.txtFileContents.Size = new System.Drawing.Size(533, 138);
- this.txtFileContents.TabIndex = 0;
- //
- // btnOK
- //
- this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.btnOK.Location = new System.Drawing.Point(389, 512);
- this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(75, 23);
- this.btnOK.TabIndex = 1;
- this.btnOK.Text = "OK";
- this.btnOK.UseVisualStyleBackColor = true;
- this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
- //
- // btnCancel
- //
- this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(470, 512);
- this.btnCancel.Name = "btnCancel";
- this.btnCancel.Size = new System.Drawing.Size(75, 23);
- this.btnCancel.TabIndex = 2;
- this.btnCancel.Text = "Cancel";
- this.btnCancel.UseVisualStyleBackColor = true;
- //
- // hSeparator1
- //
- this.hSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.hSeparator1.Location = new System.Drawing.Point(12, 235);
- this.hSeparator1.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
- this.hSeparator1.MaximumSize = new System.Drawing.Size(10000, 4);
- this.hSeparator1.MinimumSize = new System.Drawing.Size(0, 4);
- this.hSeparator1.Name = "hSeparator1";
- this.hSeparator1.Size = new System.Drawing.Size(533, 4);
- this.hSeparator1.TabIndex = 3;
- this.hSeparator1.TabStop = true;
- //
- // openFile
- //
- this.openFile.FileName = "openFileDialog1";
- this.openFile.Filter = "Text Files (*.txt,*.csv)|*.txt;*.csv|All Files|*.*";
- //
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.chkMergeDelimiters);
- this.groupBox1.Controls.Add(this.txtOther);
- this.groupBox1.Controls.Add(this.chkOther);
- this.groupBox1.Controls.Add(this.chkSpace);
- this.groupBox1.Controls.Add(this.chkTab);
- this.groupBox1.Controls.Add(this.chkSemicolon);
- this.groupBox1.Controls.Add(this.chkComma);
- this.groupBox1.Location = new System.Drawing.Point(12, 12);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(354, 75);
- this.groupBox1.TabIndex = 4;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Delimiters";
- //
- // txtOther
- //
- this.txtOther.Location = new System.Drawing.Point(287, 23);
- this.txtOther.MaxLength = 1;
- this.txtOther.Name = "txtOther";
- this.txtOther.Size = new System.Drawing.Size(23, 20);
- this.txtOther.TabIndex = 5;
- this.txtOther.TextChanged += new System.EventHandler(this.DelimiterCheck_CheckedChanged);
- //
- // chkOther
- //
- this.chkOther.AutoSize = true;
- this.chkOther.Location = new System.Drawing.Point(226, 25);
- this.chkOther.Name = "chkOther";
- this.chkOther.Size = new System.Drawing.Size(55, 17);
- this.chkOther.TabIndex = 4;
- this.chkOther.Text = "Other:";
- this.chkOther.UseVisualStyleBackColor = true;
- this.chkOther.CheckedChanged += new System.EventHandler(this.DelimiterCheck_CheckedChanged);
- //
- // chkSpace
- //
- this.chkSpace.AutoSize = true;
- this.chkSpace.Location = new System.Drawing.Point(113, 48);
- this.chkSpace.Name = "chkSpace";
- this.chkSpace.Size = new System.Drawing.Size(57, 17);
- this.chkSpace.TabIndex = 3;
- this.chkSpace.Text = "Space";
- this.chkSpace.UseVisualStyleBackColor = true;
- this.chkSpace.CheckedChanged += new System.EventHandler(this.DelimiterCheck_CheckedChanged);
- //
- // chkTab
- //
- this.chkTab.AutoSize = true;
- this.chkTab.Location = new System.Drawing.Point(17, 48);
- this.chkTab.Name = "chkTab";
- this.chkTab.Size = new System.Drawing.Size(45, 17);
- this.chkTab.TabIndex = 2;
- this.chkTab.Text = "Tab";
- this.chkTab.UseVisualStyleBackColor = true;
- this.chkTab.CheckedChanged += new System.EventHandler(this.DelimiterCheck_CheckedChanged);
- //
- // chkSemicolon
- //
- this.chkSemicolon.AutoSize = true;
- this.chkSemicolon.Location = new System.Drawing.Point(113, 25);
- this.chkSemicolon.Name = "chkSemicolon";
- this.chkSemicolon.Size = new System.Drawing.Size(75, 17);
- this.chkSemicolon.TabIndex = 1;
- this.chkSemicolon.Text = "Semicolon";
- this.chkSemicolon.UseVisualStyleBackColor = true;
- this.chkSemicolon.CheckedChanged += new System.EventHandler(this.DelimiterCheck_CheckedChanged);
- //
- // chkComma
- //
- this.chkComma.AutoSize = true;
- this.chkComma.Checked = true;
- this.chkComma.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkComma.Location = new System.Drawing.Point(17, 25);
- this.chkComma.Name = "chkComma";
- this.chkComma.Size = new System.Drawing.Size(61, 17);
- this.chkComma.TabIndex = 0;
- this.chkComma.Text = "Comma";
- this.chkComma.UseVisualStyleBackColor = true;
- this.chkComma.CheckedChanged += new System.EventHandler(this.DelimiterCheck_CheckedChanged);
- //
- // cboTextQualifier
- //
- this.cboTextQualifier.FormattingEnabled = true;
- this.cboTextQualifier.Items.AddRange(new object[] {
- "{none}",
- "\'",
- "\""});
- this.cboTextQualifier.Location = new System.Drawing.Point(456, 22);
- this.cboTextQualifier.Name = "cboTextQualifier";
- this.cboTextQualifier.Size = new System.Drawing.Size(61, 21);
- this.cboTextQualifier.TabIndex = 5;
- this.cboTextQualifier.Text = "\"";
- this.cboTextQualifier.TextChanged += new System.EventHandler(this.comboBox1_TextChanged);
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(378, 25);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(72, 13);
- this.label1.TabIndex = 6;
- this.label1.Text = "Text Qualifier:";
- //
- // backgroundWorker1
- //
- this.backgroundWorker1.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker1_DoWork);
- this.backgroundWorker1.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker1_RunWorkerCompleted);
- //
- // chkFirstRow
- //
- this.chkFirstRow.AutoSize = true;
- this.chkFirstRow.Checked = true;
- this.chkFirstRow.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkFirstRow.Location = new System.Drawing.Point(381, 60);
- this.chkFirstRow.Name = "chkFirstRow";
- this.chkFirstRow.Size = new System.Drawing.Size(164, 17);
- this.chkFirstRow.TabIndex = 7;
- this.chkFirstRow.Text = "First row contains field names";
- this.chkFirstRow.UseVisualStyleBackColor = true;
- this.chkFirstRow.CheckedChanged += new System.EventHandler(this.chkFirstRow_CheckedChanged);
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(12, 255);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(68, 13);
- this.label2.TabIndex = 8;
- this.label2.Text = "Table Name:";
- //
- // txtName
- //
- this.txtName.Location = new System.Drawing.Point(86, 252);
- this.txtName.Name = "txtName";
- this.txtName.Size = new System.Drawing.Size(157, 20);
- this.txtName.TabIndex = 9;
- this.txtName.TextChanged += new System.EventHandler(this.txtName_TextChanged);
- //
- // pnlTableWarning
- //
- this.pnlTableWarning.Controls.Add(this.label3);
- this.pnlTableWarning.Controls.Add(this.pictureBox1);
- this.pnlTableWarning.Location = new System.Drawing.Point(250, 243);
- this.pnlTableWarning.Name = "pnlTableWarning";
- this.pnlTableWarning.Size = new System.Drawing.Size(295, 37);
- this.pnlTableWarning.TabIndex = 10;
- this.pnlTableWarning.Visible = false;
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(27, 12);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(226, 13);
- this.label3.TabIndex = 1;
- this.label3.Text = "There is already a table by the specified name.";
- //
- // pictureBox1
- //
- this.pictureBox1.Image = global::AgateDatabaseEditor.Properties.Resources.warning;
- this.pictureBox1.Location = new System.Drawing.Point(5, 9);
- this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(16, 16);
- this.pictureBox1.TabIndex = 0;
- this.pictureBox1.TabStop = false;
- //
- // lstColumns
- //
- this.lstColumns.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)));
- this.lstColumns.Enabled = false;
- this.lstColumns.FormattingEnabled = true;
- this.lstColumns.Location = new System.Drawing.Point(3, 16);
- this.lstColumns.Name = "lstColumns";
- this.lstColumns.Size = new System.Drawing.Size(120, 199);
- this.lstColumns.TabIndex = 11;
- this.lstColumns.SelectedIndexChanged += new System.EventHandler(this.lstColumns_SelectedIndexChanged);
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(3, 0);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(47, 13);
- this.label4.TabIndex = 12;
- this.label4.Text = "Columns";
- //
- // propColumns
- //
- this.propColumns.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.propColumns.CommandsVisibleIfAvailable = false;
- this.propColumns.Enabled = false;
- this.propColumns.HelpVisible = false;
- this.propColumns.Location = new System.Drawing.Point(129, 16);
- this.propColumns.Name = "propColumns";
- this.propColumns.Size = new System.Drawing.Size(401, 201);
- this.propColumns.TabIndex = 13;
- //
- // panel1
- //
- this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.panel1.Controls.Add(this.label4);
- this.panel1.Controls.Add(this.propColumns);
- this.panel1.Controls.Add(this.lstColumns);
- this.panel1.Location = new System.Drawing.Point(12, 286);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(533, 220);
- this.panel1.TabIndex = 14;
- //
- // chkMergeDelimiters
- //
- this.chkMergeDelimiters.AutoSize = true;
- this.chkMergeDelimiters.Location = new System.Drawing.Point(226, 48);
- this.chkMergeDelimiters.Name = "chkMergeDelimiters";
- this.chkMergeDelimiters.Size = new System.Drawing.Size(104, 17);
- this.chkMergeDelimiters.TabIndex = 15;
- this.chkMergeDelimiters.Text = "Merge Delimiters";
- this.chkMergeDelimiters.UseVisualStyleBackColor = true;
- this.chkMergeDelimiters.CheckedChanged += new System.EventHandler(this.chkMergeDelimiters_CheckedChanged);
- //
- // frmImportTable
- //
- this.AcceptButton = this.btnOK;
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.CancelButton = this.btnCancel;
- this.ClientSize = new System.Drawing.Size(557, 547);
- this.Controls.Add(this.panel1);
- this.Controls.Add(this.pnlTableWarning);
- this.Controls.Add(this.txtName);
- this.Controls.Add(this.label2);
- this.Controls.Add(this.chkFirstRow);
- this.Controls.Add(this.label1);
- this.Controls.Add(this.cboTextQualifier);
- this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.hSeparator1);
- this.Controls.Add(this.btnCancel);
- this.Controls.Add(this.btnOK);
- this.Controls.Add(this.txtFileContents);
- this.Name = "frmImportTable";
- this.Text = "Import Data";
- this.Load += new System.EventHandler(this.frmImportData_Load);
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- this.pnlTableWarning.ResumeLayout(false);
- this.pnlTableWarning.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
-
- private System.Windows.Forms.TextBox txtFileContents;
- private System.Windows.Forms.Button btnOK;
- private System.Windows.Forms.Button btnCancel;
- private ERY.NotebookLib.HSeparator hSeparator1;
- private System.Windows.Forms.OpenFileDialog openFile;
- private System.Windows.Forms.GroupBox groupBox1;
- private System.Windows.Forms.TextBox txtOther;
- private System.Windows.Forms.CheckBox chkOther;
- private System.Windows.Forms.CheckBox chkSpace;
- private System.Windows.Forms.CheckBox chkTab;
- private System.Windows.Forms.CheckBox chkSemicolon;
- private System.Windows.Forms.CheckBox chkComma;
- private System.Windows.Forms.ComboBox cboTextQualifier;
- private System.Windows.Forms.Label label1;
- private System.ComponentModel.BackgroundWorker backgroundWorker1;
- private System.Windows.Forms.CheckBox chkFirstRow;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox txtName;
- private System.Windows.Forms.Panel pnlTableWarning;
- private System.Windows.Forms.PictureBox pictureBox1;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.ListBox lstColumns;
- private System.Windows.Forms.Label label4;
- private System.Windows.Forms.PropertyGrid propColumns;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.CheckBox chkMergeDelimiters;
- }
-}
\ No newline at end of file
Deleted: trunk/Tools/DatabaseEditor/frmImportTable.cs
===================================================================
--- trunk/Tools/DatabaseEditor/frmImportTable.cs 2011-02-01 00:01:08 UTC (rev 1279)
+++ trunk/Tools/DatabaseEditor/frmImportTable.cs 2011-02-01 06:11:50 UTC (rev 1280)
@@ -1,453 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using AgateLib.Data;
-
-namespace AgateDatabaseEditor
-{
- public partial class frmImportTable : Form
- {
- string fileContents;
-
- public frmImportTable()
- {
- InitializeComponent();
-
- UpdateDelimiters();
- textQualifier = cboTextQualifier.Text;
- }
-
- public AgateDatabase Database { get; set; }
- char[] Delimiters;
- string textQualifier;
- bool firstRowFieldNames = true;
- bool mergeDelimiters = false;
- AgateTable importedTable;
-
- private void frmImportData_Load(object sender, EventArgs e)
- {
- if (openFile.ShowDialog() == DialogResult.Cancel)
- {
- Close();
- return;
- }
-
- fileContents = System.IO.File.ReadAllText(openFile.FileName);
-
- txtName.Text = System.IO.Path.GetFileNameWithoutExtension(openFile.FileName);
- txtFileContents.Text = fileContents;
-
- RedoImport();
- }
-
- private void DelimiterCheck_CheckedChanged(object sender, EventArgs e)
- {
- UpdateDelimiters();
- RedoImport();
- }
-
- private void UpdateDelimiters()
- {
- List<char> delim = new List<char>();
-
- if (chkComma.Checked) delim.Add(',');
- if (chkSemicolon.Checked) delim.Add(';');
- if (chkSpace.Checked) delim.Add(' ');
- if (chkTab.Checked) delim.Add('\t');
- if (chkOther.Checked && txtOther.Text.Length > 0)
- delim.Add(txtOther.Text[0]);
-
- Delimiters = delim.ToArray();
- }
-
-
- private void chkMergeDelimiters_CheckedChanged(object sender, EventArgs e)
- {
- mergeDelimiters = chkMergeDelimiters.Checked;
- RedoImport();
- }
-
- private void comboBox1_TextChanged(object sender, EventArgs e)
- {
- if (cboTextQualifier.Text != "{none}")
- {
- textQualifier = cboTextQualifier.Text;
- }
- else
- textQualifier = null;
-
- RedoImport();
- }
-
- private void chkFirstRow_CheckedChanged(object sender, EventArgs e)
- {
- firstRowFieldNames = chkFirstRow.Checked;
-
- RedoImport();
- }
- private void RedoImport()
- {
- btnOK.Enabled = false;
- lstColumns.Enabled = false;
- propColumns.Enabled = false;
- lstColumns.Items.Clear();
-
- if (backgroundWorker1.IsBusy)
- backgroundWorker1.CancelAsync();
-
- backgroundWorker1.RunWorkerAsync();
- }
-
- private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e)
- {
- importedTable = null;
-
- string[] lines = fileContents.Split('\n');
- for (int i = 0; i < lines.Length; i++)
- {
- if (lines[i].EndsWith("\r"))
- {
- lines[i] = lines[i].Substring(0, lines[i].Length - 1);
- }
- }
-
- List<AgateColumn> cols = new List<AgateColumn>();
- DetectColumnTypes(lines, cols);
-
- if (firstRowFieldNames)
- SetColumnNames(lines[0], cols);
- else
- SetDefaultColumnNames(cols);
-
-
-
- AgateTable tbl = ImportTable(lines, cols);
-
- importedTable = tbl;
- }
-
- private...
[truncated message content] |
|
From: <ka...@us...> - 2011-02-01 00:01:15
|
Revision: 1279
http://agate.svn.sourceforge.net/agate/?rev=1279&view=rev
Author: kanato
Date: 2011-02-01 00:01:08 +0000 (Tue, 01 Feb 2011)
Log Message:
-----------
Fixes to some tests.
Modified Paths:
--------------
trunk/Tests/AudioTests/AudioPlayer/frmAudioPlayer.cs
trunk/Tests/DisplayTests/PixelBufferMask.cs
Modified: trunk/Tests/AudioTests/AudioPlayer/frmAudioPlayer.cs
===================================================================
--- trunk/Tests/AudioTests/AudioPlayer/frmAudioPlayer.cs 2011-01-31 23:53:32 UTC (rev 1278)
+++ trunk/Tests/AudioTests/AudioPlayer/frmAudioPlayer.cs 2011-02-01 00:01:08 UTC (rev 1279)
@@ -109,7 +109,7 @@
lstFiles.Items.Clear();
string[] files = Directory.GetFiles(Directory.GetCurrentDirectory());
- string extensions = ".mid .mp3 .wav .wma .ogg";
+ string extensions = ".mid .wav .wma .ogg";
foreach (string filename in files)
{
Modified: trunk/Tests/DisplayTests/PixelBufferMask.cs
===================================================================
--- trunk/Tests/DisplayTests/PixelBufferMask.cs 2011-01-31 23:53:32 UTC (rev 1278)
+++ trunk/Tests/DisplayTests/PixelBufferMask.cs 2011-02-01 00:01:08 UTC (rev 1279)
@@ -69,8 +69,14 @@
for (int x = 0; x < pbMaskCircle.Width; x++)
{
+ if (mX + x >= pbBg.Width)
+ break;
+
for (int y = 0; y < pbMaskCircle.Height; y++)
{
+ if (mY + y >= pbBg.Height)
+ break;
+
if (pbMaskCircle.GetPixel(x, y) == Color.FromArgb(255, 0, 0, 0))
pbBg.SetPixel(mX + x, mY + y, Color.FromArgb(0, 0, 0, 0));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-31 23:53:38
|
Revision: 1278
http://agate.svn.sourceforge.net/agate/?rev=1278&view=rev
Author: kanato
Date: 2011-01-31 23:53:32 +0000 (Mon, 31 Jan 2011)
Log Message:
-----------
Fix automatic naming of tables.
Fix ordering of columns in tables.
Modified Paths:
--------------
trunk/Tools/DatabaseEditor/DatabaseEditor.cs
trunk/Tools/DatabaseEditor/frmDesignTable.cs
Modified: trunk/Tools/DatabaseEditor/DatabaseEditor.cs
===================================================================
--- trunk/Tools/DatabaseEditor/DatabaseEditor.cs 2011-01-13 19:29:17 UTC (rev 1277)
+++ trunk/Tools/DatabaseEditor/DatabaseEditor.cs 2011-01-31 23:53:32 UTC (rev 1278)
@@ -235,6 +235,11 @@
IncrementTableName(tbl);
+ while (Database.Tables.ContainsTable(tbl.Name))
+ {
+ IncrementTableName(tbl);
+ }
+
Database.Tables.Add(tbl);
frmDesignTable.EditColumns(Database, tbl);
Modified: trunk/Tools/DatabaseEditor/frmDesignTable.cs
===================================================================
--- trunk/Tools/DatabaseEditor/frmDesignTable.cs 2011-01-13 19:29:17 UTC (rev 1277)
+++ trunk/Tools/DatabaseEditor/frmDesignTable.cs 2011-01-31 23:53:32 UTC (rev 1278)
@@ -53,7 +53,9 @@
mTable = value;
- gridColumns.RowCount = mTable.Columns.Count+1;
+ cboTableLookup.Items.Remove(value);
+
+ gridColumns.RowCount = mTable.Columns.Count + 1;
}
}
@@ -130,6 +132,8 @@
{
this.mColumnInEdit = new AgateColumn();
this.mRowInEdit = gridColumns.Rows.Count - 1;
+
+ this.mColumnInEdit.DisplayIndex = gridColumns.Rows.Count - 1;
}
private void gridColumns_RowValidated(object sender, DataGridViewCellEventArgs e)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-13 19:29:28
|
Revision: 1277
http://agate.svn.sourceforge.net/agate/?rev=1277&view=rev
Author: kanato
Date: 2011-01-13 19:29:17 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
Fix Surface.WritePixels overload when there is a specified startPoint with Direct3D.
Modified Paths:
--------------
trunk/AgateLib/DisplayLib/PixelBuffer.cs
trunk/AgateLib/DisplayLib/Surface.cs
trunk/Drivers/AgateSDX/SDX_Surface.cs
trunk/Tests/DisplayTests/PixelBufferMask.cs
Modified: trunk/AgateLib/DisplayLib/PixelBuffer.cs
===================================================================
--- trunk/AgateLib/DisplayLib/PixelBuffer.cs 2011-01-13 16:15:47 UTC (rev 1276)
+++ trunk/AgateLib/DisplayLib/PixelBuffer.cs 2011-01-13 19:29:17 UTC (rev 1277)
@@ -496,6 +496,9 @@
if (srcRect.X < 0 || srcRect.Y < 0 || srcRect.Right > buffer.Width || srcRect.Bottom > buffer.Height)
throw new ArgumentOutOfRangeException("srcRect", "Source rectangle outside size of buffer!");
+ if (destPt.X < 0 || destPt.Y < 0)
+ throw new ArgumentOutOfRangeException("destPt", "Destination cannot be less than zero.");
+
if (buffer.RowStride == RowStride && buffer.PixelFormat == PixelFormat && destPt.X == 0)
{
int destIndex = GetPixelIndex(destPt.X, destPt.Y);
Modified: trunk/AgateLib/DisplayLib/Surface.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Surface.cs 2011-01-13 16:15:47 UTC (rev 1276)
+++ trunk/AgateLib/DisplayLib/Surface.cs 2011-01-13 19:29:17 UTC (rev 1277)
@@ -796,6 +796,7 @@
/// writing pixel data.</param>
public void WritePixels(PixelBuffer buffer, Rectangle sourceRect, Point destPt)
{
+ // TODO: add validation on the rectangle, and only do the copy if the rectangle doesn't match the buffer dimensions.
PixelBuffer smallBuffer = new PixelBuffer(buffer, sourceRect);
WritePixels(smallBuffer, destPt);
Modified: trunk/Drivers/AgateSDX/SDX_Surface.cs
===================================================================
--- trunk/Drivers/AgateSDX/SDX_Surface.cs 2011-01-13 16:15:47 UTC (rev 1276)
+++ trunk/Drivers/AgateSDX/SDX_Surface.cs 2011-01-13 19:29:17 UTC (rev 1277)
@@ -649,20 +649,24 @@
surf.Dispose();
+ // This should probably only lock the region of the surface we intend to update.
+ // However, as is usually the case with DirectX, doing so gives weird errors
+ // with no real explanation as to what is wrong.
DataRectangle stm = mTexture.Value.LockRectangle
- (0, Interop.Convert(updateRect), LockFlags.Discard);
+ (0, LockFlags.None);
if (buffer.PixelFormat != pixelFormat)
buffer = buffer.ConvertTo(pixelFormat);
unsafe
{
- for (int i = updateRect.Top; i < updateRect.Bottom; i++)
+ for (int i = 0; i < buffer.Height; i++)
{
int startIndex = buffer.GetPixelIndex(0, i);
int rowStride = buffer.RowStride;
IntPtr dest = (IntPtr)
- ((byte*)stm.Data.DataPointer + i * stm.Pitch + updateRect.Left * pixelPitch);
+ ((byte*)stm.Data.DataPointer + (i + updateRect.Top) * stm.Pitch
+ + updateRect.Left * pixelPitch);
Marshal.Copy(buffer.Data, startIndex, dest, rowStride);
}
Modified: trunk/Tests/DisplayTests/PixelBufferMask.cs
===================================================================
--- trunk/Tests/DisplayTests/PixelBufferMask.cs 2011-01-13 16:15:47 UTC (rev 1276)
+++ trunk/Tests/DisplayTests/PixelBufferMask.cs 2011-01-13 19:29:17 UTC (rev 1277)
@@ -11,8 +11,6 @@
{
class PixelBufferMask : IAgateTest
{
- #region IAgateTest Members
-
public string Name
{
get { return "Pixel Buffer Masking"; }
@@ -27,8 +25,7 @@
{
using (AgateSetup setup = new AgateSetup())
{
- bool isRunning = false;
-
+ setup.AskUser = true;
setup.InitializeAll();
if (setup.WasCanceled)
@@ -54,17 +51,14 @@
surfRealBg.WritePixels(pbBg);
- isRunning = true;
-
- while (isRunning)
+ while (Display.CurrentWindow.IsClosed == false)
{
Display.CurrentWindow.Title = Display.FramesPerSecond.ToString();
Display.BeginFrame();
if (Keyboard.Keys[KeyCode.Escape])
- isRunning = false;
+ return;
-
if (Mouse.Buttons[Mouse.MouseButtons.Primary])
{
int mX = Mouse.X;
@@ -93,7 +87,5 @@
}
}
}
-
- #endregion
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-13 16:15:55
|
Revision: 1276
http://agate.svn.sourceforge.net/agate/?rev=1276&view=rev
Author: kanato
Date: 2011-01-13 16:15:47 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
Added PixelBufferMask.cs test.
Modified Paths:
--------------
trunk/Tests/Tests.csproj
Added Paths:
-----------
trunk/Tests/Data/mask_bg-bricks.png
trunk/Tests/Data/mask_circle.png
trunk/Tests/DisplayTests/PixelBufferMask.cs
Added: trunk/Tests/Data/mask_bg-bricks.png
===================================================================
(Binary files differ)
Property changes on: trunk/Tests/Data/mask_bg-bricks.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tests/Data/mask_circle.png
===================================================================
(Binary files differ)
Property changes on: trunk/Tests/Data/mask_circle.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tests/DisplayTests/PixelBufferMask.cs
===================================================================
--- trunk/Tests/DisplayTests/PixelBufferMask.cs (rev 0)
+++ trunk/Tests/DisplayTests/PixelBufferMask.cs 2011-01-13 16:15:47 UTC (rev 1276)
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AgateLib;
+using AgateLib.DisplayLib;
+using AgateLib.Geometry;
+using AgateLib.InputLib;
+
+namespace Tests.DisplayTests
+{
+ class PixelBufferMask : IAgateTest
+ {
+ #region IAgateTest Members
+
+ public string Name
+ {
+ get { return "Pixel Buffer Masking"; }
+ }
+
+ public string Category
+ {
+ get { return "Display"; }
+ }
+
+ public void Main(string[] args)
+ {
+ using (AgateSetup setup = new AgateSetup())
+ {
+ bool isRunning = false;
+
+ setup.InitializeAll();
+
+ if (setup.WasCanceled)
+ return;
+
+ DisplayWindow window = DisplayWindow.CreateWindowed("Test", 800, 600);
+
+ PixelBuffer pbMaskBg = PixelBuffer.FromFile("mask_bg-bricks.png");
+ PixelBuffer pbBg = PixelBuffer.FromFile("bg-bricks.png");
+ PixelBuffer pbMaskCircle = PixelBuffer.FromFile("mask_circle.png");
+
+ Surface surfRealBg = new Surface(pbMaskBg.Size);
+
+
+ for (int x = 0; x < pbMaskBg.Width; x++)
+ {
+ for (int y = 0; y < pbMaskBg.Height; y++)
+ {
+ if (pbMaskBg.GetPixel(x, y) == Color.FromArgb(255, 0, 0, 0))
+ pbBg.SetPixel(x, y, Color.FromArgb(0, 0, 0, 0));
+ }
+ }
+
+ surfRealBg.WritePixels(pbBg);
+
+ isRunning = true;
+
+ while (isRunning)
+ {
+ Display.CurrentWindow.Title = Display.FramesPerSecond.ToString();
+ Display.BeginFrame();
+
+ if (Keyboard.Keys[KeyCode.Escape])
+ isRunning = false;
+
+
+ if (Mouse.Buttons[Mouse.MouseButtons.Primary])
+ {
+ int mX = Mouse.X;
+ int mY = Mouse.Y;
+
+ Rectangle rect = new Rectangle(mX, mY, pbMaskCircle.Width, pbMaskCircle.Height);
+ Point p = new Point(mX, mY);
+
+ for (int x = 0; x < pbMaskCircle.Width; x++)
+ {
+ for (int y = 0; y < pbMaskCircle.Height; y++)
+ {
+ if (pbMaskCircle.GetPixel(x, y) == Color.FromArgb(255, 0, 0, 0))
+ pbBg.SetPixel(mX + x, mY + y, Color.FromArgb(0, 0, 0, 0));
+ }
+ }
+
+ surfRealBg.WritePixels(pbBg, rect, p);
+ }
+
+ Display.Clear(Color.Blue);
+ surfRealBg.Draw();
+
+ Display.EndFrame();
+ Core.KeepAlive();
+ }
+ }
+ }
+
+ #endregion
+ }
+}
Modified: trunk/Tests/Tests.csproj
===================================================================
--- trunk/Tests/Tests.csproj 2011-01-11 02:02:44 UTC (rev 1275)
+++ trunk/Tests/Tests.csproj 2011-01-13 16:15:47 UTC (rev 1276)
@@ -138,6 +138,7 @@
<Compile Include="DisplayTests\Capabilities\frmCapabilities.Designer.cs">
<DependentUpon>frmCapabilities.cs</DependentUpon>
</Compile>
+ <Compile Include="DisplayTests\PixelBufferMask.cs" />
<Compile Include="DisplayTests\ClipRect.cs" />
<Compile Include="DisplayTests\Prerendered.cs" />
<Compile Include="Fonts\Builtin.cs" />
@@ -522,6 +523,14 @@
<Name>AgateLib.WinForms</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Content Include="Data\mask_bg-bricks.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Data\mask_circle.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-11 02:02:52
|
Revision: 1275
http://agate.svn.sourceforge.net/agate/?rev=1275&view=rev
Author: kanato
Date: 2011-01-11 02:02:44 +0000 (Tue, 11 Jan 2011)
Log Message:
-----------
Add documentation to WritePixels method.
Modified Paths:
--------------
trunk/AgateLib/DisplayLib/Surface.cs
Modified: trunk/AgateLib/DisplayLib/Surface.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Surface.cs 2011-01-10 23:23:10 UTC (rev 1274)
+++ trunk/AgateLib/DisplayLib/Surface.cs 2011-01-11 02:02:44 UTC (rev 1275)
@@ -774,7 +774,8 @@
/// pixel data. The PixelBuffer must fit within the surface.
/// </summary>
/// <param name="buffer">The PixelBuffer which contains pixel data to copy from.</param>
- /// <param name="startPoint"></param>
+ /// <param name="startPoint">The location of the upper left corner on the Surface to start
+ /// writing pixel data.</param>
public void WritePixels(PixelBuffer buffer, Point startPoint)
{
if (startPoint.X + buffer.Width > SurfaceWidth ||
@@ -789,9 +790,10 @@
/// of the surface's pixel data. The selected source rectangle from the pixel buffer must
/// fit within the surface.
/// </summary>
- /// <param name="buffer"></param>
- /// <param name="sourceRect"></param>
- /// <param name="destPt"></param>
+ /// <param name="buffer">The PixelBuffer which contains pixel data to copy from.</param>
+ /// <param name="sourceRect">The rectangle to copy source data from on the PixelBuffer object.</param>
+ /// <param name="destPt">The location of the upper left corner on the Surface to start
+ /// writing pixel data.</param>
public void WritePixels(PixelBuffer buffer, Rectangle sourceRect, Point destPt)
{
PixelBuffer smallBuffer = new PixelBuffer(buffer, sourceRect);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-10 23:23:16
|
Revision: 1274
http://agate.svn.sourceforge.net/agate/?rev=1274&view=rev
Author: kanato
Date: 2011-01-10 23:23:10 +0000 (Mon, 10 Jan 2011)
Log Message:
-----------
* DisplayLib/DisplayCapsInfo.cs: Fix some documentation text.
Modified Paths:
--------------
trunk/AgateLib/DisplayLib/DisplayCapsInfo.cs
Modified: trunk/AgateLib/DisplayLib/DisplayCapsInfo.cs
===================================================================
--- trunk/AgateLib/DisplayLib/DisplayCapsInfo.cs 2011-01-10 21:18:31 UTC (rev 1273)
+++ trunk/AgateLib/DisplayLib/DisplayCapsInfo.cs 2011-01-10 23:23:10 UTC (rev 1274)
@@ -168,7 +168,7 @@
/// </summary>
PixelAlpha,
/// <summary>
- /// Indicates whether there is hardware acceleration available for 2D and 3D drawing.
+ /// Indicates whether there is hardware acceleration available for 2D scaling and rotations.
/// </summary>
IsHardwareAccelerated,
/// <summary>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-10 21:18:38
|
Revision: 1273
http://agate.svn.sourceforge.net/agate/?rev=1273&view=rev
Author: kanato
Date: 2011-01-10 21:18:31 +0000 (Mon, 10 Jan 2011)
Log Message:
-----------
Fix clip rect projection matrix for AgateOTK
Modified Paths:
--------------
trunk/AgateLib/AgateLib.csproj
trunk/AgateLib/DisplayLib/Shaders/AgateShader.cs
trunk/AgateLib/DisplayLib/Shaders/Basic2DShader.cs
trunk/AgateLib/DisplayLib/Shaders/Implementation/AgateShaderImpl.cs
trunk/AgateLib/DisplayLib/Shaders/Implementation/Basic2DImpl.cs
trunk/AgateLib/DisplayLib/Shaders/Implementation/Lighting2DImpl.cs
trunk/AgateLib/DisplayLib/Shaders/Lighting2D.cs
trunk/Drivers/AgateOTK/GL_Display.cs
trunk/Drivers/AgateOTK/Legacy/FixedFunction/OTK_FF_Basic2DShader.cs
trunk/Drivers/AgateOTK/Legacy/FixedFunction/OTK_FF_Lighting2D.cs
Added Paths:
-----------
trunk/AgateLib/DisplayLib/Shaders/IShader2D.cs
Modified: trunk/AgateLib/AgateLib.csproj
===================================================================
--- trunk/AgateLib/AgateLib.csproj 2011-01-09 18:53:59 UTC (rev 1272)
+++ trunk/AgateLib/AgateLib.csproj 2011-01-10 21:18:31 UTC (rev 1273)
@@ -584,6 +584,7 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>DataResources.Designer.cs</LastGenOutput>
</EmbeddedResource>
+ <Compile Include="DisplayLib\Shaders\IShader2D.cs" />
</ItemGroup>
<ItemGroup>
<None Include="InternalResources\agate-black-gui.zip" />
Modified: trunk/AgateLib/DisplayLib/Shaders/AgateShader.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Shaders/AgateShader.cs 2011-01-09 18:53:59 UTC (rev 1272)
+++ trunk/AgateLib/DisplayLib/Shaders/AgateShader.cs 2011-01-10 21:18:31 UTC (rev 1273)
@@ -83,5 +83,6 @@
{
Display.Shader = this;
}
+
}
}
Modified: trunk/AgateLib/DisplayLib/Shaders/Basic2DShader.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Shaders/Basic2DShader.cs 2011-01-09 18:53:59 UTC (rev 1272)
+++ trunk/AgateLib/DisplayLib/Shaders/Basic2DShader.cs 2011-01-10 21:18:31 UTC (rev 1273)
@@ -29,7 +29,7 @@
/// The default 2D shader. This shader supports no effects, and must be implemented
/// by every AgateLib display driver.
/// </summary>
- public class Basic2DShader : AgateInternalShader
+ public class Basic2DShader : AgateInternalShader, IShader2D
{
/// <summary>
/// Constructs a 2D shader.
Added: trunk/AgateLib/DisplayLib/Shaders/IShader2D.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Shaders/IShader2D.cs (rev 0)
+++ trunk/AgateLib/DisplayLib/Shaders/IShader2D.cs 2011-01-10 21:18:31 UTC (rev 1273)
@@ -0,0 +1,38 @@
+// 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-2009.
+// All Rights Reserved.
+//
+// Contributor(s): Erik Ylvisaker
+//
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AgateLib.DisplayLib.Shaders.Implementation;
+using AgateLib.Geometry;
+
+namespace AgateLib.DisplayLib.Shaders
+{
+ public interface IShader2D
+ {
+ /// <summary>
+ /// Gets or sets the coordinate system used for drawing.
+ /// The default for any render target is to use a one-to-one
+ /// mapping for pixels.
+ /// </summary>
+ Rectangle CoordinateSystem { get; set; }
+ }
+}
+
Modified: trunk/AgateLib/DisplayLib/Shaders/Implementation/AgateShaderImpl.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Shaders/Implementation/AgateShaderImpl.cs 2011-01-09 18:53:59 UTC (rev 1272)
+++ trunk/AgateLib/DisplayLib/Shaders/Implementation/AgateShaderImpl.cs 2011-01-10 21:18:31 UTC (rev 1273)
@@ -41,5 +41,6 @@
public abstract void BeginPass(int passIndex);
public abstract void EndPass();
public abstract void End();
+
}
}
Modified: trunk/AgateLib/DisplayLib/Shaders/Implementation/Basic2DImpl.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Shaders/Implementation/Basic2DImpl.cs 2011-01-09 18:53:59 UTC (rev 1272)
+++ trunk/AgateLib/DisplayLib/Shaders/Implementation/Basic2DImpl.cs 2011-01-10 21:18:31 UTC (rev 1273)
@@ -33,5 +33,6 @@
/// Gets or sets the coordinate system used (orthogonal projection).
/// </summary>
public abstract Rectangle CoordinateSystem { get; set; }
+
}
}
Modified: trunk/AgateLib/DisplayLib/Shaders/Implementation/Lighting2DImpl.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Shaders/Implementation/Lighting2DImpl.cs 2011-01-09 18:53:59 UTC (rev 1272)
+++ trunk/AgateLib/DisplayLib/Shaders/Implementation/Lighting2DImpl.cs 2011-01-10 21:18:31 UTC (rev 1273)
@@ -49,6 +49,10 @@
/// Sets the ambient light color.
/// </summary>
public abstract Color AmbientLight { get; set; }
-
+
+ /// <summary>
+ /// Gets or sets the coordinate system used (orthogonal projection).
+ /// </summary>
+ public abstract Rectangle CoordinateSystem { get; set; }
}
}
Modified: trunk/AgateLib/DisplayLib/Shaders/Lighting2D.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Shaders/Lighting2D.cs 2011-01-09 18:53:59 UTC (rev 1272)
+++ trunk/AgateLib/DisplayLib/Shaders/Lighting2D.cs 2011-01-10 21:18:31 UTC (rev 1273)
@@ -28,7 +28,7 @@
/// <summary>
/// Lighting2D is the Basic2DShader with lighting effects added.
/// </summary>
- public class Lighting2D : AgateInternalShader
+ public class Lighting2D : AgateInternalShader, IShader2D
{
protected override BuiltInShader BuiltInShaderType
{
@@ -86,6 +86,19 @@
}
}
}
+
+
+ #region IShader2D implementation
+
+ public Rectangle CoordinateSystem
+ {
+ get { return Impl.CoordinateSystem; }
+ set
+ {
+ Impl.CoordinateSystem = value;
+ }
+ }
+ #endregion
}
public class Light
Modified: trunk/Drivers/AgateOTK/GL_Display.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL_Display.cs 2011-01-09 18:53:59 UTC (rev 1272)
+++ trunk/Drivers/AgateOTK/GL_Display.cs 2011-01-10 21:18:31 UTC (rev 1273)
@@ -207,7 +207,14 @@
{
GL.Viewport(newClipRect.X, mRenderTarget.Height - newClipRect.Bottom,
newClipRect.Width, newClipRect.Height);
-
+
+ if (Display.Shader is AgateLib.DisplayLib.Shaders.IShader2D)
+ {
+ AgateLib.DisplayLib.Shaders.IShader2D s = (AgateLib.DisplayLib.Shaders.IShader2D)Display.Shader ;
+
+ s.CoordinateSystem = newClipRect;
+ }
+
mCurrentClip = newClipRect;
}
Modified: trunk/Drivers/AgateOTK/Legacy/FixedFunction/OTK_FF_Basic2DShader.cs
===================================================================
--- trunk/Drivers/AgateOTK/Legacy/FixedFunction/OTK_FF_Basic2DShader.cs 2011-01-09 18:53:59 UTC (rev 1272)
+++ trunk/Drivers/AgateOTK/Legacy/FixedFunction/OTK_FF_Basic2DShader.cs 2011-01-10 21:18:31 UTC (rev 1273)
@@ -14,6 +14,13 @@
{
Rectangle coords;
+ void SetProjection ()
+ {
+ GL.MatrixMode(MatrixMode.Projection);
+ GL.LoadIdentity();
+ GL.Ortho(coords.Left, coords.Right, coords.Bottom, coords.Top, -1, 1);
+ }
+
public override Rectangle CoordinateSystem
{
get
@@ -23,17 +30,16 @@
set
{
coords = value;
+ SetProjection();
}
}
public override void Begin()
{
+ SetProjection();
+
GL.Disable(EnableCap.Lighting);
- GL.MatrixMode(MatrixMode.Projection);
- GL.LoadIdentity();
- GL.Ortho(coords.Left, coords.Right, coords.Bottom, coords.Top, -1, 1);
-
GL.Enable(EnableCap.Texture2D);
GL.Enable(EnableCap.Blend);
Modified: trunk/Drivers/AgateOTK/Legacy/FixedFunction/OTK_FF_Lighting2D.cs
===================================================================
--- trunk/Drivers/AgateOTK/Legacy/FixedFunction/OTK_FF_Lighting2D.cs 2011-01-09 18:53:59 UTC (rev 1272)
+++ trunk/Drivers/AgateOTK/Legacy/FixedFunction/OTK_FF_Lighting2D.cs 2011-01-10 21:18:31 UTC (rev 1273)
@@ -11,11 +11,28 @@
{
class OTK_FF_Lighting2D : Lighting2DImpl
{
+ Rectangle coords;
+
Color mAmbientLight;
public OTK_FF_Lighting2D()
{
}
+
+
+ public override Rectangle CoordinateSystem
+ {
+ get
+ {
+ return coords;
+ }
+ set
+ {
+ coords = value;
+ }
+ }
+
+
public override int MaxActiveLights
{
get
@@ -48,6 +65,10 @@
public override void Begin()
{
+ GL.MatrixMode(MatrixMode.Projection);
+ GL.LoadIdentity();
+ GL.Ortho(coords.Left, coords.Right, coords.Bottom, coords.Top, -1, 1);
+
GL.Enable(EnableCap.Lighting);
float[] array = new float[4];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-09 18:54:06
|
Revision: 1272
http://agate.svn.sourceforge.net/agate/?rev=1272&view=rev
Author: kanato
Date: 2011-01-09 18:53:59 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/Tests/Tests.csproj
Modified: trunk/Tests/Tests.csproj
===================================================================
--- trunk/Tests/Tests.csproj 2011-01-09 18:50:08 UTC (rev 1271)
+++ trunk/Tests/Tests.csproj 2011-01-09 18:53:59 UTC (rev 1272)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-09 18:50:14
|
Revision: 1271
http://agate.svn.sourceforge.net/agate/?rev=1271&view=rev
Author: kanato
Date: 2011-01-09 18:50:08 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
Fix formatting in ClipRect.cs.
Modified Paths:
--------------
trunk/Tests/DisplayTests/ClipRect.cs
Modified: trunk/Tests/DisplayTests/ClipRect.cs
===================================================================
--- trunk/Tests/DisplayTests/ClipRect.cs 2011-01-09 18:47:43 UTC (rev 1270)
+++ trunk/Tests/DisplayTests/ClipRect.cs 2011-01-09 18:50:08 UTC (rev 1271)
@@ -58,7 +58,7 @@
for (int i = 10; i < 100; i += 10)
{
Display.SetClipRect(new Rectangle(320 + i, i, 310 - i * 2, 310 - i * 2));
- Display.FillRect(0,0,640,480, colors[index]);
+ Display.FillRect(0, 0, 640, 480, colors[index]);
index++;
}
@@ -70,4 +70,4 @@
#endregion
}
-}
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-09 18:47:49
|
Revision: 1270
http://agate.svn.sourceforge.net/agate/?rev=1270&view=rev
Author: kanato
Date: 2011-01-09 18:47:43 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
Modify ClipRect.cs to expose bug with coordinate systems when using cliprects.
Modified Paths:
--------------
trunk/Tests/DisplayTests/ClipRect.cs
Modified: trunk/Tests/DisplayTests/ClipRect.cs
===================================================================
--- trunk/Tests/DisplayTests/ClipRect.cs 2011-01-07 20:24:09 UTC (rev 1269)
+++ trunk/Tests/DisplayTests/ClipRect.cs 2011-01-09 18:47:43 UTC (rev 1270)
@@ -8,7 +8,7 @@
namespace Tests.DisplayTests
{
- class ClipRect:IAgateTest
+ class ClipRect : IAgateTest
{
#region IAgateTest Members
@@ -37,15 +37,27 @@
Color[] colors = new Color[] {
Color.Red, Color.Orange, Color.Yellow, Color.YellowGreen, Color.Green, Color.Turquoise, Color.Blue, Color.Violet, Color.Wheat, Color.White};
+ Surface surf = new Surface("Data/wallpaper.png");
+
while (wind.IsClosed == false)
{
Display.BeginFrame();
Display.Clear();
+ for (int i = 0; i < 10; i++)
+ {
+ for (int j = 0; j < 10; j++)
+ {
+ Display.SetClipRect(new Rectangle(5 + i * 32, 5 + j * 32, 30, 30));
+
+ surf.Draw();
+ }
+ }
+
int index = 0;
for (int i = 10; i < 100; i += 10)
{
- Display.SetClipRect(new Rectangle(i, i, 310 - i * 2, 310 - i * 2));
+ Display.SetClipRect(new Rectangle(320 + i, i, 310 - i * 2, 310 - i * 2));
Display.FillRect(0,0,640,480, colors[index]);
index++;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-07 20:24:16
|
Revision: 1269
http://agate.svn.sourceforge.net/agate/?rev=1269&view=rev
Author: kanato
Date: 2011-01-07 20:24:09 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
Remove extraneous references to GUI stuff.
Set versions in databases and resources to 0.3.2 instead of 0.4.0
Modified Paths:
--------------
trunk/AgateLib/AgateLib.csproj
trunk/AgateLib/Data/AgateDatabase.cs
trunk/AgateLib/Data/AgateTable.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/Tests/ResourceTests/Res032.cs
Removed Paths:
-------------
trunk/AgateLib/Resources/GuiThemeResource.cs
Modified: trunk/AgateLib/AgateLib.csproj
===================================================================
--- trunk/AgateLib/AgateLib.csproj 2011-01-07 20:14:25 UTC (rev 1268)
+++ trunk/AgateLib/AgateLib.csproj 2011-01-07 20:24:09 UTC (rev 1269)
@@ -167,56 +167,12 @@
<Compile Include="DisplayLib\Shaders\Lighting2D.cs" />
<Compile Include="DisplayLib\Shaders\Lighting3D.cs" />
<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" />
- <Compile Include="Gui\Container.cs" />
- <Compile Include="Gui\GuiRoot.cs" />
- <Compile Include="Gui\IGuiThemeEngine.cs" />
- <Compile Include="Gui\ILayoutPerformer.cs" />
- <Compile Include="Gui\Label.cs" />
- <Compile Include="Gui\LayoutExpand.cs" />
- <Compile Include="Gui\Layout\BoxLayoutBase.cs" />
- <Compile Include="Gui\Layout\Grid.cs" />
- <Compile Include="Gui\Layout\HorizontalBox.cs" />
- <Compile Include="Gui\Layout\VerticalBox.cs" />
- <Compile Include="Gui\ListBox.cs" />
- <Compile Include="Gui\Panel.cs" />
- <Compile Include="Gui\RadioButton.cs" />
- <Compile Include="Gui\TextBox.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\Cache\ScrollBarCache.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\Mercury.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryButton.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryCheckBox.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryGuiRoot.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryLabel.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryListBox.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryPanel.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryScheme.cs" />
- <Compile Include="Gui\ScrollBar.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryWidget.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryScrollBar.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryTextBox.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryWindow.cs" />
- <Compile Include="Gui\ThemeEngines\Venus\CssData.cs" />
- <Compile Include="Gui\ThemeEngines\Venus\Venus.cs" />
- <Compile Include="Gui\ThemeEngines\Venus\VenusScheme.cs" />
- <Compile Include="Gui\ThemeEngines\Venus\VenusTheme.cs" />
- <Compile Include="Gui\ThemeEngines\Venus\VenusThemeDictionary.cs" />
- <Compile Include="Gui\ThemeEngines\Venus\WidgetStyle.cs" />
- <Compile Include="Gui\Widget.cs" />
- <Compile Include="Gui\WidgetList.cs" />
- <Compile Include="Gui\Window.cs" />
<Compile Include="IFileProvider.cs">
<SubType>Code</SubType>
</Compile>
<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" />
@@ -634,9 +590,6 @@
<None Include="InternalResources\Fonts.zip" />
<None Include="InternalResources\images.tar.gz" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="Gui\Cache\" />
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
Modified: trunk/AgateLib/Data/AgateDatabase.cs
===================================================================
--- trunk/AgateLib/Data/AgateDatabase.cs 2011-01-07 20:14:25 UTC (rev 1268)
+++ trunk/AgateLib/Data/AgateDatabase.cs 2011-01-07 20:24:09 UTC (rev 1269)
@@ -79,7 +79,7 @@
void IXleSerializable.WriteData(XleSerializationInfo info)
{
- info.Write("Version", "0.4.0");
+ info.Write("Version", "0.3.2");
info.Write("CodeNamespace", CodeNamespace);
info.Write("Tables", TableList.ToList());
@@ -88,7 +88,7 @@
{
string version = info.ReadString("Version");
- if (version == "0.4.0")
+ if (version == "0.3.2")
{
List<string> tables = info.ReadList<string>("Tables");
mTables.AddUnloadedTable(tables);
@@ -144,7 +144,7 @@
{
StringBuilder b = new StringBuilder();
- b.AppendLine("Version:0.4.0");
+ b.AppendLine("Version:0.3.2");
foreach (var table in mTables)
{
Modified: trunk/AgateLib/Data/AgateTable.cs
===================================================================
--- trunk/AgateLib/Data/AgateTable.cs 2011-01-07 20:14:25 UTC (rev 1268)
+++ trunk/AgateLib/Data/AgateTable.cs 2011-01-07 20:24:09 UTC (rev 1269)
@@ -56,7 +56,7 @@
mColumns.SortByDisplayIndex();
info.Write("Name", mName);
- info.Write("Version", "0.4.0");
+ info.Write("Version", "0.3.2");
info.Write("Columns", mColumns.ColumnList);
info.Write("Rows", RowString());
}
@@ -66,7 +66,7 @@
string version = info.ReadString("Version");
- if (version == "0.4.0")
+ if (version == "0.3.2")
{
mColumns = new AgateColumnDictionary(this, info.ReadList<AgateColumn>("Columns"));
mRows = new AgateRowList(this, ReadRows(info.ReadString("Rows")));
Modified: trunk/AgateLib/Resources/AgateResourceCollection.cs
===================================================================
--- trunk/AgateLib/Resources/AgateResourceCollection.cs 2011-01-07 20:14:25 UTC (rev 1268)
+++ trunk/AgateLib/Resources/AgateResourceCollection.cs 2011-01-07 20:24:09 UTC (rev 1269)
@@ -38,14 +38,14 @@
Dictionary<string, AgateResource> mStore = new Dictionary<string, AgateResource>();
List<ImageResource> mImages = new List<ImageResource>();
- List<GuiThemeResource> mGuiThemes = new List<GuiThemeResource>();
+ //List<GuiThemeResource> mGuiThemes = new List<GuiThemeResource>();
const string mStringTableKey = "Strings";
bool mOwnFileProvider;
IFileProvider mFileProvider;
SurfaceResourceList mSurfaceAccessor;
- GuiThemeResourceList mGuiThemeAccessor;
+ //GuiThemeResourceList mGuiThemeAccessor;
public class SurfaceResourceList
{
@@ -77,44 +77,44 @@
get { return mResources.mImages.Count; }
}
}
- public class GuiThemeResourceList
- {
- AgateResourceCollection mResources;
+// 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; }
+// }
+// }
- 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);
+ //mGuiThemeAccessor = new GuiThemeResourceList(this);
this.mStore.Add(mStringTableKey, new StringTable());
}
@@ -140,7 +140,7 @@
public AgateResourceCollection(IFileProvider fileProvider, string filename)
{
mSurfaceAccessor = new SurfaceResourceList(this);
- mGuiThemeAccessor = new GuiThemeResourceList(this);
+ //mGuiThemeAccessor = new GuiThemeResourceList(this);
FileProvider = fileProvider;
RootDirectory = Path.GetDirectoryName(filename);
@@ -219,10 +219,10 @@
/// <summary>
/// Gets the list of GuiThemeResource objects.
/// </summary>
- public GuiThemeResourceList GuiThemes
- {
- get { return mGuiThemeAccessor; }
- }
+// public GuiThemeResourceList GuiThemes
+// {
+// get { return mGuiThemeAccessor; }
+// }
/// <summary>
/// Enumerates through the DisplayWindowResources contained in this group of resources.
/// </summary>
@@ -267,10 +267,10 @@
mImages.Add(img);
}
- else if (item is GuiThemeResource)
- {
- mGuiThemes.Add((GuiThemeResource)item);
- }
+// else if (item is GuiThemeResource)
+// {
+// mGuiThemes.Add((GuiThemeResource)item);
+// }
else
mStore.Add(item.Name, item);
}
Modified: trunk/AgateLib/Resources/AgateResourceLoader.cs
===================================================================
--- trunk/AgateLib/Resources/AgateResourceLoader.cs 2011-01-07 20:14:25 UTC (rev 1268)
+++ trunk/AgateLib/Resources/AgateResourceLoader.cs 2011-01-07 20:24:09 UTC (rev 1269)
@@ -38,7 +38,7 @@
{
XmlDocument doc = new XmlDocument();
XmlElement root = doc.CreateElement("AgateResources");
- XmlHelper.AppendAttribute(root, doc, "Version", "0.4.0");
+ XmlHelper.AppendAttribute(root, doc, "Version", "0.3.2");
doc.AppendChild(root);
@@ -99,10 +99,10 @@
switch (version)
{
- case "0.4.0":
+ case "0.3.2":
case "0.3.1":
case "0.3.0":
- ReadVersion040(resources, root, version);
+ ReadVersion032(resources, root, version);
break;
default:
@@ -111,7 +111,7 @@
}
- private static void ReadVersion040(AgateResourceCollection resources, XmlNode root, string version)
+ private static void ReadVersion032(AgateResourceCollection resources, XmlNode root, string version)
{
for (int i = 0; i < root.ChildNodes.Count; i++)
{
@@ -144,9 +144,6 @@
case "Image":
return new ImageResource(node, version);
- case "GuiTheme":
- return new GuiThemeResource(node, version);
-
case "Surface":
return new SurfaceResource(node, version);
Modified: trunk/AgateLib/Resources/BitmapFontResource.cs
===================================================================
--- trunk/AgateLib/Resources/BitmapFontResource.cs 2011-01-07 20:14:25 UTC (rev 1268)
+++ trunk/AgateLib/Resources/BitmapFontResource.cs 2011-01-07 20:24:09 UTC (rev 1269)
@@ -27,11 +27,11 @@
{
switch (version)
{
- case "0.4.0":
+ case "0.3.2":
Name = node.Attributes["name"].Value;
mImage = XmlHelper.ReadAttributeString(node, "image", string.Empty);
- ReadMetrics040(node);
+ ReadMetrics032(node);
break;
@@ -50,7 +50,7 @@
}
}
- private void ReadMetrics040(XmlNode parent)
+ private void ReadMetrics032(XmlNode parent)
{
XmlNode root = null;
Modified: trunk/AgateLib/Resources/DisplayWindowResource.cs
===================================================================
--- trunk/AgateLib/Resources/DisplayWindowResource.cs 2011-01-07 20:14:25 UTC (rev 1268)
+++ trunk/AgateLib/Resources/DisplayWindowResource.cs 2011-01-07 20:24:09 UTC (rev 1269)
@@ -110,6 +110,7 @@
{
switch (version)
{
+ case "0.3.2":
case "0.3.1":
case "0.3.0":
Name = node.Attributes["name"].Value;
Deleted: trunk/AgateLib/Resources/GuiThemeResource.cs
===================================================================
--- trunk/AgateLib/Resources/GuiThemeResource.cs 2011-01-07 20:14:25 UTC (rev 1268)
+++ trunk/AgateLib/Resources/GuiThemeResource.cs 2011-01-07 20:24:09 UTC (rev 1269)
@@ -1,35 +0,0 @@
-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();
- }
- }
-}
Modified: trunk/AgateLib/Resources/ImageResource.cs
===================================================================
--- trunk/AgateLib/Resources/ImageResource.cs 2011-01-07 20:14:25 UTC (rev 1268)
+++ trunk/AgateLib/Resources/ImageResource.cs 2011-01-07 20:24:09 UTC (rev 1269)
@@ -22,9 +22,9 @@
switch (version)
{
- case "0.4.0":
+ case "0.3.2":
Filename = node.Attributes["filename"].Value;
- ReadSubNodes040(node);
+ ReadSubNodes032(node);
break;
default:
@@ -32,7 +32,7 @@
}
}
- private void ReadSubNodes040(XmlNode node)
+ private void ReadSubNodes032(XmlNode node)
{
foreach (XmlNode n in node.ChildNodes)
{
Modified: trunk/AgateLib/Resources/SpriteResource.cs
===================================================================
--- trunk/AgateLib/Resources/SpriteResource.cs 2011-01-07 20:14:25 UTC (rev 1268)
+++ trunk/AgateLib/Resources/SpriteResource.cs 2011-01-07 20:24:09 UTC (rev 1269)
@@ -132,6 +132,7 @@
{
switch (version)
{
+ case "0.3.2":
case "0.3.1":
Name = node.Attributes["name"].Value;
mFilename = XmlHelper.ReadAttributeString(node, "image", string.Empty);
Modified: trunk/AgateLib/Resources/StringTable.cs
===================================================================
--- trunk/AgateLib/Resources/StringTable.cs 2011-01-07 20:14:25 UTC (rev 1268)
+++ trunk/AgateLib/Resources/StringTable.cs 2011-01-07 20:24:09 UTC (rev 1269)
@@ -40,6 +40,8 @@
{
switch (version)
{
+ case "0.3.2":
+ case "0.3.1":
case "0.3.0":
for (int i = 0; i < node.ChildNodes.Count; i++)
{
Modified: trunk/AgateLib/Resources/SurfaceResource.cs
===================================================================
--- trunk/AgateLib/Resources/SurfaceResource.cs 2011-01-07 20:14:25 UTC (rev 1268)
+++ trunk/AgateLib/Resources/SurfaceResource.cs 2011-01-07 20:24:09 UTC (rev 1269)
@@ -70,6 +70,7 @@
{
switch (version)
{
+ case "0.3.2":
case "0.3.1":
case "0.3.0":
Name = node.Attributes["name"].Value;
Modified: trunk/Tests/ResourceTests/Res032.cs
===================================================================
--- trunk/Tests/ResourceTests/Res032.cs 2011-01-07 20:14:25 UTC (rev 1268)
+++ trunk/Tests/ResourceTests/Res032.cs 2011-01-07 20:24:09 UTC (rev 1269)
@@ -8,7 +8,7 @@
namespace Tests.ResourceTests
{
- class Resources040: AgateGame, IAgateTest
+ class Resources032: AgateGame, IAgateTest
{
public void Main(string[] args)
{
@@ -20,7 +20,7 @@
initParams.AllowResize = true;
}
- public string Name { get { return "Resources 0.4.0"; } }
+ public string Name { get { return "Resources 0.3.2"; } }
public string Category { get { return "Resources"; } }
AgateResourceCollection resources;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-07 20:14:31
|
Revision: 1268
http://agate.svn.sourceforge.net/agate/?rev=1268&view=rev
Author: kanato
Date: 2011-01-07 20:14:25 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
Rename Resource040 test to Resource032
Modified Paths:
--------------
trunk/Tests/Tests.csproj
Added Paths:
-----------
trunk/Tests/ResourceTests/Res032.cs
Removed Paths:
-------------
trunk/Tests/ResourceTests/Res040.cs
Copied: trunk/Tests/ResourceTests/Res032.cs (from rev 1261, trunk/Tests/ResourceTests/Res040.cs)
===================================================================
--- trunk/Tests/ResourceTests/Res032.cs (rev 0)
+++ trunk/Tests/ResourceTests/Res032.cs 2011-01-07 20:14:25 UTC (rev 1268)
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AgateLib;
+using AgateLib.DisplayLib;
+using AgateLib.InputLib;
+using AgateLib.Resources;
+
+namespace Tests.ResourceTests
+{
+ class Resources040: AgateGame, IAgateTest
+ {
+ public void Main(string[] args)
+ {
+ Run(args);
+ }
+
+ protected override void AdjustAppInitParameters(ref AppInitParameters initParams)
+ {
+ initParams.AllowResize = true;
+ }
+
+ public string Name { get { return "Resources 0.4.0"; } }
+ public string Category { get { return "Resources"; } }
+
+ AgateResourceCollection resources;
+ Surface btn;
+
+ protected override void Initialize()
+ {
+ resources = AgateResourceCollection.FromZipArchive("Data/gui.zip");
+
+ btn = new Surface(resources, "Button");
+ }
+
+ protected override void Update(double time_ms)
+ {
+ base.Update(time_ms);
+
+ if (Keyboard.Keys[KeyCode.Space])
+ Quit();
+ }
+
+ protected override void Render()
+ {
+ btn.Draw(5, 5);
+ }
+ }
+}
Deleted: trunk/Tests/ResourceTests/Res040.cs
===================================================================
--- trunk/Tests/ResourceTests/Res040.cs 2011-01-07 20:12:49 UTC (rev 1267)
+++ trunk/Tests/ResourceTests/Res040.cs 2011-01-07 20:14:25 UTC (rev 1268)
@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AgateLib;
-using AgateLib.DisplayLib;
-using AgateLib.InputLib;
-using AgateLib.Resources;
-
-namespace Tests.ResourceTests
-{
- class Resources040: AgateGame, IAgateTest
- {
- public void Main(string[] args)
- {
- Run(args);
- }
-
- protected override void AdjustAppInitParameters(ref AppInitParameters initParams)
- {
- initParams.AllowResize = true;
- }
-
- public string Name { get { return "Resources 0.4.0"; } }
- public string Category { get { return "Resources"; } }
-
- AgateResourceCollection resources;
- Surface btn;
-
- protected override void Initialize()
- {
- resources = AgateResourceCollection.FromZipArchive("Data/gui.zip");
-
- btn = new Surface(resources, "Button");
- }
-
- protected override void Update(double time_ms)
- {
- base.Update(time_ms);
-
- if (Keyboard.Keys[KeyCode.Space])
- Quit();
- }
-
- protected override void Render()
- {
- btn.Draw(5, 5);
- }
- }
-}
Modified: trunk/Tests/Tests.csproj
===================================================================
--- trunk/Tests/Tests.csproj 2011-01-07 20:12:49 UTC (rev 1267)
+++ trunk/Tests/Tests.csproj 2011-01-07 20:14:25 UTC (rev 1268)
@@ -219,7 +219,6 @@
<Compile Include="DisplayTests\Interpolation.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="ResourceTests\Res040.cs" />
<Compile Include="Shaders\CoordinateSystem.cs">
<SubType>Code</SubType>
</Compile>
@@ -511,6 +510,7 @@
<None Include="Data\CssTest.css">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
+ <Compile Include="ResourceTests\Res032.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AgateLib\AgateLib.csproj">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-07 20:12:55
|
Revision: 1267
http://agate.svn.sourceforge.net/agate/?rev=1267&view=rev
Author: kanato
Date: 2011-01-07 20:12:49 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
Silly MonoDevelop did not remove references to deleted GUI files.
Modified Paths:
--------------
trunk/Tests/Tests.csproj
Modified: trunk/Tests/Tests.csproj
===================================================================
--- trunk/Tests/Tests.csproj 2011-01-07 20:11:41 UTC (rev 1266)
+++ trunk/Tests/Tests.csproj 2011-01-07 20:12:49 UTC (rev 1267)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
@@ -149,12 +149,6 @@
<DependentUpon>frmLauncher.cs</DependentUpon>
<SubType>Code</SubType>
</Compile>
- <Compile Include="GuiTests\Buttons.cs" />
- <Compile Include="GuiTests\Listboxes.cs" />
- <Compile Include="GuiTests\RenderGui.cs" />
- <Compile Include="GuiTests\ScrollBars.cs" />
- <Compile Include="GuiTests\Textboxes.cs" />
- <Compile Include="GuiTests\Transitions.cs" />
<Compile Include="IAgateTest.cs">
<SubType>Code</SubType>
</Compile>
@@ -514,7 +508,6 @@
<None Include="Data\shaders\hlsl\PerPixelLighting.fx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
- <Compile Include="GuiTests\CssParserTest.cs" />
<None Include="Data\CssTest.css">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-07 20:11:48
|
Revision: 1266
http://agate.svn.sourceforge.net/agate/?rev=1266&view=rev
Author: kanato
Date: 2011-01-07 20:11:41 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
Removed Gui files which will not be in the next release.
Modified Paths:
--------------
trunk/AgateLib/AgateGame.cs
trunk/AgateTools.sln
trunk/ChangeLog.txt
trunk/Drivers/AgateDrawing/AgateDrawing.csproj
trunk/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj
trunk/TODO.txt
trunk/Tools/AgateDataLib/AgateDataLib.csproj
trunk/Tools/DatabaseEditor/DatabaseEditor.csproj
trunk/Tools/FontCreator/FontCreator.csproj
trunk/Tools/PackedSpriteCreator/PackedSpriteCreator.csproj
trunk/Tools/ResourceEditor/ResourceEditor.csproj
Removed Paths:
-------------
trunk/AgateLib/Gui/
trunk/Tests/GuiTests/
Modified: trunk/AgateLib/AgateGame.cs
===================================================================
--- trunk/AgateLib/AgateGame.cs 2011-01-07 20:05:01 UTC (rev 1265)
+++ trunk/AgateLib/AgateGame.cs 2011-01-07 20:11:41 UTC (rev 1266)
@@ -45,7 +45,7 @@
DisplayWindow mWindow;
AppInitParameters mInitParams;
FontSurface font;
- Gui.GuiRoot mGui;
+ //Gui.GuiRoot mGui;
double totalSplashTime = 0;
bool splashFadeDone = false;
@@ -99,8 +99,8 @@
if (MainWindow.IsClosed)
break;
- if (GuiRoot != null)
- GuiRoot.DoUpdate();
+// if (GuiRoot != null)
+// GuiRoot.DoUpdate();
Display.RenderTarget = MainWindow.FrameBuffer;
@@ -108,8 +108,8 @@
Render();
- if (GuiRoot != null)
- GuiRoot.Draw();
+// if (GuiRoot != null)
+// GuiRoot.Draw();
Display.EndFrame();
Core.KeepAlive();
@@ -325,27 +325,27 @@
get { return mWindow; }
}
- /// <summary>
- /// Gets or sets the GuiRoot object.
- /// </summary>
- public Gui.GuiRoot GuiRoot
- {
- get { return mGui; }
- set
- {
- if (value == null && mGui == null)
- return;
+// / <summary>
+// / Gets or sets the GuiRoot object.
+// / </summary>
+// public Gui.GuiRoot GuiRoot
+// {
+// get { return mGui; }
+// set
+// {
+// if (value == null && mGui == null)
+// return;
+//
+// if (mGui != null)
+// mGui.EnableInteraction = false;
+//
+// mGui = value;
+//
+// if (mGui != null)
+// mGui.EnableInteraction = true;
+// }
+// }
- if (mGui != null)
- mGui.EnableInteraction = false;
-
- mGui = value;
-
- if (mGui != null)
- mGui.EnableInteraction = true;
- }
- }
-
#endregion
/// <summary>
Modified: trunk/AgateTools.sln
===================================================================
--- trunk/AgateTools.sln 2011-01-07 20:05:01 UTC (rev 1265)
+++ trunk/AgateTools.sln 2011-01-07 20:11:41 UTC (rev 1266)
@@ -1,3 +1,4 @@
+
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{4B147B99-8BC3-4B78-938A-1035B16A8D1B}"
@@ -35,42 +36,6 @@
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Debug|x64.ActiveCfg = Debug|x64
- {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Debug|x64.Build.0 = Debug|x64
- {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Debug|x86.ActiveCfg = Debug|x86
- {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Debug|x86.Build.0 = Debug|x86
- {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Release|Any CPU.Build.0 = Release|Any CPU
- {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Release|x64.ActiveCfg = Release|x64
- {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Release|x64.Build.0 = Release|x64
- {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Release|x86.ActiveCfg = Release|x86
- {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Release|x86.Build.0 = Release|x86
- {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|x64.ActiveCfg = Debug|x64
- {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|x64.Build.0 = Debug|x64
- {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|x86.ActiveCfg = Debug|x86
- {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|x86.Build.0 = Debug|x86
- {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|Any CPU.Build.0 = Release|Any CPU
- {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|x64.ActiveCfg = Release|x64
- {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|x64.Build.0 = Release|x64
- {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|x86.ActiveCfg = Release|x86
- {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|x86.Build.0 = Release|x86
- {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Debug|x64.ActiveCfg = Debug|x64
- {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Debug|x64.Build.0 = Debug|x64
- {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Debug|x86.ActiveCfg = Debug|x86
- {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Debug|x86.Build.0 = Debug|x86
- {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Release|Any CPU.Build.0 = Release|Any CPU
- {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Release|x64.ActiveCfg = Release|x64
- {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Release|x64.Build.0 = Release|x64
- {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Release|x86.ActiveCfg = Release|x86
- {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Release|x86.Build.0 = Release|x86
{164A785D-924E-40FB-A517-D7E677F3B53A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{164A785D-924E-40FB-A517-D7E677F3B53A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{164A785D-924E-40FB-A517-D7E677F3B53A}.Debug|x64.ActiveCfg = Debug|x64
@@ -83,42 +48,6 @@
{164A785D-924E-40FB-A517-D7E677F3B53A}.Release|x64.Build.0 = Release|x64
{164A785D-924E-40FB-A517-D7E677F3B53A}.Release|x86.ActiveCfg = Release|x86
{164A785D-924E-40FB-A517-D7E677F3B53A}.Release|x86.Build.0 = Release|x86
- {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Debug|x64.ActiveCfg = Debug|x64
- {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Debug|x64.Build.0 = Debug|x64
- {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Debug|x86.ActiveCfg = Debug|x86
- {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Debug|x86.Build.0 = Debug|x86
- {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Release|Any CPU.Build.0 = Release|Any CPU
- {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Release|x64.ActiveCfg = Release|x64
- {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Release|x64.Build.0 = Release|x64
- {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Release|x86.ActiveCfg = Release|x86
- {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Release|x86.Build.0 = Release|x86
- {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|x64.ActiveCfg = Debug|x64
- {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|x64.Build.0 = Debug|x64
- {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|x86.ActiveCfg = Debug|x86
- {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|x86.Build.0 = Debug|x86
- {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|Any CPU.Build.0 = Release|Any CPU
- {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|x64.ActiveCfg = Release|x64
- {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|x64.Build.0 = Release|x64
- {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|x86.ActiveCfg = Release|x86
- {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|x86.Build.0 = Release|x86
- {91F57346-B574-4D52-9EB0-AA191B552C94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {91F57346-B574-4D52-9EB0-AA191B552C94}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {91F57346-B574-4D52-9EB0-AA191B552C94}.Debug|x64.ActiveCfg = Debug|x64
- {91F57346-B574-4D52-9EB0-AA191B552C94}.Debug|x64.Build.0 = Debug|x64
- {91F57346-B574-4D52-9EB0-AA191B552C94}.Debug|x86.ActiveCfg = Debug|x86
- {91F57346-B574-4D52-9EB0-AA191B552C94}.Debug|x86.Build.0 = Debug|x86
- {91F57346-B574-4D52-9EB0-AA191B552C94}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {91F57346-B574-4D52-9EB0-AA191B552C94}.Release|Any CPU.Build.0 = Release|Any CPU
- {91F57346-B574-4D52-9EB0-AA191B552C94}.Release|x64.ActiveCfg = Release|x64
- {91F57346-B574-4D52-9EB0-AA191B552C94}.Release|x64.Build.0 = Release|x64
- {91F57346-B574-4D52-9EB0-AA191B552C94}.Release|x86.ActiveCfg = Release|x86
- {91F57346-B574-4D52-9EB0-AA191B552C94}.Release|x86.Build.0 = Release|x86
{2F7A686B-2272-4803-9EF9-0B34BA7802DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2F7A686B-2272-4803-9EF9-0B34BA7802DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2F7A686B-2272-4803-9EF9-0B34BA7802DC}.Debug|x64.ActiveCfg = Debug|x64
@@ -143,7 +72,84 @@
{685E7B82-4609-4ABB-B25B-0DC7C58BD45F}.Release|x64.Build.0 = Release|x64
{685E7B82-4609-4ABB-B25B-0DC7C58BD45F}.Release|x86.ActiveCfg = Release|x86
{685E7B82-4609-4ABB-B25B-0DC7C58BD45F}.Release|x86.Build.0 = Release|x86
+ {91F57346-B574-4D52-9EB0-AA191B552C94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {91F57346-B574-4D52-9EB0-AA191B552C94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {91F57346-B574-4D52-9EB0-AA191B552C94}.Debug|x64.ActiveCfg = Debug|x64
+ {91F57346-B574-4D52-9EB0-AA191B552C94}.Debug|x64.Build.0 = Debug|x64
+ {91F57346-B574-4D52-9EB0-AA191B552C94}.Debug|x86.ActiveCfg = Debug|x86
+ {91F57346-B574-4D52-9EB0-AA191B552C94}.Debug|x86.Build.0 = Debug|x86
+ {91F57346-B574-4D52-9EB0-AA191B552C94}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {91F57346-B574-4D52-9EB0-AA191B552C94}.Release|Any CPU.Build.0 = Release|Any CPU
+ {91F57346-B574-4D52-9EB0-AA191B552C94}.Release|x64.ActiveCfg = Release|x64
+ {91F57346-B574-4D52-9EB0-AA191B552C94}.Release|x64.Build.0 = Release|x64
+ {91F57346-B574-4D52-9EB0-AA191B552C94}.Release|x86.ActiveCfg = Release|x86
+ {91F57346-B574-4D52-9EB0-AA191B552C94}.Release|x86.Build.0 = Release|x86
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|x64.ActiveCfg = Debug|x64
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|x64.Build.0 = Debug|x64
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|x86.ActiveCfg = Debug|x86
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|x86.Build.0 = Debug|x86
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|x64.ActiveCfg = Release|x64
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|x64.Build.0 = Release|x64
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|x86.ActiveCfg = Release|x86
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|x86.Build.0 = Release|x86
+ {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Debug|x64.ActiveCfg = Debug|x64
+ {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Debug|x64.Build.0 = Debug|x64
+ {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Debug|x86.ActiveCfg = Debug|x86
+ {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Debug|x86.Build.0 = Debug|x86
+ {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Release|x64.ActiveCfg = Release|x64
+ {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Release|x64.Build.0 = Release|x64
+ {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Release|x86.ActiveCfg = Release|x86
+ {A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}.Release|x86.Build.0 = Release|x86
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|x64.ActiveCfg = Debug|x64
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|x64.Build.0 = Debug|x64
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|x86.ActiveCfg = Debug|x86
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|x86.Build.0 = Debug|x86
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|x64.ActiveCfg = Release|x64
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|x64.Build.0 = Release|x64
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|x86.ActiveCfg = Release|x86
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|x86.Build.0 = Release|x86
+ {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Debug|x64.ActiveCfg = Debug|x64
+ {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Debug|x64.Build.0 = Debug|x64
+ {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Debug|x86.ActiveCfg = Debug|x86
+ {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Debug|x86.Build.0 = Debug|x86
+ {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Release|x64.ActiveCfg = Release|x64
+ {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Release|x64.Build.0 = Release|x64
+ {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Release|x86.ActiveCfg = Release|x86
+ {C653C244-F604-4BA4-8822-D04FA9ACEFA5}.Release|x86.Build.0 = Release|x86
+ {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Debug|x64.ActiveCfg = Debug|x64
+ {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Debug|x64.Build.0 = Debug|x64
+ {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Debug|x86.ActiveCfg = Debug|x86
+ {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Debug|x86.Build.0 = Debug|x86
+ {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Release|x64.ActiveCfg = Release|x64
+ {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Release|x64.Build.0 = Release|x64
+ {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Release|x86.ActiveCfg = Release|x86
+ {FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}.Release|x86.Build.0 = Release|x86
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ EndGlobalSection
+ GlobalSection(MonoDevelopProperties) = preSolution
+ StartupItem = Tools\DatabaseEditor\DatabaseEditor.csproj
+ EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
Modified: trunk/ChangeLog.txt
===================================================================
--- trunk/ChangeLog.txt 2011-01-07 20:05:01 UTC (rev 1265)
+++ trunk/ChangeLog.txt 2011-01-07 20:11:41 UTC (rev 1266)
@@ -1,8 +1,51 @@
Version 0.3.2
===================
+Even though the version number has only been incremented slightly, there are a lot of changes in
+this release. Many of the changes are backend changes that will ease the future development
+of AgateLib, but may not be noticable to a developer using AgateLib.
+
+Removed the prebuild-based build system. Now that Mono's xbuild can build AgateLib, and
+MonoDevelop supports Visual Studio project files, there is no need for it and the headaches
+associated with it.
+
+The source code for Tao.Sdl is absorbed into AgateSDL, so there is no need to distribute
+Tao.Sdl.dll files.
+
+AgateMDX has been dropped and replced with AgateSDX. Now DirectX support is obtained through
+SlimDX instead of the old, buggy, deprecated Managed DirectX.
+
+A simple framework is in place for saving user preferences. The .NET/WinForms properties
+don't seem to be well supported under Mono so this is a simple replacement for that.
+
+The AgateLib.Data namespace has been added with classes that implement a flat-file
+relational database. A database editor application exists in the Tools folder as well. This
+provides cross-platform light-weight support for basic database features to provide a
+structured data store for games without bringing in any external dependencies. The database
+editor includes a code generator to create stongly typed objects that can easily access the
+data in the tables of the database.
+
+A system for use of vertex and pixel shaders has been developed. Mainly, the framework is
+in place for future expansion, there is little that can be done with shaders at this point
+aside from using the built in shaders for lighting or standard rendering.
+
+Vertex buffers can be created and used. Also, arbitrary transformation matrices can be
+specified, so that AgateLib can now be used for basic 3D applications. It is likely
+not very practical at the moment but the basic framework is in place for future expansion.
+
+Font rendering and surface rendering backends have been changed to utilize stateless drawing.
+All drawing options can be specified in objects passed to draw methods. The stateful drawing
+methods can still be used, but this allows for a great deal of cleanup in the backend
+rendering methods as well as the option to circumvent the stateful drawing. This also allows
+for AgateLib to put less pressure on the GC, especially in rendering text.
+
+Better platform detection is implemented.
+
+Various minor bugs have been fixed.
+
Moved ISprite and ISpriteFrame to Sprites namespace.
+
Version 0.3.1
===================
All obsolete API's have been removed.
Modified: trunk/Drivers/AgateDrawing/AgateDrawing.csproj
===================================================================
--- trunk/Drivers/AgateDrawing/AgateDrawing.csproj 2011-01-07 20:05:01 UTC (rev 1265)
+++ trunk/Drivers/AgateDrawing/AgateDrawing.csproj 2011-01-07 20:11:41 UTC (rev 1266)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
@@ -7,8 +7,6 @@
<ProjectGuid>{164A785D-924E-40FB-A517-D7E677F3B53A}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>AgateDrawing</AssemblyName>
@@ -21,52 +19,41 @@
<AppDesignerFolder>
</AppDesignerFolder>
<RootNamespace>AgateDrawing</RootNamespace>
- <StartupObject>
- </StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE;</DefineConstants>
<DocumentationFile>
</DocumentationFile>
- <DebugSymbols>True</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>False</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>..\..\Binaries\Debug\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;</DefineConstants>
<DocumentationFile>
</DocumentationFile>
- <DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>True</Optimize>
+ <Optimize>true</Optimize>
<OutputPath>..\..\Binaries\Release\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
@@ -75,6 +62,9 @@
<BaseAddress>285212672</BaseAddress>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\x64\Release\</OutputPath>
@@ -83,6 +73,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -91,6 +83,9 @@
<BaseAddress>285212672</BaseAddress>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\x86\Release\</OutputPath>
@@ -99,6 +94,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
@@ -153,6 +150,7 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
Modified: trunk/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj
===================================================================
--- trunk/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj 2011-01-07 20:05:01 UTC (rev 1265)
+++ trunk/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj 2011-01-07 20:11:41 UTC (rev 1266)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
@@ -7,8 +7,6 @@
<ProjectGuid>{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>AgateLib.WinForms</AssemblyName>
@@ -21,51 +19,40 @@
<AppDesignerFolder>
</AppDesignerFolder>
<RootNamespace>AgateLib.WinForms</RootNamespace>
- <StartupObject>
- </StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE;</DefineConstants>
<DocumentationFile>
</DocumentationFile>
- <DebugSymbols>True</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>False</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>..\..\Binaries\Debug\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;</DefineConstants>
<DocumentationFile>AgateLib.WinForms.xml</DocumentationFile>
- <DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>True</Optimize>
+ <Optimize>true</Optimize>
<OutputPath>..\..\Binaries\Release\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
@@ -74,6 +61,9 @@
<BaseAddress>285212672</BaseAddress>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\x64\Release\</OutputPath>
@@ -83,6 +73,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -91,6 +83,9 @@
<BaseAddress>285212672</BaseAddress>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\x86\Release\</OutputPath>
@@ -100,6 +95,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
@@ -125,7 +122,6 @@
<ProjectReference Include="..\..\AgateLib\AgateLib.csproj">
<Name>AgateLib</Name>
<Project>{9490B719-829E-43A7-A5FE-8001F8A81759}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -190,6 +186,7 @@
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
Modified: trunk/TODO.txt
===================================================================
--- trunk/TODO.txt 2011-01-07 20:05:01 UTC (rev 1265)
+++ trunk/TODO.txt 2011-01-07 20:11:41 UTC (rev 1266)
@@ -6,13 +6,12 @@
General:
Remove all OpenGL immediate mode code from AgateOTK.
Check GetPixelFormat method in AgateSDX
- Test / Debug writing pixel buffer to SDX surface.
Deal with TODO's in font tests.
Implement better Platform.HasWriteAccessToAppDirectory method.
- Test ClipRects with AgateOTK
Test if GL_GameWindow is viable.
Remove old resource code so that surface and sprites are loaded only as subelements
of the Image tag.
+ Skinnable GUI
Goals for 0.3.2
--------------------------------
@@ -26,6 +25,8 @@
D Fix bug with rotation where ScaleWidth or ScaleHeight are less than zero.
Drivers
D Update AgateOTK to not call GL functions in finalizers.
+ * Test ClipRects with AgateOTK
+ * Test / Debug writing pixel buffer to SDX surface.
Input
* Add support for POV hats on joysticks.
@@ -46,6 +47,7 @@
D Convert AgateMDX to use SlimDX instead and deprecate the use of AgateMDX.
D Interface to allow audio to be generated at runtime.
D Convert AgateOTK to use vertex buffers instead of vertex arrays.
+ * Use OpenGL 3.0 forward compatible context in AgateOTK if available.
Gui
* Document GUI classes
* Develop data-driven skinning system for the GUI
@@ -78,7 +80,7 @@
Compact Sprites Builder:
Utility to construct packed sprite files with an associated xml
resource file describing frame locations.
- Fonts:
+ Fonts: - Done
Utility to construct fonts from System.Drawing from options specified.
Distributions:
Builds distributions for Linux, Windows, and MacOS based on the assemblies and resource
Modified: trunk/Tools/AgateDataLib/AgateDataLib.csproj
===================================================================
--- trunk/Tools/AgateDataLib/AgateDataLib.csproj 2011-01-07 20:05:01 UTC (rev 1265)
+++ trunk/Tools/AgateDataLib/AgateDataLib.csproj 2011-01-07 20:11:41 UTC (rev 1266)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,6 +41,8 @@
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\x64\Release\</OutputPath>
@@ -49,6 +51,7 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -57,6 +60,8 @@
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\x86\Release\</OutputPath>
@@ -65,12 +70,9 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ionic.Zip.Reduced, Version=1.9.1.2, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>.\Ionic.Zip.Reduced.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -79,6 +81,10 @@
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Xml" />
+ <Reference Include="Ionic.Zip.Reduced, Version=1.9.1.2, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>Ionic.Zip.Reduced.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="CodeGenerator.cs" />
@@ -98,6 +104,7 @@
<Content Include="Images\TableHSLarge.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Modified: trunk/Tools/DatabaseEditor/DatabaseEditor.csproj
===================================================================
--- trunk/Tools/DatabaseEditor/DatabaseEditor.csproj 2011-01-07 20:05:01 UTC (rev 1265)
+++ trunk/Tools/DatabaseEditor/DatabaseEditor.csproj 2011-01-07 20:11:41 UTC (rev 1266)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,6 +41,8 @@
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\x64\Release\</OutputPath>
@@ -49,6 +51,7 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -57,6 +60,8 @@
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\x86\Release\</OutputPath>
@@ -65,6 +70,7 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -203,6 +209,7 @@
<None Include="Resources\CodeGen.bmp" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Modified: trunk/Tools/FontCreator/FontCreator.csproj
===================================================================
--- trunk/Tools/FontCreator/FontCreator.csproj 2011-01-07 20:05:01 UTC (rev 1265)
+++ trunk/Tools/FontCreator/FontCreator.csproj 2011-01-07 20:11:41 UTC (rev 1266)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
@@ -7,8 +7,6 @@
<ProjectGuid>{A18DEAA1-EB7F-4B4A-B93A-83A2CAD5954A}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>FontCreator</AssemblyName>
@@ -21,52 +19,41 @@
<AppDesignerFolder>
</AppDesignerFolder>
<RootNamespace>FontCreator</RootNamespace>
- <StartupObject>
- </StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE;</DefineConstants>
<DocumentationFile>
</DocumentationFile>
- <DebugSymbols>True</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>False</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>..\..\Binaries\Debug\FontCreator\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;</DefineConstants>
<DocumentationFile>
</DocumentationFile>
- <DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>True</Optimize>
+ <Optimize>true</Optimize>
<OutputPath>..\..\Binaries\Debug\FontCreator\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
@@ -75,6 +62,9 @@
<BaseAddress>285212672</BaseAddress>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>..\..\Binaries\Debug\FontCreator\</OutputPath>
@@ -83,6 +73,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -91,6 +83,9 @@
<BaseAddress>285212672</BaseAddress>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\..\Binaries\Debug\FontCreator\</OutputPath>
@@ -99,6 +94,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
@@ -125,7 +122,6 @@
<ProjectReference Include="..\..\AgateLib\AgateLib.csproj">
<Name>AgateLib</Name>
<Project>{9490B719-829E-43A7-A5FE-8001F8A81759}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\..\Drivers\AgateDrawing\AgateDrawing.csproj">
<Project>{164A785D-924E-40FB-A517-D7E677F3B53A}</Project>
@@ -134,7 +130,6 @@
<ProjectReference Include="..\..\Drivers\AgateLib.WinForms\AgateLib.WinForms.csproj">
<Name>AgateLib.WinForms</Name>
<Project>{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\NotebookLib\NotebookLib\NotebookLib.csproj">
<Project>{91F57346-B574-4D52-9EB0-AA191B552C94}</Project>
@@ -241,6 +236,7 @@
<None Include="Resources\zoom_out.png" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
Modified: trunk/Tools/PackedSpriteCreator/PackedSpriteCreator.csproj
===================================================================
--- trunk/Tools/PackedSpriteCreator/PackedSpriteCreator.csproj 2011-01-07 20:05:01 UTC (rev 1265)
+++ trunk/Tools/PackedSpriteCreator/PackedSpriteCreator.csproj 2011-01-07 20:11:41 UTC (rev 1266)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
@@ -7,8 +7,6 @@
<ProjectGuid>{C653C244-F604-4BA4-8822-D04FA9ACEFA5}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>PackedSpriteCreator</AssemblyName>
@@ -21,52 +19,41 @@
<AppDesignerFolder>
</AppDesignerFolder>
<RootNamespace>PackedSpriteCreator</RootNamespace>
- <StartupObject>
- </StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE;</DefineConstants>
<DocumentationFile>
</DocumentationFile>
- <DebugSymbols>True</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>False</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>..\..\Binaries\Debug\PackedSpriteCreator\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;</DefineConstants>
<DocumentationFile>
</DocumentationFile>
- <DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>True</Optimize>
+ <Optimize>true</Optimize>
<OutputPath>..\..\Binaries\Debug\PackedSpriteCreator\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
@@ -75,6 +62,9 @@
<BaseAddress>285212672</BaseAddress>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>..\..\Binaries\Debug\PackedSpriteCreator\</OutputPath>
@@ -83,6 +73,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -91,6 +83,9 @@
<BaseAddress>285212672</BaseAddress>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\..\Binaries\Debug\PackedSpriteCreator\</OutputPath>
@@ -99,6 +94,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
@@ -121,17 +118,14 @@
<ProjectReference Include="..\..\AgateLib\AgateLib.csproj">
<Name>AgateLib</Name>
<Project>{9490B719-829E-43A7-A5FE-8001F8A81759}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\..\Drivers\AgateDrawing\AgateDrawing.csproj">
<Name>AgateDrawing</Name>
<Project>{164A785D-924E-40FB-A517-D7E677F3B53A}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\..\Drivers\AgateLib.WinForms\AgateLib.WinForms.csproj">
<Name>AgateLib.WinForms</Name>
<Project>{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -210,6 +204,7 @@
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
Modified: trunk/Tools/ResourceEditor/ResourceEditor.csproj
===================================================================
--- trunk/Tools/ResourceEditor/ResourceEditor.csproj 2011-01-07 20:05:01 UTC (rev 1265)
+++ trunk/Tools/ResourceEditor/ResourceEditor.csproj 2011-01-07 20:11:41 UTC (rev 1266)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
@@ -7,8 +7,6 @@
<ProjectGuid>{FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>ResourceEditor</AssemblyName>
@@ -21,52 +19,41 @@
<AppDesignerFolder>
</AppDesignerFolder>
<RootNamespace>ResourceEditor</RootNamespace>
- <StartupObject>
- </StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE;</DefineConstants>
<DocumentationFile>
</DocumentationFile>
- <DebugSymbols>True</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>False</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>..\..\Binaries\Debug\ResourceEditor\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;</DefineConstants>
<DocumentationFile>
</DocumentationFile>
- <DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>True</Optimize>
+ <Optimize>true</Optimize>
<OutputPath>..\..\Binaries\Debug\ResourceEditor\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
@@ -75,6 +62,9 @@
<BaseAddress>285212672</BaseAddress>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>..\..\Binaries\Debug\ResourceEditor\</OutputPath>
@@ -83,6 +73,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -91,6 +83,9 @@
<BaseAddress>285212672</BaseAddress>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\..\Binaries\Debug\ResourceEditor\</OutputPath>
@@ -99,6 +94,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
@@ -124,22 +121,18 @@
<ProjectReference Include="..\..\AgateLib\AgateLib.csproj">
<Name>AgateLib</Name>
<Project>{9490B719-829E-43A7-A5FE-8001F8A81759}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\..\Drivers\AgateDrawing\AgateDrawing.csproj">
<Name>AgateDrawing</Name>
<Project>{164A785D-924E-40FB-A517-D7E677F3B53A}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\..\Drivers\AgateLib.WinForms\AgateLib.WinForms.csproj">
<Name>AgateLib.WinForms</Name>
<Project>{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\NotebookLib\NotebookLib\NotebookLib.csproj">
<Name>NotebookLib</Name>
<Project>{91F57346-B574-4D52-9EB0-AA191B552C94}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -264,6 +257,7 @@
</None>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-07 20:05:09
|
Revision: 1265
http://agate.svn.sourceforge.net/agate/?rev=1265&view=rev
Author: kanato
Date: 2011-01-07 20:05:01 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
Add gui-032 branch.
Modified Paths:
--------------
branches/gui-032/AgateTools.sln
branches/gui-032/ChangeLog.txt
branches/gui-032/Drivers/AgateDrawing/AgateDrawing.csproj
branches/gui-032/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj
branches/gui-032/TODO.txt
branches/gui-032/Tools/AgateDataLib/AgateDataLib.csproj
branches/gui-032/Tools/DatabaseEditor/DatabaseEditor.csproj
branches/gui-032/Tools/FontCreator/FontCreator.csproj
branches/gui-032/Tools/PackedSpriteCreator/PackedSpriteCreator.csproj
branches/gui-032/Tools/ResourceEditor/ResourceEditor.csproj
Added Paths:
-----------
branches/gui-032/
branches/gui-032/AgateLib/AgateLib.csproj
branches/gui-032/AgateLib/PlatformType.cs
branches/gui-032/Tools/NotebookLib/NotebookLib/NotebookLib.csproj
branches/gui-032/Tools/NotebookLib/NotebookLib/Properties/Resources.Designer.cs
branches/gui-032/trunk/
Removed Paths:
-------------
branches/gui-032/AgateLib/AgateLib.csproj
branches/gui-032/AgateLib/PlatformType.cs
branches/gui-032/AgateLib/Utility/Platform.cs
branches/gui-032/Tools/NotebookLib/NotebookLib/NotebookLib.csproj
branches/gui-032/Tools/NotebookLib/NotebookLib/Properties/Resources.Designer.cs
Deleted: branches/gui-032/AgateLib/AgateLib.csproj
===================================================================
--- trunk/AgateLib/AgateLib.csproj 2010-12-29 21:38:41 UTC (rev 1261)
+++ branches/gui-032/AgateLib/AgateLib.csproj 2011-01-07 20:05:01 UTC (rev 1265)
@@ -1,648 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
- <PropertyGroup>
- <ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{9490B719-829E-43A7-A5FE-8001F8A81759}</ProjectGuid>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
- <AssemblyKeyContainerName>
- </AssemblyKeyContainerName>
- <AssemblyName>AgateLib</AssemblyName>
- <DefaultClientScript>JScript</DefaultClientScript>
- <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
- <DefaultTargetSchema>IE50</DefaultTargetSchema>
- <DelaySign>false</DelaySign>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>
- </AppDesignerFolder>
- <RootNamespace>AgateLib</RootNamespace>
- <StartupObject>
- </StartupObject>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
- <BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>DEBUG;TRACE;</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
- <DebugSymbols>True</DebugSymbols>
- <FileAlignment>4096</FileAlignment>
- <Optimize>False</Optimize>
- <OutputPath>..\Binaries\Debug\</OutputPath>
- <RegisterForComInterop>False</RegisterForComInterop>
- <RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
- <WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
- <BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>TRACE;</DefineConstants>
- <DocumentationFile>AgateLib.xml</DocumentationFile>
- <DebugSymbols>False</DebugSymbols>
- <FileAlignment>4096</FileAlignment>
- <Optimize>True</Optimize>
- <OutputPath>..\Binaries\Release\</OutputPath>
- <RegisterForComInterop>False</RegisterForComInterop>
- <RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
- <WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>..\Binaries\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE;</DefineConstants>
- <BaseAddress>285212672</BaseAddress>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <FileAlignment>4096</FileAlignment>
- <PlatformTarget>x64</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
- <OutputPath>bin\x64\Release\</OutputPath>
- <DefineConstants>TRACE;</DefineConstants>
- <BaseAddress>285212672</BaseAddress>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DocumentationFile>AgateLib.xml</DocumentationFile>
- <Optimize>true</Optimize>
- <FileAlignment>4096</FileAlignment>
- <PlatformTarget>x64</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>..\Binaries\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE;</DefineConstants>
- <BaseAddress>285212672</BaseAddress>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <FileAlignment>4096</FileAlignment>
- <PlatformTarget>x86</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>bin\x86\Release\</OutputPath>
- <DefineConstants>TRACE;</DefineConstants>
- <BaseAddress>285212672</BaseAddress>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DocumentationFile>AgateLib.xml</DocumentationFile>
- <Optimize>true</Optimize>
- <FileAlignment>4096</FileAlignment>
- <PlatformTarget>x86</PlatformTarget>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System">
- <Name>System</Name>
- </Reference>
- <Reference Include="System.Core">
- <Name>System.Core</Name>
- </Reference>
- <Reference Include="System.Data" />
- <Reference Include="System.Xml">
- <Name>System.Xml</Name>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="AgateException.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="AgateFileProvider.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="AgateGame.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="AgateSetup.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="AppInitParameters.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="AudioLib\AudioCapsInfo.cs" />
- <Compile Include="AudioLib\ImplementationBase\MusicImpl.cs" />
- <Compile Include="AudioLib\ImplementationBase\SoundBufferImpl.cs" />
- <Compile Include="AudioLib\ImplementationBase\SoundBufferSessionImpl.cs" />
- <Compile Include="AudioLib\ImplementationBase\StreamingSoundBufferImpl.cs" />
- <Compile Include="AudioLib\SoundFormat.cs" />
- <Compile Include="AudioLib\StreamingSoundBuffer.cs" />
- <Compile Include="Core.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Data\AgateDatabaseException.cs" />
- <Compile Include="Data\AgateColumn.cs" />
- <Compile Include="Data\AgateDatabase.cs" />
- <Compile Include="Data\AgateRow.cs" />
- <Compile Include="Data\AgateTable.cs" />
- <Compile Include="Data\AgateColumnDictionary.cs" />
- <Compile Include="Data\AgateDataHelper.cs" />
- <Compile Include="Data\FieldType.cs" />
- <Compile Include="Data\AgateRowList.cs" />
- <Compile Include="Data\AgateTableDictionary.cs" />
- <Compile Include="DisplayLib\FrameBuffer.cs" />
- <Compile Include="DisplayLib\Shaders\AgateBuiltInShaders.cs" />
- <Compile Include="DisplayLib\Shaders\Basic2DShader.cs" />
- <Compile Include="DisplayLib\Shaders\AgateShader.cs" />
- <Compile Include="DisplayLib\Shaders\Implementation\AgateInternalShader.cs" />
- <Compile Include="DisplayLib\Shaders\Implementation\AgateShaderImpl.cs" />
- <Compile Include="DisplayLib\Shaders\Implementation\Basic2DImpl.cs" />
- <Compile Include="DisplayLib\Shaders\Implementation\BuiltInShader.cs" />
- <Compile Include="DisplayLib\Shaders\Implementation\Lighting2DImpl.cs" />
- <Compile Include="DisplayLib\Shaders\Implementation\Lighting3DImpl.cs" />
- <Compile Include="DisplayLib\Shaders\Lighting2D.cs" />
- <Compile Include="DisplayLib\Shaders\Lighting3D.cs" />
- <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" />
- <Compile Include="Gui\Container.cs" />
- <Compile Include="Gui\GuiRoot.cs" />
- <Compile Include="Gui\IGuiThemeEngine.cs" />
- <Compile Include="Gui\ILayoutPerformer.cs" />
- <Compile Include="Gui\Label.cs" />
- <Compile Include="Gui\LayoutExpand.cs" />
- <Compile Include="Gui\Layout\BoxLayoutBase.cs" />
- <Compile Include="Gui\Layout\Grid.cs" />
- <Compile Include="Gui\Layout\HorizontalBox.cs" />
- <Compile Include="Gui\Layout\VerticalBox.cs" />
- <Compile Include="Gui\ListBox.cs" />
- <Compile Include="Gui\Panel.cs" />
- <Compile Include="Gui\RadioButton.cs" />
- <Compile Include="Gui\TextBox.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\Cache\ScrollBarCache.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\Mercury.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryButton.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryCheckBox.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryGuiRoot.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryLabel.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryListBox.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryPanel.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryScheme.cs" />
- <Compile Include="Gui\ScrollBar.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryWidget.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryScrollBar.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryTextBox.cs" />
- <Compile Include="Gui\ThemeEngines\Mercury\MercuryWindow.cs" />
- <Compile Include="Gui\ThemeEngines\Venus\CssData.cs" />
- <Compile Include="Gui\ThemeEngines\Venus\Venus.cs" />
- <Compile Include="Gui\ThemeEngines\Venus\VenusScheme.cs" />
- <Compile Include="Gui\ThemeEngines\Venus\VenusTheme.cs" />
- <Compile Include="Gui\ThemeEngines\Venus\VenusThemeDictionary.cs" />
- <Compile Include="Gui\ThemeEngines\Venus\WidgetStyle.cs" />
- <Compile Include="Gui\Widget.cs" />
- <Compile Include="Gui\WidgetList.cs" />
- <Compile Include="Gui\Window.cs" />
- <Compile Include="IFileProvider.cs">
- <SubType>Code</SubType>
- </Compile>
- <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">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="AudioLib\Audio.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="AudioLib\Music.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="AudioLib\SoundBuffer.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="AudioLib\SoundBufferSession.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="BitmapFont\BitmapFontImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="BitmapFont\BitmapFontOptions.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="BitmapFont\FontMetrics.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="BitmapFont\GlyphMetrics.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\CreateWindowParams.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\Display.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\DisplayCapsInfo.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\DisplayWindow.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\FontState.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\FontSurface.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\IndexBuffer.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\ISurface.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\Origin.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\OriginAlignment.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\PixelBuffer.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\PixelFormat.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\PrimitiveType.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\RenderStateAdapter.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\ScreenMode.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\StringTransformer.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\Surface.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\SurfaceState.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\TextLayout.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\VertexBuffer.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\Cache\FontStateCache.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\Cache\SurfaceStateCache.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\Shaders\Implementation\AgateShaderCompileError.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\Shaders\Implementation\Effect.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\Shaders\Implementation\ShaderCompiler.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\Shaders\Implementation\ShaderLanguage.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\Shaders\Implementation\ShaderProgram.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\Shaders\Implementation\Technique.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\Shaders\Implementation\UniformState.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Drivers\AgateDriverInfo.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Drivers\AgateDriverReporter.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Drivers\AgateSandBoxLoader.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Drivers\DriverImplBase.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Drivers\IDesktopDriver.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Drivers\IUserSetSystems.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Drivers\NullInputImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Drivers\NullSoundImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Drivers\Registrar.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Drivers\TypeID.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\Color.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\Gradient.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\Matrix4x4.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\Point.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\PointF.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\Rectangle.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\RectangleF.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\Size.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\SizeF.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\TypeConverters.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\Vector2.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\Vector3.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\Vector4.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\Builders\Cube.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\Builders\Terrain.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\VertexTypes\PositionColor.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\VertexTypes\PositionTextureColor.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\VertexTypes\PositionTextureNormal.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\VertexTypes\PositionTextureNormalTangent.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\VertexTypes\PositionTextureNTB.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Geometry\VertexTypes\VertexLayout.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="AudioLib\ImplementationBase\AudioImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\ImplementationBase\DisplayImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\ImplementationBase\DisplayWindowImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\ImplementationBase\FontSurfaceImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\ImplementationBase\IndexBufferImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="InputLib\ImplementationBase\InputImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="InputLib\ImplementationBase\JoystickImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\ImplementationBase\ShaderCompilerImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\ImplementationBase\SurfaceImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="DisplayLib\ImplementationBase\VertexBufferImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="InputLib\InputEventArgs.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="InputLib\Joystick.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="InputLib\JoystickInput.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="InputLib\Keyboard.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="InputLib\KeyCode.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="InputLib\KeyModifiers.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="InputLib\Mouse.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="InternalResources\Data.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="InternalResources\DataResources.Designer.cs">
- <DependentUpon>DataResources.resx</DependentUpon>
- <SubType>Code</SubType>
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- </Compile>
- <Compile Include="Meshes\Loaders\OBJFileRepresentation.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Meshes\Loaders\Obj\OBJFileRepresentation.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Meshes\Loaders\Obj\Parser.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Meshes\Loaders\Obj\TokenTypes.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Particles\Particle.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Particles\ParticleEmitter.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Particles\Emitters\PixelEmitter.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Particles\Emitters\SpriteEmitter.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Particles\Emitters\SurfaceEmitter.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Particles\Manipulators\FadeOutManipulator.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Particles\Manipulators\GravityManipulator.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Particles\Manipulators\GravityPointManipulator.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Particles\Particles\PixelParticle.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Particles\Particles\SpriteParticle.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Particles\Particles\SurfaceParticle.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Properties\AssemblyInfo.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Resources\AgateResource.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Resources\AgateResourceCollection.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Resources\AgateResourceException.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Resources\AgateResourceLoader.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Resources\BitmapFontResource.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Resources\DisplayWindowResource.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Resources\SpriteResource.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Resources\StringTable.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Resources\SurfaceResource.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Resources\XmlHelper.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Serialization\Formatters\Xml\XmlFormatter.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Serialization\Xle\ITypeBinder.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Serialization\Xle\IXleSerializable.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Serialization\Xle\TypeBinder.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Serialization\Xle\XleSerializationException.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Serialization\Xle\XleSerializationInfo.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Serialization\Xle\XleSerializer.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Sprites\FrameList.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Sprites\IFrameList.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Sprites\ISprite.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Sprites\ISpriteFrame.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Sprites\Sprite.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Sprites\SpriteFrame.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Utility\FileProviderList.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Utility\FileSystemProvider.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Settings\PersistantSettings.cs" />
- <Compile Include="Utility\Ref.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Utility\SurfacePacker.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Utility\TgzFileProvider.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Utility\ZipFileProvider.cs">
- <SubType>Code</SubType>
- </Compile>
- <EmbeddedResource Include="InternalResources\DataResources.resx">
- <SubType>Designer</SubType>
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>DataResources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <None Include="InternalResources\agate-black-gui.zip" />
- <None Include="InternalResources\Fonts.zip" />
- <None Include="InternalResources\images.tar.gz" />
- </ItemGroup>
- <ItemGroup>
- <Folder Include="Gui\Cache\" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
- <PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Copied: branches/gui-032/AgateLib/AgateLib.csproj (from rev 1263, trunk/AgateLib/AgateLib.csproj)
===================================================================
--- branches/gui-032/AgateLib/AgateLib.csproj (rev 0)
+++ branches/gui-032/AgateLib/AgateLib.csproj 2011-01-07 20:05:01 UTC (rev 1265)
@@ -0,0 +1,648 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{9490B719-829E-43A7-A5FE-8001F8A81759}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>AgateLib</AssemblyName>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>
+ </AppDesignerFolder>
+ <RootNamespace>AgateLib</RootNamespace>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <Optimize>false</Optimize>
+ <OutputPath>..\Binaries\Debug\</OutputPath>
+ <RegisterForComInterop>False</RegisterForComInterop>
+ <RemoveIntegerChecks>False</RemoveIntegerChecks>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE;</DefineConstants>
+ <DocumentationFile>AgateLib.xml</DocumentationFile>
+ <FileAlignment>4096</FileAlignment>
+ <Optimize>true</Optimize>
+ <OutputPath>..\Binaries\Release\</OutputPath>
+ <RegisterForComInterop>False</RegisterForComInterop>
+ <RemoveIntegerChecks>False</RemoveIntegerChecks>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>..\Binaries\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE;</DefineConstants>
+ <BaseAddress>285212672</BaseAddress>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <FileAlignment>4096</FileAlignment>
+ <PlatformTarget>x64</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+ <OutputPath>bin\x64\Release\</OutputPath>
+ <DefineConstants>TRACE;</DefineConstants>
+ <BaseAddress>285212672</BaseAddress>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <DocumentationFile>AgateLib.xml</DocumentationFile>
+ <Optimize>true</Optimize>
+ <FileAlignment>4096</FileAlignment>
+ <PlatformTarget>x64</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>..\Binaries\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE;</DefineConstants>
+ <BaseAddress>285212672</BaseAddress>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <FileAlignment>4096</FileAlignment>
+ <PlatformTarget>x86</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <OutputPath>bin\x86\Release\</OutputPath>
+ <DefineConstants>TRACE;</DefineConstants>
+ <BaseAddress>285212672</BaseAddress>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <DocumentationFile>AgateLib.xml</DocumentationFile>
+ <Optimize>true</Optimize>
+ <FileAlignment>4096</FileAlignment>
+ <PlatformTarget>x86</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System">
+ <Name>System</Name>
+ </Reference>
+ <Reference Include="System.Core">
+ <Name>System.Core</Name>
+ </Reference>
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml">
+ <Name>System.Xml</Name>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="AgateException.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="AgateFileProvider.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="AgateGame.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="AgateSetup.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="AppInitParameters.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="AudioLib\AudioCapsInfo.cs" />
+ <Compile Include="AudioLib\ImplementationBase\MusicImpl.cs" />
+ <Compile Include="AudioLib\ImplementationBase\SoundBufferImpl.cs" />
+ <Compile Include="AudioLib\ImplementationBase\SoundBufferSessionImpl.cs" />
+ <Compile Include="AudioLib\ImplementationBase\StreamingSoundBufferImpl.cs" />
+ <Compile Include="AudioLib\SoundFormat.cs" />
+ <Compile Include="AudioLib\StreamingSoundBuffer.cs" />
+ <Compile Include="Core.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Data\AgateDatabaseException.cs" />
+ <Compile Include="Data\AgateColumn.cs" />
+ <Compile Include="Data\AgateDatabase.cs" />
+ <Compile Include="Data\AgateRow.cs" />
+ <Compile Include="Data\AgateTable.cs" />
+ <Compile Include="Data\AgateColumnDictionary.cs" />
+ <Compile Include="Data\AgateDataHelper.cs" />
+ <Compile Include="Data\FieldType.cs" />
+ <Compile Include="Data\AgateRowList.cs" />
+ <Compile Include="Data\AgateTableDictionary.cs" />
+ <Compile Include="DisplayLib\FrameBuffer.cs" />
+ <Compile Include="DisplayLib\Shaders\AgateBuiltInShaders.cs" />
+ <Compile Include="DisplayLib\Shaders\Basic2DShader.cs" />
+ <Compile Include="DisplayLib\Shaders\AgateShader.cs" />
+ <Compile Include="DisplayLib\Shaders\Implementation\AgateInternalShader.cs" />
+ <Compile Include="DisplayLib\Shaders\Implementation\AgateShaderImpl.cs" />
+ <Compile Include="DisplayLib\Shaders\Implementation\Basic2DImpl.cs" />
+ <Compile Include="DisplayLib\Shaders\Implementation\BuiltInShader.cs" />
+ <Compile Include="DisplayLib\Shaders\Implementation\Lighting2DImpl.cs" />
+ <Compile Include="DisplayLib\Shaders\Implementation\Lighting3DImpl.cs" />
+ <Compile Include="DisplayLib\Shaders\Lighting2D.cs" />
+ <Compile Include="DisplayLib\Shaders\Lighting3D.cs" />
+ <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" />
+ <Compile Include="Gui\Container.cs" />
+ <Compile Include="Gui\GuiRoot.cs" />
+ <Compile Include="Gui\IGuiThemeEngine.cs" />
+ <Compile Include="Gui\ILayoutPerformer.cs" />
+ <Compile Include="Gui\Label.cs" />
+ <Compile Include="Gui\LayoutExpand.cs" />
+ <Compile Include="Gui\Layout\BoxLayoutBase.cs" />
+ <Compile Include="Gui\Layout\Grid.cs" />
+ <Compile Include="Gui\Layout\HorizontalBox.cs" />
+ <Compile Include="Gui\Layout\VerticalBox.cs" />
+ <Compile Include="Gui\ListBox.cs" />
+ <Compile Include="Gui\Panel.cs" />
+ <Compile Include="Gui\RadioButton.cs" />
+ <Compile Include="Gui\TextBox.cs" />
+ <Compile Include="Gui\ThemeEngines\Mercury\Cache\ScrollBarCache.cs" />
+ <Compile Include="Gui\ThemeEngines\Mercury\Mercury.cs" />
+ <Compile Include="Gui\ThemeEngines\Mercury\MercuryButton.cs" />
+ <Compile Include="Gui\ThemeEngines\Mercury\MercuryCheckBox.cs" />
+ <Compile Include="Gui\ThemeEngines\Mercury\MercuryGuiRoot.cs" />
+ <Compile Include="Gui\ThemeEngines\Mercury\MercuryLabel.cs" />
+ <Compile Include="Gui\ThemeEngines\Mercury\MercuryListBox.cs" />
+ <Compile Include="Gui\ThemeEngines\Mercury\MercuryPanel.cs" />
+ <Compile Include="Gui\ThemeEngines\Mercury\MercuryScheme.cs" />
+ <Compile Include="Gui\ScrollBar.cs" />
+ <Compile Include="Gui\ThemeEngines\Mercury\MercuryWidget.cs" />
+ <Compile Include="Gui\ThemeEngines\Mercury\MercuryScrollBar.cs" />
+ <Compile Include="Gui\ThemeEngines\Mercury\MercuryTextBox.cs" />
+ <Compile Include="Gui\ThemeEngines\Mercury\MercuryWindow.cs" />
+ <Compile Include="Gui\ThemeEngines\Venus\CssData.cs" />
+ <Compile Include="Gui\ThemeEngines\Venus\Venus.cs" />
+ <Compile Include="Gui\ThemeEngines\Venus\VenusScheme.cs" />
+ <Compile Include="Gui\ThemeEngines\Venus\VenusTheme.cs" />
+ <Compile Include="Gui\ThemeEngines\Venus\VenusThemeDictionary.cs" />
+ <Compile Include="Gui\ThemeEngines\Venus\WidgetStyle.cs" />
+ <Compile Include="Gui\Widget.cs" />
+ <Compile Include="Gui\WidgetList.cs" />
+ <Compile Include="Gui\Window.cs" />
+ <Compile Include="IFileProvider.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <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">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="AudioLib\Audio.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="AudioLib\Music.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="AudioLib\SoundBuffer.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="AudioLib\SoundBufferSession.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="BitmapFont\BitmapFontImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="BitmapFont\BitmapFontOptions.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="BitmapFont\FontMetrics.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="BitmapFont\GlyphMetrics.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\CreateWindowParams.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\Display.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\DisplayCapsInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\DisplayWindow.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\FontState.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\FontSurface.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\IndexBuffer.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\ISurface.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\Origin.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\OriginAlignment.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\PixelBuffer.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\PixelFormat.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\PrimitiveType.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\RenderStateAdapter.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\ScreenMode.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\StringTransformer.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\Surface.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\SurfaceState.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\TextLayout.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\VertexBuffer.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\Cache\FontStateCache.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\Cache\SurfaceStateCache.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\Shaders\Implementation\AgateShaderCompileError.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\Shaders\Implementation\Effect.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\Shaders\Implementation\ShaderCompiler.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\Shaders\Implementation\ShaderLanguage.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\Shaders\Implementation\ShaderProgram.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\Shaders\Implementation\Technique.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\Shaders\Implementation\UniformState.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Drivers\AgateDriverInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Drivers\AgateDriverReporter.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Drivers\AgateSandBoxLoader.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Drivers\DriverImplBase.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Drivers\IDesktopDriver.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Drivers\IUserSetSystems.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Drivers\NullInputImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Drivers\NullSoundImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Drivers\Registrar.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Drivers\TypeID.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\Color.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\Gradient.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\Matrix4x4.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\Point.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\PointF.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\Rectangle.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\RectangleF.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\Size.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\SizeF.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\TypeConverters.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\Vector2.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\Vector3.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\Vector4.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\Builders\Cube.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\Builders\Terrain.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\VertexTypes\PositionColor.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\VertexTypes\PositionTextureColor.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\VertexTypes\PositionTextureNormal.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\VertexTypes\PositionTextureNormalTangent.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\VertexTypes\PositionTextureNTB.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Geometry\VertexTypes\VertexLayout.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="AudioLib\ImplementationBase\AudioImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\ImplementationBase\DisplayImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\ImplementationBase\DisplayWindowImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\ImplementationBase\FontSurfaceImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\ImplementationBase\IndexBufferImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="InputLib\ImplementationBase\InputImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="InputLib\ImplementationBase\JoystickImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\ImplementationBase\ShaderCompilerImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\ImplementationBase\SurfaceImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DisplayLib\ImplementationBase\VertexBufferImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="InputLib\InputEventArgs.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="InputLib\Joystick.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="InputLib\JoystickInput.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="InputLib\Keyboard.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="InputLib\KeyCode.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="InputLib\KeyModifiers.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="InputLib\Mouse.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="InternalResources\Data.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="InternalResources\DataResources.Designer.cs">
+ <DependentUpon>DataResources.resx</DependentUpon>
+ <SubType>Code</SubType>
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ </Compile>
+ <Compile Include="Meshes\Loaders\OBJFileRepresentation.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Meshes\Loaders\Obj\OBJFileRepresentation.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Meshes\Loaders\Obj\Parser.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Meshes\Loaders\Obj\TokenTypes.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particles\Particle.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particles\ParticleEmitter.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particles\Emitters\PixelEmitter.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particles\Emitters\SpriteEmitter.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particles\Emitters\SurfaceEmitter.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particles\Manipulators\FadeOutManipulator.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particles\Manipulators\GravityManipulator.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particles\Manipulators\GravityPointManipulator.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particles\Particles\PixelParticle.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particles\Particles\SpriteParticle.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particles\Particles\SurfaceParticle.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Resources\AgateResource.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Resources\AgateResourceCollection.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Resources\AgateResourceException.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Resources\AgateResourceLoader.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Resources\BitmapFontResource.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Resources\DisplayWindowResource.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Resources\SpriteResource.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Resources\StringTable.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Resources\SurfaceResource.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Resources\XmlHelper.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Serialization\Formatters\Xml\XmlFormatter.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Serialization\Xle\ITypeBinder.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Serialization\Xle\IXleSerializable.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Serialization\Xle\TypeBinder.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Serialization\Xle\XleSerializationException.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Serialization\Xle\XleSerializationInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Serialization\Xle\XleSerializer.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Sprites\FrameList.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Sprites\IFrameList.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Sprites\ISprite.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Sprites\ISpriteFrame.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Sprites\Sprite.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Sprites\SpriteFrame.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Utility\FileProviderList.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Utility\FileSystemProvider.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Settings\PersistantSettings.cs" />
+ <Compile Include="Utility\Ref.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Utility\SurfacePacker.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Utility\TgzFileProvider.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Utility\ZipFileProvider.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <EmbeddedResource Include="InternalResources\DataResources.resx">
+ <SubType>Designer</SubType>
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>DataResources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="InternalResources\agate-black-gui.zip" />
+ <None Include="InternalResources\Fonts.zip" />
+ <None Include="InternalResources\images.tar.gz" />
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="Gui\Cache\" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Deleted: branches/gui-032/AgateLib/PlatformType.cs
===================================================================
--- trunk/AgateLib/PlatformType.cs 2010-12-29 21:38:41 UTC (rev 1261)
+++ branches/gui-032/AgateLib/PlatformType.cs 2011-01-07 20:05:01 UTC (rev 1265)
@@ -1,110 +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) 2009.
-// All Rights Reserved.
-//
-// Contributor(s): Erik Ylvisaker
-//
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace AgateLib
-{
- /// <summary>
- /// Enumeration listing the known platform types.
- /// </summary>
- public enum PlatformType
- {
- /// <summary>
- /// Default value.
- /// </summary>
- Unknown,
-
- /// <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,
-
- /// <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>
- /// Enum indicating which .NET runtime is currently in use.
- /// </summary>
- public enum DotNetRuntime
- {
- /// <summary>
- /// An unknown runtime.
- /// </summary>
- Unknown,
-
- /// <summary>
- /// Microsoft's runtime.
- /// </summary>
- MicrosoftDotNet = 1,
- /// <summary>
- /// The runtime of the Mono project.
- /// </summary>
- Mono,
- /// <summary>
- /// The DotGnu / Portable.NET runtime.
- /// </summary>
- DotGnu,
- }
-}
Copied: branches/gui-032/AgateLib/PlatformType.cs (from rev 1263, trunk/AgateLib/PlatformType.cs)
===================================================================
--- branches/gui-032/AgateLib/PlatformType.cs (rev 0)
+++ branches/gui-032/AgateLib/PlatformType.cs 2011-01-07 20:05:01 UTC (rev 1265)
@@ -0,0 +1,112 @@
+// 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) 2009.
+// All Rights Reserved.
+//
+// Contributor(s): Erik Ylvisaker
+//
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AgateLib
+{
+ /// <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>
+ /// 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: branches/gui-032/AgateLib/Utility/Platform.cs
===================================================================
--- trunk/AgateLib/Utility/Platform.cs 2010-12-29 21:38:41 UTC (rev 1261)
+++ branches/gui-032/AgateLib/Utility/Platform.cs 2011-01-07 20:05:01 UTC (rev 1265)
@@ -1,109 +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-2009.
-// All Rights Reserved.
-//
-// Contributor(s): Erik Ylvisaker
-//
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace AgateLib.Utility
-{
- using AgateLib.DisplayLib;
-
- /// <summary>
- /// Returns information about the current platform.
- /// </summary>
- public static class Platform
- {
- static bool mDetectedPlatform = false;
- static PlatformType mType = PlatformType.Unknown;
- static PlatformSpecific.IPlatformServices mServices;
-
- /// <summary>
- /// Returns an enum representing the current platform.
- /// </summary>
- public static PlatformType PlatformType
- {
- get
- {
- if (mDetectedPlatform == false)
- DetectPlatform();
-
- return mType;
- }
- }
-
- private static void DetectPlatform()
- {
- switch (Environment.OSVersion.Platform)
- {
- case PlatformID.Win32NT:
- case PlatformID.Win32S:
- case PlatformID.Win32Windows:
- case PlatformID.WinCE:
- mType = PlatformType.Windows;
- break;
-
- case PlatformID.Unix:
- mType = PlatformType.Linux;
- break;
- }
-
- if (Display.Impl == null)
- return;
-
- mServices = Display.GetPlatformServices();
- mType = mServices.PlatformType;
-
- mDetectedPlatform = true;
-
- }
- }
-
- /// <summary>
- /// Enumeration listing the known platform types.
- /// </summary>
- public enum PlatformType
- {
- /// <summary>
- /// Default value.
- /// </summary>
- Unknown,
-
- /// <summary>
- /// The Windows platform, including Windows 98, Windows NT, Windows ...
[truncated message content] |
|
From: <ka...@us...> - 2011-01-07 20:01:35
|
Revision: 1264
http://agate.svn.sourceforge.net/agate/?rev=1264&view=rev
Author: kanato
Date: 2011-01-07 20:01:29 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
Remove old gui branch.
Removed Paths:
-------------
branches/gui-3.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-01-07 19:52:58
|
Revision: 1263
http://agate.svn.sourceforge.net/agate/?rev=1263&view=rev
Author: kanato
Date: 2011-01-07 19:52:52 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
Add numerical values to PlatformType.cs enumerations.
Remove oddly still present Utility/Platform.cs file.
Modified Paths:
--------------
trunk/AgateLib/AgateLib.csproj
trunk/AgateLib/PlatformType.cs
Removed Paths:
-------------
trunk/AgateLib/Utility/Platform.cs
Modified: trunk/AgateLib/AgateLib.csproj
===================================================================
--- trunk/AgateLib/AgateLib.csproj 2011-01-07 19:32:13 UTC (rev 1262)
+++ trunk/AgateLib/AgateLib.csproj 2011-01-07 19:52:52 UTC (rev 1263)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
@@ -7,8 +7,6 @@
<ProjectGuid>{9490B719-829E-43A7-A5FE-8001F8A81759}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>AgateLib</AssemblyName>
@@ -21,51 +19,42 @@
<AppDesignerFolder>
</AppDesignerFolder>
<RootNamespace>AgateLib</RootNamespace>
- <StartupObject>
- </StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE;</DefineConstants>
<DocumentationFile>
</DocumentationFile>
- <DebugSymbols>True</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>False</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>..\Binaries\Debug\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;</DefineConstants>
<DocumentationFile>AgateLib.xml</DocumentationFile>
- <DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>True</Optimize>
+ <Optimize>true</Optimize>
<OutputPath>..\Binaries\Release\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
@@ -75,6 +64,9 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\x64\Release\</OutputPath>
@@ -85,6 +77,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -94,6 +88,9 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\x86\Release\</OutputPath>
@@ -104,6 +101,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
@@ -639,6 +638,7 @@
<Folder Include="Gui\Cache\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
Modified: trunk/AgateLib/PlatformType.cs
===================================================================
--- trunk/AgateLib/PlatformType.cs 2011-01-07 19:32:13 UTC (rev 1262)
+++ trunk/AgateLib/PlatformType.cs 2011-01-07 19:52:52 UTC (rev 1263)
@@ -31,7 +31,7 @@
/// <summary>
/// Default value.
/// </summary>
- Unknown,
+ Unknown = 0,
/// <summary>
/// The Microsoft Windows platform, including Windows 98, Windows NT, Windows XP, Windows Vista, etc.
@@ -64,7 +64,7 @@
/// <summary>
/// An unknown version of Windows.
/// </summary>
- Unknown,
+ Unknown = 0,
/// <summary>
/// Windows 98.
@@ -92,7 +92,7 @@
/// <summary>
/// An unknown runtime.
/// </summary>
- Unknown,
+ Unknown = 0,
/// <summary>
/// Microsoft's runtime.
@@ -101,10 +101,12 @@
/// <summary>
/// The runtime of the Mono project.
/// </summary>
- Mono,
+ 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,
+ DotGnu = 9999,
}
}
Deleted: trunk/AgateLib/Utility/Platform.cs
===================================================================
--- trunk/AgateLib/Utility/Platform.cs 2011-01-07 19:32:13 UTC (rev 1262)
+++ trunk/AgateLib/Utility/Platform.cs 2011-01-07 19:52:52 UTC (rev 1263)
@@ -1,109 +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-2009.
-// All Rights Reserved.
-//
-// Contributor(s): Erik Ylvisaker
-//
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace AgateLib.Utility
-{
- using AgateLib.DisplayLib;
-
- /// <summary>
- /// Returns information about the current platform.
- /// </summary>
- public static class Platform
- {
- static bool mDetectedPlatform = false;
- static PlatformType mType = PlatformType.Unknown;
- static PlatformSpecific.IPlatformServices mServices;
-
- /// <summary>
- /// Returns an enum representing the current platform.
- /// </summary>
- public static PlatformType PlatformType
- {
- get
- {
- if (mDetectedPlatform == false)
- DetectPlatform();
-
- return mType;
- }
- }
-
- private static void DetectPlatform()
- {
- switch (Environment.OSVersion.Platform)
- {
- case PlatformID.Win32NT:
- case PlatformID.Win32S:
- case PlatformID.Win32Windows:
- case PlatformID.WinCE:
- mType = PlatformType.Windows;
- break;
-
- case PlatformID.Unix:
- mType = PlatformType.Linux;
- break;
- }
-
- if (Display.Impl == null)
- return;
-
- mServices = Display.GetPlatformServices();
- mType = mServices.PlatformType;
-
- mDetectedPlatform = true;
-
- }
- }
-
- /// <summary>
- /// Enumeration listing the known platform types.
- /// </summary>
- public enum PlatformType
- {
- /// <summary>
- /// Default value.
- /// </summary>
- Unknown,
-
- /// <summary>
- /// The 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,
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
