Thread: [Agate-svn-commit] SF.net SVN: agate:[1344] trunk (Page 4)

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

Revision: 1344
          http://agate.svn.sourceforge.net/agate/?rev=1344&view=rev
Author:   kanato
Date:     2012-04-10 18:09:20 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Framebuffer bug fixes for AgateDrawing and AgateOTK. 
Now Viewport is set when rendering to a Framebuffer in AgateOTK.
Prevent recreation of Drawing_Surface every time the RenderTarget property was accessed in AgateDrawing.
Added MultipleFramebufferTest.

Modified Paths:
--------------
    trunk/AgateLib/DisplayLib/FrameBuffer.cs
    trunk/Drivers/AgateDrawing/Drawing_FrameBuffer.cs
    trunk/Drivers/AgateDrawing/Drawing_Surface.cs
    trunk/Drivers/AgateOTK/ContextFB.cs
    trunk/Drivers/AgateOTK/GL3/FrameBuffer.cs
    trunk/Drivers/AgateOTK/GL_Display.cs
    trunk/Drivers/AgateOTK/GL_Surface.cs
    trunk/Tests/DisplayTests/MultipleWindows/MultipleWindowTest.cs
    trunk/Tests/Tests.csproj
    trunk/Tests/frmLauncher.Designer.cs
    trunk/Tests/frmLauncher.cs
    trunk/Tests/frmLauncher.resx
    trunk/Tests/settings_list.txt

Added Paths:
-----------
    trunk/Tests/DisplayTests/MultipleFramebufferTest.cs

Modified: trunk/AgateLib/DisplayLib/FrameBuffer.cs
===================================================================

--- trunk/AgateLib/DisplayLib/FrameBuffer.cs	2012-04-05 17:23:01 UTC (rev 1343)
+++ trunk/AgateLib/DisplayLib/FrameBuffer.cs	2012-04-10 18:09:20 UTC (rev 1344)
@@ -143,12 +143,6 @@
 		{
 			get
 			{
-				if (mRenderTarget != null && mRenderTarget.Impl != Impl.RenderTarget)
-				{
-					mRenderTarget.Dispose();
-					mRenderTarget = null;
-				}
-
 				if (mRenderTarget == null)
 					mRenderTarget = new Surface(Impl.RenderTarget);
 

Modified: trunk/Drivers/AgateDrawing/Drawing_FrameBuffer.cs
===================================================================
--- trunk/Drivers/AgateDrawing/Drawing_FrameBuffer.cs	2012-04-05 17:23:01 UTC (rev 1343)
+++ trunk/Drivers/AgateDrawing/Drawing_FrameBuffer.cs	2012-04-10 18:09:20 UTC (rev 1344)
@@ -31,6 +31,7 @@
 	{
 		Bitmap backBuffer;
 		internal AgateLib.DisplayLib.DisplayWindow mAttachedWindow;
+		SurfaceImpl mRenderTarget;
 
 		public Drawing_FrameBuffer(Size size)
 		{
@@ -51,7 +52,8 @@
 		}
 		public override void Dispose()
 		{
-			backBuffer.Dispose();
+			if (mRenderTarget == null)
+				backBuffer.Dispose();
 		}
 
 		public override Size Size
@@ -62,7 +64,13 @@
 		public System.Drawing.Bitmap BackBufferBitmap
 		{
 			get { return backBuffer; }
-			set { backBuffer = value; }
+			set
+			{
+				if (value == null)
+					throw new ArgumentNullException();
+
+				backBuffer = value;
+			}
 		}
 
 		public override void BeginRender()
@@ -82,7 +90,13 @@
 		}
 		public override SurfaceImpl RenderTarget
 		{
-			get { return new Drawing_Surface(backBuffer, new System.Drawing.Rectangle(System.Drawing.Point.Empty, backBuffer.Size)); }
+			get
+			{
+				if (mRenderTarget == null)
+					mRenderTarget = new Drawing_Surface(backBuffer);
+
+				return mRenderTarget;
+			}
 		}
 		
 		public override AgateLib.DisplayLib.DisplayWindow AttachedWindow

Modified: trunk/Drivers/AgateDrawing/Drawing_Surface.cs
===================================================================
--- trunk/Drivers/AgateDrawing/Drawing_Surface.cs	2012-04-05 17:23:01 UTC (rev 1343)
+++ trunk/Drivers/AgateDrawing/Drawing_Surface.cs	2012-04-10 18:09:20 UTC (rev 1344)
@@ -62,19 +62,23 @@
 
 			System.Diagnostics.Debug.Assert(mImage != null);
 		}
-
-		private void ConvertImage()
+		/// <summary>
+		/// Creates a Drawing_Surface object which wraps the specified image.
+		/// </summary>
+		/// <param name="image"></param>
+		public Drawing_Surface(Bitmap image)
 		{
-			var newImage = new Bitmap(mImage.Width, mImage.Height);
+			mDisplay = Display.Impl as Drawing_Display;
 
-			Graphics g = Graphics.FromImage(newImage);
-			g.DrawImage(mImage, new Rectangle(0, 0, mImage.Width, mImage.Height));
+			mImage = image;
 
-			g.Dispose();
-			mImage.Dispose();
-
-			mImage = newImage;
+			System.Diagnostics.Debug.Assert(mImage != null);
 		}
+		/// <summary>
+		/// Creates a Drawing_Surface object and copies pixels from the specified image.
+		/// </summary>
+		/// <param name="image"></param>
+		/// <param name="sourceRect"></param>
 		public Drawing_Surface(Bitmap image, Rectangle sourceRect)
 		{
 			mDisplay = Display.Impl as Drawing_Display;
@@ -89,7 +93,9 @@
 				(Rectangle)sourceRect, GraphicsUnit.Pixel);
 
 			g.Dispose();
+			
 
+			System.Diagnostics.Debug.Assert(mImage != null);
 		}
 		public Drawing_Surface(Geometry.Size sz)
 		{
@@ -113,6 +119,19 @@
 			}
 		}
 
+		private void ConvertImage()
+		{
+			var newImage = new Bitmap(mImage.Width, mImage.Height);
+
+			Graphics g = Graphics.FromImage(newImage);
+			g.DrawImage(mImage, new Rectangle(0, 0, mImage.Width, mImage.Height));
+
+			g.Dispose();
+			mImage.Dispose();
+
+			mImage = newImage;
+		}
+
 		#endregion
 		#region --- Protected Drawing helper methods ---
 
@@ -149,7 +168,7 @@
 
 			Geometry.SizeF displaySize = s.GetDisplaySize(SurfaceSize);
 			Geometry.PointF rotationCenter = s.GetRotationCenter(displaySize);
-			
+
 			Drawing_Display disp = Display.Impl as Drawing_Display;
 			Graphics g = disp.FrameGraphics;
 			GraphicsState state = g.Save();
@@ -235,6 +254,7 @@
 					break;
 			}
 		}
+
 		#endregion
 		#region --- Public overriden properties ---
 
@@ -274,8 +294,6 @@
 
 			mImage.Save(filename, drawformat);
 		}
-
-
 		public override void SetSourceSurface(SurfaceImpl surf, Geometry.Rectangle srcRect)
 		{
 			mImage.Dispose();
@@ -289,13 +307,13 @@
 
 			g.Dispose();
 
+			System.Diagnostics.Debug.Assert(mImage != null);
 		}
 
 		public override PixelBuffer ReadPixels(PixelFormat format)
 		{
 			return ReadPixels(format, new Geometry.Rectangle(Geometry.Point.Empty, SurfaceSize));
 		}
-
 		public override PixelBuffer ReadPixels(PixelFormat format, Geometry.Rectangle rect)
 		{
 			BitmapData data = mImage.LockBits(Interop.Convert(rect), ImageLockMode.ReadOnly,
@@ -315,7 +333,6 @@
 
 			return buffer;
 		}
-
 		public override void WritePixels(PixelBuffer buffer)
 		{
 			BitmapData data = mImage.LockBits(new Rectangle(Point.Empty, Interop.Convert(SurfaceSize)),

Modified: trunk/Drivers/AgateOTK/ContextFB.cs
===================================================================
--- trunk/Drivers/AgateOTK/ContextFB.cs	2012-04-05 17:23:01 UTC (rev 1343)
+++ trunk/Drivers/AgateOTK/ContextFB.cs	2012-04-10 18:09:20 UTC (rev 1344)
@@ -71,13 +71,11 @@
 			}
 
 			GL.Viewport(0, 0, Width, Height);
-
 		}
 
 		public override void BeginRender()
 		{
 			MakeCurrent();
-
 		}
 
 		public override void EndRender()

Modified: trunk/Drivers/AgateOTK/GL3/FrameBuffer.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL3/FrameBuffer.cs	2012-04-05 17:23:01 UTC (rev 1343)
+++ trunk/Drivers/AgateOTK/GL3/FrameBuffer.cs	2012-04-10 18:09:20 UTC (rev 1344)
@@ -52,6 +52,11 @@
 			GL.GenFramebuffers(1, out mFramebufferID);
 			GL.BindFramebuffer(FramebufferTarget.Framebuffer, mFramebufferID);
 
+			// attach the texture
+			GL.FramebufferTexture2D(FramebufferTarget.Framebuffer,
+				 FramebufferAttachment.ColorAttachment0, TextureTarget.Texture2D,
+				 mTexture.GLTextureID, 0);
+
 			// generate a depth buffer to render to
 			GL.GenRenderbuffers(1, out mDepthBuffer);
 			GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, mDepthBuffer);
@@ -66,10 +71,6 @@
 				FramebufferAttachment.DepthAttachment, RenderbufferTarget.Renderbuffer,
 				mDepthBuffer);
 
-			// attach the texture
-			GL.FramebufferTexture2D(FramebufferTarget.Framebuffer,
-				 FramebufferAttachment.ColorAttachment0, TextureTarget.Texture2D,
-				 mTexture.GLTextureID, 0);
 
 			FramebufferErrorCode code =
 				GL.CheckFramebufferStatus(FramebufferTarget.Framebuffer);
@@ -128,7 +129,7 @@
 		}
 		public override bool CanAccessRenderTarget
 		{
-			get			{				return true;			}
+			get { return true; }
 		}
 
 		public override bool HasDepthBuffer

Modified: trunk/Drivers/AgateOTK/GL_Display.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL_Display.cs	2012-04-05 17:23:01 UTC (rev 1343)
+++ trunk/Drivers/AgateOTK/GL_Display.cs	2012-04-10 18:09:20 UTC (rev 1344)
@@ -206,6 +206,7 @@
 			mRenderTarget.BeginRender();
 
 			GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha);
+			GL.Viewport(0, 0, mRenderTarget.Width, mRenderTarget.Height);
 		}
 		protected override void OnEndFrame()
 		{

Modified: trunk/Drivers/AgateOTK/GL_Surface.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL_Surface.cs	2012-04-05 17:23:01 UTC (rev 1343)
+++ trunk/Drivers/AgateOTK/GL_Surface.cs	2012-04-10 18:09:20 UTC (rev 1344)
@@ -109,7 +109,7 @@
 				GL.BindTexture(TextureTarget.Texture2D, mTextureID);
 				GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba,
 					mTextureSize.Width, mTextureSize.Height, 0, OTKPixelFormat.Rgba,
-					PixelType.UnsignedByte, fake);
+					PixelType.UnsignedByte, IntPtr.Zero);
 
 				mTexCoord = GetTextureCoords(mSourceRect);
 			}

Added: trunk/Tests/DisplayTests/MultipleFramebufferTest.cs
===================================================================
--- trunk/Tests/DisplayTests/MultipleFramebufferTest.cs	                        (rev 0)
+++ trunk/Tests/DisplayTests/MultipleFramebufferTest.cs	2012-04-10 18:09:20 UTC (rev 1344)
@@ -0,0 +1,123 @@
+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 MultipleFramebufferTest : IAgateTest
+	{
+		List<Surface> mRegionColors = new List<Surface>();
+
+
+		public string Name
+		{
+			get { return "Multiple Framebuffer Test"; }
+		}
+
+		public string Category
+		{
+			get { return "Display"; }
+		}
+
+		List<Surface> tests = new List<Surface>();
+		bool done;
+		FontSurface font;
+			
+		public void Main(string[] args)
+		{
+			using (AgateSetup setup = new AgateSetup(args))
+			{
+				setup.InitializeAll();
+				if (setup.WasCanceled)
+					return;
+
+				DisplayWindow wind = DisplayWindow.CreateWindowed("Multiple Framebuffer Test - " + 
+					AgateLib.Drivers.Registrar.DisplayUsed.FriendlyName, 640, 480);
+
+				font = FontSurface.AgateSans14;
+
+				CreateTests();
+
+				Keyboard.KeyDown += new InputEventHandler(Keyboard_KeyDown);
+
+				while (wind.IsClosed == false && done == false)
+				{
+					Display.RenderTarget = wind.FrameBuffer;
+					Display.BeginFrame();
+					Display.Clear(Color.Gray);
+
+					font.Color = Color.White;
+					font.DisplayAlignment = OriginAlignment.TopLeft;
+					font.DrawText("Press space to create another frame buffer.");
+
+					int y = font.FontHeight;
+					int x = 10;
+					foreach (var surf in tests)
+					{
+						surf.Draw(x, y);
+						y += surf.DisplayHeight + 10;
+
+						if (y + 42 >= wind.Height)
+						{
+							y = font.FontHeight;
+							x += 42;
+						}
+					}
+
+					Display.EndFrame();
+					Core.KeepAlive();
+				}
+			}
+		}
+
+		void Keyboard_KeyDown(InputEventArgs e)
+		{
+			if (e.KeyCode == KeyCode.Escape)
+				done = true;
+
+			if (e.KeyCode == KeyCode.Space)
+				CreateTests();
+		}
+
+		int hueAngle = 0;
+		private void CreateTests()
+		{
+			const int angleIncrement = 373 / 8;
+			font.Color = Color.Black;
+			font.DisplayAlignment = OriginAlignment.CenterRight;
+			Surface mySurface = new Surface("jellybean.png");
+
+			FrameBuffer frame = new FrameBuffer(32, 32);
+			var clr = Color.FromHsv(hueAngle, 1, 1);
+
+			Display.RenderTarget = frame;
+			Display.BeginFrame();
+			Display.Clear();
+			mySurface.Draw();
+			Display.FillRect(new Rectangle(0, 0, 8, 32), clr);
+
+			var pt = new Point(31, 16);
+			string text = tests.Count.ToString();
+
+			font.Color = Color.Black;
+			font.DrawText(pt.X - 1, pt.Y, text);
+			font.DrawText(pt.X + 1, pt.Y, text);
+			font.DrawText(pt.X, pt.Y - 1, text);
+			font.DrawText(pt.X, pt.Y + 1, text);
+
+			font.Color = Color.White;
+			font.DrawText(pt.X, pt.Y, text);
+
+			Display.EndFrame();
+			tests.Add(frame.RenderTarget);
+			frame.RenderTarget.SaveTo("test.png", ImageFileFormat.Png);
+
+			hueAngle += angleIncrement;
+		}
+	}
+}

Modified: trunk/Tests/DisplayTests/MultipleWindows/MultipleWindowTest.cs
===================================================================
--- trunk/Tests/DisplayTests/MultipleWindows/MultipleWindowTest.cs	2012-04-05 17:23:01 UTC (rev 1343)
+++ trunk/Tests/DisplayTests/MultipleWindows/MultipleWindowTest.cs	2012-04-10 18:09:20 UTC (rev 1344)
@@ -13,7 +13,7 @@
 	{
 		Surface surf;
 		Random rand = new Random();
-		FrameBuffer buffer;
+		FrameBuffer frameBuffer;
 
 		public string Name
 		{
@@ -40,7 +40,7 @@
 				DisplayWindow wnd_2 = DisplayWindow.CreateFromControl(myForm.pictureBox2);
 				DisplayWindow wnd_3 = DisplayWindow.CreateFromControl(myForm.pictureBox3);
 
-				buffer = new FrameBuffer(wnd_3.Width, wnd_3.Height);
+				frameBuffer = new FrameBuffer(wnd_3.Width, wnd_3.Height);
 				myForm.pictureBox3.Resize += new EventHandler(wnd_3_Resize);
 
 				// this is the code that will be called when the button is pressed
@@ -84,28 +84,22 @@
 					// draw the third window from the surface
 					Display.RenderTarget = wnd_3.FrameBuffer;
 
-					surf = buffer.RenderTarget;
+					surf = frameBuffer.RenderTarget;
 
 					Display.BeginFrame();
-					Display.Clear(Color.Black);
+					Display.Clear(Color.Gray);
 					surf.Draw(0, 0);
 					Display.EndFrame();
 
 					Core.KeepAlive();
 					time = Timing.TotalSeconds;
-					//System.Threading.Thread.Sleep(250);
-
 				}
-
 			}
-
-
 		}
 
 		void btnDrawText_Click(object sender, EventArgs e)
 		{
-			Display.RenderTarget = buffer;
-
+			Display.RenderTarget = frameBuffer;
 			Display.BeginFrame();
 
 			int x = rand.Next(20, 100);
@@ -134,18 +128,17 @@
 			Display.BeginFrame();
 			Display.Clear();
 
-			buffer.RenderTarget.Draw(new Rectangle(0, 0, buffer.Width, buffer.Height));
+			frameBuffer.RenderTarget.Draw();
 
 			Display.EndFrame();
 
-			buffer.Dispose();
-			buffer = newBuffer;
+			frameBuffer.Dispose();
+			frameBuffer = newBuffer;
 		}
 
 		void btnClear_Click(object sender, EventArgs e)
 		{
-			Display.RenderTarget = buffer;
-
+			Display.RenderTarget = frameBuffer;
 			Display.BeginFrame();
 			Display.Clear(0, 0, 0, 0);
 			Display.EndFrame();
@@ -153,16 +146,15 @@
 
 		void btnDraw_Click(object sender, EventArgs e)
 		{
-			Display.RenderTarget = buffer;
-
+			Display.RenderTarget = frameBuffer;
 			Display.BeginFrame();
 
 			int width = rand.Next(20, 100);
 			int height = rand.Next(20, 100);
 
 			Rectangle rect = new Rectangle(
-				rand.Next(0, buffer.Width - width),
-				rand.Next(0, buffer.Height - height),
+				rand.Next(0, frameBuffer.Width - width),
+				rand.Next(0, frameBuffer.Height - height),
 				width,
 				height);
 

Modified: trunk/Tests/Tests.csproj
===================================================================
--- trunk/Tests/Tests.csproj	2012-04-05 17:23:01 UTC (rev 1343)
+++ trunk/Tests/Tests.csproj	2012-04-10 18:09:20 UTC (rev 1344)
@@ -143,6 +143,7 @@
     <Compile Include="DisplayTests\ColorTest.cs" />
     <Compile Include="DisplayTests\LargeImage.cs" />
     <Compile Include="DisplayTests\DisplayWindowEvents.cs" />
+    <Compile Include="DisplayTests\MultipleFramebufferTest.cs" />
     <Compile Include="DisplayTests\PixelBufferMask.cs" />
     <Compile Include="DisplayTests\ClipRect.cs" />
     <Compile Include="DisplayTests\Prerendered.cs" />

Modified: trunk/Tests/frmLauncher.Designer.cs
===================================================================
--- trunk/Tests/frmLauncher.Designer.cs	2012-04-05 17:23:01 UTC (rev 1343)
+++ trunk/Tests/frmLauncher.Designer.cs	2012-04-10 18:09:20 UTC (rev 1344)
@@ -27,7 +27,7 @@
 		/// the contents of this method with the code editor.
 		/// </summary>
 		private void InitializeComponent()
-		{
+		{
 			this.lstTests = new System.Windows.Forms.ListBox();
 			this.displayList = new System.Windows.Forms.ComboBox();
 			this.inputList = new System.Windows.Forms.ComboBox();
@@ -39,9 +39,9 @@
 			// 
 			// lstTests
 			// 
-			this.lstTests.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.lstTests.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.lstTests.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
 			this.lstTests.FormattingEnabled = true;
 			this.lstTests.Location = new System.Drawing.Point(324, 12);
@@ -62,6 +62,7 @@
 			this.displayList.Name = "displayList";
 			this.displayList.Size = new System.Drawing.Size(229, 21);
 			this.displayList.TabIndex = 8;
+			this.displayList.SelectedIndexChanged += new System.EventHandler(this.displayList_SelectedIndexChanged);
 			// 
 			// inputList
 			// 
@@ -72,6 +73,7 @@
 			this.inputList.Name = "inputList";
 			this.inputList.Size = new System.Drawing.Size(229, 21);
 			this.inputList.TabIndex = 10;
+			this.inputList.SelectedIndexChanged += new System.EventHandler(this.inputList_SelectedIndexChanged);
 			// 
 			// audioList
 			// 
@@ -82,6 +84,7 @@
 			this.audioList.Name = "audioList";
 			this.audioList.Size = new System.Drawing.Size(229, 21);
 			this.audioList.TabIndex = 12;
+			this.audioList.SelectedIndexChanged += new System.EventHandler(this.audioList_SelectedIndexChanged);
 			// 
 			// label1
 			// 

Modified: trunk/Tests/frmLauncher.cs
===================================================================
--- trunk/Tests/frmLauncher.cs	2012-04-05 17:23:01 UTC (rev 1343)
+++ trunk/Tests/frmLauncher.cs	2012-04-10 18:09:20 UTC (rev 1344)
@@ -33,19 +33,18 @@
 
 			bold = new Font(lstTests.Font, FontStyle.Bold | FontStyle.Italic);
 
+			FillDrivers();
+
 			ReadSettingsNames();
 
 			AgateLib.Settings.PersistantSettings.SettingsTracer = this;
 			AgateLib.Settings.PersistantSettings.Debug = true;
 
-			FillDrivers();
-
 			this.FormClosed += HandleFormClosed;
 		}
 
 		private void frmLauncher_Load(object sender, EventArgs e)
 		{
-			FillDrivers();
 		}
 
 		private void FillDrivers()
@@ -75,7 +74,7 @@
 			{
 				foreach (var setting in mSettings)
 				{
-					string text = setting.Key + " " + setting.Value;
+					string text = setting.Key + "\t" + setting.Value;
 
 					System.Diagnostics.Debug.Print(text);
 					w.WriteLine(text);
@@ -110,42 +109,38 @@
 
 			try
 			{
-				using (r)
+				settingsFile = targetDirectory + filename;
+				r = new StreamReader(targetDirectory + filename);
+			}
+			catch (DirectoryNotFoundException)
+			{
+				settingsFile = filename;
+				r = new StreamReader(filename);
+			}
+
+			using (r)
+			{
+				while (r.EndOfStream == false)
 				{
-					try
-					{
-						settingsFile = targetDirectory + filename;
-						r = new StreamReader(targetDirectory + filename);
-					}
-					catch (DirectoryNotFoundException)
-					{
-						settingsFile = filename;
-						r = new StreamReader(filename);
-					}
+					string x = r.ReadLine().Trim();
 
-					while (r.EndOfStream == false)
-					{
-						string x = r.ReadLine().Trim();
-						if (string.IsNullOrEmpty(x) == false)
-						{
-							int index = x.IndexOf(' ');
+					if (string.IsNullOrWhiteSpace(x))
+						continue;
 
-							if (index == -1)
-							{
-								mSettings.Add(x, null);
-							}
-							else
-								mSettings.Add(x.Substring(0, index), x.Substring(index + 1));
-						}
+					int index = x.IndexOf('\t');
+
+					if (index == -1)
+					{
+						mSettings[x] = null;
 					}
+					else
+						mSettings[x.Substring(0, index)] = x.Substring(index + 1);
 				}
 			}
-			catch
-			{
-				if (settingsFile == null)
-					settingsFile = filename;
-			}
 
+			displayList.SelectedItem = mSettings["AgateLib.DisplayDriver"];
+			audioList.SelectedItem = mSettings["AgateLib.AudioDriver"];
+			inputList.SelectedItem = mSettings["AgateLib.InputDriver"];
 		}
 		void StoreSetting(string name, string value)
 		{
@@ -241,10 +236,6 @@
 			string[] args = { };
 
 			this.Hide();
-			AgateLib.Core.Settings["AgateLib"]["DisplayDriver"] = displayList.Text;
-			AgateLib.Core.Settings["AgateLib"]["AudioDriver"] = audioList.Text;
-			AgateLib.Core.Settings["AgateLib"]["InputDriver"] = inputList.Text;
-
 			foreach (var kvp in mSettings)
 			{
 				if (kvp.Value == null)
@@ -253,13 +244,6 @@
 				string group, key;
 				SplitName(kvp.Key, out group, out key);
 
-				if (group == "AgateLib")
-				{
-					if (key == "DisplayDriver") continue;
-					if (key == "AudioDriver") continue;
-					if (key == "InputDriver") continue;
-				}
-
 				AgateLib.Core.Settings[group][key] = kvp.Value;
 			}
 
@@ -337,5 +321,18 @@
 			e.DrawFocusRectangle();
 		}
 
+		private void displayList_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			mSettings["AgateLib.DisplayDriver"] = displayList.Text;
+		}
+		private void audioList_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			mSettings["AgateLib.AudioDriver"] = audioList.Text;
+		}
+		private void inputList_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			mSettings["AgateLib.InputDriver"] = inputList.Text;
+		}
+
 	}
 }
\ No newline at end of file

Modified: trunk/Tests/frmLauncher.resx
===================================================================
--- trunk/Tests/frmLauncher.resx	2012-04-05 17:23:01 UTC (rev 1343)
+++ trunk/Tests/frmLauncher.resx	2012-04-10 18:09:20 UTC (rev 1344)
@@ -112,9 +112,9 @@
     <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>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.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>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file

Modified: trunk/Tests/settings_list.txt
===================================================================
--- trunk/Tests/settings_list.txt	2012-04-05 17:23:01 UTC (rev 1343)
+++ trunk/Tests/settings_list.txt	2012-04-10 18:09:20 UTC (rev 1344)
@@ -1,6 +1,6 @@
-AgateLib.AudioDriver 
-AgateLib.DisplayDriver 
-AgateLib.InputDriver 
-AgateLib.OpenGL.DisableFramebufferArb 
-AgateLib.OpenGL.EnableGL3 false
-AgateLib.OpenGL.DisableFramebufferExt 
+AgateLib.DisplayDriver	OpenGL through OpenTK 1.0.278.44921
+AgateLib.AudioDriver	Default
+AgateLib.InputDriver	Default
+AgateLib.OpenGL.DisableFramebufferArb	
+AgateLib.OpenGL.EnableGL3	false
+AgateLib.OpenGL.DisableFramebufferExt	

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





Thread: [Agate-svn-commit] SF.net SVN: agate:[1344] trunk (Page 4)

agate-svn-commit