123

diff --git a/dev4/psychlops/core/graphic/canvas.cs b/dev4/psychlops/core/graphic/canvas.cs
index ccdf1a2..7f6360c 100644 (file)
--- a/dev4/psychlops/core/graphic/canvas.cs
+++ b/dev4/psychlops/core/graphic/canvas.cs
@@ -26,6 +26,14 @@ namespace Psychlops
                        internal int lineStackN;\r
                        internal Rectangle[] rectStack;\r
                        internal int rectStackN;\r
+                       internal Ellipse[] ellipseStack;\r
+                       internal int ellipseStackN;\r
+                       internal Polygon[] polygonStack;\r
+                       internal int polygonStackN;\r
+                       internal Letters[] lettersStack;\r
+                       internal int lettersStackN;\r
+                       internal Image[] imageStack;\r
+                       internal int imageStackN;\r
 \r
 \r
                        public StackableDrawable()\r
@@ -34,10 +42,21 @@ namespace Psychlops
                                stack = new Internal.PrimitiveFigure[40000];\r
                                lineStack = new Line[10000];\r
                                rectStack = new Rectangle[10000];\r
+                               ellipseStack = new Ellipse[10000];\r
+                               polygonStack = new Polygon[1000];\r
+                               lettersStack = new Letters[1000];\r
+                               imageStack = new Image[1000];\r
                                for (int i = 0; i < 10000; i++)\r
                                {\r
                                        lineStack[i] = new Line(0,0,0,0);\r
                                        rectStack[i] = new Rectangle();\r
+                                       ellipseStack[i] = new Ellipse();\r
+                               }\r
+                               for (int i = 0; i < 1000; i++)\r
+                               {\r
+                                       polygonStack[i] = new Polygon();\r
+                                       lettersStack[i] = new Letters();\r
+                                       //imageStack[i] = new Image();\r
                                }\r
                        }\r
 \r
@@ -68,22 +87,26 @@ namespace Psychlops
 \r
                        public virtual void ellipse(Ellipse drawee)\r
                        {\r
-//                             stack.Enqueue(drawee.clone());\r
+                               //                              stack.Enqueue(drawee.clone());\r
+                               drawee.copyToStack(this);\r
                        }\r
 \r
                        public virtual void polygon(Polygon drawee)\r
                        {\r
-//                             stack.Enqueue(drawee.clone());\r
+                               //                              stack.Enqueue(drawee.clone());\r
+                               drawee.copyToStack(this);\r
                        }\r
 \r
                        public virtual void letters(Letters drawee)\r
                        {\r
-//                             stack.Enqueue(drawee.clone());\r
+                               //                              stack.Enqueue(drawee.clone());\r
+                               drawee.copyToStack(this);\r
                        }\r
 \r
                        public virtual void image(Image drawee)\r
                        {\r
-//                             stack.Enqueue(drawee.clone());\r
+                               //                              stack.Enqueue(drawee.clone());\r
+                               drawee.copyToStack(this);\r
                        }\r
 \r
                        public void msg(string str, double x, double y) { msg(str, x, y, Color.white); }\r
@@ -114,6 +137,10 @@ namespace Psychlops
                internal int linePoolN;\r
                internal System.Windows.Shapes.Rectangle[] rectPool;\r
                internal int rectPoolN;\r
+               internal System.Windows.Shapes.Ellipse[] ellipsePool;\r
+               internal int ellipsePoolN;\r
+               internal System.Windows.Shapes.Polygon[] polygonPool;\r
+               internal int polygonPoolN;\r
 \r
                #region initializer\r
 \r
@@ -237,6 +264,7 @@ namespace Psychlops
                }\r
 \r
                int nextIntervalFrame = 1, chacked = 0;\r
+               /*\r
                public void flip()\r
                {\r
                        //api_canvas.Dispatcher.BeginInvoke(flipexec);\r
@@ -268,9 +296,9 @@ namespace Psychlops
                                if (chacked > 0)\r
                                {\r
                //                      prevPool.Children.Clear();\r
-               //                      var tmp = new System.Windows.Controls.Canvas();\r
-//                                     if (stack.Count > 0)\r
-                                       if (stackN > 0)\r
+                                       var tmp = new System.Windows.Controls.Canvas();\r
+                                       if (stack.Count > 0)\r
+               //                      if (stackN > 0)\r
                                        {\r
                                                //foreach (UIElement e in api_canvas.Children)\r
                                                //{\r
@@ -280,16 +308,16 @@ namespace Psychlops
                                                {\r
                                                        //                                                      tmp.Children.Add(f.toNative());\r
 //                                                     tmp.Children.Add(f.poolNative(this));\r
-               //                                      tmp.Children.Add(stack[i].poolNative(this));\r
-                                                       System.Windows.Controls.Canvas.SetLeft(api_canvas.Children[i + 1], rectStack[i].left);\r
-                                                       api_canvas.Children[0] = api_canvas.Children[0];\r
+                                                       tmp.Children.Add(stack[i].poolNative(this));\r
+               //                                      System.Windows.Controls.Canvas.SetLeft(api_canvas.Children[i + 1], rectStack[i].left);\r
+               //                                      api_canvas.Children[0] = api_canvas.Children[0];\r
                                                }\r
                                                stackN = 0;\r
 \r
                                        }\r
-               //                      api_canvas.Children.Clear();\r
-               //                      api_canvas.Children.Add(tmp);\r
-//                                     stack.Clear();\r
+                                       api_canvas.Children.Clear();\r
+                                       api_canvas.Children.Add(tmp);\r
+               //                      stack.Clear();\r
                                        lock (this)\r
                                        {\r
                                                chacked = 0;\r
@@ -300,6 +328,57 @@ namespace Psychlops
                        }\r
                        System.Threading.Thread.Sleep(0);\r
                }\r
+               */\r
+\r
+               public void flip()\r
+               {\r
+                       lock (this)\r
+                       {\r
+                               nextIntervalFrame = 1;\r
+                               chacked = 1;\r
+                       }\r
+                       //                      pointPoolN = 0;\r
+                       //                      brushPoolN = 0;\r
+                       //                      linePoolN = 0;\r
+                       rectPoolN = 0;\r
+                       lineStackN = 0;\r
+                       rectStackN = 0;\r
+                       Internal.Main.canvas_flag.WaitOne();\r
+               }\r
+               public void executeFlip()\r
+               {\r
+                       lock (this)\r
+                       {\r
+                               nextIntervalFrame--;\r
+                       }\r
+                       if (nextIntervalFrame <= 0)\r
+                       {\r
+                               if (chacked > 0)\r
+                               {\r
+                                       //api_canvas.Children.Clear();\r
+                                       //var tmp = new System.Windows.Controls.Canvas();\r
+                                       if (stackN > 0)\r
+                                       {\r
+                                               for (int i = 0; i < stackN - 2; i++)\r
+                                               {\r
+                                                       //api_canvas.Children.Add(stack[i].poolNative(this));\r
+                                                       api_canvas.Children.Add(stack[i].poolNative(this));\r
+                                               }\r
+                                               stackN = 0;\r
+                                       }\r
+                                       //api_canvas.Children.Clear();\r
+                                       //api_canvas.Children.Add(tmp);\r
+                                       lock (this)\r
+                                       {\r
+                                               chacked = 0;\r
+                                       }\r
+                                       Psychlops.Internal.Main.canvas_flag.Set();\r
+                               }\r
+                       }\r
+                       System.Threading.Thread.Sleep(0);\r
+               }\r
+\r
+\r
 \r
                #region Properties\r
 \r
@@ -402,16 +481,6 @@ namespace Psychlops
                {\r
                        return (Rectangle)MemberwiseClone();\r
                }\r
-               public void copyToStack(Templates.StackableDrawable d)\r
-               {\r
-                       var tmp = d.rectStack[d.rectStackN];\r
-                       tmp.v1 = v1;\r
-                       tmp.v2 = v2;\r
-                       tmp.fill = fill;\r
-                       d.stack[d.stackN] = tmp; \r
-                       d.rectStackN++;\r
-                       d.stackN++;\r
-               }\r
                public static implicit operator System.Windows.Rect(Rectangle d)\r
                {\r
                        return new System.Windows.Rect(d.v1.x, d.v1.y, d.v2.x, d.v2.y);\r
@@ -424,8 +493,18 @@ namespace Psychlops
                        System.Windows.Controls.Canvas.SetTop(tmp, d.top);\r
                        return tmp;\r
                }\r
-               public UIElement toNative() { return this; }\r
 \r
+               public UIElement toNative() { return this; }\r
+               public void copyToStack(Templates.StackableDrawable d)\r
+               {\r
+                       var tmp = d.rectStack[d.rectStackN];\r
+                       tmp.v1 = v1;\r
+                       tmp.v2 = v2;\r
+                       tmp.fill = fill;\r
+                       d.stack[d.stackN] = tmp;\r
+                       d.rectStackN++;\r
+                       d.stackN++;\r
+               }\r
                public UIElement poolNative(Canvas d)\r
                {\r
                        var tmp = d.rectPool[d.rectPoolN];\r
@@ -458,19 +537,30 @@ namespace Psychlops
                        System.Windows.Controls.Canvas.SetTop(tmp, d.top);\r
                        return tmp;\r
                }\r
+\r
                public UIElement toNative() { return this; }\r
 \r
+               public void copyToStack(Templates.StackableDrawable d)\r
+               {\r
+                       var tmp = d.ellipseStack[d.ellipseStackN];\r
+                       tmp.datum = datum;\r
+                       tmp.xdiameter = xdiameter;\r
+                       tmp.ydiameter = ydiameter;\r
+                       tmp.fill = fill;\r
+                       d.stack[d.stackN] = tmp;\r
+                       d.rectStackN++;\r
+                       d.stackN++;\r
+               }\r
                public UIElement poolNative(Canvas d)\r
                {\r
-/*                     var tmp = d.rectPool[d.rectPoolN];\r
+                       var tmp = d.ellipsePool[d.ellipsePoolN];\r
                        tmp.Width = width;\r
                        tmp.Height = height;\r
                        tmp.Fill = fill;\r
                        System.Windows.Controls.Canvas.SetLeft(tmp, left);\r
                        System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], top);\r
                        tmp.Visibility = Visibility.Visible;\r
-                       d.rectPoolN++;\r
-*/\r
+                       d.ellipsePoolN++;\r
                        return this;\r
                }\r
        }\r
@@ -499,17 +589,30 @@ namespace Psychlops
                }\r
                public UIElement toNative() { return this; }\r
 \r
+               public void copyToStack(Templates.StackableDrawable d)\r
+               {\r
+                       var tmp = d.polygonStack[d.polygonStackN];\r
+                       tmp.datum = datum;\r
+                       tmp.vertices.Clear();\r
+                       foreach (var v in vertices)\r
+                       {\r
+                               tmp.vertices.Add(v);\r
+                       }\r
+                       tmp.fill = fill;\r
+                       d.stack[d.stackN] = tmp;\r
+                       d.rectStackN++;\r
+                       d.stackN++;\r
+               }\r
                public UIElement poolNative(Canvas d)\r
                {\r
-                       /*                      var tmp = d.rectPool[d.rectPoolN];\r
-                                               tmp.Width = width;\r
-                                               tmp.Height = height;\r
-                                               tmp.Fill = fill;\r
-                                               System.Windows.Controls.Canvas.SetLeft(tmp, left);\r
-                                               System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], top);\r
-                                               tmp.Visibility = Visibility.Visible;\r
-                                               d.rectPoolN++;\r
-*/\r
+                       var tmp = d.polygonPool[d.polygonPoolN];\r
+                       tmp.Fill = fill;\r
+                       /*\r
+                       System.Windows.Controls.Canvas.SetLeft(tmp, left);\r
+                       System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], top);\r
+                       */ \r
+                       tmp.Visibility = Visibility.Visible;\r
+                       d.polygonPoolN++;\r
                        return this;\r
                }\r
 \r
@@ -570,6 +673,15 @@ namespace Psychlops
                }\r
                public UIElement toNative() { return this; }\r
 \r
+               public void copyToStack(Templates.StackableDrawable d)\r
+               {\r
+                       var tmp = d.polygonStack[d.polygonStackN];\r
+                       tmp.datum = datum;\r
+                       tmp.fill = fill;\r
+                       d.stack[d.stackN] = tmp;\r
+                       d.rectStackN++;\r
+                       d.stackN++;\r
+               }\r
                public UIElement poolNative(Canvas d)\r
                {\r
                        /*                      var tmp = d.rectPool[d.rectPoolN];\r

diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index 32ba5e8..b9daaa9 100644 (file)
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -1,4 +1,5 @@
 \r
+/*\r
 using Psychlops;\r
 \r
 namespace PsychlopsSilverlight4test\r
@@ -45,9 +46,8 @@ namespace PsychlopsSilverlight4test
 \r
 }\r
 \r
+*/\r
 \r
-\r
-/*\r
 using Psychlops;\r
 \r
 namespace Psychlops\r
@@ -75,6 +75,7 @@ namespace Psychlops
 }\r
 \r
 \r
+\r
 namespace PsychlopsSilverlight4test\r
 {\r
 \r
@@ -111,9 +112,10 @@ namespace PsychlopsSilverlight4test
                        dots = new RandomDots();\r
 \r
 \r
-                       while(true) {\r
+                       while (true)\r
+                       {\r
                                frames++;\r
-                               \r
+\r
                                cnvs.clear(new Color(Mouse.left.pressed() ? 0.75 : 0.5));\r
                                col.set(Math.random(1.0));\r
 \r
@@ -126,17 +128,17 @@ namespace PsychlopsSilverlight4test
                                img.centering(Mouse.position);\r
                                img.draw();\r
 \r
-                               shape.centering(Mouse.position).shift(100,0);\r
+                               shape.centering(Mouse.position).shift(100, 0);\r
                                shape.draw();\r
                                if (Keyboard.spc.pressed()) cnvs.var(Mouse.x, 100, 100);\r
 \r
                                cnvs.var(frames, 20, 20);\r
-                               slider.value = frames/100.0;\r
+                               slider.value = frames / 100.0;\r
 \r
-                               fixation.shift(100,100);\r
+                               fixation.shift(100, 100);\r
                                fixation.draw(new Stroke(Color.blue, 3));\r
 \r
-                               for (int i=0; i<dots.cood.Length; i++)\r
+                               for (int i = 0; i < dots.cood.Length; i++)\r
                                {\r
                                        dots.cood[i].set(Math.random(500), Math.random(500));\r
                                }\r
@@ -148,4 +150,6 @@ namespace PsychlopsSilverlight4test
        }\r
 \r
 }\r
-*/
\ No newline at end of file
+\r
+\r
+\r

diff --git a/test4/TestPage.html b/test4/TestPage.html
index a651178..1bcd588 100644 (file)
--- a/test4/TestPage.html
+++ b/test4/TestPage.html
@@ -69,6 +69,7 @@
                  <param name="minRuntimeVersion" value="3.0.40624.0" />\r
                  <param name="autoUpgrade" value="true" />\r
                  <param name="enableHtmlAccess" value="true" />\r
+                 <param name="enableGPUAcceleration" value="true" />\r
                  <a href="http://go.microsoft.com/fwlink/?LinkID=149156&v=3.0.40624.0" style="text-decoration:none">\r
                          <img src="http://go.microsoft.com/fwlink/?LinkId=108181" alt="Microsoft Silverlight を入手" style="border-style:none"/>\r
                  </a>\r