From: HOSOKAWA Kenchi <hskwk@users.sourceforge.jp>
Date: Tue, 29 Mar 2011 12:30:32 +0000 (+0900)
Subject: shader
X-Git-Url: http://git.osdn.jp/view?p=psychlops%2Fsilverlight.git;a=commitdiff_plain;h=b55ddaa401cfe09614a68299447148a3dd55c406

shader
---

diff --git a/dev4/PsychlopsSilverlight4.csproj b/dev4/PsychlopsSilverlight4.csproj
index e2f0ade..37bd4af 100644
--- a/dev4/PsychlopsSilverlight4.csproj
+++ b/dev4/PsychlopsSilverlight4.csproj
@@ -88,10 +88,13 @@
     <Compile Include="psychlops\extention\media\dom.cs" />
     <Compile Include="psychlops\extention\media\svg.cs" />
     <Compile Include="psychlops\extention\standard\CIEColor.cs" />
+    <Compile Include="psychlops\extention\standard\shader.cs" />
     <Compile Include="psychlops\extention\standard\figures.cs" />
     <Compile Include="psychlops\extention\standard\widget.cs" />
     <Compile Include="psychlops\psychlops.cs" />
     <Compile Include="psychlops\core\graphic\shape.cs" />
+    <Resource Include="Shader\Gabor.ps" />
+    <Resource Include="Shader\GaborAlpha.ps" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Pages\BinomialSolver.xaml">
@@ -99,6 +102,7 @@
       <Generator>MSBuild:Compile</Generator>
     </None>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.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.
diff --git a/dev4/Shader/Gabor.ps b/dev4/Shader/Gabor.ps
new file mode 100644
index 0000000..cdc54db
Binary files /dev/null and b/dev4/Shader/Gabor.ps differ
diff --git a/dev4/Shader/GaborAlpha.fx b/dev4/Shader/GaborAlpha.fx
new file mode 100644
index 0000000..095d01f
--- /dev/null
+++ b/dev4/Shader/GaborAlpha.fx
@@ -0,0 +1,60 @@
+/// <summary>Amplitude of Grating</summary>
+/// <minValue>0</minValue>
+/// <maxValue>1</maxValue>
+/// <defaultValue>1</defaultValue>
+float contrast : register(C1);
+
+/// <summary>Phase of Grating</summary>
+/// <minValue>0</minValue>
+/// <maxValue>100</maxValue>
+/// <defaultValue>100</defaultValue>
+float frequency: register(C2);
+
+/// <summary>Phase of Grating</summary>
+/// <minValue>0</minValue>
+/// <maxValue>6.283184</maxValue>
+/// <defaultValue>0</defaultValue>
+float phase: register(C3);
+
+/// <summary>Orientation of Grating</summary>
+/// <minValue>0</minValue>
+/// <maxValue>6.283184</maxValue>
+/// <defaultValue>0</defaultValue>
+float orientation: register(C4);
+
+/// <summary>Half bandwidth of envelope</summary>
+/// <minValue>2</minValue>
+/// <maxValue>8</maxValue>
+/// <defaultValue>4</defaultValue>
+float sigma : register(C5);
+
+/// <summary>Transparency of Figure</summary>
+/// <minValue>0</minValue>
+/// <maxValue>1</maxValue>
+/// <defaultValue>1</defaultValue>
+float alpha : register(C6);
+
+
+float rp(float2 uv)
+{
+	const float2 Center = float2(0.5,0.5);
+	float2 dir = uv - Center; // vector from center to pixel
+	float dist = length(dir);
+	//dir /= dist;
+	return dist;
+}
+
+float4 main(float2 uv : TEXCOORD) : COLOR
+//float4 main(float2 uv : VPOS ) : COLOR
+{
+	//float _r = rp(uv)*sigma*4.0;
+	//float env = exp( -(_r*_r) / 2.0 ) * alpha;
+	float _r = rp(uv)*8;
+	float env = exp( -(_r*_r) / (2.0) ) * alpha;
+
+	float _x = sin(orientation)*uv[0]-cos(orientation)*uv[1];
+	float l = 0.5+env*contrast*0.5*cos(frequency*_x + phase);
+	
+	float4 color = float4(l,l,l,1.0);
+	return color;
+}
diff --git a/dev4/Shader/GaborAlpha.ps b/dev4/Shader/GaborAlpha.ps
new file mode 100644
index 0000000..5a395e2
Binary files /dev/null and b/dev4/Shader/GaborAlpha.ps differ
diff --git a/dev4/psychlops/core/app/misc.cs b/dev4/psychlops/core/app/misc.cs
index 545e5cb..d0d44c0 100644
--- a/dev4/psychlops/core/app/misc.cs
+++ b/dev4/psychlops/core/app/misc.cs
@@ -14,6 +14,7 @@
 		{
 			public static System.Threading.Thread routine;
 			public static System.Threading.AutoResetEvent canvas_flag;
+			public static System.Windows.Controls.Canvas layoutRoot;
 			public static System.Windows.Controls.TextBlock statusBar;
 			public static System.Windows.Controls.StackPanel widgetStack;
 
diff --git a/dev4/psychlops/core/graphic/canvas.cs b/dev4/psychlops/core/graphic/canvas.cs
index 4d65ec4..7f0267b 100644
--- a/dev4/psychlops/core/graphic/canvas.cs
+++ b/dev4/psychlops/core/graphic/canvas.cs
@@ -36,6 +36,8 @@ namespace Psychlops
 			internal int lineStackN = 0;
 			internal Rectangle[] rectStack;
 			internal int rectStackN = 0;
+			internal ShaderField[] shaderStack;
+			internal int shaderStackN = 0;
 			internal Ellipse[] ellipseStack;
 			internal int ellipseStackN = 0;
 			internal Polygon[] polygonStack;
@@ -53,6 +55,7 @@ namespace Psychlops
 				lineStack = new Line[CONST.MOBJ_N];
 				rectStack = new Rectangle[CONST.MOBJ_N];
 				ellipseStack = new Ellipse[CONST.MOBJ_N];
+				shaderStack = new ShaderField[CONST.COBJ_N];
 				polygonStack = new Polygon[CONST.COBJ_N];
 				lettersStack = new Letters[CONST.COBJ_N];
 				imageStack = new Image[CONST.HOBJ_N];
@@ -65,6 +68,7 @@ namespace Psychlops
 				}
 				for (int i = 0; i < CONST.COBJ_N; i++)
 				{
+					shaderStack[i] = new ShaderField();
 					polygonStack[i] = new Polygon();
 					lettersStack[i] = new Letters();
 				}
@@ -73,6 +77,8 @@ namespace Psychlops
 					imageStack[i] = new Image();
 //					groupStack[i] = new Group();
 				}
+
+
 			}
 
 			public void clear() { clear(Color.black); }
@@ -86,6 +92,7 @@ namespace Psychlops
 			public virtual void letters(Letters drawee) { drawee.copyToStack(this); }
 			public virtual void image(Image drawee) { drawee.copyToStack(this); }
 			public virtual void group(Group drawee) { drawee.copyToStack(this); }
+			public virtual void shader(ShaderField drawee) { drawee.copyToStack(this); }
 
 			public void msg(string str, double x, double y) { msg(str, x, y, Color.white); }
 			public virtual void msg(string dstr, double x, double y, Color col)
@@ -120,6 +127,8 @@ namespace Psychlops
 		internal System.Windows.Shapes.Rectangle[] dummyRectPool;
 		internal System.Windows.Shapes.Rectangle[] rectPool;
 		internal int rectPoolN;
+		internal System.Windows.Shapes.Rectangle[] shaderPool;
+		internal int shaderPoolN;
 		internal System.Windows.Shapes.Ellipse[] ellipsePool;
 		internal int ellipsePoolN;
 		internal System.Windows.Shapes.Polygon[] polygonPool;
@@ -134,9 +143,8 @@ namespace Psychlops
 
 		#region initializer
 
-		internal delegate void TwoIntProcedure(int x, int y);
-		internal delegate void SimpleProcedure();
-		SimpleProcedure flipexec;
+		Action flipexec;
+		public static IList<Action> initialize_at_canvas_initialize__ = new List<Action>();
 
 		public static System.Windows.Controls.UserControl default_panel;
 		public static System.Windows.Controls.Canvas default_api_canvas;
@@ -161,6 +169,7 @@ namespace Psychlops
 		}
 
 		protected bool AsyncInitBool;
+		internal void beginInvoke(Action a) { api_canvas.Dispatcher.BeginInvoke(a); }
 		protected void initialize(int wid, int hei)
 		{
 			before = new Clock();
@@ -169,7 +178,7 @@ namespace Psychlops
 			AsyncInitBool = false;
 			width_ = wid;
 			height_ = hei;
-			api_canvas.Dispatcher.BeginInvoke(new TwoIntProcedure(initialize__), wid, hei);
+			api_canvas.Dispatcher.BeginInvoke(new Action<int,int>(initialize__), wid, hei);
 			while (!AsyncInitBool)
 			{
 				after.update();
@@ -181,7 +190,7 @@ namespace Psychlops
 
 			back_panel = new Rectangle(wid, hei);
 
-			flipexec = new SimpleProcedure(executeFlip);
+			flipexec = new Action(executeFlip);
 		}
 		protected void initialize__(int wid, int hei)
 		{
@@ -213,10 +222,12 @@ namespace Psychlops
 				rectPool[i] = new System.Windows.Shapes.Rectangle();
 				ellipsePool[i] = new System.Windows.Shapes.Ellipse();
 			}
+			shaderPool = new System.Windows.Shapes.Rectangle[CONST.COBJ_N];
 			polygonPool = new System.Windows.Shapes.Polygon[CONST.COBJ_N];
 			lettersPool = new System.Windows.Controls.TextBlock[CONST.COBJ_N];
 			for (int i = 0; i < CONST.COBJ_N; i++)
 			{
+				shaderPool[i] = new System.Windows.Shapes.Rectangle();
 				polygonPool[i] = new System.Windows.Shapes.Polygon();
 				lettersPool[i] = new System.Windows.Controls.TextBlock();
 			}
@@ -254,6 +265,9 @@ namespace Psychlops
 			}
 
 			AsyncInitBool = true;
+
+			// initialize at Canvas initializing
+			//Figures.ShaderGabor.initialize__();
 		}
 
 		internal int findEmptyInPool(Dictionary<int, bool> pool)
@@ -295,6 +309,7 @@ namespace Psychlops
 			//pointStackN = 0;
 			lineStackN = 0;
 			rectStackN = 0;
+			shaderStackN = 0;
 			polygonStackN = 0;
 			ellipseStackN = 0;
 			lettersStackN = 0;
@@ -332,6 +347,7 @@ namespace Psychlops
 //			AppState.statusBar = ((after - before).at_msec().ToString()) + " msec";
 
 			Line lineS;
+			ShaderField shaderS;
 			Rectangle rectS;
 			Ellipse ellipseS;
 			Polygon polygonS;
@@ -340,6 +356,7 @@ namespace Psychlops
 			Group groupS;
 			System.Windows.Shapes.Line lineP;
 			System.Windows.Shapes.Rectangle rectP;
+			System.Windows.Shapes.Rectangle shaderP;
 			System.Windows.Shapes.Ellipse ellipseP;
 			System.Windows.Shapes.Polygon polygonP;
 			System.Windows.Controls.TextBlock lettersP;
@@ -360,7 +377,19 @@ namespace Psychlops
 					{
 						for (int i = 0; i < stackN; i++)
 						{
-							if( null != (rectS = stack[i] as Rectangle) )
+							if (null != (shaderS = stack[i] as ShaderField))
+							{
+								if (null != (shaderP = cnv.Children[0] as System.Windows.Shapes.Rectangle))
+								{
+									shaderS.modifyNative(shaderP, this);
+								}
+								else
+								{
+									cnv.Children.Clear();
+									cnv.Children.Add(stack[i].poolNative(this));
+								}
+							}
+							else if( null != (rectS = stack[i] as Rectangle) )
 							{
 								if (null != (rectP = cnv.Children[0] as System.Windows.Shapes.Rectangle))
 								{
@@ -871,6 +900,62 @@ namespace Psychlops
 	}
 	
 	#endregion
+	
+	#region ShaderField
+
+	partial class ShaderField
+	{
+		public System.Windows.Media.Effects.Effect shader;
+		protected static System.Windows.Media.SolidColorBrush dummyfill = null;
+
+		protected static void initializeShader()
+		{
+			dummyfill = new SolidColorBrush(System.Windows.Media.Colors.Blue);
+		}
+
+		public UIElement toNative() { return null; }
+		public void copyToStack(Templates.StackableDrawable d)
+		{
+			var tmp = d.shaderStack[d.shaderStackN];
+			tmp.initialize__ = initialize__;
+			tmp.setParameters = setParameters;
+			tmp.v1 = v1;
+			tmp.v2 = v2;
+			tmp.shader = shader;
+			d.stack[d.stackN] = tmp;
+			d.shaderStackN++;
+			d.stackN++;
+		}
+		public UIElement poolNative(Canvas d)
+		{
+			var tmp = d.shaderPool[d.shaderPoolN];
+			tmp.Width = width;
+			tmp.Height = height;
+			if (!initialized) { initialize__(); }
+			setParameters();
+			tmp.Effect = shader;
+			tmp.Fill = dummyfill;
+			System.Windows.Controls.Canvas.SetLeft(tmp, left);
+			System.Windows.Controls.Canvas.SetTop(tmp, top);
+			tmp.Visibility = Visibility.Visible;
+			d.shaderPoolN++;
+			return tmp;
+		}
+		public void modifyNative(System.Windows.Shapes.Rectangle tmp, Canvas d)
+		{
+			tmp.Width = width;
+			tmp.Height = height;
+			if (!initialized) { initialize__(); }
+			setParameters();
+			tmp.Effect = shader;
+			tmp.Fill = dummyfill;
+			System.Windows.Controls.Canvas.SetLeft(tmp, left);
+			System.Windows.Controls.Canvas.SetTop(tmp, top);
+			tmp.Visibility = Visibility.Visible;
+		}
+	}
+
+	#endregion
 
 	#region Ellipse
 
@@ -1114,7 +1199,7 @@ namespace Psychlops
 		internal void initialize__(int wid, int hei)
 		{
 			AsyncBool = false;
-			Canvas.default_api_canvas.Dispatcher.BeginInvoke(new Canvas.TwoIntProcedure(create__), wid, hei);
+			Canvas.default_api_canvas.Dispatcher.BeginInvoke(new Action<int,int>(create__), wid, hei);
 			while (!AsyncBool) { System.Threading.Thread.Sleep(10); }
 		}
 		internal void create__(int wid, int hei)
@@ -1231,7 +1316,7 @@ namespace Psychlops
 	{
 		internal void initialize__()
 		{
-			Canvas.default_api_canvas.Dispatcher.BeginInvoke(new Canvas.SimpleProcedure(create__));
+			Canvas.default_api_canvas.Dispatcher.BeginInvoke(new Action(create__));
 		}
 		internal void create__()
 		{
diff --git a/dev4/psychlops/core/graphic/module.cs b/dev4/psychlops/core/graphic/module.cs
index e55a779..8a5be98 100644
--- a/dev4/psychlops/core/graphic/module.cs
+++ b/dev4/psychlops/core/graphic/module.cs
@@ -140,6 +140,7 @@ namespace Psychlops
 		void letters(Letters drawee);
 		void image(Image drawee);
 		void group(Group drawee);
+		void shader(ShaderField drawee);
 		void msg(string s, double x, double y, Color c);
 	}
 
@@ -254,4 +255,114 @@ namespace Psychlops
 		}
 	}
 
+
+
+	public partial class ShaderField : Internal.PrimitiveFigure
+	{
+		public Point v1, v2;
+		
+		public ShaderField()
+		{
+			set(0,0);
+		}
+		public ShaderField(double wid, double hei)
+		{
+			initialized = false;
+			set(wid, hei);
+		}
+		public ShaderField(Rectangle another)
+		{
+			v1 = another.v1;
+			v2 = another.v2;
+		}
+		public ShaderField set(double wid, double hei)
+		{
+			v1.set(0, 0, 0);
+			v2.set(wid, hei, 0);
+			return this;
+		}
+		ShaderField set(Point po1, Point po2)
+		{
+			v1 = po1;
+			v2 = po2;
+			return this;
+		}
+		public ShaderField set(double l, double t, double r, double b)
+		{
+			v1.set(l, t, 0);
+			v2.set(r, b, 0);
+			return this;
+		}
+		public ShaderField set(ShaderField another)
+		{
+			v1 = another.v1;
+			v2 = another.v2;
+			return this;
+		}
+
+		public ShaderField resize(double width, double height)
+		{
+			Point po = center;
+			set(width, height);
+			centering(po);
+			return this;
+		}
+
+
+		public Point datum
+		{
+			get { return v1; }
+			set { double w = width, h = height; v1 = value; v2 = v1 + new Point(w,h); }
+		}
+		public ShaderField move_to(Point p) { datum = p; return this; }
+		public ShaderField move_to(double x, double y, double z = 0.0) { datum = new Point(x, y, z); return this; }
+		public ShaderField locate(Point p) { datum = p; return this; }
+		public ShaderField locate(double x, double y, double z = 0.0) { datum = new Point(x, y, z); return this; }
+
+		public Figure shift(Point p)
+		{
+			v1 += p;
+			v2 += p;
+			return this;
+		}
+		public Figure centering(Point p)
+		{
+			double h = width, v = height;
+			v1.x = p.x - h / 2.0;
+			v1.y = p.y - v / 2.0;
+			v2.x = v1.x + h;
+			v2.y = v1.y + v;
+			return this;
+		}
+
+		public virtual void draw()
+		{
+			Main.drawable.shader(this);
+		}
+
+		internal Action setParameters = initialize___;
+		internal Action initialize__ = initialize___;
+		private static void initialize___() {}
+		internal bool initialized = false;
+
+		public double left { get { return v1.x; } }
+		public double top { get { return v1.y; } }
+		public double right { get { return v2.x; } }
+		public double bottom { get { return v2.y; } }
+		public double width { get { return Math.abs(v1.x - v2.x); } }
+		public double height { get { return Math.abs(v1.y - v2.y); } }
+		public Point center
+		{
+			get { return new Point((left + right) / 2, (top + bottom) / 2); }
+			set { centering(value); }
+		}
+		public double getLeft() { return left; }
+		public double getTop() { return top; }
+		public double getRight() { return right; }
+		public double getBottom() { return bottom; }
+		public double getWidth() { return width; }
+		public double getHeight() { return height; }
+		public Point getCenter() { return center; }
+	}
+
 }
\ No newline at end of file
diff --git a/dev4/psychlops/extention/standard/figures.cs b/dev4/psychlops/extention/standard/figures.cs
index f82d1a2..948aecc 100644
--- a/dev4/psychlops/extention/standard/figures.cs
+++ b/dev4/psychlops/extention/standard/figures.cs
@@ -3,7 +3,7 @@ using System.Windows.Media.Imaging;
 namespace Psychlops
 {
 
-    public static class Figures
+    public static partial class Figures
     {
 
 		public static void drawGrating(ref Image img, int width, int height, double wavelength, double contrast, double orientation, double phase)
diff --git a/dev4/psychlops/extention/standard/shader.cs b/dev4/psychlops/extention/standard/shader.cs
new file mode 100644
index 0000000..af94a38
--- /dev/null
+++ b/dev4/psychlops/extention/standard/shader.cs
@@ -0,0 +1,226 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     このコードはツールによって生成されました。
+//     ランタイム バージョン:4.0.30319.1
+//
+//     このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
+//     コードが再生成されるときに損失したりします。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Media3D;
+
+
+namespace Psychlops
+{
+
+
+	public static partial class Figures
+	{
+
+
+		public class ShaderGabor : ShaderField
+		{
+			protected Shader.GaborProgram ps = null;
+			public ShaderGabor()
+			{
+				initialize__ = initialize___;
+				setParameters = setParameters__;
+			}
+			internal void initialize()
+			{
+				if (!initialized)
+				{
+					Main.canvas.beginInvoke(initialize___);
+					initialized = true;
+				}
+			}
+			internal void initialize___()
+			{
+				if (!initialized)
+				{
+					if (ps == null)
+					{
+						ps = new Shader.GaborProgram();
+						initializeShader();
+					}
+					shader = ps;
+					initialized = true;
+				}
+			}
+
+			//public double contrast { get; set; }
+			//public double frequency { get; set; }
+			//public double phase { get; set; }
+			//public double orientation { get; set; }
+			public double contrast = 1.0, wavelength = 20.0, phase = 0.0, orientation = 0.0, alpha = 1.0;
+			public ShaderGabor setSigma(double s)
+			{
+				set(s*8, s*8);
+				return this;
+			}
+			
+			public void setParameters__()
+			{
+				ps.Contrast = contrast;
+				ps.WaveLength = wavelength;
+				ps.Phase = phase;
+				ps.Orientation = orientation;
+				ps.Sigma = 4.0;
+				ps.Size = width;
+				ps.Alpha = alpha;
+				ps.Update();
+			}
+
+
+		}
+	}
+
+
+	namespace Shader
+	{
+		internal static partial class Connector
+		{
+			internal delegate void PixelShaderConnector(ShaderEffect q, Uri s);
+		}
+
+
+		public abstract class ShaderProgram : ShaderEffect
+		{
+		}
+
+		public class GaborProgram : ShaderProgram
+		{
+			public static readonly Uri ps = new Uri(@"/PsychlopsSilverlight4;component/Shader/Gabor.ps", UriKind.Relative);
+
+			public static readonly DependencyProperty InputProperty = ShaderEffect.RegisterPixelShaderSamplerProperty("Input", typeof(GaborProgram), 0);
+			public static readonly DependencyProperty ContrastProperty = DependencyProperty.Register("Contrast", typeof(double), typeof(GaborProgram), new PropertyMetadata(((double)(1D)), PixelShaderConstantCallback(1)));
+			public static readonly DependencyProperty FrequencyProperty = DependencyProperty.Register("Frequency", typeof(double), typeof(GaborProgram), new PropertyMetadata(((double)(100D)), PixelShaderConstantCallback(2)));
+			public static readonly DependencyProperty PhaseProperty = DependencyProperty.Register("Phase", typeof(double), typeof(GaborProgram), new PropertyMetadata(((double)(0D)), PixelShaderConstantCallback(3)));
+			public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register("Orientation", typeof(double), typeof(GaborProgram), new PropertyMetadata(((double)(0D)), PixelShaderConstantCallback(4)));
+			public static readonly DependencyProperty SigmaProperty = DependencyProperty.Register("Sigma", typeof(double), typeof(GaborProgram), new PropertyMetadata(((double)(4D)), PixelShaderConstantCallback(5)));
+			public static readonly DependencyProperty AlphaProperty = DependencyProperty.Register("Alpha", typeof(double), typeof(GaborProgram), new PropertyMetadata(((double)(1D)), PixelShaderConstantCallback(6)));
+			public GaborProgram()
+			{
+				PixelShader pixelShader = new PixelShader();
+				pixelShader.UriSource = ps;
+				this.PixelShader = pixelShader;
+
+				this.UpdateShaderValue(InputProperty);
+				this.UpdateShaderValue(ContrastProperty);
+				this.UpdateShaderValue(FrequencyProperty);
+				this.UpdateShaderValue(PhaseProperty);
+				this.UpdateShaderValue(OrientationProperty);
+				this.UpdateShaderValue(SigmaProperty);
+				this.UpdateShaderValue(AlphaProperty);
+
+				Size = 200;
+				Contrast = 1.0;
+				WaveLength = 100.0;
+				Orientation = 0.0;
+				Sigma = 4.0;
+				Alpha = 1.0;
+			}
+
+			public void Update()
+			{
+				this.UpdateShaderValue(InputProperty);
+				this.UpdateShaderValue(ContrastProperty);
+				this.UpdateShaderValue(FrequencyProperty);
+				this.UpdateShaderValue(PhaseProperty);
+				this.UpdateShaderValue(OrientationProperty);
+				this.UpdateShaderValue(SigmaProperty);
+				this.UpdateShaderValue(AlphaProperty);
+			}
+
+
+			private double size__, wavelength__;
+			public double Size { get { return size__; } set { size__ = value; setFrequency(); } }
+			private void setFrequency()
+			{
+				double freq = size__ * 2.0 * Math.PI / (wavelength__);
+				this.SetValue(FrequencyProperty, freq);
+			}
+
+			/// <summary>Amplitude of Grating</summary>
+			public double Contrast
+			{
+				get
+				{
+					return ((double)(this.GetValue(ContrastProperty))) * 2.0;
+				}
+				set
+				{
+					this.SetValue(ContrastProperty, value / 2.0);
+				}
+			}
+			/// <summary>Phase of Grating</summary>
+			public double WaveLength
+			{
+				get
+				{
+					return wavelength__;
+				}
+				set
+				{
+					wavelength__ = value;
+					setFrequency();
+				}
+			}
+			/// <summary>Phase of Grating</summary>
+			public double Phase
+			{
+				get
+				{
+					return ((double)(this.GetValue(PhaseProperty)));
+				}
+				set
+				{
+					this.SetValue(PhaseProperty, value);
+				}
+			}
+			/// <summary>Orientation of Grating</summary>
+			public double Orientation
+			{
+				get
+				{
+					return ((double)(this.GetValue(OrientationProperty)));
+				}
+				set
+				{
+					this.SetValue(OrientationProperty, value);
+				}
+			}
+			/// <summary>Half bandwidth of envelope</summary>
+			public double Sigma
+			{
+				get
+				{
+					return ((double)(this.GetValue(SigmaProperty)));
+				}
+				set
+				{
+					this.SetValue(SigmaProperty, value);
+				}
+			}
+			/// <summary>Transparency of Figure</summary>
+			public double Alpha
+			{
+				get
+				{
+					return ((double)(this.GetValue(AlphaProperty)));
+				}
+				set
+				{
+					this.SetValue(AlphaProperty, value);
+				}
+			}
+		}
+
+	
+	}
+}
\ No newline at end of file
diff --git a/dev4/psychlops/extention/standard/widget.cs b/dev4/psychlops/extention/standard/widget.cs
index 42e7668..92ce8a2 100644
--- a/dev4/psychlops/extention/standard/widget.cs
+++ b/dev4/psychlops/extention/standard/widget.cs
@@ -118,6 +118,19 @@ namespace Psychlops
 		}
 		 */
 
+		public class Button
+		{
+			public static Color bgcolor;
+
+			internal System.Windows.Controls.Button uibutton;
+
+			public Button(string l)
+			{
+				uibutton = new System.Windows.Controls.Button();
+				uibutton.Content = l;
+			}
+			public void str(string l) { }
+		}
 
 		public class Slider
 		{
@@ -253,7 +266,7 @@ namespace Psychlops
 		}
 
 
-		internal static class Connector
+		internal static partial class Connector
 		{
 			internal delegate void VoidString(string s);
 			internal delegate void VoidStringObject(String s, System.Object o);
diff --git a/test4/MainPage.xaml b/test4/MainPage.xaml
index 1cc8030..6487be3 100644
--- a/test4/MainPage.xaml
+++ b/test4/MainPage.xaml
@@ -9,9 +9,13 @@
 				<ColumnDefinition Width="0" />
 				<ColumnDefinition Width="*" />
 			</Grid.ColumnDefinitions>
+
+
 			<StackPanel x:Name="Controller" Grid.Column="0">
 			</StackPanel>
+			
 			<Canvas x:Name="LayoutRoot" Grid.Column="1"></Canvas>
+
 		</Grid>
 		<TextBlock x:Name="AppStatusBar" Height="20">Loading...</TextBlock>
 	</StackPanel>
diff --git a/test4/MainPage.xaml.cs b/test4/MainPage.xaml.cs
index 2a1ef51..a125451 100644
--- a/test4/MainPage.xaml.cs
+++ b/test4/MainPage.xaml.cs
@@ -1,4 +1,10 @@
 using Psychlops;
+using System;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Media3D;
+
 
 namespace PsychlopsSilverlight4test
 {
@@ -39,24 +45,25 @@ namespace PsychlopsSilverlight4test
 			//main_routine = main.psychlops_main();
 
 			Psychlops.Internal.Main.statusBar = AppStatusBar;
+			Psychlops.Internal.Main.layoutRoot = LayoutRoot;
 			//Psychlops.Internal.Main.widgetStack = Controller;
 			AppStatusBar.Text = "Now starting Psychlops environment... please wait a minute";
 
-			/*
-			var ur = new System.Uri("Resources/Benham.png", System.UriKind.RelativeOrAbsolute);
-			var																																																																																																																																																																																																																																																												bitmap = new System.Windows.Media.Imaging.BitmapImage(ur);
-			var img = new System.Windows.Controls.Image();
-			img.Source = bitmap;
-			System.Windows.Controls.Canvas.SetLeft(img, 100);
-			System.Windows.Controls.Canvas.SetTop(img, 100);
-			Controller.Children.Add(img);
-			 * */
-			 
-			 
+
+//eff__ = new Psychlops.Shader.GaborProgram();
+//rect__ = new System.Windows.Shapes.Rectangle();
+//rect__.Width = 200;
+//rect__.Height = 200;
+//rect__.Effect = eff__;
+//rect__.Fill = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Colors.Blue);
 		}
 		protected void getFocusMouseEnter(object sender, System.Windows.Input.MouseEventArgs e) {
 			this.Focus();
+//if(!b) { LayoutRoot.Children.Add(rect__); b = true; }
 		}
+//System.Windows.Shapes.Rectangle rect__;
+//Psychlops.Shader.GaborProgram eff__;
+//bool b = false;
 
 		private void CompositionTarget_Rendering(object sender, System.EventArgs e)
 		{
@@ -70,5 +77,8 @@ namespace PsychlopsSilverlight4test
 		}
 
 	}
+
+
+
 }
 
diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index c0b941a..9090e56 100644
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -1,4 +1,6 @@
-//Two types of plaid motion
+
+/*
+//Two types of plaid motion
 //E. H. Adelson and J. A. Movshon (1982).
 //Phenomenal coherence of moving visual patterns. Nature 300, 523-525
 
@@ -222,11 +224,10 @@ using Psychlops;
 		}
 	}
 }
+*/
 
 
 
-
-/*
 using Psychlops;
 //Position Bias Program
 namespace PsychlopsSilverlightApp
@@ -236,12 +237,14 @@ namespace PsychlopsSilverlightApp
     {
         Canvas cnvs;
         Image img, img2, img3;
-        int isize = 80;        
+        int isize = 40;        
         int frames;
         Psychlops.Widgets.Slider tfreq;
         Psychlops.Widgets.Slider contrast;
         Psychlops.Widgets.Slider lambda;
+		
 
+		
         public void psychlops_main()
         {
             cnvs = new Canvas(300, 600);
@@ -254,18 +257,34 @@ namespace PsychlopsSilverlightApp
             img2 = new Image(isize * 2, isize * 2);
             img3 = new Image(isize * 2, isize * 2);
 
+			Figures.ShaderGabor[] gabor1 = StaticFunctions.NewArray<Figures.ShaderGabor>(100);
+			foreach(var g in gabor1)
+			{
+				g.setSigma(isize / 8).centering().shift(Math.random(300) - 150, Math.random(600) - 300);
+				g.orientation = Math.random(2*Math.PI);
+			}
 
             while (true)
-            {
+			{
                 cnvs.clear(new Color(0.5));
 
-                Figures.drawGabor(ref img, isize / 6, 1/lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * tfreq / 60);
-				Figures.drawGabor(ref img2, isize / 6, 1 / lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * -tfreq / 60);
-				Figures.drawGabor(ref img3, isize / 6, 1 / lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * tfreq / 60);
+                Figures.drawGabor(ref img, isize / 8, 1/lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * tfreq / 60);
+				Figures.drawGabor(ref img2, isize / 8, 1 / lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * -tfreq / 60);
+				Figures.drawGabor(ref img3, isize / 8, 1 / lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * tfreq / 60);
 
-                img.centering().shift(0, -isize * 1.5).draw();
-                img2.centering().draw();
-                img3.centering().shift(0, isize * 1.5).draw();
+
+                //img.centering().shift(0, -isize * 1.5).draw();
+                //img2.centering().draw();
+                //img3.centering().shift(0, isize * 1.5).draw();
+
+
+				foreach (var g in gabor1)
+				{
+					g.wavelength = lambda;
+					g.phase = (double)frames * 2.0 * Math.PI * tfreq / 60;
+					g.contrast = contrast;
+					g.draw();
+				}
                 
                 if (!Mouse.left.pressed()) frames++;
 
@@ -274,5 +293,3 @@ namespace PsychlopsSilverlightApp
         }
     }
 }
-
-*/
\ No newline at end of file