OSDN Git Service

faster2
[psychlops/silverlight.git] / dev4 / psychlops / core / graphic / canvas.cs
index 7f6360c..6216e53 100644 (file)
@@ -56,7 +56,7 @@ namespace Psychlops
                                {\r
                                        polygonStack[i] = new Polygon();\r
                                        lettersStack[i] = new Letters();\r
-                                       //imageStack[i] = new Image();\r
+                                       imageStack[i] = new Image(1,1);\r
                                }\r
                        }\r
 \r
@@ -75,7 +75,8 @@ namespace Psychlops
 \r
                        public virtual void line(Line drawee)\r
                        {\r
-//                             stack.Enqueue(drawee.clone());\r
+                               //                              stack.Enqueue(drawee.clone());\r
+                               drawee.copyToStack(this);\r
                        }\r
 \r
                        public virtual void rect(Rectangle drawee)\r
@@ -141,6 +142,10 @@ namespace Psychlops
                internal int ellipsePoolN;\r
                internal System.Windows.Shapes.Polygon[] polygonPool;\r
                internal int polygonPoolN;\r
+               internal System.Windows.Controls.TextBlock[] lettersPool;\r
+               internal int lettersPoolN;\r
+               internal System.Windows.Controls.Image[] imagePool;\r
+               internal int imagePoolN;\r
 \r
                #region initializer\r
 \r
@@ -171,11 +176,17 @@ namespace Psychlops
                        api_canvas = apicnvs;\r
                        initialize(wid, hei);\r
                }\r
+\r
+               protected bool AsyncInitBool;\r
                protected void initialize(int wid, int hei)\r
                {\r
+                       AsyncInitBool = false;\r
                        width_ = wid;\r
                        height_ = hei;\r
                        api_canvas.Dispatcher.BeginInvoke(new TwoIntProcedure(initialize__), wid, hei);\r
+                       while(!AsyncInitBool)\r
+                       {\r
+                       }\r
                        Mouse._prime = api_canvas;\r
                        Main.drawable = this;\r
                        Main.canvas = this;\r
@@ -206,22 +217,29 @@ namespace Psychlops
                        brushPool = new SolidColorBrush[10000];\r
                        linePool = new System.Windows.Shapes.Line[10000];\r
                        rectPool = new System.Windows.Shapes.Rectangle[10000];\r
+                       ellipsePool = new System.Windows.Shapes.Ellipse[10000];\r
                        for (int i = 0; i < 10000; i++)\r
                        {\r
                                pointPool[i] = new System.Windows.Point();\r
                                brushPool[i] = new SolidColorBrush();\r
                                linePool[i] = new System.Windows.Shapes.Line();\r
                                rectPool[i] = new System.Windows.Shapes.Rectangle();\r
+                               ellipsePool[i] = new System.Windows.Shapes.Ellipse();\r
                        }\r
-                       for (int i = 0; i < 300; i++)\r
+                       polygonPool = new System.Windows.Shapes.Polygon[1000];\r
+                       lettersPool = new System.Windows.Controls.TextBlock[1000];\r
+                       for (int i = 0; i < 1000; i++)\r
                        {\r
-                               api_canvas.Children.Add(rectStack[i].poolNative(this));\r
-                               api_canvas.Children.Add(rectStack[i].poolNative(this));\r
+                               polygonPool[i] = new System.Windows.Shapes.Polygon();\r
+                               lettersPool[i] = new System.Windows.Controls.TextBlock();\r
                        }\r
 \r
                        masterPool = new System.Windows.Controls.Canvas();\r
                        prevPool = new System.Windows.Controls.Canvas();\r
-//                     masterPool.Children.Add()\r
+                       api_canvas.Children.Add(masterPool);\r
+                       //api_canvas.Children.Remove(Internal.Main.widgetStack);\r
+\r
+                       AsyncInitBool = true;\r
                }\r
 \r
                #endregion\r
@@ -258,78 +276,15 @@ namespace Psychlops
                public override void clear(Color col)\r
                {\r
                        back_panel.fill = col;\r
-//                     stack.Clear();\r
                        stackN = 0;\r
                        rect(back_panel);\r
                }\r
 \r
                int nextIntervalFrame = 1, chacked = 0;\r
-               /*\r
-               public void flip()\r
+               public void flip(int n)\r
                {\r
-                       //api_canvas.Dispatcher.BeginInvoke(flipexec);\r
-                       //flipexec();\r
-                       //System.Threading.Thread.Sleep(System.Threading.Timeout.Infinite);\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
+                       flip();\r
                }\r
-               public void executeFlip()\r
-               {\r
-                       lock (this)\r
-                       {\r
-                               nextIntervalFrame--;\r
-                       }\r
-                       if (nextIntervalFrame <= 0)\r
-                       {\r
-                               var rr = new Random();\r
-                               //Psychlops.AppState.statusBar = chacked.ToString();\r
-                               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
-                                       {\r
-                                               //foreach (UIElement e in api_canvas.Children)\r
-                                               //{\r
-                                               //}\r
-//                                             foreach (Internal.PrimitiveFigure f in stack)\r
-                                               for (int i = 0; i < stackN - 2; i++)\r
-                                               {\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
-                                               }\r
-                                               stackN = 0;\r
-\r
-                                       }\r
-                                       api_canvas.Children.Clear();\r
-                                       api_canvas.Children.Add(tmp);\r
-               //                      stack.Clear();\r
-                                       lock (this)\r
-                                       {\r
-                                               chacked = 0;\r
-                                       }\r
-                                       Psychlops.Internal.Main.canvas_flag.Set();\r
-               //                      prevPool = tmp;\r
-                               }\r
-                       }\r
-                       System.Threading.Thread.Sleep(0);\r
-               }\r
-               */\r
-\r
                public void flip()\r
                {\r
                        lock (this)\r
@@ -339,10 +294,24 @@ namespace Psychlops
                        }\r
                        //                      pointPoolN = 0;\r
                        //                      brushPoolN = 0;\r
-                       //                      linePoolN = 0;\r
+                       linePoolN = 0;\r
                        rectPoolN = 0;\r
                        lineStackN = 0;\r
                        rectStackN = 0;\r
+                       polygonStackN = 0;\r
+                       ellipseStackN = 0;\r
+                       lettersStackN = 0;\r
+                       imageStackN = 0;\r
+\r
+                       pointPoolN = 0;\r
+                       brushPoolN = 0;\r
+                       linePoolN = 0;\r
+                       rectPoolN = 0;\r
+                       ellipsePoolN = 0;\r
+                       polygonPoolN = 0;\r
+                       lettersPoolN = 0;\r
+                       imagePoolN = 0;\r
+\r
                        Internal.Main.canvas_flag.WaitOne();\r
                }\r
                public void executeFlip()\r
@@ -355,19 +324,15 @@ namespace Psychlops
                        {\r
                                if (chacked > 0)\r
                                {\r
-                                       //api_canvas.Children.Clear();\r
-                                       //var tmp = new System.Windows.Controls.Canvas();\r
+                                       masterPool.Children.Clear();\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
+                                                       masterPool.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
@@ -454,6 +419,19 @@ namespace Psychlops
                }\r
                public UIElement toNative() { return this; }\r
 \r
+               public void copyToStack(Templates.StackableDrawable d)\r
+               {\r
+                       var tmp = d.lineStack[d.lineStackN];\r
+                       tmp.begin.x = begin.x;\r
+                       tmp.begin.y = begin.y;\r
+                       tmp.end.x = end.x;\r
+                       tmp.end.y = end.y;\r
+                       tmp.fill = fill;\r
+                       tmp.stroke = stroke;\r
+                       d.stack[d.stackN] = tmp;\r
+                       d.lineStackN++;\r
+                       d.stackN++;\r
+               }\r
                public UIElement poolNative(Canvas d)\r
                {\r
                        var tmp = d.linePool[d.linePoolN];\r
@@ -548,7 +526,7 @@ namespace Psychlops
                        tmp.ydiameter = ydiameter;\r
                        tmp.fill = fill;\r
                        d.stack[d.stackN] = tmp;\r
-                       d.rectStackN++;\r
+                       d.ellipseStackN++;\r
                        d.stackN++;\r
                }\r
                public UIElement poolNative(Canvas d)\r
@@ -561,7 +539,7 @@ namespace Psychlops
                        System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], top);\r
                        tmp.Visibility = Visibility.Visible;\r
                        d.ellipsePoolN++;\r
-                       return this;\r
+                       return tmp;\r
                }\r
        }\r
 \r
@@ -600,20 +578,23 @@ namespace Psychlops
                        }\r
                        tmp.fill = fill;\r
                        d.stack[d.stackN] = tmp;\r
-                       d.rectStackN++;\r
+                       d.polygonStackN++;\r
                        d.stackN++;\r
                }\r
                public UIElement poolNative(Canvas d)\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.Points.Clear();\r
+                       foreach (var v in vertices)\r
+                       {\r
+                               tmp.Points.Add(v);\r
+                       }\r
+                       System.Windows.Controls.Canvas.SetLeft(tmp, datum.x);\r
+                       System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], datum.y);\r
                        tmp.Visibility = Visibility.Visible;\r
                        d.polygonPoolN++;\r
-                       return this;\r
+                       return tmp;\r
                }\r
 \r
        }\r
@@ -675,25 +656,31 @@ namespace Psychlops
 \r
                public void copyToStack(Templates.StackableDrawable d)\r
                {\r
-                       var tmp = d.polygonStack[d.polygonStackN];\r
+                       var tmp = d.lettersStack[d.lettersStackN];\r
+                       tmp.str = str;\r
                        tmp.datum = datum;\r
                        tmp.fill = fill;\r
                        d.stack[d.stackN] = tmp;\r
-                       d.rectStackN++;\r
+                       d.lettersStackN++;\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
-                       return this;\r
+                       var tmp = d.lettersPool[d.lettersPoolN];\r
+                       tmp.Text = str;\r
+                       tmp.Width = 500;\r
+                       tmp.Height = 500;\r
+                       tmp.FontSize = font.size;\r
+                       //tmp.FontFamily = ,\r
+                       tmp.FontStyle = FONT_STYLE_BRIDGE[font.style];\r
+                       tmp.FontWeight = FONT_WEIGHT_BRIDGE[font.weight];\r
+                       tmp.TextAlignment = LETTERS_H_ALIGN_BRIDGE[align];\r
+                       tmp.Foreground = fill;\r
+                       System.Windows.Controls.Canvas.SetLeft(tmp, datum.x);\r
+                       System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], datum.y);\r
+                       tmp.Visibility = Visibility.Visible;\r
+                       d.lettersPoolN++;\r
+                       return tmp;\r
                }\r
        }\r
 \r
@@ -707,6 +694,7 @@ namespace Psychlops
                internal void create__(int wid, int hei)\r
                {\r
                        buffer = new WriteableBitmap(wid, hei);\r
+                       AsyncBool = true;\r
                }\r
                delegate void FieldFunc1(System.Func<int, int, System.Windows.Media.Color> func);\r
                delegate void FieldFunc2(System.Func<int, int, System.Windows.Media.Color, System.Windows.Media.Color> func);\r
@@ -743,17 +731,24 @@ namespace Psychlops
                }\r
                public UIElement toNative() { return this; }\r
 \r
+               public void copyToStack(Templates.StackableDrawable d)\r
+               {\r
+                       var tmp = d.imageStack[d.imageStackN];\r
+                       tmp.datum = datum;\r
+                       tmp.buffer = buffer;\r
+                       tmp.self_rect = self_rect;\r
+                       d.stack[d.stackN] = tmp;\r
+                       d.imageStackN++;\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.imagePool[d.imagePoolN];\r
+                       tmp.Source = buffer;\r
+                       System.Windows.Controls.Canvas.SetLeft(tmp, datum.x);\r
+                       System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], datum.y);\r
+                       tmp.Visibility = Visibility.Visible;\r
+                       d.rectPoolN++;\r
                        return this;\r
                }\r
 \r