Merge remote branch 'remotes/psychlopssilverlight/master'

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

diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index 5fe3ea7..7a79979 100644 (file)
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -1,4 +1,4 @@
-\r
+/*\r
 ///+ Prefix linkto BasicCode1\r
 //// Lines for set up Psychlops environment\r
 using Psychlops;\r
@@ -70,6 +70,7 @@ namespace PsychlopsSilverlightApp
        }\r
 \r
 }\r
+ * */\r
 \r
 \r
 /*\r
@@ -541,7 +542,7 @@ using Psychlops;
 */\r
 \r
 \r
-/*\r
+\r
 using Psychlops;\r
 //Position Bias Program\r
 namespace PsychlopsSilverlightApp\r
@@ -571,7 +572,11 @@ namespace PsychlopsSilverlightApp
             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
@@ -607,4 +612,3 @@ namespace PsychlopsSilverlightApp
         }\r
     }\r
 }\r
-*/
\ No newline at end of file