shader

[psychlops/silverlight.git] / test4 / PsychlopsMain.cs

diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index 7a79979..16acfd8 100644 (file)
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -1,4 +1,79 @@
-/*\r
+\r
+\r
+\r
+using Psychlops;\r
+//Position Bias Program\r
+namespace PsychlopsSilverlightApp\r
+{\r
+\r
+       public class PsychlopsMain\r
+       {\r
+               Canvas cnvs;\r
+               Image img, img2, img3;\r
+               int isize = 40;\r
+               int frames;\r
+               Psychlops.Widgets.Slider tfreq;\r
+               Psychlops.Widgets.Slider contrast;\r
+               Psychlops.Widgets.Slider lambda;\r
+\r
+\r
+\r
+               public void psychlops_main()\r
+               {\r
+                       cnvs = new Canvas(300, 600);\r
+                       Interval rng = new Interval();\r
+                       tfreq = new Psychlops.Widgets.Slider("Temporal Frequency(Hz)", -5 <= rng <= 5, 3.0);\r
+                       contrast = new Psychlops.Widgets.Slider("Contrast", 0.0 <= rng <= 1.0, 0.25);\r
+                       lambda = new Psychlops.Widgets.Slider("Wave Length", 10.0 <= rng <= 120.0, 30);\r
+\r
+                       img = new Image(isize * 2, isize * 2);\r
+                       img2 = new Image(isize * 2, isize * 2);\r
+                       img3 = new Image(isize * 2, isize * 2);\r
+\r
+                       var gabor1 = StaticFunctions.NewArray<Figures.ShaderGabor>(100);\r
+                       foreach (var g in gabor1)\r
+                       {\r
+                               g.setSigma(isize/8).centering().shift(Math.random(300) - 150, Math.random(600) - 300);\r
+                               //g.setSize(isize).centering().shift(Math.random(300) - 150, Math.random(600) - 300);\r
+                               g.orientation = Math.random(2 * Math.PI);\r
+                               //g.orientation2 = Math.random(2 * Math.PI);\r
+                       }\r
+\r
+                       while (true)\r
+                       {\r
+                               cnvs.clear(new Color(0.5));\r
+\r
+                               Figures.drawGabor(ref img, isize / 8, 1 / lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * tfreq / 60);\r
+                               Figures.drawGabor(ref img2, isize / 8, 1 / lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * -tfreq / 60);\r
+                               Figures.drawGabor(ref img3, isize / 8, 1 / lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * tfreq / 60);\r
+\r
+\r
+                               //img.centering().shift(0, -isize * 1.5).draw();\r
+                               //img2.centering().draw();\r
+                               //img3.centering().shift(0, isize * 1.5).draw();\r
+\r
+\r
+                               foreach (var g in gabor1)\r
+                               {\r
+                                       g.wavelength = lambda;\r
+                                       g.phase = (double)frames * 2.0 * Math.PI * tfreq / 60;\r
+                                       g.contrast = contrast;\r
+                                       //g.wavelength2 = lambda * 2;\r
+                                       //g.phase2 = (double)frames * 2.0 * Math.PI * tfreq / 60;\r
+                                       //g.contrast2 = contrast / 2;\r
+                                       g.draw();\r
+                               }\r
+\r
+                               if (!Mouse.left.pressed()) frames++;\r
+\r
+                               cnvs.flip();\r
+                       }\r
+               }\r
+       }\r
+}\r
+\r
+\r
+/*\r
 ///+ Prefix linkto BasicCode1\r
 //// Lines for set up Psychlops environment\r
 using Psychlops;\r
@@ -540,75 +615,3 @@ using Psychlops;
        }\r
 }\r
 */\r
-\r
-\r
-\r
-using Psychlops;\r
-//Position Bias Program\r
-namespace PsychlopsSilverlightApp\r
-{\r
-\r
-    public class PsychlopsMain\r
-    {\r
-        Canvas cnvs;\r
-        Image img, img2, img3;\r
-        int isize = 40;        \r
-        int frames;\r
-        Psychlops.Widgets.Slider tfreq;\r
-        Psychlops.Widgets.Slider contrast;\r
-        Psychlops.Widgets.Slider lambda;\r
-               \r
-\r
-               \r
-        public void psychlops_main()\r
-        {\r
-            cnvs = new Canvas(300, 600);\r
-            Interval rng = new Interval();\r
-            tfreq = new Psychlops.Widgets.Slider("Temporal Frequency(Hz)", -5 <= rng <= 5, 3.0);\r
-            contrast = new Psychlops.Widgets.Slider("Contrast", 0.0 <= rng <= 1.0, 0.25);\r
-            lambda = new Psychlops.Widgets.Slider("Wave Length", 10.0 <= rng <= 120.0, 30);\r
-\r
-            img = new Image(isize * 2, isize * 2);\r
-            img2 = new Image(isize * 2, isize * 2);\r
-            img3 = new Image(isize * 2, isize * 2);\r
-\r
-<<<<<<< HEAD
-                       var gabor1 = StaticFunctions.NewArray<Figures.ShaderGabor>(100);\r
-=======
-                       var gabor1 = StaticFunctions.NewArray<Figures.ShaderGaborAlpha>(100);\r
->>>>>>> remotes/psychlopssilverlight/master
-                       foreach(var g in gabor1)\r
-                       {\r
-                               g.setSigma(isize / 8).centering().shift(Math.random(300) - 150, Math.random(600) - 300);\r
-                               g.orientation = Math.random(2*Math.PI);\r
-                       }\r
-\r
-            while (true)\r
-                       {\r
-                cnvs.clear(new Color(0.5));\r
-\r
-                Figures.drawGabor(ref img, isize / 8, 1/lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * tfreq / 60);\r
-                               Figures.drawGabor(ref img2, isize / 8, 1 / lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * -tfreq / 60);\r
-                               Figures.drawGabor(ref img3, isize / 8, 1 / lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * tfreq / 60);\r
-\r
-\r
-                //img.centering().shift(0, -isize * 1.5).draw();\r
-                //img2.centering().draw();\r
-                //img3.centering().shift(0, isize * 1.5).draw();\r
-\r
-\r
-                               foreach (var g in gabor1)\r
-                               {\r
-                                       g.wavelength = lambda;\r
-                                       g.phase = (double)frames * 2.0 * Math.PI * tfreq / 60;\r
-                                       g.contrast = contrast;\r
-                                       g.draw();\r
-                               }\r
-                \r
-                if (!Mouse.left.pressed()) frames++;\r
-\r
-                cnvs.flip();\r
-            }\r
-        }\r
-    }\r
-}\r