[Agate-svn-commit] SF.net SVN: agate:[864] branches/agate-3d/Drivers/AgateOTK

[<ka...@us...>]

Revision: 864
          http://agate.svn.sourceforge.net/agate/?rev=864&view=rev
Author:   kanato
Date:     2009-04-15 04:44:43 +0000 (Wed, 15 Apr 2009)

Log Message:
-----------
Refactored AgateOTK to use OtkShader class as a base for ArbShader and GlslShader.

Modified Paths:
--------------
    branches/agate-3d/Drivers/AgateOTK/ArbShader.cs
    branches/agate-3d/Drivers/AgateOTK/GL_Display.cs
    branches/agate-3d/Drivers/AgateOTK/GlslShader.cs

Added Paths:
-----------
    branches/agate-3d/Drivers/AgateOTK/OtkShader.cs

Modified: branches/agate-3d/Drivers/AgateOTK/ArbShader.cs
===================================================================
--- branches/agate-3d/Drivers/AgateOTK/ArbShader.cs	2009-04-15 04:02:03 UTC (rev 863)
+++ branches/agate-3d/Drivers/AgateOTK/ArbShader.cs	2009-04-15 04:44:43 UTC (rev 864)
@@ -7,7 +7,7 @@
 
 namespace AgateOTK
 {
-    class ArbShader : ShaderProgram
+    class ArbShader : OtkShader
     {
         int programHandle;
         Dictionary<string, int> mUniforms = new Dictionary<string, int>();
@@ -31,7 +31,7 @@
             get { return vertex; }
         }
 
-        public int Handle
+        public override int Handle
         {
             get { return programHandle; }
         }

Modified: branches/agate-3d/Drivers/AgateOTK/GL_Display.cs
===================================================================
--- branches/agate-3d/Drivers/AgateOTK/GL_Display.cs	2009-04-15 04:02:03 UTC (rev 863)
+++ branches/agate-3d/Drivers/AgateOTK/GL_Display.cs	2009-04-15 04:44:43 UTC (rev 864)
@@ -434,24 +434,24 @@
             
         }
 
-        GlslShader mCurrentShader;
+        OtkShader mCurrentShader;
 
         public override AgateLib.DisplayLib.Shaders.ShaderProgram Shader
         {
             get
             {
-                return mCurrentShader;
+				return mCurrentShader;
             }
             set
             {
 				if (value == null)
 					return;
 
-                if (value is GlslShader == false)
-                    throw new AgateLib.AgateException(string.Format(
-                        "Shader type is {0} but must be GlslShader.", typeof(ValueType)));
+				if (value is OtkShader == false)
+					throw new AgateLib.AgateException(string.Format(
+						"Shader type is {0} but must be IGlShader.", value.GetType()));
 
-                mCurrentShader = (GlslShader)value;
+				mCurrentShader = (OtkShader)value;
 
                 if (mCurrentShader == null)
                 {

Modified: branches/agate-3d/Drivers/AgateOTK/GlslShader.cs
===================================================================
--- branches/agate-3d/Drivers/AgateOTK/GlslShader.cs	2009-04-15 04:02:03 UTC (rev 863)
+++ branches/agate-3d/Drivers/AgateOTK/GlslShader.cs	2009-04-15 04:44:43 UTC (rev 864)
@@ -7,7 +7,7 @@
 
 namespace AgateOTK
 {
-	class GlslShader : ShaderProgram
+	class GlslShader : OtkShader
 	{
 		struct UniformInfo
 		{
@@ -88,7 +88,6 @@
 
 			mAttributeNames = mAttributes.Select(x => x.Name).ToList();
 		}
-
 		private void LoadUniforms()
 		{
 			int count;
@@ -149,7 +148,7 @@
 			get { return vertex; }
 		}
 
-		public int Handle
+		public override int Handle
 		{
 			get { return programHandle; }
 		}

Added: branches/agate-3d/Drivers/AgateOTK/OtkShader.cs
===================================================================
--- branches/agate-3d/Drivers/AgateOTK/OtkShader.cs	                        (rev 0)
+++ branches/agate-3d/Drivers/AgateOTK/OtkShader.cs	2009-04-15 04:44:43 UTC (rev 864)
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AgateLib.DisplayLib.Shaders;
+
+namespace AgateOTK
+{
+	public abstract class OtkShader : ShaderProgram 
+	{
+		public abstract int Handle { get; }
+	}
+}


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