OK

diff --git a/PsychlopsSilverlight4Dev.sln b/PsychlopsSilverlight4Dev.sln
index 8a731bd..cab0068 100644 (file)
--- a/PsychlopsSilverlight4Dev.sln
+++ b/PsychlopsSilverlight4Dev.sln
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Web Developer Express 2010\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PsychlopsSilverlight4test", "test4\PsychlopsSilverlight4test.csproj", "{46CA4F41-B3F5-43E0-9BC7-DDD7EBF3C1E4}"\r
 EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PsychlopsSilverlight4", "dev4\PsychlopsSilverlight4.csproj", "{58F3CEF1-8123-4105-9525-B7E2C7F188AC}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Any CPU = Debug|Any CPU\r
@@ -13,6 +15,10 @@ Global
                {46CA4F41-B3F5-43E0-9BC7-DDD7EBF3C1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {46CA4F41-B3F5-43E0-9BC7-DDD7EBF3C1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {46CA4F41-B3F5-43E0-9BC7-DDD7EBF3C1E4}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {58F3CEF1-8123-4105-9525-B7E2C7F188AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {58F3CEF1-8123-4105-9525-B7E2C7F188AC}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {58F3CEF1-8123-4105-9525-B7E2C7F188AC}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {58F3CEF1-8123-4105-9525-B7E2C7F188AC}.Release|Any CPU.Build.0 = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index 4ed837b..ad9a4c1 100644 (file)
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -1,47 +1,100 @@
-using Psychlops;\r
+\r
+using Psychlops;\r
+\r
+namespace PsychlopsSilverlightApp\r
+{\r
+\r
+       public class PsychlopsMain\r
+       {\r
+\r
+               public void psychlops_main()\r
+               {\r
+                       Canvas window = new Canvas(300,300);\r
+\r
+                       Rectangle figure = new Rectangle();\r
+                       figure.set(100, 100);\r
+                       figure.fill = new Color(1, 1, 1);\r
+                       figure.centering().shift(0, 0);\r
+\r
+                       int frame = 0;\r
+                       int looming_direction = 1, motion_dir = 1;\r
+\r
+\r
+                       while (!Keyboard.esc.pushed())\r
+                       {\r
+                               window.clear(0);\r
+\r
+                               if (frame % 30 == 0)\r
+                               {\r
+                                       looming_direction = looming_direction * -1;\r
+                               }\r
+                               if (frame % 90 == 0)\r
+                               {\r
+                                       motion_dir *= -1;\r
+                               }\r
+\r
+                               figure.resize(figure.getWidth() + looming_direction * 1,\r
+                                                                       figure.getHeight() + looming_direction * 1);\r
+                               figure.shift(motion_dir * 1, motion_dir * 0);\r
+\r
+                               figure.draw();\r
+                               window.flip();\r
+\r
+                               frame++;\r
+                       }\r
+\r
+               }\r
+\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 = 80;        \r
-        int frames;\r
-        Psychlops.Widgets.Slider tfreq;\r
-        Psychlops.Widgets.Slider contrast;\r
-        Psychlops.Widgets.Slider lambda;\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
-\r
-            while (true)\r
-            {\r
-                cnvs.clear(new Color(0.5));\r
-\r
-                Figures.drawGabor(ref img, isize / 6, 1/lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * tfreq / 60);\r
+       public class PsychlopsMain\r
+       {\r
+               Canvas cnvs;\r
+               Image img, img2, img3;\r
+               int isize = 80;        \r
+               int frames;\r
+               Psychlops.Widgets.Slider tfreq;\r
+               Psychlops.Widgets.Slider contrast;\r
+               Psychlops.Widgets.Slider lambda;\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
+\r
+                       while (true)\r
+                       {\r
+                               cnvs.clear(new Color(0.5));\r
+\r
+                               Figures.drawGabor(ref img, isize / 6, 1/lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * tfreq / 60);\r
                                Figures.drawGabor(ref img2, isize / 6, 1 / lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * -tfreq / 60);\r
                                Figures.drawGabor(ref img3, isize / 6, 1 / lambda, contrast, 0.5 * Math.PI, (double)frames * 2.0 * Math.PI * tfreq / 60);\r
 \r
-                img.centering().shift(0, -isize * 1.5).draw();\r
-                img2.centering().draw();\r
-                img3.centering().shift(0, isize * 1.5).draw();\r
+                               img.centering().shift(0, -isize * 1.5).draw();\r
+                               img2.centering().draw();\r
+                               img3.centering().shift(0, isize * 1.5).draw();\r
                 \r
-                if (!Mouse.left.pressed()) frames++;\r
+                               if (!Mouse.left.pressed()) frames++;\r
 \r
-                cnvs.flip();\r
-            }\r
-        }\r
-    }\r
-}
\ No newline at end of file
+                               cnvs.flip();\r
+                       }\r
+               }\r
+       }\r
+}\r
+*/\r