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

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

Revision: 1087
          http://agate.svn.sourceforge.net/agate/?rev=1087&view=rev
Author:   kanato
Date:     2009-11-05 23:05:27 +0000 (Thu, 05 Nov 2009)

Log Message:
-----------
Initial commit of shaders.

Modified Paths:
--------------
    branches/shaders/AgateLib/AgateLib.csproj
    branches/shaders/AgateLib/Core.cs
    branches/shaders/AgateLib/DisplayLib/Display.cs
    branches/shaders/AgateLib/DisplayLib/DisplayCapsInfo.cs
    branches/shaders/AgateLib/DisplayLib/DisplayWindow.cs
    branches/shaders/AgateLib/Drivers/Registrar.cs
    branches/shaders/AgateLib/ImplementationBase/DisplayImpl.cs
    branches/shaders/AgateLib/Meshes/Loaders/OBJFileRepresentation.cs
    branches/shaders/AgateLib/Meshes/Loaders/Obj/OBJFileRepresentation.cs
    branches/shaders/AgateLib/Meshes/Loaders/Obj/Parser.cs
    branches/shaders/AgateLib/Meshes/Loaders/Obj/TokenTypes.cs
    branches/shaders/AgateLib-Windows.sln
    branches/shaders/Drivers/AgateDrawing/AgateDrawing.csproj
    branches/shaders/Drivers/AgateDrawing/Drawing_Display.cs
    branches/shaders/Drivers/AgateDrawing/Drawing_DisplayWindow.cs
    branches/shaders/Drivers/AgateDrawing/Drawing_FontSurface.cs
    branches/shaders/Drivers/AgateDrawing/Drawing_IRenderTarget.cs
    branches/shaders/Drivers/AgateDrawing/Drawing_Reporter.cs
    branches/shaders/Drivers/AgateDrawing/Drawing_Surface.cs
    branches/shaders/Drivers/AgateFMOD/AgateFMOD.csproj
    branches/shaders/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj
    branches/shaders/Drivers/AgateOTK/AgateOTK.csproj
    branches/shaders/Drivers/AgateOTK/GL_Display.cs
    branches/shaders/Drivers/AgateSDL/AgateSDL.csproj
    branches/shaders/Drivers/AgateSDX/SDX_Display.cs
    branches/shaders/Tests/DisplayTests/Ortho.cs
    branches/shaders/Tests/Shaders/LightingTest/LightingTest.cs
    branches/shaders/Tests/Tests.csproj
    branches/shaders/Tests/frmLauncher.Designer.cs
    branches/shaders/Tests/frmLauncher.cs
    branches/shaders/Tools/FontCreator/CreateFont.Designer.cs
    branches/shaders/Tools/FontCreator/FontCreator.csproj
    branches/shaders/Tools/NotebookLib/NotebookLib/NotebookLib.csproj
    branches/shaders/Tools/PackedSpriteCreator/PackedSpriteCreator.csproj
    branches/shaders/Tools/ResourceEditor/ResourceEditor.csproj

Added Paths:
-----------
    branches/shaders/AgateLib/DisplayLib/Shaders/AgateShader.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/Basic2DShader.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/
    branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/AgateInternalShader.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/AgateShaderCompileError.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/AgateShaderImpl.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/BuiltInShader.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/Effect.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/ShaderCompiler.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/ShaderLanguage.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/ShaderProgram.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/Technique.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/UniformState.cs
    branches/shaders/Drivers/AgateDrawing/DrawingBasic2DShader.cs
    branches/shaders/Tests/DisplayTests/ClipRect.cs

Removed Paths:
-------------
    branches/shaders/AgateLib/DisplayLib/Shaders/Effect.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/ShaderCompiler.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/ShaderLanguage.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/ShaderProgram.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/Technique.cs
    branches/shaders/AgateLib/DisplayLib/Shaders/UniformState.cs

Modified: branches/shaders/AgateLib/AgateLib.csproj
===================================================================

--- branches/shaders/AgateLib/AgateLib.csproj	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/AgateLib.csproj	2009-11-05 23:05:27 UTC (rev 1087)
@@ -1,12 +1,13 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BED5DD5D-13C6-4BA4-80DC-A47478E74F84}</ProjectGuid>
+    <ProjectGuid>{9490B719-829E-43A7-A5FE-8001F8A81759}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>AgateLib</AssemblyName>
@@ -16,9 +17,11 @@
     <DelaySign>false</DelaySign>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
+    <AppDesignerFolder>
+    </AppDesignerFolder>
     <RootNamespace>AgateLib</RootNamespace>
-    <StartupObject></StartupObject>
+    <StartupObject>
+    </StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -29,7 +32,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>DEBUG;TRACE;</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -38,7 +42,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@@ -56,17 +61,19 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System">
-        <Name>System</Name>
+      <Name>System</Name>
     </Reference>
     <Reference Include="System.Core">
-        <Name>System.Core</Name>
+      <Name>System.Core</Name>
     </Reference>
+    <Reference Include="System.Data" />
     <Reference Include="System.Xml">
-        <Name>System.Xml</Name>
+      <Name>System.Xml</Name>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -90,9 +97,16 @@
     <Compile Include="Core.cs">
       <SubType>Code</SubType>
     </Compile>
+    <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\BuiltInShader.cs" />
     <Compile Include="IFileProvider.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Platform.cs" />
+    <Compile Include="PlatformType.cs" />
     <Compile Include="Timing.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -195,25 +209,25 @@
     <Compile Include="DisplayLib\Cache\SurfaceStateCache.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DisplayLib\Shaders\AgateShaderCompileError.cs">
+    <Compile Include="DisplayLib\Shaders\Implementation\AgateShaderCompileError.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DisplayLib\Shaders\Effect.cs">
+    <Compile Include="DisplayLib\Shaders\Implementation\Effect.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DisplayLib\Shaders\ShaderCompiler.cs">
+    <Compile Include="DisplayLib\Shaders\Implementation\ShaderCompiler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DisplayLib\Shaders\ShaderLanguage.cs">
+    <Compile Include="DisplayLib\Shaders\Implementation\ShaderLanguage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DisplayLib\Shaders\ShaderProgram.cs">
+    <Compile Include="DisplayLib\Shaders\Implementation\ShaderProgram.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DisplayLib\Shaders\Technique.cs">
+    <Compile Include="DisplayLib\Shaders\Implementation\Technique.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DisplayLib\Shaders\UniformState.cs">
+    <Compile Include="DisplayLib\Shaders\Implementation\UniformState.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Drivers\AgateDriverInfo.cs">
@@ -415,9 +429,6 @@
     <Compile Include="Particles\Particles\SurfaceParticle.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="PlatformSpecific\IPlatformServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -496,9 +507,6 @@
     <Compile Include="Utility\FileSystemProvider.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Utility\Platform.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Utility\Ref.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -524,4 +532,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/shaders/AgateLib/Core.cs
===================================================================
--- branches/shaders/AgateLib/Core.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/Core.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -24,7 +24,6 @@
 
 using AgateLib.AudioLib;
 using AgateLib.DisplayLib;
-using AgateLib.PlatformSpecific;
 
 namespace AgateLib
 {
@@ -90,6 +89,7 @@
 		private static bool mAutoPause = false;
 		private static bool mIsActive = true;
 		private static bool mInititalized = false;
+		private static Platform mPlatform;
 
 		#region --- Error Reporting ---
 
@@ -296,7 +296,6 @@
 
 		static Core()
 		{
-
 		}
 		/// <summary>
 		/// Initializes Core class.
@@ -307,6 +306,7 @@
 			if (mInititalized)
 				return;
 
+			mPlatform = new Platform();
 			Drivers.Registrar.Initialize();
 
 			Debug.Listeners.Add(new TextWriterTraceListener(Console.Out));
@@ -314,7 +314,6 @@
 			mInititalized = true;
 		}
 
-
 		/// <summary>
 		/// Gets or sets a bool value which indicates whether or not your
 		/// app is the focused window.  This will be automatically set if
@@ -412,5 +411,7 @@
 		{
 			return mTime.ElapsedMilliseconds;
 		}
+
+
 	}
 }
\ No newline at end of file

Modified: branches/shaders/AgateLib/DisplayLib/Display.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Display.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/DisplayLib/Display.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -94,6 +94,8 @@
 			impl.Initialize();
 
 			mSurfacePacker = new SurfacePacker();
+
+			Shaders.AgateBuiltInShaders.InitializeShaders();
 		}
 
 		public static RenderStateAdapter RenderState
@@ -117,6 +119,8 @@
 				impl.Dispose();
 				impl = null;
 			}
+
+			Shaders.AgateBuiltInShaders.DisposeShaders();
 		}
 
 		internal static void ProcessEvents()
@@ -137,12 +141,19 @@
 			}
 		}
 
+		[Obsolete]
 		public static Shaders.Effect Effect
 		{
-			get { return impl.Effect; }
-			set { impl.Effect = value; }
+			get { throw new Exception(); }
+			set { throw new Exception(); }
 		}
 
+		public static Shaders.AgateShader Shader
+		{
+			get { return impl.Shader; }
+			internal set { impl.Shader = value; }
+		}
+
 		/// <summary>
 		/// Delegate type for functions which are called when Display.Dispose is called
 		/// at the end of execution of the program.
@@ -448,14 +459,11 @@
 		/// <param name="top"></param>
 		/// <param name="right"></param>
 		/// <param name="bottom"></param>
+		[Obsolete]
 		public static void SetOrthoProjection(int left, int top, int right, int bottom)
 		{
 			SetOrthoProjection(Rectangle.FromLTRB(left, top, right, bottom));
 		}
-		public static Matrix4x4 GetOrthoProjection()
-		{
-			return Matrix4x4.Ortho(RectangleF.FromLTRB(0, 0, RenderTarget.Width, RenderTarget.Height), -1, 1);
-		}
 
 		/// <summary>
 		/// Sets the orthogonal projection for rendering.  This allows redefinition of the
@@ -472,6 +480,7 @@
 		/// the entire window.</para>
 		/// </remarks>
 		/// <param name="region"></param>
+		[Obsolete("Use a shader instead.")]
 		public static void SetOrthoProjection(Rectangle region)
 		{
 			impl.SetOrthoProjection(region);
@@ -683,11 +692,6 @@
 			impl.SavePixelBuffer(pixelBuffer, filename, format);
 		}
 
-		internal static AgateLib.PlatformSpecific.IPlatformServices GetPlatformServices()
-		{
-			return impl.GetPlatformServices();
-		}
-
 		internal static void HideCursor()
 		{
 			impl.HideCursor();
@@ -697,6 +701,7 @@
 		{
 			impl.ShowCursor();
 		}
+
 	}
 
 }

Modified: branches/shaders/AgateLib/DisplayLib/DisplayCapsInfo.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/DisplayCapsInfo.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/DisplayLib/DisplayCapsInfo.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -94,9 +94,9 @@
 		/// <summary>
 		/// Indicates whether or not vertex/pixel shaders are supported.
 		/// </summary>
-		public bool SupportsShaders
+		public bool SupportsCustomShaders
 		{
-			get { return Display.Impl.Supports(DisplayBoolCaps.Shaders); }
+			get { return Display.Impl.Supports(DisplayBoolCaps.CustomShaders); }
 		}
 		/// <summary>
 		/// Indicates which shader language is supported.
@@ -166,7 +166,7 @@
 		/// <summary>
 		/// Indicates whether or not vertex/pixel shaders are supported.
 		/// </summary>
-		Shaders,
+		CustomShaders,
 		/// <summary>
 		/// Indicates whether the driver can create a bitmap font from an operating
 		/// system font.

Modified: branches/shaders/AgateLib/DisplayLib/DisplayWindow.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/DisplayWindow.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/DisplayLib/DisplayWindow.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -304,6 +304,11 @@
 			impl.SetFullScreen(width, height, bpp);
 		}
 
+		public Matrix4x4 OrthoProjection
+		{
+			get { return Matrix4x4.Ortho(new RectangleF(0, 0, Width, Height), -1, 1); }
+		}
+
 		#region --- IRenderTarget Members ---
 
 		IRenderTargetImpl IRenderTarget.Impl

Added: branches/shaders/AgateLib/DisplayLib/Shaders/AgateShader.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/AgateShader.cs	                        (rev 0)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/AgateShader.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -0,0 +1,132 @@
+//     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 class AgateShader
+	{
+		AgateShaderImpl impl;
+
+		protected internal void SetImpl(AgateShaderImpl impl)
+		{
+			if (this.impl != null)
+				throw new InvalidOperationException("Cannot set impl on an object which already has one.");
+
+			this.impl = impl;
+		}
+
+		public int Passes
+		{
+			get { return impl.Passes; }
+		}
+
+		public void Begin()
+		{
+			impl.Begin();
+		}
+		public void BeginPass(int passIndex)
+		{
+			impl.BeginPass(passIndex);
+		}
+		public void EndPass()
+		{
+			impl.EndPass();
+		}
+		public void End()
+		{
+			impl.End();
+		}
+
+		public bool IsValid
+		{
+			get { return impl != null; }
+		}
+
+		public bool IsActive
+		{
+			get { return Display.Shader == this; }
+		}
+
+		public void Activate()
+		{
+			Display.Shader = this;
+		}
+		public void SetTexture(EffectTexture tex, string variableName)
+		{
+			impl.SetTexture(tex, variableName);
+		}
+		public void SetVariable(string name, params float[] v)
+		{
+			impl.SetVariable(name, v);
+		}
+		public void SetVariable(string name, params int[] v)
+		{
+			impl.SetVariable(name, v);
+		}
+		public void SetVariable(string name, Matrix4x4 matrix)
+		{
+			impl.SetVariable(name, matrix);
+		}
+
+		public void SetVariable(string name, Vector2 v)
+		{
+			SetVariable(name, v.X, v.Y);
+		}
+		public void SetVariable(string name, Vector3 v)
+		{
+			SetVariable(name, v.X, v.Y, v.Z);
+		}
+		public void SetVariable(string name, Vector4 v)
+		{
+			SetVariable(name, v.X, v.Y, v.Z, v.W);
+		}
+		public void SetVariable(string name, Color color)
+		{
+			impl.SetVariable(name, color);
+		}
+
+	}
+
+	public static class AgateBuiltInShaders
+	{
+		internal static void InitializeShaders()
+		{
+			if (Basic2DShader != null)
+				throw new InvalidOperationException();
+
+			Basic2DShader = new Basic2DShader();
+
+
+			Basic2DShader.Activate();
+		}
+		internal static void DisposeShaders()
+		{
+			Basic2DShader = null;
+		}
+
+		public static Basic2DShader Basic2DShader { get; private set; }
+
+	}
+}

Added: branches/shaders/AgateLib/DisplayLib/Shaders/Basic2DShader.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/Basic2DShader.cs	                        (rev 0)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/Basic2DShader.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -0,0 +1,39 @@
+//     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;
+
+namespace AgateLib.DisplayLib.Shaders
+{
+	public class Basic2DShader : AgateInternalShader  
+	{
+		public Basic2DShader()
+		{
+
+		}
+
+		protected override BuiltInShader BuiltInShaderType
+		{
+			get { return BuiltInShader.Basic2DShader; }
+		}
+	}
+}

Deleted: branches/shaders/AgateLib/DisplayLib/Shaders/Effect.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/Effect.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/Effect.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using AgateLib.Geometry;
-using AgateLib.Geometry.VertexTypes;
-
-namespace AgateLib.DisplayLib.Shaders
-{
-	public abstract class Effect
-	{
-		public abstract string Technique { get; set; }
-
-		public abstract int Passes { get; }
-
-		public abstract void Begin();
-		public abstract void BeginPass(int passIndex);
-		public abstract void EndPass();
-		public abstract void End();
-
-		public abstract void SetTexture(EffectTexture tex, string variableName);
-		public abstract void SetVariable(string name, params float[] v);
-		public abstract void SetVariable(string name, params int[] v);
-		public abstract void SetVariable(string name, Matrix4x4 matrix);
-
-		public void SetVariable(string name, Vector2 v)
-		{
-			SetVariable(name, v.X, v.Y);
-		}
-		public void SetVariable(string name, Vector3 v)
-		{
-			SetVariable(name, v.X, v.Y, v.Z);
-		}
-		public void SetVariable(string name, Vector4 v)
-		{
-			SetVariable(name, v.X, v.Y, v.Z, v.W);
-		}
-		public void SetVariable(string name, Color color)
-		{
-			SetVariable(name, color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f);
-		}
-
-		//public VertexLayout VertexDefinition { get; set; }
-
-		public abstract void Render<T>(RenderHandler<T> handler, T obj);
-	}
-
-	public enum EffectTexture
-	{
-		Texture0,
-		Texture1,
-		Texture2,
-		Texture3,
-	}
-
-	public delegate void RenderHandler<T>(T obj);
-}

Added: branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/AgateInternalShader.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/AgateInternalShader.cs	                        (rev 0)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/AgateInternalShader.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -0,0 +1,36 @@
+//     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;
+
+namespace AgateLib.DisplayLib.Shaders.Implementation
+{
+	public abstract class AgateInternalShader : AgateShader
+	{
+		protected AgateInternalShader() 
+		{
+			SetImpl(Display.Impl.CreateBuiltInShader(BuiltInShaderType));
+		}
+
+		protected abstract BuiltInShader BuiltInShaderType { get; }
+
+	}
+}

Added: branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/AgateShaderCompileError.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/AgateShaderCompileError.cs	                        (rev 0)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/AgateShaderCompileError.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -0,0 +1,37 @@
+//     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;
+
+namespace AgateLib.DisplayLib.Shaders
+{
+	[global::System.Serializable]
+	public class AgateShaderCompilerException : Exception
+	{
+		public AgateShaderCompilerException() { }
+		public AgateShaderCompilerException(string message) : base(message) { }
+		public AgateShaderCompilerException(string message, Exception inner) : base(message, inner) { }
+		protected AgateShaderCompilerException(
+		  System.Runtime.Serialization.SerializationInfo info,
+		  System.Runtime.Serialization.StreamingContext context)
+			: base(info, context) { }
+	}
+}

Added: branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/AgateShaderImpl.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/AgateShaderImpl.cs	                        (rev 0)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/AgateShaderImpl.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -0,0 +1,42 @@
+//     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.Geometry;
+
+namespace AgateLib.DisplayLib.Shaders.Implementation
+{
+	public abstract class AgateShaderImpl
+	{
+		public abstract void SetTexture(EffectTexture tex, string variableName);
+		public abstract void SetVariable(string name, params float[] v);
+		public abstract void SetVariable(string name, params int[] v);
+		public abstract void SetVariable(string name, Matrix4x4 matrix);
+		public abstract void SetVariable(string name, Color color);
+
+		public abstract int Passes { get; }
+
+		public abstract void Begin();
+		public abstract void BeginPass(int passIndex);
+		public abstract void EndPass();
+		public abstract void End();
+	}
+}

Added: branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/BuiltInShader.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/BuiltInShader.cs	                        (rev 0)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/BuiltInShader.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -0,0 +1,30 @@
+//     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;
+
+namespace AgateLib.DisplayLib.Shaders.Implementation
+{
+	public enum BuiltInShader
+	{
+		Basic2DShader,
+	}
+}

Added: branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/Effect.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/Effect.cs	                        (rev 0)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/Effect.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -0,0 +1,75 @@
+//     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.Geometry;
+using AgateLib.Geometry.VertexTypes;
+
+namespace AgateLib.DisplayLib.Shaders
+{
+	public abstract class Effect
+	{
+		public abstract string Technique { get; set; }
+
+		public abstract int Passes { get; }
+
+		public abstract void Begin();
+		public abstract void BeginPass(int passIndex);
+		public abstract void EndPass();
+		public abstract void End();
+
+		public abstract void SetTexture(EffectTexture tex, string variableName);
+		public abstract void SetVariable(string name, params float[] v);
+		public abstract void SetVariable(string name, params int[] v);
+		public abstract void SetVariable(string name, Matrix4x4 matrix);
+
+		public void SetVariable(string name, Vector2 v)
+		{
+			SetVariable(name, v.X, v.Y);
+		}
+		public void SetVariable(string name, Vector3 v)
+		{
+			SetVariable(name, v.X, v.Y, v.Z);
+		}
+		public void SetVariable(string name, Vector4 v)
+		{
+			SetVariable(name, v.X, v.Y, v.Z, v.W);
+		}
+		public void SetVariable(string name, Color color)
+		{
+			SetVariable(name, color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f);
+		}
+
+		//public VertexLayout VertexDefinition { get; set; }
+
+		public abstract void Render<T>(RenderHandler<T> handler, T obj);
+	}
+
+	public enum EffectTexture
+	{
+		Texture0,
+		Texture1,
+		Texture2,
+		Texture3,
+	}
+
+	public delegate void RenderHandler<T>(T obj);
+}

Added: branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/ShaderCompiler.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/ShaderCompiler.cs	                        (rev 0)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/ShaderCompiler.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -0,0 +1,53 @@
+//     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.ImplementationBase;
+
+namespace AgateLib.DisplayLib.Shaders
+{
+	public static class ShaderCompiler
+	{
+		static ShaderCompilerImpl impl;
+
+		internal static void Initialize(AgateLib.ImplementationBase.ShaderCompilerImpl shaderCompilerImpl)
+		{
+			impl = shaderCompilerImpl;
+
+			Display.DisposeDisplay += new Display.DisposeDisplayHandler(Display_DisposeDisplay);
+		}
+
+		static void Display_DisposeDisplay()
+		{
+			impl = null;
+		}
+
+		internal static void Disable()
+		{
+			impl = null;
+		}
+
+		public static Effect CompileEffect(ShaderLanguage language, string effectSource)
+		{
+			return impl.CompileEffect(language, effectSource);
+		}
+	}
+}

Added: branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/ShaderLanguage.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/ShaderLanguage.cs	                        (rev 0)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/ShaderLanguage.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -0,0 +1,35 @@
+//     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;
+
+namespace AgateLib.DisplayLib.Shaders
+{
+	public enum ShaderLanguage
+	{
+		None,
+
+		Glsl,
+		Hlsl,
+		// Cg,
+
+	}
+}

Added: branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/ShaderProgram.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/ShaderProgram.cs	                        (rev 0)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/ShaderProgram.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -0,0 +1,62 @@
+//     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.Geometry;
+using AgateLib.Geometry.VertexTypes;
+
+namespace AgateLib.DisplayLib.Shaders
+{
+	/*
+	public abstract class ShaderProgram
+	{
+		public abstract PixelShader PixelShader { get; }
+		public abstract VertexShader VertexShader { get; }
+
+		public abstract void SetUniform(string name, params float[] v);
+		public abstract void SetUniform(string name, params int[] v);
+		public abstract void SetUniform(string name, Matrix4 matrix);
+
+		public void SetUniform(string name, Vector2 v)
+		{
+			SetUniform(name, v.X, v.Y);
+		}
+		public void SetUniform(string name, Vector3 v)
+		{
+			SetUniform(name, v.X, v.Y, v.Z);
+		}
+		public void SetUniform(string name, Vector4 v)
+		{
+			SetUniform(name, v.X, v.Y, v.Z, v.W);
+		}
+		public void SetUniform(string name, Color color)
+		{
+			SetUniform(name, color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f);
+		}
+
+		public VertexLayout VertexDefinition { get; set; }
+
+		public abstract void Render(RenderHandler handler, object obj);
+	}
+
+	public delegate void RenderHandler(object obj);
+	 * */
+}

Added: branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/Technique.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/Technique.cs	                        (rev 0)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/Technique.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -0,0 +1,29 @@
+//     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;
+
+namespace AgateLib.DisplayLib.Shaders
+{
+	public class Technique
+	{
+	}
+}

Added: branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/UniformState.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/UniformState.cs	                        (rev 0)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/Implementation/UniformState.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -0,0 +1,29 @@
+//     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;
+
+namespace AgateLib.DisplayLib.Shaders
+{
+	public class UniformState
+	{
+	}
+}

Deleted: branches/shaders/AgateLib/DisplayLib/Shaders/ShaderCompiler.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/ShaderCompiler.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/ShaderCompiler.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using AgateLib.ImplementationBase;
-
-namespace AgateLib.DisplayLib.Shaders
-{
-	public static class ShaderCompiler
-	{
-		static ShaderCompilerImpl impl;
-
-		internal static void Initialize(AgateLib.ImplementationBase.ShaderCompilerImpl shaderCompilerImpl)
-		{
-			impl = shaderCompilerImpl;
-
-			Display.DisposeDisplay += new Display.DisposeDisplayHandler(Display_DisposeDisplay);
-		}
-
-		static void Display_DisposeDisplay()
-		{
-			impl = null;
-		}
-
-		internal static void Disable()
-		{
-			impl = null;
-		}
-
-		public static Effect CompileEffect(ShaderLanguage language, string effectSource)
-		{
-			return impl.CompileEffect(language, effectSource);
-		}
-	}
-}

Deleted: branches/shaders/AgateLib/DisplayLib/Shaders/ShaderLanguage.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/ShaderLanguage.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/ShaderLanguage.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace AgateLib.DisplayLib.Shaders
-{
-	public enum ShaderLanguage
-	{
-		None,
-
-		Glsl,
-		Hlsl,
-		// Cg,
-
-	}
-}

Deleted: branches/shaders/AgateLib/DisplayLib/Shaders/ShaderProgram.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/ShaderProgram.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/ShaderProgram.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using AgateLib.Geometry;
-using AgateLib.Geometry.VertexTypes;
-
-namespace AgateLib.DisplayLib.Shaders
-{
-	/*
-	public abstract class ShaderProgram
-	{
-		public abstract PixelShader PixelShader { get; }
-		public abstract VertexShader VertexShader { get; }
-
-		public abstract void SetUniform(string name, params float[] v);
-		public abstract void SetUniform(string name, params int[] v);
-		public abstract void SetUniform(string name, Matrix4 matrix);
-
-		public void SetUniform(string name, Vector2 v)
-		{
-			SetUniform(name, v.X, v.Y);
-		}
-		public void SetUniform(string name, Vector3 v)
-		{
-			SetUniform(name, v.X, v.Y, v.Z);
-		}
-		public void SetUniform(string name, Vector4 v)
-		{
-			SetUniform(name, v.X, v.Y, v.Z, v.W);
-		}
-		public void SetUniform(string name, Color color)
-		{
-			SetUniform(name, color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f);
-		}
-
-		public VertexLayout VertexDefinition { get; set; }
-
-		public abstract void Render(RenderHandler handler, object obj);
-	}
-
-	public delegate void RenderHandler(object obj);
-	 * */
-}

Deleted: branches/shaders/AgateLib/DisplayLib/Shaders/Technique.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/Technique.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/Technique.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace AgateLib.DisplayLib.Shaders
-{
-	public class Technique
-	{
-	}
-}

Deleted: branches/shaders/AgateLib/DisplayLib/Shaders/UniformState.cs
===================================================================
--- branches/shaders/AgateLib/DisplayLib/Shaders/UniformState.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/DisplayLib/Shaders/UniformState.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace AgateLib.DisplayLib.Shaders
-{
-	public class UniformState
-	{
-	}
-}

Modified: branches/shaders/AgateLib/Drivers/Registrar.cs
===================================================================
--- branches/shaders/AgateLib/Drivers/Registrar.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/Drivers/Registrar.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -24,7 +24,6 @@
 using System.Text;
 
 using AgateLib.ImplementationBase;
-using AgateLib.PlatformSpecific;
 using AgateLib.Utility;
 
 namespace AgateLib.Drivers

Modified: branches/shaders/AgateLib/ImplementationBase/DisplayImpl.cs
===================================================================
--- branches/shaders/AgateLib/ImplementationBase/DisplayImpl.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/ImplementationBase/DisplayImpl.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -23,6 +23,7 @@
 using AgateLib.BitmapFont;
 using AgateLib.DisplayLib;
 using AgateLib.DisplayLib.Shaders;
+using AgateLib.DisplayLib.Shaders.Implementation;
 using AgateLib.Geometry;
 using AgateLib.Utility;
 
@@ -592,13 +593,6 @@
 		}
 
 		/// <summary>
-		/// Override to return an object implementing IPlatformServices.  This object will provide
-		/// basic services that are not available in the .NET platform (high precision timing, etc.)
-		/// </summary>
-		/// <returns></returns>
-		protected internal abstract AgateLib.PlatformSpecific.IPlatformServices GetPlatformServices();
-
-		/// <summary>
 		/// Makes the OS mouse pointer visible.
 		/// </summary>
 		protected internal abstract void ShowCursor();
@@ -650,11 +644,15 @@
 			get { throw new NotSupportedException("The current driver does not support shaders."); }
 			set { throw new NotSupportedException("The current driver does not support shaders."); }
 		}
+		public virtual AgateShader Shader
+		{
+			get { throw new NotSupportedException("The current driver does not support shaders."); }
+			set { throw new NotSupportedException("The current driver does not support shaders."); }
+		}
 
-
 		protected void InitializeShaders()
 		{
-			if (Display.Caps.SupportsShaders)
+			if (Display.Caps.SupportsCustomShaders)
 			{
 				ShaderCompiler.Initialize(CreateShaderCompiler());
 			}
@@ -666,5 +664,18 @@
 
 		protected internal abstract bool GetRenderState(RenderStateBool renderStateBool);
 		protected internal abstract void SetRenderState(RenderStateBool renderStateBool, bool value);
+
+		/// <summary>
+		/// Creates one of the build in shaders in AgateLib.  Implementers should 
+		/// return null for any built in shader that is not supported.
+		/// Basic2DShader must have an implementation, but any other shader can be unsupported.
+		/// </summary>
+		/// <param name="BuiltInShaderType"></param>
+		/// <returns></returns>
+		protected internal virtual AgateShaderImpl CreateBuiltInShader(AgateLib.DisplayLib.Shaders.Implementation.BuiltInShader BuiltInShaderType)
+		{
+			// TODO: make this abstract.
+			return null;
+		}
 	}
 }

Modified: branches/shaders/AgateLib/Meshes/Loaders/OBJFileRepresentation.cs
===================================================================
(Binary files differ)

Modified: branches/shaders/AgateLib/Meshes/Loaders/Obj/OBJFileRepresentation.cs
===================================================================
(Binary files differ)

Modified: branches/shaders/AgateLib/Meshes/Loaders/Obj/Parser.cs
===================================================================
(Binary files differ)

Modified: branches/shaders/AgateLib/Meshes/Loaders/Obj/TokenTypes.cs
===================================================================
--- branches/shaders/AgateLib/Meshes/Loaders/Obj/TokenTypes.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib/Meshes/Loaders/Obj/TokenTypes.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -1,4 +1,16 @@
-namespace AgateLib.Meshes.Loaders.Obj
+//     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.
+//
+namespace AgateLib.Meshes.Loaders.Obj
 {
 	internal enum TokenTypes
 	{

Modified: branches/shaders/AgateLib-Windows.sln
===================================================================
--- branches/shaders/AgateLib-Windows.sln	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/AgateLib-Windows.sln	2009-11-05 23:05:27 UTC (rev 1087)
@@ -1,20 +1,20 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateLib.WinForms", "Drivers\AgateLib.WinForms\AgateLib.WinForms.csproj", "{2E6579F9-1F70-4DF9-98A9-22687425A830}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateLib.WinForms", "Drivers\AgateLib.WinForms\AgateLib.WinForms.csproj", "{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateDrawing", "Drivers\AgateDrawing\AgateDrawing.csproj", "{AAC01466-7370-4464-B1AD-1593A3A3BEC1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateDrawing", "Drivers\AgateDrawing\AgateDrawing.csproj", "{164A785D-924E-40FB-A517-D7E677F3B53A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateSDL", "Drivers\AgateSDL\AgateSDL.csproj", "{6ED4F92F-7C1F-478C-9AA1-938F47B68F22}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateSDL", "Drivers\AgateSDL\AgateSDL.csproj", "{00C7FA95-98F4-43D9-9B63-34122B1DB003}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateSDX", "Drivers\AgateSDX\AgateSDX.csproj", "{6C4E3198-7D6D-41E5-BFA2-AC28ADDAE2B6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{CCA60063-264F-4B62-9B5D-45B9D0E3D6D8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{DC687DB2-90A8-484D-AB99-B3D29FDD8D44}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateLib", "AgateLib\AgateLib.csproj", "{BED5DD5D-13C6-4BA4-80DC-A47478E74F84}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateLib", "AgateLib\AgateLib.csproj", "{9490B719-829E-43A7-A5FE-8001F8A81759}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateFMOD", "Drivers\AgateFMOD\AgateFMOD.csproj", "{44C7FBC7-BFF6-4DEE-B891-82A043F548BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateFMOD", "Drivers\AgateFMOD\AgateFMOD.csproj", "{424C08A9-6CC6-4FFF-B782-CBD58BC42FCA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateOTK", "Drivers\AgateOTK\AgateOTK.csproj", "{3F2BD363-E2D6-4B62-8D57-7727142D6B82}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateOTK", "Drivers\AgateOTK\AgateOTK.csproj", "{9E095F03-BA3F-4EAD-A905-2A2647CE4405}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{6AFA2E43-361A-4AA6-83D9-6DE946C1F0B6}"
 	ProjectSection(SolutionItems) = preProject
@@ -29,38 +29,38 @@
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2E6579F9-1F70-4DF9-98A9-22687425A830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E6579F9-1F70-4DF9-98A9-22687425A830}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E6579F9-1F70-4DF9-98A9-22687425A830}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E6579F9-1F70-4DF9-98A9-22687425A830}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AAC01466-7370-4464-B1AD-1593A3A3BEC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAC01466-7370-4464-B1AD-1593A3A3BEC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAC01466-7370-4464-B1AD-1593A3A3BEC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AAC01466-7370-4464-B1AD-1593A3A3BEC1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6ED4F92F-7C1F-478C-9AA1-938F47B68F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6ED4F92F-7C1F-478C-9AA1-938F47B68F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6ED4F92F-7C1F-478C-9AA1-938F47B68F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6ED4F92F-7C1F-478C-9AA1-938F47B68F22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{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}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{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}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{164A785D-924E-40FB-A517-D7E677F3B53A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00C7FA95-98F4-43D9-9B63-34122B1DB003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00C7FA95-98F4-43D9-9B63-34122B1DB003}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00C7FA95-98F4-43D9-9B63-34122B1DB003}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00C7FA95-98F4-43D9-9B63-34122B1DB003}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6C4E3198-7D6D-41E5-BFA2-AC28ADDAE2B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6C4E3198-7D6D-41E5-BFA2-AC28ADDAE2B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6C4E3198-7D6D-41E5-BFA2-AC28ADDAE2B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6C4E3198-7D6D-41E5-BFA2-AC28ADDAE2B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CCA60063-264F-4B62-9B5D-45B9D0E3D6D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CCA60063-264F-4B62-9B5D-45B9D0E3D6D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CCA60063-264F-4B62-9B5D-45B9D0E3D6D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CCA60063-264F-4B62-9B5D-45B9D0E3D6D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BED5DD5D-13C6-4BA4-80DC-A47478E74F84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BED5DD5D-13C6-4BA4-80DC-A47478E74F84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BED5DD5D-13C6-4BA4-80DC-A47478E74F84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BED5DD5D-13C6-4BA4-80DC-A47478E74F84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44C7FBC7-BFF6-4DEE-B891-82A043F548BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44C7FBC7-BFF6-4DEE-B891-82A043F548BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44C7FBC7-BFF6-4DEE-B891-82A043F548BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44C7FBC7-BFF6-4DEE-B891-82A043F548BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F2BD363-E2D6-4B62-8D57-7727142D6B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F2BD363-E2D6-4B62-8D57-7727142D6B82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F2BD363-E2D6-4B62-8D57-7727142D6B82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F2BD363-E2D6-4B62-8D57-7727142D6B82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC687DB2-90A8-484D-AB99-B3D29FDD8D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC687DB2-90A8-484D-AB99-B3D29FDD8D44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC687DB2-90A8-484D-AB99-B3D29FDD8D44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC687DB2-90A8-484D-AB99-B3D29FDD8D44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{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}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9490B719-829E-43A7-A5FE-8001F8A81759}.Release|Any CPU.Build.0 = Release|Any CPU
+		{424C08A9-6CC6-4FFF-B782-CBD58BC42FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{424C08A9-6CC6-4FFF-B782-CBD58BC42FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{424C08A9-6CC6-4FFF-B782-CBD58BC42FCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{424C08A9-6CC6-4FFF-B782-CBD58BC42FCA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: branches/shaders/Drivers/AgateDrawing/AgateDrawing.csproj
===================================================================
--- branches/shaders/Drivers/AgateDrawing/AgateDrawing.csproj	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/Drivers/AgateDrawing/AgateDrawing.csproj	2009-11-05 23:05:27 UTC (rev 1087)
@@ -3,7 +3,7 @@
     <ProjectType>Local</ProjectType>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AAC01466-7370-4464-B1AD-1593A3A3BEC1}</ProjectGuid>
+    <ProjectGuid>{164A785D-924E-40FB-A517-D7E677F3B53A}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ApplicationIcon>
@@ -86,6 +86,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DrawingBasic2DShader.cs" />
     <Compile Include="Drawing_Display.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -110,11 +111,11 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\AgateLib\AgateLib.csproj">
-      <Project>{BED5DD5D-13C6-4BA4-80DC-A47478E74F84}</Project>
+      <Project>{9490B719-829E-43A7-A5FE-8001F8A81759}</Project>
       <Name>AgateLib</Name>
     </ProjectReference>
     <ProjectReference Include="..\AgateLib.WinForms\AgateLib.WinForms.csproj">
-      <Project>{2E6579F9-1F70-4DF9-98A9-22687425A830}</Project>
+      <Project>{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}</Project>
       <Name>AgateLib.WinForms</Name>
     </ProjectReference>
   </ItemGroup>

Added: branches/shaders/Drivers/AgateDrawing/DrawingBasic2DShader.cs
===================================================================
--- branches/shaders/Drivers/AgateDrawing/DrawingBasic2DShader.cs	                        (rev 0)
+++ branches/shaders/Drivers/AgateDrawing/DrawingBasic2DShader.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AgateLib.DisplayLib.Shaders.Implementation;
+
+namespace AgateDrawing
+{
+	class DrawingBasic2DShader : AgateShaderImpl 
+	{
+		public override void SetTexture(AgateLib.DisplayLib.Shaders.EffectTexture tex, string variableName)
+		{
+			throw new NotImplementedException();
+		}
+
+		public override void SetVariable(string name, params float[] v)
+		{
+			throw new NotImplementedException();
+		}
+
+		public override void SetVariable(string name, params int[] v)
+		{
+			throw new NotImplementedException();
+		}
+
+		public override void SetVariable(string name, AgateLib.Geometry.Matrix4x4 matrix)
+		{
+			throw new NotImplementedException();
+		}
+
+		public override void SetVariable(string name, AgateLib.Geometry.Color color)
+		{
+			throw new NotImplementedException();
+		}
+
+		public override int Passes
+		{
+			get { return 1; }
+		}
+
+		public override void Begin()
+		{
+			throw new NotImplementedException();
+		}
+
+		public override void BeginPass(int passIndex)
+		{
+			throw new NotImplementedException();
+		}
+
+		public override void EndPass()
+		{
+			throw new NotImplementedException();
+		}
+
+		public override void End()
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

Modified: branches/shaders/Drivers/AgateDrawing/Drawing_Display.cs
===================================================================
--- branches/shaders/Drivers/AgateDrawing/Drawing_Display.cs	2009-11-05 22:19:20 UTC (rev 1086)
+++ branches/shaders/Drivers/AgateDrawing/Drawing_Display.cs	2009-11-05 23:05:27 UTC (rev 1087)
@@ -24,16 +24,21 @@
 using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
 
+using AgateLib;
 using AgateLib.BitmapFont;
+using AgateLib.DisplayLib;
+using AgateLib.DisplayLib.Shaders;
+using AgateLib.DisplayLib.Shaders.Implementation;
 using AgateLib.Drivers;
 using AgateLib.ImplementationBase;
-using AgateLib.PlatformSpecific;
+using AgateLib.WinForms;
+using Geometry = AgateLib.Geometry;
+using FontStyle = AgateLib.DisplayLib.FontStyle;
+using PixelFormat = AgateLib.DisplayLib.PixelFormat;
 
-namespace AgateLib.DisplayLib.SystemDrawing
+namespace AgateDrawing
 {
-	using WinForms;
-
-	public class Drawing_Display : DisplayImp...
 
[truncated message content]

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

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

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